From 6f19d3d0ea3815815f246a3e455495c72c8604c7 Mon Sep 17 00:00:00 2001 From: munja Date: Wed, 16 Feb 2022 21:03:16 +0000 Subject: [PATCH 1/2] feat: default macros and bumping core --- api/scripts/systemInit.sas | 19 ++++++++++++++++--- package-lock.json | 13 +++++++++++++ package.json | 3 +++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/api/scripts/systemInit.sas b/api/scripts/systemInit.sas index 87c1cd4..c92e858 100644 --- a/api/scripts/systemInit.sas +++ b/api/scripts/systemInit.sas @@ -4,11 +4,24 @@ @details This program is inserted into every sasjs/server program invocation, _before_ any user-provided content. + A number of useful CORE macros are also compiled below, so that they can be + available "out of the box". +

SAS Macros

@li mcf_stpsrv_header.sas + @li mf_getuser.sas + @li mf_getvarlist.sas + @li mf_mkdir.sas + @li mf_nobs.sas + @li mf_uid.sas + @li mfs_httpheader.sas + @li mp_dirlist.sas + @li mp_ds2ddl.sas + @li mp_ds2md.sas + @li mp_getdbml.sas + @li mp_init.sas + @li mp_makedata.sas + @li mp_zip.sas **/ -/* to be replaced with mfs_httpheader -%mcf_stpsrv_header(wrap=YES, insert_cmplib=YES) -*/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ac1747c..1ac1754 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,9 @@ "": { "name": "server", "version": "0.0.27", + "dependencies": { + "@sasjs/core": "4.9.0" + }, "devDependencies": { "prettier": "^2.3.1", "standard-version": "^9.3.2" @@ -56,6 +59,11 @@ "node": ">=6.9.0" } }, + "node_modules/@sasjs/core": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", + "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" + }, "node_modules/@types/minimist": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", @@ -2145,6 +2153,11 @@ "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", "dev": true }, + "@sasjs/core": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", + "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" + }, "@types/minimist": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", diff --git a/package.json b/package.json index 3f5135d..3e41fd2 100644 --- a/package.json +++ b/package.json @@ -18,5 +18,8 @@ "devDependencies": { "prettier": "^2.3.1", "standard-version": "^9.3.2" + }, + "dependencies": { + "@sasjs/core": "4.9.0" } } From f10138b0f2005a958f63cb3a8351e1afa52f086a Mon Sep 17 00:00:00 2001 From: munja Date: Wed, 16 Feb 2022 21:05:22 +0000 Subject: [PATCH 2/2] fix: moving core --- api/package-lock.json | 14 +++++++------- api/package.json | 2 +- package-lock.json | 13 ------------- package.json | 5 +---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 14e8719..e670a4a 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -8,7 +8,7 @@ "name": "api", "version": "0.0.2", "dependencies": { - "@sasjs/core": "4.8.0", + "@sasjs/core": "4.9.0", "@sasjs/utils": "2.34.1", "bcryptjs": "^2.4.3", "cors": "^2.8.5", @@ -1418,9 +1418,9 @@ } }, "node_modules/@sasjs/core": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.8.0.tgz", - "integrity": "sha512-go31UvPRzOqWJm2hkM+9/KQXIky9SA7bFMLa2d1dMfpdrX0XQyw+dcDM3jHD/agtcATWYJ9exJrET7Bkj148YQ==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", + "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" }, "node_modules/@sasjs/utils": { "version": "2.34.1", @@ -11132,9 +11132,9 @@ } }, "@sasjs/core": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.8.0.tgz", - "integrity": "sha512-go31UvPRzOqWJm2hkM+9/KQXIky9SA7bFMLa2d1dMfpdrX0XQyw+dcDM3jHD/agtcATWYJ9exJrET7Bkj148YQ==" + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", + "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" }, "@sasjs/utils": { "version": "2.34.1", diff --git a/api/package.json b/api/package.json index cda4a92..1232e07 100644 --- a/api/package.json +++ b/api/package.json @@ -43,7 +43,7 @@ }, "author": "4GL Ltd", "dependencies": { - "@sasjs/core": "4.8.0", + "@sasjs/core": "4.9.0", "@sasjs/utils": "2.34.1", "bcryptjs": "^2.4.3", "cors": "^2.8.5", diff --git a/package-lock.json b/package-lock.json index 1ac1754..ac1747c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,9 +7,6 @@ "": { "name": "server", "version": "0.0.27", - "dependencies": { - "@sasjs/core": "4.9.0" - }, "devDependencies": { "prettier": "^2.3.1", "standard-version": "^9.3.2" @@ -59,11 +56,6 @@ "node": ">=6.9.0" } }, - "node_modules/@sasjs/core": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", - "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" - }, "node_modules/@types/minimist": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", @@ -2153,11 +2145,6 @@ "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", "dev": true }, - "@sasjs/core": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz", - "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ==" - }, "@types/minimist": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", diff --git a/package.json b/package.json index 3e41fd2..c3fd7bc 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,5 @@ "devDependencies": { "prettier": "^2.3.1", "standard-version": "^9.3.2" - }, - "dependencies": { - "@sasjs/core": "4.9.0" } -} +} \ No newline at end of file