@wzyjs/next 0.3.2 → 0.3.4

package/dist/Base.zmodel

@@ -12,45 +12,49 @@ datasource db {
 }
 
 plugin prisma {
-    provider = '@core/prisma'
-    output = './schema.prisma'
+  provider = '@core/prisma'
+  output = './schema.prisma'
 }
 
 plugin enhancer {
-    provider = '@core/enhancer'
-    output = '../src/api/generated/enhancer'
-    preserveTsFiles = true
+  provider = '@core/enhancer'
+  output = '../src/api/generated/enhancer'
+  preserveTsFiles = true
 }
 
 plugin zod {
-    provider = '@core/zod'
-    output = '../src/api/generated/zod'
-    compile = false
+  provider = '@core/zod'
+  output = '../src/api/generated/zod'
+  compile = false
 }
 
 plugin trpc {
-    provider = '@zenstackhq/trpc'
-    output = '../src/api/generated/trpc'
-    version = 'v11'
-    generateClientHelpers = 'next'
-    importCreateRouter = "@/api/trpc/trpc"
-    importProcedure = "@/api/trpc/procedures"
-    zodSchemasImport = '@/api/generated/zod'
-    generateModelActions = 'findMany, findUnique, create, update, updateMany, delete, deleteMany, count'
+  provider = '@zenstackhq/trpc'
+  output = '../src/api/generated/trpc'
+  version = 'v11'
+  generateClientHelpers = 'next'
+  importCreateRouter = "@/api/trpc/trpc"
+  importProcedure = "@/api/trpc/procedures"
+  zodSchemasImport = '@/api/generated/zod'
+  generateModelActions = 'findMany, findUnique, create, update, updateMany, delete, deleteMany, count'
 }
 
 plugin crud_tags {
-    provider = '@wzyjs/next'
-    title = 'Generate Some'
-    output = 'src/api/generated'
-    generateActions = 'crud, tags'
+  provider = '@wzyjs/next'
+  title = 'Generate Some Api'
+  output = 'src/api/generated'
+  generateActions = 'crud, tags'
 }
 
 abstract  model Base {
   id        String    @id @default(cuid())
+
   createdAt DateTime  @default(now())
   updatedAt DateTime? @updatedAt
-  isDeleted Boolean?  @default(false) @omit
+
+  sort      Int?
+  enabled   Boolean   @default(true)
+  isDeleted Boolean   @default(false) @omit
 
   @@allow('all', !isDeleted)
 }

package/dist/index.js

@@ -43,7 +43,7 @@ var tags_1 = require("./plugin/tags");
 exports.name = 'Generate CRUD and Tags';
 function run(model, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var outputPath, generateActions, actions;
+        var outputPath, generateActions;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -52,16 +52,14 @@ function run(model, options) {
                         throw new Error('output is required');
                     }
                     outputPath = String(options.output);
-                    generateActions = String(options.generateActions || 'crud,tags');
-                    actions = generateActions.split(',').map(function (action) { return action.trim().toLowerCase(); });
-                    console.log();
-                    if (!actions.includes('crud')) return [3 /*break*/, 2];
+                    generateActions = String(options.generateActions || 'crud, tags').replace(/\s/g, '').toLowerCase().split(',');
+                    if (!generateActions.includes('crud')) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, crud_1.generateCRUD)(model, outputPath)];
                 case 1:
                     _a.sent();
                     _a.label = 2;
                 case 2:
-                    if (!actions.includes('tags')) return [3 /*break*/, 4];
+                    if (!generateActions.includes('tags')) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, tags_1.generateTags)(model, outputPath)];
                 case 3:
                     _a.sent();

package/dist/plugin/tags/index.js

@@ -40,10 +40,9 @@ exports.generateTags = void 0;
 var fs = require("node:fs");
 var path = require("node:path");
 var generateTags = function (model, outputPath) { return __awaiter(void 0, void 0, void 0, function () {
-    var dataModels, modelsWithTags, _i, modelsWithTags_1, dataModel, modelName, routerFilePath, fileContent, zImport, procedureImportToken, delegateName, getAllTagsInterface, existingMatch, newContent, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion;
+    var modelsWithTags, _i, modelsWithTags_1, dataModel, modelName, routerFilePath, fileContent, delegateName, getAllTagsInterface, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion, newContent;
     return __generator(this, function (_a) {
-        dataModels = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
-        modelsWithTags = dataModels;
+        modelsWithTags = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
         // .filter(dataModel => {
         //   return dataModel.fields.some(field => field.name === 'tags')
         // })
@@ -60,21 +59,12 @@ var generateTags = function (model, outputPath) { return __awaiter(void 0, void
                 continue;
             }
             fileContent = fs.readFileSync(routerFilePath, 'utf-8');
-            zImport = 'import { z } from "@/api/utils";';
-            if (!fileContent.includes(zImport)) {
-                procedureImportToken = 'import { procedure } from "@/api/trpc/procedures";';
-                if (fileContent.includes(procedureImportToken)) {
-                    fileContent = fileContent.replace(procedureImportToken, "".concat(procedureImportToken, "\n").concat(zImport));
-                }
-            }
-            delegateName = modelName.charAt(0).toLowerCase() + modelName.slice(1);
-            getAllTagsInterface = "\n        getAllTags: procedure\n        .input(z.object({ where: z.any().optional() }).optional())\n        .query(async ({ ctx, input }) => {\n          const records = await checkRead(db(ctx).".concat(delegateName, ".findMany({\n            ...(input?.where ? { where: input.where } : {}),\n            select: { tags: true },\n          }))\n\n          const uniqueTags = Array.from(new Set(records.flatMap(record => record.tags || [])))\n\n          return uniqueTags\n        }),");
-            existingMatch = fileContent.match(/\n\s*getAllTags:\s*procedure[\s\S]*?\n\s*\}\),/m);
-            if (existingMatch === null || existingMatch === void 0 ? void 0 : existingMatch[0]) {
-                newContent = fileContent.replace(existingMatch[0], "\n".concat(getAllTagsInterface));
-                fs.writeFileSync(routerFilePath, newContent, 'utf-8');
+            // 检查是否已经添加了 getAllTags 接口
+            if (fileContent.includes('getAllTags:')) {
                 continue;
             }
+            delegateName = modelName.charAt(0).toLowerCase() + modelName.slice(1);
+            getAllTagsInterface = "\n        getAllTags: procedure\n        .query(async ({ ctx, input }) => {\n          const records = await checkRead(db(ctx).".concat(delegateName, ".findMany({\n            ...(input?.where ? { where: input.where } : {}),\n            select: { tags: true },\n          }))\n\n          // \u6241\u5E73\u5316 + \u53BB\u91CD\n          const uniqueTags = Array.from(new Set(records.flatMap(record => record.tags || [])))\n\n          return uniqueTags\n        }),");
             lastCommaIndex = fileContent.lastIndexOf(',');
             closingBraceIndex = fileContent.indexOf('\n    }\n    );', lastCommaIndex);
             if (closingBraceIndex === -1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "description",
   "author": "wzy",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "22c3d24e9f596ff0171bf93c85d17c9615690981",
+  "gitHead": "759abaadc6f778c5a1b4ddb5b16f7753d45f37f9",
   "publishConfig": {
     "access": "public"
   }