diff --git a/sas/deploy/makeData4GL.json b/sas/deploy/makeData4GL.json index efa9c59..6f4fdd7 100644 --- a/sas/deploy/makeData4GL.json +++ b/sas/deploy/makeData4GL.json @@ -1,8 +1,8 @@ { "fromjs": [ { - "ADMIN": "dcgroup", + "ADMIN": "AllUsers", "DCPATH": "/opt/data/DataController" } ] -} +} \ No newline at end of file diff --git a/sas/package-lock.json b/sas/package-lock.json index 44ac263..31947ec 100644 --- a/sas/package-lock.json +++ b/sas/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "dc-sas", "dependencies": { - "@sasjs/cli": "4.3.0", + "@sasjs/cli": "^4.4.2", "@sasjs/core": "^4.46.4" } }, @@ -29,9 +29,9 @@ } }, "node_modules/@sasjs/adapter": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.3.4.tgz", - "integrity": "sha512-hPLNPXqunbIXZY+rsRxwfiLehk8x9a0IG2/96geJqrgP4Xi705X2WqkTaCpJ+Lr9gFGk4PttdprokCl1yoHVNw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.5.1.tgz", + "integrity": "sha512-WeKDMfCivBywxDZ6t0jng78ZBPoMk8RIHKFTNDDmvuvmXq5Mr5oqZ0r5lRPB863XkGOeVi6UIEI1+JawZ2TlWQ==", "hasInstallScript": true, "dependencies": { "@sasjs/utils": "2.52.0", @@ -39,7 +39,7 @@ "axios-cookiejar-support": "1.0.1", "form-data": "4.0.0", "https": "1.0.0", - "tough-cookie": "4.0.0" + "tough-cookie": "4.1.3" } }, "node_modules/@sasjs/adapter/node_modules/@sasjs/utils": { @@ -78,22 +78,22 @@ } }, "node_modules/@sasjs/cli": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.3.0.tgz", - "integrity": "sha512-LDObBUigusiBvq7SzkL49W5zel2YfjcmetdrftEnEdpWeVkVYYby77gJiW9iXdhrdVT+Hgrdubs6tA+RT0LskA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.4.2.tgz", + "integrity": "sha512-o1Qp+L7vJOH9dbsEPJK6GaQR7yWW+W0BAI1rrD55+Ij3USMCcdWcRJAOvFxwS8Gflq5BuNrVqa39rg4RK0ZVEQ==", "hasInstallScript": true, "dependencies": { - "@sasjs/adapter": "4.3.4", - "@sasjs/core": "4.45.4", - "@sasjs/lint": "2.3.0", + "@sasjs/adapter": "4.5.1", + "@sasjs/core": "4.46.3", + "@sasjs/lint": "2.3.1", "@sasjs/utils": "3.3.0", "adm-zip": "0.5.9", "chalk": "4.1.2", - "dotenv": "10.0.0", + "dotenv": "16.0.3", "esm": "3.2.25", "find": "0.3.0", "js-base64": "3.7.2", - "jsdom": "21.1.0", + "jsdom": "22.1.0", "jwt-decode": "3.1.2", "lodash.groupby": "4.6.0", "lodash.uniqby": "4.7.0", @@ -111,9 +111,9 @@ } }, "node_modules/@sasjs/cli/node_modules/@sasjs/core": { - "version": "4.45.4", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.45.4.tgz", - "integrity": "sha512-zf0foZHXNUb7hTHQAbGcQbHhiwX7qNK9g3PTT5XkjR8aDgcYeBpSxu1bEj7GTVvOmv49YF/3xrVZNh5J+38+DA==" + "version": "4.46.3", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.3.tgz", + "integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw==" }, "node_modules/@sasjs/core": { "version": "4.46.4", @@ -121,9 +121,9 @@ "integrity": "sha512-Q4UiOEYEHWCYn4ak+2BaKnrusLauyvKK/Hq4Y4RwJOfwA2MSjOzJSV8fDpbhnY1Dyubbk4SChA6yAL8lc0hn1Q==" }, "node_modules/@sasjs/lint": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.3.0.tgz", - "integrity": "sha512-ac3l4RUf3+87tmi2VCebibxQNIdiyzJuRGErka/BKXu+F4pBhUG1Y8t0lNISLDk6fm5uJXHpYrR5zck8J5tCtQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.3.1.tgz", + "integrity": "sha512-vvoMXAicuewxyiBmF9VkMziQsAA6+MSKMnmcmAfnbR5cvBVSDYDh6X7sAeWXyjNfWxuBweyP9nv6//FRiWaRMQ==", "hasInstallScript": true, "dependencies": { "@sasjs/utils": "2.52.0", @@ -254,34 +254,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-globals": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", - "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", - "dependencies": { - "acorn": "^8.1.0", - "acorn-walk": "^8.0.2" - } - }, - "node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/adm-zip": { "version": "0.5.9", "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz", @@ -556,43 +528,33 @@ "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==" }, - "node_modules/cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==" - }, "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", + "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", "dependencies": { - "cssom": "~0.3.6" + "rrweb-cssom": "^0.6.0" }, "engines": { - "node": ">=8" + "node": ">=14" } }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" - }, "node_modules/csv-stringify": { "version": "5.6.5", "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.5.tgz", "integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==" }, "node_modules/data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz", + "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==", "dependencies": { "abab": "^2.0.6", "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" + "whatwg-url": "^12.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/debug": { @@ -647,11 +609,11 @@ } }, "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", + "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==", "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/emoji-regex": { @@ -678,26 +640,6 @@ "node": ">=6" } }, - "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, "node_modules/esm": { "version": "3.2.25", "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", @@ -706,34 +648,6 @@ "node": ">=6" } }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -1036,26 +950,23 @@ "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" }, "node_modules/jsdom": { - "version": "21.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.0.tgz", - "integrity": "sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", + "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "dependencies": { "abab": "^2.0.6", - "acorn": "^8.8.1", - "acorn-globals": "^7.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.2", - "decimal.js": "^10.4.2", + "cssstyle": "^3.0.0", + "data-urls": "^4.0.0", + "decimal.js": "^10.4.3", "domexception": "^4.0.0", - "escodegen": "^2.0.0", "form-data": "^4.0.0", "html-encoding-sniffer": "^3.0.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.1", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.2", - "parse5": "^7.1.1", + "nwsapi": "^2.2.4", + "parse5": "^7.1.2", + "rrweb-cssom": "^0.6.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", "tough-cookie": "^4.1.2", @@ -1063,12 +974,12 @@ "webidl-conversions": "^7.0.0", "whatwg-encoding": "^2.0.0", "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0", - "ws": "^8.11.0", + "whatwg-url": "^12.0.1", + "ws": "^8.13.0", "xml-name-validator": "^4.0.0" }, "engines": { - "node": ">=14" + "node": ">=16" }, "peerDependencies": { "canvas": "^2.5.0" @@ -1079,28 +990,6 @@ } } }, - "node_modules/jsdom/node_modules/tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsdom/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -1258,9 +1147,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.6.tgz", - "integrity": "sha512-vSZ4miHQ4FojLjmz2+ux4B0/XA16jfwt/LBzIUftDpRd8tujHFkXjMyLwjS08fIZCzesj2z7gJukOKJwqebJAQ==" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==" }, "node_modules/once": { "version": "1.4.0", @@ -1492,6 +1381,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rrweb-cssom": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1553,15 +1447,6 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ssl-root-cas": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.3.1.tgz", @@ -1630,35 +1515,36 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "node_modules/tough-cookie": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { "node": ">=6" } }, "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "engines": { "node": ">= 4.0.0" } }, "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dependencies": { - "punycode": "^2.1.1" + "punycode": "^2.3.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/traverse-chain": { @@ -1745,15 +1631,15 @@ } }, "node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", + "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==", "dependencies": { - "tr46": "^3.0.0", + "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/wrap-ansi": { @@ -1869,16 +1755,16 @@ } }, "@sasjs/adapter": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.3.4.tgz", - "integrity": "sha512-hPLNPXqunbIXZY+rsRxwfiLehk8x9a0IG2/96geJqrgP4Xi705X2WqkTaCpJ+Lr9gFGk4PttdprokCl1yoHVNw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.5.1.tgz", + "integrity": "sha512-WeKDMfCivBywxDZ6t0jng78ZBPoMk8RIHKFTNDDmvuvmXq5Mr5oqZ0r5lRPB863XkGOeVi6UIEI1+JawZ2TlWQ==", "requires": { "@sasjs/utils": "2.52.0", "axios": "0.27.2", "axios-cookiejar-support": "1.0.1", "form-data": "4.0.0", "https": "1.0.0", - "tough-cookie": "4.0.0" + "tough-cookie": "4.1.3" }, "dependencies": { "@sasjs/utils": { @@ -1912,21 +1798,21 @@ } }, "@sasjs/cli": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.3.0.tgz", - "integrity": "sha512-LDObBUigusiBvq7SzkL49W5zel2YfjcmetdrftEnEdpWeVkVYYby77gJiW9iXdhrdVT+Hgrdubs6tA+RT0LskA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.4.2.tgz", + "integrity": "sha512-o1Qp+L7vJOH9dbsEPJK6GaQR7yWW+W0BAI1rrD55+Ij3USMCcdWcRJAOvFxwS8Gflq5BuNrVqa39rg4RK0ZVEQ==", "requires": { - "@sasjs/adapter": "4.3.4", - "@sasjs/core": "4.45.4", - "@sasjs/lint": "2.3.0", + "@sasjs/adapter": "4.5.1", + "@sasjs/core": "4.46.3", + "@sasjs/lint": "2.3.1", "@sasjs/utils": "3.3.0", "adm-zip": "0.5.9", "chalk": "4.1.2", - "dotenv": "10.0.0", + "dotenv": "16.0.3", "esm": "3.2.25", "find": "0.3.0", "js-base64": "3.7.2", - "jsdom": "21.1.0", + "jsdom": "22.1.0", "jwt-decode": "3.1.2", "lodash.groupby": "4.6.0", "lodash.uniqby": "4.7.0", @@ -1941,9 +1827,9 @@ }, "dependencies": { "@sasjs/core": { - "version": "4.45.4", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.45.4.tgz", - "integrity": "sha512-zf0foZHXNUb7hTHQAbGcQbHhiwX7qNK9g3PTT5XkjR8aDgcYeBpSxu1bEj7GTVvOmv49YF/3xrVZNh5J+38+DA==" + "version": "4.46.3", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.46.3.tgz", + "integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw==" } } }, @@ -1953,9 +1839,9 @@ "integrity": "sha512-Q4UiOEYEHWCYn4ak+2BaKnrusLauyvKK/Hq4Y4RwJOfwA2MSjOzJSV8fDpbhnY1Dyubbk4SChA6yAL8lc0hn1Q==" }, "@sasjs/lint": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.3.0.tgz", - "integrity": "sha512-ac3l4RUf3+87tmi2VCebibxQNIdiyzJuRGErka/BKXu+F4pBhUG1Y8t0lNISLDk6fm5uJXHpYrR5zck8J5tCtQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.3.1.tgz", + "integrity": "sha512-vvoMXAicuewxyiBmF9VkMziQsAA6+MSKMnmcmAfnbR5cvBVSDYDh6X7sAeWXyjNfWxuBweyP9nv6//FRiWaRMQ==", "requires": { "@sasjs/utils": "2.52.0", "ignore": "5.2.4" @@ -2074,25 +1960,6 @@ } } }, - "acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==" - }, - "acorn-globals": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", - "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", - "requires": { - "acorn": "^8.1.0", - "acorn-walk": "^8.0.2" - } - }, - "acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" - }, "adm-zip": { "version": "0.5.9", "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz", @@ -2280,24 +2147,12 @@ "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==" }, - "cssom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", - "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==" - }, "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", + "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" - } + "rrweb-cssom": "^0.6.0" } }, "csv-stringify": { @@ -2306,13 +2161,13 @@ "integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==" }, "data-urls": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", - "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz", + "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==", "requires": { "abab": "^2.0.6", "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0" + "whatwg-url": "^12.0.0" } }, "debug": { @@ -2350,9 +2205,9 @@ } }, "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", + "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==" }, "emoji-regex": { "version": "8.0.0", @@ -2369,37 +2224,11 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, - "escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "source-map": "~0.6.1" - } - }, "esm": { "version": "3.2.25", "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, "eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -2605,26 +2434,23 @@ "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" }, "jsdom": { - "version": "21.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.0.tgz", - "integrity": "sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", + "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "requires": { "abab": "^2.0.6", - "acorn": "^8.8.1", - "acorn-globals": "^7.0.0", - "cssom": "^0.5.0", - "cssstyle": "^2.3.0", - "data-urls": "^3.0.2", - "decimal.js": "^10.4.2", + "cssstyle": "^3.0.0", + "data-urls": "^4.0.0", + "decimal.js": "^10.4.3", "domexception": "^4.0.0", - "escodegen": "^2.0.0", "form-data": "^4.0.0", "html-encoding-sniffer": "^3.0.0", "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.1", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.2", - "parse5": "^7.1.1", + "nwsapi": "^2.2.4", + "parse5": "^7.1.2", + "rrweb-cssom": "^0.6.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", "tough-cookie": "^4.1.2", @@ -2632,27 +2458,9 @@ "webidl-conversions": "^7.0.0", "whatwg-encoding": "^2.0.0", "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^11.0.0", - "ws": "^8.11.0", + "whatwg-url": "^12.0.1", + "ws": "^8.13.0", "xml-name-validator": "^4.0.0" - }, - "dependencies": { - "tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - } - }, - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==" - } } }, "jsonfile": { @@ -2774,9 +2582,9 @@ } }, "nwsapi": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.6.tgz", - "integrity": "sha512-vSZ4miHQ4FojLjmz2+ux4B0/XA16jfwt/LBzIUftDpRd8tujHFkXjMyLwjS08fIZCzesj2z7gJukOKJwqebJAQ==" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==" }, "once": { "version": "1.4.0", @@ -2941,6 +2749,11 @@ "glob": "^7.1.3" } }, + "rrweb-cssom": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==" + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2979,12 +2792,6 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "optional": true - }, "ssl-root-cas": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.3.1.tgz", @@ -3038,28 +2845,29 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "tough-cookie": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "requires": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "dependencies": { "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==" } } }, "tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "requires": { - "punycode": "^2.1.1" + "punycode": "^2.3.0" } }, "traverse-chain": { @@ -3131,11 +2939,11 @@ "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==" }, "whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", + "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==", "requires": { - "tr46": "^3.0.0", + "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" } }, diff --git a/sas/package.json b/sas/package.json index 77558c3..26800c2 100644 --- a/sas/package.json +++ b/sas/package.json @@ -27,7 +27,7 @@ }, "private": true, "dependencies": { - "@sasjs/cli": "4.3.0", + "@sasjs/cli": "^4.4.2", "@sasjs/core": "^4.46.4" } } diff --git a/sas/sasjs/sasjsconfig.json b/sas/sasjs/sasjsconfig.json index 35a6487..b5ca395 100644 --- a/sas/sasjs/sasjsconfig.json +++ b/sas/sasjs/sasjsconfig.json @@ -240,13 +240,17 @@ }, { "name": "server", - "serverUrl": "https://sas.4gl.io:5006", + "serverUrl": "https://sas9.4gl.io", "serverType": "SASJS", "httpsAgentOptions": { "rejectUnauthorized": false, "allowInsecureRequests": true }, "appLoc": "/Public/app/dc", + "deployConfig": { + "deployServicePack": true, + "deployScripts": [] + }, "macroFolders": [ "sasjs/targets/server/macros_server" ], @@ -265,8 +269,8 @@ "streamConfig": { "streamWeb": true, "streamWebFolder": "web", - "streamServiceName": "DataController", "webSourcePath": "../client/dist", + "streamServiceName": "DataController", "streamLogo": "favicon.ico", "assetPaths": [] } diff --git a/sas/sasjs/services/auditors/postdata.test.1.sas b/sas/sasjs/services/auditors/postdata.test.1.sas index 933d527..ab5a20d 100644 --- a/sas/sasjs/services/auditors/postdata.test.1.sas +++ b/sas/sasjs/services/auditors/postdata.test.1.sas @@ -3,7 +3,7 @@ @brief testing postdata with mpe_x_test

SAS Macros

- @li mp_testservice.sas + @li mx_testservice.sas @li mp_assert.sas @@ -44,10 +44,11 @@ data work.jsdata; else stop; run; -%mp_testservice(&appLoc/services/editors/stagedata, +%mx_testservice(&appLoc/services/editors/stagedata, viyacontext=&defaultcontext, inputdatasets=work.jsdata work.sascontroltable, - outlib=web1 + outlib=web1, + mdebug=&sasjs_mdebug ) %let status=0; @@ -73,11 +74,12 @@ data work.sascontroltable; output; stop; run; -%mp_testservice(&appLoc/services/auditors/postdata, +%mx_testservice(&appLoc/services/auditors/postdata, viyacontext=&defaultcontext, inputdatasets=work.sascontroltable, outlib=web2, - outref=wbout + outref=wbout, + mdebug=&sasjs_mdebug ) %let leadcheck=0; @@ -86,7 +88,7 @@ data _null_; infile wbout; input; putlog _infile_; - /* the JSON libname option removes leading blanks!!!! */ + /* the JSON libname engine removes leading blanks!!!! */ if index(_infile_,' leadingblanks') then call symputx('leadcheck',1); /* there is no clean way to send a special missing - so is sent as string */ if index(_infile_,',"SOME_NUM":"_"') then call symputx('speshcheck',1); diff --git a/sas/sasjs/services/editors/getdata.test.sas b/sas/sasjs/services/editors/getdata.test.sas index 9f7aec9..d8139d0 100644 --- a/sas/sasjs/services/editors/getdata.test.sas +++ b/sas/sasjs/services/editors/getdata.test.sas @@ -7,7 +7,9 @@ @li mp_assertcolvals.sas @li mp_assertdsobs.sas @li mf_getuniquefileref.sas + @li mf_getuniquename.sas @li mp_filterstore.sas + @li mx_testservice.sas **/ @@ -23,10 +25,11 @@ data _null_; put 'LIBDS:$43.'; put "&dclib..MPE_TABLES"; run; -%mp_testservice(&_program, +%mx_testservice(&_program, viyacontext=&defaultcontext, inputfiles=&f1:sascontroltable, - outlib=web1 + outlib=web1, + mdebug=&sasjs_mdebug ) data _null_; infile "%sysfunc(pathname(WEB1))" lrecl=32767; @@ -44,8 +47,6 @@ data dqrules; set web1.dqrules; data dqdata; set web1.dqdata; -data spec; - set web1.spec; data cols; set web1.cols; data maxvarlengths; @@ -105,7 +106,7 @@ data _null_; put "&dclib..MPE_TABLES,&filter_rk"; run; -%mp_testservice(&_program, +%mx_testservice(&_program, viyacontext=&defaultcontext, inputfiles=&f2:sascontroltable, outlib=web2 @@ -133,13 +134,31 @@ run; * Test 3 - format catalog */ -/* first, make filter */ +/* first, make sure format data exists */ +%let fmtname=%upcase(%substr(%mf_getuniquename(prefix=FMT),1,15))NAME; + +/* add formats */ +data work.fmts; + length fmtname $32; + fmtname="&fmtname"; + do start=1 to 10; + label= cats("&fmtname",start); + output; + end; +run; +proc sort data=work.fmts nodupkey; + by fmtname; +run; +proc format cntlin=work.fmts library=dctest.dcfmts; +run; + +/* now, make filter */ data work.inquery3; infile datalines4 dsd; input GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32. OPERATOR_NM:$10. RAW_VALUE:$4000.; datalines4; -AND,AND,1,FMTNAME,CONTAINS,"'MOR'" +AND,AND,1,FMTNAME,CONTAINS,"'&fmtname'" ;;;; run; %mp_filterstore( @@ -164,14 +183,16 @@ data _null_; put "DCTEST.DCFMTS-FC,&filter_rk3"; run; -%mp_testservice(&_program, +%mx_testservice(&_program, viyacontext=&defaultcontext, inputfiles=&f3:sascontroltable, - outlib=web3 + outlib=web3, + mdebug=&sasjs_mdebug ) data sasdata3; set web3.sasdata; + putlog (_all_)(=); data query3; set web3.query; run; @@ -183,6 +204,6 @@ run; ) %mp_assertdsobs(work.sasdata3, desc=Test3 - format data has rows, - test=ATLEAST 5, + test=EQUALS 10, outds=work.test_results ) diff --git a/sas/sasjs/services/editors/stagedata.test.2.sas b/sas/sasjs/services/editors/stagedata.test.2.sas index ba52dbf..d527910 100644 --- a/sas/sasjs/services/editors/stagedata.test.2.sas +++ b/sas/sasjs/services/editors/stagedata.test.2.sas @@ -3,7 +3,7 @@ @brief testing stagedata with format table

SAS Macros

- @li mp_testservice.sas + @li mx_testservice.sas @li mp_assert.sas @@ -29,10 +29,11 @@ data work.jsdata; if _n_>20 then stop; run; -%mp_testservice(&_program, +%mx_testservice(&_program, viyacontext=&defaultcontext, inputdatasets=work.sascontroltable work.jsdata, - outlib=web1 + outlib=web1, + mdebug=&sasjs_mdebug ) %let status=0; diff --git a/sas/sasjs/services/public/getrawdata.test.sas b/sas/sasjs/services/public/getrawdata.test.sas index 0210929..becdbd8 100644 --- a/sas/sasjs/services/public/getrawdata.test.sas +++ b/sas/sasjs/services/public/getrawdata.test.sas @@ -51,7 +51,7 @@ data work.params2; name='filter';value='0';output; run; -%mp_testservice(&_program, +%mx_testservice(&_program, viyacontext=&defaultcontext, inputparams=work.params2, outref=web2, diff --git a/sas/sasjs/services/public/refreshlibinfo.test.sas b/sas/sasjs/services/public/refreshlibinfo.test.sas index d396e28..8df2dbe 100644 --- a/sas/sasjs/services/public/refreshlibinfo.test.sas +++ b/sas/sasjs/services/public/refreshlibinfo.test.sas @@ -28,7 +28,7 @@ run; data work.libinfo; set web1.libinfo; putlog (_all_)(=); - call symputx('libref',libref); + call symputx('libref',libname); run; %mp_assert( diff --git a/sas/sasjs/services/public/viewdata.test.1.sas b/sas/sasjs/services/public/viewdata.test.1.sas index 73403fe..2d42922 100644 --- a/sas/sasjs/services/public/viewdata.test.1.sas +++ b/sas/sasjs/services/public/viewdata.test.1.sas @@ -14,10 +14,23 @@ **/ -/* first, validate the filter and get the RK */ +/* first, ensure the table has the 3 records we need */ +proc sql; +delete from &dclib..mpe_x_test where PRIMARY_KEY_FIELD in (1,2,3); +data work.append; + set &dclib..mpe_x_test; + do PRIMARY_KEY_FIELD=1,2,3; + output; + end; + stop; +run; +proc append base=&dclib..mpe_x_test data=work.append; +run; + +/* now, validate the filter and get the RK */ %let _program=&appLoc/services/public/validatefilter; -/* filter for one record */ +/* create filter */ %let f1=%mf_getuniquefileref(); data _null_; file &f1 termstr=crlf; diff --git a/sas/sasjs/tests/testsetup.sas b/sas/sasjs/tests/testsetup.sas index cae8ec9..dd9df5c 100644 --- a/sas/sasjs/tests/testsetup.sas +++ b/sas/sasjs/tests/testsetup.sas @@ -75,7 +75,7 @@ data work.fmts; end; run; proc sort data=work.fmts nodupkey; - by type fmtname fmtrow; + by fmtname; run; proc format cntlin=work.fmts library=dctest.dcfmts; run;