@wzyjs/next 0.3.28 → 0.3.30

package/dist/Base.zmodel

@@ -43,7 +43,7 @@ plugin crud_tags {
   provider = '@wzyjs/next'
   title = 'Generate Some Api'
   output = 'src/api/generated'
-  generateActions = 'crud, tags'
+  generateActions = 'crud, tags, noCheck'
 }
 
 abstract  model Base {

package/dist/plugin/crud/index.js

@@ -1,76 +1,37 @@
 "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 = {
+const fs = require("node:fs");
+const path = require("node:path");
+const 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 });
-            }
+const generateCRUD = async (model, outputPath) => {
+    const crudDirPath = path.join(outputPath, 'crud');
+    // 过滤出来 model
+    const modelNames = model.declarations.filter(item => 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*/];
+    }
+    // 生成模板
+    modelNames.forEach(({ name: ModelName }) => {
+        let templateContent = crudConfig.template.content;
+        const modelName = String(ModelName).replace(/^./, (s) => s.toLowerCase());
+        templateContent = templateContent.replace(/habitGroup/g, modelName);
+        templateContent = templateContent.replace(/HabitGroup/g, String(ModelName));
+        fs.writeFileSync(path.join(crudDirPath, `use${ModelName}CRUD.ts`), templateContent);
     });
-}); };
+    // 创建 index.ts 导出所有代理
+    const indexContent = modelNames.map(({ name: ModelName }) => {
+        return `export * from './use${ModelName}CRUD'`;
+    }).join('\n');
+    fs.writeFileSync(path.join(crudDirPath, 'index.ts'), indexContent + '\n');
+    console.log('\n');
+    console.log(`✅ CRUD 功能生成完成，共处理 ${modelNames.length} 个模型`);
+};
 exports.generateCRUD = generateCRUD;

package/dist/plugin/crud/useHabitGroupCRUD.ts

@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 // @ts-ignore
 import { App } from '@/components'
 

package/dist/plugin/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.name = void 0;
+exports.default = run;
+const crud_1 = require("./crud");
+const tags_1 = require("./tags");
+const no_check_1 = require("./no-check");
+exports.name = 'Generate CRUD, Tags 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(',');
+    // 根据配置执行相应功能
+    if (generateActions.includes('crud')) {
+        await (0, crud_1.generateCRUD)(model, outputPath);
+    }
+    if (generateActions.includes('tags')) {
+        await (0, tags_1.generateTags)(model, outputPath);
+    }
+    if (generateActions.includes('nocheck')) {
+        await (0, no_check_1.markGeneratedNoCheck)(outputPath);
+    }
+}

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.markGeneratedNoCheck = void 0;
+const fs = require("node:fs");
+const path = require("node:path");
+const noCheckBanner = '// @ts-nocheck';
+const walkTsFiles = (dirPath) => {
+    if (!fs.existsSync(dirPath)) {
+        return [];
+    }
+    const files = [];
+    const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+        const entryPath = path.join(dirPath, entry.name);
+        if (entry.isDirectory()) {
+            files.push(...walkTsFiles(entryPath));
+            continue;
+        }
+        if (entry.isFile() && entry.name.endsWith('.ts')) {
+            files.push(entryPath);
+        }
+    }
+    return files;
+};
+const markFile = (filePath) => {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    if (content.includes(noCheckBanner)) {
+        return false;
+    }
+    fs.writeFileSync(filePath, `${noCheckBanner}\n${content}`, 'utf-8');
+    return true;
+};
+const markGeneratedNoCheck = async (outputPath) => {
+    const files = walkTsFiles(outputPath);
+    const changedCount = files.filter(markFile).length;
+    console.log(`✅ Generated 文件 no-check 标记完成，共处理 ${changedCount}/${files.length} 个 TS 文件`);
+};
+exports.markGeneratedNoCheck = markGeneratedNoCheck;

package/dist/plugin/tags/index.js

@@ -1,84 +1,59 @@
 "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 modelsWithTags, _i, modelsWithTags_1, dataModel, modelName, routerFilePath, fileContent, delegateName, getAllTagsInterface, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion, newContent;
-    return __generator(this, function (_a) {
-        modelsWithTags = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
-        // .filter(dataModel => {
-        //   return dataModel.fields.some(field => field.name === 'tags')
-        // })
-        if (modelsWithTags.length === 0) {
-            return [2 /*return*/];
+const fs = require("node:fs");
+const path = require("node:path");
+const generateTags = async (model, outputPath) => {
+    // 过滤出来有 tags 字段的 DataModel
+    const modelsWithTags = model.declarations.filter(item => item.$type === 'DataModel');
+    // .filter(dataModel => {
+    //   return dataModel.fields.some(field => field.name === 'tags')
+    // })
+    if (modelsWithTags.length === 0) {
+        return;
+    }
+    // 为每个有 tags 字段的模型添加 getAllTags 接口
+    for (const dataModel of modelsWithTags) {
+        const modelName = String(dataModel.name);
+        const routerFilePath = path.join(outputPath, 'trpc', 'routers', `${modelName}.router.ts`);
+        // 检查文件是否存在
+        if (!fs.existsSync(routerFilePath)) {
+            continue;
         }
-        // 为每个有 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;
-            }
-            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) {
-                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');
+        // 读取文件内容
+        let fileContent = fs.readFileSync(routerFilePath, 'utf-8');
+        // 检查是否已经添加了 getAllTags 接口
+        if (fileContent.includes('getAllTags:')) {
+            continue;
         }
-        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*/];
-    });
-}); };
+        const delegateName = modelName.charAt(0).toLowerCase() + modelName.slice(1);
+        const getAllTagsInterface = `
+        getAllTags: procedure
+        .query(async ({ ctx, input }) => {
+          const records = await checkRead(db(ctx).${delegateName}.findMany({
+            ...(input?.where ? { where: input.where } : {}),
+            select: { tags: true },
+          }))
+
+          // 扁平化 + 去重
+          const uniqueTags = Array.from(new Set(records.flatMap(record => record.tags || [])))
+
+          return uniqueTags
+        }),`;
+        // 找到最后一个接口的位置，在其后添加新接口
+        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);
+        const newContent = beforeInsertion + getAllTagsInterface + afterInsertion;
+        // 写入文件
+        fs.writeFileSync(routerFilePath, newContent, 'utf-8');
+    }
+    console.log(`✅ Tags 功能生成完成，共处理 ${modelsWithTags.length} 个模型`);
+};
 exports.generateTags = generateTags;

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "description",
   "author": "wzy",
-  "main": "dist/index.js",
+  "main": "dist/plugin/index.js",
+  "exports": {
+    ".": "./dist/plugin/index.js",
+    "./Base.zmodel": "./dist/Base.zmodel"
+  },
   "scripts": {
     "build:plugin": "tsc",
     "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": "npm run rm && npm run build:plugin && npm run cp1 && npm run cp2"
+    "build": "bun run rm && bun run build:plugin && bun run cp1 && bun run cp2"
   },
   "files": [
     "dist"
@@ -17,7 +21,11 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "cfb708a071a9f7f0e2c819760c95427d7196623b",
+  "devDependencies": {
+    "@types/node": "^20.19.23",
+    "typescript": "^5.9.3"
+  },
+  "gitHead": "4e50539cd20e721602a057645c9b859530a1b8c5",
   "publishConfig": {
     "access": "public"
   }

package/dist/index.js

@@ -1,71 +0,0 @@
-"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.name = void 0;
-exports.default = run;
-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 outputPath, generateActions;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    // 检查配置
-                    if (!options.output) {
-                        throw new Error('output is required');
-                    }
-                    outputPath = String(options.output);
-                    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 (!generateActions.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*/];
-            }
-        });
-    });
-}