@wzyjs/next 0.2.56 → 0.2.58

package/dist/Base.zmodel

@@ -39,10 +39,11 @@ plugin trpc {
     generateModelActions = 'findMany, findUnique, create, update, delete, deleteMany'
 }
 
-plugin crud {
+plugin crud_tags {
     provider = '@wzyjs/next'
-    title = 'Generate useModelCRUD'
-    output = 'src/api/generated/crud'
+    title = 'Generate Some'
+    output = 'src/api/generated'
+    generateActions = 'crud, tags'
 }
 
 abstract  model Base {

package/dist/index.js

@@ -38,44 +38,36 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.name = void 0;
 exports.default = run;
-var fs = require("node:fs");
-var path = require("node:path");
-exports.name = 'Generate useModelCRUD';
-var config = {
-    template: {
-        content: fs.readFileSync(path.resolve(__dirname, './useHabitGroupCRUD.ts'), 'utf-8'),
-    },
-};
+var crud_1 = require("./plugin/crud");
+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 modelNames, indexContent;
+        var outputPath, generateActions, actions;
         return __generator(this, function (_a) {
-            // 检查配置
-            if (!options.output) {
-                throw new Error('crud output is required');
-            }
-            modelNames = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
-            // 创建目录
-            if (modelNames.length) {
-                if (!fs.existsSync(options.output)) {
-                    fs.mkdirSync(options.output);
-                }
+            switch (_a.label) {
+                case 0:
+                    // 检查配置
+                    if (!options.output) {
+                        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];
+                    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];
+                    return [4 /*yield*/, (0, tags_1.generateTags)(model, outputPath)];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
             }
-            // 生成模板
-            modelNames.forEach(function (_a) {
-                var ModelName = _a.name;
-                var templateContent = config.template.content;
-                var modelName = ModelName.replace(/^./, function (s) { return s.toLowerCase(); });
-                templateContent = templateContent.replace(/habitGroup/g, modelName);
-                templateContent = templateContent.replace(/HabitGroup/g, ModelName);
-                fs.writeFileSync(options.output + "/use".concat(ModelName, "CRUD.ts"), templateContent);
-            });
-            indexContent = modelNames.map(function (_a) {
-                var ModelName = _a.name;
-                return "export * from './use".concat(ModelName, "CRUD'");
-            }).join('\n');
-            fs.writeFileSync(options.output + '/index.ts', indexContent + '\n');
-            return [2 /*return*/];
         });
     });
 }

package/dist/plugin/crud/index.js

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateCRUD = void 0;
+var fs = require("node:fs");
+var path = require("node:path");
+var crudConfig = {
+    template: {
+        content: fs.readFileSync(path.resolve(__dirname, './useHabitGroupCRUD.ts'), 'utf-8'),
+    },
+};
+var generateCRUD = function (model, outputPath) { return __awaiter(void 0, void 0, void 0, function () {
+    var crudDirPath, modelNames, indexContent;
+    return __generator(this, function (_a) {
+        crudDirPath = path.join(outputPath, 'crud');
+        modelNames = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
+        // 创建目录
+        if (modelNames.length) {
+            if (!fs.existsSync(crudDirPath)) {
+                fs.mkdirSync(crudDirPath, { recursive: true });
+            }
+        }
+        // 生成模板
+        modelNames.forEach(function (_a) {
+            var ModelName = _a.name;
+            var templateContent = crudConfig.template.content;
+            var modelName = String(ModelName).replace(/^./, function (s) { return s.toLowerCase(); });
+            templateContent = templateContent.replace(/habitGroup/g, modelName);
+            templateContent = templateContent.replace(/HabitGroup/g, String(ModelName));
+            fs.writeFileSync(path.join(crudDirPath, "use".concat(ModelName, "CRUD.ts")), templateContent);
+        });
+        indexContent = modelNames.map(function (_a) {
+            var ModelName = _a.name;
+            return "export * from './use".concat(ModelName, "CRUD'");
+        }).join('\n');
+        fs.writeFileSync(path.join(crudDirPath, 'index.ts'), indexContent + '\n');
+        console.log("\u2705 CRUD \u529F\u80FD\u751F\u6210\u5B8C\u6210\uFF0C\u5171\u5904\u7406 ".concat(modelNames.length, " \u4E2A\u6A21\u578B"));
+        return [2 /*return*/];
+    });
+}); };
+exports.generateCRUD = generateCRUD;

package/dist/{useHabitGroupCRUD.ts → plugin/crud/useHabitGroupCRUD.ts}

@@ -12,6 +12,10 @@ interface Option {
     query?: Parameters<typeof api.habitGroup.findMany.useQuery>[0],
     option?: Parameters<typeof api.habitGroup.findMany.useQuery>[1],
   },
+  info?: false | {
+    query?: Parameters<typeof api.habitGroup.findUnique.useQuery>[0],
+    option?: Parameters<typeof api.habitGroup.findUnique.useQuery>[1],
+  },
   create?: Parameters<typeof api.habitGroup.create.useMutation>[0],
   update?: Parameters<typeof api.habitGroup.update.useMutation>[0],
   remove?: Parameters<typeof api.habitGroup.update.useMutation>[0],
@@ -19,7 +23,7 @@ interface Option {
 }
 
 export const useHabitGroupCRUD = (option: Option = {}) => {
-  const { list, create, update, remove, delete: deleteOption, showTip = true } = option
+  const { list, info, create, update, remove, delete: deleteOption, showTip = true } = option
 
   const apiUtils = api.useUtils()
 
@@ -28,6 +32,11 @@ export const useHabitGroupCRUD = (option: Option = {}) => {
     ...list?.option,
   })
 
+  const infoState = api.habitGroup.findUnique.useQuery(info ? info.query : { where: { id: '' } }, {
+    enabled: !!(info && info.query),
+    ...info?.option,
+  })
+
   const onSuccess = (tip: string) => {
     message.destroy()
     if (showTip) {
@@ -136,6 +145,7 @@ export const useHabitGroupCRUD = (option: Option = {}) => {
 
   return {
     listState,
+    infoState,
     createState,
     removeState,
     updateState,

package/dist/plugin/tags/index.js

@@ -0,0 +1,83 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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, getAllTagsInterface, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion, newContent;
+    return __generator(this, function (_a) {
+        dataModels = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
+        modelsWithTags = dataModels.filter(function (dataModel) {
+            return dataModel.fields.some(function (field) { return field.name === 'tags'; });
+        });
+        if (modelsWithTags.length === 0) {
+            return [2 /*return*/];
+        }
+        // 为每个有 tags 字段的模型添加 getAllTags 接口
+        for (_i = 0, modelsWithTags_1 = modelsWithTags; _i < modelsWithTags_1.length; _i++) {
+            dataModel = modelsWithTags_1[_i];
+            modelName = String(dataModel.name);
+            routerFilePath = path.join(outputPath, 'trpc', 'routers', "".concat(modelName, ".router.ts"));
+            // 检查文件是否存在
+            if (!fs.existsSync(routerFilePath)) {
+                continue;
+            }
+            fileContent = fs.readFileSync(routerFilePath, 'utf-8');
+            // 检查是否已经添加了 getAllTags 接口
+            if (fileContent.includes('getAllTags:')) {
+                continue;
+            }
+            getAllTagsInterface = "\n        getAllTags: procedure.query(async ({ ctx }) => {\n          const records = await checkRead(db(ctx).".concat(modelName.charAt(0).toLowerCase() + modelName.slice(1), ".findMany({\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) {
+                console.warn("\u26A0\uFE0F  Could not find insertion point in ".concat(modelName, ".router.ts"));
+                continue;
+            }
+            beforeInsertion = fileContent.substring(0, closingBraceIndex);
+            afterInsertion = fileContent.substring(closingBraceIndex);
+            newContent = beforeInsertion + getAllTagsInterface + afterInsertion;
+            // 写入文件
+            fs.writeFileSync(routerFilePath, newContent, 'utf-8');
+        }
+        console.log("\u2705 Tags \u529F\u80FD\u751F\u6210\u5B8C\u6210\uFF0C\u5171\u5904\u7406 ".concat(modelsWithTags.length, " \u4E2A\u5305\u542B tags \u5B57\u6BB5\u7684\u6A21\u578B"));
+        return [2 /*return*/];
+    });
+}); };
+exports.generateTags = generateTags;

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.2.56",
+  "version": "0.2.58",
   "description": "description",
   "author": "wzy",
   "main": "dist/index.js",
   "scripts": {
-    "build:plugin": "tsc src/plugin/crud/index.ts --outDir dist --skipLibCheck --module CommonJS",
+    "build:plugin": "tsc",
+    "rm": "rm -rf dist",
     "cp1": "cp src/prisma/Base.zmodel dist/Base.zmodel",
-    "cp2": "cp src/plugin/crud/useHabitGroupCRUD.ts dist/useHabitGroupCRUD.ts",
-    "build": "npm run build:plugin && npm run cp1 && npm run cp2"
+    "cp2": "cp src/plugin/crud/useHabitGroupCRUD.ts dist/plugin/crud/useHabitGroupCRUD.ts",
+    "build": "npm run rm && npm run build:plugin && npm run cp1 && npm run cp2"
   },
   "files": [
     "dist"
@@ -16,7 +17,7 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "2a14d6fdc5a381dd93390472cdfbc409f12e65db",
+  "gitHead": "c293b90cf37a8425c75eb8f3880787b40b951593",
   "publishConfig": {
     "access": "public"
   }