@sprucelabs/data-stores 18.0.7 → 18.0.10

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

@@ -3,8 +3,9 @@ export default class DatabaseFactory {
     private static cache;
     private constructor();
     static Database(options: {
-        dbName: string;
+        dbName?: string;
         dbConnectionString: string;
     }): Database;
+    private static generateCacheKey;
     static reset(): void;
 }

package/build/esm/factories/DatabaseFactory.js

@@ -13,7 +13,7 @@ export default class DatabaseFactory {
                 friendlyMessage: "DatabaseFactory can't connect to the database! Setting env.DB_CONNECTION_STRING may help!",
             });
         }
-        const cacheKey = options.dbName + options.dbConnectionString;
+        const cacheKey = this.generateCacheKey(options);
         if (!this.cache[cacheKey]) {
             if (dbConnectionString.startsWith('memory')) {
                 database = new NeDbDatabase();
@@ -25,6 +25,15 @@ export default class DatabaseFactory {
         }
         return this.cache[cacheKey];
     }
+    static generateCacheKey(options) {
+        if (!options.dbName && options.dbConnectionString.includes('memory')) {
+            const key = Object.keys(this.cache).find((k) => k.startsWith('memory'));
+            if (key) {
+                return key;
+            }
+        }
+        return options.dbName + options.dbConnectionString;
+    }
     static reset() {
         this.cache = {};
     }

package/build/esm/loaders/StoreLoader.d.ts

@@ -9,6 +9,7 @@ export default class StoreLoader {
     private static instance;
     private static defaultStoreDir;
     private static defaultDb;
+    private factory?;
     private constructor();
     static setStoreDir(dir: string): void;
     static setDatabase(db: Database): void;

package/build/esm/loaders/StoreLoader.js

@@ -64,12 +64,19 @@ export default class StoreLoader {
     }
     loadStoresAndErrors() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { stores, errors } = yield this.loadStoreClassesWithErrors();
-            const factory = StoreFactory.Factory(this.db);
-            for (const store of stores) {
-                factory.setStoreClass(namesUtil.toCamel(store.namePascal), store.Class);
+            let errors = [];
+            if (!this.factory) {
+                const { stores, errors: loadedErrors } = yield this.loadStoreClassesWithErrors();
+                errors = loadedErrors;
+                const factory = StoreFactory.Factory(this.db);
+                for (const store of stores) {
+                    factory.setStoreClass(namesUtil.toCamel(store.namePascal), store.Class);
+                }
+                if (errors.length === 0) {
+                    this.factory = factory;
+                }
             }
-            return { factory, errors };
+            return { factory: this.factory, errors };
         });
     }
     loadStoreClassesWithErrors() {

package/build/factories/DatabaseFactory.d.ts

@@ -3,8 +3,9 @@ export default class DatabaseFactory {
     private static cache;
     private constructor();
     static Database(options: {
-        dbName: string;
+        dbName?: string;
         dbConnectionString: string;
     }): Database;
+    private static generateCacheKey;
     static reset(): void;
 }

package/build/factories/DatabaseFactory.js

@@ -18,7 +18,7 @@ class DatabaseFactory {
                 friendlyMessage: "DatabaseFactory can't connect to the database! Setting env.DB_CONNECTION_STRING may help!",
             });
         }
-        const cacheKey = options.dbName + options.dbConnectionString;
+        const cacheKey = this.generateCacheKey(options);
         if (!this.cache[cacheKey]) {
             if (dbConnectionString.startsWith('memory')) {
                 database = new NeDbDatabase_1.default();
@@ -30,6 +30,15 @@ class DatabaseFactory {
         }
         return this.cache[cacheKey];
     }
+    static generateCacheKey(options) {
+        if (!options.dbName && options.dbConnectionString.includes('memory')) {
+            const key = Object.keys(this.cache).find((k) => k.startsWith('memory'));
+            if (key) {
+                return key;
+            }
+        }
+        return options.dbName + options.dbConnectionString;
+    }
     static reset() {
         this.cache = {};
     }

package/build/loaders/StoreLoader.d.ts

@@ -9,6 +9,7 @@ export default class StoreLoader {
     private static instance;
     private static defaultStoreDir;
     private static defaultDb;
+    private factory?;
     private constructor();
     static setStoreDir(dir: string): void;
     static setDatabase(db: Database): void;

package/build/loaders/StoreLoader.js

@@ -53,12 +53,19 @@ class StoreLoader {
         return factory;
     }
     async loadStoresAndErrors() {
-        const { stores, errors } = await this.loadStoreClassesWithErrors();
-        const factory = StoreFactory_1.default.Factory(this.db);
-        for (const store of stores) {
-            factory.setStoreClass(spruce_skill_utils_1.namesUtil.toCamel(store.namePascal), store.Class);
+        let errors = [];
+        if (!this.factory) {
+            const { stores, errors: loadedErrors } = await this.loadStoreClassesWithErrors();
+            errors = loadedErrors;
+            const factory = StoreFactory_1.default.Factory(this.db);
+            for (const store of stores) {
+                factory.setStoreClass(spruce_skill_utils_1.namesUtil.toCamel(store.namePascal), store.Class);
+            }
+            if (errors.length === 0) {
+                this.factory = factory;
+            }
         }
-        return { factory, errors };
+        return { factory: this.factory, errors };
     }
     async loadStoreClassesWithErrors() {
         var _a, _b;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "18.0.7",
+  "version": "18.0.10",
   "files": [
     "build/**/*",
     "!build/__tests__",