@stryke/prisma-trpc-generator 0.5.1 → 0.6.0

package/dist/generator.cjs

@@ -6891,10 +6891,10 @@ var configSchema = z.object({
   withMiddleware: configMiddleware.default("true"),
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
+  withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
   trpcOptions: z.boolean().or(z.string()).optional(),
   showModelNameInProcedure: configBoolean.default("true"),
-  useTRPCNext: configBoolean.default("false"),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7636,12 +7636,6 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateRPCImport = /* @__PURE__ */ __name((sourceFile) => {
-  sourceFile.addImportDeclaration({
-    moduleSpecifier: "@trpc/server",
-    namespaceImport: "trpc"
-  });
-}, "generateRPCImport");
 var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -7682,7 +7676,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7765,7 +7759,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7837,7 +7831,7 @@ function generateRouterSchemaImports(sourceFile, modelName, modelActions) {
 }
 __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
-  const opType = opName.replace("OrThrow", "");
+  const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
   return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
@@ -7863,22 +7857,22 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
       inputType = `${modelName}CreateManySchema`;
       break;
     case "createManyAndReturn":
-      inputType = `${modelName}CreateManyAndReturnSchema`;
+      inputType = `${modelName}CreateManySchema`;
       break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
-    case "updateOne":
-      inputType = `${modelName}UpdateOneSchema`;
-      break;
     case "deleteMany":
       inputType = `${modelName}DeleteManySchema`;
       break;
+    case "updateOne":
+      inputType = `${modelName}UpdateOneSchema`;
+      break;
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
     case "updateManyAndReturn":
-      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      inputType = `${modelName}UpdateManySchema`;
       break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
@@ -7963,7 +7957,7 @@ var getImports = /* @__PURE__ */ __name((type, newPath) => {
   } else if (type === "trpc-shield") {
     statement = "import { shield, allow } from 'trpc-shield';\n";
   } else if (type === "context") {
-    statement = `import { Context } from '${newPath}';
+    statement = `import type { Context } from '${newPath}';
 `;
   }
   return statement;
@@ -7987,7 +7981,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
   return `export const permissions = ${shieldObjectText};`;
 }, "wrapWithExport");
-var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, shieldOutputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -8014,9 +8008,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
-  shieldText += getImports("context", relativePath(outputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -11610,49 +11602,47 @@ async function generate(options) {
   } else {
     consoleLog("Skipping Zod schemas generation");
   }
+  const queries = [];
+  const mutations = [];
+  const subscriptions = [];
+  prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
+    const { model: _model, plural: _plural, ...operations } = modelOperation;
+    for (const [opType, opNameWithModel] of Object.entries(operations)) {
+      if ([
+        "findUnique",
+        "findUniqueOrThrow",
+        "findFirst",
+        "findFirstOrThrow",
+        "findRaw",
+        "findMany",
+        "aggregateRaw",
+        "count",
+        "aggregate",
+        "groupBy"
+      ].includes(opType)) {
+        queries.push(opNameWithModel);
+      }
+      if ([
+        "createOne",
+        "createMany",
+        "createManyAndReturn",
+        "deleteOne",
+        "deleteMany",
+        "updateOne",
+        "updateMany",
+        "updateManyAndReturn",
+        "upsertOne"
+      ].includes(opType)) {
+        mutations.push(opNameWithModel);
+      }
+    }
+  });
+  queries.sort();
+  mutations.sort();
+  subscriptions.sort();
   if (config.withShield !== false) {
     consoleLog("Generating tRPC Shield");
-    const shieldOutputDir = joinPaths(outputDir, "shield");
-    consoleLog("Preparing tRPC Shield output directory");
-    await createDirectory(shieldOutputDir);
-    const queries = [];
-    const mutations = [];
-    const subscriptions = [];
-    prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
-      const { model: _model, plural: _plural, ...operations } = modelOperation;
-      for (const [opType, opNameWithModel] of Object.entries(operations)) {
-        if ([
-          "findUnique",
-          "findUniqueOrThrow",
-          "findFirst",
-          "findFirstOrThrow",
-          "findRaw",
-          "findMany",
-          "aggregateRaw",
-          "count",
-          "aggregate",
-          "groupBy"
-        ].includes(opType)) {
-          queries.push(opNameWithModel);
-        }
-        if ([
-          "createOne",
-          "createMany",
-          "createManyAndReturn",
-          "deleteOne",
-          "deleteMany",
-          "updateOne",
-          "updateMany",
-          "updateManyAndReturn",
-          "upsertOne"
-        ].includes(opType)) {
-          mutations.push(opNameWithModel);
-        }
-      }
-    });
-    queries.sort();
-    mutations.sort();
-    subscriptions.sort();
+    const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
     const shieldText = await constructShield({
       queries,
@@ -11672,7 +11662,7 @@ async function generate(options) {
           contextPath: config.contextPath
         }
       }
-    });
+    }, shieldOutputDir);
     consoleLog("Saving tRPC Shield source file to disk");
     await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
   } else {
@@ -11682,9 +11672,9 @@ async function generate(options) {
   if (config.trpcOptions && typeof config.trpcOptions === "boolean") {
     const trpcOptionsOutputPath = joinPaths(outputDir, "options.ts");
     consoleLog("Generating tRPC options source file");
-    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.useTRPCNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
+    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.withNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
 
-export default {${config.useTRPCNext ? "\n transformer," : ""}
+export default {${config.withNext ? "\n transformer," : ""}
   errorFormatter({ shape, error }) {
     return {
       ...shape,
@@ -11701,11 +11691,10 @@ export default {${config.useTRPCNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
+  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  generateRPCImport(createRouter);
   if (config.withShield) {
     await generateShieldImport(createRouter, options, config.withShield);
   }

package/dist/generator.js

@@ -6896,10 +6896,10 @@ var configSchema = z.object({
   withMiddleware: configMiddleware.default("true"),
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
+  withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
   trpcOptions: z.boolean().or(z.string()).optional(),
   showModelNameInProcedure: configBoolean.default("true"),
-  useTRPCNext: configBoolean.default("false"),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7641,12 +7641,6 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateRPCImport = /* @__PURE__ */ __name((sourceFile) => {
-  sourceFile.addImportDeclaration({
-    moduleSpecifier: "@trpc/server",
-    namespaceImport: "trpc"
-  });
-}, "generateRPCImport");
 var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -7687,7 +7681,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7770,7 +7764,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7842,7 +7836,7 @@ function generateRouterSchemaImports(sourceFile, modelName, modelActions) {
 }
 __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
-  const opType = opName.replace("OrThrow", "");
+  const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
   return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
@@ -7868,22 +7862,22 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
       inputType = `${modelName}CreateManySchema`;
       break;
     case "createManyAndReturn":
-      inputType = `${modelName}CreateManyAndReturnSchema`;
+      inputType = `${modelName}CreateManySchema`;
       break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
-    case "updateOne":
-      inputType = `${modelName}UpdateOneSchema`;
-      break;
     case "deleteMany":
       inputType = `${modelName}DeleteManySchema`;
       break;
+    case "updateOne":
+      inputType = `${modelName}UpdateOneSchema`;
+      break;
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
     case "updateManyAndReturn":
-      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      inputType = `${modelName}UpdateManySchema`;
       break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
@@ -7968,7 +7962,7 @@ var getImports = /* @__PURE__ */ __name((type, newPath) => {
   } else if (type === "trpc-shield") {
     statement = "import { shield, allow } from 'trpc-shield';\n";
   } else if (type === "context") {
-    statement = `import { Context } from '${newPath}';
+    statement = `import type { Context } from '${newPath}';
 `;
   }
   return statement;
@@ -7992,7 +7986,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
   return `export const permissions = ${shieldObjectText};`;
 }, "wrapWithExport");
-var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, shieldOutputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -8019,9 +8013,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
-  shieldText += getImports("context", relativePath(outputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -11615,49 +11607,47 @@ async function generate(options) {
   } else {
     consoleLog("Skipping Zod schemas generation");
   }
+  const queries = [];
+  const mutations = [];
+  const subscriptions = [];
+  prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
+    const { model: _model, plural: _plural, ...operations } = modelOperation;
+    for (const [opType, opNameWithModel] of Object.entries(operations)) {
+      if ([
+        "findUnique",
+        "findUniqueOrThrow",
+        "findFirst",
+        "findFirstOrThrow",
+        "findRaw",
+        "findMany",
+        "aggregateRaw",
+        "count",
+        "aggregate",
+        "groupBy"
+      ].includes(opType)) {
+        queries.push(opNameWithModel);
+      }
+      if ([
+        "createOne",
+        "createMany",
+        "createManyAndReturn",
+        "deleteOne",
+        "deleteMany",
+        "updateOne",
+        "updateMany",
+        "updateManyAndReturn",
+        "upsertOne"
+      ].includes(opType)) {
+        mutations.push(opNameWithModel);
+      }
+    }
+  });
+  queries.sort();
+  mutations.sort();
+  subscriptions.sort();
   if (config.withShield !== false) {
     consoleLog("Generating tRPC Shield");
-    const shieldOutputDir = joinPaths(outputDir, "shield");
-    consoleLog("Preparing tRPC Shield output directory");
-    await createDirectory(shieldOutputDir);
-    const queries = [];
-    const mutations = [];
-    const subscriptions = [];
-    prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
-      const { model: _model, plural: _plural, ...operations } = modelOperation;
-      for (const [opType, opNameWithModel] of Object.entries(operations)) {
-        if ([
-          "findUnique",
-          "findUniqueOrThrow",
-          "findFirst",
-          "findFirstOrThrow",
-          "findRaw",
-          "findMany",
-          "aggregateRaw",
-          "count",
-          "aggregate",
-          "groupBy"
-        ].includes(opType)) {
-          queries.push(opNameWithModel);
-        }
-        if ([
-          "createOne",
-          "createMany",
-          "createManyAndReturn",
-          "deleteOne",
-          "deleteMany",
-          "updateOne",
-          "updateMany",
-          "updateManyAndReturn",
-          "upsertOne"
-        ].includes(opType)) {
-          mutations.push(opNameWithModel);
-        }
-      }
-    });
-    queries.sort();
-    mutations.sort();
-    subscriptions.sort();
+    const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
     const shieldText = await constructShield({
       queries,
@@ -11677,7 +11667,7 @@ async function generate(options) {
           contextPath: config.contextPath
         }
       }
-    });
+    }, shieldOutputDir);
     consoleLog("Saving tRPC Shield source file to disk");
     await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
   } else {
@@ -11687,9 +11677,9 @@ async function generate(options) {
   if (config.trpcOptions && typeof config.trpcOptions === "boolean") {
     const trpcOptionsOutputPath = joinPaths(outputDir, "options.ts");
     consoleLog("Generating tRPC options source file");
-    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.useTRPCNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
+    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.withNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
 
-export default {${config.useTRPCNext ? "\n transformer," : ""}
+export default {${config.withNext ? "\n transformer," : ""}
   errorFormatter({ shape, error }) {
     return {
       ...shape,
@@ -11706,11 +11696,10 @@ export default {${config.useTRPCNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(path5.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
+  const createRouter = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  generateRPCImport(createRouter);
   if (config.withShield) {
     await generateShieldImport(createRouter, options, config.withShield);
   }

package/dist/index.cjs

@@ -6887,10 +6887,10 @@ var configSchema = z.object({
   withMiddleware: configMiddleware.default("true"),
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
+  withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
   trpcOptions: z.boolean().or(z.string()).optional(),
   showModelNameInProcedure: configBoolean.default("true"),
-  useTRPCNext: configBoolean.default("false"),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7632,12 +7632,6 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateRPCImport = /* @__PURE__ */ __name((sourceFile) => {
-  sourceFile.addImportDeclaration({
-    moduleSpecifier: "@trpc/server",
-    namespaceImport: "trpc"
-  });
-}, "generateRPCImport");
 var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -7678,7 +7672,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7761,7 +7755,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7833,7 +7827,7 @@ function generateRouterSchemaImports(sourceFile, modelName, modelActions) {
 }
 __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
-  const opType = opName.replace("OrThrow", "");
+  const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
   return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
@@ -7859,22 +7853,22 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
       inputType = `${modelName}CreateManySchema`;
       break;
     case "createManyAndReturn":
-      inputType = `${modelName}CreateManyAndReturnSchema`;
+      inputType = `${modelName}CreateManySchema`;
       break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
-    case "updateOne":
-      inputType = `${modelName}UpdateOneSchema`;
-      break;
     case "deleteMany":
       inputType = `${modelName}DeleteManySchema`;
       break;
+    case "updateOne":
+      inputType = `${modelName}UpdateOneSchema`;
+      break;
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
     case "updateManyAndReturn":
-      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      inputType = `${modelName}UpdateManySchema`;
       break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
@@ -7959,7 +7953,7 @@ var getImports = /* @__PURE__ */ __name((type, newPath) => {
   } else if (type === "trpc-shield") {
     statement = "import { shield, allow } from 'trpc-shield';\n";
   } else if (type === "context") {
-    statement = `import { Context } from '${newPath}';
+    statement = `import type { Context } from '${newPath}';
 `;
   }
   return statement;
@@ -7983,7 +7977,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
   return `export const permissions = ${shieldObjectText};`;
 }, "wrapWithExport");
-var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, shieldOutputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -8010,9 +8004,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
-  shieldText += getImports("context", relativePath(outputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -11606,49 +11598,47 @@ async function generate(options) {
   } else {
     consoleLog("Skipping Zod schemas generation");
   }
+  const queries = [];
+  const mutations = [];
+  const subscriptions = [];
+  prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
+    const { model: _model, plural: _plural, ...operations } = modelOperation;
+    for (const [opType, opNameWithModel] of Object.entries(operations)) {
+      if ([
+        "findUnique",
+        "findUniqueOrThrow",
+        "findFirst",
+        "findFirstOrThrow",
+        "findRaw",
+        "findMany",
+        "aggregateRaw",
+        "count",
+        "aggregate",
+        "groupBy"
+      ].includes(opType)) {
+        queries.push(opNameWithModel);
+      }
+      if ([
+        "createOne",
+        "createMany",
+        "createManyAndReturn",
+        "deleteOne",
+        "deleteMany",
+        "updateOne",
+        "updateMany",
+        "updateManyAndReturn",
+        "upsertOne"
+      ].includes(opType)) {
+        mutations.push(opNameWithModel);
+      }
+    }
+  });
+  queries.sort();
+  mutations.sort();
+  subscriptions.sort();
   if (config.withShield !== false) {
     consoleLog("Generating tRPC Shield");
-    const shieldOutputDir = joinPaths(outputDir, "shield");
-    consoleLog("Preparing tRPC Shield output directory");
-    await createDirectory(shieldOutputDir);
-    const queries = [];
-    const mutations = [];
-    const subscriptions = [];
-    prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
-      const { model: _model, plural: _plural, ...operations } = modelOperation;
-      for (const [opType, opNameWithModel] of Object.entries(operations)) {
-        if ([
-          "findUnique",
-          "findUniqueOrThrow",
-          "findFirst",
-          "findFirstOrThrow",
-          "findRaw",
-          "findMany",
-          "aggregateRaw",
-          "count",
-          "aggregate",
-          "groupBy"
-        ].includes(opType)) {
-          queries.push(opNameWithModel);
-        }
-        if ([
-          "createOne",
-          "createMany",
-          "createManyAndReturn",
-          "deleteOne",
-          "deleteMany",
-          "updateOne",
-          "updateMany",
-          "updateManyAndReturn",
-          "upsertOne"
-        ].includes(opType)) {
-          mutations.push(opNameWithModel);
-        }
-      }
-    });
-    queries.sort();
-    mutations.sort();
-    subscriptions.sort();
+    const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
     const shieldText = await constructShield({
       queries,
@@ -11668,7 +11658,7 @@ async function generate(options) {
           contextPath: config.contextPath
         }
       }
-    });
+    }, shieldOutputDir);
     consoleLog("Saving tRPC Shield source file to disk");
     await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
   } else {
@@ -11678,9 +11668,9 @@ async function generate(options) {
   if (config.trpcOptions && typeof config.trpcOptions === "boolean") {
     const trpcOptionsOutputPath = joinPaths(outputDir, "options.ts");
     consoleLog("Generating tRPC options source file");
-    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.useTRPCNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
+    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.withNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
 
-export default {${config.useTRPCNext ? "\n transformer," : ""}
+export default {${config.withNext ? "\n transformer," : ""}
   errorFormatter({ shape, error }) {
     return {
       ...shape,
@@ -11697,11 +11687,10 @@ export default {${config.useTRPCNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
+  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  generateRPCImport(createRouter);
   if (config.withShield) {
     await generateShieldImport(createRouter, options, config.withShield);
   }

package/dist/index.js

@@ -6892,10 +6892,10 @@ var configSchema = z.object({
   withMiddleware: configMiddleware.default("true"),
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
+  withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
   trpcOptions: z.boolean().or(z.string()).optional(),
   showModelNameInProcedure: configBoolean.default("true"),
-  useTRPCNext: configBoolean.default("false"),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7637,12 +7637,6 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateRPCImport = /* @__PURE__ */ __name((sourceFile) => {
-  sourceFile.addImportDeclaration({
-    moduleSpecifier: "@trpc/server",
-    namespaceImport: "trpc"
-  });
-}, "generateRPCImport");
 var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -7683,7 +7677,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7766,7 +7760,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7838,7 +7832,7 @@ function generateRouterSchemaImports(sourceFile, modelName, modelActions) {
 }
 __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
-  const opType = opName.replace("OrThrow", "");
+  const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
   return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
@@ -7864,22 +7858,22 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
       inputType = `${modelName}CreateManySchema`;
       break;
     case "createManyAndReturn":
-      inputType = `${modelName}CreateManyAndReturnSchema`;
+      inputType = `${modelName}CreateManySchema`;
       break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
-    case "updateOne":
-      inputType = `${modelName}UpdateOneSchema`;
-      break;
     case "deleteMany":
       inputType = `${modelName}DeleteManySchema`;
       break;
+    case "updateOne":
+      inputType = `${modelName}UpdateOneSchema`;
+      break;
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
     case "updateManyAndReturn":
-      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      inputType = `${modelName}UpdateManySchema`;
       break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
@@ -7964,7 +7958,7 @@ var getImports = /* @__PURE__ */ __name((type, newPath) => {
   } else if (type === "trpc-shield") {
     statement = "import { shield, allow } from 'trpc-shield';\n";
   } else if (type === "context") {
-    statement = `import { Context } from '${newPath}';
+    statement = `import type { Context } from '${newPath}';
 `;
   }
   return statement;
@@ -7988,7 +7982,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
   return `export const permissions = ${shieldObjectText};`;
 }, "wrapWithExport");
-var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, shieldOutputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -8015,9 +8009,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
-  shieldText += getImports("context", relativePath(outputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -11611,49 +11603,47 @@ async function generate(options) {
   } else {
     consoleLog("Skipping Zod schemas generation");
   }
+  const queries = [];
+  const mutations = [];
+  const subscriptions = [];
+  prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
+    const { model: _model, plural: _plural, ...operations } = modelOperation;
+    for (const [opType, opNameWithModel] of Object.entries(operations)) {
+      if ([
+        "findUnique",
+        "findUniqueOrThrow",
+        "findFirst",
+        "findFirstOrThrow",
+        "findRaw",
+        "findMany",
+        "aggregateRaw",
+        "count",
+        "aggregate",
+        "groupBy"
+      ].includes(opType)) {
+        queries.push(opNameWithModel);
+      }
+      if ([
+        "createOne",
+        "createMany",
+        "createManyAndReturn",
+        "deleteOne",
+        "deleteMany",
+        "updateOne",
+        "updateMany",
+        "updateManyAndReturn",
+        "upsertOne"
+      ].includes(opType)) {
+        mutations.push(opNameWithModel);
+      }
+    }
+  });
+  queries.sort();
+  mutations.sort();
+  subscriptions.sort();
   if (config.withShield !== false) {
     consoleLog("Generating tRPC Shield");
-    const shieldOutputDir = joinPaths(outputDir, "shield");
-    consoleLog("Preparing tRPC Shield output directory");
-    await createDirectory(shieldOutputDir);
-    const queries = [];
-    const mutations = [];
-    const subscriptions = [];
-    prismaClientDmmf.mappings.modelOperations.forEach((modelOperation) => {
-      const { model: _model, plural: _plural, ...operations } = modelOperation;
-      for (const [opType, opNameWithModel] of Object.entries(operations)) {
-        if ([
-          "findUnique",
-          "findUniqueOrThrow",
-          "findFirst",
-          "findFirstOrThrow",
-          "findRaw",
-          "findMany",
-          "aggregateRaw",
-          "count",
-          "aggregate",
-          "groupBy"
-        ].includes(opType)) {
-          queries.push(opNameWithModel);
-        }
-        if ([
-          "createOne",
-          "createMany",
-          "createManyAndReturn",
-          "deleteOne",
-          "deleteMany",
-          "updateOne",
-          "updateMany",
-          "updateManyAndReturn",
-          "upsertOne"
-        ].includes(opType)) {
-          mutations.push(opNameWithModel);
-        }
-      }
-    });
-    queries.sort();
-    mutations.sort();
-    subscriptions.sort();
+    const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
     const shieldText = await constructShield({
       queries,
@@ -11673,7 +11663,7 @@ async function generate(options) {
           contextPath: config.contextPath
         }
       }
-    });
+    }, shieldOutputDir);
     consoleLog("Saving tRPC Shield source file to disk");
     await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
   } else {
@@ -11683,9 +11673,9 @@ async function generate(options) {
   if (config.trpcOptions && typeof config.trpcOptions === "boolean") {
     const trpcOptionsOutputPath = joinPaths(outputDir, "options.ts");
     consoleLog("Generating tRPC options source file");
-    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.useTRPCNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
+    await writeFileSafely(trpcOptionsOutputPath, `import { ZodError } from 'zod';${config.withNext ? '\nimport { transformer } from "@stryke/trpc-next/shared";' : ""}
 
-export default {${config.useTRPCNext ? "\n transformer," : ""}
+export default {${config.withNext ? "\n transformer," : ""}
   errorFormatter({ shape, error }) {
     return {
       ...shape,
@@ -11702,11 +11692,10 @@ export default {${config.useTRPCNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(path5.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
+  const createRouter = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  generateRPCImport(createRouter);
   if (config.withShield) {
     await generateShieldImport(createRouter, options, config.withShield);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/prisma-trpc-generator",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "type": "module",
   "description": "A fork of the prisma-trpc-generator code to work in ESM with Prisma v6.",
   "repository": {