@stryke/prisma-trpc-generator 0.7.5 → 0.7.6

package/dist/generator.cjs

@@ -7334,6 +7334,28 @@ 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();
@@ -7377,7 +7399,7 @@ var configSchema = z.object({
   withZod: z.coerce.boolean().or(z.string()).default(true),
   withNext: z.coerce.boolean().or(z.string()).default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.coerce.boolean().or(z.string()).optional(),
+  trpcOptions: z.coerce.boolean().or(z.string()).default(true),
   showModelNameInProcedure: z.coerce.boolean().or(z.string()).default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
@@ -7589,7 +7611,7 @@ function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath,
     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 = relativePath(_fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7700,7 +7722,8 @@ async function generateBaseRouter(sourceFile, config, options) {
     sourceFile.addStatements(
       /* ts */
       `
-    export const permissionsMiddleware = t.middleware(permissions); `
+    export const permissionsMiddleware = t.middleware(permissions);
+    `
     );
     middlewares.push({
       type: "shield",
@@ -7725,14 +7748,6 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.withNext) {
-    sourceFile.addStatements(
-      /* ts */
-      `
-  export const createAction = createTRPCServerActionHandler(t, createContext);
-  `
-    );
-  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7749,6 +7764,15 @@ export const createCallerFactory = t.createCallerFactory;`
       );
     });
   }
+  if (config.withNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction: ReturnType<typeof createTRPCServerActionHandler> =
+    createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
 }
 __name(generateBaseRouter, "generateBaseRouter");
 function generateProcedure(sourceFile, name, typeName, modelName, opType, baseOpType, config) {
@@ -7926,7 +7950,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
   return wrapped;
 }, "wrapWithTrpcShieldCall");
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
-  return `export const permissions = ${shieldObjectText};`;
+  return `export const permissions: ReturnType<typeof shield<Context>> = ${shieldObjectText};`;
 }, "wrapWithExport");
 var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
@@ -10302,11 +10326,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    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"));
+    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"));
     }
-    const normalized = correctPath(relativePath);
+    const normalized = correctPath(relativePath2);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);

package/dist/generator.js

@@ -7339,6 +7339,28 @@ 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();
@@ -7382,7 +7404,7 @@ var configSchema = z.object({
   withZod: z.coerce.boolean().or(z.string()).default(true),
   withNext: z.coerce.boolean().or(z.string()).default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.coerce.boolean().or(z.string()).optional(),
+  trpcOptions: z.coerce.boolean().or(z.string()).default(true),
   showModelNameInProcedure: z.coerce.boolean().or(z.string()).default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
@@ -7594,7 +7616,7 @@ function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath,
     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 = relativePath(_fromPath, toPath).split(path2.sep).join(path2.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7705,7 +7727,8 @@ async function generateBaseRouter(sourceFile, config, options) {
     sourceFile.addStatements(
       /* ts */
       `
-    export const permissionsMiddleware = t.middleware(permissions); `
+    export const permissionsMiddleware = t.middleware(permissions);
+    `
     );
     middlewares.push({
       type: "shield",
@@ -7730,14 +7753,6 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.withNext) {
-    sourceFile.addStatements(
-      /* ts */
-      `
-  export const createAction = createTRPCServerActionHandler(t, createContext);
-  `
-    );
-  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7754,6 +7769,15 @@ export const createCallerFactory = t.createCallerFactory;`
       );
     });
   }
+  if (config.withNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction: ReturnType<typeof createTRPCServerActionHandler> =
+    createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
 }
 __name(generateBaseRouter, "generateBaseRouter");
 function generateProcedure(sourceFile, name, typeName, modelName, opType, baseOpType, config) {
@@ -7931,7 +7955,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
   return wrapped;
 }, "wrapWithTrpcShieldCall");
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
-  return `export const permissions = ${shieldObjectText};`;
+  return `export const permissions: ReturnType<typeof shield<Context>> = ${shieldObjectText};`;
 }, "wrapWithExport");
 var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
@@ -10307,11 +10331,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath = path3.relative(path3.dirname(indexPath), filePath);
-    if (relativePath.endsWith(".ts")) {
-      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
+    let relativePath2 = path3.relative(path3.dirname(indexPath), filePath);
+    if (relativePath2.endsWith(".ts")) {
+      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath);
+    const normalized = correctPath(relativePath2);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);

package/dist/index.cjs

@@ -7330,6 +7330,28 @@ 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();
@@ -7373,7 +7395,7 @@ var configSchema = z.object({
   withZod: z.coerce.boolean().or(z.string()).default(true),
   withNext: z.coerce.boolean().or(z.string()).default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.coerce.boolean().or(z.string()).optional(),
+  trpcOptions: z.coerce.boolean().or(z.string()).default(true),
   showModelNameInProcedure: z.coerce.boolean().or(z.string()).default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
@@ -7585,7 +7607,7 @@ function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath,
     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 = relativePath(_fromPath, toPath).split(import_node_path3.default.sep).join(import_node_path3.default.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7696,7 +7718,8 @@ async function generateBaseRouter(sourceFile, config, options) {
     sourceFile.addStatements(
       /* ts */
       `
-    export const permissionsMiddleware = t.middleware(permissions); `
+    export const permissionsMiddleware = t.middleware(permissions);
+    `
     );
     middlewares.push({
       type: "shield",
@@ -7721,14 +7744,6 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.withNext) {
-    sourceFile.addStatements(
-      /* ts */
-      `
-  export const createAction = createTRPCServerActionHandler(t, createContext);
-  `
-    );
-  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7745,6 +7760,15 @@ export const createCallerFactory = t.createCallerFactory;`
       );
     });
   }
+  if (config.withNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction: ReturnType<typeof createTRPCServerActionHandler> =
+    createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
 }
 __name(generateBaseRouter, "generateBaseRouter");
 function generateProcedure(sourceFile, name, typeName, modelName, opType, baseOpType, config) {
@@ -7922,7 +7946,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
   return wrapped;
 }, "wrapWithTrpcShieldCall");
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
-  return `export const permissions = ${shieldObjectText};`;
+  return `export const permissions: ReturnType<typeof shield<Context>> = ${shieldObjectText};`;
 }, "wrapWithExport");
 var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
@@ -10298,11 +10322,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    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"));
+    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"));
     }
-    const normalized = correctPath(relativePath);
+    const normalized = correctPath(relativePath2);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);

package/dist/index.js

@@ -7335,6 +7335,28 @@ 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();
@@ -7378,7 +7400,7 @@ var configSchema = z.object({
   withZod: z.coerce.boolean().or(z.string()).default(true),
   withNext: z.coerce.boolean().or(z.string()).default(true),
   contextPath: z.string().default("../src/trpc/context"),
-  trpcOptions: z.coerce.boolean().or(z.string()).optional(),
+  trpcOptions: z.coerce.boolean().or(z.string()).default(true),
   showModelNameInProcedure: z.coerce.boolean().or(z.string()).default(true),
   generateModelActions: z.string().default(Object.values(ModelAction).join(",")).transform((arg) => {
     return arg.split(",").map((action) => modelActionEnum.parse(action.trim()));
@@ -7590,7 +7612,7 @@ function getRelativePath(outputPath, filePath, isOutsideOutputPath, schemaPath,
     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 = relativePath(_fromPath, toPath).split(path2.sep).join(path2.posix.sep);
   return newPath;
 }
 __name(getRelativePath, "getRelativePath");
@@ -7701,7 +7723,8 @@ async function generateBaseRouter(sourceFile, config, options) {
     sourceFile.addStatements(
       /* ts */
       `
-    export const permissionsMiddleware = t.middleware(permissions); `
+    export const permissionsMiddleware = t.middleware(permissions);
+    `
     );
     middlewares.push({
       type: "shield",
@@ -7726,14 +7749,6 @@ export const createCallerFactory = t.createCallerFactory;`
     `
     export const publicProcedure = t.procedure; `
   );
-  if (config.withNext) {
-    sourceFile.addStatements(
-      /* ts */
-      `
-  export const createAction = createTRPCServerActionHandler(t, createContext);
-  `
-    );
-  }
   if (middlewares.length > 0) {
     const procName = getProcedureName(config);
     middlewares.forEach((middleware, i) => {
@@ -7750,6 +7765,15 @@ export const createCallerFactory = t.createCallerFactory;`
       );
     });
   }
+  if (config.withNext) {
+    sourceFile.addStatements(
+      /* ts */
+      `
+  export const createAction: ReturnType<typeof createTRPCServerActionHandler> =
+    createTRPCServerActionHandler(t, createContext);
+  `
+    );
+  }
 }
 __name(generateBaseRouter, "generateBaseRouter");
 function generateProcedure(sourceFile, name, typeName, modelName, opType, baseOpType, config) {
@@ -7927,7 +7951,7 @@ var wrapWithTrpcShieldCall = /* @__PURE__ */ __name(({ shieldObjectTextWrapped }
   return wrapped;
 }, "wrapWithTrpcShieldCall");
 var wrapWithExport = /* @__PURE__ */ __name(({ shieldObjectText }) => {
-  return `export const permissions = ${shieldObjectText};`;
+  return `export const permissions: ReturnType<typeof shield<Context>> = ${shieldObjectText};`;
 }, "wrapWithExport");
 var constructShield = /* @__PURE__ */ __name(async ({ queries, mutations, subscriptions }, config, options, outputDir) => {
   if (queries.length === 0 && mutations.length === 0 && subscriptions.length === 0) {
@@ -10303,11 +10327,11 @@ var writeFileSafely = /* @__PURE__ */ __name(async (writeLocation, content, addT
 }, "writeFileSafely");
 var writeIndexFile = /* @__PURE__ */ __name(async (indexPath) => {
   const rows = Array.from(indexExports).map((filePath) => {
-    let relativePath = path3.relative(path3.dirname(indexPath), filePath);
-    if (relativePath.endsWith(".ts")) {
-      relativePath = relativePath.slice(0, relativePath.lastIndexOf(".ts"));
+    let relativePath2 = path3.relative(path3.dirname(indexPath), filePath);
+    if (relativePath2.endsWith(".ts")) {
+      relativePath2 = relativePath2.slice(0, relativePath2.lastIndexOf(".ts"));
     }
-    const normalized = correctPath(relativePath);
+    const normalized = correctPath(relativePath2);
     return `export * from './${normalized}'`;
   });
   await writeFileSafely(indexPath, rows.join("\n"), false);

package/package.json

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