Merge pull request #159 from sasjs/woff3

fix: avoiding error and including test in mp_streamfile.sas

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: monthly
+    open-pull-requests-limit: 3
+    allow:
+      - dependency-type: "production"

all.sas

@@ -10803,7 +10803,10 @@ create table &outds as
   @param [in] contenttype= (TEXTS) Either TEXT, ZIP, CSV, EXCEL
   @param [in] inloc= /path/to/file.ext to be sent
   @param [in] inref= fileref of file to be sent (if provided, overrides `inloc`)
+  @param [in] iftrue= (1=1) Provide a condition under which to execute.
   @param [out] outname= the name of the file, as downloaded by the browser
+  @param [out] outref= (_webout) The destination where the file should be
+    streamed.
 
   <h4> SAS Macros </h4>
   @li mf_getplatform.sas
@@ -10817,12 +10820,16 @@ create table &outds as
   contenttype=TEXT
   ,inloc=
   ,inref=0
+  ,iftrue=%str(1=1)
   ,outname=
+  ,outref=_webout
 )/*/STORE SOURCE*/;
 
-%let contentype=%upcase(&contenttype);
+%if not(%eval(%unquote(&iftrue))) %then %return;
-%local platform; %let platform=%mf_getplatform();
 
+%let contentype=%upcase(&contenttype);
+%let outref=%upcase(&outref);
+%local platform; %let platform=%mf_getplatform();
 
 /**
   * check engine type to avoid the below err message:
@@ -10831,7 +10838,7 @@ create table &outds as
 %local streamweb;
 %let streamweb=0;
 data _null_;
-  set sashelp.vextfl(where=(upcase(fileref)="_WEBOUT"));
+  set sashelp.vextfl(where=(upcase(fileref)="&outref"));
   if xengine='STREAM' then call symputx('streamweb',1,'l');
 run;
 
@@ -10843,7 +10850,7 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
       contenttype='application/csv'
       contentdisp="attachment; filename=&outname";
   %end;
@@ -10857,14 +10864,14 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
       contenttype='application/vnd.ms-excel'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
 %else %if &contentype=HTML %then %do;
   %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
       contenttype="text/html";
   %end;
 %end;
@@ -10876,24 +10883,20 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
       contenttype='application/text'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
-%else %do;
+%else %if &contentype=WOFF or &contentype=WOFF2 or &contentype=TTF %then %do;
-  %put %str(ERR)OR: Content Type &contenttype NOT SUPPORTED by &sysmacroname!;
-  %return;
-%end;
-%else %if &contentype=WOFF %then %do;
   %if &platform=SASMETA and &streamweb=1 %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','font/woff');
+      rc=stpsrv_header('Content-type',"font/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI"
-      contenttype='font/woff';
+      contenttype="font/%lowcase(&contenttype)";
   %end;
 %end;
 %else %if &contentype=XLSX %then %do;
@@ -10905,7 +10908,7 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
       contenttype=
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       contentdisp="attachment; filename=&outname";
@@ -10919,17 +10922,21 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
       contenttype='application/zip'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
+%else %do;
+  %put %str(ERR)OR: Content Type &contenttype NOT SUPPORTED by &sysmacroname!;
+  %return;
+%end;
 
 %if &inref ne 0 %then %do;
-  %mp_binarycopy(inref=&inref,outref=_webout)
+  %mp_binarycopy(inref=&inref,outref=&outref)
 %end;
 %else %do;
-  %mp_binarycopy(inloc="&inloc",outref=_webout)
+  %mp_binarycopy(inloc="&inloc",outref=&outref)
 %end;
 
 %mend mp_streamfile;

base/mp_streamfile.sas

@@ -15,7 +15,10 @@
   @param [in] contenttype= (TEXTS) Either TEXT, ZIP, CSV, EXCEL
   @param [in] inloc= /path/to/file.ext to be sent
   @param [in] inref= fileref of file to be sent (if provided, overrides `inloc`)
+  @param [in] iftrue= (1=1) Provide a condition under which to execute.
   @param [out] outname= the name of the file, as downloaded by the browser
+  @param [out] outref= (_webout) The destination where the file should be
+    streamed.
 
   <h4> SAS Macros </h4>
   @li mf_getplatform.sas
@@ -29,12 +32,16 @@
   contenttype=TEXT
   ,inloc=
   ,inref=0
+  ,iftrue=%str(1=1)
   ,outname=
+  ,outref=_webout
 )/*/STORE SOURCE*/;
 
-%let contentype=%upcase(&contenttype);
+%if not(%eval(%unquote(&iftrue))) %then %return;
-%local platform; %let platform=%mf_getplatform();
 
+%let contentype=%upcase(&contenttype);
+%let outref=%upcase(&outref);
+%local platform; %let platform=%mf_getplatform();
 
 /**
   * check engine type to avoid the below err message:
@@ -43,7 +50,7 @@
 %local streamweb;
 %let streamweb=0;
 data _null_;
-  set sashelp.vextfl(where=(upcase(fileref)="_WEBOUT"));
+  set sashelp.vextfl(where=(upcase(fileref)="&outref"));
   if xengine='STREAM' then call symputx('streamweb',1,'l');
 run;
 
@@ -55,7 +62,7 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
       contenttype='application/csv'
       contentdisp="attachment; filename=&outname";
   %end;
@@ -69,14 +76,14 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
       contenttype='application/vnd.ms-excel'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
 %else %if &contentype=HTML %then %do;
   %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name="_webout.json"
       contenttype="text/html";
   %end;
 %end;
@@ -88,24 +95,20 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.txt'
       contenttype='application/text'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
-%else %do;
+%else %if &contentype=WOFF or &contentype=WOFF2 or &contentype=TTF %then %do;
-  %put %str(ERR)OR: Content Type &contenttype NOT SUPPORTED by &sysmacroname!;
-  %return;
-%end;
-%else %if &contentype=WOFF %then %do;
   %if &platform=SASMETA and &streamweb=1 %then %do;
     data _null_;
-      rc=stpsrv_header('Content-type','font/woff');
+      rc=stpsrv_header('Content-type',"font/%lowcase(&contenttype)");
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI"
-      contenttype='font/woff';
+      contenttype="font/%lowcase(&contenttype)";
   %end;
 %end;
 %else %if &contentype=XLSX %then %do;
@@ -117,7 +120,7 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
       contenttype=
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       contentdisp="attachment; filename=&outname";
@@ -131,17 +134,21 @@ run;
     run;
   %end;
   %else %if &platform=SASVIYA %then %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
+    filename &outref filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.zip'
       contenttype='application/zip'
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
+%else %do;
+  %put %str(ERR)OR: Content Type &contenttype NOT SUPPORTED by &sysmacroname!;
+  %return;
+%end;
 
 %if &inref ne 0 %then %do;
-  %mp_binarycopy(inref=&inref,outref=_webout)
+  %mp_binarycopy(inref=&inref,outref=&outref)
 %end;
 %else %do;
-  %mp_binarycopy(inloc="&inloc",outref=_webout)
+  %mp_binarycopy(inloc="&inloc",outref=&outref)
 %end;
 
 %mend mp_streamfile;

sasjs/sasjsconfig.json

@@ -59,6 +59,7 @@
         "tests/sas9only"
       ],
       "programFolders": [],
+      "binaryFolders": [],
       "deployConfig": {
         "deployServicePack": true,
         "deployScripts": []

tests/crossplatform/mp_streamfile.test.sas

@@ -0,0 +1,28 @@
+/**
+  @file
+  @brief Testing mp_streamfile.sas macro
+  @details This is tricky to test as it streams to webout.  For now just
+  check the compilation, and for macro leakage.
+
+  <h4> SAS Macros </h4>
+  @li mp_assert.sas
+  @li mp_assertscope.sas
+  @li mp_streamfile.sas
+
+**/
+
+%mp_assertscope(SNAPSHOT)
+
+%mp_streamfile(iftrue=(1=0)
+  ,contenttype=csv,inloc=/some/where.txt
+  ,outname=myfile.txt
+)
+
+%mp_assertscope(COMPARE)
+
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Checking error condition,
+  outds=work.test_results
+)
+

tests/testterm.sas

@@ -2,8 +2,18 @@
   @file
   @brief term file for tests
 
+  <h4> SAS Macros </h4>
+  @li mp_assert.sas
+
 **/
 
+%mp_assert(
+  iftrue=(&syscc=0),
+  desc=Checking final error condition,
+  outds=work.test_results
+)
+
+
 %webout(OPEN)
 %webout(OBJ, TEST_RESULTS)
 %webout(CLOSE)