fix: apply viya file type properties to newly created viya files

Issue400

README.md

@@ -1,19 +1,12 @@
 # Macro Core
-[![npm package][npm-image]][npm-url]
+
-[![Github Workflow][githubworkflow-image]][githubworkflow-url]
+[![npm package](https://img.shields.io/npm/v/@sasjs/core.svg)](http://npmjs.org/package/@sasjs/core)
+[![Github Workflow](https://github.com/sasjs/core/actions/workflows/main.yml/badge.svg)](https://github.com/sasjs/core/blob/main/.github/workflows/main.yml)
 ![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)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/sasjs/core)
-
-
-[npm-image]:https://img.shields.io/npm/v/@sasjs/core.svg
-[npm-url]:http://npmjs.org/package/@sasjs/core
-[githubworkflow-image]:https://github.com/sasjs/core/actions/workflows/main.yml/badge.svg
-[githubworkflow-url]:https://github.com/sasjs/core/blob/main/.github/workflows/main.yml
-[dependency-url]:https://github.com/sasjs/core/blob/main/package.json
 
 
 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

@@ -1121,7 +1121,7 @@ or %index(&pgm,/tests/testteardown)
   @author Allan Bowe
 **/
 
-%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mc,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;
@@ -11943,7 +11943,7 @@ data _null_;
 run;
 
 /* END */
-%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
+/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
 
 %mend mp_replace;
 /**
@@ -24098,18 +24098,25 @@ run;
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc;
+  %local fref rc var;
   %let fref=%mf_getuniquefileref();
 
   %if %sysfunc(filename(fref,,filesrvc,folderPath="&path"))=0 %then %do;
     1
+    %let var=_FILESRVC_&fref._URI;
     %let rc=%sysfunc(filename(fref));
+    %symdel &var;
   %end;
   %else %do;
     0
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave mfv_existfolder.sas with syscc=&syscc
+  )
+
 %mend mfv_existfolder;/**
   @file mfv_existsashdat.sas
   @brief Checks whether a CAS sashdat dataset exists in persistent storage.
@@ -24171,6 +24178,58 @@ run;
 
 %mend mfv_existsashdat;
 /**
+  @file
+  @brief Returns the path of a folder from the URI
+  @details Makes use of the SYSMSG() ER8OR response, which resolves the uri,
+  seemingly without entering an er8or state.
+
+  Usage:
+
+      %mv_createfolder(path=/public/demo)
+      %let uri=%mfv_getpathuri(/public/demo);
+      %put %mfv_getfolderpath(&uri);
+
+  Notice above the new path has an uppercase P - the correct path.
+
+  @param [in] uri The uri of the folder -eg /folders/folders/xxxx)
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
+
+  <h4> Related Macros </h4>
+  @li mfv_getpathuri.sas
+
+  @version 4
+  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
+**/
+%macro mfv_getfolderpath(uri
+)/*/STORE SOURCE*/;
+
+  %local fref rc path msg var /* var used to avoid delete timing issue */;
+  %let fref=%mf_getuniquefileref();
+  %if %quote(%substr(%str(&uri),1,17)) ne %quote(/folders/folders/)
+  %then %do;
+    %put &sysmacroname: Invalid URI: &uri;
+  %end;
+  %else %if %sysfunc(filename(fref,,filesrvc,folderuri="&uri" ))=0
+  %then %do;
+    %let var=_FILESRVC_&fref._URI;
+    %local fid ;
+    %let fid= %sysfunc(fopen(&fref,I));
+    %let msg=%quote(%sysfunc(sysmsg()));
+
+    %unquote(%scan(&msg,2,%str(,.)))
+
+    %let rc=%sysfunc(fclose(&fid));
+    %let rc=%sysfunc(filename(fref));
+    %symdel &var;
+  %end;
+  %else %do;
+    %put &sysmacroname: Not Found: &uri;
+    %let syscc=0;
+  %end;
+
+%mend mfv_getfolderpath ;/**
   @file
   @brief Returns the uri of a file or folder
   @details The automatic variable `_FILESRVC_[fref]_URI` is used after assigning
@@ -24221,6 +24280,10 @@ run;
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave &sysmacroname with syscc=&syscc
+  )
 %mend mfv_getpathuri;/**
   @file
   @brief Creates a file in SAS Drive using the API method
@@ -24318,6 +24381,11 @@ run;
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
   %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
@@ -24395,6 +24463,11 @@ run;
   ,mac=MV_CREATEFILE
   ,msg=%str(File &path/&name already exists and force=&force)
 )
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  mac=MV_CREATEFILE182
+  msg=syscc=&syscc after mfv_getpathuri
+)
 
 %if %mf_isblank(&fileuri)=0 and &force=YES %then %do;
   proc http method="DELETE" url="&base_uri&fileuri" &oauth_bearer;
@@ -24438,7 +24511,7 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
     "Authorization"="Bearer &&&access_token_var"
   %end;
   "Content-Disposition"=
-  %if "&ext"="SVG" %then %do;
+  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
     "filename=""&name"";"
   %end;
   %else %do;
@@ -24464,8 +24537,20 @@ data &outds;
   end;
 run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
+%put &sysmacroname: %trim(&base_uri)%mfv_getpathuri(&path/&name);
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put /SASJobExecution?_file=&path/&name;%put;
+
+%if &mdebug=0 %then %do;
+  /* clear refs */
+  filename &fname1 clear;
+  filename &fref clear;
+  libname &libref2 clear;
+%end;
+
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 
 %mend mv_createfile;/**
   @file mv_createfolder.sas
@@ -24515,6 +24600,11 @@ run;
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %if %mfv_existfolder(&path)=1 %then %do;
   %&dbg.put &sysmacroname: &path already exists;
   data &outds;
@@ -24524,6 +24614,7 @@ run;
   run;
   %return;
 %end;
+%mp_abort(iftrue=(&syscc ne 0),msg=syscc=&syscc when folder checking)
 
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
@@ -24577,6 +24668,17 @@ options noquotelenmax;
       headers "Authorization"="Bearer &&&access_token_var";
   %end;
   run;
+  %if &SYS_PROCHTTP_STATUS_CODE=401 %then %do;
+    /* relates to: https://github.com/sasjs/core/issues/400 */
+    %put 401 thrown in &sysmacroname;
+    %put sleeping: %sysfunc(sleep(12,1)) secs - will try again;
+    proc http method='GET' out=&fname1 &oauth_bearer
+        url="&base_uri/folders/folders/@item?path=&newpath";
+    %if &grant_type=authorization_code %then %do;
+        headers "Authorization"="Bearer &&&access_token_var";
+    %end;
+    run;
+  %end;
   %local libref1;
   %let libref1=%mf_getuniquelibref();
   libname &libref1 JSON fileref=&fname1;
@@ -24584,7 +24686,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=&sysmacroname
+    ,mac=mv_createfolder124
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -24633,7 +24735,7 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
       %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
     %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
@@ -24663,6 +24765,10 @@ options noquotelenmax;
   filename &fname1 clear;
   libname &libref1 clear;
 %end;
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 %mend mv_createfolder;/**
   @file
   @brief Creates a Viya Job
@@ -27228,7 +27334,7 @@ data _null_;
   uri=symget('uri');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l');
+    call symputx('errmsg',"URI is too short - "!!uri,'l');
   end;
   if scan(uri,-1)='state' or scan(uri,1) ne 'jobExecution' then do;
     call symputx('errflg',1);
@@ -27293,7 +27399,7 @@ data _null_;
   uri=symget('loglocation');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l');
+    call symputx('errmsg',"URI is too short - "!!uri,'l');
   end;
   else if (scan(uri,1,'/') ne 'compute' or scan(uri,2,'/') ne 'sessions')
     and (scan(uri,1,'/') ne 'files' or scan(uri,2,'/') ne 'files')
@@ -28381,6 +28487,8 @@ run;
     %if %mf_existvarList(&inds,FLOW_ID)=0 %then %do;
       retain FLOW_ID 0;
     %end;
+    /* https://github.com/sasjs/adapter/pull/845#issuecomment-2956589644 */
+    retain _omitSessionResults "false";
     set &inds;
     &dbg. putlog (_all_)(=);
   run;

base/mf_getuniquelibref.sas

@@ -26,7 +26,7 @@
   @author Allan Bowe
 **/
 
-%macro mf_getuniquelibref(prefix=mclib,maxtries=1000);
+%macro mf_getuniquelibref(prefix=mc,maxtries=1000);
   %local x;
 
   %if ( %length(&prefix) gt 7 ) %then %do;

base/mp_assertscope.sas

@@ -73,10 +73,6 @@
   ignorelist=,
   outds=work.test_results
 )/*/STORE SOURCE*/;
-%local ds test_result test_comments del add mod ilist;
-%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
-  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
-
 /**
   * this sets up the global vars, it will also enter STRICT mode.  If this
   * behaviour is not desired, simply initiate the following global macro
@@ -84,6 +80,10 @@
   */
 %mp_init()
 
+%local ds test_result test_comments del add mod ilist;
+%let ilist=%upcase(&sasjs_prefix._FUNCTIONS SYS_PROCHTTP_STATUS_CODE
+  SYS_PROCHTTP_STATUS_CODE SYS_PROCHTTP_STATUS_PHRASE &ignorelist);
+
 /* get current variables */
 %if &action=SNAPSHOT %then %do;
   proc sql;

base/mp_replace.sas

@@ -148,6 +148,6 @@ data _null_;
 run;
 
 /* END */
-%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;
+/* %put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) secs to run; */
 
 %mend mp_replace;

tests/viyaonly/mfv_getfolderpath.test.sas

@@ -0,0 +1,31 @@
+/**
+  @file
+  @brief Testing mfv_getfolderpath macro function
+
+  <h4> SAS Macros </h4>
+  @li mf_uid.sas
+  @li mfv_getfolderpath.sas
+  @li mfv_getpathuri.sas
+  @li mp_assert.sas
+  @li mv_createfolder.sas
+
+**/
+
+options mprint sgen;
+
+%let folder=%mf_uid();
+/* create a folder */
+%mv_createfolder(path=&mcTestAppLoc/&folder)
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=no errs on folder creation
+)
+
+%let uri=%mfv_getpathuri(&mcTestAppLoc/&folder);
+%put %mfv_getfolderpath(&uri);
+
+%mp_assert(
+  iftrue=("%mfv_getfolderpath(&uri)"="&mcTestAppLoc/&folder"),
+  desc=Check if correct folder was returned
+)
+

tests/viyaonly/mfv_getpathuri.test.sas

@@ -14,7 +14,7 @@ options mprint sgen;
 
 %let file=%mf_uid();
 
-/* create a folder */
+/* create a file */
 filename somefile temp;
 data _null_;
   file somefile;

tests/viyaonly/mv_getviyafileextparms.test.sas

@@ -0,0 +1,95 @@
+/**
+  @file
+  @brief Testing mv_getviyafileextparms macro
+
+  <h4> SAS Macros </h4>
+  @li mf_isBlank.sas
+  @li mp_assert.sas
+  @li mp_assertscope.sas
+  @li mv_getviyafileextparms.sas
+
+**/
+
+options mprint;
+
+%let mvarIgnoreList =
+  MC0_JADP1LEN MC0_JADP2LEN MC0_JADP3LEN MC0_JADPNUM MC0_JADVLEN;
+
+%put TEST 1 - Test with common extension, requesting only typeDefName parameter;
+%mp_assertscope(SNAPSHOT)
+%mv_getviyafileextparms(ext=txt, typeDefNameVar=viyaTypeDefName)
+%mp_assertscope(COMPARE
+  ,ignorelist=&mvarIgnoreList viyaTypeDefName
+)
+
+%mp_assert(
+  iftrue=(not %mf_isBlank(&viyaTypeDefName)),
+  desc=Check the requested macro variable viyaTypeDefName is not blank.
+)
+
+%put TEST 2 - Test with common extension, requesting only properties parameter;
+%mp_assertscope(SNAPSHOT)
+%mv_getviyafileextparms(ext=html, propertiesVar=viyaProperties)
+%mp_assertscope(COMPARE
+  ,ignorelist=&mvarIgnoreList viyaProperties
+)
+
+%mp_assert(
+  iftrue=(not %mf_isBlank(&viyaProperties)),
+  desc=Check the requested macro variable viyaProperties is not blank.
+)
+
+%put TEST 3 - Test with common extension, requesting only mediaType parameter;
+%mp_assertscope(SNAPSHOT)
+%mv_getviyafileextparms(ext=mp3, mediaTypeVar=viyaMediaType)
+%mp_assertscope(COMPARE
+  ,ignorelist=&mvarIgnoreList viyaMediaType
+)
+
+%mp_assert(
+  iftrue=(not %mf_isBlank(&viyaMediaType)),
+  desc=Check the requested macro variable viyaMediaType is not blank.
+)
+
+%put TEST 4 - Test with common extension, requesting all parameters;
+%mp_assertscope(SNAPSHOT)
+%mv_getviyafileextparms(
+  ext=css,
+  typeDefNameVar=cssViyaTypeDefName,
+  propertiesVar=cssViyaProperties,
+  mediaTypeVar=cssViyaMediaType
+  )
+%mp_assertscope(COMPARE
+  ,ignorelist=
+    &mvarIgnoreList cssViyaTypeDefName cssViyaProperties  cssViyaMediaType
+)
+
+%mp_assert(
+  iftrue=(not ( %mf_isBlank(&cssViyaTypeDefName) or
+                %mf_isBlank(&cssViyaProperties) or
+                %mf_isBlank(&cssViyaMediaType) ) ),
+  desc=Check a full set of requested macro variables are not blank.
+)
+
+
+%put TEST 5 - Test with invalid extension - requested parameters will be blank;
+%mp_assertscope(SNAPSHOT)
+%mv_getviyafileextparms(
+  ext=xxxINVALIDxxx,
+  typeDefNameVar=invalidTypeDefName,
+  propertiesVar=invalidProperties,
+  mediaTypeVar=invalidMediaType
+  )
+%mp_assertscope(COMPARE
+  ,ignorelist=
+    &mvarIgnoreList invalidTypeDefName invalidProperties invalidMediaType
+)
+
+%mp_assert(
+  iftrue=(
+    %mf_isBlank(&invalidTypeDefName) and
+    %mf_isBlank(&invalidProperties) and
+    %mf_isBlank(&invalidMediaType)
+    ),
+  desc=Check the requested macro variables are all blank.
+)

viya/mfv_existfolder.sas

@@ -33,16 +33,23 @@
     msg=Cannot enter mfv_existfolder.sas with syscc=&syscc
   )
 
-  %local fref rc;
+  %local fref rc var;
   %let fref=%mf_getuniquefileref();
 
   %if %sysfunc(filename(fref,,filesrvc,folderPath="&path"))=0 %then %do;
     1
+    %let var=_FILESRVC_&fref._URI;
     %let rc=%sysfunc(filename(fref));
+    %symdel &var;
   %end;
   %else %do;
     0
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave mfv_existfolder.sas with syscc=&syscc
+  )
+
 %mend mfv_existfolder;

viya/mfv_getfolderpath.sas

@@ -0,0 +1,53 @@
+/**
+  @file
+  @brief Returns the path of a folder from the URI
+  @details Makes use of the SYSMSG() ER8OR response, which resolves the uri,
+  seemingly without entering an er8or state.
+
+  Usage:
+
+      %mv_createfolder(path=/public/demo)
+      %let uri=%mfv_getpathuri(/public/demo);
+      %put %mfv_getfolderpath(&uri);
+
+  Notice above the new path has an uppercase P - the correct path.
+
+  @param [in] uri The uri of the folder -eg /folders/folders/xxxx)
+
+  <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
+
+  <h4> Related Macros </h4>
+  @li mfv_getpathuri.sas
+
+  @version 4
+  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
+**/
+%macro mfv_getfolderpath(uri
+)/*/STORE SOURCE*/;
+
+  %local fref rc path msg var /* var used to avoid delete timing issue */;
+  %let fref=%mf_getuniquefileref();
+  %if %quote(%substr(%str(&uri),1,17)) ne %quote(/folders/folders/)
+  %then %do;
+    %put &sysmacroname: Invalid URI: &uri;
+  %end;
+  %else %if %sysfunc(filename(fref,,filesrvc,folderuri="&uri" ))=0
+  %then %do;
+    %let var=_FILESRVC_&fref._URI;
+    %local fid ;
+    %let fid= %sysfunc(fopen(&fref,I));
+    %let msg=%quote(%sysfunc(sysmsg()));
+
+    %unquote(%scan(&msg,2,%str(,.)))
+
+    %let rc=%sysfunc(fclose(&fid));
+    %let rc=%sysfunc(filename(fref));
+    %symdel &var;
+  %end;
+  %else %do;
+    %put &sysmacroname: Not Found: &uri;
+    %let syscc=0;
+  %end;
+
+%mend mfv_getfolderpath ;

viya/mfv_getpathuri.sas

@@ -49,4 +49,8 @@
     %let syscc=0;
   %end;
 
+  %mf_abort(
+    iftrue=(&syscc ne 0),
+    msg=Cannot leave &sysmacroname with syscc=&syscc
+  )
 %mend mfv_getpathuri;

viya/mv_createfile.sas

@@ -69,6 +69,7 @@
   @li mp_base64copy.sas
   @li mp_replace.sas
   @li mv_createfolder.sas
+  @li mv_getviyafileextparms.sas
 
   <h4> Related Macros</h4>
   @li mv_createfile.sas
@@ -95,6 +96,11 @@
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
   %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
@@ -148,7 +154,7 @@
 
 options noquotelenmax;
 %local base_uri; /* location of rest apis */
-%let base_uri=%mf_getplatform(VIYARESTAPI);
+%let base_uri=%trim(%mf_getplatform(VIYARESTAPI));
 
 /* create folder if it does not already exist */
 %local folderds self_uri;
@@ -167,11 +173,16 @@ run;
 /* abort or delete if file already exists */
 %let force=%upcase(&force);
 %local fileuri ;
-%let fileuri=%mfv_getpathuri(&path/&name);
+%let fileuri=%trim(%mfv_getpathuri(&path/&name));
 %mp_abort(iftrue=(%mf_isblank(&fileuri)=0 and &force ne YES)
   ,mac=MV_CREATEFILE
   ,msg=%str(File &path/&name already exists and force=&force)
 )
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  mac=MV_CREATEFILE182
+  msg=syscc=&syscc after mfv_getpathuri
+)
 
 %if %mf_isblank(&fileuri)=0 and &force=YES %then %do;
   proc http method="DELETE" url="&base_uri&fileuri" &oauth_bearer;
@@ -191,6 +202,12 @@ run;
 %let url=&base_uri/files/files?parentFolderUri=&self_uri;
 %let ext=%upcase(%scan(&name,-1,.));
 
+/* Get Viya file-extension details into some macro variables */
+%mv_getViyaFileExtParms(&ext
+                        ,propertiesVar=viyaProperties
+                        ,typeDefNameVar=viyaTypeDefName
+                        ,mdebug=&mdebug);
+
 /* fetch job info */
 %local fname1;
 %let fname1=%mf_getuniquefileref();
@@ -202,12 +219,18 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
   %else %do;
     ct="&ctype"
   %end;
-  %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+
-  or "&ext"="SVG" %then %do;
+  %if not %mf_isBlank(&viyaTypeDefName) %then %do;
-    url="&url%str(&)typeDefName=file";
+    url="&url%str(&)typeDefName=&viyaTypeDefName";
   %end;
   %else %do;
-    url="&url";
+    %if "&ext"="HTML" or "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG"
+    or "&ext"="SVG" %then %do;
+      url="&url%str(&)typeDefName=file";
+    %end;
+    %else %do;
+      url="&url";
+    %end;
   %end;
 
   headers "Accept"="application/json"
@@ -215,7 +238,7 @@ proc http method='POST' out=&fname1 &oauth_bearer in=&fref
     "Authorization"="Bearer &&&access_token_var"
   %end;
   "Content-Disposition"=
-  %if "&ext"="SVG" %then %do;
+  %if "&ext"="SVG" or "&ext"="HTML" %then %do;
     "filename=""&name"";"
   %end;
   %else %do;
@@ -229,19 +252,68 @@ run;
   ,mac=MV_CREATEFILE
   ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
 )
-%local libref2;
-%let libref2=%mf_getuniquelibref();
-libname &libref2 JSON fileref=&fname1;
-/* Grab the follow on link */
-data &outds;
-  set &libref2..links end=last;
-  if rel='createChild' then do;
-    call symputx('href',quote(cats("&base_uri",href)),'l');
-    &dbg put (_all_)(=);
-  end;
-run;
 
-%put &sysmacroname: &name created at %mfv_getpathuri(&path/&name);%put;
+/* URI of the created file */
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+
+/* If properties were found then patch the file to include them */
+%if not %mf_isBlank(&viyaProperties) %then %do;
+  /* Wrap the properties object in a root object also containing the file name */
+  %local viyapatch;
+  %let viyapatch = %sysfunc(pathname(work))/%mf_getuniquename(prefix=patch_json_);
+  data _null_;
+    length line $32767;
+    file "&viyapatch" lrecl=32767;
+    put '{ "name": "' "&name" '",';
+    line = cat('"properties": ',symget("viyaProperties"));
+    put line;
+    put '}';
+    stop;
+  run;
+
+  %if &mdebug=1 %then %do;
+    data _null_;
+      if (_n_ eq 1) then put 'DEBUG: ** PATCH JSON **';
+      infile "&viyapatch" end=last;
+      input;
+      put _infile_;
+    run;
+  %end;
+
+  /* And apply the properties to the newly created file, using the PATCH method */
+  %let fref=%mf_getuniquefileref();
+  filename &fref "&viyapatch";
+  %let url=&base_uri&fileuri;
+
+  proc http method='PATCH' oauth_bearer=sas_services in=&fref
+    url="&url";
+    headers "Accept"="application/json"
+            "Content-Type"="application/json"
+            "If-Match"="*";
+    %if &mdebug=1 %then %do;
+      debug level=2;
+    %end;
+  run;
+  %if &mdebug=1 %then %put &sysmacroname PATCH &=url
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
+  %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 200)
+    ,mac=MV_CREATEFILE
+    ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
+  )
+%end;
+
+%put &sysmacroname: &base_uri&fileuri;
+%put /SASJobExecution?_file=&path/&name;%put;
+
+%if &mdebug=0 %then %do;
+  /* clear refs */
+  filename &fname1 clear;
+  filename &fref clear;
+%end;
+
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 
 %mend mv_createfile;

viya/mv_createfolder.sas

@@ -46,6 +46,11 @@
 %end;
 %else %let dbg=*;
 
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot enter &sysmacroname with syscc=&syscc
+)
+
 %if %mfv_existfolder(&path)=1 %then %do;
   %&dbg.put &sysmacroname: &path already exists;
   data &outds;
@@ -55,6 +60,7 @@
   run;
   %return;
 %end;
+%mp_abort(iftrue=(&syscc ne 0),msg=syscc=&syscc when folder checking)
 
 %local oauth_bearer;
 %if &grant_type=detect %then %do;
@@ -108,6 +114,17 @@ options noquotelenmax;
       headers "Authorization"="Bearer &&&access_token_var";
   %end;
   run;
+  %if &SYS_PROCHTTP_STATUS_CODE=401 %then %do;
+    /* relates to: https://github.com/sasjs/core/issues/400 */
+    %put 401 thrown in &sysmacroname;
+    %put sleeping: %sysfunc(sleep(12,1)) secs - will try again;
+    proc http method='GET' out=&fname1 &oauth_bearer
+        url="&base_uri/folders/folders/@item?path=&newpath";
+    %if &grant_type=authorization_code %then %do;
+        headers "Authorization"="Bearer &&&access_token_var";
+    %end;
+    run;
+  %end;
   %local libref1;
   %let libref1=%mf_getuniquelibref();
   libname &libref1 JSON fileref=&fname1;
@@ -115,7 +132,7 @@ options noquotelenmax;
     iftrue=(
       &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 404
     )
-    ,mac=&sysmacroname
+    ,mac=mv_createfolder124
     ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
   )
   %if &mdebug=1 %then %do;
@@ -164,7 +181,7 @@ options noquotelenmax;
                 'Content-Type'='application/vnd.sas.content.folder+json'
                 'Accept'='application/vnd.sas.content.folder+json';
     run;
-    %if &SYS_PROCHTTP_STATUS_CODE ne 200 %then %do;
+    %if &SYS_PROCHTTP_STATUS_CODE ne 201 %then %do;
       %put &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
     %end;
     %mp_abort(iftrue=(&SYS_PROCHTTP_STATUS_CODE ne 201)
@@ -194,4 +211,8 @@ options noquotelenmax;
   filename &fname1 clear;
   libname &libref1 clear;
 %end;
+%mp_abort(
+  iftrue=(&syscc ne 0),
+  msg=Cannot leave &sysmacroname with syscc=&syscc
+)
 %mend mv_createfolder;

viya/mv_getjoblog.sas

@@ -126,7 +126,7 @@ data _null_;
   uri=symget('uri');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l');
+    call symputx('errmsg',"URI is too short - "!!uri,'l');
   end;
   if scan(uri,-1)='state' or scan(uri,1) ne 'jobExecution' then do;
     call symputx('errflg',1);
@@ -191,7 +191,7 @@ data _null_;
   uri=symget('loglocation');
   if length(uri)<12 then do;
     call symputx('errflg',1);
-    call symputx('errmsg',"URI is invalid (too short) - '&uri'",'l');
+    call symputx('errmsg',"URI is too short - "!!uri,'l');
   end;
   else if (scan(uri,1,'/') ne 'compute' or scan(uri,2,'/') ne 'sessions')
     and (scan(uri,1,'/') ne 'files' or scan(uri,2,'/') ne 'files')

viya/mv_getviyafileextparms.sas

@@ -0,0 +1,179 @@
+/**
+  @file mv_getviyafileextparms.sas
+  @brief Reads the VIYA file-extension type definition and returns selected
+    values in SAS macro variables
+
+  @details Content is derived from the following endpoint:
+    "https://<srv>/types/types?filter=contains(extensions,'<some ext>')"
+
+  @param [in] ext File extension to retrieve property info for.
+  @param [out] propertiesVar= SAS macro variable name that will contain
+    the 'properties' object json, if found, else blank.
+  @param [out] typeDefNameVar= SAS macro variable name that will contain
+    the 'typeDefName' property value, if found, else blank.
+  @param [out] mediaTypeVar= SAS macro variable name that will contain
+    the 'mediaType' property value, if found, else blank.
+  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+
+  <h4> SAS Macros </h4>
+  @li mf_abort.sas
+  @li mf_existds.sas
+  @li mf_getplatform.sas
+  @li mf_getuniquefileref.sas
+  @li mf_getuniquename.sas
+  @li mf_getvalue.sas
+  @li mf_getvarlist.sas
+  @li mf_getvartype.sas
+
+*/
+
+%macro mv_getViyaFileExtParms(ext,typeDefNameVar=,propertiesVar=,mediaTypeVar=,mdebug=0);
+  %local base_uri; /* location of rest apis */
+  %local viyatypedef; /* temp fileref to json response */
+  %local url; /* File extension info end-point */
+
+  %mf_abort(iftrue=(%mf_isBlank(&ext))
+    ,msg=%str(MV_GETVIYAFILEEXTPARMS - No file extension provided.)
+  );
+
+  %mf_abort(iftrue=(%mf_isBlank(&typeDefNameVar) and
+                    %mf_isBlank(&propertiesVar) and
+                    %mf_isBlank(&mediaTypeVar))
+    ,msg=%str(MV_GETVIYAFILEEXTPARMS - No parameter was requested.)
+  );
+
+  /* Declare requested parameters as global macro vars and initialize blank */
+  %if not %mf_isBlank(&typeDefNameVar) %then %do;
+    %global &typeDefNameVar;
+    %let &typeDefNameVar = %str();
+  %end;
+  %if not %mf_isBlank(&propertiesVar) %then %do;
+    %global &propertiesVar;
+    %let &propertiesVar = %str();
+  %end;
+  %if not %mf_isBlank(&mediaTypeVar) %then %do;
+    %global &mediaTypeVar;
+    %let &mediaTypeVar = %str();
+  %end;
+
+  %let base_uri=%mf_getplatform(VIYARESTAPI);
+  %if &mdebug=1 %then %do;
+    %put DEBUG: &SYSMACRONAME &=base_uri;
+  %end;
+
+  %let ext=%lowcase(&ext);
+
+  /* Create a temp file and fill with JSON that declares */
+  /* VIYA file-type details for the given file extension */
+  %let viyatypedef=%mf_getuniquefileref();
+  filename &viyatypedef temp;
+
+  %let url = &base_uri/types/types?filter=contains(extensions,%str(%')&ext%str(%'));
+
+  proc http oauth_bearer=sas_services out=&viyatypedef
+    url="&url";
+  run;
+
+  %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=url
+    &=SYS_PROCHTTP_STATUS_CODE &=SYS_PROCHTTP_STATUS_PHRASE;
+
+  %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. */
+    %put INFO: &sysmacroname A response was not returned.;
+    filename &viyatypedef clear;
+    %return;
+  %end;
+
+  %if &mdebug=1 %then %do;
+    data _null_;
+        infile &viyatypedef;
+        input;
+        put "DEBUG: &SYSMACRONAME" _infile_;
+    run;
+  %end;
+
+  /* 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 jsonlib=%mf_getuniquelibref(prefix=json);
+    /* And point a libname at it */
+  %let opt_dlcreatedir = %sysfunc(getoption(dlcreatedir));
+  options dlcreatedir; libname &jsonlib "&jsonworkfolder"; options &opt_dlcreatedir;
+
+  /* Read the json output once and copy datasets to its work folder */
+  %local libref1;
+  %let libref1=%mf_getuniquelibref();
+  libname &libref1 JSON fileref=&viyatypedef automap=create;
+  proc copy in=&libref1 out=&jsonlib; run;
+
+  /* Populate typeDefName, if requested */
+  %if (not %mf_isBlank(&typeDefNameVar)) %then %do;
+    %let &typeDefNameVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="name"));
+    %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
+  %end;
+
+  /* Populate mediaType, if requested */
+  %if (not %mf_isBlank(&mediaTypeVar)) %then %do;
+    %let &mediaTypeVar = %mf_getvalue(&jsonlib..alldata,value,filter=%quote(p1="items" and p2="mediaType"));
+    %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
+  %end;
+
+  /* Populate properties macro variable, if requested */
+  %if not %mf_isBlank(&propertiesVar) %then %do;
+    /* Check for the items_properties table */
+    %if ( not %mf_existds(&jsonlib..ITEMS_PROPERTIES) ) %then %do;
+      %let &propertiesVar = %str();
+      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME - No Viya properties found for file suffix %str(%')&ext%str(%');
+    %end;
+    %else %do;
+      /* Properties potentially span multiple rows in the ITEMS_PROPERTIES table */
+      /* First remove some unwanted variables from the items_properties dataset. */
+      %let dsTemplate=%mf_getuniquename(prefix=dsTemplate_);
+      data work.&dsTemplate;
+        stop;
+        set &jsonlib..ITEMS_PROPERTIES(drop=ordinal:);
+      run;
+
+      /* Retrieve the names of the remaining variables */
+      /* These are the names of the properties. */
+      %let varlist = %mf_getvarlist(work.&dsTemplate);
+      %if &mdebug %then %put DEBUG: &SYSMACRONAME &=varlist;
+
+      %let &propertiesVar = %quote({);
+
+      %let nvars = %sysfunc(countw(&varlist));
+      %do i = 1 %to &nvars;
+        /* Use the name of each variable in the dataset as the property 'key' */
+        %let key = %scan(&varlist,&i);
+        %let value = %mf_getvalue(&jsonlib..ITEMS_PROPERTIES,&key);
+        /* The data type determines if value should be quoted in the output*/
+        %if %mf_getvartype(&jsonlib..ITEMS_PROPERTIES,&key) = C %then %do;
+          %let value = "&value";
+        %end;
+        /* Transform the character '_', to '.' if found in the key */
+        %let key = %sysfunc(translate(&key,.,_));
+        /* Build the line to output */
+        %let line="&key": &value;
+        /* ...adding a comma to all but the final line in the object */
+        %if &i < &nvars %then %let line = &line%str(,);
+        %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME line=%quote(&line);
+        %let &propertiesVar = &&&propertiesVar %quote(&line);
+      %end;
+      /* Close off the properties object */
+      %let &propertiesVar = &&&propertiesVar %quote(});
+      %if &mdebug=1 %then %put DEBUG: &SYSMACRONAME &=propertiesVar &propertiesVar=&&&propertiesVar;
+    %end;
+
+  %end;
+
+  %if &mdebug=0 %then %do;
+    proc datasets library=&jsonlib nolist kill; quit;
+    libname &jsonlib clear;
+  %end;
+
+  libname &libref1 clear;
+  filename &viyatypedef clear;
+
+%mend;

viya/mv_jobflow.sas

@@ -188,6 +188,8 @@
     %if %mf_existvarList(&inds,FLOW_ID)=0 %then %do;
       retain FLOW_ID 0;
     %end;
+    /* https://github.com/sasjs/adapter/pull/845#issuecomment-2956589644 */
+    retain _omitSessionResults "false";
     set &inds;
     &dbg. putlog (_all_)(=);
   run;