Merge pull request 'fix: latest adapter' (#32) from adapter-bump into development

Reviewed-on: #32

client/package.json

@@ -48,9 +48,9 @@
     "@clr/angular": "^13.17.0",
     "@clr/icons": "^13.0.2",
     "@clr/ui": "^13.17.0",
-    "@handsontable/angular": "^13.0.0",
+    "@handsontable/angular": "^13.1.0",
-    "@sasjs/adapter": "4.3.6",
+    "@sasjs/adapter": "4.10.1",
-    "@sasjs/utils": "^3.3.0",
+    "@sasjs/utils": "^3.4.0",
     "@sheet/crypto": "1.20211122.1",
     "@types/d3-graphviz": "^2.6.7",
     "@types/text-encoding": "0.0.35",
@@ -60,7 +60,7 @@
     "crypto-js": "^3.3.0",
     "d3-graphviz": "^5.0.2",
     "fs-extra": "^7.0.1",
-    "handsontable": "^13.0.0",
+    "handsontable": "^13.1.0",
     "https-browserify": "1.0.0",
     "hyperformula": "^2.5.0",
     "iconv-lite": "^0.5.0",

sas/package-lock.json

@@ -6,8 +6,8 @@
     "": {
       "name": "dc-sas",
       "dependencies": {
-        "@sasjs/cli": "^4.4.2",
+        "@sasjs/cli": "^4.10.1",
-        "@sasjs/core": "^4.46.4"
+        "@sasjs/core": "^4.46.6"
       }
     },
     "node_modules/@coolaj86/urequest": {
@@ -29,9 +29,9 @@
       }
     },
     "node_modules/@sasjs/adapter": {
-      "version": "4.5.1",
+      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.9.2.tgz",
-      "integrity": "sha512-WeKDMfCivBywxDZ6t0jng78ZBPoMk8RIHKFTNDDmvuvmXq5Mr5oqZ0r5lRPB863XkGOeVi6UIEI1+JawZ2TlWQ==",
+      "integrity": "sha512-WAWhJAbhsOwChbRB6N+dcgj9Tods2Hq/ygsCASALbjKvqxtYlUDVBoEhdedur0VdsWyUaTAqcwioCiCpWtcRZA==",
       "hasInstallScript": true,
       "dependencies": {
         "@sasjs/utils": "2.52.0",
@@ -78,21 +78,21 @@
       }
     },
     "node_modules/@sasjs/cli": {
-      "version": "4.4.2",
+      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.10.1.tgz",
-      "integrity": "sha512-o1Qp+L7vJOH9dbsEPJK6GaQR7yWW+W0BAI1rrD55+Ij3USMCcdWcRJAOvFxwS8Gflq5BuNrVqa39rg4RK0ZVEQ==",
+      "integrity": "sha512-qnhTdwENC8j9NJwZKtVVXNmKfmdoIkMIYxgUnH4tw08630qCNPZaH/jGrwVFF5MSUyUswgOoLVyNjxSPAYaWMA==",
       "hasInstallScript": true,
       "dependencies": {
-        "@sasjs/adapter": "4.5.1",
+        "@sasjs/adapter": "4.9.2",
         "@sasjs/core": "4.46.3",
         "@sasjs/lint": "2.3.1",
-        "@sasjs/utils": "3.3.0",
+        "@sasjs/utils": "3.4.0",
-        "adm-zip": "0.5.9",
+        "adm-zip": "0.5.10",
         "chalk": "4.1.2",
         "dotenv": "16.0.3",
         "esm": "3.2.25",
         "find": "0.3.0",
-        "js-base64": "3.7.2",
+        "js-base64": "3.7.5",
         "jsdom": "22.1.0",
         "jwt-decode": "3.1.2",
         "lodash.groupby": "4.6.0",
@@ -116,9 +116,9 @@
       "integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
     },
     "node_modules/@sasjs/core": {
-      "version": "4.46.4",
+      "version": "4.46.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.4.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.6.tgz",
-      "integrity": "sha512-Q4UiOEYEHWCYn4ak+2BaKnrusLauyvKK/Hq4Y4RwJOfwA2MSjOzJSV8fDpbhnY1Dyubbk4SChA6yAL8lc0hn1Q=="
+      "integrity": "sha512-aXftehSL6eCGlfWxllR1fzzmUNf6mk32hGrcP/LK+lClTXTaC6Vjm4b9NdMtqy/7TK3uwXmV2+ChhOuXEUNipg=="
     },
     "node_modules/@sasjs/lint": {
       "version": "2.3.1",
@@ -166,9 +166,9 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "3.3.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.4.0.tgz",
-      "integrity": "sha512-ZJ+c2d/rEoF340Ay3TZrXO4c2ain7AvSzkRuKG2H2qxwIlQQTk/9Rbknmy0mo3Y/QRScBYl0Fw5xSZ8SMHjljg==",
+      "integrity": "sha512-KHkuOcbwKdD9HrgwKYrMPPuKoFzOAEyNpUjHHhyefxRlrpLwTaf08nYQXFBUhqbWuS+hPRqFLozx45x+xExgyQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@fast-csv/format": "4.3.5",
@@ -255,9 +255,9 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/adm-zip": {
-      "version": "0.5.9",
+      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
       "engines": {
         "node": ">=6.0"
       }
@@ -945,9 +945,9 @@
       }
     },
     "node_modules/js-base64": {
-      "version": "3.7.2",
+      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz",
-      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+      "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
     },
     "node_modules/jsdom": {
       "version": "22.1.0",
@@ -1755,9 +1755,9 @@
       }
     },
     "@sasjs/adapter": {
-      "version": "4.5.1",
+      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.9.2.tgz",
-      "integrity": "sha512-WeKDMfCivBywxDZ6t0jng78ZBPoMk8RIHKFTNDDmvuvmXq5Mr5oqZ0r5lRPB863XkGOeVi6UIEI1+JawZ2TlWQ==",
+      "integrity": "sha512-WAWhJAbhsOwChbRB6N+dcgj9Tods2Hq/ygsCASALbjKvqxtYlUDVBoEhdedur0VdsWyUaTAqcwioCiCpWtcRZA==",
       "requires": {
         "@sasjs/utils": "2.52.0",
         "axios": "0.27.2",
@@ -1798,20 +1798,20 @@
       }
     },
     "@sasjs/cli": {
-      "version": "4.4.2",
+      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.10.1.tgz",
-      "integrity": "sha512-o1Qp+L7vJOH9dbsEPJK6GaQR7yWW+W0BAI1rrD55+Ij3USMCcdWcRJAOvFxwS8Gflq5BuNrVqa39rg4RK0ZVEQ==",
+      "integrity": "sha512-qnhTdwENC8j9NJwZKtVVXNmKfmdoIkMIYxgUnH4tw08630qCNPZaH/jGrwVFF5MSUyUswgOoLVyNjxSPAYaWMA==",
       "requires": {
-        "@sasjs/adapter": "4.5.1",
+        "@sasjs/adapter": "4.9.2",
         "@sasjs/core": "4.46.3",
         "@sasjs/lint": "2.3.1",
-        "@sasjs/utils": "3.3.0",
+        "@sasjs/utils": "3.4.0",
-        "adm-zip": "0.5.9",
+        "adm-zip": "0.5.10",
         "chalk": "4.1.2",
         "dotenv": "16.0.3",
         "esm": "3.2.25",
         "find": "0.3.0",
-        "js-base64": "3.7.2",
+        "js-base64": "3.7.5",
         "jsdom": "22.1.0",
         "jwt-decode": "3.1.2",
         "lodash.groupby": "4.6.0",
@@ -1834,9 +1834,9 @@
       }
     },
     "@sasjs/core": {
-      "version": "4.46.4",
+      "version": "4.46.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.4.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.6.tgz",
-      "integrity": "sha512-Q4UiOEYEHWCYn4ak+2BaKnrusLauyvKK/Hq4Y4RwJOfwA2MSjOzJSV8fDpbhnY1Dyubbk4SChA6yAL8lc0hn1Q=="
+      "integrity": "sha512-aXftehSL6eCGlfWxllR1fzzmUNf6mk32hGrcP/LK+lClTXTaC6Vjm4b9NdMtqy/7TK3uwXmV2+ChhOuXEUNipg=="
     },
     "@sasjs/lint": {
       "version": "2.3.1",
@@ -1878,9 +1878,9 @@
       }
     },
     "@sasjs/utils": {
-      "version": "3.3.0",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.4.0.tgz",
-      "integrity": "sha512-ZJ+c2d/rEoF340Ay3TZrXO4c2ain7AvSzkRuKG2H2qxwIlQQTk/9Rbknmy0mo3Y/QRScBYl0Fw5xSZ8SMHjljg==",
+      "integrity": "sha512-KHkuOcbwKdD9HrgwKYrMPPuKoFzOAEyNpUjHHhyefxRlrpLwTaf08nYQXFBUhqbWuS+hPRqFLozx45x+xExgyQ==",
       "requires": {
         "@fast-csv/format": "4.3.5",
         "@types/fs-extra": "9.0.13",
@@ -1961,9 +1961,9 @@
       }
     },
     "adm-zip": {
-      "version": "0.5.9",
+      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg=="
+      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ=="
     },
     "agent-base": {
       "version": "6.0.2",
@@ -2429,9 +2429,9 @@
       }
     },
     "js-base64": {
-      "version": "3.7.2",
+      "version": "3.7.5",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz",
-      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
+      "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
     },
     "jsdom": {
       "version": "22.1.0",

sas/package.json

@@ -27,7 +27,7 @@
   },
   "private": true,
   "dependencies": {
-    "@sasjs/cli": "^4.4.2",
+    "@sasjs/cli": "^4.11.1",
-    "@sasjs/core": "^4.46.4"
+    "@sasjs/core": "^4.47.0"
   }
 }

sas/sasjs/macros/mpe_makedata.sas

@@ -1733,12 +1733,12 @@ proc format library=&lib..mpe_x_catalog;
     6   = "Agree"
     7   = "Strongly Agree"
   ;
-  VALUE LIKERT7_A
+  VALUE LIKERT7_ELEVEN
     1,2,3   = "Disagree"
     4       = "Neither Agree nor Disagree"
     5,6,7   = "Agree"
   ;
-  VALUE LIKERT7_B
+  VALUE LIKERT7_SISTERS
     1-3     = "Disagree"
     4       = "Neither Agree nor Disagree"
     5-7     = "Agree"

sas/sasjs/services/editors/stagedata.sas

@@ -186,20 +186,15 @@ options notes mprint;
 libname approve "&dir";
 
 /* take copy of webin file */
-
 data _null_;
-  if symexist('_WEBIN_FILEREF1')
+  if symexist('_WEBIN_FILEREF1') then ref=symget('_WEBIN_FILEREF1');
-    then ref=symget('_WEBIN_FILEREF1');
+  else if symexist('sasjs_tables') then ref='0ref'; /* no fileref created */
-  else if symexist('sasjs_tables') then do;
-    rc=filename('ref',"%sysfunc(pathname(work))/&dsn.csv");
-    ref='ref';
-  end;
   else ref='indata1';
   call symputx('ref',ref);
   putlog ref=;
 run;
 
-%mp_binarycopy(inref=&ref, outloc="&dir/_WEBIN_FILEREF1.txt")
+%mp_binarycopy(inref=&ref,outloc="&dir/_WEBIN_FILEREF1.txt",iftrue=&ref ne 0ref)
 
 
 /* take copy of macvars */