@wzyjs/next 0.3.32 → 0.3.37

package/dist/Base.zmodel

@@ -1,5 +1,6 @@
 generator client {
   provider = "prisma-client-js"
+  output   = "../src/server/generated/prisma-client"
 }
 
 generator json {
@@ -18,32 +19,26 @@ plugin prisma {
 
 plugin enhancer {
   provider = '@core/enhancer'
-  output = '../src/api/generated/enhancer'
+  output = '../src/server/generated/enhancer'
   preserveTsFiles = true
 }
 
-plugin zod {
-  provider = '@core/zod'
-  output = '../src/api/generated/zod'
-  compile = false
-}
-
 plugin trpc {
   provider = '@zenstackhq/trpc'
-  output = '../src/api/generated/trpc'
+  output = '../src/server/generated/trpc'
   version = 'v11'
   generateClientHelpers = 'next'
-  importCreateRouter = "@/api/trpc/trpc"
-  importProcedure = "@/api/trpc/procedures"
-  zodSchemasImport = '@/api/generated/zod'
+  importCreateRouter = "@/server/trpc/init"
+  importProcedure = "@/server/trpc/procedures"
+  zodSchemasImport = '@/server/generated/.zenstack/zod'
   generateModelActions = 'findMany, findUnique, create, update, updateMany, delete, deleteMany, count'
 }
 
 plugin crud_tags {
   provider = '@wzyjs/next'
   title = 'Generate Some Api'
-  output = 'src/api/generated'
-  generateActions = 'crud, tags, noCheck'
+  output = 'src/server/generated'
+  generateActions = 'crud, tags, softDelete, noCheck'
 }
 
 abstract  model Base {

package/dist/plugin/crud/useHabitGroupCRUD.ts

@@ -4,7 +4,7 @@
 import { App } from '@/components'
 
 // @ts-ignore
-import { trpc as api } from '@/api/react'
+import { api } from '@/utils/trpc'
 
 import type { Prisma } from '@prisma/client'
 import type { UseTRPCQueryOptions } from '@trpc/react-query/shared'
@@ -38,7 +38,8 @@ interface Option<TList extends FindManyArgs = FindManyArgs, TInfo extends FindUn
   }
   create?: Parameters<typeof api.habitGroup.create.useMutation>[0]
   update?: Parameters<typeof api.habitGroup.update.useMutation>[0]
-  remove?: Parameters<typeof api.habitGroup.update.useMutation>[0]
+  remove?: Parameters<typeof api.habitGroup.remove.useMutation>[0]
+  restore?: Parameters<typeof api.habitGroup.restore.useMutation>[0]
   delete?: Parameters<typeof api.habitGroup.delete.useMutation>[0]
 }
 
@@ -55,7 +56,7 @@ const r = (q: any) => {
 }
 
 export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TInfo extends FindUniqueArgs = FindUniqueArgs>(option: Option<TList, TInfo> = {}) => {
-  const { list, info, create, update, remove, tags = false, delete: deleteOption, showTip = true } = option
+  const { list, info, create, update, remove, restore, tags = false, delete: deleteOption, showTip = true } = option
 
   const { message } = App.useApp()
 
@@ -144,7 +145,7 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     },
   }
 
-  const baseRemoveState = api.habitGroup.update.useMutation({
+  const baseRemoveState = api.habitGroup.remove.useMutation({
     ...remove,
     onSuccess: (...args) => {
       if (remove?.onSuccess) {
@@ -159,13 +160,11 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     mutate: (id: string) => {
       return baseRemoveState.mutate({
         where: { id },
-        data: { isDeleted: true },
       })
     },
     mutateAsync: (id: string) => {
       return baseRemoveState.mutateAsync({
         where: { id },
-        data: { isDeleted: true },
       })
     },
   }
@@ -194,6 +193,30 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     },
   }
 
+  const baseRestoreState = api.habitGroup.restore.useMutation({
+    ...restore,
+    onSuccess: (...args) => {
+      if (restore?.onSuccess) {
+        restore.onSuccess(...args)
+      }
+      onSuccess('恢复成功')
+    },
+  })
+
+  const restoreState = {
+    ...(baseRestoreState as unknown as typeof baseRestoreState),
+    mutate: (id: string) => {
+      return baseRestoreState.mutate({
+        where: { id },
+      })
+    },
+    mutateAsync: (id: string) => {
+      return baseRestoreState.mutateAsync({
+        where: { id },
+      })
+    },
+  }
+
   return {
     listState,
     countState,
@@ -205,6 +228,7 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     createState,
     updateState,
     removeState,
+    restoreState,
     deleteState,
 
     apiUtils,

package/dist/plugin/index.js

@@ -4,15 +4,16 @@ exports.name = void 0;
 exports.default = run;
 const crud_1 = require("./crud");
 const tags_1 = require("./tags");
+const soft_delete_1 = require("./soft-delete");
 const no_check_1 = require("./no-check");
-exports.name = 'Generate CRUD, Tags and Generated File Banners';
+exports.name = 'Generate CRUD, Tags, Soft Delete and Generated File Banners';
 async function run(model, options) {
     // 检查配置
     if (!options.output) {
         throw new Error('output is required');
     }
     const outputPath = String(options.output);
-    const generateActions = String(options.generateActions || 'crud, tags, noCheck').replace(/\s/g, '').toLowerCase().split(',');
+    const generateActions = String(options.generateActions || 'crud, tags, softDelete, noCheck').replace(/\s/g, '').toLowerCase().split(',');
     // 根据配置执行相应功能
     if (generateActions.includes('crud')) {
         await (0, crud_1.generateCRUD)(model, outputPath);
@@ -20,6 +21,9 @@ async function run(model, options) {
     if (generateActions.includes('tags')) {
         await (0, tags_1.generateTags)(model, outputPath);
     }
+    if (generateActions.includes('softdelete')) {
+        await (0, soft_delete_1.generateSoftDelete)(model, outputPath);
+    }
     if (generateActions.includes('nocheck')) {
         await (0, no_check_1.markGeneratedNoCheck)(outputPath);
     }

package/dist/plugin/no-check/index.js

@@ -4,7 +4,8 @@ exports.markGeneratedNoCheck = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const noCheckBanner = '// @ts-nocheck';
-const walkTsFiles = (dirPath) => {
+const noCheckExtensions = new Set(['.ts', '.tsx', '.js', '.jsx']);
+const walkGeneratedFiles = (dirPath) => {
     if (!fs.existsSync(dirPath)) {
         return [];
     }
@@ -13,10 +14,10 @@ const walkTsFiles = (dirPath) => {
     for (const entry of entries) {
         const entryPath = path.join(dirPath, entry.name);
         if (entry.isDirectory()) {
-            files.push(...walkTsFiles(entryPath));
+            files.push(...walkGeneratedFiles(entryPath));
             continue;
         }
-        if (entry.isFile() && entry.name.endsWith('.ts')) {
+        if (entry.isFile() && noCheckExtensions.has(path.extname(entry.name))) {
             files.push(entryPath);
         }
     }
@@ -31,8 +32,8 @@ const markFile = (filePath) => {
     return true;
 };
 const markGeneratedNoCheck = async (outputPath) => {
-    const files = walkTsFiles(outputPath);
+    const files = walkGeneratedFiles(outputPath);
     const changedCount = files.filter(markFile).length;
-    console.log(`✅ Generated 文件 no-check 标记完成，共处理 ${changedCount}/${files.length} 个 TS 文件`);
+    console.log(`✅ Generated 文件 no-check 标记完成，共处理 ${changedCount}/${files.length} 个 TS/JS 文件`);
 };
 exports.markGeneratedNoCheck = markGeneratedNoCheck;

package/dist/plugin/soft-delete/index.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSoftDelete = void 0;
+const fs = require("node:fs");
+const path = require("node:path");
+const hasIsDeletedUpdateInput = (outputPath, modelName) => {
+    const updateInputPath = path.join(outputPath, '.zenstack', 'zod', 'objects', `${modelName}UpdateInput.schema.ts`);
+    if (!fs.existsSync(updateInputPath)) {
+        return false;
+    }
+    return fs.readFileSync(updateInputPath, 'utf-8').includes('isDeleted:');
+};
+const createSoftDeleteInterface = (modelName, delegateName) => {
+    return `
+        remove: procedure.input($Schema.${modelName}InputSchema.delete).mutation(async ({ ctx, input }) => checkMutate(db(ctx).${delegateName}.update({
+            ...(input as any),
+            data: { isDeleted: true },
+        } as any))),
+
+        restore: procedure.input($Schema.${modelName}InputSchema.delete).mutation(async ({ ctx, input }) => checkMutate(db(ctx).${delegateName}.update({
+            ...(input as any),
+            data: { isDeleted: false },
+        } as any))),
+`;
+};
+const generateSoftDelete = async (model, outputPath) => {
+    const dataModels = model.declarations.filter(item => item.$type === 'DataModel');
+    let processedCount = 0;
+    for (const dataModel of dataModels) {
+        const modelName = String(dataModel.name);
+        if (!hasIsDeletedUpdateInput(outputPath, modelName)) {
+            continue;
+        }
+        const routerFilePath = path.join(outputPath, 'trpc', 'routers', `${modelName}.router.ts`);
+        if (!fs.existsSync(routerFilePath)) {
+            continue;
+        }
+        let fileContent = fs.readFileSync(routerFilePath, 'utf-8');
+        if (fileContent.includes('remove:') && fileContent.includes('restore:')) {
+            continue;
+        }
+        const delegateName = modelName.charAt(0).toLowerCase() + modelName.slice(1);
+        const lastCommaIndex = fileContent.lastIndexOf(',');
+        const closingBraceIndex = fileContent.indexOf('\n    }\n    );', lastCommaIndex);
+        if (closingBraceIndex === -1) {
+            console.warn(`⚠️  Could not find insertion point in ${modelName}.router.ts`);
+            continue;
+        }
+        const beforeInsertion = fileContent.substring(0, closingBraceIndex);
+        const afterInsertion = fileContent.substring(closingBraceIndex);
+        fileContent = beforeInsertion + createSoftDeleteInterface(modelName, delegateName) + afterInsertion;
+        fs.writeFileSync(routerFilePath, fileContent, 'utf-8');
+        processedCount += 1;
+    }
+    console.log(`✅ Soft Delete 功能生成完成，共处理 ${processedCount} 个模型`);
+};
+exports.generateSoftDelete = generateSoftDelete;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.3.32",
+  "version": "0.3.37",
   "description": "description",
   "author": "wzy",
   "main": "dist/plugin/index.js",
@@ -13,19 +13,20 @@
     "rm": "rm -rf dist",
     "cp1": "cp src/prisma/Base.zmodel dist/Base.zmodel",
     "cp2": "cp src/plugin/crud/useHabitGroupCRUD.ts dist/plugin/crud/useHabitGroupCRUD.ts",
-    "build": "bun run rm && bun run build:plugin && bun run cp1 && bun run cp2"
+    "build": "bun run rm && bun run build:plugin && bun run cp1 && bun run cp2",
+    "typecheck": "tsc --noEmit"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@zenstackhq/sdk": "^2.12.3"
+    "@zenstackhq/sdk": "2.22.1"
   },
   "devDependencies": {
     "@types/node": "^20.19.23",
     "typescript": "^5.9.3"
   },
-  "gitHead": "260d8290106ef447ec42375d4656af2e89675b15",
+  "gitHead": "66fc9b56ff49d9a725189dbd3360d6987cb9d604",
   "publishConfig": {
     "access": "public"
   }