@zenstackhq/trpc 2.6.2 → 2.7.0

package/client-helper/index.d.ts

@@ -0,0 +1,17 @@
+import { type PluginOptions } from '@zenstackhq/sdk';
+import { Project } from 'ts-morph';
+import { SupportedClientHelpers } from '../utils';
+export declare function generateClientTypingForModel(project: Project, generateClientHelpers: SupportedClientHelpers[], model: string, options: PluginOptions, generateOperations: Array<{
+    name: string;
+    baseType: string;
+}>, version: string, outDir: string): void;
+export declare function createClientHelperEntries(project: Project, outputDir: string, generateClientHelpers: SupportedClientHelpers[], models: string[], version: string): void;
+/**
+ * Given a model and Prisma operation, returns related TS types.
+ */
+export declare function getPrismaOperationTypes(model: string, operation: string): {
+    genericBase: string;
+    argsType: string;
+    resultType: string;
+    argsOptional: boolean;
+};

package/client-helper/index.js

@@ -0,0 +1,252 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateClientTypingForModel = generateClientTypingForModel;
+exports.createClientHelperEntries = createClientHelperEntries;
+exports.getPrismaOperationTypes = getPrismaOperationTypes;
+const sdk_1 = require("@zenstackhq/sdk");
+const prisma_1 = require("@zenstackhq/sdk/prisma");
+const fs_1 = __importDefault(require("fs"));
+const lower_case_first_1 = require("lower-case-first");
+const path_1 = __importDefault(require("path"));
+const ts_morph_1 = require("ts-morph");
+const upper_case_first_1 = require("upper-case-first");
+const __1 = require("..");
+const NextHelpers = __importStar(require("./next"));
+const NuxtHelpers = __importStar(require("./nuxt"));
+const ReactHelpers = __importStar(require("./react"));
+const helpers = {
+    react: ReactHelpers,
+    next: NextHelpers,
+    nuxt: NuxtHelpers,
+};
+function generateClientTypingForModel(project, generateClientHelpers, model, options, generateOperations, version, outDir) {
+    var _a;
+    for (const clientType of generateClientHelpers) {
+        const sf = project.createSourceFile(path_1.default.resolve(outDir, `client/${(0, upper_case_first_1.upperCaseFirst)(model)}.${clientType}.type.ts`), undefined, {
+            overwrite: true,
+        });
+        sf.addStatements([`/* eslint-disable */`]);
+        generateImports(clientType, sf, options, version);
+        // generate a `ClientType` interface that contains typing for query/mutation operations
+        const routerTypingStructure = {
+            kind: ts_morph_1.StructureKind.Interface,
+            name: 'ClientType',
+            isExported: true,
+            typeParameters: ['AppRouter extends AnyRouter', `Context = AppRouter['_def']['_config']['$types']['ctx']`],
+            properties: [],
+        };
+        for (const { name: generateOpName, baseType: baseOpType } of generateOperations) {
+            (_a = routerTypingStructure.properties) === null || _a === void 0 ? void 0 : _a.push({
+                kind: ts_morph_1.StructureKind.PropertySignature,
+                name: generateOpName,
+                type: (writer) => {
+                    helpers[clientType].generateProcedureTyping(writer, generateOpName, model, baseOpType, version);
+                },
+            });
+        }
+        sf.addInterface(routerTypingStructure);
+    }
+}
+function generateImports(clientHelperType, sourceFile, options, version) {
+    const importingDir = sourceFile.getDirectoryPath();
+    const prismaImport = (0, prisma_1.getPrismaClientImportSpec)(importingDir, options);
+    sourceFile.addStatements([
+        `import type { Prisma } from '${prismaImport}';`,
+        `import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';`,
+    ]);
+    // generate framework-specific imports
+    helpers[clientHelperType].generateRouterTypingImports(sourceFile, version);
+}
+function createClientHelperEntries(project, outputDir, generateClientHelpers, models, version) {
+    // generate utils
+    const content = fs_1.default.readFileSync(path_1.default.join(__dirname, `../res/client/${version}/utils.ts`), 'utf-8');
+    project.createSourceFile(path_1.default.resolve(outputDir, 'client', `utils.ts`), content, {
+        overwrite: true,
+    });
+    for (const client of generateClientHelpers) {
+        createClientHelperEntryForType(project, client, models, version, outputDir);
+    }
+}
+function createClientHelperEntryForType(project, clientHelperType, models, version, outputDir) {
+    const content = fs_1.default.readFileSync(path_1.default.join(__dirname, `../res/client/${version}/${clientHelperType}.ts`), 'utf-8');
+    const sf = project.createSourceFile(path_1.default.resolve(outputDir, 'client', `${clientHelperType}.ts`), content, {
+        overwrite: true,
+    });
+    sf.addInterface({
+        name: 'ClientType',
+        typeParameters: ['AppRouter extends AnyRouter'],
+        isExported: true,
+        properties: models.map((model) => {
+            sf.addImportDeclaration({
+                namedImports: [{ name: 'ClientType', alias: `${(0, upper_case_first_1.upperCaseFirst)(model)}ClientType` }],
+                moduleSpecifier: `./${(0, upper_case_first_1.upperCaseFirst)(model)}.${clientHelperType}.type`,
+            });
+            return {
+                name: (0, lower_case_first_1.lowerCaseFirst)(model),
+                type: `${(0, upper_case_first_1.upperCaseFirst)(model)}ClientType<AppRouter>`,
+            };
+        }),
+    });
+}
+/**
+ * Given a model and Prisma operation, returns related TS types.
+ */
+function getPrismaOperationTypes(model, operation) {
+    // TODO: find a way to derive from Prisma Client API's generic types
+    // instead of duplicating them
+    const capModel = (0, upper_case_first_1.upperCaseFirst)(model);
+    const capOperation = (0, upper_case_first_1.upperCaseFirst)(operation);
+    let genericBase = `Prisma.${capModel}${capOperation}Args`;
+    const getPayload = `Prisma.${capModel}GetPayload<T>`;
+    const selectSubset = `Prisma.SelectSubset<T, ${genericBase}>`;
+    let argsType;
+    let resultType;
+    const argsOptional = ['findMany', 'findFirst', 'findFirstOrThrow', 'createMany', 'deleteMany', 'count'].includes(operation);
+    switch (operation) {
+        case 'findUnique':
+        case 'findFirst':
+            argsType = selectSubset;
+            resultType = `${getPayload} | null`;
+            break;
+        case 'findUniqueOrThrow':
+        case 'findFirstOrThrow':
+            argsType = selectSubset;
+            resultType = getPayload;
+            break;
+        case 'findMany':
+            argsType = selectSubset;
+            resultType = `Array<${getPayload}>`;
+            break;
+        case 'create':
+            argsType = selectSubset;
+            resultType = getPayload;
+            break;
+        case 'createMany':
+            argsType = selectSubset;
+            resultType = `Prisma.BatchPayload`;
+            break;
+        case 'update':
+            argsType = selectSubset;
+            resultType = getPayload;
+            break;
+        case 'updateMany':
+            argsType = selectSubset;
+            resultType = `Prisma.BatchPayload`;
+            break;
+        case 'upsert':
+            argsType = selectSubset;
+            resultType = getPayload;
+            break;
+        case 'delete':
+            argsType = selectSubset;
+            resultType = getPayload;
+            break;
+        case 'deleteMany':
+            argsType = selectSubset;
+            resultType = `Prisma.BatchPayload`;
+            break;
+        case 'count':
+            argsType = `Prisma.Subset<T, ${genericBase}>`;
+            resultType = `'select' extends keyof T
+            ? T['select'] extends true
+              ? number
+              : Prisma.GetScalarType<T['select'], Prisma.${capModel}CountAggregateOutputType>
+            : number`;
+            break;
+        case 'aggregate':
+            argsType = `Prisma.Subset<T, ${genericBase}>`;
+            resultType = `Prisma.Get${capModel}AggregateType<T>`;
+            break;
+        case 'groupBy':
+            genericBase = `Prisma.${capModel}GroupByArgs,
+            HasSelectOrTake extends Prisma.Or<
+              Prisma.Extends<'skip', Prisma.Keys<T>>,
+              Prisma.Extends<'take', Prisma.Keys<T>>
+            >,
+            OrderByArg extends Prisma.True extends HasSelectOrTake
+              ? { orderBy: Prisma.${capModel}GroupByArgs['orderBy'] }
+              : { orderBy?: Prisma.${capModel}GroupByArgs['orderBy'] },
+            OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>,
+            ByFields extends Prisma.MaybeTupleToUnion<T['by']>,
+            ByValid extends Prisma.Has<ByFields, OrderFields>,
+            HavingFields extends Prisma.GetHavingFields<T['having']>,
+            HavingValid extends Prisma.Has<ByFields, HavingFields>,
+            ByEmpty extends T['by'] extends never[] ? Prisma.True : Prisma.False,
+            InputErrors extends ByEmpty extends Prisma.True
+            ? \`Error: "by" must not be empty.\`
+            : HavingValid extends Prisma.False
+            ? {
+                [P in HavingFields]: P extends ByFields
+                  ? never
+                  : P extends string
+                  ? \`Error: Field "\${P}" used in "having" needs to be provided in "by".\`
+                  : [
+                      Error,
+                      'Field ',
+                      P,
+                      \` in "having" needs to be provided in "by"\`,
+                    ]
+              }[HavingFields]
+            : 'take' extends Prisma.Keys<T>
+            ? 'orderBy' extends Prisma.Keys<T>
+              ? ByValid extends Prisma.True
+                ? {}
+                : {
+                    [P in OrderFields]: P extends ByFields
+                      ? never
+                      : \`Error: Field "\${P}" in "orderBy" needs to be provided in "by"\`
+                  }[OrderFields]
+              : 'Error: If you provide "take", you also need to provide "orderBy"'
+            : 'skip' extends Prisma.Keys<T>
+            ? 'orderBy' extends Prisma.Keys<T>
+              ? ByValid extends Prisma.True
+                ? {}
+                : {
+                    [P in OrderFields]: P extends ByFields
+                      ? never
+                      : \`Error: Field "\${P}" in "orderBy" needs to be provided in "by"\`
+                  }[OrderFields]
+              : 'Error: If you provide "skip", you also need to provide "orderBy"'
+            : ByValid extends Prisma.True
+            ? {}
+            : {
+                [P in OrderFields]: P extends ByFields
+                  ? never
+                  : \`Error: Field "\${P}" in "orderBy" needs to be provided in "by"\`
+              }[OrderFields]
+          `;
+            argsType = `Prisma.SubsetIntersection<T, Prisma.${capModel}GroupByArgs, OrderByArg> & InputErrors`;
+            resultType = `{} extends InputErrors ? Prisma.Get${capModel}GroupByPayload<T> : InputErrors`;
+            break;
+        default:
+            throw new sdk_1.PluginError(__1.name, `Unsupported operation: "${operation}"`);
+    }
+    return { genericBase, argsType, resultType, argsOptional };
+}
+//# sourceMappingURL=index.js.map

package/client-helper/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client-helper/index.ts"],"names":[],"mappings":"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"}

package/client-helper/next.d.ts

@@ -0,0 +1,3 @@
+import { CodeBlockWriter, SourceFile } from 'ts-morph';
+export declare function generateRouterTypingImports(sourceFile: SourceFile, version: string): void;
+export declare function generateProcedureTyping(writer: CodeBlockWriter, opType: string, modelName: string, baseOpType: string, version: string): void;

package/client-helper/next.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateRouterTypingImports = generateRouterTypingImports;
+exports.generateProcedureTyping = generateProcedureTyping;
+const react_1 = require("./react");
+function generateRouterTypingImports(sourceFile, version) {
+    // next shares the same typing imports as react
+    (0, react_1.generateRouterTypingImports)(sourceFile, version);
+}
+function generateProcedureTyping(writer, opType, modelName, baseOpType, version) {
+    // next shares the same procedure typing as react
+    (0, react_1.generateProcedureTyping)(writer, opType, modelName, baseOpType, version);
+}
+//# sourceMappingURL=next.js.map

package/client-helper/next.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"next.js","sourceRoot":"","sources":["../../src/client-helper/next.ts"],"names":[],"mappings":";;AAMA,kEAGC;AAED,0DASC;AAnBD,mCAGiB;AAEjB,SAAgB,2BAA2B,CAAC,UAAsB,EAAE,OAAe;IAC/E,+CAA+C;IAC/C,IAAA,mCAAmC,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,uBAAuB,CACnC,MAAuB,EACvB,MAAc,EACd,SAAiB,EACjB,UAAkB,EAClB,OAAe;IAEf,iDAAiD;IACjD,IAAA,+BAA+B,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACpF,CAAC"}

package/client-helper/nuxt.d.ts

@@ -0,0 +1,3 @@
+import { CodeBlockWriter, SourceFile } from 'ts-morph';
+export declare function generateRouterTypingImports(sourceFile: SourceFile, version: string): void;
+export declare function generateProcedureTyping(writer: CodeBlockWriter, opType: string, modelName: string, baseOpType: string, _version: string): void;

package/client-helper/nuxt.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateRouterTypingImports = generateRouterTypingImports;
+exports.generateProcedureTyping = generateProcedureTyping;
+const utils_1 = require("../utils");
+const _1 = require(".");
+function generateRouterTypingImports(sourceFile, version) {
+    sourceFile.addStatements([
+        `import type { MaybeRefOrGetter, UnwrapRef } from 'vue';`,
+        `import type { AsyncData, AsyncDataOptions } from 'nuxt/app';`,
+        `import type { KeysOf, PickFrom } from './utils';`,
+    ]);
+    if (version === 'v10') {
+        sourceFile.addStatements([`import type { AnyRouter } from '@trpc/server';`]);
+    }
+    else {
+        sourceFile.addStatements([`import type { AnyTRPCRouter as AnyRouter } from '@trpc/server';`]);
+    }
+}
+function generateProcedureTyping(writer, opType, modelName, baseOpType, _version) {
+    const procType = (0, utils_1.getProcedureTypeByOpName)(baseOpType);
+    const { genericBase, argsType, argsOptional, resultType } = (0, _1.getPrismaOperationTypes)(modelName, opType);
+    const errorType = `TRPCClientErrorLike<AppRouter>`;
+    const inputOptional = argsOptional ? '?' : '';
+    writer.block(() => {
+        if (procType === 'query') {
+            writer.writeLine(`
+                query: <T extends ${genericBase}>(input${inputOptional}: ${argsType}) => Promise<${resultType}>;
+                useQuery: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(input${inputOptional}: MaybeRefOrGetter<${argsType}>, opts?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'watch'> & {
+                    trpc?: TRPCRequestOptions;
+                    queryKey?: string;
+                    watch?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>['watch'] | false;
+                }) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, DataE>;
+                useLazyQuery: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(input${inputOptional}: MaybeRefOrGetter<${argsType}>, opts?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy' | 'watch'> & {
+                    trpc?: TRPCRequestOptions;
+                    queryKey?: string;
+                    watch?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>['watch'] | false;
+                }) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, DataE>;
+                `);
+        }
+        else if (procType === 'mutation') {
+            writer.writeLine(`
+                mutate: <T extends ${genericBase}>(input${inputOptional}: ${argsType}) => Promise<${resultType}>;
+                useMutation: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>, DefaultT = null>(opts?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy'> & {
+                    trpc?: TRPCRequestOptions;
+                }) => AsyncData<PickFrom<DataT, PickKeys> | DefaultT, DataE> & {
+                    mutate: <T extends ${genericBase}, ResT = ${resultType}, DataE = ${errorType}, DataT = ResT, PickKeys extends KeysOf<DataT> = KeysOf<DataT>>(input${inputOptional}: ${argsType}) => Promise<UnwrapRef<AsyncData<PickFrom<DataT, PickKeys> | null, DataE>['data']>>;
+                };
+                `);
+        }
+    });
+}
+//# sourceMappingURL=nuxt.js.map

package/client-helper/nuxt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nuxt.js","sourceRoot":"","sources":["../../src/client-helper/nuxt.ts"],"names":[],"mappings":";;AAIA,kEAYC;AAED,0DAsCC;AAvDD,oCAAoD;AACpD,wBAA4C;AAE5C,SAAgB,2BAA2B,CAAC,UAAsB,EAAE,OAAe;IAC/E,UAAU,CAAC,aAAa,CAAC;QACrB,yDAAyD;QACzD,8DAA8D;QAC9D,kDAAkD;KACrD,CAAC,CAAC;IAEH,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACpB,UAAU,CAAC,aAAa,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACJ,UAAU,CAAC,aAAa,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAC;IAClG,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CACnC,MAAuB,EACvB,MAAc,EACd,SAAiB,EACjB,UAAkB,EAClB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,gCAAwB,EAAC,UAAU,CAAC,CAAC;IACtD,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAuB,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvG,MAAM,SAAS,GAAG,gCAAgC,CAAC;IACnD,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QACd,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACvB,MAAM,CAAC,SAAS,CAAC;oCACO,WAAW,UAAU,aAAa,KAAK,QAAQ,gBAAgB,UAAU;uCACtE,WAAW,YAAY,UAAU,aAAa,SAAS,yFAAyF,aAAa,sBAAsB,QAAQ;;;;;2CAKvL,WAAW,YAAY,UAAU,aAAa,SAAS,yFAAyF,aAAa,sBAAsB,QAAQ;;;;;iBAKrN,CAAC,CAAC;QACX,CAAC;aAAM,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,CAAC,SAAS,CAAC;qCACQ,WAAW,UAAU,aAAa,KAAK,QAAQ,gBAAgB,UAAU;0CACpE,WAAW,YAAY,UAAU,aAAa,SAAS;;;yCAGxD,WAAW,YAAY,UAAU,aAAa,SAAS,wEAAwE,aAAa,KAAK,QAAQ;;iBAEjL,CAAC,CAAC;QACX,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/client-helper/react.d.ts

@@ -0,0 +1,3 @@
+import { CodeBlockWriter, SourceFile } from 'ts-morph';
+export declare function generateRouterTypingImports(sourceFile: SourceFile, version: string): void;
+export declare function generateProcedureTyping(writer: CodeBlockWriter, opType: string, modelName: string, baseOpType: string, version: string): void;

package/client-helper/react.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateRouterTypingImports = generateRouterTypingImports;
+exports.generateProcedureTyping = generateProcedureTyping;
+const utils_1 = require("../utils");
+const _1 = require(".");
+function generateRouterTypingImports(sourceFile, version) {
+    sourceFile.addStatements([
+        `import type { UseTRPCMutationOptions, UseTRPCMutationResult, UseTRPCQueryOptions, UseTRPCQueryResult, UseTRPCInfiniteQueryOptions, UseTRPCInfiniteQueryResult } from '@trpc/react-query/shared';`,
+    ]);
+    if (version === 'v10') {
+        sourceFile.addStatements([`import type { AnyRouter } from '@trpc/server';`]);
+    }
+    else {
+        sourceFile.addStatements([
+            `import type { AnyTRPCRouter as AnyRouter } from '@trpc/server';`,
+            `import type { UseTRPCSuspenseQueryOptions, UseTRPCSuspenseQueryResult, UseTRPCSuspenseInfiniteQueryOptions, UseTRPCSuspenseInfiniteQueryResult } from '@trpc/react-query/shared';`,
+        ]);
+    }
+}
+function generateProcedureTyping(writer, opType, modelName, baseOpType, version) {
+    const procType = (0, utils_1.getProcedureTypeByOpName)(baseOpType);
+    const { genericBase, argsType, argsOptional, resultType } = (0, _1.getPrismaOperationTypes)(modelName, opType);
+    const errorType = `TRPCClientErrorLike<AppRouter>`;
+    const inputOptional = argsOptional ? '?' : '';
+    writer.block(() => {
+        if (procType === 'query') {
+            if (version === 'v10') {
+                writer.writeLine(`
+                useQuery: <T extends ${genericBase}, TData = ${resultType}>(
+                    input${inputOptional}: ${argsType},
+                    opts?: UseTRPCQueryOptions<string, T, ${resultType}, TData, Error>
+                    ) => UseTRPCQueryResult<
+                        TData,
+                        ${errorType}
+                    >;
+                useInfiniteQuery: <T extends ${genericBase}>(
+                    input${inputOptional}: Omit<${argsType}, 'cursor'>,
+                    opts?: UseTRPCInfiniteQueryOptions<string, T, ${resultType}, Error>
+                    ) => UseTRPCInfiniteQueryResult<
+                        ${resultType},
+                        ${errorType}
+                    >;
+                `);
+            }
+            else {
+                writer.writeLine(`
+                useQuery: <T extends ${genericBase}, TData = ${resultType}>(
+                    input${inputOptional}: ${argsType},
+                    opts?: UseTRPCQueryOptions<${resultType}, TData, Error>
+                    ) => UseTRPCQueryResult<
+                        TData,
+                        ${errorType}
+                    >;
+                useInfiniteQuery: <T extends ${genericBase}>(
+                    input${inputOptional}: Omit<${argsType}, 'cursor'>,
+                    opts?: UseTRPCInfiniteQueryOptions<T, ${resultType}, Error>
+                    ) => UseTRPCInfiniteQueryResult<
+                        ${resultType},
+                        ${errorType},
+                        T
+                    >;
+                useSuspenseQuery: <T extends ${genericBase}, TData = ${resultType}>(
+                    input${inputOptional}: ${argsType},
+                    opts?: UseTRPCSuspenseQueryOptions<${resultType}, TData, Error>
+                    ) => UseTRPCSuspenseQueryResult<TData, ${errorType}>;
+                useSuspenseInfiniteQuery: <T extends ${genericBase}>(
+                    input${inputOptional}: Omit<${argsType}, 'cursor'>,
+                    opts?: UseTRPCSuspenseInfiniteQueryOptions<T, ${resultType}, Error>
+                    ) => UseTRPCSuspenseInfiniteQueryResult<${resultType}, ${errorType}, T>;
+                `);
+            }
+        }
+        else if (procType === 'mutation') {
+            writer.writeLine(`
+                useMutation: <T extends ${genericBase}>(opts?: UseTRPCMutationOptions<
+                    ${genericBase},
+                    ${errorType},
+                    ${resultType},
+                    Context
+                >) =>
+                Omit<UseTRPCMutationResult<${resultType}, ${errorType}, ${argsType}, Context>, 'mutateAsync'> & {
+                    mutateAsync:
+                        <T extends ${genericBase}>(variables${inputOptional}: T, opts?: UseTRPCMutationOptions<T, ${errorType}, ${resultType}, Context>) => Promise<${resultType}>
+                };
+                `);
+        }
+    });
+}
+//# sourceMappingURL=react.js.map

package/client-helper/react.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/client-helper/react.ts"],"names":[],"mappings":";;AAIA,kEAYC;AAED,0DAyEC;AA1FD,oCAAoD;AACpD,wBAA4C;AAE5C,SAAgB,2BAA2B,CAAC,UAAsB,EAAE,OAAe;IAC/E,UAAU,CAAC,aAAa,CAAC;QACrB,kMAAkM;KACrM,CAAC,CAAC;IACH,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACpB,UAAU,CAAC,aAAa,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACJ,UAAU,CAAC,aAAa,CAAC;YACrB,iEAAiE;YACjE,mLAAmL;SACtL,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CACnC,MAAuB,EACvB,MAAc,EACd,SAAiB,EACjB,UAAkB,EAClB,OAAe;IAEf,MAAM,QAAQ,GAAG,IAAA,gCAAwB,EAAC,UAAU,CAAC,CAAC;IACtD,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAA,0BAAuB,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvG,MAAM,SAAS,GAAG,gCAAgC,CAAC;IACnD,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QACd,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACvB,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;gBACpB,MAAM,CAAC,SAAS,CAAC;uCACM,WAAW,aAAa,UAAU;2BAC9C,aAAa,KAAK,QAAQ;4DACO,UAAU;;;0BAG5C,SAAS;;+CAEY,WAAW;2BAC/B,aAAa,UAAU,QAAQ;oEACU,UAAU;;0BAEpD,UAAU;0BACV,SAAS;;iBAElB,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,SAAS,CAAC;uCACM,WAAW,aAAa,UAAU;2BAC9C,aAAa,KAAK,QAAQ;iDACJ,UAAU;;;0BAGjC,SAAS;;+CAEY,WAAW;2BAC/B,aAAa,UAAU,QAAQ;4DACE,UAAU;;0BAE5C,UAAU;0BACV,SAAS;;;+CAGY,WAAW,aAAa,UAAU;2BACtD,aAAa,KAAK,QAAQ;yDACI,UAAU;6DACN,SAAS;uDACf,WAAW;2BACvC,aAAa,UAAU,QAAQ;oEACU,UAAU;8DAChB,UAAU,KAAK,SAAS;iBACrE,CAAC,CAAC;YACP,CAAC;QACL,CAAC;aAAM,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,CAAC,SAAS,CAAC;0CACa,WAAW;sBAC/B,WAAW;sBACX,SAAS;sBACT,UAAU;;;6CAGa,UAAU,KAAK,SAAS,KAAK,QAAQ;;qCAE7C,WAAW,cAAc,aAAa,yCAAyC,SAAS,KAAK,UAAU,0BAA0B,UAAU;;iBAE/J,CAAC,CAAC;QACX,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/generator.js

@@ -27,14 +27,13 @@ exports.generate = generate;
 const sdk_1 = require("@zenstackhq/sdk");
 const ast_1 = require("@zenstackhq/sdk/ast");
 const prisma_1 = require("@zenstackhq/sdk/prisma");
-const fs_1 = __importDefault(require("fs"));
 const lower_case_first_1 = require("lower-case-first");
 const path_1 = __importDefault(require("path"));
-const ts_morph_1 = require("ts-morph");
 const upper_case_first_1 = require("upper-case-first");
 const _1 = require(".");
-const helpers_1 = require("./helpers");
+const client_helper_1 = require("./client-helper");
 const project_1 = require("./project");
+const utils_1 = require("./utils");
 function generate(model, options, dmmf) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -44,8 +43,9 @@ function generate(model, options, dmmf) {
         const generateModelActions = (0, sdk_1.parseOptionAsStrings)(options, 'generateModelActions', _1.name);
         // resolve "generateClientHelpers" option
         const generateClientHelpers = (0, sdk_1.parseOptionAsStrings)(options, 'generateClientHelpers', _1.name);
-        if (generateClientHelpers && !generateClientHelpers.every((v) => ['react', 'next'].includes(v))) {
-            throw new sdk_1.PluginError(_1.name, `Option "generateClientHelpers" only support values "react" and "next"`);
+        if (generateClientHelpers &&
+            !generateClientHelpers.every((v) => utils_1.AllSupportedClientHelpers.includes(v))) {
+            throw new sdk_1.PluginError(_1.name, `Option "generateClientHelpers" only supports the following values: ${utils_1.AllSupportedClientHelpers.map((n) => '"' + n + '"').join(', ')}.`);
         }
         if (options.zodSchemasImport && typeof options.zodSchemasImport !== 'string') {
             throw new sdk_1.PluginError(_1.name, `Option "zodSchemasImport" must be a string`);
@@ -76,7 +76,7 @@ function generate(model, options, dmmf) {
         // TODO: remove this legacy code that deals with "@Gen.hide" comment syntax inherited
         // from original code
         const hiddenModels = [];
-        (0, helpers_1.resolveModelsComments)(prismaClientDmmf.datamodel.models, hiddenModels);
+        (0, utils_1.resolveModelsComments)(prismaClientDmmf.datamodel.models, hiddenModels);
         const zodSchemasImport = (_a = options.zodSchemasImport) !== null && _a !== void 0 ? _a : '@zenstackhq/runtime/zod';
         createAppRouter(outDir, modelOperations, hiddenModels, generateModelActions, generateClientHelpers, model, zodSchemasImport, options, version);
         createHelper(outDir);
@@ -191,47 +191,10 @@ function createAppRouter(outDir, modelOperations, hiddenModels, generateModelAct
         writer.write(');');
     });
     if (generateClientHelpers) {
-        appRouter.addInterface({
-            name: 'ClientType',
-            typeParameters: ['AppRouter extends AnyRouter'],
-            isExported: true,
-            properties: filteredModelOperations.map(({ model }) => {
-                appRouter.addImportDeclaration({
-                    namedImports: [{ name: 'ClientType', alias: `${(0, upper_case_first_1.upperCaseFirst)(model)}ClientType` }],
-                    moduleSpecifier: `./${model}.router`,
-                });
-                return {
-                    name: (0, lower_case_first_1.lowerCaseFirst)(model),
-                    type: `${(0, upper_case_first_1.upperCaseFirst)(model)}ClientType<AppRouter>`,
-                };
-            }),
-        });
-        createClientHelpers(outDir, generateClientHelpers, version);
+        (0, client_helper_1.createClientHelperEntries)(project_1.project, outDir, generateClientHelpers, filteredModelOperations.map(({ model }) => model), version);
     }
     appRouter.formatText();
 }
-function createClientHelpers(outputDir, generateClientHelpers, version) {
-    const utils = project_1.project.createSourceFile(path_1.default.resolve(outputDir, 'client', `utils.ts`), undefined, {
-        overwrite: true,
-    });
-    utils.replaceWithText(fs_1.default.readFileSync(path_1.default.join(__dirname, `./res/client/${version}/utils.ts`), 'utf-8'));
-    for (const client of generateClientHelpers) {
-        switch (client) {
-            case 'react': {
-                const content = fs_1.default.readFileSync(path_1.default.join(__dirname, `./res/client/${version}/react.ts`), 'utf-8');
-                project_1.project.createSourceFile(path_1.default.resolve(outputDir, 'client', 'react.ts'), content, {
-                    overwrite: true,
-                });
-                break;
-            }
-            case 'next': {
-                const content = fs_1.default.readFileSync(path_1.default.join(__dirname, `./res/client/${version}/next.ts`), 'utf-8');
-                project_1.project.createSourceFile(path_1.default.resolve(outputDir, 'client', 'next.ts'), content, { overwrite: true });
-                break;
-            }
-        }
-    }
-}
 function generateModelCreateRouter(project, model, operations, outputDir, generateModelActions, generateClientHelpers, zodSchemasImport, options, zmodel, version) {
     const modelRouter = project.createSourceFile(path_1.default.resolve(outputDir, 'routers', `${model}.router.ts`), undefined, {
         overwrite: true,
@@ -266,13 +229,9 @@ function generateModelCreateRouter(project, model, operations, outputDir, genera
         ]);
     }
     // zod schema import
-    (0, helpers_1.generateRouterSchemaImport)(modelRouter, zodSchemasImport);
+    (0, utils_1.generateRouterSchemaImport)(modelRouter, zodSchemasImport);
     // runtime helpers
-    (0, helpers_1.generateHelperImport)(modelRouter);
-    // client helper imports
-    if (generateClientHelpers) {
-        (0, helpers_1.generateRouterTypingImports)(modelRouter, options, version);
-    }
+    (0, utils_1.generateHelperImport)(modelRouter);
     const createRouterFunc = version === 'v10'
         ? modelRouter.addFunction({
             name: 'createRouter<Config extends BaseConfig>',
@@ -288,33 +247,21 @@ function generateModelCreateRouter(project, model, operations, outputDir, genera
             isExported: true,
             isDefaultExport: true,
         });
-    let routerTypingStructure = undefined;
-    if (generateClientHelpers) {
-        // generate an interface for precise Prisma-like typing for the router procedures
-        // which will be used to correct tRPC's typing on the client side
-        routerTypingStructure = {
-            kind: ts_morph_1.StructureKind.Interface,
-            name: 'ClientType',
-            isExported: true,
-            typeParameters: ['AppRouter extends AnyRouter', `Context = AppRouter['_def']['_config']['$types']['ctx']`],
-            properties: [],
-        };
-    }
     const dataModel = zmodel.declarations.find((d) => (0, ast_1.isDataModel)(d) && d.name === model);
     if (!dataModel) {
         throw new Error(`Data model "${model}" not found`);
     }
+    const generateOperations = [];
     createRouterFunc.setBodyText((funcWriter) => {
         funcWriter.write(`return ${version === 'v10' ? 'router' : 'createTRPCRouter'}(`);
         funcWriter.block(() => {
-            var _a;
             for (const [opType, opNameWithModel] of Object.entries(operations)) {
                 if ((0, sdk_1.isDelegateModel)(dataModel) && (opType.startsWith('create') || opType.startsWith('upsert'))) {
                     // delete models don't support create or upsert operations
                     continue;
                 }
                 const baseOpType = opType.replace('OrThrow', '');
-                const inputType = (0, helpers_1.getInputSchemaByOpName)(baseOpType, model);
+                const inputType = (0, utils_1.getInputSchemaByOpName)(baseOpType, model);
                 const generateOpName = opType.replace(/One$/, '');
                 if (opNameWithModel &&
                     inputType &&
@@ -322,23 +269,15 @@ function generateModelCreateRouter(project, model, operations, outputDir, genera
                     if (generateOpName === 'createMany' && !(0, prisma_1.supportCreateMany)(zmodel)) {
                         continue;
                     }
-                    (0, helpers_1.generateProcedure)(funcWriter, generateOpName, (0, upper_case_first_1.upperCaseFirst)(inputType), model, baseOpType);
-                    if (routerTypingStructure) {
-                        (_a = routerTypingStructure.properties) === null || _a === void 0 ? void 0 : _a.push({
-                            kind: ts_morph_1.StructureKind.PropertySignature,
-                            name: generateOpName,
-                            type: (writer) => {
-                                (0, helpers_1.generateRouterTyping)(writer, generateOpName, model, baseOpType, version);
-                            },
-                        });
-                    }
+                    (0, utils_1.generateProcedure)(funcWriter, generateOpName, (0, upper_case_first_1.upperCaseFirst)(inputType), model, baseOpType);
+                    generateOperations.push({ name: generateOpName, baseType: baseOpType });
                 }
             }
         });
         funcWriter.write(');');
     });
-    if (routerTypingStructure) {
-        modelRouter.addInterface(routerTypingStructure);
+    if (generateClientHelpers) {
+        (0, client_helper_1.generateClientTypingForModel)(project, generateClientHelpers, model, options, generateOperations, version, outputDir);
     }
     modelRouter.formatText();
 }