@stryke/prisma-trpc-generator 0.7.1 → 0.7.2

package/dist/generator.cjs

@@ -7637,7 +7637,7 @@ var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, va
   const outputDir = internals.parseEnvValue(options.generator.output);
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
-    shieldPath = joinPaths(relativePath(outputDir, options.schemaPath), value);
+    shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
   }
   sourceFile.addImportDeclaration({
     moduleSpecifier: shieldPath,
@@ -7657,37 +7657,30 @@ 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 = joinPaths(relativePath(outputDir, options.schemaPath), config.contextPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${relativeContextPath}';
-  `
+  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';`
   );
   if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
-    `
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';`
     );
   }
   if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
-      `
-    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';
-  `
+      `import { createContext } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+    import { initTRPC } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';`
     );
   }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
-  `
+  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});`
   );
   const middlewares = [];
   if (config.withMiddleware && typeof config.withMiddleware === "boolean") {
@@ -7776,13 +7769,7 @@ export const createCallerFactory = t.createCallerFactory;`
       }
       sourceFile.addStatements(
         /* ts */
-        `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
-    experimental_nextAppDirCaller({
-      normalizeFormData: true,
-    }),
-  )` : ""}
-      `
+        `.use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})`
       );
     });
   }
@@ -11635,21 +11622,7 @@ async function generate(options) {
         queries,
         mutations,
         subscriptions
-      }, config, {
-        ...options,
-        generator: {
-          ...options.generator,
-          output: {
-            fromEnvVar: null,
-            ...options.generator.output,
-            value: outputDir
-          },
-          config: {
-            ...options.generator.config,
-            contextPath: config.contextPath
-          }
-        }
-      }, shieldOutputDir);
+      }, config, options, shieldOutputDir);
       consoleLog("Saving tRPC Shield source file to disk");
       await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
     }

package/dist/generator.js

@@ -7642,7 +7642,7 @@ var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, va
   const outputDir = internals.parseEnvValue(options.generator.output);
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
-    shieldPath = joinPaths(relativePath(outputDir, options.schemaPath), value);
+    shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
   }
   sourceFile.addImportDeclaration({
     moduleSpecifier: shieldPath,
@@ -7662,37 +7662,30 @@ 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 = joinPaths(relativePath(outputDir, options.schemaPath), config.contextPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${relativeContextPath}';
-  `
+  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';`
   );
   if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
-    `
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';`
     );
   }
   if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
-      `
-    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';
-  `
+      `import { createContext } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+    import { initTRPC } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';`
     );
   }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
-  `
+  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});`
   );
   const middlewares = [];
   if (config.withMiddleware && typeof config.withMiddleware === "boolean") {
@@ -7781,13 +7774,7 @@ export const createCallerFactory = t.createCallerFactory;`
       }
       sourceFile.addStatements(
         /* ts */
-        `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
-    experimental_nextAppDirCaller({
-      normalizeFormData: true,
-    }),
-  )` : ""}
-      `
+        `.use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})`
       );
     });
   }
@@ -11640,21 +11627,7 @@ async function generate(options) {
         queries,
         mutations,
         subscriptions
-      }, config, {
-        ...options,
-        generator: {
-          ...options.generator,
-          output: {
-            fromEnvVar: null,
-            ...options.generator.output,
-            value: outputDir
-          },
-          config: {
-            ...options.generator.config,
-            contextPath: config.contextPath
-          }
-        }
-      }, shieldOutputDir);
+      }, config, options, shieldOutputDir);
       consoleLog("Saving tRPC Shield source file to disk");
       await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
     }

package/dist/index.cjs

@@ -7633,7 +7633,7 @@ var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, va
   const outputDir = internals.parseEnvValue(options.generator.output);
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
-    shieldPath = joinPaths(relativePath(outputDir, options.schemaPath), value);
+    shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
   }
   sourceFile.addImportDeclaration({
     moduleSpecifier: shieldPath,
@@ -7653,37 +7653,30 @@ 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 = joinPaths(relativePath(outputDir, options.schemaPath), config.contextPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${relativeContextPath}';
-  `
+  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';`
   );
   if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
-    `
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';`
     );
   }
   if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
-      `
-    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';
-  `
+      `import { createContext } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+    import { initTRPC } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';`
     );
   }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
-  `
+  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});`
   );
   const middlewares = [];
   if (config.withMiddleware && typeof config.withMiddleware === "boolean") {
@@ -7772,13 +7765,7 @@ export const createCallerFactory = t.createCallerFactory;`
       }
       sourceFile.addStatements(
         /* ts */
-        `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
-    experimental_nextAppDirCaller({
-      normalizeFormData: true,
-    }),
-  )` : ""}
-      `
+        `.use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})`
       );
     });
   }
@@ -11631,21 +11618,7 @@ async function generate(options) {
         queries,
         mutations,
         subscriptions
-      }, config, {
-        ...options,
-        generator: {
-          ...options.generator,
-          output: {
-            fromEnvVar: null,
-            ...options.generator.output,
-            value: outputDir
-          },
-          config: {
-            ...options.generator.config,
-            contextPath: config.contextPath
-          }
-        }
-      }, shieldOutputDir);
+      }, config, options, shieldOutputDir);
       consoleLog("Saving tRPC Shield source file to disk");
       await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
     }

package/dist/index.js

@@ -7638,7 +7638,7 @@ var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, va
   const outputDir = internals.parseEnvValue(options.generator.output);
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
-    shieldPath = joinPaths(relativePath(outputDir, options.schemaPath), value);
+    shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
   }
   sourceFile.addImportDeclaration({
     moduleSpecifier: shieldPath,
@@ -7658,37 +7658,30 @@ 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 = joinPaths(relativePath(outputDir, options.schemaPath), config.contextPath);
   sourceFile.addStatements(
     /* ts */
     `
-  import type { Context } from '${relativeContextPath}';
-  `
+  import type { Context } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';`
   );
   if (config.trpcOptions) {
     sourceFile.addStatements(
       /* ts */
       `
-    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';
-    `
+    import trpcOptions from '${getRelativePath(outputDir, typeof config.trpcOptions === "boolean" ? joinPaths(outputDir, "options") : config.trpcOptions, true, options.schemaPath)}';`
     );
   }
   if (config.withNext) {
     sourceFile.addStatements(
       /* ts */
-      `
-    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';
-  `
+      `import { createContext } from '${getRelativePath(outputDir, config.contextPath, true, options.schemaPath)}';
+    import { initTRPC } from '@trpc/server';
+    import { createTRPCServerActionHandler } from '@stryke/trpc-next/action-handler';`
     );
   }
   sourceFile.addStatements(
     /* ts */
     `
-  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});
-  `
+  export const t = initTRPC.context<Context>().create(${config.trpcOptions ? "trpcOptions" : ""});`
   );
   const middlewares = [];
   if (config.withMiddleware && typeof config.withMiddleware === "boolean") {
@@ -7777,13 +7770,7 @@ export const createCallerFactory = t.createCallerFactory;`
       }
       sourceFile.addStatements(
         /* ts */
-        `
-      .use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})${config.withNext ? `.experimental_caller(
-    experimental_nextAppDirCaller({
-      normalizeFormData: true,
-    }),
-  )` : ""}
-      `
+        `.use(${middleware.type === "shield" ? "permissionsMiddleware" : "globalMiddleware"})`
       );
     });
   }
@@ -11636,21 +11623,7 @@ async function generate(options) {
         queries,
         mutations,
         subscriptions
-      }, config, {
-        ...options,
-        generator: {
-          ...options.generator,
-          output: {
-            fromEnvVar: null,
-            ...options.generator.output,
-            value: outputDir
-          },
-          config: {
-            ...options.generator.config,
-            contextPath: config.contextPath
-          }
-        }
-      }, shieldOutputDir);
+      }, config, options, shieldOutputDir);
       consoleLog("Saving tRPC Shield source file to disk");
       await writeFileSafely(joinPaths(shieldOutputDir, "shield.ts"), shieldText);
     }

package/package.json

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