@zenstackhq/trpc 0.6.0-pre.19 → 1.0.0-alpha.101

package/README.md

@@ -1,3 +1,5 @@
 # ZenStack tRPC plugin
 
-This package contains ZenStack plugin for tRPC. It's based on [prisma-trpc-generator](https://github.com/omar-dulaimi/prisma-trpc-generator).
+This package contains ZenStack plugin for tRPC. The implementation is based on [prisma-trpc-generator](https://github.com/omar-dulaimi/prisma-trpc-generator).
+
+Visit [Homepage](https://zenstack.dev) for more details.

package/generator.js

@@ -24,46 +24,62 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
+const sdk_1 = require("@zenstackhq/sdk");
+const change_case_1 = require("change-case");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const generator_1 = require("./zod/generator");
 const helpers_1 = require("./helpers");
 const project_1 = require("./project");
 const removeDir_1 = __importDefault(require("./utils/removeDir"));
-const change_case_1 = require("change-case");
+const generator_1 = require("./zod/generator");
 function generate(model, options, dmmf) {
     return __awaiter(this, void 0, void 0, function* () {
-        const outputDir = options.output;
-        yield fs_1.promises.mkdir(outputDir, { recursive: true });
-        yield (0, removeDir_1.default)(outputDir, true);
+        let outDir = options.output;
+        if (!outDir) {
+            throw new sdk_1.PluginError('"output" option is required');
+        }
+        if (!path_1.default.isAbsolute(outDir)) {
+            // output dir is resolved relative to the schema file path
+            outDir = path_1.default.join(path_1.default.dirname(options.schemaPath), outDir);
+        }
+        yield fs_1.promises.mkdir(outDir, { recursive: true });
+        yield (0, removeDir_1.default)(outDir, true);
         yield (0, generator_1.generate)(model, options, dmmf);
         const prismaClientDmmf = dmmf;
         const modelOperations = prismaClientDmmf.mappings.modelOperations;
         const models = prismaClientDmmf.datamodel.models;
         const hiddenModels = [];
         (0, helpers_1.resolveModelsComments)(models, hiddenModels);
-        const appRouter = project_1.project.createSourceFile(path_1.default.resolve(outputDir, 'routers', `index.ts`), undefined, {
-            overwrite: true,
-        });
-        appRouter.addImportDeclarations([
-            {
-                namedImports: ['AnyRootConfig'],
-                moduleSpecifier: '@trpc/server',
-            },
-            {
-                namedImports: ['PrismaClient'],
-                moduleSpecifier: '@prisma/client',
-            },
-            {
-                namedImports: ['createRouterFactory'],
-                moduleSpecifier: '@trpc/server/dist/core/router',
-            },
-            {
-                namedImports: ['createBuilder'],
-                moduleSpecifier: '@trpc/server/dist/core/internals/procedureBuilder',
-            },
-        ]);
-        appRouter.addStatements(`
+        createAppRouter(outDir, modelOperations, hiddenModels);
+        createHelper(outDir);
+        yield project_1.project.save();
+    });
+}
+exports.generate = generate;
+function createAppRouter(outDir, modelOperations, hiddenModels) {
+    const appRouter = project_1.project.createSourceFile(path_1.default.resolve(outDir, 'routers', `index.ts`), undefined, {
+        overwrite: true,
+    });
+    appRouter.addStatements('/* eslint-disable */');
+    appRouter.addImportDeclarations([
+        {
+            namedImports: ['AnyRootConfig'],
+            moduleSpecifier: '@trpc/server',
+        },
+        {
+            namedImports: ['PrismaClient'],
+            moduleSpecifier: '@prisma/client',
+        },
+        {
+            namedImports: ['createRouterFactory'],
+            moduleSpecifier: '@trpc/server/dist/core/router',
+        },
+        {
+            namedImports: ['createBuilder'],
+            moduleSpecifier: '@trpc/server/dist/core/internals/procedureBuilder',
+        },
+    ]);
+    appRouter.addStatements(`
         export type BaseConfig = AnyRootConfig;
 
         export type RouterFactory<Config extends BaseConfig> = ReturnType<
@@ -82,41 +98,39 @@ function generate(model, options, dmmf) {
         }
         
     `);
-        const createFunction = appRouter.addFunction({
-            name: 'createRouter<Config extends BaseConfig>',
-            parameters: [
-                { name: 'router', type: 'RouterFactory<Config>' },
-                { name: 'procedure', type: 'ProcBuilder<Config>' },
-            ],
-            isExported: true,
-        });
-        createFunction.setBodyText((writer) => {
-            writer.write('return router(');
-            writer.block(() => {
-                for (const modelOperation of modelOperations) {
-                    const { model } = modelOperation, operations = __rest(modelOperation, ["model"]);
-                    if (hiddenModels.includes(model)) {
-                        continue;
-                    }
-                    generateModelCreateRouter(project_1.project, model, operations, outputDir);
-                    appRouter.addImportDeclaration({
-                        defaultImport: `create${model}Router`,
-                        moduleSpecifier: `./${model}.router`,
-                    });
-                    writer.writeLine(`${(0, change_case_1.camelCase)(model)}: create${model}Router<Config>(router, procedure),`);
+    const createFunction = appRouter.addFunction({
+        name: 'createRouter<Config extends BaseConfig>',
+        parameters: [
+            { name: 'router', type: 'RouterFactory<Config>' },
+            { name: 'procedure', type: 'ProcBuilder<Config>' },
+        ],
+        isExported: true,
+    });
+    createFunction.setBodyText((writer) => {
+        writer.write('return router(');
+        writer.block(() => {
+            for (const modelOperation of modelOperations) {
+                const { model } = modelOperation, operations = __rest(modelOperation, ["model"]);
+                if (hiddenModels.includes(model)) {
+                    continue;
                 }
-            });
-            writer.write(');');
+                generateModelCreateRouter(project_1.project, model, operations, outDir);
+                appRouter.addImportDeclaration({
+                    defaultImport: `create${model}Router`,
+                    moduleSpecifier: `./${model}.router`,
+                });
+                writer.writeLine(`${(0, change_case_1.camelCase)(model)}: create${model}Router<Config>(router, procedure),`);
+            }
         });
-        appRouter.formatText();
-        yield project_1.project.save();
+        writer.write(');');
     });
+    appRouter.formatText();
 }
-exports.generate = generate;
 function generateModelCreateRouter(project, model, operations, outputDir) {
     const modelRouter = project.createSourceFile(path_1.default.resolve(outputDir, 'routers', `${model}.router.ts`), undefined, {
         overwrite: true,
     });
+    modelRouter.addStatements('/* eslint-disable */');
     modelRouter.addImportDeclarations([
         {
             namedImports: ['type RouterFactory', 'type ProcBuilder', 'type BaseConfig', 'db'],
@@ -124,6 +138,7 @@ function generateModelCreateRouter(project, model, operations, outputDir) {
         },
     ]);
     (0, helpers_1.generateRouterSchemaImports)(modelRouter, model);
+    (0, helpers_1.generateHelperImport)(modelRouter);
     modelRouter
         .addFunction({
         name: 'createRouter<Config extends BaseConfig>',
@@ -149,4 +164,99 @@ function generateModelCreateRouter(project, model, operations, outputDir) {
     });
     modelRouter.formatText();
 }
+function createHelper(outDir) {
+    const sf = project_1.project.createSourceFile(path_1.default.resolve(outDir, 'helper.ts'), undefined, {
+        overwrite: true,
+    });
+    sf.addStatements(`import { TRPCError } from '@trpc/server';`);
+    sf.addStatements(`import { isPrismaClientKnownRequestError } from '${sdk_1.RUNTIME_PACKAGE}';`);
+    const checkMutate = sf.addFunction({
+        name: 'checkMutate',
+        typeParameters: [{ name: 'T' }],
+        parameters: [
+            {
+                name: 'promise',
+                type: 'Promise<T>',
+            },
+        ],
+        isAsync: true,
+        isExported: true,
+        returnType: 'Promise<T | undefined>',
+    });
+    checkMutate.setBodyText(`try {
+            return await promise;
+        } catch (err: any) {
+            if (isPrismaClientKnownRequestError(err)) {
+                if (err.code === 'P2004') {
+                    if (err.meta?.reason === '${sdk_1.CrudFailureReason.RESULT_NOT_READABLE}') {
+                        // unable to readback data
+                        return undefined;
+                    } else {
+                        // rejected by policy
+                        throw new TRPCError({
+                            code: 'FORBIDDEN',
+                            message: err.message,
+                            cause: err,
+                        });
+                    }
+                } else {
+                    // request error
+                    throw new TRPCError({
+                        code: 'BAD_REQUEST',
+                        message: err.message,
+                        cause: err,
+                    });
+                }
+            } else {
+                throw err;
+            }
+        }
+    `);
+    checkMutate.formatText();
+    const checkRead = sf.addFunction({
+        name: 'checkRead',
+        typeParameters: [{ name: 'T' }],
+        parameters: [
+            {
+                name: 'promise',
+                type: 'Promise<T>',
+            },
+        ],
+        isAsync: true,
+        isExported: true,
+        returnType: 'Promise<T>',
+    });
+    checkRead.setBodyText(`try {
+            return await promise;
+        } catch (err: any) {
+            if (isPrismaClientKnownRequestError(err)) {
+                if (err.code === 'P2004') {
+                    // rejected by policy
+                    throw new TRPCError({
+                        code: 'FORBIDDEN',
+                        message: err.message,
+                        cause: err,
+                    });
+                } else if (err.code === 'P2025') {
+                    // not found
+                    throw new TRPCError({
+                        code: 'NOT_FOUND',
+                        message: err.message,
+                        cause: err,
+                    });
+                } else {
+                    // request error
+                    throw new TRPCError({
+                        code: 'BAD_REQUEST',
+                        message: err.message,
+                        cause: err,
+                    })
+                }
+            } else {
+                throw err;
+            }
+        }
+    `);
+    checkRead.formatText();
+}
 //# sourceMappingURL=generator.js.map

package/generator.js.map

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

package/helpers.d.ts

@@ -1,9 +1,8 @@
 import { DMMF } from '@prisma/generator-helper';
 import { CodeBlockWriter, SourceFile } from 'ts-morph';
-export declare const generatetRPCImport: (sourceFile: SourceFile) => void;
-export declare const generateRouterImport: (sourceFile: SourceFile, modelNamePlural: string, modelNameCamelCase: string) => void;
 export declare function generateProcedure(writer: CodeBlockWriter, opType: string, typeName: string, modelName: string, baseOpType: string): void;
 export declare function generateRouterSchemaImports(sourceFile: SourceFile, name: string): void;
+export declare function generateHelperImport(sourceFile: SourceFile): void;
 export declare const getInputTypeByOpName: (opName: string, modelName: string) => string | undefined;
 export declare const getProcedureTypeByOpName: (opName: string) => string | undefined;
 export declare function resolveModelsComments(models: DMMF.Model[], hiddenModels: string[]): void;

package/helpers.js

@@ -1,32 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveModelsComments = exports.getProcedureTypeByOpName = exports.getInputTypeByOpName = exports.generateRouterSchemaImports = exports.generateProcedure = exports.generateRouterImport = exports.generatetRPCImport = void 0;
+exports.resolveModelsComments = exports.getProcedureTypeByOpName = exports.getInputTypeByOpName = exports.generateHelperImport = exports.generateRouterSchemaImports = exports.generateProcedure = void 0;
 const uncapitalizeFirstLetter_1 = require("./utils/uncapitalizeFirstLetter");
-const generatetRPCImport = (sourceFile) => {
-    sourceFile.addImportDeclaration({
-        moduleSpecifier: '@trpc/server',
-        namespaceImport: 'trpc',
-    });
-};
-exports.generatetRPCImport = generatetRPCImport;
-const generateRouterImport = (sourceFile, modelNamePlural, modelNameCamelCase) => {
-    sourceFile.addImportDeclaration({
-        moduleSpecifier: `./${modelNameCamelCase}.router`,
-        namedImports: [`${modelNamePlural}Router`],
-    });
-};
-exports.generateRouterImport = generateRouterImport;
 function generateProcedure(writer, opType, typeName, modelName, baseOpType) {
     const procType = (0, exports.getProcedureTypeByOpName)(baseOpType);
-    writer.write(`
-        ${opType}: procedure.input(${typeName}).${procType}(({ctx, input}) => db(ctx).${(0, uncapitalizeFirstLetter_1.uncapitalizeFirstLetter)(modelName)}.${opType.replace('One', '')}(input)),
+    const prismaMethod = opType.replace('One', '');
+    if (procType === 'query') {
+        writer.write(`
+        ${opType}: procedure.input(${typeName}).query(({ctx, input}) => checkRead(db(ctx).${(0, uncapitalizeFirstLetter_1.uncapitalizeFirstLetter)(modelName)}.${prismaMethod}(input))),
+    `);
+    }
+    else if (procType === 'mutation') {
+        writer.write(`
+        ${opType}: procedure.input(${typeName}).mutation(async ({ctx, input}) => checkMutate(db(ctx).${(0, uncapitalizeFirstLetter_1.uncapitalizeFirstLetter)(modelName)}.${prismaMethod}(input))),
     `);
+    }
 }
 exports.generateProcedure = generateProcedure;
 function generateRouterSchemaImports(sourceFile, name) {
     sourceFile.addStatements(`import { ${name}Schema } from '../schemas/${name}.schema';`);
 }
 exports.generateRouterSchemaImports = generateRouterSchemaImports;
+function generateHelperImport(sourceFile) {
+    sourceFile.addStatements(`import { checkRead, checkMutate } from '../helper';`);
+}
+exports.generateHelperImport = generateHelperImport;
 const getInputTypeByOpName = (opName, modelName) => {
     let inputType;
     switch (opName) {

package/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAEA,6EAA0E;AAEnE,MAAM,kBAAkB,GAAG,CAAC,UAAsB,EAAE,EAAE;IACzD,UAAU,CAAC,oBAAoB,CAAC;QAC5B,eAAe,EAAE,cAAc;QAC/B,eAAe,EAAE,MAAM;KAC1B,CAAC,CAAC;AACP,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,oBAAoB,GAAG,CAAC,UAAsB,EAAE,eAAuB,EAAE,kBAA0B,EAAE,EAAE;IAChH,UAAU,CAAC,oBAAoB,CAAC;QAC5B,eAAe,EAAE,KAAK,kBAAkB,SAAS;QACjD,YAAY,EAAE,CAAC,GAAG,eAAe,QAAQ,CAAC;KAC7C,CAAC,CAAC;AACP,CAAC,CAAC;AALW,QAAA,oBAAoB,wBAK/B;AAEF,SAAgB,iBAAiB,CAC7B,MAAuB,EACvB,MAAc,EACd,QAAgB,EAChB,SAAiB,EACjB,UAAkB;IAElB,MAAM,QAAQ,GAAG,IAAA,gCAAwB,EAAC,UAAU,CAAC,CAAC;IACtD,MAAM,CAAC,KAAK,CAAC;UACP,MAAM,qBAAqB,QAAQ,KAAK,QAAQ,8BAA8B,IAAA,iDAAuB,EACvG,SAAS,CACZ,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KAC7B,CAAC,CAAC;AACP,CAAC;AAbD,8CAaC;AAED,SAAgB,2BAA2B,CAAC,UAAsB,EAAE,IAAY;IAC5E,UAAU,CAAC,aAAa,CAAC,YAAY,IAAI,6BAA6B,IAAI,WAAW,CAAC,CAAC;AAC3F,CAAC;AAFD,kEAEC;AAEM,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAE,EAAE;IACtE,IAAI,SAAS,CAAC;IACd,QAAQ,MAAM,EAAE;QACZ,KAAK,YAAY;YACb,SAAS,GAAG,GAAG,SAAS,mBAAmB,CAAC;YAC5C,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,kBAAkB,CAAC;YAC3C,MAAM;QACV,KAAK,UAAU;YACX,SAAS,GAAG,GAAG,SAAS,iBAAiB,CAAC;YAC1C,MAAM;QACV,KAAK,SAAS;YACV,SAAS,GAAG,GAAG,SAAS,sBAAsB,CAAC;YAC/C,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,eAAe,CAAC;YACxC,MAAM;QACV,KAAK,YAAY;YACb,SAAS,GAAG,GAAG,SAAS,mBAAmB,CAAC;YAC5C,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,eAAe,CAAC;YACxC,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,eAAe,CAAC;YACxC,MAAM;QACV,KAAK,YAAY;YACb,SAAS,GAAG,GAAG,SAAS,mBAAmB,CAAC;YAC5C,MAAM;QACV,KAAK,YAAY;YACb,SAAS,GAAG,GAAG,SAAS,mBAAmB,CAAC;YAC5C,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,eAAe,CAAC;YACxC,MAAM;QACV,KAAK,WAAW;YACZ,SAAS,GAAG,GAAG,SAAS,kBAAkB,CAAC;YAC3C,MAAM;QACV,KAAK,cAAc;YACf,SAAS,GAAG,GAAG,SAAS,2BAA2B,CAAC;YACpD,MAAM;QACV,KAAK,SAAS;YACV,SAAS,GAAG,GAAG,SAAS,gBAAgB,CAAC;YACzC,MAAM;QACV;YACI,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;KACpE;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAjDW,QAAA,oBAAoB,wBAiD/B;AAEK,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,EAAE;IACvD,IAAI,QAAQ,CAAC;IACb,QAAQ,MAAM,EAAE;QACZ,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,cAAc,CAAC;QACpB,KAAK,SAAS;YACV,QAAQ,GAAG,OAAO,CAAC;YACnB,MAAM;QACV,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC;QAClB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW;YACZ,QAAQ,GAAG,UAAU,CAAC;YACtB,MAAM;QACV;YACI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;KAC7D;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAzBW,QAAA,wBAAwB,4BAyBnC;AAEF,SAAgB,qBAAqB,CAAC,MAAoB,EAAE,YAAsB;;IAC9E,MAAM,mBAAmB,GAAG,mCAAmC,CAAC;IAChE,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;IACvD,MAAM,kBAAkB,GAAG,kCAAkC,CAAC;IAE9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QACxB,IAAI,KAAK,CAAC,aAAa,EAAE;YACrB,MAAM,SAAS,GAAG,MAAA,MAAA,KAAK,CAAC,aAAa,0CAAE,KAAK,CAAC,mBAAmB,CAAC,0CAAG,CAAC,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,kBAAkB,CAAC,0CAAG,CAAC,CAAC,0CAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9E,IAAI,aAAa,KAAK,OAAO;gBAAE,SAAS;YACxC,MAAM,gBAAgB,GAAG,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,kBAAkB,CAAC,0CAAG,CAAC,CAAC,0CAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAEjF,MAAM,mBAAmB,GAA4B,EAAE,CAAC;YACxD,IAAI,gBAAgB,EAAE;gBAClB,MAAM,qBAAqB,GAAG,gBAAgB;qBACzC,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;qBACtB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC9D,IAAI,EAAE;qBACN,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;oBACtD,MAAM,GAAG,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;oBACrC,MAAM,KAAK,GAAG,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC3C,mBAAmB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBAChD;aACJ;YACD,IAAI,mBAAmB,CAAC,IAAI,EAAE;gBAC1B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACjC;SACJ;KACJ;AACL,CAAC;AAhCD,sDAgCC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/trpc",
   "displayName": "ZenStack plugin for tRPC",
-  "version": "0.6.0-pre.19",
+  "version": "1.0.0-alpha.101",
   "description": "ZenStack plugin for tRPC",
   "main": "index.js",
   "repository": {
@@ -19,17 +19,25 @@
     "@prisma/generator-helper": "^4.7.1",
     "@prisma/internals": "^4.7.1",
     "change-case": "^4.1.2",
+    "prettier": "^2.8.3",
     "ts-morph": "^16.0.0",
+    "tslib": "^2.4.1",
     "zod": "^3.19.1",
-    "@zenstackhq/sdk": "0.6.0-pre.19"
+    "@zenstackhq/sdk": "1.0.0-alpha.101"
   },
   "devDependencies": {
+    "@types/jest": "^29.5.0",
+    "@types/prettier": "^2.7.2",
+    "copyfiles": "^2.4.1",
+    "jest": "^29.5.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.9.4"
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.9.4",
+    "@zenstackhq/testtools": "1.0.0-alpha.101"
   },
   "scripts": {
     "clean": "rimraf dist",
-    "build": "pnpm lint && pnpm clean && tsc && cp ./package.json ./README.md ../../../LICENSE dist/",
+    "build": "pnpm lint && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE dist",
     "watch": "tsc --watch",
     "lint": "eslint src --ext ts",
     "publish-dev": "pnpm publish --tag dev"

package/zod/generator.js

@@ -15,9 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const sdk_1 = require("@zenstackhq/sdk");
 const ast_1 = require("@zenstackhq/sdk/ast");
+const dmmf_helpers_1 = require("@zenstackhq/sdk/dmmf-helpers");
 const fs_1 = require("fs");
-const helpers_1 = require("./helpers");
-const aggregate_helpers_1 = require("./helpers/aggregate-helpers");
 const transformer_1 = __importDefault(require("./transformer"));
 const removeDir_1 = __importDefault(require("./utils/removeDir"));
 function generate(model, options, dmmf) {
@@ -28,21 +27,15 @@ function generate(model, options, dmmf) {
         const modelOperations = prismaClientDmmf.mappings.modelOperations;
         const inputObjectTypes = prismaClientDmmf.schema.inputObjectTypes.prisma;
         const outputObjectTypes = prismaClientDmmf.schema.outputObjectTypes.prisma;
-        const enumTypes = prismaClientDmmf.schema.enumTypes;
         const models = prismaClientDmmf.datamodel.models;
-        const hiddenModels = [];
-        const hiddenFields = [];
-        (0, helpers_1.resolveModelsComments)(models, modelOperations, enumTypes, hiddenModels, hiddenFields);
         yield generateEnumSchemas(prismaClientDmmf.schema.enumTypes.prisma, (_b = prismaClientDmmf.schema.enumTypes.model) !== null && _b !== void 0 ? _b : []);
         const dataSource = model.declarations.find((d) => (0, ast_1.isDataSource)(d));
         const dataSourceProvider = (0, sdk_1.getLiteral)((_c = dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields.find((f) => f.name === 'provider')) === null || _c === void 0 ? void 0 : _c.value);
         transformer_1.default.provider = dataSourceProvider;
         const generatorConfigOptions = {};
         Object.entries(options).forEach(([k, v]) => (generatorConfigOptions[k] = v));
-        const addMissingInputObjectTypeOptions = (0, helpers_1.resolveAddMissingInputObjectTypeOptions)(generatorConfigOptions);
-        (0, helpers_1.addMissingInputObjectTypes)(inputObjectTypes, outputObjectTypes, models, modelOperations, dataSourceProvider, addMissingInputObjectTypeOptions);
-        const aggregateOperationSupport = (0, aggregate_helpers_1.resolveAggregateOperationSupport)(inputObjectTypes);
-        (0, helpers_1.hideInputObjectTypesAndRelatedFields)(inputObjectTypes, hiddenModels, hiddenFields);
+        (0, dmmf_helpers_1.addMissingInputObjectTypes)(inputObjectTypes, outputObjectTypes, models);
+        const aggregateOperationSupport = (0, dmmf_helpers_1.resolveAggregateOperationSupport)(inputObjectTypes);
         yield generateObjectSchemas(inputObjectTypes);
         yield generateModelSchemas(models, modelOperations, aggregateOperationSupport);
     });

package/zod/generator.js.map

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

package/zod/transformer.d.ts

@@ -17,12 +17,8 @@ export default class Transformer {
     private hasJson;
     private static prismaClientOutputPath;
     private static isCustomPrismaClientOutputPath;
-    private static isGenerateSelect;
-    private static isGenerateInclude;
     constructor(params: TransformerParams);
     static setOutputPath(outPath: string): void;
-    static setIsGenerateSelect(isGenerateSelect: boolean): void;
-    static setIsGenerateInclude(isGenerateInclude: boolean): void;
     static getOutputPath(): string;
     static setPrismaClientOutputPath(prismaClientCustomPath: string): void;
     generateEnumSchemas(): Promise<void>;
@@ -56,7 +52,6 @@ export default class Transformer {
     resolveModelQuerySchemaName(modelName: string, queryName: string): string;
     wrapWithZodUnion(zodStringFields: string[]): string;
     wrapWithZodObject(zodStringFields: string | string[]): string;
-    resolveObjectSchemaName(): string;
     generateModelSchemas(): Promise<void>;
     generateImportStatements(imports: (string | undefined)[]): string;
     resolveSelectIncludeImportAndZodSchemaLine(model: PrismaDMMF.Model): {