@stryke/prisma-trpc-generator 0.4.7 → 0.5.0

package/dist/generator.cjs

@@ -2631,6 +2631,12 @@ function normalizeString(path6, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
+// ../string-format/src/lower-case-first.ts
+init_cjs_shims();
+var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
+  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
+}, "lowerCaseFirst");
+
 // src/prisma-generator.ts
 var import_node_path6 = __toESM(require("node:path"), 1);
 var import_pluralize = __toESM(require_pluralize(), 1);
@@ -6853,8 +6859,10 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["findMany"] = "findMany";
   ModelAction2["create"] = "create";
   ModelAction2["createMany"] = "createMany";
+  ModelAction2["createManyAndReturn"] = "createManyAndReturn";
   ModelAction2["update"] = "update";
   ModelAction2["updateMany"] = "updateMany";
+  ModelAction2["updateManyAndReturn"] = "updateManyAndReturn";
   ModelAction2["upsert"] = "upsert";
   ModelAction2["delete"] = "delete";
   ModelAction2["deleteMany"] = "deleteMany";
@@ -6884,8 +6892,9 @@ var configSchema = z.object({
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptionsPath: z.string().optional(),
+  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()));
   })
@@ -6894,12 +6903,6 @@ var configSchema = z.object({
 // src/helpers.ts
 init_cjs_shims();
 
-// ../string-format/src/lower-case-first.ts
-init_cjs_shims();
-var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
-  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
-}, "lowerCaseFirst");
-
 // src/utils/get-prisma-internals.ts
 init_cjs_shims();
 
@@ -7644,24 +7647,35 @@ var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural,
 async function generateBaseRouter(sourceFile, config, options) {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
+  const relativeContextPath = getRelativePath(outputDir, config.contextPath, true, options.schemaPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+  import type { Context } from '${relativeContextPath}';
   `
   );
-  if (config.trpcOptionsPath) {
+  if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, config.trpcOptionsPath, true, options.schemaPath)}';
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
     `
     );
   }
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+    import { createContext } from '${relativeContextPath}';
+    import { initTRPC, TRPCError } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
+  `
+    );
+  }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptionsPath ? "trpcOptions" : ""});
+  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
   `
   );
   const middlewares = [];
@@ -7717,11 +7731,44 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
+  sourceFile.addStatements(
+    /* ts */
+    `
+/**
+ * Create a server-side caller
+ * @see https://trpc.io/docs/server/server-side-calls
+ */
+export const createCallerFactory = t.createCallerFactory;`
+  );
   sourceFile.addStatements(
     /* ts */
     `
     export const publicProcedure = t.procedure; `
   );
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+export const protectedProcedure = publicProcedure.use((opts) => {
+  const { session } = opts.ctx;
+
+  if (!session?.user) {
+    throw new TRPCError({
+      code: 'UNAUTHORIZED',
+    });
+  }
+
+  return opts.next({ ctx: { session } });
+});
+`
+    );
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction = createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7795,6 +7842,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "createMany":
       inputType = `${modelName}CreateManySchema`;
       break;
+    case "createManyAndReturn":
+      inputType = `${modelName}CreateManyAndReturnSchema`;
+      break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
@@ -7807,6 +7857,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
+    case "updateManyAndReturn":
+      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
       break;
@@ -7841,10 +7894,12 @@ var getProcedureTypeByOpName = /* @__PURE__ */ __name((opName) => {
       break;
     case "createOne":
     case "createMany":
+    case "createManyAndReturn":
     case "deleteOne":
     case "updateOne":
     case "deleteMany":
     case "updateMany":
+    case "updateManyAndReturn":
     case "upsertOne":
       procType = "mutation";
       break;
@@ -7935,7 +7990,9 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     })},`;
     rootItems += subscriptionLinesWrapped;
   }
-  if (rootItems.length === 0) return "";
+  if (rootItems.length === 0) {
+    return "";
+  }
   let shieldText = getImports("trpc-shield");
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -11602,6 +11659,27 @@ async function generate(options) {
     consoleLog("Skipping tRPC Shield generation");
   }
   consoleLog(`Generating tRPC source code for ${models.length} models`);
+  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";' : ""}
+
+export default {${config.useTRPCNext ? "\n transformer," : ""}
+  errorFormatter({ shape, error }) {
+    return {
+      ...shape,
+      data: {
+        ...shape.data,
+        zodError:
+          error.code === 'BAD_REQUEST' && error.cause instanceof ZodError
+            ? error.cause.flatten()
+            : null,
+      },
+    };
+  },
+};
+`);
+  }
   resolveModelsComments(models, hiddenModels);
   const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
     overwrite: true
@@ -11630,12 +11708,19 @@ async function generate(options) {
       consoleLog(`Skipping model ${model} as it is hidden`);
       continue;
     }
-    const modelActions = Object.keys(operations).filter((opType) => config.generateModelActions.includes(opType.replace("One", "")));
+    if (!model) {
+      consoleLog(`Skipping model ${model} as it is not defined`);
+      continue;
+    }
+    const modelActions = Object.keys(operations).filter((opType) => (
+      // eslint-disable-next-line unicorn/prefer-includes
+      config.generateModelActions.some((generateModelAction) => generateModelAction === opType.replace("One", ""))
+    ));
     if (!modelActions.length) {
       consoleLog(`Skipping model ${model} as it has no actions to generate`);
       continue;
     }
-    const plural = (0, import_pluralize.default)(model.toLowerCase());
+    const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
     const modelRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {

package/dist/generator.js

@@ -2636,6 +2636,12 @@ function normalizeString(path6, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
+// ../string-format/src/lower-case-first.ts
+init_esm_shims();
+var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
+  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
+}, "lowerCaseFirst");
+
 // src/prisma-generator.ts
 var import_pluralize = __toESM(require_pluralize(), 1);
 import path5 from "node:path";
@@ -6858,8 +6864,10 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["findMany"] = "findMany";
   ModelAction2["create"] = "create";
   ModelAction2["createMany"] = "createMany";
+  ModelAction2["createManyAndReturn"] = "createManyAndReturn";
   ModelAction2["update"] = "update";
   ModelAction2["updateMany"] = "updateMany";
+  ModelAction2["updateManyAndReturn"] = "updateManyAndReturn";
   ModelAction2["upsert"] = "upsert";
   ModelAction2["delete"] = "delete";
   ModelAction2["deleteMany"] = "deleteMany";
@@ -6889,8 +6897,9 @@ var configSchema = z.object({
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptionsPath: z.string().optional(),
+  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()));
   })
@@ -6899,12 +6908,6 @@ var configSchema = z.object({
 // src/helpers.ts
 init_esm_shims();
 
-// ../string-format/src/lower-case-first.ts
-init_esm_shims();
-var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
-  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
-}, "lowerCaseFirst");
-
 // src/utils/get-prisma-internals.ts
 init_esm_shims();
 
@@ -7649,24 +7652,35 @@ var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural,
 async function generateBaseRouter(sourceFile, config, options) {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
+  const relativeContextPath = getRelativePath(outputDir, config.contextPath, true, options.schemaPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+  import type { Context } from '${relativeContextPath}';
   `
   );
-  if (config.trpcOptionsPath) {
+  if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, config.trpcOptionsPath, true, options.schemaPath)}';
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
     `
     );
   }
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+    import { createContext } from '${relativeContextPath}';
+    import { initTRPC, TRPCError } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
+  `
+    );
+  }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptionsPath ? "trpcOptions" : ""});
+  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
   `
   );
   const middlewares = [];
@@ -7722,11 +7736,44 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
+  sourceFile.addStatements(
+    /* ts */
+    `
+/**
+ * Create a server-side caller
+ * @see https://trpc.io/docs/server/server-side-calls
+ */
+export const createCallerFactory = t.createCallerFactory;`
+  );
   sourceFile.addStatements(
     /* ts */
     `
     export const publicProcedure = t.procedure; `
   );
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+export const protectedProcedure = publicProcedure.use((opts) => {
+  const { session } = opts.ctx;
+
+  if (!session?.user) {
+    throw new TRPCError({
+      code: 'UNAUTHORIZED',
+    });
+  }
+
+  return opts.next({ ctx: { session } });
+});
+`
+    );
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction = createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7800,6 +7847,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "createMany":
       inputType = `${modelName}CreateManySchema`;
       break;
+    case "createManyAndReturn":
+      inputType = `${modelName}CreateManyAndReturnSchema`;
+      break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
@@ -7812,6 +7862,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
+    case "updateManyAndReturn":
+      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
       break;
@@ -7846,10 +7899,12 @@ var getProcedureTypeByOpName = /* @__PURE__ */ __name((opName) => {
       break;
     case "createOne":
     case "createMany":
+    case "createManyAndReturn":
     case "deleteOne":
     case "updateOne":
     case "deleteMany":
     case "updateMany":
+    case "updateManyAndReturn":
     case "upsertOne":
       procType = "mutation";
       break;
@@ -7940,7 +7995,9 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     })},`;
     rootItems += subscriptionLinesWrapped;
   }
-  if (rootItems.length === 0) return "";
+  if (rootItems.length === 0) {
+    return "";
+  }
   let shieldText = getImports("trpc-shield");
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -11607,6 +11664,27 @@ async function generate(options) {
     consoleLog("Skipping tRPC Shield generation");
   }
   consoleLog(`Generating tRPC source code for ${models.length} models`);
+  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";' : ""}
+
+export default {${config.useTRPCNext ? "\n transformer," : ""}
+  errorFormatter({ shape, error }) {
+    return {
+      ...shape,
+      data: {
+        ...shape.data,
+        zodError:
+          error.code === 'BAD_REQUEST' && error.cause instanceof ZodError
+            ? error.cause.flatten()
+            : null,
+      },
+    };
+  },
+};
+`);
+  }
   resolveModelsComments(models, hiddenModels);
   const createRouter = project.createSourceFile(path5.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
     overwrite: true
@@ -11635,12 +11713,19 @@ async function generate(options) {
       consoleLog(`Skipping model ${model} as it is hidden`);
       continue;
     }
-    const modelActions = Object.keys(operations).filter((opType) => config.generateModelActions.includes(opType.replace("One", "")));
+    if (!model) {
+      consoleLog(`Skipping model ${model} as it is not defined`);
+      continue;
+    }
+    const modelActions = Object.keys(operations).filter((opType) => (
+      // eslint-disable-next-line unicorn/prefer-includes
+      config.generateModelActions.some((generateModelAction) => generateModelAction === opType.replace("One", ""))
+    ));
     if (!modelActions.length) {
       consoleLog(`Skipping model ${model} as it has no actions to generate`);
       continue;
     }
-    const plural = (0, import_pluralize.default)(model.toLowerCase());
+    const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
     const modelRouter = project.createSourceFile(path5.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {

package/dist/index.cjs

@@ -2627,6 +2627,12 @@ function normalizeString(path6, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
+// ../string-format/src/lower-case-first.ts
+init_cjs_shims();
+var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
+  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
+}, "lowerCaseFirst");
+
 // src/prisma-generator.ts
 var import_node_path6 = __toESM(require("node:path"), 1);
 var import_pluralize = __toESM(require_pluralize(), 1);
@@ -6849,8 +6855,10 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["findMany"] = "findMany";
   ModelAction2["create"] = "create";
   ModelAction2["createMany"] = "createMany";
+  ModelAction2["createManyAndReturn"] = "createManyAndReturn";
   ModelAction2["update"] = "update";
   ModelAction2["updateMany"] = "updateMany";
+  ModelAction2["updateManyAndReturn"] = "updateManyAndReturn";
   ModelAction2["upsert"] = "upsert";
   ModelAction2["delete"] = "delete";
   ModelAction2["deleteMany"] = "deleteMany";
@@ -6880,8 +6888,9 @@ var configSchema = z.object({
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptionsPath: z.string().optional(),
+  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()));
   })
@@ -6890,12 +6899,6 @@ var configSchema = z.object({
 // src/helpers.ts
 init_cjs_shims();
 
-// ../string-format/src/lower-case-first.ts
-init_cjs_shims();
-var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
-  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
-}, "lowerCaseFirst");
-
 // src/utils/get-prisma-internals.ts
 init_cjs_shims();
 
@@ -7640,24 +7643,35 @@ var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural,
 async function generateBaseRouter(sourceFile, config, options) {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
+  const relativeContextPath = getRelativePath(outputDir, config.contextPath, true, options.schemaPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+  import type { Context } from '${relativeContextPath}';
   `
   );
-  if (config.trpcOptionsPath) {
+  if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, config.trpcOptionsPath, true, options.schemaPath)}';
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
     `
     );
   }
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+    import { createContext } from '${relativeContextPath}';
+    import { initTRPC, TRPCError } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
+  `
+    );
+  }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptionsPath ? "trpcOptions" : ""});
+  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
   `
   );
   const middlewares = [];
@@ -7713,11 +7727,44 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
+  sourceFile.addStatements(
+    /* ts */
+    `
+/**
+ * Create a server-side caller
+ * @see https://trpc.io/docs/server/server-side-calls
+ */
+export const createCallerFactory = t.createCallerFactory;`
+  );
   sourceFile.addStatements(
     /* ts */
     `
     export const publicProcedure = t.procedure; `
   );
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+export const protectedProcedure = publicProcedure.use((opts) => {
+  const { session } = opts.ctx;
+
+  if (!session?.user) {
+    throw new TRPCError({
+      code: 'UNAUTHORIZED',
+    });
+  }
+
+  return opts.next({ ctx: { session } });
+});
+`
+    );
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction = createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7791,6 +7838,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "createMany":
       inputType = `${modelName}CreateManySchema`;
       break;
+    case "createManyAndReturn":
+      inputType = `${modelName}CreateManyAndReturnSchema`;
+      break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
@@ -7803,6 +7853,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
+    case "updateManyAndReturn":
+      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
       break;
@@ -7837,10 +7890,12 @@ var getProcedureTypeByOpName = /* @__PURE__ */ __name((opName) => {
       break;
     case "createOne":
     case "createMany":
+    case "createManyAndReturn":
     case "deleteOne":
     case "updateOne":
     case "deleteMany":
     case "updateMany":
+    case "updateManyAndReturn":
     case "upsertOne":
       procType = "mutation";
       break;
@@ -7931,7 +7986,9 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     })},`;
     rootItems += subscriptionLinesWrapped;
   }
-  if (rootItems.length === 0) return "";
+  if (rootItems.length === 0) {
+    return "";
+  }
   let shieldText = getImports("trpc-shield");
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -11598,6 +11655,27 @@ async function generate(options) {
     consoleLog("Skipping tRPC Shield generation");
   }
   consoleLog(`Generating tRPC source code for ${models.length} models`);
+  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";' : ""}
+
+export default {${config.useTRPCNext ? "\n transformer," : ""}
+  errorFormatter({ shape, error }) {
+    return {
+      ...shape,
+      data: {
+        ...shape.data,
+        zodError:
+          error.code === 'BAD_REQUEST' && error.cause instanceof ZodError
+            ? error.cause.flatten()
+            : null,
+      },
+    };
+  },
+};
+`);
+  }
   resolveModelsComments(models, hiddenModels);
   const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
     overwrite: true
@@ -11626,12 +11704,19 @@ async function generate(options) {
       consoleLog(`Skipping model ${model} as it is hidden`);
       continue;
     }
-    const modelActions = Object.keys(operations).filter((opType) => config.generateModelActions.includes(opType.replace("One", "")));
+    if (!model) {
+      consoleLog(`Skipping model ${model} as it is not defined`);
+      continue;
+    }
+    const modelActions = Object.keys(operations).filter((opType) => (
+      // eslint-disable-next-line unicorn/prefer-includes
+      config.generateModelActions.some((generateModelAction) => generateModelAction === opType.replace("One", ""))
+    ));
     if (!modelActions.length) {
       consoleLog(`Skipping model ${model} as it has no actions to generate`);
       continue;
     }
-    const plural = (0, import_pluralize.default)(model.toLowerCase());
+    const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
     const modelRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {

package/dist/index.js

@@ -2632,6 +2632,12 @@ function normalizeString(path6, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
+// ../string-format/src/lower-case-first.ts
+init_esm_shims();
+var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
+  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
+}, "lowerCaseFirst");
+
 // src/prisma-generator.ts
 var import_pluralize = __toESM(require_pluralize(), 1);
 import path5 from "node:path";
@@ -6854,8 +6860,10 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["findMany"] = "findMany";
   ModelAction2["create"] = "create";
   ModelAction2["createMany"] = "createMany";
+  ModelAction2["createManyAndReturn"] = "createManyAndReturn";
   ModelAction2["update"] = "update";
   ModelAction2["updateMany"] = "updateMany";
+  ModelAction2["updateManyAndReturn"] = "updateManyAndReturn";
   ModelAction2["upsert"] = "upsert";
   ModelAction2["delete"] = "delete";
   ModelAction2["deleteMany"] = "deleteMany";
@@ -6885,8 +6893,9 @@ var configSchema = z.object({
   withShield: configShield.default("true"),
   withZod: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptionsPath: z.string().optional(),
+  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()));
   })
@@ -6895,12 +6904,6 @@ var configSchema = z.object({
 // src/helpers.ts
 init_esm_shims();
 
-// ../string-format/src/lower-case-first.ts
-init_esm_shims();
-var lowerCaseFirst = /* @__PURE__ */ __name((input) => {
-  return input ? input.charAt(0).toLowerCase() + input.slice(1) : input;
-}, "lowerCaseFirst");
-
 // src/utils/get-prisma-internals.ts
 init_esm_shims();
 
@@ -7645,24 +7648,35 @@ var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural,
 async function generateBaseRouter(sourceFile, config, options) {
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
+  const relativeContextPath = getRelativePath(outputDir, config.contextPath, true, options.schemaPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+  import type { Context } from '${relativeContextPath}';
   `
   );
-  if (config.trpcOptionsPath) {
+  if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, config.trpcOptionsPath, true, options.schemaPath)}';
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
     `
     );
   }
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+    import { createContext } from '${relativeContextPath}';
+    import { initTRPC, TRPCError } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
+  `
+    );
+  }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptionsPath ? "trpcOptions" : ""});
+  export const t = trpc.initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
   `
   );
   const middlewares = [];
@@ -7718,11 +7732,44 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
+  sourceFile.addStatements(
+    /* ts */
+    `
+/**
+ * Create a server-side caller
+ * @see https://trpc.io/docs/server/server-side-calls
+ */
+export const createCallerFactory = t.createCallerFactory;`
+  );
   sourceFile.addStatements(
     /* ts */
     `
     export const publicProcedure = t.procedure; `
   );
+  if (config.useTRPCNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+export const protectedProcedure = publicProcedure.use((opts) => {
+  const { session } = opts.ctx;
+
+  if (!session?.user) {
+    throw new TRPCError({
+      code: 'UNAUTHORIZED',
+    });
+  }
+
+  return opts.next({ ctx: { session } });
+});
+`
+    );
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction = createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7796,6 +7843,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "createMany":
       inputType = `${modelName}CreateManySchema`;
       break;
+    case "createManyAndReturn":
+      inputType = `${modelName}CreateManyAndReturnSchema`;
+      break;
     case "deleteOne":
       inputType = `${modelName}DeleteOneSchema`;
       break;
@@ -7808,6 +7858,9 @@ var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
     case "updateMany":
       inputType = `${modelName}UpdateManySchema`;
       break;
+    case "updateManyAndReturn":
+      inputType = `${modelName}UpdateManyAndReturnSchema`;
+      break;
     case "upsertOne":
       inputType = `${modelName}UpsertSchema`;
       break;
@@ -7842,10 +7895,12 @@ var getProcedureTypeByOpName = /* @__PURE__ */ __name((opName) => {
       break;
     case "createOne":
     case "createMany":
+    case "createManyAndReturn":
     case "deleteOne":
     case "updateOne":
     case "deleteMany":
     case "updateMany":
+    case "updateManyAndReturn":
     case "upsertOne":
       procType = "mutation";
       break;
@@ -7936,7 +7991,9 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     })},`;
     rootItems += subscriptionLinesWrapped;
   }
-  if (rootItems.length === 0) return "";
+  if (rootItems.length === 0) {
+    return "";
+  }
   let shieldText = getImports("trpc-shield");
   const internals = await getPrismaInternals();
   const outputDir = internals.parseEnvValue(options.generator.output);
@@ -11603,6 +11660,27 @@ async function generate(options) {
     consoleLog("Skipping tRPC Shield generation");
   }
   consoleLog(`Generating tRPC source code for ${models.length} models`);
+  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";' : ""}
+
+export default {${config.useTRPCNext ? "\n transformer," : ""}
+  errorFormatter({ shape, error }) {
+    return {
+      ...shape,
+      data: {
+        ...shape.data,
+        zodError:
+          error.code === 'BAD_REQUEST' && error.cause instanceof ZodError
+            ? error.cause.flatten()
+            : null,
+      },
+    };
+  },
+};
+`);
+  }
   resolveModelsComments(models, hiddenModels);
   const createRouter = project.createSourceFile(path5.resolve(outputDir, "routers", "helpers", "createRouter.ts"), void 0, {
     overwrite: true
@@ -11631,12 +11709,19 @@ async function generate(options) {
       consoleLog(`Skipping model ${model} as it is hidden`);
       continue;
     }
-    const modelActions = Object.keys(operations).filter((opType) => config.generateModelActions.includes(opType.replace("One", "")));
+    if (!model) {
+      consoleLog(`Skipping model ${model} as it is not defined`);
+      continue;
+    }
+    const modelActions = Object.keys(operations).filter((opType) => (
+      // eslint-disable-next-line unicorn/prefer-includes
+      config.generateModelActions.some((generateModelAction) => generateModelAction === opType.replace("One", ""))
+    ));
     if (!modelActions.length) {
       consoleLog(`Skipping model ${model} as it has no actions to generate`);
       continue;
     }
-    const plural = (0, import_pluralize.default)(model.toLowerCase());
+    const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
     const modelRouter = project.createSourceFile(path5.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {

package/package.json

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