@stryke/prisma-trpc-generator 0.6.1 → 0.7.0

package/dist/generator.cjs

@@ -6883,13 +6883,13 @@ var configMiddleware = z.union([
 ]);
 var configShield = z.union([
   configBoolean,
-  z.string().default("../src/trpc/shield")
+  z.string().default("../src/trpc/shields")
 ]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
   debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("true"),
-  withShield: configShield.default("true"),
+  withMiddleware: configMiddleware.default("false"),
+  withShields: configShield.default("true"),
   withZod: configBoolean.default("true"),
   withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
@@ -7622,7 +7622,7 @@ __name(getRelativePath, "getRelativePath");
 
 // src/helpers.ts
 var getProcedureName = /* @__PURE__ */ __name((config) => {
-  return config.withShield ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
+  return config.withShields ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
 }, "getProcedureName");
 var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config }) => {
   const imports = [
@@ -7682,6 +7682,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       `
     import { createContext } from '${relativeContextPath}';
     import { initTRPC, TRPCError } from '@trpc/server';
+    import { experimental_nextAppDirCaller } from '@trpc/server/adapters/next-app-dir';
     import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
   `
     );
@@ -7730,7 +7731,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
-  if (config.withShield) {
+  if (config.withShields) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7763,22 +7764,6 @@ export const createCallerFactory = t.createCallerFactory;`
     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);
   `
     );
@@ -7790,14 +7775,17 @@ export const protectedProcedure = publicProcedure.use((opts) => {
         sourceFile.addStatements(
           /* ts */
           `
-    export const ${procName} = t.procedure
-      `
+    export const ${procName} = t.procedure`
         );
       }
       sourceFile.addStatements(
         /* ts */
         `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})
+      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
+    experimental_nextAppDirCaller({
+      normalizeFormData: true,
+    }),
+  )` : ""}
       `
       );
     });
@@ -11640,7 +11628,7 @@ async function generate(options) {
   queries.sort();
   mutations.sort();
   subscriptions.sort();
-  if (config.withShield !== false) {
+  if (config.withShields !== false) {
     consoleLog("Generating tRPC Shield");
     const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
@@ -11695,8 +11683,8 @@ export default {${config.withNext ? "\n transformer," : ""}
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+  if (config.withShields) {
+    await generateShieldImport(createRouter, options, config.withShields);
   }
   consoleLog("Generating tRPC base router");
   await generateBaseRouter(createRouter, config, options);

package/dist/generator.js

@@ -6888,13 +6888,13 @@ var configMiddleware = z.union([
 ]);
 var configShield = z.union([
   configBoolean,
-  z.string().default("../src/trpc/shield")
+  z.string().default("../src/trpc/shields")
 ]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
   debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("true"),
-  withShield: configShield.default("true"),
+  withMiddleware: configMiddleware.default("false"),
+  withShields: configShield.default("true"),
   withZod: configBoolean.default("true"),
   withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
@@ -7627,7 +7627,7 @@ __name(getRelativePath, "getRelativePath");
 
 // src/helpers.ts
 var getProcedureName = /* @__PURE__ */ __name((config) => {
-  return config.withShield ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
+  return config.withShields ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
 }, "getProcedureName");
 var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config }) => {
   const imports = [
@@ -7687,6 +7687,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       `
     import { createContext } from '${relativeContextPath}';
     import { initTRPC, TRPCError } from '@trpc/server';
+    import { experimental_nextAppDirCaller } from '@trpc/server/adapters/next-app-dir';
     import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
   `
     );
@@ -7735,7 +7736,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
-  if (config.withShield) {
+  if (config.withShields) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7768,22 +7769,6 @@ export const createCallerFactory = t.createCallerFactory;`
     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);
   `
     );
@@ -7795,14 +7780,17 @@ export const protectedProcedure = publicProcedure.use((opts) => {
         sourceFile.addStatements(
           /* ts */
           `
-    export const ${procName} = t.procedure
-      `
+    export const ${procName} = t.procedure`
         );
       }
       sourceFile.addStatements(
         /* ts */
         `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})
+      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
+    experimental_nextAppDirCaller({
+      normalizeFormData: true,
+    }),
+  )` : ""}
       `
       );
     });
@@ -11645,7 +11633,7 @@ async function generate(options) {
   queries.sort();
   mutations.sort();
   subscriptions.sort();
-  if (config.withShield !== false) {
+  if (config.withShields !== false) {
     consoleLog("Generating tRPC Shield");
     const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
@@ -11700,8 +11688,8 @@ export default {${config.withNext ? "\n transformer," : ""}
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+  if (config.withShields) {
+    await generateShieldImport(createRouter, options, config.withShields);
   }
   consoleLog("Generating tRPC base router");
   await generateBaseRouter(createRouter, config, options);

package/dist/index.cjs

@@ -6879,13 +6879,13 @@ var configMiddleware = z.union([
 ]);
 var configShield = z.union([
   configBoolean,
-  z.string().default("../src/trpc/shield")
+  z.string().default("../src/trpc/shields")
 ]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
   debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("true"),
-  withShield: configShield.default("true"),
+  withMiddleware: configMiddleware.default("false"),
+  withShields: configShield.default("true"),
   withZod: configBoolean.default("true"),
   withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
@@ -7618,7 +7618,7 @@ __name(getRelativePath, "getRelativePath");
 
 // src/helpers.ts
 var getProcedureName = /* @__PURE__ */ __name((config) => {
-  return config.withShield ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
+  return config.withShields ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
 }, "getProcedureName");
 var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config }) => {
   const imports = [
@@ -7678,6 +7678,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       `
     import { createContext } from '${relativeContextPath}';
     import { initTRPC, TRPCError } from '@trpc/server';
+    import { experimental_nextAppDirCaller } from '@trpc/server/adapters/next-app-dir';
     import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
   `
     );
@@ -7726,7 +7727,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
-  if (config.withShield) {
+  if (config.withShields) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7759,22 +7760,6 @@ export const createCallerFactory = t.createCallerFactory;`
     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);
   `
     );
@@ -7786,14 +7771,17 @@ export const protectedProcedure = publicProcedure.use((opts) => {
         sourceFile.addStatements(
           /* ts */
           `
-    export const ${procName} = t.procedure
-      `
+    export const ${procName} = t.procedure`
         );
       }
       sourceFile.addStatements(
         /* ts */
         `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})
+      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
+    experimental_nextAppDirCaller({
+      normalizeFormData: true,
+    }),
+  )` : ""}
       `
       );
     });
@@ -11636,7 +11624,7 @@ async function generate(options) {
   queries.sort();
   mutations.sort();
   subscriptions.sort();
-  if (config.withShield !== false) {
+  if (config.withShields !== false) {
     consoleLog("Generating tRPC Shield");
     const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
@@ -11691,8 +11679,8 @@ export default {${config.withNext ? "\n transformer," : ""}
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+  if (config.withShields) {
+    await generateShieldImport(createRouter, options, config.withShields);
   }
   consoleLog("Generating tRPC base router");
   await generateBaseRouter(createRouter, config, options);

package/dist/index.js

@@ -6884,13 +6884,13 @@ var configMiddleware = z.union([
 ]);
 var configShield = z.union([
   configBoolean,
-  z.string().default("../src/trpc/shield")
+  z.string().default("../src/trpc/shields")
 ]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
   debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("true"),
-  withShield: configShield.default("true"),
+  withMiddleware: configMiddleware.default("false"),
+  withShields: configShield.default("true"),
   withZod: configBoolean.default("true"),
   withNext: configBoolean.default("true"),
   contextPath: z.string().default("../src/trpc/context"),
@@ -7623,7 +7623,7 @@ __name(getRelativePath, "getRelativePath");
 
 // src/helpers.ts
 var getProcedureName = /* @__PURE__ */ __name((config) => {
-  return config.withShield ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
+  return config.withShields ? "shieldedProcedure" : config.withMiddleware ? "protectedProcedure" : "publicProcedure";
 }, "getProcedureName");
 var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config }) => {
   const imports = [
@@ -7683,6 +7683,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       `
     import { createContext } from '${relativeContextPath}';
     import { initTRPC, TRPCError } from '@trpc/server';
+    import { experimental_nextAppDirCaller } from '@trpc/server/adapters/next-app-dir';
     import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';
   `
     );
@@ -7731,7 +7732,7 @@ async function generateBaseRouter(sourceFile, config, options) {
       )
     });
   }
-  if (config.withShield) {
+  if (config.withShields) {
     sourceFile.addStatements(
       /* ts */
       `
@@ -7764,22 +7765,6 @@ export const createCallerFactory = t.createCallerFactory;`
     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);
   `
     );
@@ -7791,14 +7776,17 @@ export const protectedProcedure = publicProcedure.use((opts) => {
         sourceFile.addStatements(
           /* ts */
           `
-    export const ${procName} = t.procedure
-      `
+    export const ${procName} = t.procedure`
         );
       }
       sourceFile.addStatements(
         /* ts */
         `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})
+      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
+    experimental_nextAppDirCaller({
+      normalizeFormData: true,
+    }),
+  )` : ""}
       `
       );
     });
@@ -11641,7 +11629,7 @@ async function generate(options) {
   queries.sort();
   mutations.sort();
   subscriptions.sort();
-  if (config.withShield !== false) {
+  if (config.withShields !== false) {
     consoleLog("Generating tRPC Shield");
     const shieldOutputDir = outputDir;
     consoleLog("Constructing tRPC Shield source file");
@@ -11696,8 +11684,8 @@ export default {${config.withNext ? "\n transformer," : ""}
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
-  if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+  if (config.withShields) {
+    await generateShieldImport(createRouter, options, config.withShields);
   }
   consoleLog("Generating tRPC base router");
   await generateBaseRouter(createRouter, config, options);

package/package.json

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