@magda/typescript-common 2.3.2 → 3.0.0-alpha.0

package/dist/test/util.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeURIComponentWithApost = void 0;
-function encodeURIComponentWithApost(string) {
+export function encodeURIComponentWithApost(string) {
     return encodeURIComponent(string).replace(/'/g, "%27");
 }
-exports.encodeURIComponentWithApost = encodeURIComponentWithApost;
 //# sourceMappingURL=util.js.map

package/dist/test/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test/util.ts"],"names":[],"mappings":";;;AAAA,SAAgB,2BAA2B,CAAC,MAAc;IACtD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC3D,CAAC;AAFD,kEAEC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test/util.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,2BAA2B,CAAC,MAAc;IACtD,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC3D,CAAC"}

package/dist/unknown2Error.d.ts

@@ -0,0 +1,2 @@
+declare const unknown2Error: (e: any) => Error;
+export default unknown2Error;

package/dist/unknown2Error.js

@@ -0,0 +1,3 @@
+const unknown2Error = (e) => (e instanceof Error ? e : new Error(`${e}`));
+export default unknown2Error;
+//# sourceMappingURL=unknown2Error.js.map

package/dist/unknown2Error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unknown2Error.js","sourceRoot":"","sources":["../src/unknown2Error.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/E,eAAe,aAAa,CAAC"}

package/dist/util/arrayToMaybe.d.ts

@@ -1,2 +1,2 @@
-import { Maybe } from "tsmonad";
+import { Maybe } from "@magda/tsmonad";
 export default function arrayToMaybe<T>(rows: T[]): Maybe<T>;

package/dist/util/arrayToMaybe.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tsmonad_1 = require("tsmonad");
-function arrayToMaybe(rows) {
-    return rows.length > 0 ? tsmonad_1.Maybe.just(rows[0]) : tsmonad_1.Maybe.nothing();
+import { Maybe } from "@magda/tsmonad";
+export default function arrayToMaybe(rows) {
+    return rows.length > 0 ? Maybe.just(rows[0]) : Maybe.nothing();
 }
-exports.default = arrayToMaybe;
 //# sourceMappingURL=arrayToMaybe.js.map

package/dist/util/arrayToMaybe.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrayToMaybe.js","sourceRoot":"","sources":["../../src/util/arrayToMaybe.ts"],"names":[],"mappings":";;AAAA,qCAAgC;AAEhC,SAAwB,YAAY,CAAI,IAAS;IAC7C,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,OAAO,EAAK,CAAC;AACtE,CAAC;AAFD,+BAEC"}
+{"version":3,"file":"arrayToMaybe.js","sourceRoot":"","sources":["../../src/util/arrayToMaybe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,UAAU,YAAY,CAAI,IAAS;IAC7C,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAK,CAAC;AACtE,CAAC"}

package/dist/util/cleanOrgTitle.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function cleanOrgTitle(title) {
+export default function cleanOrgTitle(title) {
     if (!title) {
         return title;
     }
@@ -9,5 +7,4 @@ function cleanOrgTitle(title) {
     }
     return title.replace(/^\W*/, "");
 }
-exports.default = cleanOrgTitle;
 //# sourceMappingURL=cleanOrgTitle.js.map

package/dist/util/cleanOrgTitle.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanOrgTitle.js","sourceRoot":"","sources":["../../src/util/cleanOrgTitle.ts"],"names":[],"mappings":";;AAAA,SAAwB,aAAa,CAAC,KAAa;IAC/C,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,KAAK,CAAC;KAChB;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC;AARD,gCAQC"}
+{"version":3,"file":"cleanOrgTitle.js","sourceRoot":"","sources":["../../src/util/cleanOrgTitle.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAa;IAC/C,IAAI,CAAC,KAAK,EAAE;QACR,OAAO,KAAK,CAAC;KAChB;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACrC,CAAC"}

package/dist/util/escapeRegExp.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const escapeRegExp = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-exports.default = escapeRegExp;
+export default escapeRegExp;
 //# sourceMappingURL=escapeRegExp.js.map

package/dist/util/escapeRegExp.js.map

@@ -1 +1 @@
-{"version":3,"file":"escapeRegExp.js","sourceRoot":"","sources":["../../src/util/escapeRegExp.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAC/C,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"escapeRegExp.js","sourceRoot":"","sources":["../../src/util/escapeRegExp.ts"],"names":[],"mappings":"AAAA,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAC/C,eAAe,YAAY,CAAC"}

package/dist/util/getMinikubeIP.js

@@ -1,13 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = __importDefault(require("child_process"));
-function getMinikubeIP() {
-    const minikubeProcess = child_process_1.default.spawnSync("minikube", ["ip"]);
+import * as childProcess from "child_process";
+export default function getMinikubeIP() {
+    const minikubeProcess = childProcess.spawnSync("minikube", ["ip"]);
     const ip = minikubeProcess.stdout.toString().trim();
     return ip;
 }
-exports.default = getMinikubeIP;
 //# sourceMappingURL=getMinikubeIP.js.map

package/dist/util/getMinikubeIP.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMinikubeIP.js","sourceRoot":"","sources":["../../src/util/getMinikubeIP.ts"],"names":[],"mappings":";;;;;AAAA,kEAAyC;AAEzC,SAAwB,aAAa;IACjC,MAAM,eAAe,GAAG,uBAAY,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAEpD,OAAO,EAAE,CAAC;AACd,CAAC;AALD,gCAKC"}
+{"version":3,"file":"getMinikubeIP.js","sourceRoot":"","sources":["../../src/util/getMinikubeIP.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,aAAa;IACjC,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAEpD,OAAO,EAAE,CAAC;AACd,CAAC"}

package/dist/util/isArray.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const isArray = (v) => typeof v !== "undefined" && Array.isArray(v);
-exports.default = isArray;
+export default isArray;
 //# sourceMappingURL=isArray.js.map

package/dist/util/isArray.js.map

@@ -1 +1 @@
-{"version":3,"file":"isArray.js","sourceRoot":"","sources":["../../src/util/isArray.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACzE,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"isArray.js","sourceRoot":"","sources":["../../src/util/isArray.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACzE,eAAe,OAAO,CAAC"}

package/dist/util/isUuid.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const uuidRegEx = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const isUuid = (id) => typeof id === "string" && uuidRegEx.test(id);
-exports.default = isUuid;
+export default isUuid;
 //# sourceMappingURL=isUuid.js.map

package/dist/util/isUuid.js.map

@@ -1 +1 @@
-{"version":3,"file":"isUuid.js","sourceRoot":"","sources":["../../src/util/isUuid.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG,iEAAiE,CAAC;AACpF,MAAM,MAAM,GAAG,CAAC,EAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzE,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"isUuid.js","sourceRoot":"","sources":["../../src/util/isUuid.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAG,iEAAiE,CAAC;AACpF,MAAM,MAAM,GAAG,CAAC,EAAO,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzE,eAAe,MAAM,CAAC"}

package/dist/util/unionToThrowable.d.ts

@@ -1,2 +1,2 @@
-import ServerError from "../ServerError";
+import ServerError from "../ServerError.js";
 export default function unionToThrowable<T>(input: T | Error | ServerError): T;

package/dist/util/unionToThrowable.js

@@ -1,11 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ServerError_1 = __importDefault(require("../ServerError"));
-function unionToThrowable(input) {
-    if (input instanceof ServerError_1.default) {
+import ServerError from "../ServerError.js";
+export default function unionToThrowable(input) {
+    if (input instanceof ServerError) {
         throw input;
     }
     else if (input instanceof Error) {
@@ -15,5 +10,4 @@ function unionToThrowable(input) {
         return input;
     }
 }
-exports.default = unionToThrowable;
 //# sourceMappingURL=unionToThrowable.js.map

package/dist/util/unionToThrowable.js.map

@@ -1 +1 @@
-{"version":3,"file":"unionToThrowable.js","sourceRoot":"","sources":["../../src/util/unionToThrowable.ts"],"names":[],"mappings":";;;;;AAAA,iEAAyC;AAEzC,SAAwB,gBAAgB,CAAI,KAA8B;IACtE,IAAI,KAAK,YAAY,qBAAW,EAAE;QAC9B,MAAmB,KAAK,CAAC;KAC5B;SAAM,IAAI,KAAK,YAAY,KAAK,EAAE;QAC/B,MAAa,KAAK,CAAC;KACtB;SAAM;QACH,OAAU,KAAK,CAAC;KACnB;AACL,CAAC;AARD,mCAQC"}
+{"version":3,"file":"unionToThrowable.js","sourceRoot":"","sources":["../../src/util/unionToThrowable.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAI,KAA8B;IACtE,IAAI,KAAK,YAAY,WAAW,EAAE;QAC9B,MAAmB,KAAK,CAAC;KAC5B;SAAM,IAAI,KAAK,YAAY,KAAK,EAAE;QAC/B,MAAa,KAAK,CAAC;KACtB;SAAM;QACH,OAAU,KAAK,CAAC;KACnB;AACL,CAAC"}

package/dist/utilityTypes.d.ts

@@ -1 +1 @@
-export declare type RequiredKeys<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
+export type RequiredKeys<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;

package/dist/utilityTypes.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=utilityTypes.js.map

package/package.json

@@ -1,61 +1,72 @@
 {
   "name": "@magda/typescript-common",
   "description": "Common TypeScript code shared between components.",
-  "version": "2.3.2",
+  "version": "3.0.0-alpha.0",
   "license": "Apache-2.0",
+  "type": "module",
+  "exports": {
+    "./dist/*.js": "./dist/*.js",
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=18.19.0"
+  },
   "scripts": {
     "prebuild": "rimraf dist tsconfig.tsbuildinfo",
     "build": "yarn run compile",
     "compile": "tsc -b",
     "watch": "tsc -b --watch",
     "generate": "generate-registry-typescript ./src/generated/registry",
-    "test": "nyc mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/*.spec.ts\"",
+    "test": "c8 mocha",
     "dev": "yarn run watch",
     "release": "npm publish || echo \"Skip releasing npm package @magda/typescript-common.\""
   },
   "devDependencies": {
-    "@magda/registry-aspects": "^2.3.2",
-    "@magda/scripts": "^2.3.2",
-    "@types/chai": "^4.0.0",
+    "@magda/esm-utils": "^1.0.1",
+    "@magda/registry-aspects": "^3.0.0-alpha.0",
+    "@magda/scripts": "^3.0.0-alpha.0",
+    "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.0",
     "@types/cross-spawn": "^6.0.1",
     "@types/crypto-js": "^4.1.1",
+    "@types/djv": "^2.1.4",
     "@types/dompurify": "^2.2.1",
-    "@types/express": "^4.17.6",
+    "@types/express": "^4.17.21",
+    "@types/jsonwebtoken": "^9.0.5",
     "@types/lodash": "^4.14.73",
-    "@types/mocha": "^2.2.41",
-    "@types/nock": "^8.2.1",
+    "@types/mocha": "^10.0.6",
     "@types/pg": "^8.6.5",
     "@types/read-pkg-up": "^3.0.1",
     "@types/sinon": "^4.1.3",
-    "@types/superagent": "^3.5.5",
-    "@types/supertest": "^2.0.3",
+    "@types/supertest": "^2.0.16",
     "@types/urijs": "^1.19.19",
     "@types/uuid": "^8.0.0",
     "@types/yargs": "^12.0.8",
-    "chai": "^4.1.2",
+    "c8": "^9.0.0",
+    "chai": "^5.0.0-rc.0",
     "chai-as-promised": "^7.1.1",
     "djv": "^2.1.4",
-    "fs-extra": "8.1.0",
+    "fs-extra": "^11.2.0",
     "jsverify": "^0.8.2",
     "lazy-seq": "^1.0.0",
-    "mocha": "^3.4.2",
+    "mocha": "^10.2.0",
     "mock-req-res": "^1.1.1",
-    "nock": "^9.0.14",
-    "nyc": "^13.1.0",
+    "nock": "^13.4.0",
     "sinon": "^4.2.1",
-    "typescript": "~4.2.4"
+    "typescript": "~5.2.2"
   },
   "dependencies": {
+    "@magda/esm-utils": "^1.0.1",
+    "@magda/tsmonad": "^0.9.0",
     "@types/request": "^2.48.1",
     "@types/resolve": "^1.14.0",
     "@types/vfile-message": "^2.0.0",
-    "body-parser": "^1.18.2",
+    "caller-path": "^4.0.0",
+    "cross-fetch": "^4.0.0",
     "crypto-js": "^4.1.1",
     "dompurify": "^2.3.0",
-    "express": "^4.17.1",
-    "isomorphic-fetch": "^2.2.1",
-    "jsonwebtoken": "^8.4.0",
+    "express": "^4.17.2",
+    "jsonwebtoken": "^9.0.2",
     "load-json-file": "^1.0.0",
     "lodash": "^4.17.11",
     "markdown-it": "^10.0.0",
@@ -64,20 +75,25 @@
     "read-pkg-up": "^3.0.0",
     "request": "^2.88.0",
     "resolve": "^1.15.0",
-    "sql-syntax": "^1.1.3",
-    "tsmonad": "^0.7.2",
+    "sql-syntax": "^2.0.1",
     "urijs": "^1.19.11",
     "uuid": "^8.2.0",
     "yargs": "^12.0.5"
   },
   "config": {
     "docker": {
-      "include": "node_modules dist"
+      "include": "node_modules dist package.json"
     },
     "jwtSecret": "squirrel",
     "SESSION_SECRET": "keyboard cat",
     "userId": "00000000-0000-4000-8000-000000000000"
   },
+  "mocha": {
+    "import": "tsx/esm",
+    "spec": [
+      "src/test/**/**.spec.ts"
+    ]
+  },
   "magda": {
     "language": "typescript",
     "categories": {
@@ -85,9 +101,11 @@
       "npmPackage": true
     }
   },
-  "nyc": {
-    "extension": [
-      ".ts"
+  "c8": {
+    "all": true,
+    "clean": true,
+    "src": [
+      "./src"
     ],
     "exclude": [
       "src/test/**"

package/dist/test/jsverify.d.ts

@@ -1,2 +0,0 @@
-import jsc from "jsverify";
-export default jsc;

package/dist/test/jsverify.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsverify_1 = __importDefault(require("jsverify"));
-exports.default = jsverify_1.default;
-//# sourceMappingURL=jsverify.js.map

package/dist/test/jsverify.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jsverify.js","sourceRoot":"","sources":["../../src/test/jsverify.ts"],"names":[],"mappings":";;;;;AAAA,wDAA2B;AAE3B,kBAAe,kBAAG,CAAC"}