fix: doc site html side bar

Mv getviyafileextparams

.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,26 @@ 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/* .
+          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"

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
+  ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
+  ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
+  ,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;
@@ -28727,6 +28728,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 +28754,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 +28762,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 +28785,7 @@ libname &libref1 clear;
   %end;
 
   %let base_uri=%mf_getplatform(VIYARESTAPI);
-  %if &mdebug=1 %then %do;
+  %if &mdebug=1 %then %put DEBUG: &=base_uri;
-    %put DEBUG: &=base_uri;
-  %end;
 
   %let ext=%lowcase(&ext);
 
@@ -28809,7 +28809,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 +28830,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 +28864,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 =
+  data _null_;
-    %mf_getValue(
+    set &viyaFileExtRespLibDs;
-      &viyaFileExtRespLibDs
+    where p1='items' and p2='extensions' and value="&ext";
-      ,_viyaItemIdx
+    call symputx('itemRowGroup',_viyaItemIdx,'l');
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
+  %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 +28893,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"));
+    %let &typeDefNameVar = %mf_getvalue(
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
+        &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"));
+    %let &mediaTypeVar = %mf_getvalue(
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
+      &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 +28920,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 +28951,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;

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

@@ -39,6 +39,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>
 
@@ -80,7 +84,3 @@
     </div>
     <!--END TITLEAREA-->
     <!-- end header part -->
-  </div>
-</body>
-
-</html>

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
+  ,propertiesVar=viyaProperties
-                        ,typeDefNameVar=viyaTypeDefName
+  ,typeDefNameVar=viyaTypeDefName
-                        ,mdebug=&mdebug);
+  ,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_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;
+  %if &mdebug=1 %then %put DEBUG: &=base_uri;
-    %put DEBUG: &=base_uri;
-  %end;
 
   %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 =
+  data _null_;
-    %mf_getValue(
+    set &viyaFileExtRespLibDs;
-      &viyaFileExtRespLibDs
+    where p1='items' and p2='extensions' and value="&ext";
-      ,_viyaItemIdx
+    call symputx('itemRowGroup',_viyaItemIdx,'l');
-      ,filter=%quote(p1='items' and p2='extensions' and value="&ext")
+  %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"));
+    %let &typeDefNameVar = %mf_getvalue(
-    %if &mdebug=1 %then %put DEBUG: &=typeDefNameVar &typeDefNameVar=&&&typeDefNameVar;
+        &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"));
+    %let &mediaTypeVar = %mf_getvalue(
-    %if &mdebug=1 %then %put DEBUG: &=mediaTypeVar &mediaTypeVar=&&&mediaTypeVar;
+      &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;