@sprucelabs/data-stores 28.1.2 → 28.1.3

package/build/databases/MongoDatabase.d.ts

@@ -26,7 +26,7 @@ export default class MongoDatabase implements Database {
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
     private listIndexes;
-    dropIndex(collection: string, fields: string[]): Promise<void>;
+    dropIndex(collection: string, index: UniqueIndex): Promise<void>;
     getUniqueIndexes(collection: string): Promise<string[][]>;
     getIndexes(collection: string, shouldIncludeUnique?: boolean): Promise<any[]>;
     createIndex(collection: string, fields: string[]): Promise<void>;

package/build/databases/MongoDatabase.js

@@ -235,21 +235,21 @@ class MongoDatabase {
             return [];
         }
     }
-    async dropIndex(collection, fields) {
+    async dropIndex(collection, index) {
         const indexes = await this.listIndexes(collection);
         let found = false;
-        for (const index of indexes) {
-            if ((0, isEqual_1.default)(Object.keys(index.key), fields)) {
+        for (const thisIndex of indexes) {
+            if ((0, isEqual_1.default)(Object.keys(thisIndex.key), index)) {
                 await this.assertDbWhileAttempingTo('drop a index.', collection)
                     .collection(collection)
-                    .dropIndex(index.name);
+                    .dropIndex(thisIndex.name);
                 found = true;
             }
         }
         if (!found) {
             throw new SpruceError_1.default({
                 code: 'INDEX_NOT_FOUND',
-                missingIndex: fields,
+                missingIndex: (0, normalizeIndex_1.default)(index).fields,
                 collectionName: collection,
             });
         }
@@ -330,11 +330,19 @@ class MongoDatabase {
         return false;
     }
     async syncIndexes(collectionName, indexes) {
+        var _a;
         const currentIndexes = await this.getIndexes(collectionName);
         const extraIndexes = (0, differenceWith_1.default)(currentIndexes, indexes, isEqual_1.default).filter((i) => !(i.length === 1 && i[0] === '_id'));
         for (const index of indexes) {
             if (!this.doesIndexExist(currentIndexes, index)) {
-                await this.createIndex(collectionName, index);
+                try {
+                    await this.createIndex(collectionName, index);
+                }
+                catch (err) {
+                    if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) !== 'INDEX_EXISTS') {
+                        throw err;
+                    }
+                }
             }
         }
         for (const extra of extraIndexes) {
@@ -377,7 +385,12 @@ class MongoDatabase {
     async syncUniqueIndexes(collectionName, indexes) {
         var _a;
         const currentIndexes = await this.getUniqueIndexes(collectionName);
-        const extraIndexes = (0, differenceWith_1.default)(currentIndexes, indexes, isEqual_1.default);
+        const toDelete = [];
+        for (const index of currentIndexes) {
+            if (!this.doesIndexExist(indexes, index)) {
+                toDelete.push(index);
+            }
+        }
         for (const index of indexes) {
             const { fields } = this.normalizeIndex(index);
             if (!this.doesIndexExist(currentIndexes, fields)) {
@@ -391,7 +404,7 @@ class MongoDatabase {
                 }
             }
         }
-        for (const extra of extraIndexes) {
+        for (const extra of toDelete) {
             await this.dropIndex(collectionName, extra);
         }
     }

package/build/databases/NeDbDatabase.js

@@ -26,12 +26,9 @@ const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const AbstractMutexer_1 = __importDefault(require("../mutexers/AbstractMutexer"));
 const generateId_1 = __importDefault(require("../utilities/generateId"));
 const mongo_utility_1 = __importDefault(require("../utilities/mongo.utility"));
+const mapIndexFilterToNeDbQuery_1 = __importDefault(require("./mapIndexFilterToNeDbQuery"));
 const normalizeIndex_1 = __importDefault(require("./normalizeIndex"));
 dotenv_1.default.config();
-const NULL_PLACEHOLDER = '_____NULL_____';
-const UNDEFINED_PLACEHOLDER = '_____UNDEFINED_____';
-const SHOULD_SIMULATE_SLOW_QUERIES = process.env.SHOULD_SIMULATE_SLOW_QUERIES === 'true';
-const SLOW_QUERY_MAX_RANDOM_DELAY_MS = parseInt(`${(_a = process.env.SLOW_QUERY_MAX_RANDOM_DELAY_MS) !== null && _a !== void 0 ? _a : 100}`, 10);
 class NeDbDatabase extends AbstractMutexer_1.default {
     constructor() {
         super(...arguments);
@@ -295,17 +292,20 @@ class NeDbDatabase extends AbstractMutexer_1.default {
         if (col._uniqueIndexes) {
             for (const index of col._uniqueIndexes) {
                 const { fields, filter } = (0, normalizeIndex_1.default)(index);
-                if (filter) {
-                    return;
-                }
                 const existing = query
                     ? await this.findOne(collection, query)
                     : null;
-                const q = {};
+                let q = filter
+                    ? (0, mapIndexFilterToNeDbQuery_1.default)(filter)
+                    : {};
                 const duplicateFields = [];
                 const duplicateValues = [];
                 fields.forEach((f) => {
-                    q[f] = (0, get_1.default)(values, f);
+                    let value = (0, get_1.default)(values, f);
+                    if (value === NULL_PLACEHOLDER && q[f]) {
+                        value = q[f];
+                    }
+                    q[f] = value;
                     duplicateFields.push(f);
                     duplicateValues.push(q[f]);
                 });
@@ -387,9 +387,9 @@ class NeDbDatabase extends AbstractMutexer_1.default {
             });
         }
     }
-    doesIndexExist(currentIndexes, fields) {
-        for (const index of currentIndexes !== null && currentIndexes !== void 0 ? currentIndexes : []) {
-            if ((0, isEqual_1.default)(index, fields)) {
+    doesIndexExist(currentIndexes, index) {
+        for (const existing of currentIndexes !== null && currentIndexes !== void 0 ? currentIndexes : []) {
+            if ((0, isEqual_1.default)(existing, index)) {
                 return true;
             }
         }
@@ -440,10 +440,14 @@ class NeDbDatabase extends AbstractMutexer_1.default {
     async syncUniqueIndexes(collectionName, indexes) {
         var _a;
         const currentIndexes = await this.getUniqueIndexes(collectionName);
-        const extraIndexes = (0, differenceWith_1.default)(currentIndexes, indexes, isEqual_1.default);
+        const toDelete = [];
+        for (const index of currentIndexes) {
+            if (!this.doesIndexExist(indexes, index)) {
+                toDelete.push(index);
+            }
+        }
         for (const index of indexes) {
-            const { fields } = (0, normalizeIndex_1.default)(index);
-            if (!this.doesIndexExist(currentIndexes, fields)) {
+            if (!this.doesIndexExist(currentIndexes, index)) {
                 try {
                     await this.createUniqueIndex(collectionName, index);
                 }
@@ -454,7 +458,7 @@ class NeDbDatabase extends AbstractMutexer_1.default {
                 }
             }
         }
-        for (const extra of extraIndexes) {
+        for (const extra of toDelete) {
             await this.dropIndex(collectionName, extra);
         }
     }
@@ -507,3 +511,7 @@ class NeDbDatabase extends AbstractMutexer_1.default {
     }
 }
 exports.default = NeDbDatabase;
+const NULL_PLACEHOLDER = '_____NULL_____';
+const UNDEFINED_PLACEHOLDER = '_____UNDEFINED_____';
+const SHOULD_SIMULATE_SLOW_QUERIES = process.env.SHOULD_SIMULATE_SLOW_QUERIES === 'true';
+const SLOW_QUERY_MAX_RANDOM_DELAY_MS = parseInt(`${(_a = process.env.SLOW_QUERY_MAX_RANDOM_DELAY_MS) !== null && _a !== void 0 ? _a : 100}`, 10);

package/build/databases/mapIndexFilterToNeDbQuery.d.ts

@@ -0,0 +1 @@
+export default function mapIndexFilterToNeDbQuery(filter: Record<string, any>): Record<string, any>;

package/build/databases/mapIndexFilterToNeDbQuery.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+function mapIndexFilterToNeDbQuery(filter) {
+    const final = (0, schema_1.cloneDeep)(filter);
+    for (const key of Object.keys(final)) {
+        if (final[key].$type === 'string') {
+            final[key] = { $ne: null };
+        }
+    }
+    return final;
+}
+exports.default = mapIndexFilterToNeDbQuery;

package/build/esm/databases/MongoDatabase.d.ts

@@ -26,7 +26,7 @@ export default class MongoDatabase implements Database {
     dropCollection(name: string): Promise<void>;
     dropDatabase(): Promise<void>;
     private listIndexes;
-    dropIndex(collection: string, fields: string[]): Promise<void>;
+    dropIndex(collection: string, index: UniqueIndex): Promise<void>;
     getUniqueIndexes(collection: string): Promise<string[][]>;
     getIndexes(collection: string, shouldIncludeUnique?: boolean): Promise<any[]>;
     createIndex(collection: string, fields: string[]): Promise<void>;

package/build/esm/databases/MongoDatabase.js

@@ -260,22 +260,22 @@ export default class MongoDatabase {
             }
         });
     }
-    dropIndex(collection, fields) {
+    dropIndex(collection, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const indexes = yield this.listIndexes(collection);
             let found = false;
-            for (const index of indexes) {
-                if (isEqual(Object.keys(index.key), fields)) {
+            for (const thisIndex of indexes) {
+                if (isEqual(Object.keys(thisIndex.key), index)) {
                     yield this.assertDbWhileAttempingTo('drop a index.', collection)
                         .collection(collection)
-                        .dropIndex(index.name);
+                        .dropIndex(thisIndex.name);
                     found = true;
                 }
             }
             if (!found) {
                 throw new SpruceError({
                     code: 'INDEX_NOT_FOUND',
-                    missingIndex: fields,
+                    missingIndex: normalizeIndex(index).fields,
                     collectionName: collection,
                 });
             }
@@ -364,11 +364,19 @@ export default class MongoDatabase {
     }
     syncIndexes(collectionName, indexes) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const currentIndexes = yield this.getIndexes(collectionName);
             const extraIndexes = differenceWith(currentIndexes, indexes, isEqual).filter((i) => !(i.length === 1 && i[0] === '_id'));
             for (const index of indexes) {
                 if (!this.doesIndexExist(currentIndexes, index)) {
-                    yield this.createIndex(collectionName, index);
+                    try {
+                        yield this.createIndex(collectionName, index);
+                    }
+                    catch (err) {
+                        if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) !== 'INDEX_EXISTS') {
+                            throw err;
+                        }
+                    }
                 }
             }
             for (const extra of extraIndexes) {
@@ -415,7 +423,12 @@ export default class MongoDatabase {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const currentIndexes = yield this.getUniqueIndexes(collectionName);
-            const extraIndexes = differenceWith(currentIndexes, indexes, isEqual);
+            const toDelete = [];
+            for (const index of currentIndexes) {
+                if (!this.doesIndexExist(indexes, index)) {
+                    toDelete.push(index);
+                }
+            }
             for (const index of indexes) {
                 const { fields } = this.normalizeIndex(index);
                 if (!this.doesIndexExist(currentIndexes, fields)) {
@@ -429,7 +442,7 @@ export default class MongoDatabase {
                     }
                 }
             }
-            for (const extra of extraIndexes) {
+            for (const extra of toDelete) {
                 yield this.dropIndex(collectionName, extra);
             }
         });

package/build/esm/databases/NeDbDatabase.js

@@ -30,12 +30,9 @@ import SpruceError from '../errors/SpruceError.js';
 import AbstractMutexer from '../mutexers/AbstractMutexer.js';
 import generateId from '../utilities/generateId.js';
 import mongoUtil from '../utilities/mongo.utility.js';
+import mapIndexFilterToNeDbQuery from './mapIndexFilterToNeDbQuery.js';
 import normalizeIndex from './normalizeIndex.js';
 dotenv.config();
-const NULL_PLACEHOLDER = '_____NULL_____';
-const UNDEFINED_PLACEHOLDER = '_____UNDEFINED_____';
-const SHOULD_SIMULATE_SLOW_QUERIES = process.env.SHOULD_SIMULATE_SLOW_QUERIES === 'true';
-const SLOW_QUERY_MAX_RANDOM_DELAY_MS = parseInt(`${(_a = process.env.SLOW_QUERY_MAX_RANDOM_DELAY_MS) !== null && _a !== void 0 ? _a : 100}`, 10);
 export default class NeDbDatabase extends AbstractMutexer {
     constructor() {
         super(...arguments);
@@ -330,17 +327,20 @@ export default class NeDbDatabase extends AbstractMutexer {
             if (col._uniqueIndexes) {
                 for (const index of col._uniqueIndexes) {
                     const { fields, filter } = normalizeIndex(index);
-                    if (filter) {
-                        return;
-                    }
                     const existing = query
                         ? yield this.findOne(collection, query)
                         : null;
-                    const q = {};
+                    let q = filter
+                        ? mapIndexFilterToNeDbQuery(filter)
+                        : {};
                     const duplicateFields = [];
                     const duplicateValues = [];
                     fields.forEach((f) => {
-                        q[f] = get(values, f);
+                        let value = get(values, f);
+                        if (value === NULL_PLACEHOLDER && q[f]) {
+                            value = q[f];
+                        }
+                        q[f] = value;
                         duplicateFields.push(f);
                         duplicateValues.push(q[f]);
                     });
@@ -429,9 +429,9 @@ export default class NeDbDatabase extends AbstractMutexer {
             });
         }
     }
-    doesIndexExist(currentIndexes, fields) {
-        for (const index of currentIndexes !== null && currentIndexes !== void 0 ? currentIndexes : []) {
-            if (isEqual(index, fields)) {
+    doesIndexExist(currentIndexes, index) {
+        for (const existing of currentIndexes !== null && currentIndexes !== void 0 ? currentIndexes : []) {
+            if (isEqual(existing, index)) {
                 return true;
             }
         }
@@ -487,10 +487,14 @@ export default class NeDbDatabase extends AbstractMutexer {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const currentIndexes = yield this.getUniqueIndexes(collectionName);
-            const extraIndexes = differenceWith(currentIndexes, indexes, isEqual);
+            const toDelete = [];
+            for (const index of currentIndexes) {
+                if (!this.doesIndexExist(indexes, index)) {
+                    toDelete.push(index);
+                }
+            }
             for (const index of indexes) {
-                const { fields } = normalizeIndex(index);
-                if (!this.doesIndexExist(currentIndexes, fields)) {
+                if (!this.doesIndexExist(currentIndexes, index)) {
                     try {
                         yield this.createUniqueIndex(collectionName, index);
                     }
@@ -501,7 +505,7 @@ export default class NeDbDatabase extends AbstractMutexer {
                     }
                 }
             }
-            for (const extra of extraIndexes) {
+            for (const extra of toDelete) {
                 yield this.dropIndex(collectionName, extra);
             }
         });
@@ -558,3 +562,7 @@ export default class NeDbDatabase extends AbstractMutexer {
         this.fakedQueries[this.queryToKey(query)] = cb;
     }
 }
+const NULL_PLACEHOLDER = '_____NULL_____';
+const UNDEFINED_PLACEHOLDER = '_____UNDEFINED_____';
+const SHOULD_SIMULATE_SLOW_QUERIES = process.env.SHOULD_SIMULATE_SLOW_QUERIES === 'true';
+const SLOW_QUERY_MAX_RANDOM_DELAY_MS = parseInt(`${(_a = process.env.SLOW_QUERY_MAX_RANDOM_DELAY_MS) !== null && _a !== void 0 ? _a : 100}`, 10);

package/build/esm/databases/mapIndexFilterToNeDbQuery.d.ts

@@ -0,0 +1 @@
+export default function mapIndexFilterToNeDbQuery(filter: Record<string, any>): Record<string, any>;

package/build/esm/databases/mapIndexFilterToNeDbQuery.js

@@ -0,0 +1,10 @@
+import { cloneDeep } from '@sprucelabs/schema';
+export default function mapIndexFilterToNeDbQuery(filter) {
+    const final = cloneDeep(filter);
+    for (const key of Object.keys(final)) {
+        if (final[key].$type === 'string') {
+            final[key] = { $ne: null };
+        }
+    }
+    return final;
+}

package/build/esm/tests/databaseAssertUtil.js

@@ -753,6 +753,24 @@ const databaseAssertUtil = {
             indexes = (yield db.getUniqueIndexes(this.collectionName));
             assert.isLength(indexes, 1);
             assert.isEqual(indexes[0][0].toLowerCase(), 'uniquefield');
+            yield db.syncUniqueIndexes(this.collectionName, [
+                {
+                    fields: ['username'],
+                    filter: { isActive: true },
+                },
+            ]);
+            yield db.syncUniqueIndexes(this.collectionName, [
+                {
+                    fields: ['otherField', 'otherField2'],
+                    filter: { otherField: { $exists: true } },
+                },
+                {
+                    fields: ['username'],
+                    filter: { isActive: true },
+                },
+            ]);
+            indexes = (yield db.getUniqueIndexes(this.collectionName));
+            assert.isLength(indexes, 2, `Syncing unique indexs with filter is not removing extra indexes.`);
             yield this.shutdown(db);
         });
     },
@@ -1481,7 +1499,7 @@ const databaseAssertUtil = {
                 username: 'test',
                 phone: null,
                 dateScrambled: 'test',
-            }));
+            }), undefined, `Creating a duplicate record with should throw an error.`);
             yield db.createOne(this.collectionName, {
                 phone: '555-000-0000',
                 dateScrambled: 'test',

package/build/tests/databaseAssertUtil.js

@@ -686,6 +686,24 @@ const databaseAssertUtil = {
         indexes = (await db.getUniqueIndexes(this.collectionName));
         test_utils_1.assert.isLength(indexes, 1);
         test_utils_1.assert.isEqual(indexes[0][0].toLowerCase(), 'uniquefield');
+        await db.syncUniqueIndexes(this.collectionName, [
+            {
+                fields: ['username'],
+                filter: { isActive: true },
+            },
+        ]);
+        await db.syncUniqueIndexes(this.collectionName, [
+            {
+                fields: ['otherField', 'otherField2'],
+                filter: { otherField: { $exists: true } },
+            },
+            {
+                fields: ['username'],
+                filter: { isActive: true },
+            },
+        ]);
+        indexes = (await db.getUniqueIndexes(this.collectionName));
+        test_utils_1.assert.isLength(indexes, 2, `Syncing unique indexs with filter is not removing extra indexes.`);
         await this.shutdown(db);
     },
     async assertSyncingUniqueIndexsSkipsExistingIndexs(connect) {
@@ -1356,7 +1374,7 @@ const databaseAssertUtil = {
             username: 'test',
             phone: null,
             dateScrambled: 'test',
-        }));
+        }), undefined, `Creating a duplicate record with should throw an error.`);
         await db.createOne(this.collectionName, {
             phone: '555-000-0000',
             dateScrambled: 'test',

package/package.json

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