@magda/typescript-common 2.3.3 → 3.0.0-alpha.1

package/dist/test/aspect-templates/organization-details.js

@@ -1,4 +1,3 @@
-"use strict";
 const data = {
     name: organization.name,
     description: organization.description
@@ -8,4 +7,5 @@ Object.keys(data).forEach((key) => {
         delete data[key];
 });
 return data;
+export {};
 //# sourceMappingURL=organization-details.js.map

package/dist/test/aspect-templates/organization-details.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization-details.js","sourceRoot":"","sources":["../../../src/test/aspect-templates/organization-details.js"],"names":[],"mappings":";AAAA,MAAM,IAAI,GAAG;IACT,IAAI,EAAE,YAAY,CAAC,IAAI;IACvB,WAAW,EAAE,YAAY,CAAC,WAAW;CACxC,CAAC;AAEF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;IAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,OAAO,IAAI,CAAC"}
+{"version":3,"file":"organization-details.js","sourceRoot":"","sources":["../../../src/test/aspect-templates/organization-details.js"],"names":[],"mappings":"AAAA,MAAM,IAAI,GAAG;IACT,IAAI,EAAE,YAAY,CAAC,IAAI;IACvB,WAAW,EAAE,YAAY,CAAC,WAAW;CACxC,CAAC;AAEF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;IAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,OAAO,IAAI,CAAC"}

package/dist/test/buildApiClient.spec.js

@@ -1,31 +1,17 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const sinon_1 = __importDefault(require("sinon"));
-const chai_1 = __importDefault(require("chai"));
-const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
-const yargs_1 = __importDefault(require("yargs"));
-const addJwtSecretFromEnvVar_1 = __importDefault(require("../session/addJwtSecretFromEnvVar"));
-const mockAuthApiHost_1 = __importDefault(require("./mockAuthApiHost"));
-const ApiClient_1 = __importDefault(require("../authorization-api/ApiClient"));
-const mockUserDataStore_1 = __importDefault(require("./mockUserDataStore"));
-const urijs_1 = __importDefault(require("urijs"));
-chai_1.default.use(chai_as_promised_1.default);
-const expect = chai_1.default.expect;
-const mockUserData = mockUserDataStore_1.default.getData();
+import sinon from "sinon";
+import * as chai from "chai";
+import chaiAsPromised from "chai-as-promised";
+import yargs from "yargs";
+import addJwtSecretFromEnvVar from "../session/addJwtSecretFromEnvVar.js";
+import mockAuthApiHost from "./mockAuthApiHost.js";
+import ApiClient from "../authorization-api/ApiClient.js";
+import mockUserDataStore from "./mockUserDataStore.js";
+import urijs from "urijs";
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+const mockUserData = mockUserDataStore.getData();
 describe("Test ApiClient.ts", function () {
-    const argv = addJwtSecretFromEnvVar_1.default(yargs_1.default
+    const argv = addJwtSecretFromEnvVar(yargs
         .config()
         .help()
         .option("authorizationApi", {
@@ -43,10 +29,10 @@ describe("Test ApiClient.ts", function () {
         demand: true,
         default: process.env.USER_ID || process.env.npm_package_config_userId
     }).argv);
-    const mockHost = new mockAuthApiHost_1.default(argv.authorizationApi, argv.jwtSecret, argv.userId);
+    const mockHost = new mockAuthApiHost(argv.authorizationApi, argv.jwtSecret, argv.userId);
     beforeEach(function () {
-        sinon_1.default.stub(console, "error").callsFake(() => { });
-        sinon_1.default.stub(console, "warn").callsFake(() => { });
+        sinon.stub(console, "error").callsFake(() => { });
+        sinon.stub(console, "warn").callsFake(() => { });
         mockHost.start();
     });
     afterEach(function () {
@@ -54,60 +40,50 @@ describe("Test ApiClient.ts", function () {
         console.warn.restore();
         mockHost.stop();
     });
-    it("`lookupUser` should throw 'Unauthorised' error if called without specifying source or sourceId", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi);
-            try {
-                yield api.lookupUser(undefined, "testuser");
-                expect.fail("expect an error thrown");
-            }
-            catch (e) { }
-            try {
-                yield api.lookupUser("testsource", undefined);
-                expect.fail("expect an error thrown");
-            }
-            catch (e) { }
-        });
+    it("`lookupUser` should throw 'Unauthorised' error if called without specifying source or sourceId", async function () {
+        const api = new ApiClient(argv.authorizationApi);
+        try {
+            await api.lookupUser(undefined, "testuser");
+            expect.fail("expect an error thrown");
+        }
+        catch (e) { }
+        try {
+            await api.lookupUser("testsource", undefined);
+            expect.fail("expect an error thrown");
+        }
+        catch (e) { }
     });
-    it("`lookupUser` should request /public/users API with correct query parameters", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi);
-            let hasCalled = false;
-            mockHost.scope
-                .get("/public/users")
-                .query(true)
-                .reply(function (uri, requestBody) {
-                const parsedUri = urijs_1.default(uri);
-                const queries = parsedUri.search(true);
-                expect(queries).to.have.property("source", "source1");
-                expect(queries).to.have.property("sourceId", "testuser");
-                expect(queries).to.have.property("limit", "1");
-                hasCalled = true;
-                return [200, JSON.stringify([{ id: "xxx1" }])];
-            });
-            const user = yield api.lookupUser("source1", "testuser");
-            expect(user.valueOrThrow()).to.have.property("id", "xxx1");
-            expect(hasCalled).to.be.true;
+    it("`lookupUser` should request /public/users API with correct query parameters", async function () {
+        const api = new ApiClient(argv.authorizationApi);
+        let hasCalled = false;
+        mockHost.scope
+            .get("/public/users")
+            .query(true)
+            .reply(function (uri, requestBody) {
+            const parsedUri = urijs(uri);
+            const queries = parsedUri.search(true);
+            expect(queries).to.have.property("source", "source1");
+            expect(queries).to.have.property("sourceId", "testuser");
+            expect(queries).to.have.property("limit", "1");
+            hasCalled = true;
+            return [200, JSON.stringify([{ id: "xxx1" }])];
         });
+        const user = await api.lookupUser("source1", "testuser");
+        expect(user.valueOrThrow()).to.have.property("id", "xxx1");
+        expect(hasCalled).to.be.true;
     });
-    it("`getUser` should return 'Unauthorised' error if called without sepecifying user ID", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi);
-            return expect(api.getUser(mockUserData[1].id)).to.eventually.rejectedWith("Unauthorised");
-        });
+    it("`getUser` should return 'Unauthorised' error if called without sepecifying user ID", async function () {
+        const api = new ApiClient(argv.authorizationApi);
+        return expect(api.getUser(mockUserData[1].id)).to.eventually.rejectedWith("Unauthorised");
     });
-    it("`getUser` should return 'Can only be accessed by Admin users' error if called as a standard user", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
-            return expect(api.getUser(mockUserData[1].id)).eventually.rejectedWith("Can only be accessed by Admin users");
-        });
+    it("`getUser` should return 'Can only be accessed by Admin users' error if called as a standard user", async function () {
+        const api = new ApiClient(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
+        return expect(api.getUser(mockUserData[1].id)).eventually.rejectedWith("Can only be accessed by Admin users");
     });
-    it("`getUser` should return the correct test user record if called as admin user", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, argv.userId);
-            const data = (yield api.getUser(mockUserData[1].id)).valueOr(null);
-            expect(data).to.deep.equal(mockUserData[1]);
-        });
+    it("`getUser` should return the correct test user record if called as admin user", async function () {
+        const api = new ApiClient(argv.authorizationApi, argv.jwtSecret, argv.userId);
+        const data = (await api.getUser(mockUserData[1].id)).valueOr(null);
+        expect(data).to.deep.equal(mockUserData[1]);
     });
     const newUserDataToBeInserted = {
         displayName: "Test User2",
@@ -117,39 +93,37 @@ describe("Test ApiClient.ts", function () {
         sourceId: "2",
         isAdmin: false
     };
-    it(`\`createUser\` should return 'Encountered error 401 when POSTing new user to ${argv.authorizationApi}' error if called without sepecifying user ID`, function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi);
-            return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 401: Unauthorised when creating new user to http://localhost:6104/v0/public/users");
-        });
+    it(`\`createUser\` should return 'Encountered error 401 when POSTing new user to ${argv.authorizationApi}' error if called without sepecifying user ID`, async function () {
+        const api = new ApiClient(argv.authorizationApi);
+        return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 401: Unauthorised when creating new user to http://localhost:6104/v0/public/users");
     });
-    it(`\`createUser\` should return 'Encountered error 403 when POSTing new user to ${argv.authorizationApi}' error if called as a standard user`, function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
-            return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 403: Can only be accessed by Admin users when creating new user to http://localhost:6104/v0/public/users");
-        });
+    it(`\`createUser\` should return 'Encountered error 403 when POSTing new user to ${argv.authorizationApi}' error if called as a standard user`, async function () {
+        const api = new ApiClient(argv.authorizationApi, argv.jwtSecret, mockUserData[1].id);
+        return expect(api.createUser(newUserDataToBeInserted)).to.eventually.rejectedWith("Encountered error 403: Can only be accessed by Admin users when creating new user to http://localhost:6104/v0/public/users");
     });
     let newlyCreatedUserId = null;
-    it("`createUser` should return the new user data if called as admin user", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, argv.userId);
-            const newUser = yield api.createUser(newUserDataToBeInserted);
-            expect(newUser).to.have.property("id");
-            expect(newUser.id).to.be.a("string");
-            expect(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/.test(newUser.id)).to.be.true;
-            newlyCreatedUserId = newUser.id;
-            expect(newUser).to.deep.equal(Object.assign(Object.assign({}, newUserDataToBeInserted), { id: newUser.id }));
+    it("`createUser` should return the new user data if called as admin user", async function () {
+        const api = new ApiClient(argv.authorizationApi, argv.jwtSecret, argv.userId);
+        const newUser = await api.createUser(newUserDataToBeInserted);
+        expect(newUser).to.have.property("id");
+        expect(newUser.id).to.be.a("string");
+        expect(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/.test(newUser.id)).to.be.true;
+        newlyCreatedUserId = newUser.id;
+        expect(newUser).to.deep.equal({
+            ...newUserDataToBeInserted,
+            id: newUser.id
         });
     });
-    it("After `createUser` call, the same user record should be able to retrieved via `getUser`", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!newlyCreatedUserId) {
-                this.skip();
-                return;
-            }
-            const api = new ApiClient_1.default(argv.authorizationApi, argv.jwtSecret, argv.userId);
-            const user = (yield api.getUser(newlyCreatedUserId)).valueOrThrow(null);
-            expect(user).to.deep.equal(Object.assign(Object.assign({}, newUserDataToBeInserted), { id: newlyCreatedUserId }));
+    it("After `createUser` call, the same user record should be able to retrieved via `getUser`", async function () {
+        if (!newlyCreatedUserId) {
+            this.skip();
+            return;
+        }
+        const api = new ApiClient(argv.authorizationApi, argv.jwtSecret, argv.userId);
+        const user = (await api.getUser(newlyCreatedUserId)).valueOrThrow(null);
+        expect(user).to.deep.equal({
+            ...newUserDataToBeInserted,
+            id: newlyCreatedUserId
         });
     });
 });

package/dist/test/buildApiClient.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildApiClient.spec.js","sourceRoot":"","sources":["../../src/test/buildApiClient.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildApiClient.spec.js","sourceRoot":"","sources":["../../src/test/buildApiClient.spec.ts"],"names":[],"mappings":"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"}

package/dist/test/buildAuthorizedTenantClient.spec.js

@@ -1,60 +1,45 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = __importDefault(require("chai"));
-const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
-const AuthorizedTenantClient_1 = __importDefault(require("../tenant-api/AuthorizedTenantClient"));
-const mockTenantDataStore_1 = __importDefault(require("./mockTenantDataStore"));
-const TenantConsts_1 = require("../registry/TenantConsts");
-const nock_1 = __importDefault(require("nock"));
-const jwt = require("jsonwebtoken");
-chai_1.default.use(chai_as_promised_1.default);
-const expect = chai_1.default.expect;
+import * as chai from "chai";
+import chaiAsPromised from "chai-as-promised";
+import AuthorizedTenantClient from "../tenant-api/AuthorizedTenantClient.js";
+import mockTenantDataStore from "./mockTenantDataStore.js";
+import { MAGDA_ADMIN_PORTAL_ID } from "../registry/TenantConsts.js";
+import nock from "nock";
+import jwt from "jsonwebtoken";
+chai.use(chaiAsPromised);
+const expect = chai.expect;
 describe("Test AuthorizedTenantClient.ts", function () {
-    const mockTenants = mockTenantDataStore_1.default.getTenants();
+    const mockTenants = mockTenantDataStore.getTenants();
     const jwtSecret = "a top secret";
     const adminUserId = "an-admin-user";
     const tenantsBaseUrl = "http://tenant.some.where";
-    const requestScope = nock_1.default(tenantsBaseUrl, {
+    const requestScope = nock(tenantsBaseUrl, {
         reqheaders: {
             // A jwt will contain timestamp by default. The value of header
             // "X-Magda-Session" can not be pre-determined. The exact match
             // of this header can not be guaranteed. Therefore we have to
             // check the decoded user id.
             "X-Magda-Session": (jwtToken) => {
-                return jwt.verify(jwtToken, jwtSecret).userId === adminUserId;
+                return (jwt.verify(jwtToken, jwtSecret).userId ===
+                    adminUserId);
             },
             "Content-Type": "application/json",
-            "X-Magda-Tenant-Id": `${TenantConsts_1.MAGDA_ADMIN_PORTAL_ID}`
+            "X-Magda-Tenant-Id": `${MAGDA_ADMIN_PORTAL_ID}`
         }
     });
     afterEach(() => {
-        nock_1.default.cleanAll();
+        nock.cleanAll();
     });
-    it("`getTenants()` should return all tenants", function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            requestScope.get("/tenants").reply(200, mockTenants);
-            const api = new AuthorizedTenantClient_1.default({
-                urlStr: tenantsBaseUrl,
-                maxRetries: 1,
-                secondsBetweenRetries: 1,
-                jwtSecret: jwtSecret,
-                userId: adminUserId
-            });
-            const actual = yield api.getTenants();
-            return expect(actual).to.deep.equal(mockTenants);
+    it("`getTenants()` should return all tenants", async function () {
+        requestScope.get("/tenants").reply(200, mockTenants);
+        const api = new AuthorizedTenantClient({
+            urlStr: tenantsBaseUrl,
+            maxRetries: 1,
+            secondsBetweenRetries: 1,
+            jwtSecret: jwtSecret,
+            userId: adminUserId
         });
+        const actual = await api.getTenants();
+        return expect(actual).to.deep.equal(mockTenants);
     });
 });
 //# sourceMappingURL=buildAuthorizedTenantClient.spec.js.map

package/dist/test/buildAuthorizedTenantClient.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildAuthorizedTenantClient.spec.js","sourceRoot":"","sources":["../../src/test/buildAuthorizedTenantClient.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,gDAAwB;AACxB,wEAA8C;AAC9C,kGAA0E;AAC1E,gFAAwD;AACxD,2DAAiE;AACjE,gDAAwB;AAExB,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEpC,cAAI,CAAC,GAAG,CAAC,0BAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,cAAI,CAAC,MAAM,CAAC;AAE3B,QAAQ,CAAC,gCAAgC,EAAE;IACvC,MAAM,WAAW,GAAG,6BAAmB,CAAC,UAAU,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,cAAc,CAAC;IACjC,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,cAAc,GAAG,0BAA0B,CAAC;IAElD,MAAM,YAAY,GAAG,cAAI,CAAC,cAAc,EAAE;QACtC,UAAU,EAAE;YACR,+DAA+D;YAC/D,+DAA+D;YAC/D,6DAA6D;YAC7D,6BAA6B;YAC7B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;YAClE,CAAC;YACD,cAAc,EAAE,kBAAkB;YAClC,mBAAmB,EAAE,GAAG,oCAAqB,EAAE;SAClD;KACJ,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,cAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE;;YAC3C,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAErD,MAAM,GAAG,GAAG,IAAI,gCAAsB,CAAC;gBACnC,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,CAAC;gBACb,qBAAqB,EAAE,CAAC;gBACxB,SAAS,EAAE,SAAS;gBACpB,MAAM,EAAE,WAAW;aACtB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;YACtC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;KAAA,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"buildAuthorizedTenantClient.spec.js","sourceRoot":"","sources":["../../src/test/buildAuthorizedTenantClient.spec.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,sBAAsB,MAAM,yCAAyC,CAAC;AAC7E,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAmB,MAAM,cAAc,CAAC;AAE/C,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAE3B,QAAQ,CAAC,gCAAgC,EAAE;IACvC,MAAM,WAAW,GAAG,mBAAmB,CAAC,UAAU,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,cAAc,CAAC;IACjC,MAAM,WAAW,GAAG,eAAe,CAAC;IACpC,MAAM,cAAc,GAAG,0BAA0B,CAAC;IAElD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE;QACtC,UAAU,EAAE;YACR,+DAA+D;YAC/D,+DAA+D;YAC/D,6DAA6D;YAC7D,6BAA6B;YAC7B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC5B,OAAO,CACF,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAgB,CAAC,MAAM;oBACtD,WAAW,CACd,CAAC;YACN,CAAC;YACD,cAAc,EAAE,kBAAkB;YAClC,mBAAmB,EAAE,GAAG,qBAAqB,EAAE;SAClD;KACJ,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK;QAChD,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAErD,MAAM,GAAG,GAAG,IAAI,sBAAsB,CAAC;YACnC,MAAM,EAAE,cAAc;YACtB,UAAU,EAAE,CAAC;YACb,qBAAqB,EAAE,CAAC;YACxB,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,WAAW;SACtB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/test/connectors/MockExpressServer.js

@@ -1,28 +1,14 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockExpressServer = void 0;
-const express = require("express");
-class MockExpressServer {
-    run(port) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const app = express();
-            yield this.runImplementation(app);
-            return new Promise((resolve) => {
-                this.server = app.listen(port, () => {
-                    resolve(this);
-                });
+import express from "express";
+export class MockExpressServer {
+    server;
+    async run(port) {
+        const app = express();
+        await this.runImplementation(app);
+        return new Promise((resolve) => {
+            this.server = app.listen(port, () => {
+                resolve(this);
             });
         });
     }
 }
-exports.MockExpressServer = MockExpressServer;
 //# sourceMappingURL=MockExpressServer.js.map

package/dist/test/connectors/MockExpressServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MockExpressServer.js","sourceRoot":"","sources":["../../../src/test/connectors/MockExpressServer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,MAAsB,iBAAiB;IAG7B,GAAG,CAAC,IAAY;;YAClB,MAAM,GAAG,GAAQ,OAAO,EAAE,CAAC;YAE3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAElC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;oBAChC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;CAGJ;AAhBD,8CAgBC"}
+{"version":3,"file":"MockExpressServer.js","sourceRoot":"","sources":["../../../src/test/connectors/MockExpressServer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,OAAgB,iBAAiB;IACnC,MAAM,CAAM;IAEZ,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,MAAM,GAAG,GAAQ,OAAO,EAAE,CAAC;QAE3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAElC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CAGJ"}

package/dist/test/connectors/MockRegistry.d.ts

@@ -1,4 +1,4 @@
-import { MockExpressServer } from "./MockExpressServer";
+import { MockExpressServer } from "./MockExpressServer.js";
 export declare class MockRegistry extends MockExpressServer {
     aspects: any;
     records: any;

package/dist/test/connectors/MockRegistry.js

@@ -1,19 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockRegistry = void 0;
-const MockExpressServer_1 = require("./MockExpressServer");
-const lodash_1 = require("lodash");
-const body = require("body-parser");
-const djv = require("djv");
-class MockRegistry extends MockExpressServer_1.MockExpressServer {
-    constructor() {
-        super(...arguments);
-        this.aspects = {};
-        this.records = {};
-        this.env = djv();
-    }
+import { MockExpressServer } from "./MockExpressServer.js";
+import { merge } from "lodash";
+import express from "express";
+import djv from "djv";
+export class MockRegistry extends MockExpressServer {
+    aspects = {};
+    records = {};
+    env = djv();
     runImplementation(registry) {
-        registry.use(body.json({
+        registry.use(express.json({
             limit: "500000kb"
         }));
         registry.put("/aspects/:id", (req, res) => {
@@ -23,7 +17,7 @@ class MockRegistry extends MockExpressServer_1.MockExpressServer {
             res.json(req.body);
         });
         registry.put("/records/:id", (req, res) => {
-            this.records[req.params.id] = lodash_1.merge(this.records[req.params.id] || {}, req.body);
+            this.records[req.params.id] = merge(this.records[req.params.id] || {}, req.body);
             // validate aspects
             if (req.body.aspects) {
                 for (const [aspect, aspectBody] of Object.entries(req.body.aspects)) {
@@ -52,7 +46,7 @@ class MockRegistry extends MockExpressServer_1.MockExpressServer {
                         //         error: e.message
                         //     })
                         //     .end();
-                        console.log(e.message);
+                        console.log(e?.message);
                     }
                 }
             }
@@ -85,7 +79,6 @@ class MockRegistry extends MockExpressServer_1.MockExpressServer {
         });
     }
 }
-exports.MockRegistry = MockRegistry;
 if (require.main === module) {
     const app = new MockRegistry();
     app.run(8080);

package/dist/test/connectors/MockRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"MockRegistry.js","sourceRoot":"","sources":["../../../src/test/connectors/MockRegistry.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,mCAA+B;AAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACpC,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAE3B,MAAa,YAAa,SAAQ,qCAAiB;IAAnD;;QACI,YAAO,GAAQ,EAAE,CAAC;QAClB,YAAO,GAAQ,EAAE,CAAC;QAClB,QAAG,GAAQ,GAAG,EAAE,CAAC;IA0FrB,CAAC;IAxFG,iBAAiB,CAAC,QAAa;QAC3B,QAAQ,CAAC,GAAG,CACR,IAAI,CAAC,IAAI,CAAC;YACN,KAAK,EAAE,UAAU;SACpB,CAAC,CACL,CAAC;QAEF,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;YACvC,+EAA+E;YAC/E,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACvD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,cAAK,CAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,EACjC,GAAG,CAAC,IAAI,CACX,CAAC;YACF,mBAAmB;YACnB,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;gBAClB,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAC7C,GAAG,CAAC,IAAI,CAAC,OAAO,CACnB,EAAE;oBACC,IAAI;wBACA,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAC3B,GAAG,MAAM,EAAE,EACX,UAAU,CACb,CAAC;wBACF,IAAI,OAAO,EAAE;4BACT,OAAO,GAAG;iCACL,MAAM,CAAC,GAAG,CAAC;iCACX,IAAI,CAAC;gCACF,MAAM;gCACN,UAAU;gCACV,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,UAAU;gCACvC,OAAO;6BACV,CAAC;iCACD,GAAG,EAAE,CAAC;yBACd;qBACJ;oBAAC,OAAO,CAAC,EAAE;wBACR,0CAA0C;wBAC1C,aAAa;wBACb,mBAAmB;wBACnB,cAAc;wBACd,kBAAkB;wBAClB,sBAAsB;wBACtB,mDAAmD;wBACnD,2BAA2B;wBAC3B,SAAS;wBACT,cAAc;wBACd,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;qBAC1B;iBACJ;aACJ;YACD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC/C,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC9C,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAkB,KAAK,CAAC;gBAEhD,IAAI,MAAM,CAAC,SAAS,KAAK,GAAG,CAAC,KAAK,CAAC,mBAAmB,EAAE;oBACpD,SAAS;iBACZ;gBACD,IAAK,MAAc,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE;oBAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC9B,KAAK,EAAE,CAAC;iBACX;aACJ;YACD,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC9C,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,GAAQ,EAAE,GAAQ;YAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA7FD,oCA6FC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IACzB,MAAM,GAAG,GAAG,IAAI,YAAY,EAAE,CAAC;IAC/B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CACjB"}
+{"version":3,"file":"MockRegistry.js","sourceRoot":"","sources":["../../../src/test/connectors/MockRegistry.ts"],"names":[],"mappings":"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"}