@sprucelabs/data-stores 28.3.281 → 28.5.0

package/build/esm/factories/DatabaseFactory.d.ts

@@ -8,7 +8,11 @@ export default class DatabaseFactory {
     private static generateCacheKey;
     static reset(): void;
 }
-export type DatabaseConstructor = new (connectionString: string, options: DatabaseOptions) => Database;
+export type DatabaseAdapterClass = new (connectionString: string, options: DatabaseOptions) => Database;
+export interface DatabaseAdapterBuilder {
+    Database(connectionString: string, options: DatabaseOptions): Database;
+}
+export type DatabaseConstructor = DatabaseAdapterClass | DatabaseAdapterBuilder;
 interface DatabaseFactoryOptions {
     dbName?: string;
     dbConnectionString: string;

package/build/esm/factories/DatabaseFactory.js

@@ -21,8 +21,14 @@ class DatabaseFactory {
         if (!this.cache[cacheKey]) {
             for (const [key, Adapter] of Object.entries(this.Adapters)) {
                 if (dbConnectionString.startsWith(key)) {
-                    database = new Adapter(dbConnectionString, { dbName });
-                    break;
+                    const args = [
+                        dbConnectionString,
+                        { dbName },
+                    ];
+                    database =
+                        'Database' in Adapter
+                            ? Adapter.Database(...args)
+                            : new Adapter(...args);
                 }
             }
             if (!database) {

package/build/esm/factories/StoreFactory.d.ts

@@ -1,14 +1,13 @@
 import { Database } from '../types/database.types';
 import { DataStore, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
-interface StoreContructor {
-    Store(o: any): Promise<DataStore> | DataStore;
-}
 export default class StoreFactory {
-    private storeMap;
-    private db;
+    static Class?: new (db: Database) => StoreFactory;
     private static initializations;
+    protected storeMap: Record<string, StoreContructor>;
+    protected databasesByStoreName: Record<string, Database>;
+    private db;
     private stores;
-    private constructor();
+    protected constructor(db: Database);
     static Factory(db: Database): StoreFactory;
     Store<Name extends StoreName, Options extends StoreOptions<Name>>(name: Name, options?: Options): Promise<StoreMap[Name]>;
     getStoreNames(): StoreName[];
@@ -16,5 +15,9 @@ export default class StoreFactory {
     setStore(name: StoreName, store: DataStore | null): void;
     getStore<Name extends StoreName>(name: Name): Promise<StoreMap[Name]>;
     static reset(): void;
+    setDatabaseForStore<Name extends StoreName>(name: Name, db: Database): void;
+}
+interface StoreContructor {
+    Store(o: any): Promise<DataStore> | DataStore;
 }
 export {};

package/build/esm/factories/StoreFactory.js

@@ -12,11 +12,13 @@ import SpruceError from '../errors/SpruceError.js';
 class StoreFactory {
     constructor(db) {
         this.storeMap = {};
+        this.databasesByStoreName = {};
         this.stores = {};
         this.db = db;
     }
     static Factory(db) {
-        return new this(db);
+        var _a;
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(db);
     }
     Store(name, options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -29,7 +31,8 @@ class StoreFactory {
                         friendlyMessage: `You have to have ${namesUtil.toPascal(name)}.Store(options: UniversalStoreOptions) factory method on your store that returns \`new this(...)\`.`,
                     });
                 }
-                const instance = yield Store.Store(Object.assign({ db: this.db, storeFactory: this }, options));
+                const db = this.databasesByStoreName[name] || this.db;
+                const instance = yield Store.Store(Object.assign({ db, storeFactory: this }, options));
                 if (!StoreFactory.initializations[name]) {
                     StoreFactory.initializations[name] = true;
                     yield ((_a = instance.initialize) === null || _a === void 0 ? void 0 : _a.call(instance));
@@ -63,6 +66,9 @@ class StoreFactory {
     static reset() {
         this.initializations = {};
     }
+    setDatabaseForStore(name, db) {
+        this.databasesByStoreName[name] = db;
+    }
 }
 StoreFactory.initializations = {};
 export default StoreFactory;

package/build/esm/index.d.ts

@@ -4,6 +4,7 @@ export * from './fixtures/DatabaseFixture';
 export { default as AbstractStore } from './stores/AbstractStore';
 export { default as StoreFactory } from './factories/StoreFactory';
 export { default as DatabaseFactory } from './factories/DatabaseFactory';
+export { default as MockStoreFactory } from './stores/MockStoreFactory';
 export { default as StoreLoader } from './loaders/StoreLoader';
 export { default as MongoDatabase } from './databases/MongoDatabase';
 export * from './databases/MongoDatabase';

package/build/esm/index.js

@@ -4,6 +4,7 @@ export * from './fixtures/DatabaseFixture.js';
 export { default as AbstractStore } from './stores/AbstractStore.js';
 export { default as StoreFactory } from './factories/StoreFactory.js';
 export { default as DatabaseFactory } from './factories/DatabaseFactory.js';
+export { default as MockStoreFactory } from './stores/MockStoreFactory.js';
 export { default as StoreLoader } from './loaders/StoreLoader.js';
 export { default as MongoDatabase } from './databases/MongoDatabase.js';
 export * from './databases/MongoDatabase.js';

package/build/esm/stores/MockStoreFactory.d.ts

@@ -0,0 +1,7 @@
+import StoreFactory from '../factories/StoreFactory';
+import { Database } from '../types/database.types';
+import { StoreName } from '../types/stores.types';
+export default class MockStoreFactory extends StoreFactory {
+    constructor(db: Database);
+    assertDatabaseForStoreInstanceOf<Name extends StoreName>(name: Name, Class: new (...opts: any[]) => Database): Promise<void>;
+}

package/build/esm/stores/MockStoreFactory.js

@@ -0,0 +1,25 @@
+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());
+    });
+};
+import { assert } from '@sprucelabs/test-utils';
+import StoreFactory from '../factories/StoreFactory.js';
+export default class MockStoreFactory extends StoreFactory {
+    constructor(db) {
+        super(db);
+    }
+    assertDatabaseForStoreInstanceOf(name, Class) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.storeMap[name]) {
+                assert.fail(`I could not find a store named ${name}. Did you create it with 'spruce create.store'?`);
+            }
+            const store = yield this.getStore(name);
+            assert.isInstanceOf(store.getDb(), Class, `Database for '${name}' store is not set correctly. Try 'stores.setDatabaseForStore(...)`);
+        });
+    }
+}

package/build/factories/DatabaseFactory.d.ts

@@ -8,7 +8,11 @@ export default class DatabaseFactory {
     private static generateCacheKey;
     static reset(): void;
 }
-export type DatabaseConstructor = new (connectionString: string, options: DatabaseOptions) => Database;
+export type DatabaseAdapterClass = new (connectionString: string, options: DatabaseOptions) => Database;
+export interface DatabaseAdapterBuilder {
+    Database(connectionString: string, options: DatabaseOptions): Database;
+}
+export type DatabaseConstructor = DatabaseAdapterClass | DatabaseAdapterBuilder;
 interface DatabaseFactoryOptions {
     dbName?: string;
     dbConnectionString: string;

package/build/factories/DatabaseFactory.js

@@ -26,8 +26,14 @@ class DatabaseFactory {
         if (!this.cache[cacheKey]) {
             for (const [key, Adapter] of Object.entries(this.Adapters)) {
                 if (dbConnectionString.startsWith(key)) {
-                    database = new Adapter(dbConnectionString, { dbName });
-                    break;
+                    const args = [
+                        dbConnectionString,
+                        { dbName },
+                    ];
+                    database =
+                        'Database' in Adapter
+                            ? Adapter.Database(...args)
+                            : new Adapter(...args);
                 }
             }
             if (!database) {

package/build/factories/StoreFactory.d.ts

@@ -1,14 +1,13 @@
 import { Database } from '../types/database.types';
 import { DataStore, StoreMap, StoreName, StoreOptions } from '../types/stores.types';
-interface StoreContructor {
-    Store(o: any): Promise<DataStore> | DataStore;
-}
 export default class StoreFactory {
-    private storeMap;
-    private db;
+    static Class?: new (db: Database) => StoreFactory;
     private static initializations;
+    protected storeMap: Record<string, StoreContructor>;
+    protected databasesByStoreName: Record<string, Database>;
+    private db;
     private stores;
-    private constructor();
+    protected constructor(db: Database);
     static Factory(db: Database): StoreFactory;
     Store<Name extends StoreName, Options extends StoreOptions<Name>>(name: Name, options?: Options): Promise<StoreMap[Name]>;
     getStoreNames(): StoreName[];
@@ -16,5 +15,9 @@ export default class StoreFactory {
     setStore(name: StoreName, store: DataStore | null): void;
     getStore<Name extends StoreName>(name: Name): Promise<StoreMap[Name]>;
     static reset(): void;
+    setDatabaseForStore<Name extends StoreName>(name: Name, db: Database): void;
+}
+interface StoreContructor {
+    Store(o: any): Promise<DataStore> | DataStore;
 }
 export {};

package/build/factories/StoreFactory.js

@@ -8,11 +8,13 @@ const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 class StoreFactory {
     constructor(db) {
         this.storeMap = {};
+        this.databasesByStoreName = {};
         this.stores = {};
         this.db = db;
     }
     static Factory(db) {
-        return new this(db);
+        var _a;
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(db);
     }
     async Store(name, options) {
         var _a;
@@ -24,7 +26,8 @@ class StoreFactory {
                     friendlyMessage: `You have to have ${spruce_skill_utils_1.namesUtil.toPascal(name)}.Store(options: UniversalStoreOptions) factory method on your store that returns \`new this(...)\`.`,
                 });
             }
-            const instance = await Store.Store(Object.assign({ db: this.db, storeFactory: this }, options));
+            const db = this.databasesByStoreName[name] || this.db;
+            const instance = await Store.Store(Object.assign({ db, storeFactory: this }, options));
             if (!StoreFactory.initializations[name]) {
                 StoreFactory.initializations[name] = true;
                 await ((_a = instance.initialize) === null || _a === void 0 ? void 0 : _a.call(instance));
@@ -55,6 +58,9 @@ class StoreFactory {
     static reset() {
         this.initializations = {};
     }
+    setDatabaseForStore(name, db) {
+        this.databasesByStoreName[name] = db;
+    }
 }
 StoreFactory.initializations = {};
 exports.default = StoreFactory;

package/build/index.d.ts

@@ -4,6 +4,7 @@ export * from './fixtures/DatabaseFixture';
 export { default as AbstractStore } from './stores/AbstractStore';
 export { default as StoreFactory } from './factories/StoreFactory';
 export { default as DatabaseFactory } from './factories/DatabaseFactory';
+export { default as MockStoreFactory } from './stores/MockStoreFactory';
 export { default as StoreLoader } from './loaders/StoreLoader';
 export { default as MongoDatabase } from './databases/MongoDatabase';
 export * from './databases/MongoDatabase';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BatchArrayCursor = exports.BatchCursorImpl = exports.storePluginAssert = exports.databaseAssert = exports.databaseAssertUtil = exports.DatabaseFieldMapperPlugin = exports.CursorPagerFaker = exports.CursorPager = exports.generateId = exports.DataStoresError = exports.mongoUtil = exports.NeDbDatabase = exports.MongoDatabase = exports.StoreLoader = exports.DatabaseFactory = exports.StoreFactory = exports.AbstractStore = exports.DatabaseFixture = exports.AbstractDatabaseTest = void 0;
+exports.BatchArrayCursor = exports.BatchCursorImpl = exports.storePluginAssert = exports.databaseAssert = exports.databaseAssertUtil = exports.DatabaseFieldMapperPlugin = exports.CursorPagerFaker = exports.CursorPager = exports.generateId = exports.DataStoresError = exports.mongoUtil = exports.NeDbDatabase = exports.MongoDatabase = exports.StoreLoader = exports.MockStoreFactory = exports.DatabaseFactory = exports.StoreFactory = exports.AbstractStore = exports.DatabaseFixture = exports.AbstractDatabaseTest = void 0;
 var AbstractDatabaseTest_1 = require("./tests/AbstractDatabaseTest");
 Object.defineProperty(exports, "AbstractDatabaseTest", { enumerable: true, get: function () { return __importDefault(AbstractDatabaseTest_1).default; } });
 var DatabaseFixture_1 = require("./fixtures/DatabaseFixture");
@@ -29,6 +29,8 @@ var StoreFactory_1 = require("./factories/StoreFactory");
 Object.defineProperty(exports, "StoreFactory", { enumerable: true, get: function () { return __importDefault(StoreFactory_1).default; } });
 var DatabaseFactory_1 = require("./factories/DatabaseFactory");
 Object.defineProperty(exports, "DatabaseFactory", { enumerable: true, get: function () { return __importDefault(DatabaseFactory_1).default; } });
+var MockStoreFactory_1 = require("./stores/MockStoreFactory");
+Object.defineProperty(exports, "MockStoreFactory", { enumerable: true, get: function () { return __importDefault(MockStoreFactory_1).default; } });
 var StoreLoader_1 = require("./loaders/StoreLoader");
 Object.defineProperty(exports, "StoreLoader", { enumerable: true, get: function () { return __importDefault(StoreLoader_1).default; } });
 var MongoDatabase_1 = require("./databases/MongoDatabase");

package/build/stores/MockStoreFactory.d.ts

@@ -0,0 +1,7 @@
+import StoreFactory from '../factories/StoreFactory';
+import { Database } from '../types/database.types';
+import { StoreName } from '../types/stores.types';
+export default class MockStoreFactory extends StoreFactory {
+    constructor(db: Database);
+    assertDatabaseForStoreInstanceOf<Name extends StoreName>(name: Name, Class: new (...opts: any[]) => Database): Promise<void>;
+}

package/build/stores/MockStoreFactory.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const test_utils_1 = require("@sprucelabs/test-utils");
+const StoreFactory_1 = __importDefault(require("../factories/StoreFactory"));
+class MockStoreFactory extends StoreFactory_1.default {
+    constructor(db) {
+        super(db);
+    }
+    async assertDatabaseForStoreInstanceOf(name, Class) {
+        if (!this.storeMap[name]) {
+            test_utils_1.assert.fail(`I could not find a store named ${name}. Did you create it with 'spruce create.store'?`);
+        }
+        const store = await this.getStore(name);
+        test_utils_1.assert.isInstanceOf(store.getDb(), Class, `Database for '${name}' store is not set correctly. Try 'stores.setDatabaseForStore(...)`);
+    }
+}
+exports.default = MockStoreFactory;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "28.3.281",
+  "version": "28.5.0",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -67,8 +67,8 @@
     "@seald-io/nedb": "^4.0.4",
     "@sprucelabs/error": "^6.0.556",
     "@sprucelabs/globby": "^2.0.501",
-    "@sprucelabs/schema": "^31.0.2",
-    "@sprucelabs/spruce-skill-utils": "^31.1.8",
+    "@sprucelabs/schema": "^31.0.3",
+    "@sprucelabs/spruce-skill-utils": "^31.1.9",
     "just-clone": "^6.2.0",
     "lodash": "^4.17.21",
     "mongodb": "^6.12.0"