chore(refactor): upgrade utils, refactor to use timestamp generator

2025-12-10 17:04:36 +00:00 · 2021-06-04 08:40:27 +01:00
parent 551e4e43c1
commit fadccfc94c
3 changed files with 67 additions and 77 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
      "hasInstallScript": true,
      "license": "ISC",
      "dependencies": {
-        "@sasjs/utils": "^2.10.2",
+        "@sasjs/utils": "^2.17.0",
        "axios": "^0.21.1",
        "axios-cookiejar-support": "^1.0.1",
        "form-data": "^4.0.0",
@@ -31,7 +31,7 @@
        "ts-loader": "^9.1.2",
        "tslint": "^6.1.3",
        "tslint-config-prettier": "^1.18.0",
-        "typedoc": "^0.20.35",
+        "typedoc": "^0.20.36",
        "typedoc-neo-theme": "^1.1.0",
        "typedoc-plugin-external-module-name": "^4.0.6",
        "typescript": "^3.9.9",
@@ -933,16 +933,33 @@
      }
    },
    "node_modules/@sasjs/utils": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.10.2.tgz",
-      "integrity": "sha512-N5nIsz7NUs1Yt0Am0QGs9UXDkN396ialCIfIRsNR9h4VtQRzvOwjXrsLnr3AUAAV9Z8h9CtadkC3W6MAzrQaOg==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.17.0.tgz",
+      "integrity": "sha512-sKmB57ohPcsoR3ocCPEwwNLul81/pyiIqerxpMC85Y1xyNwFRcyxKP3Pz4gHIHg9aMmUsH3w39jZ0NJzNssoxA==",
+      "hasInstallScript": true,
      "dependencies": {
-        "@types/prompts": "^2.0.10",
+        "@types/prompts": "^2.0.11",
+        "chalk": "^4.1.1",
+        "cli-table": "^0.3.6",
        "consola": "^2.15.0",
+        "fs-extra": "^10.0.0",
        "prompts": "^2.4.1",
        "valid-url": "^1.0.9"
      }
    },
+    "node_modules/@sasjs/utils/node_modules/fs-extra": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@sasjs/utils/node_modules/prompts": {
      "version": "2.4.1",
      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
@@ -1354,9 +1371,9 @@
      "dev": true
    },
    "node_modules/@types/prompts": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.10.tgz",
-      "integrity": "sha512-W3PEl3l4vmxdgfY6LUG7ysh+mLJOTOFYmSpiLe6MCo1OdEm8b5s6ZJfuTQgEpYNwcMiiaRzJespPS5Py2tqLlQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.12.tgz",
+      "integrity": "sha512-Hr6osqfNg3IcQT3pJDXCsSnb0KnldY/hXeJCKJriwbZLnedN9n1e8kcZwLc25GIWULDb6h5aEyOBbf33XpZBXQ==",
      "dependencies": {
        "@types/node": "*"
      }
@@ -1687,7 +1704,6 @@
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
      "dependencies": {
        "color-convert": "^2.0.1"
      },
@@ -2302,16 +2318,18 @@
      "dev": true
    },
    "node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
      "dependencies": {
        "ansi-styles": "^4.1.0",
        "supports-color": "^7.1.0"
      },
      "engines": {
        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
    "node_modules/char-regex": {
@@ -2393,7 +2411,6 @@
      "version": "0.3.6",
      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
      "integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
-      "dev": true,
      "dependencies": {
        "colors": "1.0.3"
      },
@@ -2405,7 +2422,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true,
      "engines": {
        "node": ">=0.1.90"
      }
@@ -2468,7 +2484,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
      "dependencies": {
        "color-name": "~1.1.4"
      },
@@ -2479,8 +2494,7 @@
    "node_modules/color-name": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
    },
    "node_modules/colorette": {
      "version": "1.2.2",
@@ -3956,8 +3970,7 @@
    "node_modules/graceful-fs": {
      "version": "4.2.4",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
    },
    "node_modules/growly": {
      "version": "1.3.0",
@@ -4034,7 +4047,6 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
      "engines": {
        "node": ">=8"
      }
@@ -5980,7 +5992,6 @@
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
      "dependencies": {
        "graceful-fs": "^4.1.6",
        "universalify": "^2.0.0"
@@ -6265,9 +6276,9 @@
      }
    },
    "node_modules/marked": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.1.tgz",
-      "integrity": "sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz",
+      "integrity": "sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ==",
      "dev": true,
      "bin": {
        "marked": "bin/marked"
@@ -9450,11 +9461,6 @@
        "safer-buffer": "^2.0.2",
        "tweetnacl": "~0.14.0"
      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
      "engines": {
        "node": ">=0.10.0"
      }
@@ -11899,7 +11905,6 @@
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
      "dependencies": {
        "has-flag": "^4.0.0"
      },
@@ -12522,9 +12527,9 @@
      }
    },
    "node_modules/typedoc": {
-      "version": "0.20.35",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.20.35.tgz",
-      "integrity": "sha512-7sNca19LXg2hgyGHq3b33tQ1YFApmd8aBDEzWQ2ry4VDkw/NdFWkysGiGRY1QckDCB0gVH8+MlXA4K71IB3azg==",
+      "version": "0.20.36",
+      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.20.36.tgz",
+      "integrity": "sha512-qFU+DWMV/hifQ9ZAlTjdFO9wbUIHuUBpNXzv68ZyURAP9pInjZiO4+jCPeAzHVcaBCHER9WL/+YzzTt6ZlN/Nw==",
      "dev": true,
      "dependencies": {
        "colors": "^1.4.0",
@@ -12532,18 +12537,21 @@
        "handlebars": "^4.7.7",
        "lodash": "^4.17.21",
        "lunr": "^2.3.9",
-        "marked": "^2.0.1",
+        "marked": "^2.0.3",
        "minimatch": "^3.0.0",
        "progress": "^2.0.3",
        "shelljs": "^0.8.4",
        "shiki": "^0.9.3",
-        "typedoc-default-themes": "^0.12.9"
+        "typedoc-default-themes": "^0.12.10"
      },
      "bin": {
        "typedoc": "bin/typedoc"
      },
      "engines": {
        "node": ">= 10.8.0"
+      },
+      "peerDependencies": {
+        "typescript": "3.9.x || 4.0.x || 4.1.x || 4.2.x"
      }
    },
    "node_modules/typedoc-default-themes": {
@@ -12674,7 +12682,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
      "engines": {
        "node": ">= 10.0.0"
      }
@@ -14232,25 +14239,27 @@
      }
    },
    "@sasjs/utils": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.14.0.tgz",
-      "integrity": "sha512-5g42spg+7WpSAtIMeCt4HguCBh8w3Y1laN3rT+IXdG/twubQK6ty8TYb89bfwCVY8dH3PY2QfWikXkZm3HpYbg==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.17.0.tgz",
+      "integrity": "sha512-sKmB57ohPcsoR3ocCPEwwNLul81/pyiIqerxpMC85Y1xyNwFRcyxKP3Pz4gHIHg9aMmUsH3w39jZ0NJzNssoxA==",
      "requires": {
        "@types/prompts": "^2.0.11",
        "chalk": "^4.1.1",
        "cli-table": "^0.3.6",
        "consola": "^2.15.0",
+        "fs-extra": "^10.0.0",
        "prompts": "^2.4.1",
        "valid-url": "^1.0.9"
      },
      "dependencies": {
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
          }
        },
        "prompts": {
@@ -15424,10 +15433,9 @@
      "dev": true
    },
    "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
      "requires": {
        "ansi-styles": "^4.1.0",
        "supports-color": "^7.1.0"
@@ -16748,8 +16756,7 @@
    "graceful-fs": {
      "version": "4.2.4",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
    },
    "growly": {
      "version": "1.3.0",
@@ -18381,7 +18388,6 @@
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
      "requires": {
        "graceful-fs": "^4.1.6",
        "universalify": "^2.0.0"
@@ -18614,9 +18620,9 @@
      }
    },
    "marked": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.1.tgz",
-      "integrity": "sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz",
+      "integrity": "sha512-BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ==",
      "dev": true
    },
    "marked-terminal": {
@@ -23286,14 +23292,6 @@
        "shelljs": "^0.8.4",
        "shiki": "^0.9.3",
        "typedoc-default-themes": "^0.12.10"
-      },
-      "dependencies": {
-        "marked": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.5.tgz",
-          "integrity": "sha512-yfCEUXmKhBPLOzEC7c+tc4XZdIeTdGoRCZakFMkCxodr7wDXqoapIME4wjcpBPJLNyUnKJ3e8rb8wlAgnLnaDw==",
-          "dev": true
-        }
      }
    },
    "typedoc-default-themes": {
@@ -23394,8 +23392,7 @@
    "universalify": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
    },
    "unset-value": {
      "version": "1.0.0",
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
  },
  "main": "index.js",
  "dependencies": {
-    "@sasjs/utils": "^2.14.0",
+    "@sasjs/utils": "^2.17.0",
    "axios": "^0.21.1",
    "axios-cookiejar-support": "^1.0.1",
    "form-data": "^4.0.0",
--- a/src/SAS9ApiClient.ts
+++ b/src/SAS9ApiClient.ts
@@ -1,4 +1,4 @@
-import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
+import { generateTimestamp } from '@sasjs/utils/time'
 import * as NodeFormData from 'form-data'
 import { Sas9RequestClient } from './request/Sas9RequestClient'
 import { isUrl } from './utils'
@@ -76,7 +76,7 @@ export class SAS9ApiClient {

 const generateFileUploadForm = (data: any): NodeFormData => {
  const formData = new NodeFormData()
-  const fileName = `sasjs-execute-sas9-${getTimestamp()}.sas`
+  const fileName = `sasjs-execute-sas9-${generateTimestamp('')}.sas`
  formData.append(fileName, data, {
    filename: `${fileName}.csv`,
    contentType: 'text/plain'
@@ -84,10 +84,3 @@ const generateFileUploadForm = (data: any): NodeFormData => {

  return formData
 }
-
-const getTimestamp = () => {
-  return timestampToYYYYMMDDHHMMSS()
-    .replace(/:/g, '')
-    .replace(/\//g, '')
-    .replace(/ /g, '')
-}