@sprucelabs/data-stores 28.1.12 → 28.1.14

package/build/databases/NeDbDatabase.js

@@ -26,7 +26,6 @@ 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();
 class NeDbDatabase extends AbstractMutexer_1.default {
@@ -292,22 +291,30 @@ 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) {
+                    let shouldSkip = false;
+                    for (const key in filter) {
+                        if (values[key] === NULL_PLACEHOLDER ||
+                            typeof values[key] === 'undefined') {
+                            shouldSkip = true;
+                            break;
+                        }
+                    }
+                    if (shouldSkip) {
+                        continue;
+                    }
+                }
                 const existing = query
                     ? await this.findOne(collection, query)
                     : null;
-                let q = filter
-                    ? (0, mapIndexFilterToNeDbQuery_1.default)(filter)
-                    : {};
+                let q = {};
                 const duplicateFields = [];
                 const duplicateValues = [];
                 fields.forEach((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]);
+                    duplicateValues.push(value);
+                    q[f] = value;
                 });
                 const destination = await this.findOne(collection, q);
                 if (destination && (existing === null || existing === void 0 ? void 0 : existing.id) !== destination.id) {

package/build/esm/databases/NeDbDatabase.js

@@ -30,7 +30,6 @@ 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();
 export default class NeDbDatabase extends AbstractMutexer {
@@ -327,22 +326,30 @@ export default class NeDbDatabase extends AbstractMutexer {
             if (col._uniqueIndexes) {
                 for (const index of col._uniqueIndexes) {
                     const { fields, filter } = normalizeIndex(index);
+                    if (filter) {
+                        let shouldSkip = false;
+                        for (const key in filter) {
+                            if (values[key] === NULL_PLACEHOLDER ||
+                                typeof values[key] === 'undefined') {
+                                shouldSkip = true;
+                                break;
+                            }
+                        }
+                        if (shouldSkip) {
+                            continue;
+                        }
+                    }
                     const existing = query
                         ? yield this.findOne(collection, query)
                         : null;
-                    let q = filter
-                        ? mapIndexFilterToNeDbQuery(filter)
-                        : {};
+                    let q = {};
                     const duplicateFields = [];
                     const duplicateValues = [];
                     fields.forEach((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]);
+                        duplicateValues.push(value);
+                        q[f] = value;
                     });
                     const destination = yield this.findOne(collection, q);
                     if (destination && (existing === null || existing === void 0 ? void 0 : existing.id) !== destination.id) {

package/build/esm/tests/databaseAssertUtil.js

@@ -1469,14 +1469,14 @@ const databaseAssertUtil = {
     },
     assertCanSyncUniqueIndexesWithFilterExpression(connect) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const db = yield connectToDabatase(connect);
             try {
                 yield db.syncUniqueIndexes(this.collectionName, [
                     {
                         fields: ['uniqueField', 'someField3'],
                         filter: {
-                            uniqueField: { $exists: true },
+                            uniqueField: { $type: 'string' },
                         },
                     },
                 ]);
@@ -1518,13 +1518,13 @@ const databaseAssertUtil = {
                     {
                         fields: ['uniqueField', 'someField3'],
                         filter: {
-                            uniqueField: { $exists: true },
+                            uniqueField: { $type: 'string' },
                         },
                     },
                     {
                         fields: ['slug', 'someField3'],
                         filter: {
-                            slug: { $exists: true, $type: 'string' },
+                            slug: { $type: 'string' },
                         },
                     },
                 ]);
@@ -1548,9 +1548,51 @@ const databaseAssertUtil = {
                 });
             }
             catch (err) {
-                assert.fail((_d = `createOne() should not throw if index has filter { \$exists: true, \$type: 'string' }.\n\n` +
+                assert.fail((_d = `createOne() should not throw since index has filter { slug: { \$type: 'string' } }.\n\n` +
                     err.stack) !== null && _d !== void 0 ? _d : err.message);
             }
+            try {
+                yield db.createOne(this.collectionName, {
+                    name: generateId(),
+                    uniqueField: null,
+                    slug: '555-000-0002',
+                    someField3: 'next',
+                });
+            }
+            catch (err) {
+                assert.fail((_e = `createOne() should not throw since index has filter {uniqueField: { \$type: 'string' } }.\n\n` +
+                    err.stack) !== null && _e !== void 0 ? _e : err.message);
+            }
+            yield assert.doesThrowAsync(() => db.createOne(this.collectionName, {
+                name: generateId(),
+                uniqueField: null,
+                slug: '555-000-0002',
+                someField3: 'next',
+            }), undefined, `createOne() should throw since index has filter { slug: { \$type: 'string' } }.`);
+            yield db.createOne(this.collectionName, {
+                name: generateId(),
+                uniqueField: undefined,
+                slug: '555-000-0004',
+                someField3: undefined,
+            });
+            yield db.createOne(this.collectionName, {
+                name: generateId(),
+                uniqueField: undefined,
+                slug: '555-000-0003',
+                someField3: undefined,
+            });
+            const name = generateId();
+            yield db.createOne(this.collectionName, {
+                name,
+                uniqueField: generateId(),
+                slug: undefined,
+                someField3: undefined,
+            });
+            yield db.updateOne(this.collectionName, {
+                name,
+            }, {
+                someField2: 'hey',
+            });
             yield this.shutdown(db);
         });
     },

package/build/tests/databaseAssertUtil.js

@@ -1344,14 +1344,14 @@ const databaseAssertUtil = {
         await this.shutdown(db);
     },
     async assertCanSyncUniqueIndexesWithFilterExpression(connect) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const db = await connectToDabatase(connect);
         try {
             await db.syncUniqueIndexes(this.collectionName, [
                 {
                     fields: ['uniqueField', 'someField3'],
                     filter: {
-                        uniqueField: { $exists: true },
+                        uniqueField: { $type: 'string' },
                     },
                 },
             ]);
@@ -1393,13 +1393,13 @@ const databaseAssertUtil = {
                 {
                     fields: ['uniqueField', 'someField3'],
                     filter: {
-                        uniqueField: { $exists: true },
+                        uniqueField: { $type: 'string' },
                     },
                 },
                 {
                     fields: ['slug', 'someField3'],
                     filter: {
-                        slug: { $exists: true, $type: 'string' },
+                        slug: { $type: 'string' },
                     },
                 },
             ]);
@@ -1423,9 +1423,51 @@ const databaseAssertUtil = {
             });
         }
         catch (err) {
-            test_utils_1.assert.fail((_d = `createOne() should not throw if index has filter { \$exists: true, \$type: 'string' }.\n\n` +
+            test_utils_1.assert.fail((_d = `createOne() should not throw since index has filter { slug: { \$type: 'string' } }.\n\n` +
                 err.stack) !== null && _d !== void 0 ? _d : err.message);
         }
+        try {
+            await db.createOne(this.collectionName, {
+                name: (0, generateId_1.default)(),
+                uniqueField: null,
+                slug: '555-000-0002',
+                someField3: 'next',
+            });
+        }
+        catch (err) {
+            test_utils_1.assert.fail((_e = `createOne() should not throw since index has filter {uniqueField: { \$type: 'string' } }.\n\n` +
+                err.stack) !== null && _e !== void 0 ? _e : err.message);
+        }
+        await test_utils_1.assert.doesThrowAsync(() => db.createOne(this.collectionName, {
+            name: (0, generateId_1.default)(),
+            uniqueField: null,
+            slug: '555-000-0002',
+            someField3: 'next',
+        }), undefined, `createOne() should throw since index has filter { slug: { \$type: 'string' } }.`);
+        await db.createOne(this.collectionName, {
+            name: (0, generateId_1.default)(),
+            uniqueField: undefined,
+            slug: '555-000-0004',
+            someField3: undefined,
+        });
+        await db.createOne(this.collectionName, {
+            name: (0, generateId_1.default)(),
+            uniqueField: undefined,
+            slug: '555-000-0003',
+            someField3: undefined,
+        });
+        const name = (0, generateId_1.default)();
+        await db.createOne(this.collectionName, {
+            name,
+            uniqueField: (0, generateId_1.default)(),
+            slug: undefined,
+            someField3: undefined,
+        });
+        await db.updateOne(this.collectionName, {
+            name,
+        }, {
+            someField2: 'hey',
+        });
         await this.shutdown(db);
     },
     async assertSyncIndexesRemovesExtraIndexes(connect) {

package/package.json

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