@stryke/prisma-trpc-generator 0.5.2 → 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()));
   })
@@ -7676,7 +7676,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7759,7 +7759,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -11602,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,
@@ -11674,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,
@@ -11693,7 +11691,7 @@ 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");

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()));
   })
@@ -7681,7 +7681,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7764,7 +7764,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -11607,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,
@@ -11679,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,
@@ -11698,7 +11696,7 @@ 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");

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()));
   })
@@ -7672,7 +7672,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7755,7 +7755,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -11598,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,
@@ -11670,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,
@@ -11689,7 +11687,7 @@ 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");

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()));
   })
@@ -7677,7 +7677,7 @@ async function generateBaseRouter(sourceFile, config, options) {
     `
     );
   }
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7760,7 +7760,7 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.useTRPCNext) {
+  if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -11603,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,
@@ -11675,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,
@@ -11694,7 +11692,7 @@ 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");

package/package.json

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