@sasjs/utils 3.6.4 → 3.6.6

package/.git-hooks/pre-commit

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Scan staged changes for secrets before anything else runs.
+# The binary is pinned by the @nogoo9/gitleaks devDependency and lands
+# in node_modules/.bin after npm i. Commits are blocked until it is
+# installed so no clone silently skips the secrets scan.
+gitleaks_bin=node_modules/.bin/gitleaks
+
+if [ ! -x "$gitleaks_bin" ]; then
+    echo "❌ gitleaks not found - run 'npm i' to install it"
+    exit 1
+fi
+
+if ! "$gitleaks_bin" protect --staged --redact; then
+    echo "❌ gitleaks detected a potential secret in your staged changes"
+    echo "Remove the secret, or add a .gitleaksignore entry if it is a false positive"
+    exit 1
+fi
+
+# Avoid commits to the main branch
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+if [[ "$BRANCH" =~ ^(master|main|develop)$ ]]; then
+  echo "You are on branch $BRANCH. Are you sure you want to commit to this branch?"
+  echo "If so, commit with -n to bypass the pre-commit hook."
+  exit 1
+fi

package/.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+# Hooks for the pre-commit framework - https://pre-commit.com
+#
+# The repo also ships native hooks in .git-hooks/: gitleaks on the staged
+# content before the commit, and the Conventional Commits check on the message.
+# `npm run setup` activates them by setting core.hooksPath - but .npmrc sets
+# ignore-scripts=true, so no install step runs it, and a fresh clone commits
+# unchecked until someone runs it by hand.
+#
+# This file is the standard route instead: install the framework once with
+# `pre-commit install`, and both hooks run on every commit. gitleaks is pinned
+# to an exact release tag, and the message hook calls the script the native
+# hooks already use, so there is one implementation of the rules.
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.30.1
+    hooks:
+      - id: gitleaks
+  - repo: local
+    hooks:
+      - id: commit-msg
+        name: conventional commit
+        entry: .git-hooks/commit-msg
+        language: script
+        stages: [commit-msg]

package/auth/auth.js

@@ -1,26 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeToken = exports.hasTokenExpired = exports.isRefreshTokenExpiring = exports.isAccessTokenExpiring = void 0;
-const jwt_decode_1 = __importStar(require("jwt-decode"));
+const jwt_decode_1 = require("jwt-decode");
 /**
  * Checks if the Access Token is expired or is expiring in 1 hour.  A default Access Token
  * lasts 12 hours. If the Access Token expires, the Refresh Token is used to fetch a new
@@ -68,7 +49,7 @@ exports.hasTokenExpired = hasTokenExpired;
 function isTokenExpiring(token, timeToLiveSeconds) {
     let payload;
     try {
-        payload = (0, jwt_decode_1.default)(token);
+        payload = (0, jwt_decode_1.jwtDecode)(token);
     }
     catch (err) {
         // Only tolerate undecodable (opaque / non-JWT) tokens - anything else
@@ -92,7 +73,7 @@ function isTokenExpiring(token, timeToLiveSeconds) {
 function decodeToken(token) {
     let payload;
     try {
-        payload = (0, jwt_decode_1.default)(token);
+        payload = (0, jwt_decode_1.jwtDecode)(token);
     }
     catch (err) {
         throw new Error('Invalid token supplied.');

package/auth/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAyD;AAGzD;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,KAAc,EACd,iBAAiB,GAAG,IAAI;IAExB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAClD,CAAC;AARD,sDAQC;AAED;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CACpC,KAAc,EACd,iBAAiB,GAAG,EAAE;IAEtB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAClD,CAAC;AARD,wDAQC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,KAAc;IAC5C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;AAClC,CAAC;AALD,0CAKC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,iBAAyB;IAC/D,IAAI,OAAyB,CAAA;IAC7B,IAAI;QACF,OAAO,GAAG,IAAA,oBAAS,EAAmB,KAAK,CAAC,CAAA;KAC7C;IAAC,OAAO,GAAG,EAAE;QACZ,sEAAsE;QACtE,uCAAuC;QACvC,IAAI,CAAC,CAAC,GAAG,YAAY,8BAAiB,CAAC;YAAE,MAAM,GAAG,CAAA;QAClD,sDAAsD;QACtD,sEAAsE;QACtE,wEAAwE;QACxE,0DAA0D;QAC1D,OAAO,KAAK,CAAA;KACb;IAED,gEAAgE;IAChE,uEAAuE;IACvE,qBAAqB;IACrB,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI;QAAE,OAAO,KAAK,CAAA;IAErC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAA;IAE5D,OAAO,UAAU,IAAI,iBAAiB,CAAA;AACxC,CAAC;AAED,SAAgB,WAAW,CAAC,KAAa;IACvC,IAAI,OAAqB,CAAA;IACzB,IAAI;QACF,OAAO,GAAG,IAAA,oBAAS,EAAC,KAAK,CAAC,CAAA;KAC3B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;KAC3C;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AATD,kCASC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/auth/auth.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;AAGzD;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,KAAc,EACd,iBAAiB,GAAG,IAAI;IAExB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAClD,CAAC;AARD,sDAQC;AAED;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CACpC,KAAc,EACd,iBAAiB,GAAG,EAAE;IAEtB,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAClD,CAAC;AARD,wDAQC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,KAAc;IAC5C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;AAClC,CAAC;AALD,0CAKC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,iBAAyB;IAC/D,IAAI,OAAyB,CAAA;IAC7B,IAAI;QACF,OAAO,GAAG,IAAA,sBAAS,EAAmB,KAAK,CAAC,CAAA;KAC7C;IAAC,OAAO,GAAG,EAAE;QACZ,sEAAsE;QACtE,uCAAuC;QACvC,IAAI,CAAC,CAAC,GAAG,YAAY,8BAAiB,CAAC;YAAE,MAAM,GAAG,CAAA;QAClD,sDAAsD;QACtD,sEAAsE;QACtE,wEAAwE;QACxE,0DAA0D;QAC1D,OAAO,KAAK,CAAA;KACb;IAED,gEAAgE;IAChE,uEAAuE;IACvE,qBAAqB;IACrB,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI;QAAE,OAAO,KAAK,CAAA;IAErC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAA;IAE5D,OAAO,UAAU,IAAI,iBAAiB,CAAA;AACxC,CAAC;AAED,SAAgB,WAAW,CAAC,KAAa;IACvC,IAAI,OAAqB,CAAA;IACzB,IAAI;QACF,OAAO,GAAG,IAAA,sBAAS,EAAC,KAAK,CAAC,CAAA;KAC3B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;KAC3C;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AATD,kCASC"}

package/package.json

@@ -39,7 +39,8 @@
     "test": "jest --config=jest.config.js --coverage",
     "lint:fix": "npx prettier --write \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
-    "semantic-release": "semantic-release"
+    "semantic-release": "semantic-release",
+    "setup": "git config core.hooksPath ./.git-hooks"
   },
   "repository": {
     "type": "git",
@@ -62,20 +63,20 @@
     "jest-extended": "3.2.4",
     "semantic-release": "25.0.9",
     "ts-jest": "29.4.14",
-    "ts-loader": "9.6.2",
     "ts-node": "10.9.2",
-    "typescript": "4.5.4"
+    "typescript": "4.5.4",
+    "@nogoo9/gitleaks": "8.30.1-post.2"
   },
   "dependencies": {
-    "@fast-csv/format": "4.3.5",
+    "@fast-csv/format": "5.0.7",
     "@types/fs-extra": "11.0.4",
     "@types/prompts": "2.4.9",
     "chalk": "4.1.1",
     "cli-table": "0.3.11",
     "consola": "3.4.2",
     "fs-extra": "11.4.1",
-    "jwt-decode": "3.1.2",
+    "jwt-decode": "4.0.0",
     "prompts": "2.4.2"
   },
-  "version": "3.6.4"
+  "version": "3.6.6"
 }

package/utils/url.d.ts

@@ -1,3 +1,14 @@
 export declare const urlOrigin: (str: string) => string;
+/**
+ * The literal prefix is checked as well as the parsed protocol, because the URL
+ * parser normalises a backslash to a forward slash for special schemes:
+ * `new URL('http:\\server')` yields `http://server`. `valid-url`, which these
+ * replaced, required the literal prefix and so rejected such input.
+ *
+ * The prefix comparison is case-insensitive: the parser lowercases the scheme,
+ * so `HTTP://example.com` is a usable URL, and `valid-url` compared the scheme
+ * case-insensitively too. A backslash still fails, since it is not a slash in
+ * either case.
+ */
 export declare const isHttpUri: (str: string) => boolean;
 export declare const isHttpsUri: (str: string) => boolean;

package/utils/url.js

@@ -23,8 +23,29 @@ const hasHttpProtocol = (str, protocol) => {
         return false;
     }
 };
-const isHttpUri = (str) => hasHttpProtocol(str, 'http:');
+// The parser strips ASCII tab, newline and carriage return before parsing, so
+// `new URL('http://exa\tmple.com')` yields `http://example.com`. Those are
+// illegal in a URL, and `valid-url` rejected them.
+const hasControlChars = (str) => /[\u0000-\u001F\u007F]/.test(str);
+/**
+ * The literal prefix is checked as well as the parsed protocol, because the URL
+ * parser normalises a backslash to a forward slash for special schemes:
+ * `new URL('http:\\server')` yields `http://server`. `valid-url`, which these
+ * replaced, required the literal prefix and so rejected such input.
+ *
+ * The prefix comparison is case-insensitive: the parser lowercases the scheme,
+ * so `HTTP://example.com` is a usable URL, and `valid-url` compared the scheme
+ * case-insensitively too. A backslash still fails, since it is not a slash in
+ * either case.
+ */
+const isHttpUri = (str) => typeof str === 'string' &&
+    !hasControlChars(str) &&
+    str.toLowerCase().startsWith('http://') &&
+    hasHttpProtocol(str, 'http:');
 exports.isHttpUri = isHttpUri;
-const isHttpsUri = (str) => hasHttpProtocol(str, 'https:');
+const isHttpsUri = (str) => typeof str === 'string' &&
+    !hasControlChars(str) &&
+    str.toLowerCase().startsWith('https://') &&
+    hasHttpProtocol(str, 'https:');
 exports.isHttpsUri = isHttpsUri;
 //# sourceMappingURL=url.js.map

package/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,GAAG,CAAA;IAE1B,IAAI,MAAM,CAAA;IAEV,IAAI;QACF,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;KAChC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAZY,QAAA,SAAS,aAYrB;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,QAAgB,EAAE,EAAE;IACxD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAExB,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAA;KACnD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AAA1D,QAAA,SAAS,aAAiD;AAEhE,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;AAA5D,QAAA,UAAU,cAAkD"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;;AAAO,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;IACvC,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,GAAG,CAAA;IAE1B,IAAI,MAAM,CAAA;IAEV,IAAI;QACF,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;KAChC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAZY,QAAA,SAAS,aAYrB;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,QAAgB,EAAE,EAAE;IACxD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAExB,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAA;KACnD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAED,8EAA8E;AAC9E,2EAA2E;AAC3E,mDAAmD;AACnD,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE1E;;;;;;;;;;GAUG;AACI,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CACvC,OAAO,GAAG,KAAK,QAAQ;IACvB,CAAC,eAAe,CAAC,GAAG,CAAC;IACrB,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;IACvC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AAJlB,QAAA,SAAS,aAIS;AAExB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACxC,OAAO,GAAG,KAAK,QAAQ;IACvB,CAAC,eAAe,CAAC,GAAG,CAAC;IACrB,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IACxC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;AAJnB,QAAA,UAAU,cAIS"}