Merge pull request #53 from sasjs/base64doublebytefix

fix: mp_base64copy.sas fixes, removed renegade % symbol and issue wit…
fix: mp_base64copy.sas fixes, removed renegade % symbol and issue with truncation at character 76. Added two tests, including one to test double byte encoded characters.
2025-12-25 04:01:20 +00:00 · 2021-07-18 17:16:58 +03:00 · 2021-07-18 17:05:05 +03:00 · 2021-07-10 09:40:48 +03:00 · 2021-07-10 03:43:58 +05:00 · 2021-06-30 19:50:20 +03:00
4 changed files with 140 additions and 79 deletions
--- a/base/mp_base64copy.sas
+++ b/base/mp_base64copy.sas
@@ -76,7 +76,7 @@ run;

 %if &outfound=0 %then %do;
  filename &outref temp lrecl=2097088;
-%%end;
+%end;

 %if &action=ENCODE %then %do;
  data _null_;
@@ -84,12 +84,12 @@ run;
    retain line "";
    infile &inref recfm=F lrecl= 1 end=eof;
    input @1 stream $char1.;
-    file &outref lrecl=76;
+    file &outref recfm=N;
    substr(line,(_N_-(CEIL(_N_/57)-1)*57),1) = byte(rank(stream));
    if mod(_N_,57)=0 or EOF then do;
      if eof then b64=put(trim(line),$base64X76.);
      else b64=put(line, $base64X76.);
-      put b64;
+      put b64 + (-1) @;
      line="";
    end;
  run;
@@ -101,19 +101,13 @@ run;
    fileout = fopen("&outref",'O',3,'B');
    char= '20'x;
    do while(fread(filein)=0);
-      raw="1234";
+      length raw $4;
      do i=1 to 4;
        rc=fget(filein,char,1);
        substr(raw,i,1)=char;
      end;
-      val="123";
-      val=input(raw,$base64X4.);
-      do i=1 to 3;
-        length byte $1;
-        byte=byte(rank(substr(val,i,1)));
-        rc = fput(fileout, byte);
-      end;
-      rc =fwrite(fileout);
+      rc = fput(fileout,input(raw,$base64X4.));
+      rc = fwrite(fileout);
    end;
    rc = fclose(filein);
    rc = fclose(fileout);
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,38 +5,37 @@
  "packages": {
    "": {
      "name": "@sasjs/core",
-      "hasInstallScript": true,
      "license": "MIT",
      "devDependencies": {
-        "@sasjs/cli": "^2.27.0"
+        "@sasjs/cli": "2.33.3"
      }
    },
    "node_modules/@sasjs/adapter": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.6.3.tgz",
-      "integrity": "sha512-Mg1AIDd0JDa0/UjvvmrGxjkpYmGEpqmD1dOYmS55EJG5loAENaVKJg9Ht8bU2XFyVaMbFpgB2yqDd0VWPP4eBA==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.8.9.tgz",
+      "integrity": "sha512-8UChcZlqqlmaMMaKOCr2Bc1h+i2KVDY0FINlPXQN5PdAgEMd8dbxI2p9bsiI1yjYjOBO9LuMl7B79/mwYCtyEw==",
      "dev": true,
-      "hasInstallScript": true,
      "dependencies": {
-        "@sasjs/utils": "^2.18.0",
+        "@sasjs/utils": "^2.21.0",
        "axios": "^0.21.1",
        "axios-cookiejar-support": "^1.0.1",
        "form-data": "^4.0.0",
        "https": "^1.0.0",
+        "jwt-decode": "^3.1.2",
        "tough-cookie": "^4.0.0",
        "url": "^0.11.0"
      }
    },
    "node_modules/@sasjs/cli": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.27.0.tgz",
-      "integrity": "sha512-jdQBNFbqvkidCL2+V6kuGk66YGH9BshHetPIzYSUCJPYrsKdWYRk0+OP+dZZ4qcNk8yLbcwZH+Z6Y1xh9yroFg==",
+      "version": "2.33.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.33.3.tgz",
+      "integrity": "sha512-y1uFM5MEE6eoKLrPUJbweDt4njSy9Y3CS5w5/U2xwNbiAyhiPXgkwCHjCQ8Qg+0rQnMvyNEn6qJuJZ3udc6T7w==",
      "dev": true,
      "dependencies": {
-        "@sasjs/adapter": "2.6.3",
-        "@sasjs/core": "2.34.5",
-        "@sasjs/lint": "1.11.1",
-        "@sasjs/utils": "2.21.0",
+        "@sasjs/adapter": "2.8.9",
+        "@sasjs/core": "2.35.3",
+        "@sasjs/lint": "1.11.2",
+        "@sasjs/utils": "2.23.3",
        "@types/url-parse": "1.4.3",
        "btoa": "1.2.1",
        "chalk": "4.1.1",
@@ -61,34 +60,32 @@
      }
    },
    "node_modules/@sasjs/core": {
-      "version": "2.34.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.34.5.tgz",
-      "integrity": "sha512-aq84ce9zmyAnkhKlSQ2SGZSQyJ5+EQAaUwktWfPhVdV9B6FJJSrQL3s1K/Dw9IuMczJcZcBlS4HO/w+goQBgyw==",
-      "dev": true,
-      "hasInstallScript": true
+      "version": "2.35.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.35.3.tgz",
+      "integrity": "sha512-3o5PU6DkihpA+Aibt1lRy4USqJI0VFa+wNsKCD+bUD2DLZICU3JablZQxwAPH70VWJGXAUJtDFj0T/iRo5Devg==",
+      "dev": true
    },
    "node_modules/@sasjs/lint": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-1.11.1.tgz",
-      "integrity": "sha512-nb0xFwXSDrE1qQLYV8whUoaXX2lh4nN3jbA/dOlLpjmF+8uvpgZo9GHy5vz5cpIhtguxiFd7lOGN/zyrzKO8yg==",
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-1.11.2.tgz",
+      "integrity": "sha512-zEonhvha9kwrD+hxhG0hEhtfqpXwffH4vRDIr6eDiXkC7S8M3yImpjyFBvX/THJO5+8iuY8TYkOXKl7+nK/wAg==",
      "dev": true,
-      "hasInstallScript": true,
      "dependencies": {
        "@sasjs/utils": "^2.19.0"
      }
    },
    "node_modules/@sasjs/utils": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.21.0.tgz",
-      "integrity": "sha512-ehRF1VHBiF8FNg2w4VocjBlb+ZkyMasUZOvUn19bsdqpF0otJVYu66gFOJF0rIpykh/vbpLi6dhqYOxgCRAYIw==",
+      "version": "2.23.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.23.3.tgz",
+      "integrity": "sha512-tEh4mGG80eUxSLpbPivA0vl4akMdauL+yZrLn1uUM8EyiXPvlcWPkQTeN6oHbyyAH108D9cfEBidTePZh1p5VQ==",
      "dev": true,
-      "hasInstallScript": true,
      "dependencies": {
        "@types/prompts": "^2.0.13",
        "chalk": "^4.1.1",
        "cli-table": "^0.3.6",
        "consola": "^2.15.0",
        "fs-extra": "^10.0.0",
+        "jwt-decode": "^3.1.2",
        "prompts": "^2.4.1",
        "valid-url": "^1.0.9"
      }
@@ -103,24 +100,24 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "15.12.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
-      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==",
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz",
+      "integrity": "sha512-N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA==",
      "dev": true
    },
    "node_modules/@types/prompts": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.13.tgz",
-      "integrity": "sha512-jwMOIGy49VruR/gYehhJYgpVzB+EVpEE7t7j9m1oTo4HMpOe7KmsyqdBuoxAzA5B4caUgx0cKrWr7wUEqMXJ7Q==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.14.tgz",
+      "integrity": "sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
      }
    },
    "node_modules/@types/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz",
+      "integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==",
      "dev": true,
      "peer": true
    },
@@ -1334,6 +1331,7 @@
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The",
      "dev": true,
      "engines": {
        "node": ">=0.4.x"
@@ -1762,30 +1760,31 @@
  },
  "dependencies": {
    "@sasjs/adapter": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.6.3.tgz",
-      "integrity": "sha512-Mg1AIDd0JDa0/UjvvmrGxjkpYmGEpqmD1dOYmS55EJG5loAENaVKJg9Ht8bU2XFyVaMbFpgB2yqDd0VWPP4eBA==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-2.8.9.tgz",
+      "integrity": "sha512-8UChcZlqqlmaMMaKOCr2Bc1h+i2KVDY0FINlPXQN5PdAgEMd8dbxI2p9bsiI1yjYjOBO9LuMl7B79/mwYCtyEw==",
      "dev": true,
      "requires": {
-        "@sasjs/utils": "^2.18.0",
+        "@sasjs/utils": "^2.21.0",
        "axios": "^0.21.1",
        "axios-cookiejar-support": "^1.0.1",
        "form-data": "^4.0.0",
        "https": "^1.0.0",
+        "jwt-decode": "^3.1.2",
        "tough-cookie": "^4.0.0",
        "url": "^0.11.0"
      }
    },
    "@sasjs/cli": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.27.0.tgz",
-      "integrity": "sha512-jdQBNFbqvkidCL2+V6kuGk66YGH9BshHetPIzYSUCJPYrsKdWYRk0+OP+dZZ4qcNk8yLbcwZH+Z6Y1xh9yroFg==",
+      "version": "2.33.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-2.33.3.tgz",
+      "integrity": "sha512-y1uFM5MEE6eoKLrPUJbweDt4njSy9Y3CS5w5/U2xwNbiAyhiPXgkwCHjCQ8Qg+0rQnMvyNEn6qJuJZ3udc6T7w==",
      "dev": true,
      "requires": {
-        "@sasjs/adapter": "2.6.3",
-        "@sasjs/core": "2.34.5",
-        "@sasjs/lint": "1.11.1",
-        "@sasjs/utils": "2.21.0",
+        "@sasjs/adapter": "2.8.9",
+        "@sasjs/core": "2.35.3",
+        "@sasjs/lint": "1.11.2",
+        "@sasjs/utils": "2.23.3",
        "@types/url-parse": "1.4.3",
        "btoa": "1.2.1",
        "chalk": "4.1.1",
@@ -1807,24 +1806,24 @@
      }
    },
    "@sasjs/core": {
-      "version": "2.34.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.34.5.tgz",
-      "integrity": "sha512-aq84ce9zmyAnkhKlSQ2SGZSQyJ5+EQAaUwktWfPhVdV9B6FJJSrQL3s1K/Dw9IuMczJcZcBlS4HO/w+goQBgyw==",
+      "version": "2.35.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-2.35.3.tgz",
+      "integrity": "sha512-3o5PU6DkihpA+Aibt1lRy4USqJI0VFa+wNsKCD+bUD2DLZICU3JablZQxwAPH70VWJGXAUJtDFj0T/iRo5Devg==",
      "dev": true
    },
    "@sasjs/lint": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-1.11.1.tgz",
-      "integrity": "sha512-nb0xFwXSDrE1qQLYV8whUoaXX2lh4nN3jbA/dOlLpjmF+8uvpgZo9GHy5vz5cpIhtguxiFd7lOGN/zyrzKO8yg==",
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-1.11.2.tgz",
+      "integrity": "sha512-zEonhvha9kwrD+hxhG0hEhtfqpXwffH4vRDIr6eDiXkC7S8M3yImpjyFBvX/THJO5+8iuY8TYkOXKl7+nK/wAg==",
      "dev": true,
      "requires": {
        "@sasjs/utils": "^2.19.0"
      }
    },
    "@sasjs/utils": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.21.0.tgz",
-      "integrity": "sha512-ehRF1VHBiF8FNg2w4VocjBlb+ZkyMasUZOvUn19bsdqpF0otJVYu66gFOJF0rIpykh/vbpLi6dhqYOxgCRAYIw==",
+      "version": "2.23.3",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.23.3.tgz",
+      "integrity": "sha512-tEh4mGG80eUxSLpbPivA0vl4akMdauL+yZrLn1uUM8EyiXPvlcWPkQTeN6oHbyyAH108D9cfEBidTePZh1p5VQ==",
      "dev": true,
      "requires": {
        "@types/prompts": "^2.0.13",
@@ -1832,6 +1831,7 @@
        "cli-table": "^0.3.6",
        "consola": "^2.15.0",
        "fs-extra": "^10.0.0",
+        "jwt-decode": "^3.1.2",
        "prompts": "^2.4.1",
        "valid-url": "^1.0.9"
      }
@@ -1843,24 +1843,24 @@
      "dev": true
    },
    "@types/node": {
-      "version": "15.12.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.4.tgz",
-      "integrity": "sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==",
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz",
+      "integrity": "sha512-N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA==",
      "dev": true
    },
    "@types/prompts": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.13.tgz",
-      "integrity": "sha512-jwMOIGy49VruR/gYehhJYgpVzB+EVpEE7t7j9m1oTo4HMpOe7KmsyqdBuoxAzA5B4caUgx0cKrWr7wUEqMXJ7Q==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.14.tgz",
+      "integrity": "sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==",
      "dev": true,
      "requires": {
        "@types/node": "*"
      }
    },
    "@types/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz",
+      "integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==",
      "dev": true,
      "peer": true
    },
--- a/package.json
+++ b/package.json
@@ -30,9 +30,9 @@
    "docs": "sasjs doc && ./sasjs/utils/build.sh",
    "test": "sasjs test -t viya",
    "lint": "sasjs lint",
-    "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
+    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
  },
  "devDependencies": {
-    "@sasjs/cli": "2.27.0"
+    "@sasjs/cli": "2.33.3"
  }
 }
--- a/tests/base/mp_base64copy.test.sas
+++ b/tests/base/mp_base64copy.test.sas
@@ -0,0 +1,67 @@
+/**
+  @file
+  @brief Testing mp_base64copy.sas macro
+
+  <h4> SAS Macros </h4>
+  @li mp_base64copy.sas
+  @li mp_assert.sas
+
+**/
+
+
+/* TEST 1 - regular base64 decode */
+
+%let string1=base ik ally;
+filename tmp temp;
+data _null_;
+  file tmp;
+  put "&string1";
+run;
+%mp_base64copy(inref=tmp, outref=myref, action=ENCODE)
+
+data _null_;
+  infile myref;
+  input;
+  put _infile_;
+run;
+%mp_base64copy(inref=myref, outref=mynewref, action=DECODE)
+data _null_;
+  infile mynewref lrecl=5000;
+  input;
+  put _infile_;
+  call symputx('string1_check',_infile_);
+  stop;
+run;
+%mp_assert(
+  iftrue=("&string1"="&string1_check"),
+  desc=Basic String Compare,
+  outds=work.test_results
+)
+
+
+/* multibyte string check */
+
+filename tmp2 temp;
+data _null_;
+  file tmp2;
+  put "'╤', '╔', '╗', '═', '╧', '╚', '╝', '║', '╟', '─', '┼', '║', '╢', '│'";
+run;
+%mp_base64copy(inref=tmp2, outref=myref2, action=ENCODE)
+
+%mp_base64copy(inref=myref2, outref=newref2, action=DECODE)
+data _null_;
+  infile newref2 lrecl=5000;
+  input;
+  list;
+  /* do not print the string to the log else viya 3.5 throws exception */
+  if trim(_infile_)=
+    "'╤', '╔', '╗', '═', '╧', '╚', '╝', '║', '╟', '─', '┼', '║', '╢', '│'"
+  then call symputx('check2',1);
+  else call symputx('check2',0);
+  stop;
+run;
+%mp_assert(
+  iftrue=("&check2"="1"),
+  desc=Double Byte String Compare,
+  outds=work.test_results
+)
Author	SHA1	Message	Date
Allan Bowe	1f0128aec4	Merge pull request #53 from sasjs/base64doublebytefix fix: mp_base64copy.sas fixes, removed renegade % symbol and issue wit…	2021-07-18 17:16:58 +03:00
Allan Bowe	69f03f4e14	fix: mp_base64copy.sas fixes, removed renegade % symbol and issue with truncation at character 76. Added two tests, including one to test double byte encoded characters.	2021-07-18 17:05:05 +03:00
Allan Bowe	a932f321d8	Merge pull request #52 from sasjs/sasjs-cli-version-bump fix: bump sasjs/cli version + 'prepare' support windows CMD/Powershell	2021-07-10 09:40:48 +03:00
Saad Jutt	21200c11c1	fix: bump sasjs/cli version + 'prepare' support windows CMD/Powershell	2021-07-10 03:43:58 +05:00
Allan Bowe	825c97c49c	fix: switch postinstall to prepare	2021-06-30 19:50:20 +03:00