idk anymore, lets log more

Author: mmaietta

packages/app-builder-lib/src/node-module-collector/nodeModulesCollector.ts

@@ -39,7 +39,7 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
   constructor(
     protected readonly rootDir: string,
     private readonly tempDirManager: TmpDir
-  ) {}
+  ) { }
 
   public async getNodeModules({ cancellationToken, packageName }: { cancellationToken: CancellationToken; packageName: string }): Promise<NodeModuleInfo[]> {
     const tree: ProdDepType = await this.getDependenciesTree(this.installOptions.manager)
@@ -172,6 +172,7 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
       }
 
       // 2. Handle file: and file:// protocol or pnpm-style virtual paths
+      // Try file: protocol for virtualPath
       if (virtualPath?.startsWith("file:")) {
         const filePath = virtualPath.replace(/^file:(\/\/)?/, "")
         const normalizedPath = filePath.replace(/\//g, path.sep)
@@ -192,10 +193,23 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
         // Relative to root
         candidatePaths.push(path.resolve(this.rootDir, normalizedPath))
 
-        // If the path contains .pnpm, also try the non-pnpm version
-        const pnpmMatch = normalizedPath.match(/\.pnpm[/\\][^/\\]+[/\\]node_modules[/\\](.+)$/)
-        if (pnpmMatch) {
-          const pkgName = pnpmMatch[1].replace(/\\/g, "/")
+        // Extract package name from various pnpm path patterns
+        let pkgName: string | null = null
+
+        // Pattern 1: .pnpm/@types+fs-extra@9.0.13/node_modules/@types/fs-extra
+        const pnpmMatch1 = normalizedPath.match(/\.pnpm[/\\][^/\\]+[/\\]node_modules[/\\](.+)$/)
+        if (pnpmMatch1) {
+          pkgName = pnpmMatch1[1].replace(/\\/g, '/')
+        }
+
+        // Pattern 2: @types+node@22.13.17/node_modules/@types/node
+        const pnpmMatch2 = normalizedPath.match(/([^/\\]+@[^/\\]+)[/\\]node_modules[/\\](.+)$/)
+        if (pnpmMatch2 && !pkgName) {
+          pkgName = pnpmMatch2[2].replace(/\\/g, '/')
+        }
+
+        if (pkgName) {
+          log.error({ normalizedPath, extractedPkgName: pkgName }, "extracted package name from pnpm path")
 
           // Try in rootDir
           candidatePaths.push(path.resolve(this.rootDir, "node_modules", pkgName))
@@ -210,11 +224,9 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
             if (next === current) break
             current = next
           }
-
-          log.debug({ normalizedPath, extractedPkgName: pkgName }, "extracted package name from pnpm path")
         }
 
-        log.debug({ pkg, virtualPath, candidatePaths }, "trying to resolve file dependency")
+        log.error({ pkg, virtualPath, candidatePaths }, "trying to resolve file dependency")
 
         // Try each candidate path
         for (const candidatePath of candidatePaths) {
@@ -223,7 +235,7 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
             const pkgJsonPath = path.join(candidatePath, "package.json")
             if (await exists(pkgJsonPath)) {
               const resolvedPath = await fs.realpath(candidatePath)
-              log.debug({ pkg, resolvedPath }, "resolved file dependency")
+              log.error({ pkg, resolvedPath }, "resolved file dependency")
               return resolvedPath
             }
           } catch {
@@ -234,7 +246,7 @@ export abstract class NodeModulesCollector<ProdDepType extends Dependency<ProdDe
 
         // None of the candidates worked
         if (isOptionalDependency) {
-          log.debug({ pkg, virtualPath, candidatePaths }, "optional file dependency not found")
+          log.error({ pkg, virtualPath, candidatePaths }, "optional file dependency not found")
           return null
         }