@sprucelabs/spruce-test-fixtures 62.3.44 → 62.3.45

package/build/tests/fixtures/SkillFixture.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_1 = require("@sprucelabs/schema");
 class SkillFixture {
@@ -20,10 +9,14 @@ class SkillFixture {
         this.personFixture = options.personFixture;
     }
     async seedDemoSkill(options) {
-        const _a = options !== null && options !== void 0 ? options : {}, { creatorPhone } = _a, values = __rest(_a, ["creatorPhone"]);
+        const { creatorPhone, ...values } = options ?? {};
         const { client } = await this.personFixture.loginAsDemoPerson(creatorPhone);
         const [{ skill }] = await client.emitAndFlattenResponses('register-skill::v2020_12_25', {
-            payload: Object.assign({ slug: this.generateSkillSlug(), name: this.generateSkillName() }, values),
+            payload: {
+                slug: this.generateSkillSlug(),
+                name: this.generateSkillName(),
+                ...values,
+            },
         });
         this.skills.push({ client, skill });
         return skill;
@@ -35,7 +28,11 @@ class SkillFixture {
         return `seed-skill-${Math.round(new Date().getTime() * Math.random())}-${this.skillCounter++}`;
     }
     async loginAsDemoSkill(values) {
-        const skill = await this.seedDemoSkill(Object.assign(Object.assign({ slug: this.generateSkillSlug() }, values), { name: `${values.name} (SkillFixture)` }));
+        const skill = await this.seedDemoSkill({
+            slug: this.generateSkillSlug(),
+            ...values,
+            name: `${values.name} (SkillFixture)`,
+        });
         const skillClient = (await this.connectToApi({
             shouldReUseClient: false,
         }));
@@ -46,7 +43,6 @@ class SkillFixture {
         return { skill, client: skillClient };
     }
     async loginAsCurrentSkill() {
-        var _a;
         const missing = [];
         if (!process.env.SKILL_ID) {
             missing.push('env.SKILL_ID');
@@ -64,7 +60,7 @@ class SkillFixture {
             shouldReUseClient: false,
         });
         //@ts-ignore
-        let skill = (_a = client.auth) === null || _a === void 0 ? void 0 : _a.skill;
+        let skill = client.auth?.skill;
         if (!skill) {
             const auth = await client.authenticate({
                 skillId: process.env.SKILL_ID,
@@ -80,7 +76,10 @@ class SkillFixture {
         }
         return {
             client,
-            skill: Object.assign(Object.assign({}, skill), { apiKey: process.env.SKILL_API_KEY }),
+            skill: {
+                ...skill,
+                apiKey: process.env.SKILL_API_KEY,
+            },
         };
     }
     async destroy() {

package/build/tests/fixtures/SpyScope.js

@@ -43,8 +43,7 @@ class SpyScope {
         this.flags = flags;
     }
     getFlags() {
-        var _a;
-        return (_a = this.flags) !== null && _a !== void 0 ? _a : ['none'];
+        return this.flags ?? ['none'];
     }
     async getCurrentLocation() {
         this.assertScopedToCurrentLocation();

package/build/tests/fixtures/ViewFixture.js

@@ -28,8 +28,8 @@ class ViewFixture {
         this.connectToApi = connectToApi;
         this.people = people;
         this.vcDir =
-            vcDir !== null && vcDir !== void 0 ? vcDir : spruce_skill_utils_1.diskUtil.resolvePath(cwd !== null && cwd !== void 0 ? cwd : process.cwd(), 'build');
-        this.controllerMap = options === null || options === void 0 ? void 0 : options.controllerMap;
+            vcDir ?? spruce_skill_utils_1.diskUtil.resolvePath(cwd ?? process.cwd(), 'build');
+        this.controllerMap = options?.controllerMap;
         this.namespace = namespace;
         this.proxyDecorator = proxyDecorator;
         this.orgs = fixtureFactory.Fixture('organization', {
@@ -77,7 +77,10 @@ class ViewFixture {
         let pluginsByName = {};
         try {
             const { map: loadedControllerMap, pluginsByName: plugins } = vcDisk_utility_1.default.loadViewControllersAndBuildMap(namespace, vcDir);
-            controllerMap = Object.assign(Object.assign({}, loadedControllerMap), map);
+            controllerMap = {
+                ...loadedControllerMap,
+                ...map,
+            };
             pluginsByName = plugins;
         }
         catch (err) {
@@ -101,8 +104,7 @@ class ViewFixture {
             device: this.device,
             pluginsByName,
             connectToApi: async (options) => {
-                var _a;
-                return (_a = this.viewClient) !== null && _a !== void 0 ? _a : connectToApi(options);
+                return this.viewClient ?? connectToApi(options);
             },
             log: {
                 prefix: 'ViewFixture',
@@ -132,15 +134,17 @@ class ViewFixture {
         return ViewFixture.device;
     }
     Controller(name, options) {
-        var _a;
         try {
             const controller = this.getFactory().Controller(name, options);
             return controller;
         }
         catch (err) {
-            if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) === 'MISSING_STORAGE') {
-                throw new SpruceError_1.default(Object.assign(Object.assign({}, err.options), { friendlyMessage: err.message +
-                        "\n\nIf you are testing, make sure you're calling `await super.beforeEach()` in your test class." }));
+            if (err.options?.code === 'MISSING_STORAGE') {
+                throw new SpruceError_1.default({
+                    ...err.options,
+                    friendlyMessage: err.message +
+                        "\n\nIf you are testing, make sure you're calling `await super.beforeEach()` in your test class.",
+                });
             }
             else {
                 throw err;
@@ -190,20 +194,18 @@ class ViewFixture {
         __1.ClientProxyDecorator.getInstance().clearProxyTokenGenerator();
     }
     async load(vc, args) {
-        var _a;
         await this.assertScopeRequirementsMet(vc);
-        const scope = (_a = vc === null || vc === void 0 ? void 0 : vc.getScope) === null || _a === void 0 ? void 0 : _a.call(vc);
+        const scope = vc?.getScope?.();
         if (scope) {
             this.getScope().setFlags(scope);
         }
-        await vc.load(this.getRouter().buildLoadOptions(args !== null && args !== void 0 ? args : {}));
+        await vc.load(this.getRouter().buildLoadOptions(args ?? {}));
     }
     getThemes() {
         return this.getRouter().getThemes();
     }
     async assertScopeRequirementsMet(vc) {
-        var _a, _b;
-        if ((0, scopeUtils_1.doesScopeIncludeOrganization)((_a = vc.getScope) === null || _a === void 0 ? void 0 : _a.call(vc))) {
+        if ((0, scopeUtils_1.doesScopeIncludeOrganization)(vc.getScope?.())) {
             const org = await this.getScope().getCurrentOrganization();
             if (!org) {
                 throw new SpruceError_1.default({
@@ -212,7 +214,7 @@ class ViewFixture {
                 });
             }
         }
-        if ((0, scopeUtils_1.doesScopeIncludeLocation)((_b = vc.getScope) === null || _b === void 0 ? void 0 : _b.call(vc))) {
+        if ((0, scopeUtils_1.doesScopeIncludeLocation)(vc.getScope?.())) {
             const location = await this.getScope().getCurrentLocation();
             if (!location) {
                 throw new SpruceError_1.default({

package/build/tests/fixtures/generateRandomName.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateRandomName;
 const unique_names_generator_1 = require("unique-names-generator");
 function generateRandomName() {
-    var _a;
     const randomName = (0, unique_names_generator_1.uniqueNamesGenerator)({
         dictionaries: [unique_names_generator_1.starWars],
     }).split(' ');
     const values = {
         firstName: randomName[0],
-        lastName: (_a = randomName[1]) !== null && _a !== void 0 ? _a : null,
+        lastName: randomName[1] ?? null,
     };
     return values;
 }

package/build/tests/fixtures/scopeUtils.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doesScopeIncludeOrganization = doesScopeIncludeOrganization;
 exports.doesScopeIncludeLocation = doesScopeIncludeLocation;
 function doesScopeIncludeOrganization(flags) {
-    return flags === null || flags === void 0 ? void 0 : flags.includes('organization');
+    return flags?.includes('organization');
 }
 function doesScopeIncludeLocation(flags) {
-    return flags === null || flags === void 0 ? void 0 : flags.includes('location');
+    return flags?.includes('location');
 }

package/build/tests/routers/TestRouter.js

@@ -48,12 +48,11 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
         this.manuallySetNamespace = namespace;
     }
     getNamespace() {
-        var _a, _b;
         if (this.manuallySetNamespace) {
             return this.manuallySetNamespace;
         }
         //@ts-ignore
-        const id = (_b = (_a = this.presentVc) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 'heartwood.root';
+        const id = this.presentVc?.id ?? 'heartwood.root';
         return id.split('.')[0];
     }
     static setup(options) {
@@ -66,18 +65,17 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
         return this.presentVc;
     }
     async redirect(id, args) {
-        var _a, _b;
         if (TestRouter.shouldThrowWhenRedirectingToBadSvc ||
             this.vcFactory.hasController(id)) {
             //@ts-ignore
             this.presentVc = this.vcFactory.Controller(id, {});
         }
         if (TestRouter.shouldLoadDestinationVc) {
-            await ((_a = this.presentVc) === null || _a === void 0 ? void 0 : _a.load(this.buildLoadOptions(args)));
+            await this.presentVc?.load(this.buildLoadOptions(args));
         }
         await this.emit('did-redirect', {
             id: id,
-            vc: (_b = this.presentVc) !== null && _b !== void 0 ? _b : {},
+            vc: this.presentVc ?? {},
             args,
         });
         return this.presentVc;

package/build/utilities/vcDisk.utility.js

@@ -9,8 +9,7 @@ const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const vcDiskUtil = {
     loadViewControllers(activeDir, options) {
-        var _a;
-        const { shouldThrowOnError = true } = options !== null && options !== void 0 ? options : {};
+        const { shouldThrowOnError = true } = options ?? {};
         const path = this.resolveCombinedViewsPath(activeDir);
         if (!path) {
             throw new Error(`Could not find path to skill views. Running \`spruce sync.views\` may help.`);
@@ -28,7 +27,7 @@ const vcDiskUtil = {
             };
             try {
                 if (!item.id) {
-                    const name = (_a = controller.name) !== null && _a !== void 0 ? _a : 'Unknown View Controller';
+                    const name = controller.name ?? 'Unknown View Controller';
                     throw new SpruceError_1.default({
                         code: 'INVALID_VIEW_CONTROLLER',
                         friendlyMessage: `${name} is missing \`public static id = '${spruce_skill_utils_1.namesUtil.toKebab(name

package/package.json

@@ -13,7 +13,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "62.3.44",
+  "version": "62.3.45",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -61,29 +61,29 @@
     "lint.tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^28.3.136",
-    "@sprucelabs/error": "^6.0.477",
-    "@sprucelabs/heartwood-view-controllers": "^110.12.154",
-    "@sprucelabs/mercury-client": "^42.0.527",
-    "@sprucelabs/mercury-core-events": "^24.3.289",
-    "@sprucelabs/mercury-event-emitter": "^42.0.527",
-    "@sprucelabs/schema": "^30.0.486",
-    "@sprucelabs/spruce-core-schemas": "^40.1.472",
-    "@sprucelabs/spruce-event-utils": "^40.1.248",
-    "@sprucelabs/spruce-permission-utils": "^8.0.604",
-    "@sprucelabs/spruce-skill-booter": "^62.3.44",
-    "@sprucelabs/spruce-skill-utils": "^31.0.545",
-    "@sprucelabs/test-utils": "^5.1.427",
+    "@sprucelabs/data-stores": "^28.3.141",
+    "@sprucelabs/error": "^6.0.479",
+    "@sprucelabs/heartwood-view-controllers": "^110.12.159",
+    "@sprucelabs/mercury-client": "^42.0.528",
+    "@sprucelabs/mercury-core-events": "^24.3.290",
+    "@sprucelabs/mercury-event-emitter": "^42.0.528",
+    "@sprucelabs/schema": "^30.0.488",
+    "@sprucelabs/spruce-core-schemas": "^40.1.473",
+    "@sprucelabs/spruce-event-utils": "^40.1.249",
+    "@sprucelabs/spruce-permission-utils": "^8.0.605",
+    "@sprucelabs/spruce-skill-booter": "^62.3.45",
+    "@sprucelabs/spruce-skill-utils": "^31.0.547",
+    "@sprucelabs/test-utils": "^5.1.432",
     "dotenv": "^16.4.5",
     "unique-names-generator": "^4.7.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.461",
-    "@sprucelabs/jest-json-reporter": "^8.0.477",
-    "@sprucelabs/mercury-types": "^47.0.528",
-    "@sprucelabs/resolve-path-aliases": "^2.0.456",
+    "@sprucelabs/esm-postbuild": "^6.0.462",
+    "@sprucelabs/jest-json-reporter": "^8.0.480",
+    "@sprucelabs/mercury-types": "^47.0.529",
+    "@sprucelabs/resolve-path-aliases": "^2.0.457",
     "@sprucelabs/semantic-release": "^5.0.2",
-    "@sprucelabs/test": "^9.0.50",
+    "@sprucelabs/test": "^9.0.51",
     "@types/node": "17.0.5",
     "calendar-utils": "^0.11.0",
     "chokidar-cli": "^3.0.0",
@@ -114,5 +114,5 @@
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
   },
-  "gitHead": "c7972277d178a6c6bac75519fff5814ae846ce30"
+  "gitHead": "59b913c0b16c2e83a7506abd5618082abfcd1f65"
 }

package/tsconfig.json

@@ -3,10 +3,9 @@
 		"skipLibCheck": true,
 		"module": "commonjs",
 		"esModuleInterop": true,
-		"target": "ES2017",
+		"target": "ES2020",
 		"lib": [
 			"DOM",
-			"es2017",
 			"ES2020"
 		],
 		"declaration": true,