@wzyjs/next 0.2.61 → 0.2.63

package/dist/Base.zmodel

@@ -7,7 +7,7 @@ generator json {
 }
 
 datasource db {
-  provider = "mysql"
+  provider = "postgresql"
   url      = env("DATABASE_URL")
 }
 
@@ -36,7 +36,7 @@ plugin trpc {
     importCreateRouter = "@/api/trpc/trpc"
     importProcedure = "@/api/trpc/procedures"
     zodSchemasImport = '@/api/generated/zod'
-    generateModelActions = 'findMany, findUnique, create, update, delete, deleteMany'
+    generateModelActions = 'findMany, findUnique, create, update, updateMany, delete, deleteMany, count'
 }
 
 plugin crud_tags {

package/dist/plugin/crud/useHabitGroupCRUD.ts

@@ -17,56 +17,58 @@ type SelectSubset<T extends FindManyArgs | FindUniqueArgs, A> = Prisma.SelectSub
 type UseOptions<T> = UseTRPCQueryOptions<T, T, Error>;
 
 // 定义 Option 接口
-interface Option<
-  TList extends FindManyArgs = FindManyArgs,
-  TInfo extends FindUniqueArgs = FindUniqueArgs,
-> {
-  showTip?: boolean,
+interface Option<TList extends FindManyArgs = FindManyArgs, TInfo extends FindUniqueArgs = FindUniqueArgs> {
+  showTip?: boolean
   list?: false | {
-    query?: SelectSubset<TList, FindManyArgs>,
-    option?: UseOptions<GetPayload<TList>[]>,
-  },
-  info?: false | {
-    query: SelectSubset<TInfo, FindUniqueArgs>,
-    option?: UseOptions<GetPayload<TInfo> | null>,
-  },
-  create?: Parameters<typeof api.habitGroup.create.useMutation>[0],
-  update?: Parameters<typeof api.habitGroup.update.useMutation>[0],
-  remove?: Parameters<typeof api.habitGroup.update.useMutation>[0],
-  delete?: Parameters<typeof api.habitGroup.delete.useMutation>[0],
+    query?: SelectSubset<TList, FindManyArgs>
+    option?: UseOptions<GetPayload<TList>[]>
+  }
+  info?: {
+    query: SelectSubset<TInfo, FindUniqueArgs>
+    option?: UseOptions<GetPayload<TInfo> | null>
+  }
+  allTags?: true
+  create?: Parameters<typeof api.habitGroup.create.useMutation>[0]
+  update?: Parameters<typeof api.habitGroup.update.useMutation>[0]
+  remove?: Parameters<typeof api.habitGroup.update.useMutation>[0]
+  delete?: Parameters<typeof api.habitGroup.delete.useMutation>[0]
+}
+
+const r = (q: any) => {
+  if (!q) {
+    return
+  }
+  const query = JSON.parse(JSON.stringify(q))
+  delete query?.skip
+  delete query?.take
+  delete query?.include
+  delete query?.select
+  return query
 }
 
-export const useHabitGroupCRUD = <
-  TList extends FindManyArgs = FindManyArgs,
-  TInfo extends FindUniqueArgs = FindUniqueArgs,
->(option: Option<TList, TInfo> = {}) => {
-  const {
-    list,
-    info,
-    create,
-    update,
-    remove,
-    delete: deleteOption,
-    showTip = true,
-  } = option
+export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TInfo extends FindUniqueArgs = FindUniqueArgs>(option: Option<TList, TInfo> = {}) => {
+  const { list, info, create, update, remove, allTags, delete: deleteOption, showTip = true } = option
 
   const apiUtils = api.useUtils()
 
-  const listState = api.habitGroup.findMany.useQuery(
-    list === false ? undefined : list?.query,
-    {
-      enabled: list !== false,
-      ...(list ? list.option : undefined),
-    },
-  )
+  const listState = api.habitGroup.findMany.useQuery(list === false ? undefined : list?.query, {
+    enabled: list !== false,
+    ...(list ? list.option : undefined),
+  })
 
-  const infoState = api.habitGroup.findMany.useQuery(
-    info === false ? undefined : info?.query,
-    {
-      enabled: info !== false,
-      ...(info ? info.option : undefined),
-    },
-  )
+  const countState = api.habitGroup.count.useQuery(list === false ? {} as any : r(list?.query), {
+    enabled: list !== false,
+    ...(list ? list.option : undefined),
+  })
+
+  const infoState = api.habitGroup.findUnique.useQuery(info?.query || {} as any, {
+    enabled: !!info,
+    ...(info ? info.option : undefined),
+  })
+
+  const allTagsState = api.habitGroup.getAllTags.useQuery(undefined, {
+    enabled: allTags,
+  })
 
   const onSuccess = (tip: string) => {
     message.destroy()
@@ -75,6 +77,7 @@ export const useHabitGroupCRUD = <
     }
     if (list) {
       listState.refetch()
+      countState.refetch()
     }
   }
 
@@ -89,7 +92,7 @@ export const useHabitGroupCRUD = <
   })
 
   const createState = {
-    ...baseCreateState as unknown as typeof baseCreateState,
+    ...(baseCreateState as unknown as typeof baseCreateState),
     mutate: (data: Parameters<typeof baseCreateState.mutate>[0]['data']) => {
       return baseCreateState.mutate({ data })
     },
@@ -109,7 +112,7 @@ export const useHabitGroupCRUD = <
   })
 
   const updateState = {
-    ...baseUpdateState as unknown as typeof baseUpdateState,
+    ...(baseUpdateState as unknown as typeof baseUpdateState),
     mutate: (id: string, data: Parameters<typeof baseUpdateState.mutate>[0]['data']) => {
       return baseUpdateState.mutate({
         where: { id },
@@ -135,7 +138,7 @@ export const useHabitGroupCRUD = <
   })
 
   const removeState = {
-    ...baseRemoveState as unknown as typeof baseRemoveState,
+    ...(baseRemoveState as unknown as typeof baseRemoveState),
     mutate: (id: string) => {
       return baseRemoveState.mutate({
         where: { id },
@@ -161,7 +164,7 @@ export const useHabitGroupCRUD = <
   })
 
   const deleteState = {
-    ...baseDeleteState as unknown as typeof baseDeleteState,
+    ...(baseDeleteState as unknown as typeof baseDeleteState),
     mutate: (id: string) => {
       return baseDeleteState.mutate({
         where: { id },
@@ -176,11 +179,17 @@ export const useHabitGroupCRUD = <
 
   return {
     listState,
+    countState,
+
     infoState,
+
+    allTagsState,
+
     createState,
-    removeState,
     updateState,
+    removeState,
     deleteState,
+
     apiUtils,
   }
 }

package/dist/plugin/tags/index.js

@@ -43,9 +43,10 @@ var generateTags = function (model, outputPath) { return __awaiter(void 0, void
     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'; });
-        });
+        modelsWithTags = dataModels;
+        // .filter(dataModel => {
+        //   return dataModel.fields.some(field => field.name === 'tags')
+        // })
         if (modelsWithTags.length === 0) {
             return [2 /*return*/];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.2.61",
+  "version": "0.2.63",
   "description": "description",
   "author": "wzy",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "c7f7d2f29d99b35755eab9c160fff4fd92ed2415",
+  "gitHead": "973e4aacd8b71a5a2004cd5ceaf3a0645992cb75",
   "publishConfig": {
     "access": "public"
   }