From 982d507ae3ad2ccc08e65678956199cd54b696f2 Mon Sep 17 00:00:00 2001 From: allan Date: Mon, 29 Jun 2026 17:42:05 +0100 Subject: [PATCH] fix: upcasing RAW_VALUE, bumping core, fixing tests --- sas/package-lock.json | 61 ++++++------------- sas/package.json | 4 +- .../editors/getdynamiccolvals.test.1.sas | 4 +- .../services/validations/columns_in_libds.sas | 1 + .../services/validations/mpe_tables.dsn.sas | 4 +- 5 files changed, 27 insertions(+), 47 deletions(-) diff --git a/sas/package-lock.json b/sas/package-lock.json index 185ec6e..c961d9e 100644 --- a/sas/package-lock.json +++ b/sas/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "dc-sas", "dependencies": { - "@sasjs/cli": "4.17.5", - "@sasjs/core": "4.67.2" + "@sasjs/cli": "4.18.0", + "@sasjs/core": "4.67.3" } }, "node_modules/@asamuzakjp/css-color": { @@ -202,15 +202,15 @@ } }, "node_modules/@sasjs/adapter": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.17.0.tgz", - "integrity": "sha512-m3fj3glI7ppIMm9zIthOVnqtXEtF0BHFyXRzijhCgoVwYaP6vE7Mm3+GDsJBQ+cW3F0rYHovkp5Rmhu7oDTm8g==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.17.1.tgz", + "integrity": "sha512-MxTvAoVnr+sBmKtB+CHxDiwvsqfzBqQ3BT/Q2Of6g7WWzJRBvpJcpf6C9R80Uq/cxvEie9JAM3EfExtFEYlcLg==", "license": "ISC", "dependencies": { "@sasjs/utils": "^3.5.6", "axios": "1.16.0", "axios-cookiejar-support": "5.0.5", - "form-data": "4.0.4", + "form-data": "4.0.6", "https": "1.0.0", "tough-cookie": "4.1.3" } @@ -251,13 +251,13 @@ } }, "node_modules/@sasjs/cli": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.17.5.tgz", - "integrity": "sha512-3WQkF91ebgnKwoLak0dTrlFPTupR6auWBmKmicOoI5nFrLRCMt60o3XKZWRxIl7hT5ZcsSomo3XLy8ou1X9wBw==", + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.18.0.tgz", + "integrity": "sha512-QFsLS9XXF64x9w51kYkmx3ZUWCA9ycVDeLIaNJpHcaTu6jgPRAVHQ61ShXBKlYp/Vrze9pNapW43iaXt7o6VEA==", "license": "ISC", "dependencies": { - "@sasjs/adapter": "4.17.0", - "@sasjs/core": "4.67.1", + "@sasjs/adapter": "4.17.1", + "@sasjs/core": "4.67.3", "@sasjs/lint": "2.4.3", "@sasjs/utils": "3.5.8", "adm-zip": "0.5.10", @@ -281,12 +281,6 @@ "sasjs": "build/index.js" } }, - "node_modules/@sasjs/cli/node_modules/@sasjs/core": { - "version": "4.67.1", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.67.1.tgz", - "integrity": "sha512-yb4xW8JxsWWY3ZTN4yj/mP8ZasPIHSQVjHESLui3xS0HNatBw96H9ZYGJO3LcrkDx+X5xJz45f6sdHAJYxVeSA==", - "license": "MIT" - }, "node_modules/@sasjs/cli/node_modules/@sasjs/utils": { "version": "3.5.8", "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.8.tgz", @@ -323,9 +317,9 @@ } }, "node_modules/@sasjs/core": { - "version": "4.67.2", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.67.2.tgz", - "integrity": "sha512-69kLZXIAgE2Ftz7b2tNISBp0iSyXFBHlLNqJ2aC6pAOJLFDGCB7Mw4R8bwmG9di3smZnV+wgq6S6lTesl349dA==", + "version": "4.67.3", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.67.3.tgz", + "integrity": "sha512-7s4UeVN4slF1URo1C5/UnNVv+TonUg+vBktFRiFhcbFYr3RnfXyClBPED6nQOF8AFd2xdXEss58hsCeIebr4lg==", "license": "MIT" }, "node_modules/@sasjs/lint": { @@ -472,6 +466,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz", "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==", "license": "MIT", + "peer": true, "dependencies": { "follow-redirects": "^1.16.0", "form-data": "^4.0.5", @@ -497,22 +492,6 @@ "tough-cookie": ">=4.0.0" } }, - "node_modules/axios/node_modules/form-data": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", - "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.4", - "mime-types": "^2.1.35" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -1039,16 +1018,16 @@ } }, "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", + "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" + "hasown": "^2.0.4", + "mime-types": "^2.1.35" }, "engines": { "node": ">= 6" diff --git a/sas/package.json b/sas/package.json index 02f05d4..d5ade78 100644 --- a/sas/package.json +++ b/sas/package.json @@ -28,7 +28,7 @@ }, "private": true, "dependencies": { - "@sasjs/cli": "4.17.5", - "@sasjs/core": "4.67.2" + "@sasjs/cli": "4.18.0", + "@sasjs/core": "4.67.3" } } diff --git a/sas/sasjs/services/editors/getdynamiccolvals.test.1.sas b/sas/sasjs/services/editors/getdynamiccolvals.test.1.sas index a2b0809..cda2b9b 100644 --- a/sas/sasjs/services/editors/getdynamiccolvals.test.1.sas +++ b/sas/sasjs/services/editors/getdynamiccolvals.test.1.sas @@ -48,7 +48,7 @@ run; and the two array elements (DISPLAY_INDEX, RAW_VALUE) */ %mp_assertcols(work.DYNAMIC_VALUES, - cols=element1 element2, + cols=display_index raw_value, test=ALL, desc=Check two columns exist in DYNAMIC_VALUES ) @@ -93,7 +93,7 @@ run; data work.check; val="&dclib"; run; -%mp_assertcolvals(work.dynamic_values.element2, +%mp_assertcolvals(work.dynamic_values.raw_value, checkvals=work.check.val, desc=DCLIB found in getdynamicgolvals RAW_VALUE response, test=ANYVAL diff --git a/sas/sasjs/services/validations/columns_in_libds.sas b/sas/sasjs/services/validations/columns_in_libds.sas index 9f121a4..7877e62 100644 --- a/sas/sasjs/services/validations/columns_in_libds.sas +++ b/sas/sasjs/services/validations/columns_in_libds.sas @@ -102,6 +102,7 @@ run; data work.DYNAMIC_VALUES; set work.DYNAMIC_VALUES; format raw_value; + raw_value=upcase(raw_value); run; diff --git a/sas/sasjs/services/validations/mpe_tables.dsn.sas b/sas/sasjs/services/validations/mpe_tables.dsn.sas index a061890..d56bcde 100644 --- a/sas/sasjs/services/validations/mpe_tables.dsn.sas +++ b/sas/sasjs/services/validations/mpe_tables.dsn.sas @@ -35,7 +35,7 @@ The FORCED_VALUE column can be used to force an extended value to be selected by default when a particular value is chosen. - |DISPLAY_INDEX:best.|EXTRA_COL_NAME:$32.|DISPLAY_TYPE:$1.|RAW_VALUE_NUM|RAW_VALUE_CHAR:$5000| + |DISPLAY_INDEX|EXTRA_COL_NAME:$32.|DISPLAY_TYPE:$1.|RAW_VALUE_NUM|RAW_VALUE_CHAR:$5000| |---|---|---|---|---| |1|DISCOUNT_RT|N|0.5|| |1|DISCOUNT_RT|N|0.4|| @@ -93,7 +93,7 @@ create table work.source as and memtype='DATA'; create table work.members as - select distinct memname as raw_value + select distinct upcase(memname) as raw_value from work.source; data work.DYNAMIC_VALUES;