@sprucelabs/spruce-test-fixtures 62.3.44 → 62.3.46

package/build/ClientProxyDecorator.js

@@ -22,12 +22,15 @@ class ClientProxyDecorator {
         delete this.instance;
     }
     decorateEmitToPassProxyToken(client, token) {
-        const newClient = Object.assign(Object.assign({}, client), { proxyToken: token, 
+        const newClient = {
+            ...client,
+            proxyToken: token,
             //@ts-ignore
             emit: async (eventName, targetAndPayload, cb) => {
                 let builtTp = await this.mixinProxyToken(token, targetAndPayload);
                 return client.emit(eventName, builtTp, cb);
-            }, emitAndFlattenResponses: async (
+            },
+            emitAndFlattenResponses: async (
             //@ts-ignore
             eventName, 
             //@ts-ignore
@@ -36,20 +39,23 @@ class ClientProxyDecorator {
             cb) => {
                 let builtTp = await this.mixinProxyToken(token, targetAndPayload);
                 return client.emitAndFlattenResponses(eventName, builtTp, cb);
-            } });
+            },
+        };
         spruce_skill_utils_1.functionDelegationUtil.delegateFunctionCalls(newClient, client);
         newClient.getProxyToken = () => token;
         return newClient;
     }
     async mixinProxyToken(token, targetAndPayload) {
-        var _a;
-        const t = token || (await ((_a = this.proxyTokenGenerator) === null || _a === void 0 ? void 0 : _a.call(this)));
+        const t = token || (await this.proxyTokenGenerator?.());
         let builtTp = targetAndPayload;
         if (t) {
             if (!builtTp) {
                 builtTp = {};
             }
-            builtTp.source = Object.assign(Object.assign({}, builtTp === null || builtTp === void 0 ? void 0 : builtTp.source), { proxyToken: t });
+            builtTp.source = {
+                ...builtTp?.source,
+                proxyToken: t,
+            };
         }
         return builtTp;
     }

package/build/errors/SpruceError.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const error_1 = __importDefault(require("@sprucelabs/error"));
 class SpruceError extends error_1.default {
     friendlyMessage() {
-        var _a, _b, _c;
         const { options } = this;
         let message;
-        switch (options === null || options === void 0 ? void 0 : options.code) {
+        switch (options?.code) {
             case 'INVALID_FIXTURE':
                 message = `"${options.suppliedName}" is not a valid fixture name. Try: \n\n${options.validNames.join('\n')}`;
                 break;
@@ -17,10 +16,10 @@ class SpruceError extends error_1.default {
                 message = `Couldn't find skill with slug ${options.slug}!`;
                 break;
             case 'INVALID_VIEW_CONTROLLER':
-                message = `Dang! The view controller named ${(_a = options.name) !== null && _a !== void 0 ? _a : options.id} is not valid..`;
+                message = `Dang! The view controller named ${options.name ?? options.id} is not valid..`;
                 break;
             case 'UNKNOWN_VIEW_CONTROLLER_ERROR':
-                message = `No idea what happened when trying to load the view controller ${(_b = options.name) !== null && _b !== void 0 ? _b : options.id}! The original error is:\n\n${(_c = options.originalError) === null || _c === void 0 ? void 0 : _c.stack}`;
+                message = `No idea what happened when trying to load the view controller ${options.name ?? options.id}! The original error is:\n\n${options.originalError?.stack}`;
                 break;
             case 'FAKE_EVENT_ERROR':
                 message = `A faked response to '${options.fqen}' threw an error! If this failed a test it's time to try/catch and possibly render an alert()! If this was expected (the tests pass), then ignore it.`;

package/build/tests/AbstractSpruceFixtureTest.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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -53,13 +42,12 @@ class AbstractSpruceFixtureTest extends spruce_skill_booter_1.AbstractSkillTest
         await FixtureFactory_1.default.afterAll();
     }
     static Fixture(name, options) {
-        var _a;
         if (!this._fixtures) {
             const pkg = spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'package.json');
             let namespace;
             if (spruce_skill_utils_1.diskUtil.doesFileExist(pkg)) {
                 const values = JSON.parse(spruce_skill_utils_1.diskUtil.readFile(pkg));
-                namespace = (_a = values === null || values === void 0 ? void 0 : values.skill) === null || _a === void 0 ? void 0 : _a.namespace;
+                namespace = values?.skill?.namespace;
             }
             this._fixtures = new FixtureFactory_1.default({
                 cwd: this.cwd,
@@ -69,7 +57,7 @@ class AbstractSpruceFixtureTest extends spruce_skill_booter_1.AbstractSkillTest
         return this._fixtures.Fixture(name, options);
     }
     static async bootAndRegisterNewSkill(options) {
-        const { name, slug } = options, skillOptions = __rest(options, ["name", "slug"]);
+        const { name, slug, ...skillOptions } = options;
         const { skill, client } = await this.skills.loginAsDemoSkill({
             name,
             slug,

package/build/tests/FakeThemeManager.js

@@ -31,7 +31,9 @@ class FakeThemeManager {
         };
     }
     setTheme(theme) {
-        this.theme = Object.assign({}, theme);
+        this.theme = {
+            ...theme,
+        };
     }
     getTheme() {
         return this.theme;

package/build/tests/constants.js

@@ -2,36 +2,35 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEMO_NUMBER_ACCOUNT_AFTER_ALL_RESET = exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE_ALT = exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE = exports.DEMO_NUMBER_PERSON_FIXTURE = exports.DEMO_NUMBER_SCOPE = exports.DEMO_NUMBER_TEST_CLIENT_RECENT = exports.DEMO_NUMBER_VIEW_FIXTURE_CLIENT_2 = exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET_LOCATION = exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET = exports.DEMO_NUMBER_LOGIN_DECORATOR_2 = exports.DEMO_NUMBER_LOGIN_DECORATOR = exports.DEMO_NUMBER_VIEW_FIXTURE_2 = exports.DEMO_NUMBER_HANDLING_EVENTS_LOCALLY = exports.DEMO_NUMBER_ORGANIZATION_FIXTURE = exports.DEMO_NUMBER_LOCATION_FIXTURE_OUTSIDER = exports.DEMO_NUMBER_SKILL_FIXTURE = exports.DEMO_NUMBER_ACCOUNT_RESET = exports.DEMO_NUMBER_SKILL_DECORATORS = exports.DEMO_NUMBER_DECORATORS = exports.DEMO_NUMBER_SEED_FIXTURE = exports.DEMO_NUMBER_ROLE_FIXTURE = exports.DEMO_NUMBER_LOCATION_FIXTURE = exports.DEMO_NUMBER_MERCURY_FIXTURE = exports.DEMO_NUMBER_VIEW_FIXTURE = exports.DEMO_NUMBER_SECOND_LOGIN = exports.DEMO_NUMBER_INSTALLING_SKILLS = exports.DEMO_NUMBER_HIRING = exports.DEMO_NUMBER = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
-exports.DEMO_NUMBER = (_a = process.env.DEMO_NUMBER) !== null && _a !== void 0 ? _a : '**MISSING**';
-exports.DEMO_NUMBER_HIRING = (_b = process.env.DEMO_NUMBER_HIRING) !== null && _b !== void 0 ? _b : '**MISSING**';
-exports.DEMO_NUMBER_INSTALLING_SKILLS = (_c = process.env.DEMO_NUMBER_INSTALLING_SKILLS) !== null && _c !== void 0 ? _c : '**MISSING**';
-exports.DEMO_NUMBER_SECOND_LOGIN = (_d = process.env.DEMO_NUMBER_SECOND_LOGIN) !== null && _d !== void 0 ? _d : '**MISSING**';
-exports.DEMO_NUMBER_VIEW_FIXTURE = (_e = process.env.DEMO_NUMBER_VIEW_FIXTURE) !== null && _e !== void 0 ? _e : '**MISSING**';
-exports.DEMO_NUMBER_MERCURY_FIXTURE = (_f = process.env.DEMO_NUMBER_MERCURY_FIXTURE) !== null && _f !== void 0 ? _f : '***missing***';
-exports.DEMO_NUMBER_LOCATION_FIXTURE = (_g = process.env.DEMO_NUMBER_LOCATION_FIXTURE) !== null && _g !== void 0 ? _g : '***missing***';
-exports.DEMO_NUMBER_ROLE_FIXTURE = (_h = process.env.DEMO_NUMBER_ROLE_FIXTURE) !== null && _h !== void 0 ? _h : '***missing***';
-exports.DEMO_NUMBER_SEED_FIXTURE = (_j = process.env.DEMO_NUMBER_SEED_FIXTURE) !== null && _j !== void 0 ? _j : '***missing***';
-exports.DEMO_NUMBER_DECORATORS = (_k = process.env.DEMO_NUMBER_DECORATORS) !== null && _k !== void 0 ? _k : '***missing***';
-exports.DEMO_NUMBER_SKILL_DECORATORS = (_l = process.env.DEMO_NUMBER_SKILL_DECORATORS) !== null && _l !== void 0 ? _l : '***missing***';
-exports.DEMO_NUMBER_ACCOUNT_RESET = (_m = process.env.DEMO_NUMBER_ACCOUNT_RESET) !== null && _m !== void 0 ? _m : '***missing***';
-exports.DEMO_NUMBER_SKILL_FIXTURE = (_o = process.env.DEMO_NUMBER_SKILL_FIXTURE) !== null && _o !== void 0 ? _o : '***missing***';
-exports.DEMO_NUMBER_LOCATION_FIXTURE_OUTSIDER = (_p = process.env.DEMO_NUMBER_LOCATION_FIXTURE_OUTSIDER) !== null && _p !== void 0 ? _p : '***missing***';
-exports.DEMO_NUMBER_ORGANIZATION_FIXTURE = (_q = process.env.DEMO_NUMBER_ORGANIZATION_FIXTURE) !== null && _q !== void 0 ? _q : '***missing***';
-exports.DEMO_NUMBER_HANDLING_EVENTS_LOCALLY = (_r = process.env.DEMO_NUMBER_HANDLING_EVENTS_LOCALLY) !== null && _r !== void 0 ? _r : '***missing***';
-exports.DEMO_NUMBER_VIEW_FIXTURE_2 = (_s = process.env.DEMO_NUMBER_VIEW_FIXTURE_2) !== null && _s !== void 0 ? _s : '***missing***';
-exports.DEMO_NUMBER_LOGIN_DECORATOR = (_t = process.env.DEMO_NUMBER_LOGIN_DECORATOR) !== null && _t !== void 0 ? _t : '***missing***';
-exports.DEMO_NUMBER_LOGIN_DECORATOR_2 = (_u = process.env.DEMO_NUMBER_LOGIN_DECORATOR_2) !== null && _u !== void 0 ? _u : '***missing***';
-exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET = (_v = process.env.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET) !== null && _v !== void 0 ? _v : '***missing***';
-exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET_LOCATION = (_w = process.env.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET_LOCATION) !== null && _w !== void 0 ? _w : '***missing***';
-exports.DEMO_NUMBER_VIEW_FIXTURE_CLIENT_2 = (_x = process.env.DEMO_NUMBER_VIEW_FIXTURE_CLIENT_2) !== null && _x !== void 0 ? _x : '***missing***';
-exports.DEMO_NUMBER_TEST_CLIENT_RECENT = (_y = process.env.DEMO_NUMBER_TEST_CLIENT_RECENT) !== null && _y !== void 0 ? _y : '***missing***';
-exports.DEMO_NUMBER_SCOPE = (_z = process.env.DEMO_NUMBER_SCOPE) !== null && _z !== void 0 ? _z : '***missing***';
-exports.DEMO_NUMBER_PERSON_FIXTURE = (_0 = process.env.DEMO_NUMBER_PERSON_FIXTURE) !== null && _0 !== void 0 ? _0 : '**missing**';
-exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE = (_1 = process.env.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE) !== null && _1 !== void 0 ? _1 : '**missing**';
-exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE_ALT = (_2 = process.env.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE_ALT) !== null && _2 !== void 0 ? _2 : '**missing**';
-exports.DEMO_NUMBER_ACCOUNT_AFTER_ALL_RESET = (_3 = process.env.DEMO_NUMBER_ACCOUNT_AFTER_ALL_RESET) !== null && _3 !== void 0 ? _3 : '***missing***';
+exports.DEMO_NUMBER = process.env.DEMO_NUMBER ?? '**MISSING**';
+exports.DEMO_NUMBER_HIRING = process.env.DEMO_NUMBER_HIRING ?? '**MISSING**';
+exports.DEMO_NUMBER_INSTALLING_SKILLS = process.env.DEMO_NUMBER_INSTALLING_SKILLS ?? '**MISSING**';
+exports.DEMO_NUMBER_SECOND_LOGIN = process.env.DEMO_NUMBER_SECOND_LOGIN ?? '**MISSING**';
+exports.DEMO_NUMBER_VIEW_FIXTURE = process.env.DEMO_NUMBER_VIEW_FIXTURE ?? '**MISSING**';
+exports.DEMO_NUMBER_MERCURY_FIXTURE = process.env.DEMO_NUMBER_MERCURY_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_LOCATION_FIXTURE = process.env.DEMO_NUMBER_LOCATION_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_ROLE_FIXTURE = process.env.DEMO_NUMBER_ROLE_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_SEED_FIXTURE = process.env.DEMO_NUMBER_SEED_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_DECORATORS = process.env.DEMO_NUMBER_DECORATORS ?? '***missing***';
+exports.DEMO_NUMBER_SKILL_DECORATORS = process.env.DEMO_NUMBER_SKILL_DECORATORS ?? '***missing***';
+exports.DEMO_NUMBER_ACCOUNT_RESET = process.env.DEMO_NUMBER_ACCOUNT_RESET ?? '***missing***';
+exports.DEMO_NUMBER_SKILL_FIXTURE = process.env.DEMO_NUMBER_SKILL_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_LOCATION_FIXTURE_OUTSIDER = process.env.DEMO_NUMBER_LOCATION_FIXTURE_OUTSIDER ?? '***missing***';
+exports.DEMO_NUMBER_ORGANIZATION_FIXTURE = process.env.DEMO_NUMBER_ORGANIZATION_FIXTURE ?? '***missing***';
+exports.DEMO_NUMBER_HANDLING_EVENTS_LOCALLY = process.env.DEMO_NUMBER_HANDLING_EVENTS_LOCALLY ?? '***missing***';
+exports.DEMO_NUMBER_VIEW_FIXTURE_2 = process.env.DEMO_NUMBER_VIEW_FIXTURE_2 ?? '***missing***';
+exports.DEMO_NUMBER_LOGIN_DECORATOR = process.env.DEMO_NUMBER_LOGIN_DECORATOR ?? '***missing***';
+exports.DEMO_NUMBER_LOGIN_DECORATOR_2 = process.env.DEMO_NUMBER_LOGIN_DECORATOR_2 ?? '***missing***';
+exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET = process.env.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET ?? '***missing***';
+exports.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET_LOCATION = process.env.DEMO_NUMBER_ACCOUNT_BEFORE_ALL_RESET_LOCATION ?? '***missing***';
+exports.DEMO_NUMBER_VIEW_FIXTURE_CLIENT_2 = process.env.DEMO_NUMBER_VIEW_FIXTURE_CLIENT_2 ?? '***missing***';
+exports.DEMO_NUMBER_TEST_CLIENT_RECENT = process.env.DEMO_NUMBER_TEST_CLIENT_RECENT ?? '***missing***';
+exports.DEMO_NUMBER_SCOPE = process.env.DEMO_NUMBER_SCOPE ?? '***missing***';
+exports.DEMO_NUMBER_PERSON_FIXTURE = process.env.DEMO_NUMBER_PERSON_FIXTURE ?? '**missing**';
+exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE = process.env.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE ?? '**missing**';
+exports.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE_ALT = process.env.DEMO_NUMBER_SEED_FIXTURE_STARTING_PHONE_ALT ?? '**missing**';
+exports.DEMO_NUMBER_ACCOUNT_AFTER_ALL_RESET = process.env.DEMO_NUMBER_ACCOUNT_AFTER_ALL_RESET ?? '***missing***';

package/build/tests/decorators/fake.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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,7 +30,6 @@ const strategies = {
     owners: buildSeeder('owners'),
 };
 function resetFakedRecords(Class) {
-    var _a, _b, _c;
     if (shouldSkipNextReset) {
         shouldSkipNextReset = false;
         return;
@@ -56,25 +44,24 @@ function resetFakedRecords(Class) {
     Class.fakedGroupManagers = [];
     Class.fakedGuests = [];
     Class.fakedRoles = [];
-    Class.fakedPeople = ((_a = Class.fakedPeople) === null || _a === void 0 ? void 0 : _a[0]) ? [Class.fakedPeople[0]] : [];
+    Class.fakedPeople = Class.fakedPeople?.[0] ? [Class.fakedPeople[0]] : [];
     Class.fakedSkills = [];
-    Class.fakedTokens = ((_b = Class.fakedTokens) === null || _b === void 0 ? void 0 : _b[0]) ? [Class.fakedTokens[0]] : [];
-    Class.fakedProxyTokens = ((_c = Class.fakedProxyTokens) === null || _c === void 0 ? void 0 : _c[0])
+    Class.fakedTokens = Class.fakedTokens?.[0] ? [Class.fakedTokens[0]] : [];
+    Class.fakedProxyTokens = Class.fakedProxyTokens?.[0]
         ? [Class.fakedProxyTokens[0]]
         : [];
 }
 function fake(target, total) {
     (0, schema_1.assertOptions)({ target, total }, ['target', 'total']);
     return function (TestClass, _key, descriptor) {
-        var _a, _b;
         const Class = TestClass;
-        const bound = (_b = (_a = descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) === null || _a === void 0 ? void 0 : _a.bind) === null || _b === void 0 ? void 0 : _b.call(_a, Class);
+        const bound = descriptor?.value?.bind?.(Class);
         descriptor.value = async (...args) => {
             test_utils_1.assert.isTruthy(Class.fakedPerson, `You gotta @faker.login(...) before you can create fake '${target}'!`);
             const strategy = strategies[target];
             test_utils_1.assert.isTruthy(strategy, `Faking ${target} is not ready yet!`);
-            await (strategy === null || strategy === void 0 ? void 0 : strategy(Class, total));
-            await (bound === null || bound === void 0 ? void 0 : bound(...args));
+            await strategy?.(Class, total);
+            await bound?.(...args);
         };
     };
 }
@@ -87,15 +74,14 @@ fake.login = (phone = '555-000-0000') => {
     ViewFixture_1.default.setShouldAutomaticallyResetAuth(false);
     seed_1.default.disableResettingTestClient();
     return function (TestClass, shouldPassHookCalls = true) {
-        var _a, _b, _c;
         if (!(TestClass.prototype instanceof AbstractSpruceFixtureTest_1.default)) {
             spruce_skill_utils_1.testLog.warn(`@fake.login() is attached to an incompatible test class (${TestClass.name}). You can safely remove it or have your test class extend AbstractSpruceFixtureTest.`);
             return;
         }
         const Class = TestClass;
-        const beforeEach = (_a = Class.beforeEach) === null || _a === void 0 ? void 0 : _a.bind(Class);
-        const beforeAll = (_b = Class.beforeAll) === null || _b === void 0 ? void 0 : _b.bind(Class);
-        const afterEach = (_c = Class.afterEach) === null || _c === void 0 ? void 0 : _c.bind(Class);
+        const beforeEach = Class.beforeEach?.bind(Class);
+        const beforeAll = Class.beforeAll?.bind(Class);
+        const afterEach = Class.afterEach?.bind(Class);
         if (shouldPassHookCalls) {
             const old = MercuryFixture_1.default.beforeEach.bind(MercuryFixture_1.default);
             MercuryFixture_1.default.beforeEach = async (...args) => {
@@ -105,7 +91,7 @@ fake.login = (phone = '555-000-0000') => {
             };
         }
         Class.beforeAll = async () => {
-            await (beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll());
+            await beforeAll?.();
             resetFakedRecords(Class);
             await setupFakeListeners(Class);
             await login(Class, phone);
@@ -113,7 +99,7 @@ fake.login = (phone = '555-000-0000') => {
         };
         Class.afterEach = async () => {
             await setupFakeListeners(Class);
-            await (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
+            await afterEach?.();
         };
         Class.beforeEach = async () => {
             resetFakedRecords(Class);
@@ -128,10 +114,10 @@ fake.login = (phone = '555-000-0000') => {
                 //@ts-ignore
                 Class.fakedClient.auth.token, Class.fakedPerson);
             }
-            catch (_a) {
+            catch {
                 //hits if not in skill because cant find nameplace
             }
-            shouldPassHookCalls && (await (beforeEach === null || beforeEach === void 0 ? void 0 : beforeEach()));
+            shouldPassHookCalls && (await beforeEach?.());
         };
     };
 };
@@ -161,7 +147,7 @@ async function loginUsingViewsFallingBackToPeople(Class, phone) {
         person = p;
         client = c;
     }
-    catch (_a) {
+    catch {
         const { person: p, client: c } = await Class.people.loginAsDemoPerson(phone);
         person = p;
         client = c;
@@ -205,7 +191,7 @@ async function setupFakeListeners(Class) {
 }
 async function fakeAddRole(Class) {
     await eventFaker_1.default.on('add-role::v2020_12_25', ({ payload, target }) => {
-        const { organizationId, locationId } = target !== null && target !== void 0 ? target : {};
+        const { organizationId, locationId } = target ?? {};
         const { roleId } = payload;
         const person = getPersonById(Class, payload.personId);
         addPersonAsRoleToLocationOrOrg({
@@ -258,12 +244,11 @@ async function fakeGetRole(Class) {
 }
 async function fakeRemoveRole(Class) {
     await eventFaker_1.default.on('remove-role::v2020_12_25', ({ payload }) => {
-        var _a;
         const { personId, roleId } = payload;
         const role = getRoleById(Class, roleId);
         const people = Class[roleBaseToLocalFakedProp(role.base)];
-        const idx = (_a = people === null || people === void 0 ? void 0 : people.findIndex((p) => p.id === personId)) !== null && _a !== void 0 ? _a : -1;
-        people === null || people === void 0 ? void 0 : people.splice(idx, 1);
+        const idx = people?.findIndex((p) => p.id === personId) ?? -1;
+        people?.splice(idx, 1);
         Class.fakedPeopleRoles = Class.fakedPeopleRoles.filter((p) => !(p.personId === personId && p.roleId === roleId));
         return {};
     });
@@ -283,17 +268,17 @@ function getPersonById(Class, personId, shouldThrowWhenNotFound = true) {
 }
 async function fakeUpdatePerson(Class) {
     await eventFaker_1.default.on('update-person::v2020_12_25', ({ target, source, payload }) => {
-        const person = Class.fakedPeople.find((p) => (target === null || target === void 0 ? void 0 : target.personId)
-            ? p.id === (target === null || target === void 0 ? void 0 : target.personId)
-            : p.id === (source === null || source === void 0 ? void 0 : source.personId));
+        const person = Class.fakedPeople.find((p) => target?.personId
+            ? p.id === target?.personId
+            : p.id === source?.personId);
         if (!person) {
             throw new SpruceError_1.default({
                 code: 'INVALID_TARGET',
                 friendlyMessage: `I could not update the faked person you were looking for!`,
             });
         }
-        person.firstName = payload === null || payload === void 0 ? void 0 : payload.firstName;
-        person.lastName = payload === null || payload === void 0 ? void 0 : payload.lastName;
+        person.firstName = payload?.firstName;
+        person.lastName = payload?.lastName;
         person.casualName = buildCasualName(person);
         return {
             person,
@@ -302,9 +287,8 @@ async function fakeUpdatePerson(Class) {
 }
 async function fakeListRoles(Class) {
     await eventFaker_1.default.on('list-roles::v2020_12_25', ({ target, payload }) => {
-        var _a;
-        let { personId, organizationId, locationId } = target !== null && target !== void 0 ? target : {};
-        const { shouldIncludeMetaRoles, shouldIncludePrivateRoles } = payload !== null && payload !== void 0 ? payload : {};
+        let { personId, organizationId, locationId } = target ?? {};
+        const { shouldIncludeMetaRoles, shouldIncludePrivateRoles } = payload ?? {};
         let roles = [];
         if (personId) {
             const personRoles = Class.fakedPeopleRoles
@@ -318,7 +302,7 @@ async function fakeListRoles(Class) {
         }
         else {
             if (locationId) {
-                organizationId = (_a = Class._fakedLocations.find((l) => l.id === locationId)) === null || _a === void 0 ? void 0 : _a.organizationId;
+                organizationId = Class._fakedLocations.find((l) => l.id === locationId)?.organizationId;
             }
             roles = Class.fakedRoles.filter((r) => r.organizationId === organizationId);
         }
@@ -335,18 +319,17 @@ async function fakeListRoles(Class) {
 }
 async function fakeListPeople(Class) {
     await eventFaker_1.default.on('list-people::v2020_12_25', ({ payload }) => {
-        var _a;
         let people = [];
-        test_utils_1.assert.isFalsy(payload === null || payload === void 0 ? void 0 : payload.roleIds, `@fake does not support listing people by roleIds. You will need to use 'eventFaker.on('list-people')' to fake your own response OR consider checking this.fakedPeople on your test class.`);
-        test_utils_1.assert.isFalsy(payload === null || payload === void 0 ? void 0 : payload.personIds, `@fake does not support listing people by personIds. You will need to use 'eventFaker.on(...)' to fake your own response OR consider checking this.fakedPeople on your test class`);
-        for (const base of (_a = payload === null || payload === void 0 ? void 0 : payload.roleBases) !== null && _a !== void 0 ? _a : []) {
+        test_utils_1.assert.isFalsy(payload?.roleIds, `@fake does not support listing people by roleIds. You will need to use 'eventFaker.on('list-people')' to fake your own response OR consider checking this.fakedPeople on your test class.`);
+        test_utils_1.assert.isFalsy(payload?.personIds, `@fake does not support listing people by personIds. You will need to use 'eventFaker.on(...)' to fake your own response OR consider checking this.fakedPeople on your test class`);
+        for (const base of payload?.roleBases ?? []) {
             const faked = getFakedRecordsByRoleBase(Class, base);
             if (faked) {
                 people.push(...faked);
             }
         }
         return {
-            people: (payload === null || payload === void 0 ? void 0 : payload.roleBases) ? people : Class.fakedPeople,
+            people: payload?.roleBases ? people : Class.fakedPeople,
         };
     });
 }
@@ -357,8 +340,8 @@ function getFakedRecordsByRoleBase(Class, base) {
 async function fakeListLocations(Class) {
     await eventFaker_1.default.on('list-locations::v2020_12_25', ({ target, payload }) => {
         return {
-            locations: applyPaging(Class._fakedLocations, payload).filter((l) => !(target === null || target === void 0 ? void 0 : target.organizationId) ||
-                l.organizationId === (target === null || target === void 0 ? void 0 : target.organizationId)),
+            locations: applyPaging(Class._fakedLocations, payload).filter((l) => !target?.organizationId ||
+                l.organizationId === target?.organizationId),
         };
     });
 }
@@ -386,7 +369,11 @@ async function fakeUpdateLocation(Class) {
                 friendlyMessage: `I could not find that location to update!`,
             });
         }
-        Class._fakedLocations[idx] = Object.assign(Object.assign(Object.assign({}, Class._fakedLocations[idx]), payload), { dateUpdated: Date.now() });
+        Class._fakedLocations[idx] = {
+            ...Class._fakedLocations[idx],
+            ...payload,
+            dateUpdated: Date.now(),
+        };
         return {
             location: Class._fakedLocations[idx],
         };
@@ -410,9 +397,14 @@ async function fakeDeleteOrganization(Class) {
 }
 async function fakeCreateLocation(Class) {
     await eventFaker_1.default.on('create-location::v2020_12_25', ({ target, payload, source }) => {
-        var _a;
-        const { personId } = source !== null && source !== void 0 ? source : {};
-        const location = Object.assign(Object.assign({ id: (0, test_utils_2.generateId)(), dateCreated: new Date().getTime(), organizationId: target.organizationId }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : spruce_skill_utils_1.namesUtil.toKebab(payload.name) });
+        const { personId } = source ?? {};
+        const location = {
+            id: (0, test_utils_2.generateId)(),
+            dateCreated: new Date().getTime(),
+            organizationId: target.organizationId,
+            ...payload,
+            slug: payload.slug ?? spruce_skill_utils_1.namesUtil.toKebab(payload.name),
+        };
         Class._fakedLocations.unshift(location);
         if (personId) {
             const role = Class.fakedRoles.find((r) => r.base === 'owner');
@@ -430,8 +422,13 @@ async function fakeCreateLocation(Class) {
 }
 async function fakeCreateOrganization(Class) {
     await eventFaker_1.default.on('create-organization::v2020_12_25', ({ payload }) => {
-        var _a;
-        const organization = Object.assign(Object.assign({ id: (0, test_utils_2.generateId)(), dateCreated: new Date().getTime(), isPublic: null }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : spruce_skill_utils_1.namesUtil.toKebab(payload.name) });
+        const organization = {
+            id: (0, test_utils_2.generateId)(),
+            dateCreated: new Date().getTime(),
+            isPublic: null,
+            ...payload,
+            slug: payload.slug ?? spruce_skill_utils_1.namesUtil.toKebab(payload.name),
+        };
         Class._fakedOrganizations.unshift(organization);
         const roles = seedRoles(Class, organization.id);
         addPersonAsRoleToLocationOrOrg({
@@ -447,7 +444,7 @@ async function fakeCreateOrganization(Class) {
 }
 async function fakeGetPerson(Class) {
     await eventFaker_1.default.on('get-person::v2020_12_25', ({ target }) => {
-        test_utils_1.assert.isTruthy(target === null || target === void 0 ? void 0 : target.personId, `@fake only supports 'get-person::v2020_12_25' when passing an id. To fake more, use 'eventFaker.on(...)'.`);
+        test_utils_1.assert.isTruthy(target?.personId, `@fake only supports 'get-person::v2020_12_25' when passing an id. To fake more, use 'eventFaker.on(...)'.`);
         const person = getPersonById(Class, target.personId);
         if (!person) {
             throw new SpruceError_1.default({
@@ -464,8 +461,14 @@ async function fakeSkillLifecycleEvents(Class) {
     process.env.SKILL_ID = process.env.SKILL_ID || (0, test_utils_2.generateId)();
     process.env.SKILL_API_KEY = process.env.SKILL_API_KEY || (0, test_utils_2.generateId)();
     await eventFaker_1.default.on('register-skill::v2020_12_25', ({ payload }) => {
-        var _a;
-        const skill = Object.assign(Object.assign({ apiKey: (0, test_utils_2.generateId)(), creators: [{ personId: Class.fakedPerson.id }], dateCreated: new Date().getTime(), id: (0, test_utils_2.generateId)() }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : (0, test_utils_2.generateId)() });
+        const skill = {
+            apiKey: (0, test_utils_2.generateId)(),
+            creators: [{ personId: Class.fakedPerson.id }],
+            dateCreated: new Date().getTime(),
+            id: (0, test_utils_2.generateId)(),
+            ...payload,
+            slug: payload.slug ?? (0, test_utils_2.generateId)(),
+        };
         Class.fakedSkills.unshift(skill);
         return {
             skill,
@@ -480,8 +483,7 @@ async function fakeSkillLifecycleEvents(Class) {
     }));
 }
 function buildCasualName(names) {
-    var _a;
-    return `${(_a = names.firstName) !== null && _a !== void 0 ? _a : 'friend'} ${names.lastName ? names.lastName[0] + '.' : ''}`.trim();
+    return `${names.firstName ?? 'friend'} ${names.lastName ? names.lastName[0] + '.' : ''}`.trim();
 }
 async function fakeGetOrganization(Class) {
     await eventFaker_1.default.on('get-organization::v2020_12_25', ({ target }) => {
@@ -494,18 +496,16 @@ async function fakeGetOrganization(Class) {
 async function fakeUpdateOrganization(Class) {
     await eventFaker_1.default.on('update-organization::v2020_12_25', ({ target, payload }) => {
         const match = findOrgFromTarget(Class, target);
-        if (payload === null || payload === void 0 ? void 0 : payload.name) {
+        if (payload?.name) {
             match.name = payload.name;
         }
-        if (payload === null || payload === void 0 ? void 0 : payload.address) {
+        if (payload?.address) {
             match.address = payload.address;
         }
-        if (typeof (payload === null || payload === void 0 ? void 0 : payload.isPublic) !== 'undefined') {
+        if (typeof payload?.isPublic !== 'undefined') {
             match.isPublic = payload.isPublic;
         }
-        const copy = __rest(match
-        //@ts-ignore
-        , []);
+        const { ...copy } = match;
         //@ts-ignore
         delete copy.id;
         return {
@@ -515,16 +515,15 @@ async function fakeUpdateOrganization(Class) {
 }
 async function fakeListOrganization(Class) {
     await eventFaker_1.default.on('list-organizations::v2020_12_25', (targetAndPayload) => {
-        const { payload } = targetAndPayload !== null && targetAndPayload !== void 0 ? targetAndPayload : {};
+        const { payload } = targetAndPayload ?? {};
         return {
             organizations: applyPaging(Class._fakedOrganizations, payload),
         };
     });
 }
 function applyPaging(records, payload) {
-    var _a;
     let copy = [...records];
-    if ((_a = payload === null || payload === void 0 ? void 0 : payload.paging) === null || _a === void 0 ? void 0 : _a.pageSize) {
+    if (payload?.paging?.pageSize) {
         copy = copy.slice(0, payload.paging.pageSize);
     }
     return copy;
@@ -564,14 +563,13 @@ function buildSeeder(target) {
 }
 async function fakeWhoAmI(Class) {
     await eventFaker_1.default.on('whoami::v2020_12_25', (targetAndPayload) => {
-        var _a;
-        const { source } = targetAndPayload !== null && targetAndPayload !== void 0 ? targetAndPayload : {};
-        let { personId, proxyToken } = source !== null && source !== void 0 ? source : {};
+        const { source } = targetAndPayload ?? {};
+        let { personId, proxyToken } = source ?? {};
         if (proxyToken) {
-            personId = (_a = Class.fakedProxyTokens.find((t) => t.token === proxyToken)) === null || _a === void 0 ? void 0 : _a.personId;
+            personId = Class.fakedProxyTokens.find((t) => t.token === proxyToken)?.personId;
         }
         const person = getPersonById(Class, personId, false);
-        const skill = Class.fakedSkills.find((s) => s.id === (source === null || source === void 0 ? void 0 : source.skillId));
+        const skill = Class.fakedSkills.find((s) => s.id === source?.skillId);
         return {
             auth: {
                 skill,
@@ -585,9 +583,9 @@ async function fakeWhoAmI(Class) {
 }
 async function fakeRegisterProxyToken(Class) {
     await eventFaker_1.default.on('register-proxy-token::v2020_12_25', (targeAndPayload) => {
-        const { source } = targeAndPayload !== null && targeAndPayload !== void 0 ? targeAndPayload : {};
+        const { source } = targeAndPayload ?? {};
         const token = (0, test_utils_2.generateId)();
-        if (source === null || source === void 0 ? void 0 : source.personId) {
+        if (source?.personId) {
             Class.fakedProxyTokens.push({
                 personId: source.personId,
                 token,
@@ -600,12 +598,11 @@ async function fakeRegisterProxyToken(Class) {
 }
 async function fakeAuthenticationEvents(Class) {
     await eventFaker_1.default.on('request-pin::v2020_12_25', ({ payload }) => {
-        var _a;
         const formattedPhone = (0, schema_1.formatPhoneNumber)(payload.phone);
         let person = Class.fakedPeople.find((p) => p.phone === formattedPhone);
         if (!person) {
             person =
-                ((_a = Class.fakedPerson) === null || _a === void 0 ? void 0 : _a.phone) === formattedPhone
+                Class.fakedPerson?.phone === formattedPhone
                     ? Class.fakedPerson
                     : {
                         id: (0, test_utils_2.generateId)(),
@@ -636,11 +633,13 @@ async function fakeAuthenticationEvents(Class) {
         });
         return {
             token,
-            person: Object.assign({}, person),
+            person: {
+                ...person,
+            },
         };
     });
     await eventFaker_1.default.on('authenticate::v2020_12_25', ({ payload }) => {
-        const { token, apiKey, skillId } = payload !== null && payload !== void 0 ? payload : {};
+        const { token, apiKey, skillId } = payload ?? {};
         let skill = Class.fakedSkills.find((s) => s.apiKey === apiKey && s.id === skillId);
         if (!skill &&
             apiKey &&
@@ -681,7 +680,7 @@ async function fakeAuthenticationEvents(Class) {
 async function fakeInstallEvents(Class) {
     await eventFaker_1.default.on('is-skill-installed::v2020_12_25', ({ payload }) => {
         return {
-            isInstalled: !!Class.fakedInstalledSkills.find((i) => i.skillId === (payload === null || payload === void 0 ? void 0 : payload.skillId)),
+            isInstalled: !!Class.fakedInstalledSkills.find((i) => i.skillId === payload?.skillId),
         };
     });
     await eventFaker_1.default.on('install-skill::v2020_12_25', ({ target, payload }) => {
@@ -692,8 +691,8 @@ async function fakeInstallEvents(Class) {
         return {};
     });
     await eventFaker_1.default.on('list-skills::v2020_12_25', ({ payload }) => {
-        const namespaces = payload === null || payload === void 0 ? void 0 : payload.namespaces;
-        const matches = Class.fakedSkills.filter((s) => { var _a; return ((_a = namespaces === null || namespaces === void 0 ? void 0 : namespaces.indexOf(s.slug)) !== null && _a !== void 0 ? _a : 0) > -1; });
+        const namespaces = payload?.namespaces;
+        const matches = Class.fakedSkills.filter((s) => (namespaces?.indexOf(s.slug) ?? 0) > -1);
         if (matches.length === 0) {
             throw new SpruceError_1.default({
                 //@ts-ignore
@@ -704,9 +703,7 @@ async function fakeInstallEvents(Class) {
         }
         return {
             skills: matches.map((m) => {
-                const copy = __rest(m
-                //@ts-ignore
-                , []);
+                const { ...copy } = m;
                 //@ts-ignore
                 delete copy.apiKey;
                 //@ts-ignore