@stryke/prisma-trpc-generator 0.7.3 → 0.7.4

package/dist/generator.cjs

@@ -7303,6 +7303,14 @@ function findFilePath(filePath) {
   }), "");
 }
 __name(findFilePath, "findFilePath");
+function findFileExtension(filePath) {
+  if (filePath === "..") {
+    return "";
+  }
+  const match = /.(\.[^./]+|\.)$/.exec(normalizeWindowsPath2(filePath));
+  return match && match[1] || EMPTY_STRING;
+}
+__name(findFileExtension, "findFileExtension");
 function resolvePath(path6, cwd2 = getWorkspaceRoot()) {
   const paths = normalizeWindowsPath2(path6).split("/");
   let resolvedPath = "";
@@ -7361,24 +7369,16 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["aggregateRaw"] = "aggregateRaw";
   return ModelAction2;
 }(ModelAction || {});
-var configBoolean = z.enum([
-  "true",
-  "false"
-]).transform((arg) => JSON.parse(arg));
-var configMiddleware = z.union([
-  configBoolean,
-  z.string().default("../src/trpc/middleware")
-]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
-  debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("false"),
-  withShield: z.boolean().or(z.string()).default("true"),
-  withZod: configBoolean.default("true"),
-  withNext: configBoolean.default("true"),
+  debug: z.boolean().or(z.string()).default(false),
+  withMiddleware: z.boolean().or(z.string()).default(false),
+  withShield: z.boolean().or(z.string()).default(true),
+  withZod: z.boolean().default(true),
+  withNext: z.boolean().default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.boolean().or(z.string()).optional(),
-  showModelNameInProcedure: configBoolean.default("true"),
+  trpcOptions: z.boolean().or(z.string()).default(true),
+  showModelNameInProcedure: z.boolean().default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7610,9 +7610,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
+var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, outputDir, value) => {
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
     shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
@@ -11595,7 +11593,7 @@ 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" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" ? findFileExtension(config.withShield) ? findFilePath(config.withShield) : config.withShield : outputDir;
       const shieldText = await constructShield({
         queries,
         mutations,
@@ -11630,16 +11628,16 @@ export default {${config.withNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
+  const trpcExports = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
   if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+    await generateShieldImport(trpcExports, options, outputDir, config.withShield);
   }
   consoleLog("Generating tRPC base router");
-  await generateBaseRouter(createRouter, config, options);
-  createRouter.formatText({
+  await generateBaseRouter(trpcExports, config, options);
+  trpcExports.formatText({
     indentSize: 2
   });
   const appRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", `index.ts`), void 0, {

package/dist/generator.js

@@ -7308,6 +7308,14 @@ function findFilePath(filePath) {
   }), "");
 }
 __name(findFilePath, "findFilePath");
+function findFileExtension(filePath) {
+  if (filePath === "..") {
+    return "";
+  }
+  const match = /.(\.[^./]+|\.)$/.exec(normalizeWindowsPath2(filePath));
+  return match && match[1] || EMPTY_STRING;
+}
+__name(findFileExtension, "findFileExtension");
 function resolvePath(path6, cwd2 = getWorkspaceRoot()) {
   const paths = normalizeWindowsPath2(path6).split("/");
   let resolvedPath = "";
@@ -7366,24 +7374,16 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["aggregateRaw"] = "aggregateRaw";
   return ModelAction2;
 }(ModelAction || {});
-var configBoolean = z.enum([
-  "true",
-  "false"
-]).transform((arg) => JSON.parse(arg));
-var configMiddleware = z.union([
-  configBoolean,
-  z.string().default("../src/trpc/middleware")
-]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
-  debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("false"),
-  withShield: z.boolean().or(z.string()).default("true"),
-  withZod: configBoolean.default("true"),
-  withNext: configBoolean.default("true"),
+  debug: z.boolean().or(z.string()).default(false),
+  withMiddleware: z.boolean().or(z.string()).default(false),
+  withShield: z.boolean().or(z.string()).default(true),
+  withZod: z.boolean().default(true),
+  withNext: z.boolean().default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.boolean().or(z.string()).optional(),
-  showModelNameInProcedure: configBoolean.default("true"),
+  trpcOptions: z.boolean().or(z.string()).default(true),
+  showModelNameInProcedure: z.boolean().default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7615,9 +7615,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
+var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, outputDir, value) => {
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
     shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
@@ -11600,7 +11598,7 @@ 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" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" ? findFileExtension(config.withShield) ? findFilePath(config.withShield) : config.withShield : outputDir;
       const shieldText = await constructShield({
         queries,
         mutations,
@@ -11635,16 +11633,16 @@ export default {${config.withNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
+  const trpcExports = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
   if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+    await generateShieldImport(trpcExports, options, outputDir, config.withShield);
   }
   consoleLog("Generating tRPC base router");
-  await generateBaseRouter(createRouter, config, options);
-  createRouter.formatText({
+  await generateBaseRouter(trpcExports, config, options);
+  trpcExports.formatText({
     indentSize: 2
   });
   const appRouter = project.createSourceFile(path5.resolve(outputDir, "routers", `index.ts`), void 0, {

package/dist/index.cjs

@@ -7299,6 +7299,14 @@ function findFilePath(filePath) {
   }), "");
 }
 __name(findFilePath, "findFilePath");
+function findFileExtension(filePath) {
+  if (filePath === "..") {
+    return "";
+  }
+  const match = /.(\.[^./]+|\.)$/.exec(normalizeWindowsPath2(filePath));
+  return match && match[1] || EMPTY_STRING;
+}
+__name(findFileExtension, "findFileExtension");
 function resolvePath(path6, cwd2 = getWorkspaceRoot()) {
   const paths = normalizeWindowsPath2(path6).split("/");
   let resolvedPath = "";
@@ -7357,24 +7365,16 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["aggregateRaw"] = "aggregateRaw";
   return ModelAction2;
 }(ModelAction || {});
-var configBoolean = z.enum([
-  "true",
-  "false"
-]).transform((arg) => JSON.parse(arg));
-var configMiddleware = z.union([
-  configBoolean,
-  z.string().default("../src/trpc/middleware")
-]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
-  debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("false"),
-  withShield: z.boolean().or(z.string()).default("true"),
-  withZod: configBoolean.default("true"),
-  withNext: configBoolean.default("true"),
+  debug: z.boolean().or(z.string()).default(false),
+  withMiddleware: z.boolean().or(z.string()).default(false),
+  withShield: z.boolean().or(z.string()).default(true),
+  withZod: z.boolean().default(true),
+  withNext: z.boolean().default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.boolean().or(z.string()).optional(),
-  showModelNameInProcedure: configBoolean.default("true"),
+  trpcOptions: z.boolean().or(z.string()).default(true),
+  showModelNameInProcedure: z.boolean().default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7606,9 +7606,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
+var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, outputDir, value) => {
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
     shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
@@ -11591,7 +11589,7 @@ 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" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" ? findFileExtension(config.withShield) ? findFilePath(config.withShield) : config.withShield : outputDir;
       const shieldText = await constructShield({
         queries,
         mutations,
@@ -11626,16 +11624,16 @@ export default {${config.withNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
+  const trpcExports = project.createSourceFile(import_node_path6.default.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
   if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+    await generateShieldImport(trpcExports, options, outputDir, config.withShield);
   }
   consoleLog("Generating tRPC base router");
-  await generateBaseRouter(createRouter, config, options);
-  createRouter.formatText({
+  await generateBaseRouter(trpcExports, config, options);
+  trpcExports.formatText({
     indentSize: 2
   });
   const appRouter = project.createSourceFile(import_node_path6.default.resolve(outputDir, "routers", `index.ts`), void 0, {

package/dist/index.js

@@ -7304,6 +7304,14 @@ function findFilePath(filePath) {
   }), "");
 }
 __name(findFilePath, "findFilePath");
+function findFileExtension(filePath) {
+  if (filePath === "..") {
+    return "";
+  }
+  const match = /.(\.[^./]+|\.)$/.exec(normalizeWindowsPath2(filePath));
+  return match && match[1] || EMPTY_STRING;
+}
+__name(findFileExtension, "findFileExtension");
 function resolvePath(path6, cwd2 = getWorkspaceRoot()) {
   const paths = normalizeWindowsPath2(path6).split("/");
   let resolvedPath = "";
@@ -7362,24 +7370,16 @@ var ModelAction = /* @__PURE__ */ function(ModelAction2) {
   ModelAction2["aggregateRaw"] = "aggregateRaw";
   return ModelAction2;
 }(ModelAction || {});
-var configBoolean = z.enum([
-  "true",
-  "false"
-]).transform((arg) => JSON.parse(arg));
-var configMiddleware = z.union([
-  configBoolean,
-  z.string().default("../src/trpc/middleware")
-]);
 var modelActionEnum = z.nativeEnum(ModelAction);
 var configSchema = z.object({
-  debug: configBoolean.default("false"),
-  withMiddleware: configMiddleware.default("false"),
-  withShield: z.boolean().or(z.string()).default("true"),
-  withZod: configBoolean.default("true"),
-  withNext: configBoolean.default("true"),
+  debug: z.boolean().or(z.string()).default(false),
+  withMiddleware: z.boolean().or(z.string()).default(false),
+  withShield: z.boolean().or(z.string()).default(true),
+  withZod: z.boolean().default(true),
+  withNext: z.boolean().default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.boolean().or(z.string()).optional(),
-  showModelNameInProcedure: configBoolean.default("true"),
+  trpcOptions: z.boolean().or(z.string()).default(true),
+  showModelNameInProcedure: z.boolean().default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
   })
@@ -7611,9 +7611,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
     namedImports: imports
   });
 }, "generateCreateRouterImport");
-var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, value) => {
-  const internals = await getPrismaInternals();
-  const outputDir = internals.parseEnvValue(options.generator.output);
+var generateShieldImport = /* @__PURE__ */ __name(async (sourceFile, options, outputDir, value) => {
   let shieldPath = joinPaths(outputDir, "shield");
   if (typeof value === "string") {
     shieldPath = getRelativePath(outputDir, value, true, options.schemaPath);
@@ -11596,7 +11594,7 @@ 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" && config.withShield !== "true" ? findFilePath(config.withShield) : outputDir;
+      const shieldOutputDir = typeof config.withShield === "string" ? findFileExtension(config.withShield) ? findFilePath(config.withShield) : config.withShield : outputDir;
       const shieldText = await constructShield({
         queries,
         mutations,
@@ -11631,16 +11629,16 @@ export default {${config.withNext ? "\n transformer," : ""}
 `);
   }
   resolveModelsComments(models, hiddenModels);
-  const createRouter = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
+  const trpcExports = project.createSourceFile(path5.resolve(outputDir, "trpc.ts"), void 0, {
     overwrite: true
   });
   consoleLog("Generating tRPC imports");
   if (config.withShield) {
-    await generateShieldImport(createRouter, options, config.withShield);
+    await generateShieldImport(trpcExports, options, outputDir, config.withShield);
   }
   consoleLog("Generating tRPC base router");
-  await generateBaseRouter(createRouter, config, options);
-  createRouter.formatText({
+  await generateBaseRouter(trpcExports, config, options);
+  trpcExports.formatText({
     indentSize: 2
   });
   const appRouter = project.createSourceFile(path5.resolve(outputDir, "routers", `index.ts`), void 0, {

package/package.json

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