Merge pull request #413 from sasjs/issue412

fix: adding uri to length statement in mv_deletejes

Closes #412

.github/workflows/run-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/hydrogen]
+        node-version: [lts/iron]
 
     steps:
       - uses: actions/checkout@v2
@@ -73,6 +73,8 @@ jobs:
 
       - name: Build & Deploy Project to SAS server
         run: npx @sasjs/cli cbd -t server
+        env:
+          macroCorePath: .
 
       - name: Run all tests
         run: npx @sasjs/cli test -t server
@@ -84,3 +86,4 @@ jobs:
           SAS_PASSWORD: ${{secrets.SAS_PASSWORD}}
           ACCESS_TOKEN: ${{secrets.ACCESS_TOKEN}}
           REFRESH_TOKEN: ${{secrets.REFRESH_TOKEN}}
+

.gitpod.dockerfile

@@ -1,6 +0,0 @@
-FROM gitpod/workspace-full
-
-RUN sudo apt-get update \
- && sudo apt-get install -y doxygen \
- && sudo apt-get install -y graphviz \
- && sudo rm -rf /var/lib/apt/lists/*

.gitpod.yml

@@ -1,27 +0,0 @@
-tasks:
-  - init: npm install -g npm
-  - command: npm i
-  - command: npm i -g @sasjs/cli
-
-image:
-  file: .gitpod.dockerfile
-vscode:
-  extensions:
-    - sasjs.sasjs-for-vscode
-
-github:
-  prebuilds:
-    # enable for the master/default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: false
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
-    addComment: true
-    # add a "Review in Gitpod" button to pull requests (defaults to false)
-    addBadge: false
-    # add a label once the prebuild is ready to pull requests (defaults to false)
-    addLabel: prebuilt-in-gitpod

.npmignore

@@ -1,6 +1,5 @@
 all.sas
 build.py
-.gitpod*
 tests/
 sasjs/
 .github/

.npmrc

@@ -0,0 +1 @@
+ignore-scripts=true

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.
@@ -220,12 +213,13 @@ When contributing to this library, it is therefore important to ensure that all
 
 We are currently on major release v4.  Breaking changes should be marked with the [deprecated](https://www.doxygen.nl/manual/commands.html#cmddeprecated) doxygen tag.  The following changes are planned when the next major/breaking release (v5) becomes necessary:
 
-* mf_getuniquelibref.sas to have the deprecated maxtried parameter removed (no longer needed)
-* mp_testservice.sas to be renamed as mp_execute.sas (as it doesn't actually test anything)
-* `insert_cmplib` option of mcf_xxx macros will be deprecated (the option is now checked automatically with value inserted only if needed)
+* mcf_xxx macros to have `insert_cmplib` option deprecated (the option is now checked automatically with value inserted only if needed)
 * mcf_xxx macros to have `wrap=` option defaulted to YES for convenience.  Set this option explicitly to avoid issues.
-* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros).  A wrapper macro is already in place, and you are able to use this immediately.  The default for SHOWLOG will also be YES instead of NO.
+* mf_getuniquelibref.sas to have the deprecated maxtries parameter removed (no longer needed)
+* mp_abort.sas will have the redundant type= parameter removed.
 * mp_coretable.sas will be replaced by the standalone macros in the `ddl` folder (which are already available)
+* mp_getddl.sas to be renamed to mp_ds2ddl.sas (consistent with other ds2xxx macros).  A wrapper macro is already in place, and you are able to use this immediately.  The default for SHOWLOG will also be YES instead of NO.
+* mp_testservice.sas to be renamed as mp_execute.sas (as it doesn't actually test anything)
 
 ## Star Gazing
 

all.sas

@@ -4002,10 +4002,6 @@ run;
   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
@@ -4013,6 +4009,10 @@ run;
   */
 %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;
@@ -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;
 /**
@@ -13859,6 +13859,7 @@ run;
   @li mf_islibds.sas
   @li mf_wordsinstr1butnotstr2.sas
   @li mp_abort.sas
+  @li mp_ds2squeeze.sas
 
   <h4> Related Macros </h4>
   @li mddl_dc_difftable.sas
@@ -24098,12 +24099,14 @@ 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
@@ -24353,6 +24356,7 @@ run;
   @li mp_base64copy.sas
   @li mp_replace.sas
   @li mv_createfolder.sas
+  @li mv_getviyafileextparms.sas
 
   <h4> Related Macros</h4>
   @li mv_createfile.sas
@@ -24437,7 +24441,7 @@ run;
 
 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;
@@ -24456,11 +24460,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;
@@ -24478,7 +24487,13 @@ run;
 
 %local url mimetype ext;
 %let url=&base_uri/files/files?parentFolderUri=&self_uri;
-%let ext=%upcase(%scan(&name,-1,.));
+%let ext=%upcase(%trim(%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;
@@ -24491,12 +24506,23 @@ 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;
-    url="&url%str(&)typeDefName=file";
+
+  /* typeDefName */
+  %if not %mf_isBlank(&viyaTypeDefName) %then %do;
+    url="&url%str(&)typeDefName=&viyaTypeDefName";
   %end;
   %else %do;
-    url="&url";
+    %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do;
+      url="&url%str(&)typeDefName=file_html";
+    %end;
+    %else %do;
+      %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do;
+        url="&url%str(&)typeDefName=file_%lowcase(&ext)";
+      %end;
+      %else %do;
+        url="&url";
+      %end;
+    %end;
   %end;
 
   headers "Accept"="application/json"
@@ -24518,6 +24544,7 @@ 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;
@@ -24525,13 +24552,61 @@ libname &libref2 JSON fileref=&fname1;
 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;
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+/* URI of the created file */
+%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+
+/* 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 */
+  %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 */
@@ -24664,7 +24739,7 @@ options noquotelenmax;
   %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(10,1)) - will try once more;
+    %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;
@@ -24728,7 +24803,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)
@@ -26352,7 +26427,8 @@ libname &libref1a JSON fileref=&fname1a;
 %let found=0;
 /* %put Getting object uri from &libref1a..items; */
 data _null_;
-  length contenttype name $1000;
+  length contenttype name uri $1000;
+  call missing(of _all_);
   set &libref1a..items;
   if contenttype='jobDefinition' and upcase(name)="%upcase(&name)" then do;
     call symputx('uri',cats("&base_uri",uri),'l');
@@ -28104,6 +28180,254 @@ filename &fname1 clear;
 libname &libref1 clear;
 
 %mend mv_getusers;/**
+  @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://${serverUrl}/types/types?limit=999999"
+
+  @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 [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse)
+    Library.name of the dataset to receive the local working copy of the initial
+    response that requests all file extension details. Created once per session
+    to avoid multiple api calls.
+  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+
+  <h4> SAS Macros </h4>
+  @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
+  @li mf_isblank.sas
+  @li mf_nobs.sas
+  @li mp_abort.sas
+
+**/
+
+%macro mv_getViyaFileExtParms(
+  ext,
+  typeDefNameVar=,
+  propertiesVar=,
+  mediaTypeVar=,
+  viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse,
+  mdebug=0
+  );
+  %local base_uri; /* location of rest apis */
+  %local url; /* File extension info end-point */
+
+  %mp_abort(
+    iftrue=(%mf_isBlank(&ext))
+    ,msg=%str(No file extension provided.)
+    ,mac=MV_GETVIYAFILEEXTPARMS
+  );
+
+  %mp_abort(
+    iftrue=(%mf_isBlank(&typeDefNameVar) and
+            %mf_isBlank(&propertiesVar) and
+            %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;
+    %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: &=base_uri;
+  %end;
+
+  %let ext=%lowcase(&ext);
+
+  /* Create a local copy of the Viya response containing all file type info, if
+  it does not already exist. */
+  %if not %mf_existds(&viyaFileExtRespLibDs) %then %do;
+    /* Create a temp file and fill with JSON that declares */
+    /* VIYA file-type details for the given file extension */
+    %local viyatypedefs;
+    %let viyatypedefs=%mf_getuniquefileref();
+    filename &viyatypedefs temp;
+
+    %let url = &base_uri/types/types?limit=999999;
+
+    proc http oauth_bearer=sas_services out=&viyatypedefs
+      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 File extension details were not retrieved.;
+      filename &viyatypedefs clear;
+      %return;
+    %end;
+
+    %if &mdebug=1 %then %do;
+      /* Dump the response to the log */
+      data _null_;
+        length line $120;
+        null=byte(0);
+        infile &viyatypedefs dlm=null lrecl=120 recfm=n;
+        input line $120.;
+        if _n_ = 1 then put "DEBUG:";
+        put line;
+      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=&viyatypedefs automap=create;
+    proc copy in=&libref1 out=&jsonlib; run;
+
+    libname &libref1 clear;
+
+    /* Now give all rows belonging to the same items array a grouping value */
+    data &viyaFileExtRespLibDs;
+      length _viyaItemIdx 8;
+      set &jsonlib..alldata;
+      retain _viyaItemIdx 0;
+      /* Increment the row group index when a new 'items' group is observed */
+      if P=1 and P1='items' then _viyaItemIdx + 1;
+    run;
+
+    %if &mdebug=0 %then %do;
+      /* Tidy up, unless debug=1 */
+      proc datasets library=&jsonlib nolist kill; quit;
+      libname &jsonlib clear;
+    %end;
+
+    filename &viyatypedefs clear;
+
+  %end; /* If initial filetype query response didn't exist */
+
+  /* Find the row-group for the current file extension */
+  %local itemRowGroup;
+  %let itemRowGroup =
+    %mf_getValue(
+      &viyaFileExtRespLibDs
+      ,_viyaItemIdx
+      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
+    );
+
+  %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".;
+    %return;
+  %end;
+
+  /* Filter the cached response data down to the required file extension */
+  %local dsItems;
+  %let dsItems = %mf_getuniquename(prefix=dsItems_);
+  data work.&dsItems;
+    set &viyaFileExtRespLibDs;
+    where _viyaItemIdx = &itemRowGroup;
+  run;
+
+  /* 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;
+  %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;
+  %end;
+
+  /* Populate properties macro variable, if requested */
+  %if not %mf_isBlank(&propertiesVar) %then %do;
+
+    /* Filter dsItems down to the properties */
+    %local dsProperties;
+    %let dsProperties = %mf_getuniquename(prefix=dsProperties_);
+    data work.&dsProperties ( rename=(p3 = propertyName) );
+        set work.&dsItems;
+        where p2="properties" and v=1;
+    run;
+
+    /* 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(%');
+    %end;
+    %else %do;
+      /* Properties potentially span multiple rows in the input table */
+      data _null_;
+        length
+          line $32767
+          properties $32767
+        ;
+        retain properties;
+        set &dsProperties end=last;
+        if _n_ = 1 then properties = '{';
+
+        line = cats(quote(trim(propertyName)),':');
+        /* Only strings and bools appear in properties */
+        if value not in ("true","false") then value = quote(trim(value));
+        line = catx(' ',line,value);
+        /* Add a comma separator to all except the last line */
+        if not last then line = cats(line,',');
+
+        /* Add this line to the output value */
+        properties = catx(' ',properties,line);
+
+        if last then do;
+          /* Close off the properties object and output to the macro variable */
+          properties=catx(' ',properties,'}');
+          call symputx("&propertiesVar",properties);
+        end;
+      run;
+
+      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
+    %end;
+
+  %end;
+
+%mend mv_getViyaFileExtParms;
+/**
   @file
   @brief Executes a SAS Viya Job
   @details Triggers a SAS Viya Job, with optional URL parameters, using
@@ -30587,6 +30911,117 @@ endsub;
 %end;
 
 %mend mcf_string2file;/**
+  @file mx_createjob.sas
+  @brief Create a job in SAS 9, Viya or SASjs
+  @details Creates a Stored Process in SAS 9, a Job Execution Service in SAS
+  Viya, or a Stored Program on SASjs Server - depending on the executing
+  environment.
+
+Usage:
+
+    %* compile macros ;
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+    %inc mc;
+
+    %* write some code;
+    filename ft15f001 temp;
+    parmcards4;
+        data example1;
+          set sashelp.class;
+        run;
+    ;;;;
+
+    %* create the job;
+    %mx_createjob(path=/Public/app/jobs,name=myjob,replace=YES)
+
+  <h4> SAS Macros </h4>
+  @li mf_getplatform.sas
+  @li mm_createstp.sas
+  @li ms_createfile.sas
+  @li mv_createjob.sas
+
+  @param [in,out] path= The full folder path where the job will be created
+  @param [in,out] name= Job name.  Avoid spaces.
+  @param [in] desc= The description of the job (optional)
+  @param [in] precode= Space separated list of filerefs, pointing to the code
+    that needs to be attached to the beginning of the job (optional)
+  @param [in] code= (ft15f001) Space seperated fileref(s) of the actual code to
+    be added
+  @param [in] replace= (YES) Select YES to replace any existing job in that
+    location
+  @param [in] mDebug= (0) set to 1 to show debug messages in the log
+
+  @author Allan Bowe
+
+  <h4> Related Macros </h4>
+  @li mx_createjob.test.sas
+  @li mx_createwebservice.sas
+
+**/
+
+%macro mx_createjob(path=HOME
+    ,name=initJob
+    ,precode=
+    ,code=ft15f001
+    ,desc=This job was created by the mx_createjob macro
+    ,replace=YES
+    ,mdebug=0
+)/*/STORE SOURCE*/;
+
+%if &syscc ge 4 %then %do;
+  %put syscc=&syscc - &sysmacroname will not execute in this state;
+  %return;
+%end;
+
+/* combine precode and code into a single file */
+%local tempref x fref freflist;
+%let tempref=%mf_getuniquefileref();
+%local work tmpfile;
+%let work=%sysfunc(pathname(work));
+%let tmpfile=&tempref..sas;
+filename &tempref "&work/&tmpfile";
+%let freflist=&precode &code ;
+%do x=1 %to %sysfunc(countw(&freflist));
+  %let fref=%scan(&freflist,&x);
+  %put &sysmacroname: adding &fref;
+  data _null_;
+    file &tempref lrecl=3000 termstr=crlf mod;
+    infile &fref lrecl=3000;
+    input;
+    put _infile_;
+  run;
+%end;
+
+%local platform; %let platform=%mf_getplatform();
+%if &platform=SASVIYA %then %do;
+  %if "&path"="HOME" %then %let path=/Users/&sysuserid/My Folder;
+  %mv_createjob(path=&path
+    ,name=&name
+    ,code=&tempref
+    ,desc=&desc
+    ,replace=&replace
+  )
+%end;
+%else %if &platform=SASJS %then %do;
+  %if "&path"="HOME" %then %let path=/Users/&_sasjs_username/My Folder;
+  %ms_createfile(&path/&name..sas
+    ,inref=&tempref
+    ,mdebug=&mdebug
+  )
+%end;
+%else %do;
+  %if "&path"="HOME" %then %let path=/User Folders/&_METAPERSON/My Folder;
+  %mm_createstp(stpname=&name
+    ,filename=&tmpfile
+    ,directory=&work
+    ,tree=&path
+    ,stpdesc=&desc
+    ,mDebug=&mdebug
+  )
+%end;
+filename &tempref clear;
+%mend mx_createjob;
+/**
   @file mx_createwebservice.sas
   @brief Create a web service in SAS 9, Viya or SASjs
   @details Creates a SASJS ready Stored Process in SAS 9, a Job Execution
@@ -30636,6 +31071,9 @@ Usage:
 
   @author Allan Bowe
 
+  <h4> Related Macros </h4>
+  @li mx_createjob.sas
+
 **/
 
 %macro mx_createwebservice(path=HOME

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;

base/mp_stripdiffs.sas

@@ -36,6 +36,7 @@
   @li mf_islibds.sas
   @li mf_wordsinstr1butnotstr2.sas
   @li mp_abort.sas
+  @li mp_ds2squeeze.sas
 
   <h4> Related Macros </h4>
   @li mddl_dc_difftable.sas

sasjs/sasjsconfig.json

@@ -5,7 +5,10 @@
     "ddl",
     "fcmp",
     "lua",
+    "meta",
+    "metax",
     "server",
+    "viya",
     "xplatform",
     "tests/base",
     "tests/ddlonly",
@@ -42,7 +45,6 @@
         "deployScripts": []
       },
       "macroFolders": [
-        "viya",
         "tests/viyaonly"
       ],
       "contextName": "SAS Job Execution compute context"
@@ -56,8 +58,6 @@
       },
       "appLoc": "/Shared Data/temp/macrocore",
       "macroFolders": [
-        "meta",
-        "metax",
         "tests/sas9only"
       ],
       "programFolders": [],
@@ -82,7 +82,6 @@
         "deployScripts": []
       },
       "macroFolders": [
-        "server",
         "tests/serveronly"
       ]
     },

tests/viyaonly/mv_getviyafileextparms.test.sas

@@ -0,0 +1,96 @@
+/**
+  @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
+  SASJSPROCESSMODE SASJS_STPSRV_HEADER_LOC;
+
+%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(%superq(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(%superq(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(%superq(invalidProperties)) and
+    %mf_isBlank(&invalidMediaType)
+    ),
+  desc=Check the requested macro variables are all blank.
+)

tests/x-platform/mx_createjob.test.sas

@@ -0,0 +1,304 @@
+/**
+  @file
+  @brief Testing mx_createjob.sas macro
+
+  Be sure to run <code>%let mcTestAppLoc=/Public/temp/macrocore;</code> when
+  running in Studio
+
+  <h4> SAS Macros </h4>
+  @li mx_createjob.sas
+  @li mp_assert.sas
+  @li mf_getuniquefileref.sas
+  @li mp_assertscope.sas
+
+**/
+
+/**
+  * Test 1 - Basic job creation with default parameters
+  * Also checking for scope leakage
+  */
+filename ft15f001 temp;
+parmcards4;
+  data example1;
+    set sashelp.class;
+  run;
+  %put Job executed successfully;
+;;;;
+%mp_assertscope(SNAPSHOT)
+%mx_createjob(path=&mcTestAppLoc/jobs,name=testjob1,replace=YES)
+%mp_assertscope(COMPARE)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 1: No errors after basic job creation,
+  outds=work.test_results
+)
+
+/**
+  * Test 2 - Job creation with custom description
+  */
+filename ft15f001 temp;
+parmcards4;
+  data example2;
+    set sashelp.cars;
+  run;
+;;;;
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob2,
+  desc=Custom job description for testing,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 2: Job created with custom description,
+  outds=work.test_results
+)
+
+/**
+  * Test 3 - Job creation with precode
+  */
+filename precode1 temp;
+data _null_;
+  file precode1;
+  put '%let testvar=PreCodeValue;';
+  put '%put &=testvar;';
+run;
+
+filename ft15f001 temp;
+parmcards4;
+  data example3;
+    set sashelp.class;
+    precode_var="&testvar";
+  run;
+;;;;
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob3,
+  precode=precode1,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 3: Job created with precode parameter,
+  outds=work.test_results
+)
+
+filename precode1 clear;
+
+/**
+  * Test 4 - Job creation with multiple code filerefs
+  */
+%let code1=%mf_getuniquefileref();
+%let code2=%mf_getuniquefileref();
+
+filename &code1 temp;
+data _null_;
+  file &code1;
+  put 'data work.part1;';
+  put '  set sashelp.class(obs=5);';
+  put 'run;';
+run;
+
+filename &code2 temp;
+data _null_;
+  file &code2;
+  put 'data work.part2;';
+  put '  set sashelp.class(firstobs=6);';
+  put 'run;';
+run;
+
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob4,
+  code=&code1 &code2,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 4: Job created with multiple code filerefs,
+  outds=work.test_results
+)
+
+filename &code1 clear;
+filename &code2 clear;
+
+/**
+  * Test 5 - Job creation with both precode and multiple code files
+  */
+%let pre1=%mf_getuniquefileref();
+%let pre2=%mf_getuniquefileref();
+%let main1=%mf_getuniquefileref();
+
+filename &pre1 temp;
+data _null_;
+  file &pre1;
+  put '%let globalvar1=Value1;';
+run;
+
+filename &pre2 temp;
+data _null_;
+  file &pre2;
+  put '%let globalvar2=Value2;';
+run;
+
+filename &main1 temp;
+data _null_;
+  file &main1;
+  put 'data work.combined;';
+  put '  var1="&globalvar1";';
+  put '  var2="&globalvar2";';
+  put '  output;';
+  put 'run;';
+run;
+
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob5,
+  precode=&pre1 &pre2,
+  code=&main1,
+  desc=Job with multiple precode and code files,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 5: Job created with multiple precode and code files,
+  outds=work.test_results
+)
+
+filename &pre1 clear;
+filename &pre2 clear;
+filename &main1 clear;
+
+/**
+  * Test 6 - Job creation with special characters in code
+  */
+filename ft15f001 temp;
+parmcards4;
+  data example6;
+    length text $200;
+    text='Special chars: & % $ # @ !';
+    output;
+    text="Quotes: 'single' and ""double""";
+    output;
+  run;
+  %put Test with special characters;
+;;;;
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob6,
+  desc=Job with special characters in code,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 6: Job created with special characters in code,
+  outds=work.test_results
+)
+
+/**
+  * Test 7 - Job creation with macro code
+  */
+filename ft15f001 temp;
+parmcards4;
+  %macro testmacro();
+    data example7;
+      set sashelp.class;
+      where age > 12;
+    run;
+  %mend testmacro;
+
+  %testmacro()
+;;;;
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob7,
+  desc=Job containing macro definitions,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 7: Job created with macro code,
+  outds=work.test_results
+)
+
+/**
+  * Test 8 - Job creation with empty code (edge case)
+  */
+filename ft15f001 temp;
+data _null_;
+  file ft15f001;
+  put '/* Empty job for testing */';
+run;
+
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob8,
+  desc=Job with minimal code,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 8: Job created with minimal code,
+  outds=work.test_results
+)
+
+/**
+  * Test 9 - Job creation with long code block
+  */
+filename ft15f001 temp;
+data _null_;
+  file ft15f001;
+  put 'data work.longtest;';
+  do i=1 to 50;
+    put '  var' i +(-1) '=' i ';';
+  end;
+  put '  output;';
+  put 'run;';
+run;
+
+%mx_createjob(
+  path=&mcTestAppLoc/jobs,
+  name=testjob9,
+  desc=Job with many variables,
+  replace=YES
+)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 9: Job created with long code block,
+  outds=work.test_results
+)
+
+/**
+  * Test 10 - Replace existing job (replace=YES)
+  */
+filename ft15f001 temp;
+parmcards4;
+  data example10_v1;
+    set sashelp.class;
+  run;
+;;;;
+%mx_createjob(path=&mcTestAppLoc/jobs,name=testjob10,replace=YES)
+
+/* Now replace it */
+filename ft15f001 temp;
+parmcards4;
+  data example10_v2;
+    set sashelp.cars;
+  run;
+;;;;
+%mx_createjob(path=&mcTestAppLoc/jobs,name=testjob10,replace=YES)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Test 10: Job replaced successfully with replace=YES,
+  outds=work.test_results
+)

tests/x-platform/mx_testservice.test.sas

@@ -3,10 +3,10 @@
   @brief Testing mx_testservice.sas macro
 
   Be sure to run <code>%let mcTestAppLoc=/Public/temp/macrocore;</code> when
-  runnin in Studio
+  running in Studio
 
   <h4> SAS Macros </h4>
-  @li mp_createwebservice.sas
+  @li mx_createwebservice.sas
   @li mx_testservice.sas
   @li mp_assert.sas
 

viya/mfv_existfolder.sas

@@ -33,12 +33,14 @@
     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

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
@@ -153,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;
@@ -172,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;
@@ -194,7 +200,13 @@ run;
 
 %local url mimetype ext;
 %let url=&base_uri/files/files?parentFolderUri=&self_uri;
-%let ext=%upcase(%scan(&name,-1,.));
+%let ext=%upcase(%trim(%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;
@@ -207,12 +219,23 @@ 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;
-    url="&url%str(&)typeDefName=file";
+
+  /* typeDefName */
+  %if not %mf_isBlank(&viyaTypeDefName) %then %do;
+    url="&url%str(&)typeDefName=&viyaTypeDefName";
   %end;
   %else %do;
-    url="&url";
+    %if "&ext"="HTM" or "&ext"="HTML" or "&ext"="XHTML" %then %do;
+      url="&url%str(&)typeDefName=file_html";
+    %end;
+    %else %do;
+      %if "&ext"="CSS" or "&ext"="JS" or "&ext"="PNG" or "&ext"="SVG" %then %do;
+        url="&url%str(&)typeDefName=file_%lowcase(&ext)";
+      %end;
+      %else %do;
+        url="&url";
+      %end;
+    %end;
   %end;
 
   headers "Accept"="application/json"
@@ -234,6 +257,7 @@ 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;
@@ -241,13 +265,61 @@ libname &libref2 JSON fileref=&fname1;
 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;
-%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+/* URI of the created file */
+%let fileuri=%trim(%mfv_getpathuri(&path/&name));
+
+/* 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 */
+  %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 */

viya/mv_createfolder.sas

@@ -117,7 +117,7 @@ options noquotelenmax;
   %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(10,1)) - will try once more;
+    %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;
@@ -181,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)

viya/mv_deletejes.sas

@@ -117,7 +117,8 @@ libname &libref1a JSON fileref=&fname1a;
 %let found=0;
 /* %put Getting object uri from &libref1a..items; */
 data _null_;
-  length contenttype name $1000;
+  length contenttype name uri $1000;
+  call missing(of _all_);
   set &libref1a..items;
   if contenttype='jobDefinition' and upcase(name)="%upcase(&name)" then do;
     call symputx('uri',cats("&base_uri",uri),'l');

viya/mv_getviyafileextparms.sas

@@ -0,0 +1,248 @@
+/**
+  @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://${serverUrl}/types/types?limit=999999"
+
+  @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 [out] viyaFileExtRespLibDs (work.mv_getViyaFileExtParmsResponse)
+    Library.name of the dataset to receive the local working copy of the initial
+    response that requests all file extension details. Created once per session
+    to avoid multiple api calls.
+  @param [in] mdebug= (0) Set to 1 to enable DEBUG messages
+
+  <h4> SAS Macros </h4>
+  @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
+  @li mf_isblank.sas
+  @li mf_nobs.sas
+  @li mp_abort.sas
+
+**/
+
+%macro mv_getViyaFileExtParms(
+  ext,
+  typeDefNameVar=,
+  propertiesVar=,
+  mediaTypeVar=,
+  viyaFileExtRespLibDs=work.mv_getViyaFileExtParmsResponse,
+  mdebug=0
+  );
+  %local base_uri; /* location of rest apis */
+  %local url; /* File extension info end-point */
+
+  %mp_abort(
+    iftrue=(%mf_isBlank(&ext))
+    ,msg=%str(No file extension provided.)
+    ,mac=MV_GETVIYAFILEEXTPARMS
+  );
+
+  %mp_abort(
+    iftrue=(%mf_isBlank(&typeDefNameVar) and
+            %mf_isBlank(&propertiesVar) and
+            %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;
+    %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: &=base_uri;
+  %end;
+
+  %let ext=%lowcase(&ext);
+
+  /* Create a local copy of the Viya response containing all file type info, if
+  it does not already exist. */
+  %if not %mf_existds(&viyaFileExtRespLibDs) %then %do;
+    /* Create a temp file and fill with JSON that declares */
+    /* VIYA file-type details for the given file extension */
+    %local viyatypedefs;
+    %let viyatypedefs=%mf_getuniquefileref();
+    filename &viyatypedefs temp;
+
+    %let url = &base_uri/types/types?limit=999999;
+
+    proc http oauth_bearer=sas_services out=&viyatypedefs
+      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 File extension details were not retrieved.;
+      filename &viyatypedefs clear;
+      %return;
+    %end;
+
+    %if &mdebug=1 %then %do;
+      /* Dump the response to the log */
+      data _null_;
+        length line $120;
+        null=byte(0);
+        infile &viyatypedefs dlm=null lrecl=120 recfm=n;
+        input line $120.;
+        if _n_ = 1 then put "DEBUG:";
+        put line;
+      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=&viyatypedefs automap=create;
+    proc copy in=&libref1 out=&jsonlib; run;
+
+    libname &libref1 clear;
+
+    /* Now give all rows belonging to the same items array a grouping value */
+    data &viyaFileExtRespLibDs;
+      length _viyaItemIdx 8;
+      set &jsonlib..alldata;
+      retain _viyaItemIdx 0;
+      /* Increment the row group index when a new 'items' group is observed */
+      if P=1 and P1='items' then _viyaItemIdx + 1;
+    run;
+
+    %if &mdebug=0 %then %do;
+      /* Tidy up, unless debug=1 */
+      proc datasets library=&jsonlib nolist kill; quit;
+      libname &jsonlib clear;
+    %end;
+
+    filename &viyatypedefs clear;
+
+  %end; /* If initial filetype query response didn't exist */
+
+  /* Find the row-group for the current file extension */
+  %local itemRowGroup;
+  %let itemRowGroup =
+    %mf_getValue(
+      &viyaFileExtRespLibDs
+      ,_viyaItemIdx
+      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
+    );
+
+  %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".;
+    %return;
+  %end;
+
+  /* Filter the cached response data down to the required file extension */
+  %local dsItems;
+  %let dsItems = %mf_getuniquename(prefix=dsItems_);
+  data work.&dsItems;
+    set &viyaFileExtRespLibDs;
+    where _viyaItemIdx = &itemRowGroup;
+  run;
+
+  /* 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;
+  %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;
+  %end;
+
+  /* Populate properties macro variable, if requested */
+  %if not %mf_isBlank(&propertiesVar) %then %do;
+
+    /* Filter dsItems down to the properties */
+    %local dsProperties;
+    %let dsProperties = %mf_getuniquename(prefix=dsProperties_);
+    data work.&dsProperties ( rename=(p3 = propertyName) );
+        set work.&dsItems;
+        where p2="properties" and v=1;
+    run;
+
+    /* 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(%');
+    %end;
+    %else %do;
+      /* Properties potentially span multiple rows in the input table */
+      data _null_;
+        length
+          line $32767
+          properties $32767
+        ;
+        retain properties;
+        set &dsProperties end=last;
+        if _n_ = 1 then properties = '{';
+
+        line = cats(quote(trim(propertyName)),':');
+        /* Only strings and bools appear in properties */
+        if value not in ("true","false") then value = quote(trim(value));
+        line = catx(' ',line,value);
+        /* Add a comma separator to all except the last line */
+        if not last then line = cats(line,',');
+
+        /* Add this line to the output value */
+        properties = catx(' ',properties,line);
+
+        if last then do;
+          /* Close off the properties object and output to the macro variable */
+          properties=catx(' ',properties,'}');
+          call symputx("&propertiesVar",properties);
+        end;
+      run;
+
+      %if &mdebug=1 %then %put DEBUG: &=propertiesVar &propertiesVar=&&&propertiesVar;
+    %end;
+
+  %end;
+
+%mend mv_getViyaFileExtParms;

xplatform/mx_createjob.sas

@@ -0,0 +1,111 @@
+/**
+  @file mx_createjob.sas
+  @brief Create a job in SAS 9, Viya or SASjs
+  @details Creates a Stored Process in SAS 9, a Job Execution Service in SAS
+  Viya, or a Stored Program on SASjs Server - depending on the executing
+  environment.
+
+Usage:
+
+    %* compile macros ;
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+    %inc mc;
+
+    %* write some code;
+    filename ft15f001 temp;
+    parmcards4;
+        data example1;
+          set sashelp.class;
+        run;
+    ;;;;
+
+    %* create the job;
+    %mx_createjob(path=/Public/app/jobs,name=myjob,replace=YES)
+
+  <h4> SAS Macros </h4>
+  @li mf_getplatform.sas
+  @li mm_createstp.sas
+  @li ms_createfile.sas
+  @li mv_createjob.sas
+
+  @param [in,out] path= The full folder path where the job will be created
+  @param [in,out] name= Job name.  Avoid spaces.
+  @param [in] desc= The description of the job (optional)
+  @param [in] precode= Space separated list of filerefs, pointing to the code
+    that needs to be attached to the beginning of the job (optional)
+  @param [in] code= (ft15f001) Space seperated fileref(s) of the actual code to
+    be added
+  @param [in] replace= (YES) Select YES to replace any existing job in that
+    location
+  @param [in] mDebug= (0) set to 1 to show debug messages in the log
+
+  @author Allan Bowe
+
+  <h4> Related Macros </h4>
+  @li mx_createjob.test.sas
+  @li mx_createwebservice.sas
+
+**/
+
+%macro mx_createjob(path=HOME
+    ,name=initJob
+    ,precode=
+    ,code=ft15f001
+    ,desc=This job was created by the mx_createjob macro
+    ,replace=YES
+    ,mdebug=0
+)/*/STORE SOURCE*/;
+
+%if &syscc ge 4 %then %do;
+  %put syscc=&syscc - &sysmacroname will not execute in this state;
+  %return;
+%end;
+
+/* combine precode and code into a single file */
+%local tempref x fref freflist;
+%let tempref=%mf_getuniquefileref();
+%local work tmpfile;
+%let work=%sysfunc(pathname(work));
+%let tmpfile=&tempref..sas;
+filename &tempref "&work/&tmpfile";
+%let freflist=&precode &code ;
+%do x=1 %to %sysfunc(countw(&freflist));
+  %let fref=%scan(&freflist,&x);
+  %put &sysmacroname: adding &fref;
+  data _null_;
+    file &tempref lrecl=3000 termstr=crlf mod;
+    infile &fref lrecl=3000;
+    input;
+    put _infile_;
+  run;
+%end;
+
+%local platform; %let platform=%mf_getplatform();
+%if &platform=SASVIYA %then %do;
+  %if "&path"="HOME" %then %let path=/Users/&sysuserid/My Folder;
+  %mv_createjob(path=&path
+    ,name=&name
+    ,code=&tempref
+    ,desc=&desc
+    ,replace=&replace
+  )
+%end;
+%else %if &platform=SASJS %then %do;
+  %if "&path"="HOME" %then %let path=/Users/&_sasjs_username/My Folder;
+  %ms_createfile(&path/&name..sas
+    ,inref=&tempref
+    ,mdebug=&mdebug
+  )
+%end;
+%else %do;
+  %if "&path"="HOME" %then %let path=/User Folders/&_METAPERSON/My Folder;
+  %mm_createstp(stpname=&name
+    ,filename=&tmpfile
+    ,directory=&work
+    ,tree=&path
+    ,stpdesc=&desc
+    ,mDebug=&mdebug
+  )
+%end;
+filename &tempref clear;
+%mend mx_createjob;

xplatform/mx_createwebservice.sas

@@ -48,6 +48,9 @@ Usage:
 
   @author Allan Bowe
 
+  <h4> Related Macros </h4>
+  @li mx_createjob.sas
+
 **/
 
 %macro mx_createwebservice(path=HOME