prisma-mock 0.10.2 → 0.10.4

package/lib/index.js

@@ -36,28 +36,39 @@ const getNestedValue_1 = __importDefault(require("./utils/getNestedValue"));
 function IsFieldDefault(f) {
     return f.name !== undefined;
 }
-const throwKnownError = (message, { code = "P2025", meta } = {}) => {
+function isDefinedWithValue(v, key) {
+    return v[key] !== undefined;
+}
+const throwPrismaError = (message, { code = "P2025", meta } = {}, errorClass = client_1.Prisma.PrismaClientKnownRequestError) => {
     const clientVersion = client_1.Prisma.prismaVersion.client;
     // PrismaClientKnownRequestError prototype changed in version 4.7.0
     // from: constructor(message: string, code: string, clientVersion: string, meta?: any)
     // to: constructor(message: string, { code, clientVersion, meta, batchRequestIdx }: KnownErrorParams)
     let error;
-    if (client_1.Prisma.PrismaClientKnownRequestError.length === 2) {
+    if (errorClass.length === 2) {
         // @ts-ignore
-        error = new client_1.Prisma.PrismaClientKnownRequestError(message, {
+        error = new errorClass(message, {
             code,
             clientVersion,
         });
     }
     else {
         // @ts-ignore
-        error = new client_1.Prisma.PrismaClientKnownRequestError(message, code, 
+        error = new errorClass(message, 
+        // @ts-ignore
+        code, 
         // @ts-ignore
         clientVersion);
     }
     error.meta = meta;
     throw error;
 };
+const throwKnownError = (message, { code = "P2025", meta } = {}) => {
+    throwPrismaError(message, { code, meta }, client_1.Prisma.PrismaClientKnownRequestError);
+};
+const throwValidationError = (message, { code = "P2025", meta } = {}) => {
+    throwPrismaError(message, { code, meta }, client_1.Prisma.PrismaClientValidationError);
+};
 const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel, client = (0, jest_mock_extended_1.mockDeep)(), options = {
     caseInsensitive: false,
 }) => {
@@ -72,6 +83,7 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
     };
     const removeMultiFieldIds = (model, data) => {
         const c = getCamelCase(model.name);
+        // @ts-ignore
         const idFields = model.idFields || model.primaryKey?.fields;
         const removeId = (ids) => {
             const id = ids.join("_");
@@ -174,7 +186,7 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
             }
             const keys = Object.keys(orderBy);
             if (keys.length > 1) {
-                throw new client_1.Prisma.PrismaClientValidationError(`Argument orderBy of needs exactly one argument, but you provided ${keys.join(" and ")}. Please choose one.`);
+                throwValidationError(`Argument orderBy of needs exactly one argument, but you provided ${keys.join(" and ")}. Please choose one.`);
             }
             const incl = includes({
                 include: keys.reduce((acc, key) => ({ ...acc, [key]: true }), {}),
@@ -351,21 +363,26 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                                 };
                             }
                             else {
-                                const map = (val) => ({
-                                    ...val,
-                                    [joinfield.name]: {
-                                        connect: joinfield.relationToFields.reduce((prev, cur, index) => {
-                                            let val = d[cur];
-                                            if (!isCreating && !val) {
-                                                val = findOne(args)[cur];
-                                            }
-                                            return {
-                                                ...prev,
-                                                [cur]: val,
-                                            };
-                                        }, {}),
-                                    },
-                                });
+                                const map = (val) => {
+                                    if (joinfield.relationToFields.length === 0) {
+                                        return val;
+                                    }
+                                    return ({
+                                        ...val,
+                                        [joinfield.name]: {
+                                            connect: joinfield.relationToFields.reduce((prev, cur, index) => {
+                                                let val = d[cur];
+                                                if (!isCreating && !val) {
+                                                    val = findOne(args)[cur];
+                                                }
+                                                return {
+                                                    ...prev,
+                                                    [cur]: val,
+                                                };
+                                            }, {}),
+                                        },
+                                    });
+                                };
                                 let createdItems = [];
                                 if (c.createMany) {
                                     createdItems = delegate._createMany({
@@ -624,6 +641,7 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                         }
                         return res.length > 0;
                     }
+                    // @ts-ignore Backwards compatibility
                     const idFields = model.idFields || model.primaryKey?.fields;
                     if (idFields?.length > 1) {
                         if (child === idFields.join("_")) {
@@ -705,29 +723,29 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                         }
                     }
                     if ("string_ends_with" in matchFilter && match) {
-                        match = val ? val.indexOf(matchFilter.string_ends_with) === val.length - matchFilter.string_ends_with.length : false;
+                        match = val ? val.lastIndexOf(matchFilter.string_ends_with) === val.length - matchFilter.string_ends_with.length : false;
                     }
                     if ("string_contains" in matchFilter && match) {
                         match = val ? val?.indexOf(matchFilter.string_contains) !== -1 : false;
                     }
                     if ("endsWith" in matchFilter && match) {
                         match =
-                            val.indexOf(matchFilter.endsWith) ===
+                            val.lastIndexOf(matchFilter.endsWith) ===
                                 val.length - matchFilter.endsWith.length;
                     }
                     if ("contains" in matchFilter && match) {
                         match = val.indexOf(matchFilter.contains) > -1;
                     }
-                    if ("gt" in matchFilter && match) {
+                    if (isDefinedWithValue(matchFilter, "gt") && match) {
                         match = val > matchFilter.gt;
                     }
-                    if ("gte" in matchFilter && match) {
+                    if (isDefinedWithValue(matchFilter, "gte") && match) {
                         match = val >= matchFilter.gte;
                     }
-                    if ("lt" in matchFilter && match) {
+                    if (isDefinedWithValue(matchFilter, "lt") && match) {
                         match = val < matchFilter.lt;
                     }
-                    if ("lte" in matchFilter && match) {
+                    if (isDefinedWithValue(matchFilter, "lte") && match) {
                         match = val <= matchFilter.lte;
                     }
                     if ("in" in matchFilter && match) {
@@ -989,6 +1007,9 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                 const model = datamodel.models.find((model) => {
                     return getCamelCase(model.name) === prop;
                 });
+                if (!obj[key]) {
+                    return;
+                }
                 if (key === "_count") {
                     const select = obj[key]?.select;
                     const subkeys = Object.keys(select);

package/lib/indexes.js

@@ -5,7 +5,7 @@ function createIndexes() {
     let indexedFieldNames = {};
     let fields = {};
     let idFieldNames = {};
-    const addIndexFieldIfNeeded = (tableName, field) => {
+    const addIndexFieldIfNeeded = (tableName, field, isPrimary) => {
         if (!indexedFieldNames[tableName]) {
             indexedFieldNames[tableName] = [];
         }
@@ -18,13 +18,15 @@ function createIndexes() {
         let thisFields = fields[tableName];
         let thisFieldNames = indexedFieldNames[tableName];
         let thisIdFieldNames = idFieldNames[tableName];
-        if (thisFieldNames.includes(field.name))
-            return;
-        if (field.isId || field.isUnique) {
-            thisFieldNames.push(field.name);
+        if (field.isId || field.isUnique || isPrimary) {
+            if (!thisFieldNames.includes(field.name)) {
+                thisFieldNames.push(field.name);
+            }
         }
-        if (field.isId) {
-            thisIdFieldNames.push(field.name);
+        if (field.isId || isPrimary) {
+            if (!thisIdFieldNames.includes(field.name)) {
+                thisIdFieldNames.push(field.name);
+            }
         }
         if (!!field.relationFromFields?.length) {
             const fieldName = field.relationFromFields[0];
@@ -99,6 +101,7 @@ function createIndexes() {
                         let hasFound = false;
                         for (let i = 0; i < array.length; i++) {
                             const oldItem = array[i];
+                            thisIdFieldNames; //?
                             for (const thisIdFieldName of thisIdFieldNames) {
                                 if (item[thisIdFieldName] === oldItem[thisIdFieldName]) {
                                     hasFound = true;

package/lib/indexes.test.js

@@ -157,3 +157,37 @@ Array [
 ]
 `);
 });
+test("Should not make multiple items when has mulitple primary keys", () => {
+    const indexes = (0, indexes_1.default)();
+    indexes.addIndexFieldIfNeeded("UserAnswers", {
+        name: "answerId",
+        isId: false
+    }, true);
+    indexes.addIndexFieldIfNeeded("UserAnswers", {
+        name: "userId",
+        isId: false
+    }, true);
+    indexes.updateItem("UserAnswers", {
+        userId: 1,
+        name: "Alice",
+        accountId: 1
+    });
+    indexes.updateItem("UserAnswers", {
+        userId: 1,
+        name: "Alice 2",
+        accountId: 1
+    });
+    const items = indexes.getIndexedItems("UserAnswers", {
+        accountId: 1,
+        userId: 1,
+    });
+    expect(items).toMatchInlineSnapshot(`
+Array [
+  Object {
+    "accountId": 1,
+    "name": "Alice 2",
+    "userId": 1,
+  },
+]
+`);
+});

package/lib/utils/deepCopy.js

@@ -9,6 +9,9 @@ function deepCopy(source) {
     else if (Array.isArray(source)) {
         return source.map(deepCopy);
     }
+    else if (source instanceof Date) {
+        return new Date(source);
+    }
     return Object.fromEntries(Object.entries(source).map(([k, v]) => ([k, deepCopy(v)])));
 }
 exports.deepCopy = deepCopy;

package/lib/utils/deepEqual.js

@@ -3,8 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepEqual = void 0;
 // deepEqual
 function deepEqual(a, b) {
-    if ((typeof a == 'object' && a != null) &&
-        (typeof b == 'object' && b != null)) {
+    if (a === b) {
+        return true;
+    }
+    if ((typeof a === 'object' && a !== null) &&
+        (typeof b === 'object' && b !== null)) {
+        if (a instanceof Date) {
+            if (b instanceof Date) {
+                return a.getTime() === b.getTime();
+            }
+            return false;
+        }
+        else if (b instanceof Date) {
+            return false;
+        }
         var count = [0, 0];
         for (var key in a)
             count[0]++;
@@ -25,6 +37,6 @@ function deepEqual(a, b) {
         }
         return true;
     }
-    return a === b;
+    return false;
 }
 exports.deepEqual = deepEqual;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-mock",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "Mock prisma for unit testing database",
   "main": "lib/index.js",
   "repository": {
@@ -13,12 +13,12 @@
     "lib/"
   ],
   "devDependencies": {
-    "@prisma/client": "4.7.1",
+    "@prisma/client": "5.13.0",
     "@types/jest": "^27.0.2",
     "cross-spawn": "^7.0.3",
     "env-cmd": "^10.1.0",
     "jest": "^27.3.1",
-    "prisma": "4.7.1",
+    "prisma": "5.13.0",
     "ts-jest": "^27.0.7",
     "typescript": "^4.4.4",
     "uuid": "^9.0.0"
@@ -31,7 +31,7 @@
     "test:postgres": "env-cmd -e postgres jest --maxWorkers=1"
   },
   "peerDependencies": {
-    "@prisma/client": "^3.5.0 || ^4.7.0 || ^5.0.0"
+    "@prisma/client": "^3.5.0 || ^4.7.0 || ^5.0.0 || ^6.0.0"
   },
   "dependencies": {
     "jest-mock-extended": "^3.0.6"