@roundtreasury/prisma-extension-soft-delete 1.1.0 → 2.0.0

package/dist/generated/prisma/models/User.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/generated/prisma/models.d.ts

@@ -0,0 +1,5 @@
+export type * from './models/User';
+export type * from './models/Post';
+export type * from './models/Comment';
+export type * from './models/Profile';
+export type * from './commonInputTypes';

package/dist/prisma.config.d.ts

@@ -0,0 +1,3 @@
+import "dotenv/config";
+declare const _default: import("@prisma/config").PrismaConfigInternal;
+export default _default;

package/dist/prisma.config.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("dotenv/config");
+const config_1 = require("prisma/config");
+exports.default = (0, config_1.defineConfig)({
+    schema: "prisma/schema.prisma",
+    migrations: {
+        path: "prisma/migrations",
+    },
+    datasource: {
+        url: process.env.DATABASE_URL,
+    },
+});

package/dist/src/lib/createSoftDeleteExtension.d.ts

@@ -0,0 +1,2 @@
+import { Config } from "./types";
+export declare function createSoftDeleteExtension({ models, defaultConfig, modelsMeta, }: Config): (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/client").InternalArgs<{}, {}, {}, {}> & import("@prisma/client/runtime/client").DefaultArgs>;

package/dist/{lib → src/lib}/createSoftDeleteExtension.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSoftDeleteExtension = void 0;
+exports.createSoftDeleteExtension = createSoftDeleteExtension;
 const extension_1 = require("@prisma/client/extension");
 const prisma_extension_nested_operations_1 = require("@roundtreasury/prisma-extension-nested-operations");
 const createParams_1 = require("./helpers/createParams");
@@ -10,27 +10,22 @@ function createSoftDeleteExtension({ models, defaultConfig = {
     createValue: Boolean,
     allowToOneUpdates: false,
     allowCompoundUniqueIndexWhere: false,
-}, dmmf, }) {
+}, modelsMeta, }) {
     if (!defaultConfig.field) {
         throw new Error("prisma-extension-soft-delete: defaultConfig.field is required");
     }
     if (!defaultConfig.createValue) {
         throw new Error("prisma-extension-soft-delete: defaultConfig.createValue is required");
     }
-    let dmmfToUse = dmmf;
-    if (!dmmfToUse) {
-        throw new Error("prisma-extension-soft-delete: dmmf is required, pass it in manually");
-    }
     const modelConfig = {};
     Object.keys(models).forEach((model) => {
-        const modelName = model;
-        const config = models[modelName];
+        const config = models[model];
         if (config) {
-            modelConfig[modelName] =
+            modelConfig[model] =
                 typeof config === "boolean" && config ? defaultConfig : config;
         }
     });
-    const context = (0, createParams_1.createContext)(dmmfToUse);
+    const context = (0, createParams_1.createContext)(modelsMeta);
     const createParamsByModel = Object.keys(modelConfig).reduce((acc, model) => {
         const config = modelConfig[model];
         return {
@@ -65,26 +60,24 @@ function createSoftDeleteExtension({ models, defaultConfig = {
             },
         };
     }, {});
-    // before handling root params generate deleted value so it is consistent
-    // for the query. Add it to root params and get it from scope?
     return extension_1.Prisma.defineExtension((client) => {
         return client.$extends({
             query: {
                 $allModels: {
-                    // @ts-expect-error - we don't know what the client is
                     $allOperations: (0, prisma_extension_nested_operations_1.withNestedOperations)({
-                        dmmf: dmmfToUse,
+                        modelsMeta,
                         async $rootOperation(initialParams) {
                             var _a, _b;
-                            const createParams = (_a = createParamsByModel[initialParams.model || ""]) === null || _a === void 0 ? void 0 : _a[initialParams.operation];
+                            const model = String(initialParams.model || "");
+                            const createParams = (_a = createParamsByModel[model]) === null || _a === void 0 ? void 0 : _a[initialParams.operation];
                             if (!createParams)
                                 return initialParams.query(initialParams.args);
                             const { params, ctx } = createParams(initialParams);
-                            const { model } = params;
+                            const { model: paramsModel } = params;
                             const operationChanged = params.operation !== initialParams.operation;
                             const result = operationChanged
                                 ? // @ts-expect-error - we don't know what the client is
-                                    await client[model[0].toLowerCase() + model.slice(1)][params.operation](params.args)
+                                    await client[paramsModel[0].toLowerCase() + paramsModel.slice(1)][params.operation](params.args)
                                 : await params.query(params.args);
                             const modifyResult = (_b = modifyResultByModel[params.model || ""]) === null || _b === void 0 ? void 0 : _b[params.operation];
                             if (!modifyResult)
@@ -93,7 +86,8 @@ function createSoftDeleteExtension({ models, defaultConfig = {
                         },
                         async $allNestedOperations(initialParams) {
                             var _a, _b;
-                            const createParams = (_a = createParamsByModel[initialParams.model || ""]) === null || _a === void 0 ? void 0 : _a[initialParams.operation];
+                            const model = String(initialParams.model || "");
+                            const createParams = (_a = createParamsByModel[model]) === null || _a === void 0 ? void 0 : _a[initialParams.operation];
                             if (!createParams)
                                 return initialParams.query(initialParams.args);
                             const { params, ctx } = createParams(initialParams);
@@ -109,4 +103,3 @@ function createSoftDeleteExtension({ models, defaultConfig = {
         });
     });
 }
-exports.createSoftDeleteExtension = createSoftDeleteExtension;

package/dist/{lib → src/lib}/helpers/createParams.d.ts

@@ -1,9 +1,9 @@
 import { NestedParams } from "@roundtreasury/prisma-extension-nested-operations";
-import type { BaseDMMF } from "@prisma/client/runtime/library";
-import { Context, ModelConfig } from "../types";
-export declare const createContext: (dmmf: BaseDMMF) => Context;
-export type Params = Omit<NestedParams<any>, "operation"> & {
+import { Context, ModelConfig, ModelsMeta } from "../types";
+export declare const createContext: (modelsMeta: ModelsMeta) => Context;
+export type Params = Omit<NestedParams<any>, "operation" | "model"> & {
     operation: string;
+    model?: string;
 };
 export type CreateParamsReturn = {
     params: Params;

package/dist/{lib → src/lib}/helpers/createParams.js

@@ -2,24 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSelectParams = exports.createIncludeParams = exports.createWhereParams = exports.createAggregateParams = exports.createCountParams = exports.createGroupByParams = exports.createFindManyParams = exports.createFindFirstOrThrowParams = exports.createFindFirstParams = exports.createFindUniqueOrThrowParams = exports.createFindUniqueParams = exports.createUpsertParams = exports.createUpdateManyParams = exports.createUpdateParams = exports.createDeleteManyParams = exports.createDeleteParams = exports.createContext = void 0;
 const nestedReads_1 = require("../utils/nestedReads");
-const createContext = (dmmf) => {
+const createContext = (modelsMeta) => {
     const uniqueFieldsByModel = {};
     const uniqueIndexFieldsByModel = {};
-    dmmf.datamodel.models.forEach((model) => {
-        // add unique fields derived from indexes
-        const uniqueIndexFields = [];
-        model.uniqueFields.forEach((field) => {
-            uniqueIndexFields.push(field.join("_"));
-        });
-        uniqueIndexFieldsByModel[model.name] = uniqueIndexFields;
-        // add id field and unique fields from @unique decorator
-        const uniqueFields = [];
-        model.fields.forEach((field) => {
-            if (field.isId || field.isUnique) {
-                uniqueFields.push(field.name);
-            }
-        });
-        uniqueFieldsByModel[model.name] = uniqueFields;
+    Object.entries(modelsMeta).forEach(([modelName, meta]) => {
+        uniqueFieldsByModel[modelName] = meta.uniqueFields;
+        uniqueIndexFieldsByModel[modelName] = meta.uniqueIndexFields;
     });
     return { uniqueFieldsByModel, uniqueIndexFieldsByModel };
 };

package/dist/{lib → src/lib}/helpers/modifyResult.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modifyReadResult = void 0;
+exports.modifyReadResult = modifyReadResult;
 const nestedReads_1 = require("../utils/nestedReads");
 const resultFiltering_1 = require("../utils/resultFiltering");
 function modifyReadResult(_, config, result, params, ctx) {
@@ -13,4 +13,3 @@ function modifyReadResult(_, config, result, params, ctx) {
     }
     return result;
 }
-exports.modifyReadResult = modifyReadResult;

package/dist/{lib → src/lib}/types.d.ts

@@ -1,5 +1,15 @@
-import type { Prisma } from "@prisma/client";
-import type { BaseDMMF } from "@prisma/client/runtime/library";
+export type RelationField = {
+    name: string;
+    kind: string;
+    isList: boolean;
+    type: string;
+    relationName: string;
+};
+export type ModelsMeta = Record<string, {
+    uniqueFields: string[];
+    uniqueIndexFields: string[];
+    relations: RelationField[];
+}>;
 export type Context = {
     uniqueFieldsByModel: Record<string, string[]>;
     uniqueIndexFieldsByModel: Record<string, string[]>;
@@ -11,7 +21,7 @@ export type ModelConfig = {
     allowCompoundUniqueIndexWhere?: boolean;
 };
 export type Config = {
-    models: Partial<Record<Prisma.ModelName, ModelConfig | boolean>>;
+    models: Record<string, ModelConfig | boolean>;
     defaultConfig?: ModelConfig;
-    dmmf?: BaseDMMF;
+    modelsMeta: ModelsMeta;
 };

package/dist/src/lib/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/{lib → src/lib}/utils/nestedReads.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripDeletedFieldFromResults = exports.addDeletedToSelect = void 0;
+exports.addDeletedToSelect = addDeletedToSelect;
+exports.stripDeletedFieldFromResults = stripDeletedFieldFromResults;
 function addDeletedToSelect(params, config) {
     if (params.args.select && !params.args.select[config.field]) {
         return {
@@ -16,7 +17,6 @@ function addDeletedToSelect(params, config) {
     }
     return params;
 }
-exports.addDeletedToSelect = addDeletedToSelect;
 function stripDeletedFieldFromResults(results, config) {
     if (Array.isArray(results)) {
         results === null || results === void 0 ? void 0 : results.forEach((item) => {
@@ -28,4 +28,3 @@ function stripDeletedFieldFromResults(results, config) {
     }
     return results;
 }
-exports.stripDeletedFieldFromResults = stripDeletedFieldFromResults;

package/dist/{lib → src/lib}/utils/resultFiltering.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterSoftDeletedResults = exports.shouldFilterDeletedFromReadResult = void 0;
+exports.shouldFilterDeletedFromReadResult = shouldFilterDeletedFromReadResult;
+exports.filterSoftDeletedResults = filterSoftDeletedResults;
 // Maybe this should return true for non-list relations only?
 function shouldFilterDeletedFromReadResult(params, config) {
     return (!params.args.where ||
         typeof params.args.where[config.field] === "undefined" ||
         !params.args.where[config.field]);
 }
-exports.shouldFilterDeletedFromReadResult = shouldFilterDeletedFromReadResult;
 function filterSoftDeletedResults(result, config) {
     // filter out deleted records from array results
     if (result && Array.isArray(result)) {
@@ -19,4 +19,3 @@ function filterSoftDeletedResults(result, config) {
     }
     return result;
 }
-exports.filterSoftDeletedResults = filterSoftDeletedResults;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@roundtreasury/prisma-extension-soft-delete",
-  "version": "1.1.0",
-  "description": "Round Treasury Prisma extension for soft deleting records",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "module": "dist/esm/index.js",
+  "version": "2.0.0",
+  "description": "Prisma extension for soft deleting records",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "module": "dist/esm/src/index.js",
   "scripts": {
     "build": "npm-run-all build:cjs build:esm",
     "build:cjs": "tsc -p tsconfig.build.json",
@@ -29,15 +29,17 @@
   "author": "Olivier Wilkinson",
   "license": "Apache-2.0",
   "dependencies": {
-    "@roundtreasury/prisma-extension-nested-operations": "^1.2.0"
+    "@roundtreasury/prisma-extension-nested-operations": "3.0.3"
   },
   "peerDependencies": {
     "@prisma/client": "*"
   },
   "devDependencies": {
-    "@prisma/client": "^5.4.2",
+    "@prisma/adapter-pg": "^7.0.0",
+    "@prisma/client": "^7.8.0",
     "@types/faker": "^5.5.9",
     "@types/jest": "^29.2.5",
+    "@types/node": "^25.9.2",
     "@typescript-eslint/eslint-plugin": "^4.14.0",
     "@typescript-eslint/parser": "^4.14.0",
     "doctoc": "^2.2.0",
@@ -46,11 +48,11 @@
     "jest": "^29.3.1",
     "kcd-scripts": "^5.0.0",
     "npm-run-all": "^4.1.5",
-    "prisma": "^5.4.2",
+    "prisma": "^7.8.0",
     "semantic-release": "^17.0.2",
     "ts-jest": "^29.0.3",
     "ts-node": "^9.1.1",
-    "typescript": "^4.1.3"
+    "typescript": "^5.4.0"
   },
   "repository": {
     "type": "git",

package/dist/esm/lib/createSoftDeleteExtension.d.ts

@@ -1,2 +0,0 @@
-import { Config } from "./types";
-export declare function createSoftDeleteExtension({ models, defaultConfig, dmmf, }: Config): (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {}, {}, {}> & import("@prisma/client/runtime/library").DefaultArgs>;

package/dist/lib/createSoftDeleteExtension.d.ts

@@ -1,2 +0,0 @@
-import { Config } from "./types";
-export declare function createSoftDeleteExtension({ models, defaultConfig, dmmf, }: Config): (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {}, {}, {}> & import("@prisma/client/runtime/library").DefaultArgs>;