@stryke/prisma-trpc-generator 0.7.1 → 0.7.3

package/dist/generator.cjs

@@ -7326,28 +7326,6 @@ function resolvePaths(...paths) {
   return resolvePath(joinPaths(...paths.map((path6) => normalizeWindowsPath2(path6))));
 }
 __name(resolvePaths, "resolvePaths");
-function relativePath(from, to) {
-  const _from = resolvePath(from).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  const _to = resolvePath(to).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
-    return _to.join("/");
-  }
-  const _fromCopy = [
-    ..._from
-  ];
-  for (const segment of _fromCopy) {
-    if (_to[0] !== segment) {
-      break;
-    }
-    _from.shift();
-    _to.shift();
-  }
-  return [
-    ..._from.map(() => ".."),
-    ..._to
-  ].join("/");
-}
-__name(relativePath, "relativePath");
 
 // ../string-format/src/lower-case-first.ts
 init_cjs_shims();
@@ -7603,15 +7581,15 @@ __name(getPrismaGeneratorHelper, "getPrismaGeneratorHelper");
 // src/utils/get-relative-path.ts
 init_cjs_shims();
 var import_node_path3 = __toESM(require("node:path"), 1);
-function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath) {
-  const fromPath = import_node_path3.default.join(outputPath, "routers", "helpers");
+function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath, fromPath) {
+  const _fromPath = fromPath || outputPath;
   let toPath = import_node_path3.default.join(outputPath, filePath);
   if (isOutsideOutputPath) {
     const schemaPathSplit = schemaPath?.split(import_node_path3.default.sep);
     const schemaPathWithoutFileAndExtension = schemaPathSplit.slice(0, schemaPathSplit.length - 1).join(import_node_path3.default.posix.sep);
     toPath = import_node_path3.default.join(schemaPathWithoutFileAndExtension, filePath);
   }
-  const newPath = import_node_path3.default.relative(fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
+  const newPath = import_node_path3.default.relative(_fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7637,7 +7615,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 +7635,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 +7747,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"})`
       );
     });
   }
@@ -7965,7 +7930,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, shieldOutputDir) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -7992,7 +7957,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", getRelativePath(outputDir, config.contextPath, true, options.schemaPath));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -10339,11 +10304,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath2 = import_node_path4.default.relative(import_node_path4.default.dirname(indexPath), filePath);
-    if (relativePath2.endsWith(".ts")) {
-      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
+    let relativePath = import_node_path4.default.relative(import_node_path4.default.dirname(indexPath), filePath);
+    if (relativePath.endsWith(".ts")) {
+      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath2);
+    const normalized = correctPath(relativePath);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);
@@ -11630,26 +11595,12 @@ async function generate(options) {
       consoleLog("Skipping  tRPC Shield generation as path provided already exists");
     } else {
       consoleLog("Constructing tRPC Shield source file");
-      const shieldOutputDir = typeof config.withShield === "string" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
       const shieldText = await constructShield({
         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

@@ -7331,28 +7331,6 @@ function resolvePaths(...paths) {
   return resolvePath(joinPaths(...paths.map((path6) => normalizeWindowsPath2(path6))));
 }
 __name(resolvePaths, "resolvePaths");
-function relativePath(from, to) {
-  const _from = resolvePath(from).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  const _to = resolvePath(to).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
-    return _to.join("/");
-  }
-  const _fromCopy = [
-    ..._from
-  ];
-  for (const segment of _fromCopy) {
-    if (_to[0] !== segment) {
-      break;
-    }
-    _from.shift();
-    _to.shift();
-  }
-  return [
-    ..._from.map(() => ".."),
-    ..._to
-  ].join("/");
-}
-__name(relativePath, "relativePath");
 
 // ../string-format/src/lower-case-first.ts
 init_esm_shims();
@@ -7608,15 +7586,15 @@ __name(getPrismaGeneratorHelper, "getPrismaGeneratorHelper");
 // src/utils/get-relative-path.ts
 init_esm_shims();
 import path2 from "node:path";
-function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath) {
-  const fromPath = path2.join(outputPath, "routers", "helpers");
+function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath, fromPath) {
+  const _fromPath = fromPath || outputPath;
   let toPath = path2.join(outputPath, filePath);
   if (isOutsideOutputPath) {
     const schemaPathSplit = schemaPath?.split(path2.sep);
     const schemaPathWithoutFileAndExtension = schemaPathSplit.slice(0, schemaPathSplit.length - 1).join(path2.posix.sep);
     toPath = path2.join(schemaPathWithoutFileAndExtension, filePath);
   }
-  const newPath = path2.relative(fromPath, toPath).split(path2.sep).join(path2.posix.sep);
+  const newPath = path2.relative(_fromPath, toPath).split(path2.sep).join(path2.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7642,7 +7620,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 +7640,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 +7752,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"})`
       );
     });
   }
@@ -7970,7 +7935,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, shieldOutputDir) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -7997,7 +7962,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", getRelativePath(outputDir, config.contextPath, true, options.schemaPath));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -10344,11 +10309,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath2 = path3.relative(path3.dirname(indexPath), filePath);
-    if (relativePath2.endsWith(".ts")) {
-      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
+    let relativePath = path3.relative(path3.dirname(indexPath), filePath);
+    if (relativePath.endsWith(".ts")) {
+      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath2);
+    const normalized = correctPath(relativePath);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);
@@ -11635,26 +11600,12 @@ async function generate(options) {
       consoleLog("Skipping  tRPC Shield generation as path provided already exists");
     } else {
       consoleLog("Constructing tRPC Shield source file");
-      const shieldOutputDir = typeof config.withShield === "string" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
       const shieldText = await constructShield({
         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

@@ -7322,28 +7322,6 @@ function resolvePaths(...paths) {
   return resolvePath(joinPaths(...paths.map((path6) => normalizeWindowsPath2(path6))));
 }
 __name(resolvePaths, "resolvePaths");
-function relativePath(from, to) {
-  const _from = resolvePath(from).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  const _to = resolvePath(to).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
-    return _to.join("/");
-  }
-  const _fromCopy = [
-    ..._from
-  ];
-  for (const segment of _fromCopy) {
-    if (_to[0] !== segment) {
-      break;
-    }
-    _from.shift();
-    _to.shift();
-  }
-  return [
-    ..._from.map(() => ".."),
-    ..._to
-  ].join("/");
-}
-__name(relativePath, "relativePath");
 
 // ../string-format/src/lower-case-first.ts
 init_cjs_shims();
@@ -7599,15 +7577,15 @@ __name(getPrismaGeneratorHelper, "getPrismaGeneratorHelper");
 // src/utils/get-relative-path.ts
 init_cjs_shims();
 var import_node_path3 = __toESM(require("node:path"), 1);
-function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath) {
-  const fromPath = import_node_path3.default.join(outputPath, "routers", "helpers");
+function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath, fromPath) {
+  const _fromPath = fromPath || outputPath;
   let toPath = import_node_path3.default.join(outputPath, filePath);
   if (isOutsideOutputPath) {
     const schemaPathSplit = schemaPath?.split(import_node_path3.default.sep);
     const schemaPathWithoutFileAndExtension = schemaPathSplit.slice(0, schemaPathSplit.length - 1).join(import_node_path3.default.posix.sep);
     toPath = import_node_path3.default.join(schemaPathWithoutFileAndExtension, filePath);
   }
-  const newPath = import_node_path3.default.relative(fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
+  const newPath = import_node_path3.default.relative(_fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7633,7 +7611,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 +7631,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 +7743,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"})`
       );
     });
   }
@@ -7961,7 +7926,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, shieldOutputDir) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -7988,7 +7953,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", getRelativePath(outputDir, config.contextPath, true, options.schemaPath));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -10335,11 +10300,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath2 = import_node_path4.default.relative(import_node_path4.default.dirname(indexPath), filePath);
-    if (relativePath2.endsWith(".ts")) {
-      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
+    let relativePath = import_node_path4.default.relative(import_node_path4.default.dirname(indexPath), filePath);
+    if (relativePath.endsWith(".ts")) {
+      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath2);
+    const normalized = correctPath(relativePath);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);
@@ -11626,26 +11591,12 @@ async function generate(options) {
       consoleLog("Skipping  tRPC Shield generation as path provided already exists");
     } else {
       consoleLog("Constructing tRPC Shield source file");
-      const shieldOutputDir = typeof config.withShield === "string" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
       const shieldText = await constructShield({
         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

@@ -7327,28 +7327,6 @@ function resolvePaths(...paths) {
   return resolvePath(joinPaths(...paths.map((path6) => normalizeWindowsPath2(path6))));
 }
 __name(resolvePaths, "resolvePaths");
-function relativePath(from, to) {
-  const _from = resolvePath(from).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  const _to = resolvePath(to).replace(/^\/([A-Z]:)?$/i, "$1").split("/");
-  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
-    return _to.join("/");
-  }
-  const _fromCopy = [
-    ..._from
-  ];
-  for (const segment of _fromCopy) {
-    if (_to[0] !== segment) {
-      break;
-    }
-    _from.shift();
-    _to.shift();
-  }
-  return [
-    ..._from.map(() => ".."),
-    ..._to
-  ].join("/");
-}
-__name(relativePath, "relativePath");
 
 // ../string-format/src/lower-case-first.ts
 init_esm_shims();
@@ -7604,15 +7582,15 @@ __name(getPrismaGeneratorHelper, "getPrismaGeneratorHelper");
 // src/utils/get-relative-path.ts
 init_esm_shims();
 import path2 from "node:path";
-function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath) {
-  const fromPath = path2.join(outputPath, "routers", "helpers");
+function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath, fromPath) {
+  const _fromPath = fromPath || outputPath;
   let toPath = path2.join(outputPath, filePath);
   if (isOutsideOutputPath) {
     const schemaPathSplit = schemaPath?.split(path2.sep);
     const schemaPathWithoutFileAndExtension = schemaPathSplit.slice(0, schemaPathSplit.length - 1).join(path2.posix.sep);
     toPath = path2.join(schemaPathWithoutFileAndExtension, filePath);
   }
-  const newPath = path2.relative(fromPath, toPath).split(path2.sep).join(path2.posix.sep);
+  const newPath = path2.relative(_fromPath, toPath).split(path2.sep).join(path2.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7638,7 +7616,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 +7636,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 +7748,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"})`
       );
     });
   }
@@ -7966,7 +7931,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, shieldOutputDir) => {
+var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
     return "";
   }
@@ -7993,7 +7958,7 @@ var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscr
     return "";
   }
   let shieldText = getImports("trpc-shield");
-  shieldText += getImports("context", relativePath(shieldOutputDir, joinPaths(options.schemaPath, config.contextPath)));
+  shieldText += getImports("context", getRelativePath(outputDir, config.contextPath, true, options.schemaPath));
   shieldText += "\n\n";
   shieldText += wrapWithExport({
     shieldObjectText: wrapWithTrpcShieldCall({
@@ -10340,11 +10305,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath2 = path3.relative(path3.dirname(indexPath), filePath);
-    if (relativePath2.endsWith(".ts")) {
-      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
+    let relativePath = path3.relative(path3.dirname(indexPath), filePath);
+    if (relativePath.endsWith(".ts")) {
+      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath2);
+    const normalized = correctPath(relativePath);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);
@@ -11631,26 +11596,12 @@ async function generate(options) {
       consoleLog("Skipping  tRPC Shield generation as path provided already exists");
     } else {
       consoleLog("Constructing tRPC Shield source file");
-      const shieldOutputDir = typeof config.withShield === "string" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
       const shieldText = await constructShield({
         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.3",
   "type": "module",
   "description": "A fork of the prisma-trpc-generator code to work in ESM with Prisma v6.",
   "repository": {