@sprucelabs/spruce-test-fixtures 66.0.19 → 66.0.21

package/build/tests/decorators/install.js

@@ -1,23 +1,29 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = install;
 const test_utils_1 = require("@sprucelabs/test-utils");
+const FakerTracker_1 = __importDefault(require("../../FakerTracker"));
 function install() { }
 install.skills = (...namespaces) => {
     if (namespaces.length === 0) {
         test_utils_1.assert.fail(`You must pass the skill namespaces so I can install them.`);
     }
     return function (Class, key, descriptor) {
-        const old = descriptor.value.bind(Class);
+        const old = descriptor.value;
         descriptor.value = async (...args) => {
-            const orgsFixture = Class.Fixture('organization');
+            const orgsFixture = FakerTracker_1.default.getFixtures(Class.cwd).Fixture('organization');
             const latestOrg = await orgsFixture.getNewestOrganization();
             test_utils_1.assert.isTruthy(latestOrg, `You need to seed at least 1 organization. Heads up, I'll install it in the newest organization only.`);
             await orgsFixture.installSkillsByNamespace({
                 organizationId: latestOrg.id,
                 namespaces,
             });
-            return old(...args);
+            const Test = test_utils_1.SpruceTestResolver.getActiveTest();
+            const bound = old.bind(Test);
+            return bound(...args);
         };
     };
 };

package/build/tests/decorators/login.js

@@ -1,42 +1,45 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = login;
 const mercury_client_1 = require("@sprucelabs/mercury-client");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const __1 = require("../..");
+const FakerTracker_1 = __importDefault(require("../../FakerTracker"));
 function login(phone) {
     return function (Class) {
         test_utils_1.assert.isFunction(Class.Fixture, `You can only @login if your test extends AbstractSpruceFixtureTest`);
         __1.MercuryFixture.setShouldAutomaticallyClearDefaultClient(false);
         __1.ViewFixture.setShouldAutomaticallyResetAuth(false);
-        const beforeAll = Class.beforeAll.bind(Class);
         let proxyGenerator;
-        Class.beforeAll = async () => {
+        let client;
+        test_utils_1.SpruceTestResolver.onWillCallBeforeAll(async () => {
             mercury_client_1.MercuryClientFactory.setIsTestMode(true);
-            await beforeAll();
-            const viewFixture = Class.Fixture('view');
-            const { client, person } = await viewFixture.loginAsDemoPerson(phone);
+        });
+        test_utils_1.SpruceTestResolver.onDidCallBeforeAll(async () => {
+            const viewFixture = FakerTracker_1.default.getFixtures(Class.cwd).views;
+            const { client: c, person } = await viewFixture.loginAsDemoPerson(phone);
+            client = c;
             proxyGenerator = viewFixture.getProxyTokenGenerator();
             //@ts-ignore
             login.loggedInPerson = person;
             __1.MercuryFixture.setDefaultClient(client);
             __1.ViewFixture.lockProxyCacheForPerson(person.id);
             await emitDidLogin(client);
-        };
-        const beforeEach = Class.beforeEach.bind(Class);
-        Class.beforeEach = async () => {
-            Class.Fixture('view').setProxyTokenGenerator(proxyGenerator);
+        });
+        test_utils_1.SpruceTestResolver.onWillCallBeforeEach(async () => {
+            __1.MercuryFixture.setDefaultContractToLocalEventsIfExist(Class.cwd);
+            FakerTracker_1.default.getFixtures(Class.cwd).views.setProxyTokenGenerator(proxyGenerator);
+        });
+        test_utils_1.SpruceTestResolver.onWillCallAfterAll(async () => {
             __1.MercuryFixture.setDefaultContractToLocalEventsIfExist(Class.cwd);
-            await beforeEach?.();
-        };
-        const afterAll = Class.afterAll.bind(Class);
-        Class.afterAll = async () => {
-            const client = __1.MercuryFixture.getDefaultClient();
             await emitWillLogout(client);
-            __1.MercuryFixture.clearDefaultClient();
-            await afterAll();
+        });
+        test_utils_1.SpruceTestResolver.onDidCallAfterAll(async () => {
             await client?.disconnect();
-        };
+        });
     };
 }
 login.getClient = () => {

package/build/tests/decorators/seed.js

@@ -6,38 +6,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = seed;
 const mercury_client_1 = require("@sprucelabs/mercury-client");
 const test_utils_1 = require("@sprucelabs/test-utils");
+const FakerTracker_1 = __importDefault(require("../../FakerTracker"));
+const MercuryFixture_1 = __importDefault(require("../fixtures/MercuryFixture"));
 const StoreFixture_1 = __importDefault(require("../fixtures/StoreFixture"));
 const login_1 = __importDefault(require("./login"));
 function seed(storeName, totalToSeed, ...params) {
     return function (Class, key, descriptor) {
         if ((storeName === 'organizations' || storeName === 'locations') &&
-            !Class.beforeAll.__patched) {
-            const beforeAll = Class.beforeAll.bind(Class);
+            !Class.__isSeedingPatched) {
             Class.__shouldResetAccount = false;
-            Class.beforeAll = async () => {
-                await beforeAll();
+            test_utils_1.SpruceTestResolver.onDidCallBeforeAll(async (Class) => {
                 await login_1.default.on('did-login', async () => {
                     await forceResetAccount(Class);
                 });
-                await login_1.default.on('will-logout', async () => {
-                    // await forceResetAccount(Class)
-                    // if (shouldResetTestClientOnWillLogout) {
-                    //
-                    // 	MercuryTestClient.reset()
-                    // }
-                });
-            };
-            Class.beforeAll.__patched = true;
+            });
+            Class.__isSeedingPatched = true;
         }
         StoreFixture_1.default.setShouldAutomaticallyResetDatabase(false);
         StoreFixture_1.default.resetDbConnectionSettings();
         const seed = attachSeeder(storeName, Class, totalToSeed, params);
-        const bound = descriptor?.value?.bind?.(Class);
+        const unbound = descriptor?.value;
         attachCleanup(Class);
         descriptor.value = async (...args) => {
             await optionallyReset(Class, key);
             await seed();
-            await bound?.(...args);
+            const Test = test_utils_1.SpruceTestResolver.getActiveTest();
+            const allArgs = [Test, args];
+            await unbound?.apply(...allArgs);
         };
     };
 }
@@ -56,7 +51,8 @@ async function optionallyReset(Class, key) {
 async function reset(Class) {
     if (Class.__shouldResetAccount) {
         Class.__shouldResetAccount = false;
-        await Class.Fixture('seed').resetAccount();
+        const cwd = test_utils_1.SpruceTestResolver.getActiveTest().cwd;
+        await FakerTracker_1.default.getFixtures(cwd).seeder.resetAccount();
     }
     await StoreFixture_1.default.reset();
 }
@@ -67,29 +63,25 @@ seed.disableResettingTestClient = () => {
 function attachCleanup(Class) {
     if (!Class.__attachedStoreAfterEach) {
         Class.__attachedStoreAfterEach = true;
-        const afterEach = Class.afterEach.bind(Class);
-        const beforeEach = Class.beforeEach.bind(Class);
-        Class.afterEach = async () => {
-            await afterEach?.();
+        test_utils_1.SpruceTestResolver.onWillCallBeforeEach(async (Class) => {
+            MercuryFixture_1.default.setDefaultContractToLocalEventsIfExist(Class.cwd);
+            await optionallyReset(Class, 'beforeEach');
+        });
+        test_utils_1.SpruceTestResolver.onDidCallAfterEach(async () => {
             shouldResetTestClient && mercury_client_1.MercuryTestClient.reset();
             delete Class.__lastReset;
-        };
-        Class.beforeEach = async () => {
-            await optionallyReset(Class, 'beforeEach');
-            await beforeEach?.();
-        };
+        });
     }
 }
 function attachSeeder(storeName, TestClass, totalToSeed, params) {
-    //@ts-ignore
     const fixtureMap = {
-        locations: 'seed',
-        organizations: 'seed',
-        teammates: 'seed',
-        guests: 'seed',
-        groupManagers: 'seed',
-        managers: 'seed',
-        owners: 'seed',
+        locations: 'seeder',
+        organizations: 'seeder',
+        teammates: 'seeder',
+        guests: 'seeder',
+        groupManagers: 'seeder',
+        managers: 'seeder',
+        owners: 'seeder',
     };
     //@ts-ignore
     const methodMap = {
@@ -111,21 +103,25 @@ function attachSeeder(storeName, TestClass, totalToSeed, params) {
         managers: 'totalManagers',
         owners: 'totalOwners',
     };
-    const method = methodMap[storeName] ?? 'seed';
+    const method = (methodMap[storeName] ?? 'seed');
     const optionsKey = keyMap[storeName] ?? 'totalToSeed';
-    const fixtureName = fixtureMap[storeName] ?? 'store';
+    const fixtureName = (fixtureMap[storeName] ??
+        'stores');
     const options = { [optionsKey]: totalToSeed };
     return async function () {
-        let fixture = TestClass.Fixture(fixtureName);
-        if (fixtureName === 'store') {
+        const ActiveTest = test_utils_1.SpruceTestResolver.getActiveTest();
+        const fixtures = FakerTracker_1.default.getFixtures(ActiveTest.cwd);
+        let fixture = fixtures[fixtureName];
+        if (fixtureName === 'stores') {
             fixture = await fixture.getStore(storeName);
-            options.TestClass = TestClass;
+            options.TestClass = ActiveTest;
         }
         else {
             TestClass.__shouldResetAccount = true;
         }
         test_utils_1.assert.isFunction(fixture[method], `The '${storeName}' store you created needs a method called 'seed(options: StoreSeedOptions)' in order for seeding. You must implement it yourself... for now.`);
         const args = [options, ...(params ?? [])];
+        //@ts-ignore
         await fixture[method](...args);
     };
 }

package/build/tests/fixtures/FixtureFactory.d.ts

@@ -3,7 +3,7 @@ export default class FixtureFactory {
     private static fixtures;
     private cwd;
     private namespace?;
-    private static viewMercury?;
+    private static mercuryFixture?;
     constructor(options: {
         cwd: string;
         namespace?: string;
@@ -11,6 +11,7 @@ export default class FixtureFactory {
     setCwd(cwd: string): void;
     setNamespace(namespace: string): void;
     Fixture<Name extends FixtureName>(named: Name, options?: Partial<FixtureConstructorOptionsMap[Name]>): FixtureMap[Name];
+    static clearMercuryFixture(): void;
     private getMercuryFixture;
     static destroy(): Promise<void>;
     static beforeAll(): Promise<void>;

package/build/tests/fixtures/FixtureFactory.js

@@ -38,12 +38,11 @@ class FixtureFactory {
         this.namespace = namespace;
     }
     Fixture(named, options) {
-        const mercuryFixture = this.getMercuryFixture(named);
+        const mercuryFixture = this.getMercuryFixture();
         let fixture;
         switch (named) {
             case 'mercury':
-                fixture = mercuryFixture;
-                break;
+                return mercuryFixture;
             case 'person': {
                 fixture = new PersonFixture_1.default({
                     connectToApi: mercuryFixture.getConnectFactory(),
@@ -52,7 +51,8 @@ class FixtureFactory {
             }
             case 'role': {
                 fixture = new RoleFixture_1.default({
-                    people: this.Fixture('person'),
+                    //@ts-ignore
+                    people: options?.people ?? this.Fixture('person'),
                     getNewestOrg: async () => {
                         return this.Fixture('organization').getNewestOrganization();
                     },
@@ -60,24 +60,24 @@ class FixtureFactory {
                 break;
             }
             case 'organization': {
-                const people = 
-                //@ts-ignore
-                options?.people ??
-                    new PersonFixture_1.default({
-                        connectToApi: mercuryFixture.getConnectFactory(),
-                    });
                 fixture = new OrganizationFixture_1.default({
-                    people,
-                    roles: this.Fixture('role'),
+                    people: 
+                    //@ts-ignore
+                    options?.people ??
+                        new PersonFixture_1.default({
+                            connectToApi: mercuryFixture.getConnectFactory(),
+                        }),
+                    //@ts-ignore
+                    roles: options?.roles ?? this.Fixture('role'),
                 });
                 break;
             }
             case 'skill': {
                 const personFixture = 
                 //@ts-ignore
-                options?.personFixture ?? this.Fixture('person');
+                options?.people ?? this.Fixture('person');
                 fixture = new SkillFixture_1.default({
-                    personFixture,
+                    people: personFixture,
                     connectToApi: mercuryFixture.getConnectFactory(),
                 });
                 break;
@@ -92,7 +92,8 @@ class FixtureFactory {
             }
             case 'location': {
                 fixture = new LocationFixture_1.default({
-                    roles: this.Fixture('role'),
+                    //@ts-ignore
+                    roles: options?.roles ?? this.Fixture('role'),
                     //@ts-ignore
                     people: options?.people ?? this.Fixture('person'),
                     organizations: 
@@ -103,9 +104,13 @@ class FixtureFactory {
             }
             case 'seed':
                 fixture = new SeedFixture_1.default({
-                    organizations: this.Fixture('organization'),
-                    locations: this.Fixture('location'),
-                    people: this.Fixture('person'),
+                    organizations: 
+                    //@ts-ignore
+                    options?.organizations ?? this.Fixture('organization'),
+                    //@ts-ignore
+                    locations: options?.locations ?? this.Fixture('location'),
+                    //@ts-ignore
+                    people: options?.people ?? this.Fixture('person'),
                 });
                 break;
             case 'permission':
@@ -116,14 +121,16 @@ class FixtureFactory {
                     throw new Error('You need to be in a registered skill to load view controllers.');
                 }
                 fixture = new ViewFixture_1.default({
-                    //@ts-ignore
-                    people: options?.personFixture ?? this.Fixture('person'),
+                    //@ts-ignore
+                    people: options?.people ?? this.Fixture('person'),
                     connectToApi: mercuryFixture.getConnectFactory(),
                     fixtureFactory: this,
                     namespace: this.namespace,
                     proxyDecorator: __1.ClientProxyDecorator.getInstance(),
                     cwd: this.cwd,
-                    permissions: this.Fixture('permission'),
+                    permissions: 
+                    //@ts-ignore
+                    options?.permissions ?? this.Fixture('permission'),
                     ...options,
                 });
                 break;
@@ -149,20 +156,14 @@ class FixtureFactory {
             ],
         });
     }
-    getMercuryFixture(name) {
-        let mercury;
-        if (name === 'view') {
-            if (!FixtureFactory.viewMercury) {
-                FixtureFactory.viewMercury = new MercuryFixture_1.default(this.cwd);
-                FixtureFactory.fixtures.push(FixtureFactory.viewMercury);
-            }
-            mercury = FixtureFactory.viewMercury;
-        }
-        if (!mercury) {
-            mercury = new MercuryFixture_1.default(this.cwd);
-            FixtureFactory.fixtures.push(mercury);
+    static clearMercuryFixture() {
+        delete this.mercuryFixture;
+    }
+    getMercuryFixture() {
+        if (!FixtureFactory.mercuryFixture) {
+            FixtureFactory.mercuryFixture = new MercuryFixture_1.default(this.cwd);
         }
-        return mercury;
+        return FixtureFactory.mercuryFixture;
     }
     static async destroy() {
         for (const f of this.fixtures) {
@@ -171,7 +172,8 @@ class FixtureFactory {
             }
         }
         this.fixtures = [];
-        FixtureFactory.viewMercury = undefined;
+        await FixtureFactory.mercuryFixture?.destroy();
+        FixtureFactory.mercuryFixture = undefined;
     }
     static async beforeAll() {
         await Promise.all([

package/build/tests/fixtures/FixtureWarehourse.d.ts

@@ -0,0 +1,56 @@
+import { DatabaseFixture } from '@sprucelabs/data-stores';
+import { MercuryClient } from '@sprucelabs/mercury-client';
+import { FixtureName, FixtureConstructorOptionsMap } from '../../types/fixture.types';
+import LocationFixture from './LocationFixture';
+import MercuryFixture from './MercuryFixture';
+import OrganizationFixture from './OrganizationFixture';
+import PermissionFixture from './PermissionFixture';
+import PersonFixture from './PersonFixture';
+import RoleFixture from './RoleFixture';
+import SeedFixture from './SeedFixture';
+import SkillFixture from './SkillFixture';
+import StoreFixture from './StoreFixture';
+import ViewFixture from './ViewFixture';
+export default class FixtureWarehouse {
+    _fakedClient?: MercuryClient;
+    private _views?;
+    private _roles?;
+    private _locations?;
+    private _organizations?;
+    private _people?;
+    private _seeder?;
+    private _skills?;
+    private _mercury?;
+    private _stores?;
+    private _database?;
+    private _permissions?;
+    private _fixtures?;
+    private cwd;
+    protected constructor(cwd: string);
+    static Warehouse(cwd: string): FixtureWarehouse;
+    setCwd(cwd: string): void;
+    Fixture<Name extends FixtureName>(name: Name, options?: Partial<FixtureConstructorOptionsMap[Name]>): import("../../types/fixture.types").FixtureMap[Name];
+    get views(): ViewFixture;
+    set views(fixture: ViewFixture | undefined);
+    get permissions(): PermissionFixture;
+    set permissions(fixture: PermissionFixture | undefined);
+    get roles(): RoleFixture;
+    set roles(fixture: RoleFixture | undefined);
+    get locations(): LocationFixture;
+    set locations(fixture: LocationFixture | undefined);
+    get organizations(): OrganizationFixture;
+    set organizations(fixture: OrganizationFixture | undefined);
+    get people(): PersonFixture;
+    set people(fixture: PersonFixture | undefined);
+    get seeder(): SeedFixture;
+    set seeder(fixture: SeedFixture | undefined);
+    get skills(): SkillFixture;
+    set skills(fixture: SkillFixture | undefined);
+    get mercury(): MercuryFixture;
+    set mercury(fixture: MercuryFixture | undefined);
+    get stores(): StoreFixture;
+    set stores(fixture: StoreFixture | undefined);
+    get database(): DatabaseFixture;
+    set database(fixture: DatabaseFixture | undefined);
+    reset(): void;
+}

package/build/tests/fixtures/FixtureWarehourse.js

@@ -0,0 +1,170 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
+const FixtureFactory_1 = __importDefault(require("./FixtureFactory"));
+class FixtureWarehouse {
+    constructor(cwd) {
+        this.cwd = cwd;
+    }
+    static Warehouse(cwd) {
+        return new this(cwd);
+    }
+    setCwd(cwd) {
+        if (this.cwd !== cwd) {
+            this.cwd = cwd;
+            delete this._fixtures;
+            FixtureFactory_1.default.clearMercuryFixture();
+        }
+    }
+    Fixture(name, options) {
+        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 = values?.skill?.namespace;
+            }
+            this._fixtures = new FixtureFactory_1.default({
+                cwd: this.cwd,
+                namespace,
+            });
+        }
+        return this._fixtures.Fixture(name, options);
+    }
+    get views() {
+        if (!this._views) {
+            this._views = this.Fixture('view', {
+                people: this.people,
+                organizations: this.organizations,
+                locations: this.locations,
+                permissions: this.permissions,
+            });
+        }
+        return this._views;
+    }
+    set views(fixture) {
+        this._views = fixture;
+    }
+    get permissions() {
+        if (!this._permissions) {
+            this._permissions = this.Fixture('permission');
+        }
+        return this._permissions;
+    }
+    set permissions(fixture) {
+        this._permissions = fixture;
+    }
+    get roles() {
+        if (!this._roles) {
+            this._roles = this.Fixture('role', {
+                people: this.people,
+            });
+        }
+        return this._roles;
+    }
+    set roles(fixture) {
+        this._roles = fixture;
+    }
+    get locations() {
+        if (!this._locations) {
+            this._locations = this.Fixture('location', {
+                organizations: this.organizations,
+                people: this.people,
+                roles: this.roles,
+            });
+        }
+        return this._locations;
+    }
+    set locations(fixture) {
+        this._locations = fixture;
+    }
+    get organizations() {
+        if (!this._organizations) {
+            this._organizations = this.Fixture('organization', {
+                people: this.people,
+                roles: this.roles,
+            });
+        }
+        return this._organizations;
+    }
+    set organizations(fixture) {
+        this._organizations = fixture;
+    }
+    get people() {
+        if (!this._people) {
+            this._people = this.Fixture('person');
+        }
+        return this._people;
+    }
+    set people(fixture) {
+        this._people = fixture;
+    }
+    get seeder() {
+        if (!this._seeder) {
+            this._seeder = this.Fixture('seed', {
+                locations: this.locations,
+                organizations: this.organizations,
+                people: this.people,
+            });
+        }
+        return this._seeder;
+    }
+    set seeder(fixture) {
+        this._seeder = fixture;
+    }
+    get skills() {
+        if (!this._skills) {
+            this._skills = this.Fixture('skill', {
+                people: this.people,
+            });
+        }
+        return this._skills;
+    }
+    set skills(fixture) {
+        this._skills = fixture;
+    }
+    get mercury() {
+        if (!this._mercury) {
+            this._mercury = this.Fixture('mercury');
+        }
+        return this._mercury;
+    }
+    set mercury(fixture) {
+        this._mercury = fixture;
+    }
+    get stores() {
+        if (!this._stores) {
+            this._stores = this.Fixture('store');
+        }
+        return this._stores;
+    }
+    set stores(fixture) {
+        this._stores = fixture;
+    }
+    get database() {
+        if (!this._database) {
+            this._database = this.Fixture('database');
+        }
+        return this._database;
+    }
+    set database(fixture) {
+        this._database = fixture;
+    }
+    reset() {
+        this.views = undefined;
+        this.roles = undefined;
+        this.locations = undefined;
+        this.organizations = undefined;
+        this.people = undefined;
+        this.seeder = undefined;
+        this.skills = undefined;
+        this.mercury = undefined;
+        this.stores = undefined;
+        this.database = undefined;
+        this.permissions = undefined;
+    }
+}
+exports.default = FixtureWarehouse;

package/build/tests/fixtures/LocationFixture.d.ts

@@ -4,7 +4,7 @@ import PersonFixture from './PersonFixture';
 import RoleFixture from './RoleFixture';
 export default class LocationFixture {
     private people;
-    private orgs;
+    private organizations;
     private roles;
     private locationCounter;
     private static locationCount;
@@ -13,11 +13,11 @@ export default class LocationFixture {
         organizations: OrganizationFixture;
         roles: RoleFixture;
     });
-    seedDemoLocation(values?: SeedLocationValues): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num">>;
+    seedDemoLocation(values?: SeedLocationValues): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic">>;
     private generateLocationSlug;
-    getLocationById(id: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num">>;
-    getNewestLocation(organizationId?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num"> | null>;
-    listLocations(organizationId?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num">[]>;
+    getLocationById(id: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic">>;
+    getNewestLocation(organizationId?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic"> | null>;
+    listLocations(organizationId?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic">[]>;
     isPartOfLocation(options: {
         personId: string;
         locationId: string;