nestjs-trpc 1.3.1 → 1.3.3

package/dist/generators/decorator.generator.d.ts

@@ -1,8 +1,7 @@
-import { Decorator, SourceFile, Project } from 'ts-morph';
+import { Decorator, Project, SourceFile } from 'ts-morph';
 import { DecoratorGeneratorMetadata } from '../interfaces/generator.interface';
 export declare class DecoratorGenerator {
     private readonly consoleLogger;
     serializeProcedureDecorators(decorators: Decorator[], sourceFile: SourceFile, project: Project): Array<DecoratorGeneratorMetadata>;
-    private buildSourceFileImportsMap;
 }
 //# sourceMappingURL=decorator.generator.d.ts.map

package/dist/generators/decorator.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorator.generator.d.ts","sourceRoot":"","sources":["../../lib/generators/decorator.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EACL,0BAA0B,EAE3B,MAAM,mCAAmC,CAAC;AAK3C,qBACa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAExC,4BAA4B,CACjC,UAAU,EAAE,SAAS,EAAE,EACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,0BAA0B,CAAC;IA6CpC,OAAO,CAAC,yBAAyB;CAmClC"}
+{"version":3,"file":"decorator.generator.d.ts","sourceRoot":"","sources":["../../lib/generators/decorator.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAI/E,qBACa,kBAAkB;IAE7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAExC,4BAA4B,CACjC,UAAU,EAAE,SAAS,EAAE,EACvB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GACf,KAAK,CAAC,0BAA0B,CAAC;CAqCrC"}

package/dist/generators/decorator.generator.js

@@ -4,15 +4,13 @@ exports.DecoratorGenerator = void 0;
 const tslib_1 = require("tslib");
 const file_util_1 = require("../utils/file.util");
 const common_1 = require("@nestjs/common");
-const path = require("node:path");
 let DecoratorGenerator = class DecoratorGenerator {
     serializeProcedureDecorators(decorators, sourceFile, project) {
-        const sourceFileImportsMap = this.buildSourceFileImportsMap(sourceFile, project);
-        const decoratorsArray = decorators.reduce((array, decorator) => {
+        return decorators.reduce((array, decorator) => {
             const decoratorName = decorator.getName();
             if (decoratorName === 'Query' || decoratorName === 'Mutation') {
-                const input = (0, file_util_1.getDecoratorPropertyValue)(decorator, 'input', sourceFile, sourceFileImportsMap);
-                const output = (0, file_util_1.getDecoratorPropertyValue)(decorator, 'output', sourceFile, sourceFileImportsMap);
+                const input = (0, file_util_1.getDecoratorPropertyValue)(decorator, 'input', sourceFile, project);
+                const output = (0, file_util_1.getDecoratorPropertyValue)(decorator, 'output', sourceFile, project);
                 array.push({
                     name: decoratorName,
                     arguments: {
@@ -29,33 +27,6 @@ let DecoratorGenerator = class DecoratorGenerator {
             }
             return array;
         }, []);
-        return decoratorsArray;
-    }
-    buildSourceFileImportsMap(sourceFile, project) {
-        const sourceFileImportsMap = new Map();
-        const importDeclarations = sourceFile.getImportDeclarations();
-        for (const importDeclaration of importDeclarations) {
-            const namedImports = importDeclaration.getNamedImports();
-            for (const namedImport of namedImports) {
-                const name = namedImport.getName();
-                const moduleSpecifier = importDeclaration.getModuleSpecifierValue();
-                const resolvedPath = path.resolve(path.dirname(sourceFile.getFilePath()), moduleSpecifier + '.ts');
-                const importedSourceFile = project.addSourceFileAtPathIfExists(resolvedPath);
-                if (!importedSourceFile)
-                    continue;
-                const schemaVariable = importedSourceFile.getVariableDeclaration(name);
-                if (schemaVariable) {
-                    const initializer = schemaVariable.getInitializer();
-                    if (initializer) {
-                        sourceFileImportsMap.set(name, {
-                            initializer,
-                            sourceFile: importedSourceFile,
-                        });
-                    }
-                }
-            }
-        }
-        return sourceFileImportsMap;
     }
 };
 exports.DecoratorGenerator = DecoratorGenerator;

package/dist/utils/file.util.d.ts

@@ -1,6 +1,5 @@
-import { SourceFile, Decorator } from 'ts-morph';
-import { SourceFileImportsMap } from '../interfaces/generator.interface';
+import { SourceFile, Decorator, Project } from 'ts-morph';
 export declare function generateStaticDeclaration(sourceFile: SourceFile): void;
 export declare function saveOrOverrideFile(sourceFile: SourceFile): Promise<void>;
-export declare function getDecoratorPropertyValue(decorator: Decorator, propertyName: string, sourceFile: SourceFile, importsMap: Map<string, SourceFileImportsMap>): string | null;
+export declare function getDecoratorPropertyValue(decorator: Decorator, propertyName: string, sourceFile: SourceFile, project: Project): string | null;
 //# sourceMappingURL=file.util.d.ts.map

package/dist/utils/file.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.util.d.ts","sourceRoot":"","sources":["../../lib/utils/file.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAwE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEvH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAsBtE;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,GAC5C,MAAM,GAAG,IAAI,CAkBf"}
+{"version":3,"file":"file.util.d.ts","sourceRoot":"","sources":["../../lib/utils/file.util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,SAAS,EACT,OAAO,EACR,MAAM,UAAU,CAAC;AAGlB,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAsBtE;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,GACf,MAAM,GAAG,IAAI,CAyBf"}

package/dist/utils/file.util.js

@@ -31,7 +31,7 @@ async function saveOrOverrideFile(sourceFile) {
     sourceFile.formatText({ indentSize: 2 });
     await sourceFile.save();
 }
-function getDecoratorPropertyValue(decorator, propertyName, sourceFile, importsMap) {
+function getDecoratorPropertyValue(decorator, propertyName, sourceFile, project) {
     const args = decorator.getArguments();
     for (const arg of args) {
         if (arg.getKind() === ts_morph_1.SyntaxKind.ObjectLiteralExpression) {
@@ -41,7 +41,7 @@ function getDecoratorPropertyValue(decorator, propertyName, sourceFile, importsM
                 return null;
             }
             const propertyInitializer = property.getInitializer();
-            return (0, type_util_1.flattenZodSchema)(propertyInitializer, importsMap, sourceFile, propertyInitializer.getText());
+            return (0, type_util_1.flattenZodSchema)(propertyInitializer, sourceFile, project, propertyInitializer.getText());
         }
     }
     return null;

package/dist/utils/type.util.d.ts

@@ -1,6 +1,6 @@
-import { Node, SourceFile, Type } from 'ts-morph';
-import { ProcedureGeneratorMetadata, SourceFileImportsMap } from '../interfaces/generator.interface';
+import { Node, Project, SourceFile, Type } from 'ts-morph';
+import { ProcedureGeneratorMetadata } from '../interfaces/generator.interface';
 export declare function findCtxOutProperty(type: Type): string | undefined;
 export declare function generateProcedureString(procedure: ProcedureGeneratorMetadata): string;
-export declare function flattenZodSchema(node: Node, importsMap: Map<string, SourceFileImportsMap>, sourceFile: SourceFile, schema: string): string;
+export declare function flattenZodSchema(node: Node, sourceFile: SourceFile, project: Project, schema: string): string;
 //# sourceMappingURL=type.util.d.ts.map

package/dist/utils/type.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.util.d.ts","sourceRoot":"","sources":["../../lib/utils/type.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,0BAA0B,GAAG,MAAM,CAarF;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC7C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,MAAM,CA2FR"}
+{"version":3,"file":"type.util.d.ts","sourceRoot":"","sources":["../../lib/utils/type.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,0BAA0B,EAE3B,MAAM,mCAAmC,CAAC;AAE3C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,0BAA0B,GACpC,MAAM,CAeR;AA2FD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,CAiGR"}

package/dist/utils/type.util.js

@@ -11,7 +11,7 @@ function findCtxOutProperty(type) {
 }
 function generateProcedureString(procedure) {
     const { name, decorators } = procedure;
-    const decorator = decorators.find(d => d.name === 'Mutation' || d.name === 'Query');
+    const decorator = decorators.find((decorator) => decorator.name === 'Mutation' || decorator.name === 'Query');
     if (!decorator) {
         return '';
     }
@@ -20,14 +20,85 @@ function generateProcedureString(procedure) {
         .join('');
     return `${name}: publicProcedure${decoratorArgumentsArray}.${decorator.name.toLowerCase()}(async () => "PLACEHOLDER_DO_NOT_REMOVE" as any )`;
 }
-function flattenZodSchema(node, importsMap, sourceFile, schema) {
+/**
+ * https://github.com/dsherret/ts-morph/issues/327
+ * Note that if the module resolution of the compiler is Classic then it won't resolve those implicit index.ts module specifiers.
+ * So for example, if the moduleResolution compiler option isn't explicitly set then setting the module
+ * compiler option to anything but ModuleKind.CommonJS will cause the module resolution kind to resolve to Classic.
+ * Additionally, if moduleResolution and the module compiler option isn't set,
+ * then a script target of ES2015 and above will also use Classic module resolution.
+ */
+function resolveBarrelFileImport(barrelSourceFile, name, project) {
+    // Traverse through export declarations to find the actual source of the named import
+    for (const exportDeclaration of barrelSourceFile.getExportDeclarations()) {
+        const exportedSourceFile = exportDeclaration.getModuleSpecifierSourceFile();
+        if (exportedSourceFile == null)
+            continue;
+        // Check if the named export is explicitly re-exported
+        const namedExports = exportDeclaration.getNamedExports();
+        if (namedExports.length > 0) {
+            const matchingExport = namedExports.find((e) => e.getName() === name);
+            if (matchingExport) {
+                return exportedSourceFile;
+            }
+        }
+        else {
+            // Handle `export * from ...` case: recursively resolve the export
+            const schemaVariable = exportedSourceFile.getVariableDeclaration(name);
+            if (schemaVariable) {
+                return exportedSourceFile;
+            }
+            else {
+                // Continue resolving if it's another barrel file
+                const baseSourceFile = resolveBarrelFileImport(exportedSourceFile, name, project);
+                if (baseSourceFile)
+                    return baseSourceFile;
+            }
+        }
+    }
+    return undefined;
+}
+function buildSourceFileImportsMap(sourceFile, project) {
+    const sourceFileImportsMap = new Map();
+    const importDeclarations = sourceFile.getImportDeclarations();
+    for (const importDeclaration of importDeclarations) {
+        const namedImports = importDeclaration.getNamedImports();
+        for (const namedImport of namedImports) {
+            const name = namedImport.getName();
+            const importedSourceFile = importDeclaration.getModuleSpecifierSourceFile();
+            if (importedSourceFile == null) {
+                continue;
+            }
+            const resolvedSourceFile = importedSourceFile.getFilePath().endsWith('index.ts') &&
+                importedSourceFile.getVariableDeclaration(name) == null
+                ? resolveBarrelFileImport(importedSourceFile, name, project)
+                : importedSourceFile;
+            if (resolvedSourceFile == null) {
+                continue;
+            }
+            const schemaVariable = resolvedSourceFile.getVariableDeclaration(name);
+            if (schemaVariable != null) {
+                const initializer = schemaVariable.getInitializer();
+                if (initializer) {
+                    sourceFileImportsMap.set(name, {
+                        initializer,
+                        sourceFile: resolvedSourceFile,
+                    });
+                }
+            }
+        }
+    }
+    return sourceFileImportsMap;
+}
+function flattenZodSchema(node, sourceFile, project, schema) {
+    const importsMap = buildSourceFileImportsMap(sourceFile, project);
     if (ts_morph_1.Node.isIdentifier(node)) {
         const identifierName = node.getText();
         const identifierDeclaration = sourceFile.getVariableDeclaration(identifierName);
         if (identifierDeclaration != null) {
             const identifierInitializer = identifierDeclaration.getInitializer();
             if (identifierInitializer != null) {
-                const identifierSchema = flattenZodSchema(identifierInitializer, importsMap, sourceFile, identifierInitializer.getText());
+                const identifierSchema = flattenZodSchema(identifierInitializer, sourceFile, project, identifierInitializer.getText());
                 schema = schema.replace(identifierName, identifierSchema);
             }
         }
@@ -35,7 +106,7 @@ function flattenZodSchema(node, importsMap, sourceFile, schema) {
             const importedIdentifier = importsMap.get(identifierName);
             if (importedIdentifier != null) {
                 const { initializer } = importedIdentifier;
-                const identifierSchema = flattenZodSchema(initializer, importsMap, importedIdentifier.sourceFile, initializer.getText());
+                const identifierSchema = flattenZodSchema(initializer, importedIdentifier.sourceFile, project, initializer.getText());
                 schema = schema.replace(identifierName, identifierSchema);
             }
         }
@@ -46,7 +117,7 @@ function flattenZodSchema(node, importsMap, sourceFile, schema) {
                 const propertyText = property.getText();
                 const propertyInitializer = property.getInitializer();
                 if (propertyInitializer != null) {
-                    schema = schema.replace(propertyText, flattenZodSchema(propertyInitializer, importsMap, sourceFile, propertyText));
+                    schema = schema.replace(propertyText, flattenZodSchema(propertyInitializer, sourceFile, project, propertyText));
                 }
             }
         }
@@ -54,23 +125,24 @@ function flattenZodSchema(node, importsMap, sourceFile, schema) {
     else if (ts_morph_1.Node.isArrayLiteralExpression(node)) {
         for (const element of node.getElements()) {
             const elementText = element.getText();
-            schema = schema.replace(elementText, flattenZodSchema(element, importsMap, sourceFile, elementText));
+            schema = schema.replace(elementText, flattenZodSchema(element, sourceFile, project, elementText));
         }
     }
     else if (ts_morph_1.Node.isCallExpression(node)) {
         const expression = node.getExpression();
-        if (ts_morph_1.Node.isPropertyAccessExpression(expression) && !expression.getText().startsWith("z")) {
-            const baseSchema = flattenZodSchema(expression, importsMap, sourceFile, expression.getText());
+        if (ts_morph_1.Node.isPropertyAccessExpression(expression) &&
+            !expression.getText().startsWith('z')) {
+            const baseSchema = flattenZodSchema(expression, sourceFile, project, expression.getText());
             const propertyName = expression.getName();
             schema = schema.replace(expression.getText(), `${baseSchema}.${propertyName}`);
         }
         for (const arg of node.getArguments()) {
             const argText = arg.getText();
-            schema = schema.replace(argText, flattenZodSchema(arg, importsMap, sourceFile, argText));
+            schema = schema.replace(argText, flattenZodSchema(arg, sourceFile, project, argText));
         }
     }
     else if (ts_morph_1.Node.isPropertyAccessExpression(node)) {
-        schema = flattenZodSchema(node.getExpression(), importsMap, sourceFile, node.getExpression().getText());
+        schema = flattenZodSchema(node.getExpression(), sourceFile, project, node.getExpression().getText());
     }
     return schema;
 }

package/lib/generators/decorator.generator.ts

@@ -1,11 +1,7 @@
-import { Decorator, SourceFile, Project } from 'ts-morph';
-import {
-  DecoratorGeneratorMetadata,
-  SourceFileImportsMap,
-} from '../interfaces/generator.interface';
+import { Decorator, Project, SourceFile } from 'ts-morph';
+import { DecoratorGeneratorMetadata } from '../interfaces/generator.interface';
 import { getDecoratorPropertyValue } from '../utils/file.util';
 import { ConsoleLogger, Inject, Injectable } from '@nestjs/common';
-import * as path from 'node:path';
 
 @Injectable()
 export class DecoratorGenerator {
@@ -17,12 +13,7 @@ export class DecoratorGenerator {
     sourceFile: SourceFile,
     project: Project,
   ): Array<DecoratorGeneratorMetadata> {
-    const sourceFileImportsMap = this.buildSourceFileImportsMap(
-      sourceFile,
-      project,
-    );
-
-    const decoratorsArray =  decorators.reduce<DecoratorGeneratorMetadata[]>(
+    return decorators.reduce<DecoratorGeneratorMetadata[]>(
       (array, decorator) => {
         const decoratorName = decorator.getName();
 
@@ -31,13 +22,13 @@ export class DecoratorGenerator {
             decorator,
             'input',
             sourceFile,
-            sourceFileImportsMap,
+            project,
           );
           const output = getDecoratorPropertyValue(
             decorator,
             'output',
             sourceFile,
-            sourceFileImportsMap,
+            project,
           );
 
           array.push({
@@ -57,43 +48,5 @@ export class DecoratorGenerator {
       },
       [],
     );
-    
-    return decoratorsArray;
-  }
-
-  private buildSourceFileImportsMap(
-    sourceFile: SourceFile,
-    project: Project,
-  ): Map<string, SourceFileImportsMap> {
-    const sourceFileImportsMap = new Map<string, SourceFileImportsMap>();
-    const importDeclarations = sourceFile.getImportDeclarations();
-
-    for (const importDeclaration of importDeclarations) {
-      const namedImports = importDeclaration.getNamedImports();
-      for (const namedImport of namedImports) {
-        const name = namedImport.getName();
-        const moduleSpecifier = importDeclaration.getModuleSpecifierValue();
-        const resolvedPath = path.resolve(
-          path.dirname(sourceFile.getFilePath()),
-          moduleSpecifier + '.ts',
-        );
-        const importedSourceFile =
-          project.addSourceFileAtPathIfExists(resolvedPath);
-        if (!importedSourceFile) continue;
-
-        const schemaVariable = importedSourceFile.getVariableDeclaration(name);
-        if (schemaVariable) {
-          const initializer = schemaVariable.getInitializer();
-          if (initializer) {
-            sourceFileImportsMap.set(name, {
-              initializer,
-              sourceFile: importedSourceFile,
-            });
-          }
-        }
-      }
-    }
-
-    return sourceFileImportsMap;
   }
 }

package/lib/utils/file.util.ts

@@ -1,6 +1,12 @@
-import { SourceFile, StructureKind, VariableDeclarationKind, Expression, SyntaxKind, Node, Decorator } from 'ts-morph';
-import * as path from 'node:path';
-import { SourceFileImportsMap } from '../interfaces/generator.interface';
+import {
+  SourceFile,
+  StructureKind,
+  VariableDeclarationKind,
+  Expression,
+  SyntaxKind,
+  Decorator,
+  Project,
+} from 'ts-morph';
 import { flattenZodSchema } from './type.util';
 
 export function generateStaticDeclaration(sourceFile: SourceFile): void {
@@ -27,7 +33,9 @@ export function generateStaticDeclaration(sourceFile: SourceFile): void {
   ]);
 }
 
-export async function saveOrOverrideFile(sourceFile: SourceFile): Promise<void> {
+export async function saveOrOverrideFile(
+  sourceFile: SourceFile,
+): Promise<void> {
   sourceFile.formatText({ indentSize: 2 });
   await sourceFile.save();
 }
@@ -36,23 +44,30 @@ export function getDecoratorPropertyValue(
   decorator: Decorator,
   propertyName: string,
   sourceFile: SourceFile,
-  importsMap: Map<string, SourceFileImportsMap>,
+  project: Project,
 ): string | null {
   const args = decorator.getArguments();
 
   for (const arg of args) {
     if (arg.getKind() === SyntaxKind.ObjectLiteralExpression) {
       const properties = (arg as any).getProperties();
-      const property = properties.find((p: any) => p.getName() === propertyName);
+      const property = properties.find(
+        (p: any) => p.getName() === propertyName,
+      );
 
       if (!property) {
         return null;
       }
 
       const propertyInitializer: Expression = property.getInitializer();
-      return flattenZodSchema(propertyInitializer, importsMap, sourceFile, propertyInitializer.getText());
+      return flattenZodSchema(
+        propertyInitializer,
+        sourceFile,
+        project,
+        propertyInitializer.getText(),
+      );
     }
   }
 
   return null;
-}
+}

package/lib/utils/type.util.ts

@@ -1,4 +1,4 @@
-import { Node, SourceFile, Type } from 'ts-morph';
+import { Node, Project, SourceFile, Type } from 'ts-morph';
 import {
   ProcedureGeneratorMetadata,
   SourceFileImportsMap,
@@ -16,7 +16,7 @@ export function generateProcedureString(
 ): string {
   const { name, decorators } = procedure;
   const decorator = decorators.find(
-    (d) => d.name === 'Mutation' || d.name === 'Query',
+    (decorator) => decorator.name === 'Mutation' || decorator.name === 'Query',
   );
 
   if (!decorator) {
@@ -30,12 +30,102 @@ export function generateProcedureString(
   return `${name}: publicProcedure${decoratorArgumentsArray}.${decorator.name.toLowerCase()}(async () => "PLACEHOLDER_DO_NOT_REMOVE" as any )`;
 }
 
+/**
+ * https://github.com/dsherret/ts-morph/issues/327
+ * Note that if the module resolution of the compiler is Classic then it won't resolve those implicit index.ts module specifiers.
+ * So for example, if the moduleResolution compiler option isn't explicitly set then setting the module
+ * compiler option to anything but ModuleKind.CommonJS will cause the module resolution kind to resolve to Classic.
+ * Additionally, if moduleResolution and the module compiler option isn't set,
+ * then a script target of ES2015 and above will also use Classic module resolution.
+ */
+function resolveBarrelFileImport(
+  barrelSourceFile: SourceFile,
+  name: string,
+  project: Project,
+): SourceFile | undefined {
+  // Traverse through export declarations to find the actual source of the named import
+  for (const exportDeclaration of barrelSourceFile.getExportDeclarations()) {
+    const exportedSourceFile = exportDeclaration.getModuleSpecifierSourceFile();
+    if (exportedSourceFile == null) continue;
+
+    // Check if the named export is explicitly re-exported
+    const namedExports = exportDeclaration.getNamedExports();
+    if (namedExports.length > 0) {
+      const matchingExport = namedExports.find((e) => e.getName() === name);
+      if (matchingExport) {
+        return exportedSourceFile;
+      }
+    } else {
+      // Handle `export * from ...` case: recursively resolve the export
+      const schemaVariable = exportedSourceFile.getVariableDeclaration(name);
+      if (schemaVariable) {
+        return exportedSourceFile;
+      } else {
+        // Continue resolving if it's another barrel file
+        const baseSourceFile = resolveBarrelFileImport(
+          exportedSourceFile,
+          name,
+          project,
+        );
+        if (baseSourceFile) return baseSourceFile;
+      }
+    }
+  }
+
+  return undefined;
+}
+
+function buildSourceFileImportsMap(
+  sourceFile: SourceFile,
+  project: Project,
+): Map<string, SourceFileImportsMap> {
+  const sourceFileImportsMap = new Map<string, SourceFileImportsMap>();
+  const importDeclarations = sourceFile.getImportDeclarations();
+
+  for (const importDeclaration of importDeclarations) {
+    const namedImports = importDeclaration.getNamedImports();
+    for (const namedImport of namedImports) {
+      const name = namedImport.getName();
+      const importedSourceFile =
+        importDeclaration.getModuleSpecifierSourceFile();
+
+      if (importedSourceFile == null) {
+        continue;
+      }
+
+      const resolvedSourceFile =
+        importedSourceFile.getFilePath().endsWith('index.ts') &&
+        importedSourceFile.getVariableDeclaration(name) == null
+          ? resolveBarrelFileImport(importedSourceFile, name, project)
+          : importedSourceFile;
+
+      if (resolvedSourceFile == null) {
+        continue;
+      }
+
+      const schemaVariable = resolvedSourceFile.getVariableDeclaration(name);
+      if (schemaVariable != null) {
+        const initializer = schemaVariable.getInitializer();
+        if (initializer) {
+          sourceFileImportsMap.set(name, {
+            initializer,
+            sourceFile: resolvedSourceFile,
+          });
+        }
+      }
+    }
+  }
+
+  return sourceFileImportsMap;
+}
+
 export function flattenZodSchema(
   node: Node,
-  importsMap: Map<string, SourceFileImportsMap>,
   sourceFile: SourceFile,
+  project: Project,
   schema: string,
 ): string {
+  const importsMap = buildSourceFileImportsMap(sourceFile, project);
   if (Node.isIdentifier(node)) {
     const identifierName = node.getText();
     const identifierDeclaration =
@@ -47,8 +137,8 @@ export function flattenZodSchema(
       if (identifierInitializer != null) {
         const identifierSchema = flattenZodSchema(
           identifierInitializer,
-          importsMap,
           sourceFile,
+          project,
           identifierInitializer.getText(),
         );
 
@@ -61,8 +151,8 @@ export function flattenZodSchema(
         const { initializer } = importedIdentifier;
         const identifierSchema = flattenZodSchema(
           initializer,
-          importsMap,
           importedIdentifier.sourceFile,
+          project,
           initializer.getText(),
         );
 
@@ -80,8 +170,8 @@ export function flattenZodSchema(
             propertyText,
             flattenZodSchema(
               propertyInitializer,
-              importsMap,
               sourceFile,
+              project,
               propertyText,
             ),
           );
@@ -93,7 +183,7 @@ export function flattenZodSchema(
       const elementText = element.getText();
       schema = schema.replace(
         elementText,
-        flattenZodSchema(element, importsMap, sourceFile, elementText),
+        flattenZodSchema(element, sourceFile, project, elementText),
       );
     }
   } else if (Node.isCallExpression(node)) {
@@ -104,8 +194,8 @@ export function flattenZodSchema(
     ) {
       const baseSchema = flattenZodSchema(
         expression,
-        importsMap,
         sourceFile,
+        project,
         expression.getText(),
       );
       const propertyName = expression.getName();
@@ -118,14 +208,14 @@ export function flattenZodSchema(
       const argText = arg.getText();
       schema = schema.replace(
         argText,
-        flattenZodSchema(arg, importsMap, sourceFile, argText),
+        flattenZodSchema(arg, sourceFile, project, argText),
       );
     }
   } else if (Node.isPropertyAccessExpression(node)) {
     schema = flattenZodSchema(
       node.getExpression(),
-      importsMap,
       sourceFile,
+      project,
       node.getExpression().getText(),
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-trpc",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "homepage": "https://nestjs-trpc.io",
   "main": "./dist/index.js",
   "types": "./lib/index.ts",
@@ -42,7 +42,7 @@
   "peerDependencies": {
     "@nestjs/common": "^9.3.8 || ^10.0.0",
     "@nestjs/core": "^9.3.8 || ^10.0.0",
-    "@trpc/server": "^10.18.0",
+    "@trpc/server": "^10.0.0",
     "reflect-metadata": "^0.1.13 || ^0.2.0",
     "rxjs": "7.8.1",
     "zod": "^3.14.0"
@@ -64,7 +64,7 @@
     "tsconfig-paths": "^4.2.0",
     "type-fest": "^4.21.0",
     "typescript": "5.5.3",
-    "zod": "^3.14.0"
+    "zod": "^3.14.4"
   },
   "dependencies": {
     "func-loc": "^0.1.16",