npm - @stryke/prisma-trpc-generator - Versions diffs - 0.10.4 → 0.10.6 - Mend

@stryke/prisma-trpc-generator 0.10.4 → 0.10.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/generator.cjs CHANGED Viewed

@@ -7611,7 +7611,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
 }, "generateCreateRouterImport");
 var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural, modelNameCamelCase) => {
   sourceFile.addImportDeclaration({
-    moduleSpecifier: `./${modelNameCamelCase}.router`,
+    moduleSpecifier: `./${lowerCaseFirst(modelNameCamelCase)}.router`,
     namedImports: [
       `${modelNamePlural}Router`
     ]
@@ -7777,7 +7777,7 @@ __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
-  return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
+  return inputType ? `import { ${lowerCaseFirst(inputType)} } from "../schemas/${lowerCaseFirst(opType)}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
 var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   let inputType;
@@ -10644,8 +10644,8 @@ var Transformer = class _Transformer {
   hasJson = false;
   static prismaClientOutputPath = "@prisma/client";
   static isCustomPrismaClientOutputPath = false;
-  static isGenerateSelect = false;
-  static isGenerateInclude = false;
+  static isGenerateSelect = true;
+  static isGenerateInclude = true;
   constructor(params) {
     this.name = params.name ?? "";
     this.fields = params.fields ?? [];
@@ -10677,21 +10677,21 @@ var Transformer = class _Transformer {
   async generateEnumSchemas() {
     for (const enumType2 of this.enumTypes) {
       const { name, values } = enumType2;
-      await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/enums/${name}.schema.ts`), `${this.generateImportZodStatement()}
-${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)})`)}`);
+      await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/enums/${lowerCaseFirst(name)}.schema.ts`), `${this.generateImportZodStatement()}
+${this.generateExportSchemaStatement(`${lowerCaseFirst(name)}`, `z.enum(${JSON.stringify(values)})`)}`);
     }
   }
   generateImportZodStatement() {
     return "import { z } from 'zod';\n";
   }
   generateExportSchemaStatement(name, schema) {
-    return `export const ${name}Schema = ${schema}`;
+    return `export const ${lowerCaseFirst(name)}Schema = ${schema}`;
   }
   async generateObjectSchema() {
     const zodObjectSchemaFields = this.generateObjectSchemaFields();
     const objectSchema = this.prepareObjectSchema(zodObjectSchemaFields);
     const objectSchemaName = this.resolveObjectSchemaName();
-    await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/objects/${objectSchemaName}.schema.ts`), objectSchema);
+    await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/objects/${lowerCaseFirst(objectSchemaName)}.schema.ts`), objectSchema);
   }
   generateObjectSchemaFields() {
     const zodObjectSchemaFields = this.fields.map((field) => this.generateObjectSchemaField(field)).flatMap((item) => item).map((item) => {
@@ -10779,7 +10779,7 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     const arr = inputType.isList ? ".array()" : "";
     const opt = !field.isRequired ? ".optional()" : "";
     const nullable = field.inputTypes.length > 1 && field.inputTypes[1]?.type === "Null" ? ".nullable()" : "";
-    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${schema})${arr}${opt}${nullable}` : `z.lazy(() => ${schema})${arr}${opt}${nullable}`;
+    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}` : `z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}`;
   }
   generateFieldValidators(zodStringWithMainType, field) {
     const { isRequired, isNullable } = field;
@@ -10812,8 +10812,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     if (isAggregateInputType(name)) {
       name = `${name}Type`;
     }
-    const end = `export const ${exportName}ObjectSchema = Schema`;
-    return `const Schema: z.ZodType<Prisma.${name}> = ${schema};
+    const end = `export const ${lowerCaseFirst(exportName)}ObjectSchema = schema`;
+    return `const schema: z.ZodType<Prisma.${name}> = ${schema};
  ${end}`;
   }
@@ -10868,9 +10868,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       if (isModelQueryType) {
         return `import { ${this.resolveModelQuerySchemaName(modelName, queryName)} } from '../${queryName}${modelName}.schema'`;
       } else if (_Transformer.enumNames.includes(name)) {
-        return `import { ${name}Schema } from '../enums/${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}Schema } from '../enums/${lowerCaseFirst(name)}.schema'`;
       } else {
-        return `import { ${name}ObjectSchema } from './${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}ObjectSchema } from './${lowerCaseFirst(name)}.schema'`;
       }
     }).join(";\r\n");
   }
@@ -10895,9 +10895,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     };
   }
   resolveModelQuerySchemaName(modelName, queryName) {
-    const modelNameCapitalized = upperCaseFirst(modelName);
+    const modelNameUncapitalized = lowerCaseFirst(modelName);
     const queryNameCapitalized = upperCaseFirst(queryName);
-    return `${modelNameCapitalized}${queryNameCapitalized}Schema`;
+    return `${modelNameUncapitalized}${queryNameCapitalized}Schema`;
   }
   wrapWithZodUnion(zodStringFields) {
     let wrapped = "";
@@ -10924,12 +10924,11 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       name = _Transformer.rawOpsMap[name];
       exportName = name.replace("Args", "");
     }
-    return exportName;
+    return lowerCaseFirst(exportName);
   }
   async generateModelSchemas() {
     for (const modelOperation of this.modelOperations) {
       const {
-        model: modelName,
         findUnique,
         findFirst,
         findMany,
@@ -10949,7 +10948,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
         aggregate,
         groupBy
       } = modelOperation;
-      const model = findModelByName(this.models, modelName);
+      const model = findModelByName(this.models, modelOperation.model);
+      const modelName = lowerCaseFirst(modelOperation.model);
       const { selectImport, includeImport, selectZodSchemaLine, includeZodSchemaLine, selectZodSchemaLineLazy, includeZodSchemaLineLazy } = this.resolveSelectIncludeImportAndZodSchemaLine(model);
       const { orderByImport, orderByZodSchemaLine } = this.resolveOrderByWithRelationImportAndZodSchemaLine(model);
       if (findUnique) {
@@ -11103,19 +11103,19 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
   resolveSelectIncludeImportAndZodSchemaLine(model) {
     const { name: modelName } = model;
     const hasRelationToAnotherModel = checkModelHasModelRelation(model);
-    const selectImport = _Transformer.isGenerateSelect ? `import { ${modelName}SelectObjectSchema } from './objects/${modelName}Select.schema'` : "";
-    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${modelName}IncludeObjectSchema } from './objects/${modelName}Include.schema'` : "";
+    const selectImport = _Transformer.isGenerateSelect ? `import { ${lowerCaseFirst(modelName)}SelectObjectSchema } from './objects/${lowerCaseFirst(modelName)}Select.schema'` : "";
+    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${lowerCaseFirst(modelName)}IncludeObjectSchema } from './objects/${lowerCaseFirst(modelName)}Include.schema'` : "";
     let selectZodSchemaLine = "";
     let includeZodSchemaLine = "";
     let selectZodSchemaLineLazy = "";
     let includeZodSchemaLineLazy = "";
     if (_Transformer.isGenerateSelect) {
-      const zodSelectObjectSchema = `${modelName}SelectObjectSchema.optional()`;
+      const zodSelectObjectSchema = `${lowerCaseFirst(modelName)}SelectObjectSchema.optional()`;
       selectZodSchemaLine = `select: ${zodSelectObjectSchema},`;
       selectZodSchemaLineLazy = `select: z.lazy(() => ${zodSelectObjectSchema}),`;
     }
     if (_Transformer.isGenerateInclude && hasRelationToAnotherModel) {
-      const zodIncludeObjectSchema = `${modelName}IncludeObjectSchema.optional()`;
+      const zodIncludeObjectSchema = `${lowerCaseFirst(modelName)}IncludeObjectSchema.optional()`;
       includeZodSchemaLine = `include: ${zodIncludeObjectSchema},`;
       includeZodSchemaLineLazy = `include: z.lazy(() => ${zodIncludeObjectSchema}),`;
     }
@@ -11135,9 +11135,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       "postgresql",
       "mysql"
     ].includes(_Transformer.provider) && _Transformer.previewFeatures?.includes("fullTextSearch")) {
-      modelOrderBy = `${modelName}OrderByWithRelationAndSearchRelevanceInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationAndSearchRelevanceInput`;
     } else {
-      modelOrderBy = `${modelName}OrderByWithRelationInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationInput`;
     }
     const orderByImport = `import { ${modelOrderBy}ObjectSchema } from './objects/${modelOrderBy}.schema'`;
     const orderByZodSchemaLine = `orderBy: z.union([${modelOrderBy}ObjectSchema, ${modelOrderBy}ObjectSchema.array()]).optional(),`;
@@ -11681,7 +11681,7 @@ ${JSON.stringify(config)}`);
     const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
-    const modelRouter = project.createSourceFile(import_node_path5.default.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {
+    const modelRouter = project.createSourceFile(import_node_path5.default.resolve(outputDir, "routers", `${lowerCaseFirst(model)}.router.ts`), void 0, {
       overwrite: true
     });
     generateCreateRouterImport({

package/dist/generator.js CHANGED Viewed

@@ -7616,7 +7616,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
 }, "generateCreateRouterImport");
 var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural, modelNameCamelCase) => {
   sourceFile.addImportDeclaration({
-    moduleSpecifier: `./${modelNameCamelCase}.router`,
+    moduleSpecifier: `./${lowerCaseFirst(modelNameCamelCase)}.router`,
     namedImports: [
       `${modelNamePlural}Router`
     ]
@@ -7782,7 +7782,7 @@ __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
-  return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
+  return inputType ? `import { ${lowerCaseFirst(inputType)} } from "../schemas/${lowerCaseFirst(opType)}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
 var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   let inputType;
@@ -10649,8 +10649,8 @@ var Transformer = class _Transformer {
   hasJson = false;
   static prismaClientOutputPath = "@prisma/client";
   static isCustomPrismaClientOutputPath = false;
-  static isGenerateSelect = false;
-  static isGenerateInclude = false;
+  static isGenerateSelect = true;
+  static isGenerateInclude = true;
   constructor(params) {
     this.name = params.name ?? "";
     this.fields = params.fields ?? [];
@@ -10682,21 +10682,21 @@ var Transformer = class _Transformer {
   async generateEnumSchemas() {
     for (const enumType2 of this.enumTypes) {
       const { name, values } = enumType2;
-      await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/enums/${name}.schema.ts`), `${this.generateImportZodStatement()}
-${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)})`)}`);
+      await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/enums/${lowerCaseFirst(name)}.schema.ts`), `${this.generateImportZodStatement()}
+${this.generateExportSchemaStatement(`${lowerCaseFirst(name)}`, `z.enum(${JSON.stringify(values)})`)}`);
     }
   }
   generateImportZodStatement() {
     return "import { z } from 'zod';\n";
   }
   generateExportSchemaStatement(name, schema) {
-    return `export const ${name}Schema = ${schema}`;
+    return `export const ${lowerCaseFirst(name)}Schema = ${schema}`;
   }
   async generateObjectSchema() {
     const zodObjectSchemaFields = this.generateObjectSchemaFields();
     const objectSchema = this.prepareObjectSchema(zodObjectSchemaFields);
     const objectSchemaName = this.resolveObjectSchemaName();
-    await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/objects/${objectSchemaName}.schema.ts`), objectSchema);
+    await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/objects/${lowerCaseFirst(objectSchemaName)}.schema.ts`), objectSchema);
   }
   generateObjectSchemaFields() {
     const zodObjectSchemaFields = this.fields.map((field) => this.generateObjectSchemaField(field)).flatMap((item) => item).map((item) => {
@@ -10784,7 +10784,7 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     const arr = inputType.isList ? ".array()" : "";
     const opt = !field.isRequired ? ".optional()" : "";
     const nullable = field.inputTypes.length > 1 && field.inputTypes[1]?.type === "Null" ? ".nullable()" : "";
-    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${schema})${arr}${opt}${nullable}` : `z.lazy(() => ${schema})${arr}${opt}${nullable}`;
+    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}` : `z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}`;
   }
   generateFieldValidators(zodStringWithMainType, field) {
     const { isRequired, isNullable } = field;
@@ -10817,8 +10817,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     if (isAggregateInputType(name)) {
       name = `${name}Type`;
     }
-    const end = `export const ${exportName}ObjectSchema = Schema`;
-    return `const Schema: z.ZodType<Prisma.${name}> = ${schema};
+    const end = `export const ${lowerCaseFirst(exportName)}ObjectSchema = schema`;
+    return `const schema: z.ZodType<Prisma.${name}> = ${schema};
  ${end}`;
   }
@@ -10873,9 +10873,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       if (isModelQueryType) {
         return `import { ${this.resolveModelQuerySchemaName(modelName, queryName)} } from '../${queryName}${modelName}.schema'`;
       } else if (_Transformer.enumNames.includes(name)) {
-        return `import { ${name}Schema } from '../enums/${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}Schema } from '../enums/${lowerCaseFirst(name)}.schema'`;
       } else {
-        return `import { ${name}ObjectSchema } from './${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}ObjectSchema } from './${lowerCaseFirst(name)}.schema'`;
       }
     }).join(";\r\n");
   }
@@ -10900,9 +10900,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     };
   }
   resolveModelQuerySchemaName(modelName, queryName) {
-    const modelNameCapitalized = upperCaseFirst(modelName);
+    const modelNameUncapitalized = lowerCaseFirst(modelName);
     const queryNameCapitalized = upperCaseFirst(queryName);
-    return `${modelNameCapitalized}${queryNameCapitalized}Schema`;
+    return `${modelNameUncapitalized}${queryNameCapitalized}Schema`;
   }
   wrapWithZodUnion(zodStringFields) {
     let wrapped = "";
@@ -10929,12 +10929,11 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       name = _Transformer.rawOpsMap[name];
       exportName = name.replace("Args", "");
     }
-    return exportName;
+    return lowerCaseFirst(exportName);
   }
   async generateModelSchemas() {
     for (const modelOperation of this.modelOperations) {
       const {
-        model: modelName,
         findUnique,
         findFirst,
         findMany,
@@ -10954,7 +10953,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
         aggregate,
         groupBy
       } = modelOperation;
-      const model = findModelByName(this.models, modelName);
+      const model = findModelByName(this.models, modelOperation.model);
+      const modelName = lowerCaseFirst(modelOperation.model);
       const { selectImport, includeImport, selectZodSchemaLine, includeZodSchemaLine, selectZodSchemaLineLazy, includeZodSchemaLineLazy } = this.resolveSelectIncludeImportAndZodSchemaLine(model);
       const { orderByImport, orderByZodSchemaLine } = this.resolveOrderByWithRelationImportAndZodSchemaLine(model);
       if (findUnique) {
@@ -11108,19 +11108,19 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
   resolveSelectIncludeImportAndZodSchemaLine(model) {
     const { name: modelName } = model;
     const hasRelationToAnotherModel = checkModelHasModelRelation(model);
-    const selectImport = _Transformer.isGenerateSelect ? `import { ${modelName}SelectObjectSchema } from './objects/${modelName}Select.schema'` : "";
-    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${modelName}IncludeObjectSchema } from './objects/${modelName}Include.schema'` : "";
+    const selectImport = _Transformer.isGenerateSelect ? `import { ${lowerCaseFirst(modelName)}SelectObjectSchema } from './objects/${lowerCaseFirst(modelName)}Select.schema'` : "";
+    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${lowerCaseFirst(modelName)}IncludeObjectSchema } from './objects/${lowerCaseFirst(modelName)}Include.schema'` : "";
     let selectZodSchemaLine = "";
     let includeZodSchemaLine = "";
     let selectZodSchemaLineLazy = "";
     let includeZodSchemaLineLazy = "";
     if (_Transformer.isGenerateSelect) {
-      const zodSelectObjectSchema = `${modelName}SelectObjectSchema.optional()`;
+      const zodSelectObjectSchema = `${lowerCaseFirst(modelName)}SelectObjectSchema.optional()`;
       selectZodSchemaLine = `select: ${zodSelectObjectSchema},`;
       selectZodSchemaLineLazy = `select: z.lazy(() => ${zodSelectObjectSchema}),`;
     }
     if (_Transformer.isGenerateInclude && hasRelationToAnotherModel) {
-      const zodIncludeObjectSchema = `${modelName}IncludeObjectSchema.optional()`;
+      const zodIncludeObjectSchema = `${lowerCaseFirst(modelName)}IncludeObjectSchema.optional()`;
       includeZodSchemaLine = `include: ${zodIncludeObjectSchema},`;
       includeZodSchemaLineLazy = `include: z.lazy(() => ${zodIncludeObjectSchema}),`;
     }
@@ -11140,9 +11140,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       "postgresql",
       "mysql"
     ].includes(_Transformer.provider) && _Transformer.previewFeatures?.includes("fullTextSearch")) {
-      modelOrderBy = `${modelName}OrderByWithRelationAndSearchRelevanceInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationAndSearchRelevanceInput`;
     } else {
-      modelOrderBy = `${modelName}OrderByWithRelationInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationInput`;
     }
     const orderByImport = `import { ${modelOrderBy}ObjectSchema } from './objects/${modelOrderBy}.schema'`;
     const orderByZodSchemaLine = `orderBy: z.union([${modelOrderBy}ObjectSchema, ${modelOrderBy}ObjectSchema.array()]).optional(),`;
@@ -11686,7 +11686,7 @@ ${JSON.stringify(config)}`);
     const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
-    const modelRouter = project.createSourceFile(path4.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {
+    const modelRouter = project.createSourceFile(path4.resolve(outputDir, "routers", `${lowerCaseFirst(model)}.router.ts`), void 0, {
       overwrite: true
     });
     generateCreateRouterImport({

package/dist/index.cjs CHANGED Viewed

@@ -7607,7 +7607,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
 }, "generateCreateRouterImport");
 var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural, modelNameCamelCase) => {
   sourceFile.addImportDeclaration({
-    moduleSpecifier: `./${modelNameCamelCase}.router`,
+    moduleSpecifier: `./${lowerCaseFirst(modelNameCamelCase)}.router`,
     namedImports: [
       `${modelNamePlural}Router`
     ]
@@ -7773,7 +7773,7 @@ __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
-  return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
+  return inputType ? `import { ${lowerCaseFirst(inputType)} } from "../schemas/${lowerCaseFirst(opType)}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
 var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   let inputType;
@@ -10640,8 +10640,8 @@ var Transformer = class _Transformer {
   hasJson = false;
   static prismaClientOutputPath = "@prisma/client";
   static isCustomPrismaClientOutputPath = false;
-  static isGenerateSelect = false;
-  static isGenerateInclude = false;
+  static isGenerateSelect = true;
+  static isGenerateInclude = true;
   constructor(params) {
     this.name = params.name ?? "";
     this.fields = params.fields ?? [];
@@ -10673,21 +10673,21 @@ var Transformer = class _Transformer {
   async generateEnumSchemas() {
     for (const enumType2 of this.enumTypes) {
       const { name, values } = enumType2;
-      await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/enums/${name}.schema.ts`), `${this.generateImportZodStatement()}
-${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)})`)}`);
+      await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/enums/${lowerCaseFirst(name)}.schema.ts`), `${this.generateImportZodStatement()}
+${this.generateExportSchemaStatement(`${lowerCaseFirst(name)}`, `z.enum(${JSON.stringify(values)})`)}`);
     }
   }
   generateImportZodStatement() {
     return "import { z } from 'zod';\n";
   }
   generateExportSchemaStatement(name, schema) {
-    return `export const ${name}Schema = ${schema}`;
+    return `export const ${lowerCaseFirst(name)}Schema = ${schema}`;
   }
   async generateObjectSchema() {
     const zodObjectSchemaFields = this.generateObjectSchemaFields();
     const objectSchema = this.prepareObjectSchema(zodObjectSchemaFields);
     const objectSchemaName = this.resolveObjectSchemaName();
-    await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/objects/${objectSchemaName}.schema.ts`), objectSchema);
+    await writeFileSafely(import_node_path4.default.join(_Transformer.outputPath, `schemas/objects/${lowerCaseFirst(objectSchemaName)}.schema.ts`), objectSchema);
   }
   generateObjectSchemaFields() {
     const zodObjectSchemaFields = this.fields.map((field) => this.generateObjectSchemaField(field)).flatMap((item) => item).map((item) => {
@@ -10775,7 +10775,7 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     const arr = inputType.isList ? ".array()" : "";
     const opt = !field.isRequired ? ".optional()" : "";
     const nullable = field.inputTypes.length > 1 && field.inputTypes[1]?.type === "Null" ? ".nullable()" : "";
-    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${schema})${arr}${opt}${nullable}` : `z.lazy(() => ${schema})${arr}${opt}${nullable}`;
+    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}` : `z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}`;
   }
   generateFieldValidators(zodStringWithMainType, field) {
     const { isRequired, isNullable } = field;
@@ -10808,8 +10808,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     if (isAggregateInputType(name)) {
       name = `${name}Type`;
     }
-    const end = `export const ${exportName}ObjectSchema = Schema`;
-    return `const Schema: z.ZodType<Prisma.${name}> = ${schema};
+    const end = `export const ${lowerCaseFirst(exportName)}ObjectSchema = schema`;
+    return `const schema: z.ZodType<Prisma.${name}> = ${schema};
  ${end}`;
   }
@@ -10864,9 +10864,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       if (isModelQueryType) {
         return `import { ${this.resolveModelQuerySchemaName(modelName, queryName)} } from '../${queryName}${modelName}.schema'`;
       } else if (_Transformer.enumNames.includes(name)) {
-        return `import { ${name}Schema } from '../enums/${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}Schema } from '../enums/${lowerCaseFirst(name)}.schema'`;
       } else {
-        return `import { ${name}ObjectSchema } from './${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}ObjectSchema } from './${lowerCaseFirst(name)}.schema'`;
       }
     }).join(";\r\n");
   }
@@ -10891,9 +10891,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     };
   }
   resolveModelQuerySchemaName(modelName, queryName) {
-    const modelNameCapitalized = upperCaseFirst(modelName);
+    const modelNameUncapitalized = lowerCaseFirst(modelName);
     const queryNameCapitalized = upperCaseFirst(queryName);
-    return `${modelNameCapitalized}${queryNameCapitalized}Schema`;
+    return `${modelNameUncapitalized}${queryNameCapitalized}Schema`;
   }
   wrapWithZodUnion(zodStringFields) {
     let wrapped = "";
@@ -10920,12 +10920,11 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       name = _Transformer.rawOpsMap[name];
       exportName = name.replace("Args", "");
     }
-    return exportName;
+    return lowerCaseFirst(exportName);
   }
   async generateModelSchemas() {
     for (const modelOperation of this.modelOperations) {
       const {
-        model: modelName,
         findUnique,
         findFirst,
         findMany,
@@ -10945,7 +10944,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
         aggregate,
         groupBy
       } = modelOperation;
-      const model = findModelByName(this.models, modelName);
+      const model = findModelByName(this.models, modelOperation.model);
+      const modelName = lowerCaseFirst(modelOperation.model);
       const { selectImport, includeImport, selectZodSchemaLine, includeZodSchemaLine, selectZodSchemaLineLazy, includeZodSchemaLineLazy } = this.resolveSelectIncludeImportAndZodSchemaLine(model);
       const { orderByImport, orderByZodSchemaLine } = this.resolveOrderByWithRelationImportAndZodSchemaLine(model);
       if (findUnique) {
@@ -11099,19 +11099,19 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
   resolveSelectIncludeImportAndZodSchemaLine(model) {
     const { name: modelName } = model;
     const hasRelationToAnotherModel = checkModelHasModelRelation(model);
-    const selectImport = _Transformer.isGenerateSelect ? `import { ${modelName}SelectObjectSchema } from './objects/${modelName}Select.schema'` : "";
-    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${modelName}IncludeObjectSchema } from './objects/${modelName}Include.schema'` : "";
+    const selectImport = _Transformer.isGenerateSelect ? `import { ${lowerCaseFirst(modelName)}SelectObjectSchema } from './objects/${lowerCaseFirst(modelName)}Select.schema'` : "";
+    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${lowerCaseFirst(modelName)}IncludeObjectSchema } from './objects/${lowerCaseFirst(modelName)}Include.schema'` : "";
     let selectZodSchemaLine = "";
     let includeZodSchemaLine = "";
     let selectZodSchemaLineLazy = "";
     let includeZodSchemaLineLazy = "";
     if (_Transformer.isGenerateSelect) {
-      const zodSelectObjectSchema = `${modelName}SelectObjectSchema.optional()`;
+      const zodSelectObjectSchema = `${lowerCaseFirst(modelName)}SelectObjectSchema.optional()`;
       selectZodSchemaLine = `select: ${zodSelectObjectSchema},`;
       selectZodSchemaLineLazy = `select: z.lazy(() => ${zodSelectObjectSchema}),`;
     }
     if (_Transformer.isGenerateInclude && hasRelationToAnotherModel) {
-      const zodIncludeObjectSchema = `${modelName}IncludeObjectSchema.optional()`;
+      const zodIncludeObjectSchema = `${lowerCaseFirst(modelName)}IncludeObjectSchema.optional()`;
       includeZodSchemaLine = `include: ${zodIncludeObjectSchema},`;
       includeZodSchemaLineLazy = `include: z.lazy(() => ${zodIncludeObjectSchema}),`;
     }
@@ -11131,9 +11131,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       "postgresql",
       "mysql"
     ].includes(_Transformer.provider) && _Transformer.previewFeatures?.includes("fullTextSearch")) {
-      modelOrderBy = `${modelName}OrderByWithRelationAndSearchRelevanceInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationAndSearchRelevanceInput`;
     } else {
-      modelOrderBy = `${modelName}OrderByWithRelationInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationInput`;
     }
     const orderByImport = `import { ${modelOrderBy}ObjectSchema } from './objects/${modelOrderBy}.schema'`;
     const orderByZodSchemaLine = `orderBy: z.union([${modelOrderBy}ObjectSchema, ${modelOrderBy}ObjectSchema.array()]).optional(),`;
@@ -11677,7 +11677,7 @@ ${JSON.stringify(config)}`);
     const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
-    const modelRouter = project.createSourceFile(import_node_path5.default.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {
+    const modelRouter = project.createSourceFile(import_node_path5.default.resolve(outputDir, "routers", `${lowerCaseFirst(model)}.router.ts`), void 0, {
       overwrite: true
     });
     generateCreateRouterImport({

package/dist/index.js CHANGED Viewed

@@ -7612,7 +7612,7 @@ var generateCreateRouterImport = /* @__PURE__ */ __name(({ sourceFile, config })
 }, "generateCreateRouterImport");
 var generateRouterImport = /* @__PURE__ */ __name((sourceFile, modelNamePlural, modelNameCamelCase) => {
   sourceFile.addImportDeclaration({
-    moduleSpecifier: `./${modelNameCamelCase}.router`,
+    moduleSpecifier: `./${lowerCaseFirst(modelNameCamelCase)}.router`,
     namedImports: [
       `${modelNamePlural}Router`
     ]
@@ -7778,7 +7778,7 @@ __name(generateRouterSchemaImports, "generateRouterSchemaImports");
 var getRouterSchemaImportByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   const opType = opName.replace("OrThrow", "").replace("ManyAndReturn", "");
   const inputType = getInputTypeByOpName(opType, modelName);
-  return inputType ? `import { ${inputType} } from "../schemas/${opType}${modelName}.schema"; ` : "";
+  return inputType ? `import { ${lowerCaseFirst(inputType)} } from "../schemas/${lowerCaseFirst(opType)}${modelName}.schema"; ` : "";
 }, "getRouterSchemaImportByOpName");
 var getInputTypeByOpName = /* @__PURE__ */ __name((opName, modelName) => {
   let inputType;
@@ -10645,8 +10645,8 @@ var Transformer = class _Transformer {
   hasJson = false;
   static prismaClientOutputPath = "@prisma/client";
   static isCustomPrismaClientOutputPath = false;
-  static isGenerateSelect = false;
-  static isGenerateInclude = false;
+  static isGenerateSelect = true;
+  static isGenerateInclude = true;
   constructor(params) {
     this.name = params.name ?? "";
     this.fields = params.fields ?? [];
@@ -10678,21 +10678,21 @@ var Transformer = class _Transformer {
   async generateEnumSchemas() {
     for (const enumType2 of this.enumTypes) {
       const { name, values } = enumType2;
-      await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/enums/${name}.schema.ts`), `${this.generateImportZodStatement()}
-${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)})`)}`);
+      await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/enums/${lowerCaseFirst(name)}.schema.ts`), `${this.generateImportZodStatement()}
+${this.generateExportSchemaStatement(`${lowerCaseFirst(name)}`, `z.enum(${JSON.stringify(values)})`)}`);
     }
   }
   generateImportZodStatement() {
     return "import { z } from 'zod';\n";
   }
   generateExportSchemaStatement(name, schema) {
-    return `export const ${name}Schema = ${schema}`;
+    return `export const ${lowerCaseFirst(name)}Schema = ${schema}`;
   }
   async generateObjectSchema() {
     const zodObjectSchemaFields = this.generateObjectSchemaFields();
     const objectSchema = this.prepareObjectSchema(zodObjectSchemaFields);
     const objectSchemaName = this.resolveObjectSchemaName();
-    await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/objects/${objectSchemaName}.schema.ts`), objectSchema);
+    await writeFileSafely(path3.join(_Transformer.outputPath, `schemas/objects/${lowerCaseFirst(objectSchemaName)}.schema.ts`), objectSchema);
   }
   generateObjectSchemaFields() {
     const zodObjectSchemaFields = this.fields.map((field) => this.generateObjectSchemaField(field)).flatMap((item) => item).map((item) => {
@@ -10780,7 +10780,7 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     const arr = inputType.isList ? ".array()" : "";
     const opt = !field.isRequired ? ".optional()" : "";
     const nullable = field.inputTypes.length > 1 && field.inputTypes[1]?.type === "Null" ? ".nullable()" : "";
-    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${schema})${arr}${opt}${nullable}` : `z.lazy(() => ${schema})${arr}${opt}${nullable}`;
+    return inputsLength === 1 ? `  ${field.name}: z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}` : `z.lazy(() => ${lowerCaseFirst(schema)})${arr}${opt}${nullable}`;
   }
   generateFieldValidators(zodStringWithMainType, field) {
     const { isRequired, isNullable } = field;
@@ -10813,8 +10813,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     if (isAggregateInputType(name)) {
       name = `${name}Type`;
     }
-    const end = `export const ${exportName}ObjectSchema = Schema`;
-    return `const Schema: z.ZodType<Prisma.${name}> = ${schema};
+    const end = `export const ${lowerCaseFirst(exportName)}ObjectSchema = schema`;
+    return `const schema: z.ZodType<Prisma.${name}> = ${schema};
  ${end}`;
   }
@@ -10869,9 +10869,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       if (isModelQueryType) {
         return `import { ${this.resolveModelQuerySchemaName(modelName, queryName)} } from '../${queryName}${modelName}.schema'`;
       } else if (_Transformer.enumNames.includes(name)) {
-        return `import { ${name}Schema } from '../enums/${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}Schema } from '../enums/${lowerCaseFirst(name)}.schema'`;
       } else {
-        return `import { ${name}ObjectSchema } from './${name}.schema'`;
+        return `import { ${lowerCaseFirst(name)}ObjectSchema } from './${lowerCaseFirst(name)}.schema'`;
       }
     }).join(";\r\n");
   }
@@ -10896,9 +10896,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
     };
   }
   resolveModelQuerySchemaName(modelName, queryName) {
-    const modelNameCapitalized = upperCaseFirst(modelName);
+    const modelNameUncapitalized = lowerCaseFirst(modelName);
     const queryNameCapitalized = upperCaseFirst(queryName);
-    return `${modelNameCapitalized}${queryNameCapitalized}Schema`;
+    return `${modelNameUncapitalized}${queryNameCapitalized}Schema`;
   }
   wrapWithZodUnion(zodStringFields) {
     let wrapped = "";
@@ -10925,12 +10925,11 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       name = _Transformer.rawOpsMap[name];
       exportName = name.replace("Args", "");
     }
-    return exportName;
+    return lowerCaseFirst(exportName);
   }
   async generateModelSchemas() {
     for (const modelOperation of this.modelOperations) {
       const {
-        model: modelName,
         findUnique,
         findFirst,
         findMany,
@@ -10950,7 +10949,8 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
         aggregate,
         groupBy
       } = modelOperation;
-      const model = findModelByName(this.models, modelName);
+      const model = findModelByName(this.models, modelOperation.model);
+      const modelName = lowerCaseFirst(modelOperation.model);
       const { selectImport, includeImport, selectZodSchemaLine, includeZodSchemaLine, selectZodSchemaLineLazy, includeZodSchemaLineLazy } = this.resolveSelectIncludeImportAndZodSchemaLine(model);
       const { orderByImport, orderByZodSchemaLine } = this.resolveOrderByWithRelationImportAndZodSchemaLine(model);
       if (findUnique) {
@@ -11104,19 +11104,19 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
   resolveSelectIncludeImportAndZodSchemaLine(model) {
     const { name: modelName } = model;
     const hasRelationToAnotherModel = checkModelHasModelRelation(model);
-    const selectImport = _Transformer.isGenerateSelect ? `import { ${modelName}SelectObjectSchema } from './objects/${modelName}Select.schema'` : "";
-    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${modelName}IncludeObjectSchema } from './objects/${modelName}Include.schema'` : "";
+    const selectImport = _Transformer.isGenerateSelect ? `import { ${lowerCaseFirst(modelName)}SelectObjectSchema } from './objects/${lowerCaseFirst(modelName)}Select.schema'` : "";
+    const includeImport = _Transformer.isGenerateInclude && hasRelationToAnotherModel ? `import { ${lowerCaseFirst(modelName)}IncludeObjectSchema } from './objects/${lowerCaseFirst(modelName)}Include.schema'` : "";
     let selectZodSchemaLine = "";
     let includeZodSchemaLine = "";
     let selectZodSchemaLineLazy = "";
     let includeZodSchemaLineLazy = "";
     if (_Transformer.isGenerateSelect) {
-      const zodSelectObjectSchema = `${modelName}SelectObjectSchema.optional()`;
+      const zodSelectObjectSchema = `${lowerCaseFirst(modelName)}SelectObjectSchema.optional()`;
       selectZodSchemaLine = `select: ${zodSelectObjectSchema},`;
       selectZodSchemaLineLazy = `select: z.lazy(() => ${zodSelectObjectSchema}),`;
     }
     if (_Transformer.isGenerateInclude && hasRelationToAnotherModel) {
-      const zodIncludeObjectSchema = `${modelName}IncludeObjectSchema.optional()`;
+      const zodIncludeObjectSchema = `${lowerCaseFirst(modelName)}IncludeObjectSchema.optional()`;
       includeZodSchemaLine = `include: ${zodIncludeObjectSchema},`;
       includeZodSchemaLineLazy = `include: z.lazy(() => ${zodIncludeObjectSchema}),`;
     }
@@ -11136,9 +11136,9 @@ ${this.generateExportSchemaStatement(`${name}`, `z.enum(${JSON.stringify(values)
       "postgresql",
       "mysql"
     ].includes(_Transformer.provider) && _Transformer.previewFeatures?.includes("fullTextSearch")) {
-      modelOrderBy = `${modelName}OrderByWithRelationAndSearchRelevanceInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationAndSearchRelevanceInput`;
     } else {
-      modelOrderBy = `${modelName}OrderByWithRelationInput`;
+      modelOrderBy = `${lowerCaseFirst(modelName)}OrderByWithRelationInput`;
     }
     const orderByImport = `import { ${modelOrderBy}ObjectSchema } from './objects/${modelOrderBy}.schema'`;
     const orderByZodSchemaLine = `orderBy: z.union([${modelOrderBy}ObjectSchema, ${modelOrderBy}ObjectSchema.array()]).optional(),`;
@@ -11682,7 +11682,7 @@ ${JSON.stringify(config)}`);
     const plural = (0, import_pluralize.default)(lowerCaseFirst(model));
     consoleLog(`Generating tRPC router for model ${model}`);
     generateRouterImport(appRouter, plural, model);
-    const modelRouter = project.createSourceFile(path4.resolve(outputDir, "routers", `${model}.router.ts`), void 0, {
+    const modelRouter = project.createSourceFile(path4.resolve(outputDir, "routers", `${lowerCaseFirst(model)}.router.ts`), void 0, {
       overwrite: true
     });
     generateCreateRouterImport({

package/package.json CHANGED Viewed

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