Merge pull request #423 from sasjs/CS0409737

Cs0409737

.github/workflows/main.yml

@@ -54,6 +54,7 @@ jobs:
           echo "REFRESH_TOKEN=${{secrets.SAS9_4GL_IO_REFRESH_TOKEN}}" >> .env.server
 
       - name: Semantic Release
+        id: makerelease
         uses: cycjimmy/semantic-release-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -64,3 +65,27 @@ jobs:
           npx @sasjs/cli compile job -s sasjs/utils/create_sas_package.sas -o sasjsbuild -t server
           # need long duration token per https://github.com/sasjs/server/issues/307
           # npx @sasjs/cli run sasjsbuild/jobs/utils/create_sas_package.sas -t server
+
+      - name: Update Docs Site
+        if: steps.makerelease.outputs.new_release_published == 'true'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y doxygen
+          npx @sasjs/cli doc -t docsonly 
+          git clone https://x-access-token:${{ secrets.CORESASJSIO_PAT }}@github.com/sasjs/core.github.io.git
+          cd core.github.io
+          rm -rf *.html
+          rm -rf *.js
+          rm -rf *.png
+          rm -rf *.dot
+          rm -rf *.css
+          rm -rf *.svg
+          rm -rf search
+          cp -R ../sasjsbuild/docs/* .
+          ls
+          git config user.name sasjs
+          echo 'core.sasjs.io' > CNAME
+          git add .
+          git commit -m "core pipeline build on $(date +%F:%H:%M:%S)"
+          git push
+          echo "check it out:  https://sasjs.github.io/core.github.io/files.html"

.github/workflows/notmain.yml

@@ -26,6 +26,7 @@ jobs:
           git config user.email github-actions@github.com
           python3 build.py
           git add all.sas
+          git add viya/mv_createwebservice.sas
           git commit -m "chore: updating all.sas" --allow-empty
           git push
 

README.md

@@ -5,8 +5,6 @@
 ![npm](https://img.shields.io/npm/dt/@sasjs/core)
 ![GitHub top language](https://img.shields.io/github/languages/top/sasjs/core)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sasjs/core)](https://github.com/sasjs/core/issues?q=is%3Aissue+is%3Aclosed)
-[![GitHub issues](https://img.shields.io/github/issues-raw/sasjs/core)](https://github.com/sasjs/core/issues)
-![total lines](https://tokei.rs/b1/github/sasjs/core)
 
 
 Much quality. Many standards. The **Macro Core** library exists to save time and development effort! Herein ye shall find a veritable host of MIT-licenced, production quality SAS macros. These are a mix of tools, utilities, functions and code generators that are useful in the context of [Application Development](https://sasapps.io) on the SAS platform (eg https://datacontroller.io). [Contributions](https://github.com/sasjs/core/blob/main/.github/CONTRIBUTING.md) are welcome.

all.sas

@@ -25014,9 +25014,10 @@ run;
 
 /* Get Viya file-extension details into some macro variables */
 %mv_getViyaFileExtParms(&ext
-                        ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
+  ,propertiesVar=viyaProperties
+  ,typeDefNameVar=viyaTypeDefName
+  ,mdebug=&mdebug
+)
 
 /* fetch job info */
 %local fname1;
@@ -25084,9 +25085,9 @@ run;
 
 /* If properties were found then patch the file to include them */
 %if not %mf_isBlank(%superq(viyaProperties)) %then %do;
-  /* Wrap the properties object in a root object also containing the file name */
+  /* Wrap the properties object in a root object also containing the filename */
   %local viyapatch;
-  %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
+  %let viyapatch=%sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
   data _null_;
     length line $32767;
     file "&viyapatch" lrecl=32767;
@@ -25106,7 +25107,7 @@ run;
     run;
   %end;
 
-  /* And apply the properties to the newly created file, using the PATCH method */
+  /* Apply the properties to the newly created file, using the PATCH method */
   %let fref=%mf_getuniquefileref();
   filename &fref "&viyapatch";
   %let url=&base_uri&fileuri;
@@ -25290,7 +25291,6 @@ options noquotelenmax;
     run;
   %end;
   %if &SYS_PROCHTTP_STATUS_CODE=200 %then %do;
-    %*put &sysmacroname &newpath exists so grab the follow on link ;
     data _null_;
       set &libref1..links;
       if rel='createChild' then
@@ -26311,7 +26311,7 @@ data _null_;
   put '  ,showmeta=N,maxobs=MAX,workobs=0 ';
   put '); ';
   put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name ';
-  put '  sasjs_tables SYS_JES_JOB_URI; ';
+  put '  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS; ';
   put '%if %index("&_debug",log) %then %let _debug=131; ';
   put ' ';
   put '%local i tempds table; ';
@@ -26326,6 +26326,11 @@ data _null_;
   put '    %let _webin_file_count=%eval(&_webin_file_count+0); ';
   put '    %let _webin_fileuri1=&_webin_fileuri; ';
   put '    %let _webin_name1=&_webin_name; ';
+  put '    %if &_EXECUTIONTASKS=true %then %do; ';
+  put '      /* TODO - remove this once SAS Track CS0409737 is resolved */ ';
+  put '      /* links:  https://github.com/sasjs/adapter/issues/884 */ ';
+  put '      %if %upcase(&_webin_name)=_SASJS_NOOP %then %let _webin_file_count=0; ';
+  put '    %end; ';
   put '  %end; ';
   put ' ';
   put '  /* if the sasjs_tables param is passed, we expect param based upload */ ';
@@ -26366,8 +26371,12 @@ data _null_;
   put '  %end; ';
   put '  %else %do i=1 %to &_webin_file_count; ';
   put '    /* read in any files that are sent */ ';
-  put '    /* this part needs refactoring for wide files */ ';
-  put '    filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999; ';
+  put '    %if &_EXECUTIONTASKS=true %then %do; ';
+  put '      filename indata "%sysfunc(pathname(&&_webin_fileref&i))" lrecl=999999; ';
+  put '    %end; ';
+  put '    %else %do; ';
+  put '      filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999; ';
+  put '    %end; ';
   put '    data _null_; ';
   put '      infile indata termstr=crlf lrecl=32767; ';
   put '      input; ';
@@ -28727,6 +28736,7 @@ libname &libref1 clear;
   @li mf_existds.sas
   @li mf_getplatform.sas
   @li mf_getuniquefileref.sas
+  @li mf_getuniquelibref.sas
   @li mf_getuniquename.sas
   @li mf_getvalue.sas
   @li mf_getvarlist.sas
@@ -28752,7 +28762,7 @@ libname &libref1 clear;
     iftrue=(%mf_isBlank(&ext))
     ,msg=%str(No file extension provided.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   %mp_abort(
     iftrue=(%mf_isBlank(&typeDefNameVar) and
@@ -28760,13 +28770,13 @@ libname &libref1 clear;
             %mf_isBlank(&mediaTypeVar))
     ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   %mp_abort(
     iftrue=(%mf_isBlank(&viyaFileExtRespLibDs))
     ,msg=%str(No <libname.>dataset name provided to cache inital response.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   /* Declare requested parameters as global macro vars and initialize blank */
   %if not %mf_isBlank(&typeDefNameVar) %then %do;
@@ -28783,9 +28793,7 @@ libname &libref1 clear;
   %end;
 
   %let base_uri=%mf_getplatform(VIYARESTAPI);
-  %if &mdebug=1 %then %do;
-    %put DEBUG: &=base_uri;
-  %end;
+  %if &mdebug=1 %then %put DEBUG: &=base_uri;
 
   %let ext=%lowcase(&ext);
 
@@ -28809,7 +28817,7 @@ libname &libref1 clear;
 
     %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do;
       /* To avoid a breaking change, exit early if the request failed.
-        The calling process will proceed with empty requested macro variables. */
+          The calling process will proceed with empty macro variables. */
       %put INFO: &sysmacroname File extension details were not retrieved.;
       filename &viyatypedefs clear;
       %return;
@@ -28830,11 +28838,12 @@ libname &libref1 clear;
     /* Convert the content of that JSON into SAS datasets */
       /* First prepare a new WORK-based folder to receive the datasets */
     %local jsonworkfolder jsonlib opt_dlcreatedir;
-    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_);
+    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=jsn_);
     %let jsonlib=%mf_getuniquelibref(prefix=json);
-      /* And point a libname at it */
+    /* And point a libname at it */
     %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir));
-    options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir;
+    options dlcreatedir; libname &jsonlib "&jsonworkfolder";
+    options &opt_dlcreatedir;
 
     /* Read the json output once and copy datasets to its work folder */
     %local libref1;
@@ -28863,20 +28872,22 @@ libname &libref1 clear;
 
   %end; /* If initial filetype query response didn't exist */
 
-  /* Find the row-group for the current file extension */
+  %if &mdebug %then %put DEBUG: Find the row-group for extension &ext;
   %local itemRowGroup;
-  %let itemRowGroup =
-    %mf_getValue(
-      &viyaFileExtRespLibDs
-      ,_viyaItemIdx
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
-    );
+  data _null_;
+    set &viyaFileExtRespLibDs;
+    where p1='items' and p2='extensions' and value="&ext";
+    call symputx('itemRowGroup',_viyaItemIdx,'l');
+  %if &mdebug %then %do;
+    putlog (_all_)(=);
+  %end;
+  run;
 
   %if &mdebug %then %put DEBUG: &=itemRowGroup;
 
   %if %mf_isBlank(&itemRowGroup) %then %do;
     /* extension was not found */
-    %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".;
+    %if &mdebug %then %put DEBUG: No type details found for extension "&ext";
     %return;
   %end;
 
@@ -28890,14 +28901,17 @@ libname &libref1 clear;
 
   /* Populate typeDefName, if requested */
   %if (not %mf_isBlank(&typeDefNameVar)) %then %do;
-    %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name"));
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
+    %let &typeDefNameVar = %mf_getvalue(
+        &dsItems,value,filter=%quote(p1="items" and p2="name"));
+    %if &mdebug %then
+      %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
   %end;
 
   /* Populate mediaType, if requested */
   %if (not %mf_isBlank(&mediaTypeVar)) %then %do;
-    %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
+    %let &mediaTypeVar = %mf_getvalue(
+      &dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
+    %if &mdebug %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
   %end;
 
   /* Populate properties macro variable, if requested */
@@ -28914,7 +28928,8 @@ libname &libref1 clear;
     /* Check for 1+ properties */
     %if ( %mf_nobs(&dsProperties) = 0 ) %then %do;
       %let &propertiesVar = %str();
-      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%');
+      %if &mdebug %then %put DEBUG: &SYSMACRONAME - No Viya properties %trim(
+        )found for file suffix %str(%')&ext%str(%');
     %end;
     %else %do;
       /* Properties potentially span multiple rows in the input table */
@@ -28944,7 +28959,8 @@ libname &libref1 clear;
         end;
       run;
 
-      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
+      %if &mdebug %then
+        %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
     %end;
 
   %end;
@@ -30421,7 +30437,7 @@ filename &fref1 clear;
   ,showmeta=N,maxobs=MAX,workobs=0
 );
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
-  sasjs_tables SYS_JES_JOB_URI;
+  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS;
 %if %index("&_debug",log) %then %let _debug=131;
 
 %local i tempds table;
@@ -30436,6 +30452,11 @@ filename &fref1 clear;
     %let _webin_file_count=%eval(&_webin_file_count+0);
     %let _webin_fileuri1=&_webin_fileuri;
     %let _webin_name1=&_webin_name;
+    %if &_EXECUTIONTASKS=true %then %do;
+      /* TODO - remove this once SAS Track CS0409737 is resolved */
+      /* links:  https://github.com/sasjs/adapter/issues/884 */
+      %if %upcase(&_webin_name)=_SASJS_NOOP %then %let _webin_file_count=0;
+    %end;
   %end;
 
   /* if the sasjs_tables param is passed, we expect param based upload */
@@ -30476,8 +30497,12 @@ filename &fref1 clear;
   %end;
   %else %do i=1 %to &_webin_file_count;
     /* read in any files that are sent */
-    /* this part needs refactoring for wide files */
-    filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999;
+    %if &_EXECUTIONTASKS=true %then %do;
+      filename indata "%sysfunc(pathname(&&_webin_fileref&i))" lrecl=999999;
+    %end;
+    %else %do;
+      filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999;
+    %end;
     data _null_;
       infile indata termstr=crlf lrecl=32767;
       input;

package.json

@@ -31,5 +31,8 @@
     "test": "npx @sasjs/cli test -t server",
     "lint": "npx @sasjs/cli lint",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
-  }
-}
+  },
+  "maintainers": [
+    "https://sasapps.io"
+  ]
+}

sasjs/doxy/new_header.html

@@ -21,6 +21,7 @@
   <link href="$relpath^tabs.css" rel="stylesheet" type="text/css" />
   <script type="text/javascript" src="$relpath^jquery.js"></script>
   <script type="text/javascript" src="$relpath^dynsections.js"></script>
+  <script type="text/javascript" src="$relpath^cookie.js"></script>
   $treeview $search $mathjax
   <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
   <link rel="shortcut icon" href="$relpath^favicon.ico" type="image/x-icon" />
@@ -39,6 +40,10 @@
       g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
     })();
   </script>
+  <noscript>
+    <p><img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.4gl.io/matomo.php?idsite=6&amp;rec=1"
+        style="border:0;" alt="" /></p>
+  </noscript>
   <!-- End Matomo Code -->
 </head>
 
@@ -79,8 +84,4 @@
       </table>
     </div>
     <!--END TITLEAREA-->
-    <!-- end header part -->
-  </div>
-</body>
-
-</html>
+    <!-- end header part -->

sasjs/sasjsconfig.json

@@ -25,10 +25,7 @@
   },
   "testConfig": {
     "initProgram": "tests/testinit.sas",
-    "termProgram": "tests/testterm.sas",
-    "macroVars": {
-      "mcTestAppLoc": "/Public/temp/macrocore"
-    }
+    "termProgram": "tests/testterm.sas"
   },
   "defaultTarget": "server",
   "targets": [

tests/testinit.sas

@@ -10,7 +10,7 @@
 **/
 
 /* location in metadata or SAS Drive for temporary files */
-%let mcTestAppLoc=/Public/testresults/sasjs_core/%mf_uid();
+%let mcTestAppLoc=/Users/&sysuserid/testresults/sasjs_core/%mf_uid();
 
 /* set defaults */
 %mp_init()

tests/viyaonly/mv_createfolder.test.sas

@@ -5,6 +5,7 @@
   <h4> SAS Macros </h4>
   @li mf_uid.sas
   @li mp_assert.sas
+  @li mp_assertscope.sas
   @li mv_createfolder.sas
   @li mv_deleteviyafolder.sas
   @li mv_getfoldermembers.sas
@@ -15,7 +16,11 @@
 %let folder=%mf_uid();
 
 /* create a folder */
+%mp_assertscope(SNAPSHOT)
 %mv_createfolder(path=&mcTestAppLoc/temp/&folder/&folder)
+%mp_assertscope(COMPARE, ignorelist=MC0_JADP1LEN MC0_JADP2LEN MC0_JADPNUM
+  MC0_JADVLEN MC2_JADP1LEN MC2_JADP2LEN MC2_JADPNUM MC2_JADVLEN
+)
 
 %mv_getfoldermembers(root=&mcTestAppLoc/temp/&folder, outds=work.folders)
 
@@ -32,17 +37,39 @@ run;
 )
 
 /* create a folder without output dataset as part of the original macro */
-%mv_createfolder(path=&mcTestAppLoc/temp/&folder/folder2,outds=folders2)
+%mv_createfolder(path=&mcTestAppLoc/temp/&folder/f2
+  ,outds=folders2,mdebug=&sasjs_mdebug
+)
 
 %let test=0;
 data _null_;
   set work.folders2;
   putlog (_all_)(=);
-  if not missing(self_uri) and not missing(parent_uri)
-  then call symputx('test2',1);
+  if not missing(self_uri) then call symputx('test2',1);
 run;
 
 %mp_assert(
   iftrue=(&test2=1),
   desc=Check if outds param works
+)
+
+/* create a folder with full stops */
+%let newfolder=%mf_uid().2.1;
+%mv_createfolder(path=&mcTestAppLoc/temp/&newfolder
+  ,outds=work.folders3
+  ,mdebug=&sasjs_mdebug
+)
+
+%mv_getfoldermembers(root=&mcTestAppLoc/temp, outds=work.folders3)
+
+%let test3=0;
+data _null_;
+  set work.folders3;
+  putlog (_all_)(=);
+  if name="&newfolder" then call symputx('test3',1);
+run;
+
+%mp_assert(
+  iftrue=(&test3=1),
+  desc=Check if folder with full stops can be successfully created
 )

tests/viyaonly/mv_getviyafileextparms.test.sas

@@ -80,7 +80,7 @@ options mprint;
   typeDefNameVar=invalidTypeDefName,
   propertiesVar=invalidProperties,
   mediaTypeVar=invalidMediaType
-  )
+)
 %mp_assertscope(COMPARE
   ,ignorelist=
     &mvarIgnoreList invalidTypeDefName invalidProperties invalidMediaType

viya/mv_createfile.sas

@@ -204,9 +204,10 @@ run;
 
 /* Get Viya file-extension details into some macro variables */
 %mv_getViyaFileExtParms(&ext
-                        ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
+  ,propertiesVar=viyaProperties
+  ,typeDefNameVar=viyaTypeDefName
+  ,mdebug=&mdebug
+)
 
 /* fetch job info */
 %local fname1;
@@ -274,9 +275,9 @@ run;
 
 /* If properties were found then patch the file to include them */
 %if not %mf_isBlank(%superq(viyaProperties)) %then %do;
-  /* Wrap the properties object in a root object also containing the file name */
+  /* Wrap the properties object in a root object also containing the filename */
   %local viyapatch;
-  %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
+  %let viyapatch=%sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
   data _null_;
     length line $32767;
     file "&viyapatch" lrecl=32767;
@@ -296,7 +297,7 @@ run;
     run;
   %end;
 
-  /* And apply the properties to the newly created file, using the PATCH method */
+  /* Apply the properties to the newly created file, using the PATCH method */
   %let fref=%mf_getuniquefileref();
   filename &fref "&viyapatch";
   %let url=&base_uri&fileuri;

viya/mv_createfolder.sas

@@ -145,7 +145,6 @@ options noquotelenmax;
     run;
   %end;
   %if &SYS_PROCHTTP_STATUS_CODE=200 %then %do;
-    %*put &sysmacroname &newpath exists so grab the follow on link ;
     data _null_;
       set &libref1..links;
       if rel='createChild' then

viya/mv_createwebservice.sas

@@ -594,7 +594,7 @@ data _null_;
   put '  ,showmeta=N,maxobs=MAX,workobs=0 ';
   put '); ';
   put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name ';
-  put '  sasjs_tables SYS_JES_JOB_URI; ';
+  put '  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS; ';
   put '%if %index("&_debug",log) %then %let _debug=131; ';
   put ' ';
   put '%local i tempds table; ';
@@ -609,6 +609,11 @@ data _null_;
   put '    %let _webin_file_count=%eval(&_webin_file_count+0); ';
   put '    %let _webin_fileuri1=&_webin_fileuri; ';
   put '    %let _webin_name1=&_webin_name; ';
+  put '    %if &_EXECUTIONTASKS=true %then %do; ';
+  put '      /* TODO - remove this once SAS Track CS0409737 is resolved */ ';
+  put '      /* links:  https://github.com/sasjs/adapter/issues/884 */ ';
+  put '      %if %upcase(&_webin_name)=_SASJS_NOOP %then %let _webin_file_count=0; ';
+  put '    %end; ';
   put '  %end; ';
   put ' ';
   put '  /* if the sasjs_tables param is passed, we expect param based upload */ ';
@@ -649,8 +654,12 @@ data _null_;
   put '  %end; ';
   put '  %else %do i=1 %to &_webin_file_count; ';
   put '    /* read in any files that are sent */ ';
-  put '    /* this part needs refactoring for wide files */ ';
-  put '    filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999; ';
+  put '    %if &_EXECUTIONTASKS=true %then %do; ';
+  put '      filename indata "%sysfunc(pathname(&&_webin_fileref&i))" lrecl=999999; ';
+  put '    %end; ';
+  put '    %else %do; ';
+  put '      filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999; ';
+  put '    %end; ';
   put '    data _null_; ';
   put '      infile indata termstr=crlf lrecl=32767; ';
   put '      input; ';

viya/mv_getviyafileextparms.sas

@@ -23,6 +23,7 @@
   @li mf_existds.sas
   @li mf_getplatform.sas
   @li mf_getuniquefileref.sas
+  @li mf_getuniquelibref.sas
   @li mf_getuniquename.sas
   @li mf_getvalue.sas
   @li mf_getvarlist.sas
@@ -48,7 +49,7 @@
     iftrue=(%mf_isBlank(&ext))
     ,msg=%str(No file extension provided.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   %mp_abort(
     iftrue=(%mf_isBlank(&typeDefNameVar) and
@@ -56,13 +57,13 @@
             %mf_isBlank(&mediaTypeVar))
     ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   %mp_abort(
     iftrue=(%mf_isBlank(&viyaFileExtRespLibDs))
     ,msg=%str(No <libname.>dataset name provided to cache inital response.)
     ,mac=MV_GETVIYAFILEEXTPARMS
-  );
+  )
 
   /* Declare requested parameters as global macro vars and initialize blank */
   %if not %mf_isBlank(&typeDefNameVar) %then %do;
@@ -79,9 +80,7 @@
   %end;
 
   %let base_uri=%mf_getplatform(VIYARESTAPI);
-  %if &mdebug=1 %then %do;
-    %put DEBUG: &=base_uri;
-  %end;
+  %if &mdebug=1 %then %put DEBUG: &=base_uri;
 
   %let ext=%lowcase(&ext);
 
@@ -105,7 +104,7 @@
 
     %if (&SYS_PROCHTTP_STATUS_CODE ne 200) %then %do;
       /* To avoid a breaking change, exit early if the request failed.
-        The calling process will proceed with empty requested macro variables. */
+          The calling process will proceed with empty macro variables. */
       %put INFO: &sysmacroname File extension details were not retrieved.;
       filename &viyatypedefs clear;
       %return;
@@ -126,11 +125,12 @@
     /* Convert the content of that JSON into SAS datasets */
       /* First prepare a new WORK-based folder to receive the datasets */
     %local jsonworkfolder jsonlib opt_dlcreatedir;
-    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=json_);
+    %let jsonworkfolder=%sysfunc(pathname(work))/%mf_getuniquename(prefix=jsn_);
     %let jsonlib=%mf_getuniquelibref(prefix=json);
-      /* And point a libname at it */
+    /* And point a libname at it */
     %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir));
-    options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir;
+    options dlcreatedir; libname &jsonlib "&jsonworkfolder";
+    options &opt_dlcreatedir;
 
     /* Read the json output once and copy datasets to its work folder */
     %local libref1;
@@ -159,20 +159,22 @@
 
   %end; /* If initial filetype query response didn't exist */
 
-  /* Find the row-group for the current file extension */
+  %if &mdebug %then %put DEBUG: Find the row-group for extension &ext;
   %local itemRowGroup;
-  %let itemRowGroup =
-    %mf_getValue(
-      &viyaFileExtRespLibDs
-      ,_viyaItemIdx
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
-    );
+  data _null_;
+    set &viyaFileExtRespLibDs;
+    where p1='items' and p2='extensions' and value="&ext";
+    call symputx('itemRowGroup',_viyaItemIdx,'l');
+  %if &mdebug %then %do;
+    putlog (_all_)(=);
+  %end;
+  run;
 
   %if &mdebug %then %put DEBUG: &=itemRowGroup;
 
   %if %mf_isBlank(&itemRowGroup) %then %do;
     /* extension was not found */
-    %if(&mdebug=1) %then %put DEBUG: No type details found for extension "&ext".;
+    %if &mdebug %then %put DEBUG: No type details found for extension "&ext";
     %return;
   %end;
 
@@ -186,14 +188,17 @@
 
   /* Populate typeDefName, if requested */
   %if (not %mf_isBlank(&typeDefNameVar)) %then %do;
-    %let &typeDefNameVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="name"));
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
+    %let &typeDefNameVar = %mf_getvalue(
+        &dsItems,value,filter=%quote(p1="items" and p2="name"));
+    %if &mdebug %then
+      %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
   %end;
 
   /* Populate mediaType, if requested */
   %if (not %mf_isBlank(&mediaTypeVar)) %then %do;
-    %let &mediaTypeVar = %mf_getvalue(&dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
+    %let &mediaTypeVar = %mf_getvalue(
+      &dsItems,value,filter=%quote(p1="items" and p2="mediaType"));
+    %if &mdebug %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
   %end;
 
   /* Populate properties macro variable, if requested */
@@ -210,7 +215,8 @@
     /* Check for 1+ properties */
     %if ( %mf_nobs(&dsProperties) = 0 ) %then %do;
       %let &propertiesVar = %str();
-      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%');
+      %if &mdebug %then %put DEBUG: &SYSMACRONAME - No Viya properties %trim(
+        )found for file suffix %str(%')&ext%str(%');
     %end;
     %else %do;
       /* Properties potentially span multiple rows in the input table */
@@ -240,7 +246,8 @@
         end;
       run;
 
-      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
+      %if &mdebug %then
+        %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
     %end;
 
   %end;

viya/mv_webout.sas

@@ -55,7 +55,7 @@
   ,showmeta=N,maxobs=MAX,workobs=0
 );
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
-  sasjs_tables SYS_JES_JOB_URI;
+  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS;
 %if %index("&_debug",log) %then %let _debug=131;
 
 %local i tempds table;
@@ -70,6 +70,11 @@
     %let _webin_file_count=%eval(&_webin_file_count+0);
     %let _webin_fileuri1=&_webin_fileuri;
     %let _webin_name1=&_webin_name;
+    %if &_EXECUTIONTASKS=true %then %do;
+      /* TODO - remove this once SAS Track CS0409737 is resolved */
+      /* links:  https://github.com/sasjs/adapter/issues/884 */
+      %if %upcase(&_webin_name)=_SASJS_NOOP %then %let _webin_file_count=0;
+    %end;
   %end;
 
   /* if the sasjs_tables param is passed, we expect param based upload */
@@ -110,8 +115,12 @@
   %end;
   %else %do i=1 %to &_webin_file_count;
     /* read in any files that are sent */
-    /* this part needs refactoring for wide files */
-    filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999;
+    %if &_EXECUTIONTASKS=true %then %do;
+      filename indata "%sysfunc(pathname(&&_webin_fileref&i))" lrecl=999999;
+    %end;
+    %else %do;
+      filename indata filesrvc "&&_webin_fileuri&i" lrecl=999999;
+    %end;
     data _null_;
       infile indata termstr=crlf lrecl=32767;
       input;