@wzyjs/next 0.3.1 → 0.3.3

package/dist/plugin/crud/useHabitGroupCRUD.ts

@@ -27,7 +27,10 @@ interface Option<TList extends FindManyArgs = FindManyArgs, TInfo extends FindUn
     query: SelectSubset<TInfo, FindUniqueArgs>
     option?: UseOptions<GetPayload<TInfo> | null>
   }
-  allTags?: true
+  tags?: true | {
+    query?: Parameters<typeof api.habitGroup.getAllTags.useQuery>[0]
+    option?: UseOptions<string[]>
+  }
   create?: Parameters<typeof api.habitGroup.create.useMutation>[0]
   update?: Parameters<typeof api.habitGroup.update.useMutation>[0]
   remove?: Parameters<typeof api.habitGroup.update.useMutation>[0]
@@ -47,7 +50,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, allTags = false, delete: deleteOption, showTip = true } = option
+  const { list, info, create, update, remove, tags = false, delete: deleteOption, showTip = true } = option
 
   const apiUtils = api.useUtils()
 
@@ -66,8 +69,15 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     ...(info ? info.option : undefined),
   })
 
-  const allTagsState = api.habitGroup.getAllTags.useQuery(undefined, {
-    enabled: allTags,
+  const tagsConfig: Option['tags'] | false = tags
+  const tagsEnabled: boolean = Boolean(tagsConfig)
+  const tagsQuery: Parameters<typeof api.habitGroup.getAllTags.useQuery>[0] = (
+    tagsConfig && typeof tagsConfig === 'object' ? tagsConfig.query : undefined
+  ) as Parameters<typeof api.habitGroup.getAllTags.useQuery>[0]
+
+  const tagsState = api.habitGroup.getAllTags.useQuery(tagsQuery, {
+    enabled: tagsEnabled,
+    ...(tagsConfig && typeof tagsConfig === 'object' ? tagsConfig.option : undefined),
   })
 
   const onSuccess = (tip: string) => {
@@ -183,7 +193,7 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
 
     infoState,
 
-    allTagsState,
+    tagsState,
 
     createState,
     updateState,

package/dist/plugin/tags/index.js

@@ -40,7 +40,7 @@ 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;
+    var dataModels, modelsWithTags, _i, modelsWithTags_1, dataModel, modelName, routerFilePath, fileContent, zImport, procedureImportToken, delegateName, getAllTagsInterface, existingMatch, newContent, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion;
     return __generator(this, function (_a) {
         dataModels = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
         modelsWithTags = dataModels;
@@ -60,11 +60,21 @@ var generateTags = function (model, outputPath) { return __awaiter(void 0, void
                 continue;
             }
             fileContent = fs.readFileSync(routerFilePath, 'utf-8');
-            // 检查是否已经添加了 getAllTags 接口
-            if (fileContent.includes('getAllTags:')) {
+            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');
                 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "description",
   "author": "wzy",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "da50a5a7ef7989b15b91c67c1bfe5c9d8483c536",
+  "gitHead": "c0a83557cdfb520becc4d5924f1b101e0bd43d1e",
   "publishConfig": {
     "access": "public"
   }