@anjianshi/utils 3.7.3 → 3.7.4

package/env-service/prisma/extensions/soft-delete.d.ts

@@ -1,7 +1,7 @@
 /**
  * 扩展 Prisma 实现软删除
  *
- * 1. 有 deleteTime 字段的 model 支持软删除。
+ * 1. 有 deleteTime daletedTime deletedAt 字段之一的 model 支持软删除。
  * 2. 执行 delete() 和 deleteMany() 时默认是进行软删除；可指定 soft 为 false 来彻底删除；执行软删除时可指定要额外更新的 data。
  * 2. 查询时会忽略被软删除的记录；可指定 withDeleted 为 true 来包含它们。
  * 4. 可通过 restore() 和 restoreMany() 恢复软删除的记录。

package/env-service/prisma/extensions/soft-delete.js

@@ -1,7 +1,7 @@
 /**
  * 扩展 Prisma 实现软删除
  *
- * 1. 有 deleteTime 字段的 model 支持软删除。
+ * 1. 有 deleteTime daletedTime deletedAt 字段之一的 model 支持软删除。
  * 2. 执行 delete() 和 deleteMany() 时默认是进行软删除；可指定 soft 为 false 来彻底删除；执行软删除时可指定要额外更新的 data。
  * 2. 查询时会忽略被软删除的记录；可指定 withDeleted 为 true 来包含它们。
  * 4. 可通过 restore() 和 restoreMany() 恢复软删除的记录。
@@ -14,6 +14,7 @@
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
 import { Prisma } from '@prisma/client/extension.js';
+const fieldNames = ['deleteTime', 'deletedTime', 'deletedAt'];
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
 function getModel(that) {
     const context = Prisma.getExtensionContext(that);
@@ -25,16 +26,16 @@ function getModel(that) {
     do {
         model = model.$parent[context.$name];
     } while ('withSoftDeleteExtension' in model);
-    const supportSoftDelete = 'deleteTime' in model.fields;
-    return { model, supportSoftDelete };
+    const softDeleteField = fieldNames.find(field => field in model.fields);
+    return { model, softDeleteField };
 }
 function query(that, inputArgs, method) {
-    const { model, supportSoftDelete } = getModel(that);
+    const { model, softDeleteField } = getModel(that);
     // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
     const { withDeleted = false, ...args } = (inputArgs ?? {});
     return model[method]({
         ...args,
-        where: !supportSoftDelete || withDeleted ? args.where : { ...args.where, deleteTime: null },
+        where: !softDeleteField || withDeleted ? args.where : { ...args.where, [softDeleteField]: null },
     });
 }
 export const softDelete = Prisma.defineExtension({
@@ -46,12 +47,12 @@ export const softDelete = Prisma.defineExtension({
             // 操作
             // -----------------------------
             delete(rawArgs) {
-                const { model, supportSoftDelete } = getModel(this);
+                const { model, softDeleteField } = getModel(this);
                 const { soft = true, data, ...args } = rawArgs;
-                if (supportSoftDelete && soft) {
+                if (softDeleteField && soft) {
                     return model.update({
                         ...args, // .delete() 的参数 .update() 也都支持
-                        data: { ...(data ?? {}), deleteTime: new Date() },
+                        data: { ...(data ?? {}), [softDeleteField]: new Date() },
                     }); // .update() 的返回值和 .delete() 一样
                 }
                 else {
@@ -59,12 +60,12 @@ export const softDelete = Prisma.defineExtension({
                 }
             },
             deleteMany(rawArgs) {
-                const { model, supportSoftDelete } = getModel(this);
+                const { model, softDeleteField } = getModel(this);
                 const { soft = true, data, ...args } = rawArgs;
-                if (supportSoftDelete && soft) {
+                if (softDeleteField && soft) {
                     return model.updateMany({
                         ...args, // .deleteMany() 的参数 .updateMany() 也都支持
-                        data: { ...(data ?? {}), deleteTime: new Date() },
+                        data: { ...(data ?? {}), [softDeleteField]: new Date() },
                     }); // .updateMany() 的返回值和 .deleteMany() 一样
                 }
                 else {
@@ -73,22 +74,22 @@ export const softDelete = Prisma.defineExtension({
             },
             restore(rawArgs) {
                 const { data, ...args } = rawArgs;
-                const { model, supportSoftDelete } = getModel(this);
-                if (!supportSoftDelete)
+                const { model, softDeleteField } = getModel(this);
+                if (!softDeleteField)
                     throw new Error('当前模型不支持软删除，不能执行恢复');
                 return model.update({
                     ...args,
-                    data: { ...(data ?? {}), deleteTime: null },
+                    data: { ...(data ?? {}), [softDeleteField]: null },
                 });
             },
             restoreMany(rawArgs) {
                 const { data, ...args } = rawArgs;
-                const { model, supportSoftDelete } = getModel(this);
-                if (!supportSoftDelete)
+                const { model, softDeleteField } = getModel(this);
+                if (!softDeleteField)
                     throw new Error('当前模型不支持软删除，不能执行恢复');
                 return model.updateMany({
                     ...args,
-                    data: { ...(data ?? {}), deleteTime: new Date() },
+                    data: { ...(data ?? {}), [softDeleteField]: new Date() },
                 });
             },
             // -----------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -38,12 +38,12 @@
     "redis": "^5.5.6",
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
+    "@anjianshi/presets-eslint-typescript": "6.1.2",
     "@anjianshi/presets-eslint-base": "6.1.2",
-    "@anjianshi/presets-eslint-node": "6.1.2",
     "@anjianshi/presets-eslint-react": "6.1.3",
-    "@anjianshi/presets-prettier": "3.2.0",
+    "@anjianshi/presets-eslint-node": "6.1.2",
     "@anjianshi/presets-typescript": "3.2.5",
-    "@anjianshi/presets-eslint-typescript": "6.1.2"
+    "@anjianshi/presets-prettier": "3.2.0"
   },
   "prettier": "@anjianshi/presets-prettier/prettierrc"
 }