fix: adding des= macro option to mf_abort

chore: merge
fix: linting issues
2026-01-06 17:10:05 +00:00 · 2023-01-02 11:26:21 +00:00 · 2022-12-30 12:41:08 +00:00 · 2022-12-30 12:38:34 +00:00 · 2022-12-28 20:25:05 +00:00 · 2022-12-28 21:21:35 +01:00
20 changed files with 856 additions and 470 deletions
--- a/.sasjslint
+++ b/.sasjslint
@@ -1,13 +1,14 @@
 {
-    "noTrailingSpaces": true,
-    "noEncodedPasswords": true,
-    "hasDoxygenHeader": true,
-    "hasMacroNameInMend": true,
-    "hasMacroParentheses": true,
-    "noNestedMacros": false,
-    "noSpacesInFileNames": true,
-    "maxLineLength": 300,
-    "lowerCaseFileNames": true,
-    "noTabIndentation": true,
-    "indentationMultiple": 2
+  "noTrailingSpaces": true,
+  "noEncodedPasswords": true,
+  "hasDoxygenHeader": true,
+  "hasMacroNameInMend": true,
+  "hasMacroParentheses": true,
+  "noGremlins": true,
+  "noNestedMacros": false,
+  "noSpacesInFileNames": true,
+  "maxLineLength": 300,
+  "lowerCaseFileNames": true,
+  "noTabs": true,
+  "indentationMultiple": 2
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,7 @@
  "editor.rulers": [
    80
  ],
-  "files.trimTrailingWhitespace": true
+  "files.trimTrailingWhitespace": true,
+  "sasjs-for-vscode.target": "docsonly",
+  "sasjs-for-vscode.isLocal": true
 }
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 [![npm package][npm-image]][npm-url]
 [![Github Workflow][githubworkflow-image]][githubworkflow-url]
 ![npm](https://img.shields.io/npm/dt/@sasjs/core)
-![Snyk Vulnerabilities for npm package](https://img.shields.io/snyk/vulnerabilities/npm/@sasjs/core)
-[![License](https://img.shields.io/apm/l/atomic-design-ui.svg)](/LICENSE)
 ![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)
--- a/all.sas
+++ b/all.sas
@@ -30,7 +30,7 @@ options noquotelenmax;
 **/

 %macro mf_abort(mac=mf_abort.sas, msg=, iftrue=%str(1=1)
-)/*/STORE SOURCE*/;
+)/des='ungraceful abort' /*STORE SOURCE*/;

  %if not(%eval(%unquote(&iftrue))) %then %return;

@@ -42,7 +42,8 @@ options noquotelenmax;

 %mend mf_abort;

-/** @endcond *//**
+/** @endcond */
+/**
  @file
  @brief de-duplicates a macro string
  @details Removes all duplicates from a string of words.  A delimeter can be
@@ -247,7 +248,8 @@ options noquotelenmax;
    0
  %end;

-%mend mf_existfileref;/**
+%mend mf_existfileref;
+/**
  @file
  @brief Checks if a function exists
  @details Returns 1 if the function exists, else 0.  Note that this function
@@ -16439,7 +16441,7 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10 ';
+  put '      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y ';
  put '        ,maxobs=&workobs ';
  put '      ) ';
  put '      data _null_; file _sjsref mod encoding=''utf-8''; ';
@@ -20121,7 +20123,7 @@ run;
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10
+      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y
        ,maxobs=&workobs
      )
      data _null_; file _sjsref mod encoding='utf-8';
@@ -21525,7 +21527,7 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10 ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y ';
  put '        ,maxobs=&workobs ';
  put '      ) ';
  put '      data _null_; file &fref mod encoding=''utf-8'' termstr=lf; ';
@@ -21792,7 +21794,7 @@ filename &headref clear;
  @param [in] uid= (0) Provide the userid on which to filter
  @param [out] outds= (work.ms_getgroups) This output dataset will contain the
    list of groups. Format:
-|NAME:$32.|DESCRIPTION:$64.|GROUPID:best.|
+|NAME:$32.|DESCRIPTION:$256.|GROUPID:best.|
 |---|---|---|
 |`SomeGroup `|`A group `|`1`|
 |`Another Group`|`this is a different group`|`2`|
@@ -21828,7 +21830,7 @@ filename &headref clear;
 %if %sysget(MODE)=desktop %then %do;
  /* groups api does not exist in desktop mode */
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    name="&sysuserid";
    description="&sysuserid (group - desktop mode)";
    groupid=1;
@@ -21884,7 +21886,7 @@ libname &libref JSON fileref=&fref1;

 %if "&user"="0" and "&uid"="0" %then %do;
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    if _n_=1 then call missing(of _all_);
    set &libref..root;
    drop ordinal_root;
@@ -21892,7 +21894,7 @@ libname &libref JSON fileref=&fref1;
 %end;
 %else %do;
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    if _n_=1 then call missing(of _all_);
    set &libref..groups;
    drop ordinal_:;
@@ -22558,7 +22560,7 @@ run;
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y
        ,maxobs=&workobs
      )
      data _null_; file &fref mod encoding='utf-8' termstr=lf;
--- a/base/mf_abort.sas
+++ b/base/mf_abort.sas
@@ -12,7 +12,7 @@
 **/

 %macro mf_abort(mac=mf_abort.sas, msg=, iftrue=%str(1=1)
-)/*/STORE SOURCE*/;
+)/des='ungraceful abort' /*STORE SOURCE*/;

  %if not(%eval(%unquote(&iftrue))) %then %return;

--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -546,7 +546,7 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10 ';
+  put '      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y ';
  put '        ,maxobs=&workobs ';
  put '      ) ';
  put '      data _null_; file _sjsref mod encoding=''utf-8''; ';
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -150,7 +150,7 @@
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y,maxobs=10
+      %mp_jsonout(OBJ,&wt,jref=_sjsref,dslabel=first10rows,showmeta=Y
        ,maxobs=&workobs
      )
      data _null_; file _sjsref mod encoding='utf-8';
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -33,6 +33,6 @@
    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
  },
  "devDependencies": {
-    "@sasjs/cli": "3.13.0"
+    "@sasjs/cli": "3.24.0"
  }
 }
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -85,7 +85,7 @@
    {
      "name": "docsonly",
      "serverType": "SASJS",
-      "appLoc": "dummy",
+      "appLoc": "/dummy",
      "macroFolders": [
        "meta",
        "metax",
--- a/server/ms_createwebservice.sas
+++ b/server/ms_createwebservice.sas
@@ -539,7 +539,7 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10 ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y ';
  put '        ,maxobs=&workobs ';
  put '      ) ';
  put '      data _null_; file &fref mod encoding=''utf-8'' termstr=lf; ';
--- a/server/ms_getgroups.sas
+++ b/server/ms_getgroups.sas
@@ -22,7 +22,7 @@
  @param [in] uid= (0) Provide the userid on which to filter
  @param [out] outds= (work.ms_getgroups) This output dataset will contain the
    list of groups. Format:
-|NAME:$32.|DESCRIPTION:$64.|GROUPID:best.|
+|NAME:$32.|DESCRIPTION:$256.|GROUPID:best.|
 |---|---|---|
 |`SomeGroup `|`A group `|`1`|
 |`Another Group`|`this is a different group`|`2`|
@@ -58,7 +58,7 @@
 %if %sysget(MODE)=desktop %then %do;
  /* groups api does not exist in desktop mode */
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    name="&sysuserid";
    description="&sysuserid (group - desktop mode)";
    groupid=1;
@@ -114,7 +114,7 @@ libname &libref JSON fileref=&fref1;

 %if "&user"="0" and "&uid"="0" %then %do;
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    if _n_=1 then call missing(of _all_);
    set &libref..root;
    drop ordinal_root;
@@ -122,7 +122,7 @@ libname &libref JSON fileref=&fref1;
 %end;
 %else %do;
  data &outds;
-    length NAME $32 DESCRIPTION $64. GROUPID 8;
+    length NAME $32 DESCRIPTION $256. GROUPID 8;
    if _n_=1 then call missing(of _all_);
    set &libref..groups;
    drop ordinal_:;
--- a/server/ms_webout.sas
+++ b/server/ms_webout.sas
@@ -141,7 +141,7 @@
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y,maxobs=10
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,showmeta=Y
        ,maxobs=&workobs
      )
      data _null_; file &fref mod encoding='utf-8' termstr=lf;
--- a/tests/viyaonly/mv_jobflow.test.1.sas
+++ b/tests/viyaonly/mv_jobflow.test.1.sas
@@ -4,7 +4,7 @@
  @brief Testing mv_jobflow macro
  @details One of the remote jobs aborts with syscc>0 - test to
  make sure this comes back to the calling session
-
+
  <h4> SAS Macros </h4>
  @li mp_assert.sas
  @li mv_createjob.sas
--- a/tests/viyaonly/mv_jobflow.test.2.sas
+++ b/tests/viyaonly/mv_jobflow.test.2.sas
@@ -3,7 +3,7 @@
  @brief Testing mv_jobflow macro
  @details All jobs complete successfully with syscc = 0 - test to
  make sure this comes back to the calling session
-
+
  <h4> SAS Macros </h4>
  @li mp_assert.sas
  @li mv_createjob.sas
--- a/tests/viyaonly/mv_registerclient.test.1.sas
+++ b/tests/viyaonly/mv_registerclient.test.1.sas
@@ -4,7 +4,7 @@
  @brief Testing mv_registerclient.sas macro
  @details Tests for successful registration.  For this to work, the test
  account must be an admin.
-
+
  <h4> SAS Macros </h4>
  @li mf_getuniquename.sas
  @li mp_assertcolvals.sas
--- a/tests/viyaonly/mv_registerclient.test.2.sas
+++ b/tests/viyaonly/mv_registerclient.test.2.sas
@@ -1,10 +1,9 @@
 /**
-
  @file
  @brief Testing mv_registerclient.sas macro
  @details Tests for unsuccessful registration.  To do this, overrides are
  applied for the mf_loc.sas and mp_abort.sas macros.
-
+
  <h4> SAS Macros </h4>
  @li mp_assert.sas
  @li mv_registerclient.sas
Author	SHA1	Message	Date
munja	1af52a6683	fix: adding des= macro option to mf_abort	2023-01-02 11:26:21 +00:00
munja	fc0c96dd94	chore: merge	2022-12-30 12:41:08 +00:00
munja	b9c4882553	fix: linting issues	2022-12-30 12:38:34 +00:00
Allan Bowe	011b2b185c	chore: removing broken badges in README	2022-12-28 20:25:05 +00:00
Allan Bowe	dbc23550ac	Merge pull request #323 from sasjs/ms_getgroups fix: increasing desc length to 256 in ms_getgroups	2022-12-28 21:21:35 +01:00
munja	8910840ccc	fix: increasing desc length to 256 in ms_getgroups	2022-12-28 20:17:08 +00:00
Allan Bowe	4ef571032d	Merge pull request #322 from sasjs/upds Upds	2022-12-14 14:21:20 +01:00
Allan Bowe	e01cd8cd16	Merge branch 'main' into upds	2022-12-14 14:20:51 +01:00
munja	00628ec78a	chore: updating lint settings, some line ending issues, and a sasjsconfig apploc fix	2022-12-14 14:19:28 +01:00
munja	f4e6a487f3	fix: removing redundant param in mS/M_webout macros	2022-12-14 14:17:06 +01:00