fix: removing deprecated functionality ahead of planned breaking change

2025-12-11 06:24:35 +00:00 · 2022-01-22 21:16:15 +01:00
parent ae5fbcf857
commit f7fac50108
14 changed files with 19 additions and 121 deletions
--- a/README.md
+++ b/README.md
@@ -125,6 +125,7 @@ filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 - macro names must be lowercase
 - one macro per file
 - prefixes:
+  - _mcf_ for macro compiled functions (proc fcmp)
  - _mf_ for macro functions (can be used in open code).
  - _ml_ for macros that are used to compile LUA modules
  - _mm_ for metadata macros (interface with the metadata server).
@@ -183,6 +184,7 @@ When contributing to this library, it is therefore important to ensure that all
 - All dataset references must be 2 level (eg `work.blah`, not `blah`). This is to avoid contention when options [DATASTMTCHK](https://support.sas.com/documentation/cdl/en/lrdict/64316/HTML/default/viewer.htm#a000279064.htm)=ALLKEYWORDS is in effect.
 - Avoid naming collisions! All macro variables should be local scope. Use system generated work tables where possible - eg `data ; set sashelp.class; run; data &output; set &syslast; run;`
 - The use of `quit;` for `proc sql` is optional unless you are looking to benefit from the timing statistics.
+- Use [sasjs lint](https://github.com/sasjs/lint)!

 ## General Notes

@@ -193,7 +195,6 @@ When contributing to this library, it is therefore important to ensure that all
 We are currently on major release v3.  The following changes are planned when the next major (breaking) release becomes necessary:

 * Remove `dbg` parameter from mp_jsonout.sas (implement mdebug instead)
-* Remove `END_DTTM` and `START_DTTM` from mx_webout JSON

 ## Star Gazing

--- a/all.sas
+++ b/all.sas
@@ -2198,7 +2198,8 @@ Usage:
      if symexist('_debug') then debug=quote(trim(symget('_debug')));
      else debug='""';
      put '>>weboutBEGIN<<';
-      put '{"START_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '"';
+      put '{"SYSDATE" : "' "&SYSDATE" '"';
+      put ',"SYSTIME" : "' "&SYSTIME" '"';
      put ',"sasjsAbort" : [{';
      put ' "MSG":' msg ;
      put ' ,"MAC": "' "&mac" '"}]';
@@ -2227,7 +2228,7 @@ Usage:
      put ',"SYSVLONG" : ' sysvlong;
      syswarningtext=quote(trim(symget('syswarningtext')));
      put ",""SYSWARNINGTEXT"" : " syswarningtext;
-      put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+      put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
      put "}" @;
      put '>>weboutEND<<';
    run;
@@ -7712,7 +7713,6 @@ filename &tempref clear;

 %macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y
  ,engine=DATASTEP
-  ,dbg=0 /* DEPRECATED */
  ,missing=NULL
  ,showmeta=NO
 )/*/STORE SOURCE*/;
@@ -12844,7 +12844,6 @@ data _null_;
  put ' ';
  put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
  put '  ,engine=DATASTEP ';
-  put '  ,dbg=0 /* DEPRECATED */ ';
  put '  ,missing=NULL ';
  put '  ,showmeta=NO ';
  put ')/*/STORE SOURCE*/; ';
@@ -13175,7 +13174,7 @@ data _null_;
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
-  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),datetime20.3)" ''" ''; ';
+  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
  put '    memsize=quote(cats(memsize)); ';
@@ -16681,7 +16680,7 @@ run;
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
    memsize=quote(cats(memsize));
@@ -16988,7 +16987,7 @@ run;
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length autoexec $512;
    autoexec=quote(urlencode(trim(getoption('autoexec'))));
    put ',"AUTOEXEC" : ' autoexec;
@@ -17980,7 +17979,6 @@ data _null_;
  put ' ';
  put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
  put '  ,engine=DATASTEP ';
-  put '  ,dbg=0 /* DEPRECATED */ ';
  put '  ,missing=NULL ';
  put '  ,showmeta=NO ';
  put ')/*/STORE SOURCE*/; ';
@@ -18368,7 +18366,7 @@ data _null_;
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
-  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),datetime20.3)" ''" ''; ';
+  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
  put '    memsize=quote(cats(memsize)); ';
@@ -22227,7 +22225,7 @@ filename &fref1 clear;
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
    memsize=quote(cats(memsize));
--- a/base/mf_abort.sas
+++ b/base/mf_abort.sas
@@ -11,7 +11,7 @@
  @cond
 **/

-%macro mf_abort(mac=mf_abort.sas, type=deprecated, msg=, iftrue=%str(1=1)
+%macro mf_abort(mac=mf_abort.sas, msg=, iftrue=%str(1=1)
 )/*/STORE SOURCE*/;

  %if not(%eval(%unquote(&iftrue))) %then %return;
--- a/base/mp_abort.sas
+++ b/base/mp_abort.sas
@@ -173,7 +173,8 @@
      if symexist('_debug') then debug=quote(trim(symget('_debug')));
      else debug='""';
      put '>>weboutBEGIN<<';
-      put '{"START_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '"';
+      put '{"SYSDATE" : "' "&SYSDATE" '"';
+      put ',"SYSTIME" : "' "&SYSTIME" '"';
      put ',"sasjsAbort" : [{';
      put ' "MSG":' msg ;
      put ' ,"MAC": "' "&mac" '"}]';
@@ -202,7 +203,7 @@
      put ',"SYSVLONG" : ' sysvlong;
      syswarningtext=quote(trim(symget('syswarningtext')));
      put ",""SYSWARNINGTEXT"" : " syswarningtext;
-      put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+      put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
      put "}" @;
      put '>>weboutEND<<';
    run;
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -62,7 +62,6 @@

 %macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y
  ,engine=DATASTEP
-  ,dbg=0 /* DEPRECATED */
  ,missing=NULL
  ,showmeta=NO
 )/*/STORE SOURCE*/;
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -95,7 +95,6 @@ data _null_;
  put ' ';
  put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
  put '  ,engine=DATASTEP ';
-  put '  ,dbg=0 /* DEPRECATED */ ';
  put '  ,missing=NULL ';
  put '  ,showmeta=NO ';
  put ')/*/STORE SOURCE*/; ';
@@ -426,7 +425,7 @@ data _null_;
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
-  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),datetime20.3)" ''" ''; ';
+  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
  put '    memsize=quote(cats(memsize)); ';
--- a/meta/mm_updatestpsourcecode.sas
+++ b/meta/mm_updatestpsourcecode.sas
@@ -13,9 +13,6 @@
  @param [in] stpcode= the source file (or fileref) containing the SAS code to load
    into the stp.  For multiple files, they should simply be concatenated first.
  @param [in] minify= set to YES in order to strip comments, blank lines, and CRLFs.
-
-  @param frefin= deprecated - a unique fileref is now always used
-  @param frefout= deprecated - a unique fileref is now always used
  @param mDebug= set to 1 to show debug messages in the log

  @version 9.3
@@ -30,16 +27,8 @@
  ,stpcode=
  ,minify=NO
  ,mdebug=0
-  /* deprecated */
-  ,frefin=inmeta
-  ,frefout=outmeta
 );

-%if &frefin ne inmeta or &frefout ne outmeta %then %do;
-  %put %str(WARN)ING: the frefin and frefout parameters will be deprecated in
-    an upcoming release.;
-%end;
-
 /* first, check if STP exists */
 %local tsuri;
 %let tsuri=stopifempty ;
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -165,7 +165,7 @@
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
    memsize=quote(cats(memsize));
--- a/server/ms_webout.sas
+++ b/server/ms_webout.sas
@@ -161,7 +161,7 @@
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length autoexec $512;
    autoexec=quote(urlencode(trim(getoption('autoexec'))));
    put ',"AUTOEXEC" : ' autoexec;
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -239,7 +239,6 @@ data _null_;
  put ' ';
  put '%macro mp_jsonout(action,ds,jref=_webout,dslabel=,fmt=Y ';
  put '  ,engine=DATASTEP ';
-  put '  ,dbg=0 /* DEPRECATED */ ';
  put '  ,missing=NULL ';
  put '  ,showmeta=NO ';
  put ')/*/STORE SOURCE*/; ';
@@ -627,7 +626,7 @@ data _null_;
  put '    sysvlong=quote(trim(symget(''sysvlong''))); ';
  put '    put '',"SYSVLONG" : '' sysvlong; ';
  put '    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" "; ';
-  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),datetime20.3)" ''" ''; ';
+  put '    put '',"END_DTTM" : "'' "%sysfunc(datetime(),E8601DT26.6)" ''" ''; ';
  put '    length memsize $32; ';
  put '    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)"; ';
  put '    memsize=quote(cats(memsize)); ';
--- a/viya/mv_getaccesstoken.sas
+++ b/viya/mv_getaccesstoken.sas
@@ -1,32 +0,0 @@
-/**
-  @file mv_getaccesstoken.sas
-  @brief deprecated - replaced by mv_tokenrefresh.sas
-
-  @version VIYA V.03.04
-  @author Allan Bowe, source: https://github.com/sasjs/core
-
-  <h4> SAS Macros </h4>
-  @li mv_tokenrefresh.sas
-
-**/
-
-%macro mv_getaccesstoken(client_id=someclient
-    ,client_secret=somesecret
-    ,grant_type=authorization_code
-    ,code=
-    ,user=
-    ,pass=
-    ,access_token_var=ACCESS_TOKEN
-    ,refresh_token_var=REFRESH_TOKEN
-  );
-
-%mv_tokenrefresh(client_id=&client_id
-  ,client_secret=&client_secret
-  ,grant_type=&grant_type
-  ,user=&user
-  ,pass=&pass
-  ,access_token_var=&access_token_var
-  ,refresh_token_var=&refresh_token_var
-)
-
-%mend mv_getaccesstoken;
--- a/viya/mv_getapptoken.sas
+++ b/viya/mv_getapptoken.sas
@@ -1,23 +0,0 @@
-/**
-  @file
-  @brief deprecated - replaced by mv_registerclient.sas
-
-  @version VIYA V.03.04
-  @author Allan Bowe, source: https://github.com/sasjs/core
-
-  <h4> SAS Macros </h4>
-  @li mv_registerclient.sas
-
-**/
-
-%macro mv_getapptoken(client_id=someclient
-    ,client_secret=somesecret
-    ,grant_type=authorization_code
-  );
-
-%mv_registerclient(client_id=&client_id
-  ,client_secret=&client_secret
-  ,grant_type=&grant_type
-)
-
-%mend mv_getapptoken;
--- a/viya/mv_getrefreshtoken.sas
+++ b/viya/mv_getrefreshtoken.sas
@@ -1,33 +0,0 @@
-/**
-  @file mv_getrefreshtoken.sas
-  @brief deprecated - replaced by mv_tokenauth.sas
-
-  @version VIYA V.03.04
-  @author Allan Bowe, source: https://github.com/sasjs/core
-
-  <h4> SAS Macros </h4>
-  @li mv_tokenauth.sas
-
-**/
-
-%macro mv_getrefreshtoken(client_id=someclient
-    ,client_secret=somesecret
-    ,grant_type=authorization_code
-    ,code=
-    ,user=
-    ,pass=
-    ,access_token_var=ACCESS_TOKEN
-    ,refresh_token_var=REFRESH_TOKEN
-  );
-
-%mv_tokenauth(client_id=&client_id
-  ,client_secret=&client_secret
-  ,grant_type=&grant_type
-  ,code=&code
-  ,user=&user
-  ,pass=&pass
-  ,access_token_var=&access_token_var
-  ,refresh_token_var=&refresh_token_var
-)
-
-%mend mv_getrefreshtoken;
--- a/viya/mv_webout.sas
+++ b/viya/mv_webout.sas
@@ -225,7 +225,7 @@
    sysvlong=quote(trim(symget('sysvlong')));
    put ',"SYSVLONG" : ' sysvlong;
    put ",""SYSWARNINGTEXT"" : ""&syswarningtext"" ";
-    put ',"END_DTTM" : "' "%sysfunc(datetime(),datetime20.3)" '" ';
+    put ',"END_DTTM" : "' "%sysfunc(datetime(),E8601DT26.6)" '" ';
    length memsize $32;
    memsize="%sysfunc(INPUTN(%sysfunc(getoption(memsize)), best.),sizekmg.)";
    memsize=quote(cats(memsize));