nestjs-trpc 1.3.2 → 1.3.4

package/dist/factories/procedure.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"procedure.factory.d.ts","sourceRoot":"","sources":["../../lib/factories/procedure.factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,EAAE,MAAM,cAAc,CAAC;AAO1D,OAAO,EACL,wBAAwB,EAGxB,mBAAmB,EAEpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAoB,MAAM,eAAe,CAAC;AAGjE,qBACa,gBAAgB;IAOf,OAAO,CAAC,SAAS;IAL7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;gBAE/B,SAAS,EAAE,SAAS;IAExC,aAAa,CACX,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAClC,KAAK,CAAC,wBAAwB,CAAC;IAMlC,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,wBAAwB;IAuBhC,mBAAmB,CACjB,UAAU,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAC3C,QAAQ,EAAE,GAAG,EACb,oBAAoB,EAAE,MAAM,EAC5B,gBAAgB,EAAE,mBAAmB,EACrC,iBAAiB,EAAE,cAAc,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAiCtB,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,yBAAyB;CA4BlC"}
+{"version":3,"file":"procedure.factory.d.ts","sourceRoot":"","sources":["../../lib/factories/procedure.factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,EAAE,MAAM,cAAc,CAAC;AAO1D,OAAO,EACL,wBAAwB,EAGxB,mBAAmB,EAEpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAoB,MAAM,eAAe,CAAC;AAIjE,qBACa,gBAAgB;IAOf,OAAO,CAAC,SAAS;IAL7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;gBAE/B,SAAS,EAAE,SAAS;IAExC,aAAa,CACX,QAAQ,EAAE,OAAO,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAClC,KAAK,CAAC,wBAAwB,CAAC;IAMlC,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,wBAAwB;IAuBhC,mBAAmB,CACjB,UAAU,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAC3C,QAAQ,EAAE,GAAG,EACb,oBAAoB,EAAE,MAAM,EAC5B,gBAAgB,EAAE,mBAAmB,EACrC,iBAAiB,EAAE,cAAc,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAiCtB,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,wBAAwB;IA4BhC,OAAO,CAAC,yBAAyB;CA0BlC"}

package/dist/factories/procedure.factory.js

@@ -6,6 +6,7 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const trpc_constants_1 = require("../trpc.constants");
 const factory_interface_1 = require("../interfaces/factory.interface");
+const trpc_enum_1 = require("../trpc.enum");
 let ProcedureFactory = class ProcedureFactory {
     constructor(moduleRef) {
         this.moduleRef = moduleRef;
@@ -56,7 +57,7 @@ let ProcedureFactory = class ProcedureFactory {
     createCustomProcedureInstance(procedure, def) {
         const customProcedureInstance = this.moduleRef.get(def, { strict: false });
         if (typeof customProcedureInstance.use === 'function') {
-            //@ts-ignore
+            //@ts-expect-error this is expected since the type is correct.
             return procedure.use((opts) => customProcedureInstance.use(opts));
         }
         return procedure;
@@ -73,8 +74,9 @@ let ProcedureFactory = class ProcedureFactory {
                 return undefined;
             }
             if (param.type === factory_interface_1.ProcedureParamDecoratorType.Input) {
-                //@ts-ignore
-                return param.key != null ? opts[param.type]?.[param.key] : opts[param.type];
+                return param['key'] != null
+                    ? opts[param.type]?.[param['key']]
+                    : opts[param.type];
             }
             if (param.type === factory_interface_1.ProcedureParamDecoratorType.Options) {
                 return opts;
@@ -93,11 +95,9 @@ let ProcedureFactory = class ProcedureFactory {
         const procedureInvocation = (opts) => {
             return routerInstance[procedureName](...this.serializeProcedureParams(opts, params));
         };
-        return type === 'mutation'
-            ? //@ts-ignore
-                procedureWithOutput.mutation(procedureInvocation)
-            : //@ts-ignore
-                procedureWithOutput.query(procedureInvocation);
+        return type === trpc_enum_1.ProcedureType.Mutation
+            ? procedureWithOutput.mutation(procedureInvocation)
+            : procedureWithOutput.query(procedureInvocation);
     }
 };
 exports.ProcedureFactory = ProcedureFactory;

package/dist/factories/router.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.factory.d.ts","sourceRoot":"","sources":["../../lib/factories/router.factory.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,UAAU,EACX,MAAM,iCAAiC,CAAC;AAIzC,qBACa,aAAa;IAExB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAErD,UAAU,IAAI,KAAK,CAAC,cAAc,CAAC;IAenC,OAAO,CAAC,wBAAwB;IA0BhC,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAkCzF"}
+{"version":3,"file":"router.factory.d.ts","sourceRoot":"","sources":["../../lib/factories/router.factory.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,UAAU,EACX,MAAM,iCAAiC,CAAC;AAIzC,qBACa,aAAa;IAExB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAErD,UAAU,IAAI,KAAK,CAAC,cAAc,CAAC;IAenC,OAAO,CAAC,wBAAwB;IA0BhC,eAAe,CACb,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,mBAAmB,GAC7B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAiCvB"}

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

@@ -1 +1 @@
-{"version":3,"file":"trpc.generator.d.ts","sourceRoot":"","sources":["../../lib/generators/trpc.generator.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,YAAY,EACb,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAMvC,qBACa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAe;IACtD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAiC;IAG1E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IAGzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAGnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,YAAY;IAYC,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CxD,mBAAmB,CAC9B,OAAO,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
+{"version":3,"file":"trpc.generator.d.ts","sourceRoot":"","sources":["../../lib/generators/trpc.generator.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,YAAY,EACb,MAAM,gBAAgB,CAAC;AAOxB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAMvC,qBACa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAe;IACtD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAiC;IAG1E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuB;IAGzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAGnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,YAAY;IAYC,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CxD,mBAAmB,CAC9B,OAAO,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC;CAoDjB"}

package/dist/trpc.driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trpc.driver.d.ts","sourceRoot":"","sources":["../lib/trpc.driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA4B,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAqB,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAe,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG9D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,qBACa,UAAU,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,iBAAiB;IAc5C,OAAO,CAAC,SAAS;IAX7B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAG,eAAe,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAG,WAAW,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAG,aAAa,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAG,aAAa,CAAC;gBAE7B,SAAS,EAAE,SAAS;IAE3B,KAAK,CAAC,OAAO,EAAE,iBAAiB;CAuD9C"}
+{"version":3,"file":"trpc.driver.d.ts","sourceRoot":"","sources":["../lib/trpc.driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA4B,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAqB,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EAAe,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG9D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,qBACa,UAAU,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,iBAAiB;IAc5C,OAAO,CAAC,SAAS;IAX7B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAG,eAAe,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAG,WAAW,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAG,aAAa,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAG,aAAa,CAAC;gBAE7B,SAAS,EAAE,SAAS;IAE3B,KAAK,CAAC,OAAO,EAAE,iBAAiB;CAsD9C"}

package/dist/trpc.driver.js

@@ -20,7 +20,7 @@ let TRPCDriver = class TRPCDriver {
             throw new Error(`No support for current HttpAdapter: ${platformName}`);
         }
         const app = httpAdapter.getInstance();
-        //@ts-ignore Ignoring typescript here since it's the same type, yet it still isn't able to infer it.
+        //@ts-expect-error Ignoring typescript here since it's the same type, yet it still isn't able to infer it.
         const { procedure, router } = server_1.initTRPC.context().create({
             ...(options.transformer != null
                 ? { transformer: options.transformer }

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,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,0BAA0B,EAE3B,MAAM,mCAAmC,CAAC;AAG3C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,0BAA0B,GACpC,MAAM,CAeR;AAsCD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,CAiGR"}
+{"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

@@ -4,7 +4,6 @@ exports.findCtxOutProperty = findCtxOutProperty;
 exports.generateProcedureString = generateProcedureString;
 exports.flattenZodSchema = flattenZodSchema;
 const ts_morph_1 = require("ts-morph");
-const path = require("node:path");
 function findCtxOutProperty(type) {
     const typeText = type.getText();
     const ctxOutMatch = typeText.match(/_ctx_out:\s*{([^}]*)}/);
@@ -12,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 '';
     }
@@ -21,6 +20,44 @@ function generateProcedureString(procedure) {
         .join('');
     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, 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();
@@ -28,18 +65,24 @@ function buildSourceFileImportsMap(sourceFile, project) {
         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)
+            const importedSourceFile = importDeclaration.getModuleSpecifierSourceFile();
+            if (importedSourceFile == null) {
                 continue;
-            const schemaVariable = importedSourceFile.getVariableDeclaration(name);
-            if (schemaVariable) {
+            }
+            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: importedSourceFile,
+                        sourceFile: resolvedSourceFile,
                     });
                 }
             }

package/lib/factories/procedure.factory.ts

@@ -1,33 +1,35 @@
 import { ConsoleLogger, Inject, Injectable, Type } from '@nestjs/common';
 import { MetadataScanner, ModuleRef } from '@nestjs/core';
 import {
-  PROCEDURE_METADATA_KEY,
-  PROCEDURE_TYPE_KEY,
   MIDDLEWARE_KEY,
+  PROCEDURE_METADATA_KEY,
   PROCEDURE_PARAM_METADATA_KEY,
+  PROCEDURE_TYPE_KEY,
 } from '../trpc.constants';
 import {
   ProcedureFactoryMetadata,
+  ProcedureImplementation,
   ProcedureParamDecorator,
   ProcedureParamDecoratorType,
   TRPCPublicProcedure,
-  ProcedureImplementation,
 } from '../interfaces/factory.interface';
-import { TRPCMiddleware, ProcedureOptions } from '../interfaces';
+import { ProcedureOptions, TRPCMiddleware } from '../interfaces';
 import type { Class } from 'type-fest';
+import { ProcedureType } from '../trpc.enum';
 
 @Injectable()
 export class ProcedureFactory {
   @Inject(ConsoleLogger)
   private readonly consoleLogger!: ConsoleLogger;
-  
+
   @Inject(MetadataScanner)
   private readonly metadataScanner!: MetadataScanner;
 
   constructor(private moduleRef: ModuleRef) {}
-  
+
   getProcedures(
     instance: unknown,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     prototype: Record<string, Function>,
   ): Array<ProcedureFactoryMetadata> {
     return this.metadataScanner.scanFromPrototype(instance, prototype, (name) =>
@@ -44,6 +46,7 @@ export class ProcedureFactory {
 
   private extractProcedureMetadata(
     name: string,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     prototype: Record<string, Function>,
   ): ProcedureFactoryMetadata {
     const callback = prototype[name] as ProcedureImplementation;
@@ -126,7 +129,7 @@ export class ProcedureFactory {
   ): TRPCPublicProcedure {
     const customProcedureInstance = this.moduleRef.get(def, { strict: false });
     if (typeof customProcedureInstance.use === 'function') {
-      //@ts-ignore
+      //@ts-expect-error this is expected since the type is correct.
       return procedure.use((opts) => customProcedureInstance.use(opts));
     }
     return procedure;
@@ -136,10 +139,10 @@ export class ProcedureFactory {
     opts: ProcedureOptions,
     params: Array<ProcedureParamDecorator> | undefined,
   ): Array<undefined | unknown> {
-    if(params == null) {
+    if (params == null) {
       return [];
     }
-    const args = new Array(Math.max(...params.map((val) => val.index)) + 1)
+    return new Array(Math.max(...params.map((val) => val.index)) + 1)
       .fill(undefined)
       .map((_val, idx) => {
         const param = params.find((param) => param.index === idx);
@@ -147,16 +150,15 @@ export class ProcedureFactory {
           return undefined;
         }
         if (param.type === ProcedureParamDecoratorType.Input) {
-          //@ts-ignore
-          return param.key != null ? opts[param.type]?.[param.key] : opts[param.type];
+          return param['key'] != null
+            ? opts[param.type]?.[param['key']]
+            : opts[param.type];
         }
         if (param.type === ProcedureParamDecoratorType.Options) {
           return opts;
         }
         return opts[param.type];
       });
-
-    return args;
   }
 
   private createSerializedProcedure(
@@ -181,10 +183,8 @@ export class ProcedureFactory {
       );
     };
 
-    return type === 'mutation'
-      ? //@ts-ignore
-        procedureWithOutput.mutation(procedureInvocation)
-      : //@ts-ignore
-        procedureWithOutput.query(procedureInvocation);
+    return type === ProcedureType.Mutation
+      ? procedureWithOutput.mutation(procedureInvocation as any)
+      : procedureWithOutput.query(procedureInvocation as any);
   }
 }

package/lib/factories/router.factory.ts

@@ -63,7 +63,10 @@ export class RouterFactory {
     return { name, instance, alias: router.alias, middlewares };
   }
 
-  serializeRoutes(router: TRPCRouter, procedure: TRPCPublicProcedure): Record<string, any> {
+  serializeRoutes(
+    router: TRPCRouter,
+    procedure: TRPCPublicProcedure,
+  ): Record<string, any> {
     const routers = this.getRouters();
     const routerSchema = Object.create({});
 
@@ -92,7 +95,6 @@ export class RouterFactory {
 
       // TODO: To get this working with `trpc` v11, we need to remove the `router()` method from here.
       routerSchema[camelCasedRouterName] = router(routerProcedures);
-
     });
 
     return routerSchema;

package/lib/generators/trpc.generator.ts

@@ -5,12 +5,7 @@ import {
   Injectable,
   OnModuleInit,
 } from '@nestjs/common';
-import {
-  Project,
-  CompilerOptions,
-  ScriptTarget,
-  ModuleKind,
-} from 'ts-morph';
+import { Project, CompilerOptions, ScriptTarget, ModuleKind } from 'ts-morph';
 import {
   generateStaticDeclaration,
   saveOrOverrideFile,
@@ -144,15 +139,15 @@ export class TRPCGenerator implements OnModuleInit {
             middleware,
             this.project,
           );
-        
-          if(middlewareInterface != null) {
-            helperTypesSourceFile.addInterface({
-              isExported: true,
-              name: `${middlewareInterface.name}Context`,
-              extends: ['Context'],
-              properties: middlewareInterface.properties,
-            });
-          }
+
+        if (middlewareInterface != null) {
+          helperTypesSourceFile.addInterface({
+            isExported: true,
+            name: `${middlewareInterface.name}Context`,
+            extends: ['Context'],
+            properties: middlewareInterface.properties,
+          });
+        }
       }
 
       await saveOrOverrideFile(helperTypesSourceFile);

package/lib/trpc.driver.ts

@@ -37,7 +37,7 @@ export class TRPCDriver<
 
     const app = httpAdapter.getInstance<ExpressApplication>();
 
-    //@ts-ignore Ignoring typescript here since it's the same type, yet it still isn't able to infer it.
+    //@ts-expect-error Ignoring typescript here since it's the same type, yet it still isn't able to infer it.
     const { procedure, router } = initTRPC.context().create({
       ...(options.transformer != null
         ? { transformer: options.transformer }
@@ -58,7 +58,6 @@ export class TRPCDriver<
           })
         : null;
 
-
     app.use(
       options.basePath ?? '/trpc',
       trpcExpress.createExpressMiddleware({

package/lib/utils/type.util.ts

@@ -3,7 +3,6 @@ import {
   ProcedureGeneratorMetadata,
   SourceFileImportsMap,
 } from '../interfaces/generator.interface';
-import * as path from 'node:path';
 
 export function findCtxOutProperty(type: Type): string | undefined {
   const typeText = type.getText();
@@ -17,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) {
@@ -31,6 +30,51 @@ 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,
@@ -42,22 +86,30 @@ function buildSourceFileImportsMap(
     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;
+        importDeclaration.getModuleSpecifierSourceFile();
 
-      const schemaVariable = importedSourceFile.getVariableDeclaration(name);
-      if (schemaVariable) {
+      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: importedSourceFile,
+            sourceFile: resolvedSourceFile,
           });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-trpc",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "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",