1
0
mirror of https://github.com/sasjs/core.git synced 2026-01-03 15:40:05 +00:00

fix: formats

This commit is contained in:
munja
2022-01-07 13:14:40 +01:00
parent 77d1cdb753
commit cd33355418
6 changed files with 65 additions and 53 deletions

12
all.sas
View File

@@ -7690,7 +7690,7 @@ filename &tempref clear;
data &tempds/view=&tempds;
attrib _all_ label='';
%do i=1 %to &numcols;
%if &&typelong&i=char %then %do;
%if &&typelong&i=char or &fmt=Y %then %do;
length &&name&i $32767;
format &&name&i $32767.;
%end;
@@ -7703,7 +7703,7 @@ filename &tempref clear;
%end;
format _numeric_ bart.;
%do i=1 %to &numcols;
%if &&typelong&i=char %then %do;
%if &&typelong&i=char or &fmt=Y %then %do;
&&name&i='"'!!trim(prxchange('s/"/\"/',-1,
prxchange('s/'!!'0A'x!!'/\n/',-1,
prxchange('s/'!!'0D'x!!'/\r/',-1,
@@ -12820,7 +12820,7 @@ data _null_;
put ' data &tempds/view=&tempds; ';
put ' attrib _all_ label=''''; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' length &&name&i $32767; ';
put ' format &&name&i $32767.; ';
put ' %end; ';
@@ -12833,7 +12833,7 @@ data _null_;
put ' %end; ';
put ' format _numeric_ bart.; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' &&name&i=''"''!!trim(prxchange(''s/"/\"/'',-1, ';
put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';
@@ -17951,7 +17951,7 @@ data _null_;
put ' data &tempds/view=&tempds; ';
put ' attrib _all_ label=''''; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' length &&name&i $32767; ';
put ' format &&name&i $32767.; ';
put ' %end; ';
@@ -17964,7 +17964,7 @@ data _null_;
put ' %end; ';
put ' format _numeric_ bart.; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' &&name&i=''"''!!trim(prxchange(''s/"/\"/'',-1, ';
put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';

View File

@@ -181,7 +181,7 @@
data &tempds/view=&tempds;
attrib _all_ label='';
%do i=1 %to &numcols;
%if &&typelong&i=char %then %do;
%if &&typelong&i=char or &fmt=Y %then %do;
length &&name&i $32767;
format &&name&i $32767.;
%end;
@@ -194,7 +194,7 @@
%end;
format _numeric_ bart.;
%do i=1 %to &numcols;
%if &&typelong&i=char %then %do;
%if &&typelong&i=char or &fmt=Y %then %do;
&&name&i='"'!!trim(prxchange('s/"/\"/',-1,
prxchange('s/'!!'0A'x!!'/\n/',-1,
prxchange('s/'!!'0D'x!!'/\r/',-1,

View File

@@ -214,7 +214,7 @@ data _null_;
put ' data &tempds/view=&tempds; ';
put ' attrib _all_ label=''''; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' length &&name&i $32767; ';
put ' format &&name&i $32767.; ';
put ' %end; ';
@@ -227,7 +227,7 @@ data _null_;
put ' %end; ';
put ' format _numeric_ bart.; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' &&name&i=''"''!!trim(prxchange(''s/"/\"/'',-1, ';
put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';

90
package-lock.json generated
View File

@@ -10,13 +10,13 @@
"ts-loader": "^9.2.6"
},
"devDependencies": {
"@sasjs/cli": "^2.39.0"
"@sasjs/cli": "^3.4.1"
}
},
"node_modules/@sasjs/adapter": {
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.12.0.tgz",
"integrity": "sha512-zzIuohhR8KUDl3DfIFOW38gv3LADPnOBCLOvLoKu4hH5R/UJDkjZ/Gdgc8B35vI7aOprYOLK/T5D/Z44OaTkqw==",
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-3.3.1.tgz",
"integrity": "sha512-rmdOG+sjmwGipq1AHczwEXNUlzRFV5efj89neVVJWQMZR6JBC1O6Dr9HjEyJHPKcnQ6z3vzH9rRA2PGi5lgMhA==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -29,16 +29,16 @@
}
},
"node_modules/@sasjs/cli": {
"version": "2.39.0",
"resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.39.0.tgz",
"integrity": "sha512-n2LcU4n0QCEbUpXqZnBz/Ey5Td0nMJmgJpZRymMGfYEM0Y0x/CeXemd+kXHPjUvgQ+FX+SQzcvUQTEY/YlT4hA==",
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-3.4.1.tgz",
"integrity": "sha512-voc0/h8bkRAqrj7Pu1egYfCOSFLlLrrh9bXVLuGvSvWK81MezRZnWciTHlQGc9BgO2wU+LrQ0baIMd6u/HMB5Q==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
"@sasjs/adapter": "2.12.0",
"@sasjs/core": "2.45.2",
"@sasjs/adapter": "3.3.1",
"@sasjs/core": "^3.8.0",
"@sasjs/lint": "1.11.2",
"@sasjs/utils": "2.32.0",
"@sasjs/utils": "2.34.1",
"chalk": "4.1.2",
"csv-stringify": "5.6.5",
"dotenv": "10.0.0",
@@ -62,10 +62,13 @@
}
},
"node_modules/@sasjs/core": {
"version": "2.45.2",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.45.2.tgz",
"integrity": "sha512-tg+oZCD8GFMXsg+vDL66LMnyU+t151Hrqd7yl+pMXH2qwkA14N/j6QdkTBZOchskqOA/3PnpOlAZN/xxMW2gdg==",
"dev": true
"version": "3.8.1",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-3.8.1.tgz",
"integrity": "sha512-Yxak+WZwh8Z9IKcbi7aDDTRCcKlI6IUp7Ujavkec5pWMj3a2FSlLxu23lY2ERTBe7wMCGiaU7AseWlKcgd5joA==",
"dev": true,
"dependencies": {
"ts-loader": "^9.2.6"
}
},
"node_modules/@sasjs/lint": {
"version": "1.11.2",
@@ -77,9 +80,9 @@
}
},
"node_modules/@sasjs/utils": {
"version": "2.32.0",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.32.0.tgz",
"integrity": "sha512-xnvdEuI4PhTtulcdDEIMK7IxVj9bOMU1JTnxRuSEKWcsclY9P9Fw3cnMOOEgXCDffrOPn3f54DP7Wb1GXd+f8g==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.34.1.tgz",
"integrity": "sha512-hd1qieH3d7+xH96n5DpRGTEazeAhYyBBKCdnKhOXMgF2TZVoHFdRs5REfT88CKza6DHBGRVGnIVm5ORGP4cVLg==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -89,8 +92,11 @@
"cli-table": "^0.3.6",
"consola": "^2.15.0",
"csv-stringify": "^5.6.5",
"find": "0.3.0",
"fs-extra": "^10.0.0",
"jwt-decode": "^3.1.2",
"lodash.groupby": "4.6.0",
"lodash.uniqby": "4.7.0",
"prompts": "^2.4.1",
"rimraf": "^3.0.2",
"valid-url": "^1.0.9"
@@ -1051,9 +1057,9 @@
}
},
"node_modules/follow-redirects": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
"version": "1.14.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
"integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
"dev": true,
"funding": [
{
@@ -2581,9 +2587,9 @@
},
"dependencies": {
"@sasjs/adapter": {
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.12.0.tgz",
"integrity": "sha512-zzIuohhR8KUDl3DfIFOW38gv3LADPnOBCLOvLoKu4hH5R/UJDkjZ/Gdgc8B35vI7aOprYOLK/T5D/Z44OaTkqw==",
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-3.3.1.tgz",
"integrity": "sha512-rmdOG+sjmwGipq1AHczwEXNUlzRFV5efj89neVVJWQMZR6JBC1O6Dr9HjEyJHPKcnQ6z3vzH9rRA2PGi5lgMhA==",
"dev": true,
"requires": {
"@sasjs/utils": "^2.32.0",
@@ -2595,15 +2601,15 @@
}
},
"@sasjs/cli": {
"version": "2.39.0",
"resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.39.0.tgz",
"integrity": "sha512-n2LcU4n0QCEbUpXqZnBz/Ey5Td0nMJmgJpZRymMGfYEM0Y0x/CeXemd+kXHPjUvgQ+FX+SQzcvUQTEY/YlT4hA==",
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-3.4.1.tgz",
"integrity": "sha512-voc0/h8bkRAqrj7Pu1egYfCOSFLlLrrh9bXVLuGvSvWK81MezRZnWciTHlQGc9BgO2wU+LrQ0baIMd6u/HMB5Q==",
"dev": true,
"requires": {
"@sasjs/adapter": "2.12.0",
"@sasjs/core": "2.45.2",
"@sasjs/adapter": "3.3.1",
"@sasjs/core": "^3.8.0",
"@sasjs/lint": "1.11.2",
"@sasjs/utils": "2.32.0",
"@sasjs/utils": "2.34.1",
"chalk": "4.1.2",
"csv-stringify": "5.6.5",
"dotenv": "10.0.0",
@@ -2624,10 +2630,13 @@
}
},
"@sasjs/core": {
"version": "2.45.2",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.45.2.tgz",
"integrity": "sha512-tg+oZCD8GFMXsg+vDL66LMnyU+t151Hrqd7yl+pMXH2qwkA14N/j6QdkTBZOchskqOA/3PnpOlAZN/xxMW2gdg==",
"dev": true
"version": "3.8.1",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-3.8.1.tgz",
"integrity": "sha512-Yxak+WZwh8Z9IKcbi7aDDTRCcKlI6IUp7Ujavkec5pWMj3a2FSlLxu23lY2ERTBe7wMCGiaU7AseWlKcgd5joA==",
"dev": true,
"requires": {
"ts-loader": "^9.2.6"
}
},
"@sasjs/lint": {
"version": "1.11.2",
@@ -2639,9 +2648,9 @@
}
},
"@sasjs/utils": {
"version": "2.32.0",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.32.0.tgz",
"integrity": "sha512-xnvdEuI4PhTtulcdDEIMK7IxVj9bOMU1JTnxRuSEKWcsclY9P9Fw3cnMOOEgXCDffrOPn3f54DP7Wb1GXd+f8g==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.34.1.tgz",
"integrity": "sha512-hd1qieH3d7+xH96n5DpRGTEazeAhYyBBKCdnKhOXMgF2TZVoHFdRs5REfT88CKza6DHBGRVGnIVm5ORGP4cVLg==",
"dev": true,
"requires": {
"@types/fs-extra": "^9.0.11",
@@ -2650,8 +2659,11 @@
"cli-table": "^0.3.6",
"consola": "^2.15.0",
"csv-stringify": "^5.6.5",
"find": "0.3.0",
"fs-extra": "^10.0.0",
"jwt-decode": "^3.1.2",
"lodash.groupby": "4.6.0",
"lodash.uniqby": "4.7.0",
"prompts": "^2.4.1",
"rimraf": "^3.0.2",
"valid-url": "^1.0.9"
@@ -3421,9 +3433,9 @@
}
},
"follow-redirects": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
"version": "1.14.6",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
"integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
"dev": true
},
"form-data": {

View File

@@ -33,9 +33,9 @@
"prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
},
"devDependencies": {
"@sasjs/cli": "^2.39.0"
"@sasjs/cli": "^3.4.1"
},
"dependencies": {
"ts-loader": "^9.2.6"
}
}
}

View File

@@ -358,7 +358,7 @@ data _null_;
put ' data &tempds/view=&tempds; ';
put ' attrib _all_ label=''''; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' length &&name&i $32767; ';
put ' format &&name&i $32767.; ';
put ' %end; ';
@@ -371,7 +371,7 @@ data _null_;
put ' %end; ';
put ' format _numeric_ bart.; ';
put ' %do i=1 %to &numcols; ';
put ' %if &&typelong&i=char %then %do; ';
put ' %if &&typelong&i=char or &fmt=Y %then %do; ';
put ' &&name&i=''"''!!trim(prxchange(''s/"/\"/'',-1, ';
put ' prxchange(''s/''!!''0A''x!!''/\n/'',-1, ';
put ' prxchange(''s/''!!''0D''x!!''/\r/'',-1, ';