packages/compiler-sfc/src/script/resolveType.ts (2)

1159-1173: Consider caching package.json for performance.

The findPackageJsonFile function searches for package.json by traversing the directory tree on every call. Since package.json files rarely change during runtime, consider implementing a simple cache to avoid repeated filesystem operations.

Here's a suggested implementation with caching:

+const packageJsonCache = new Map<string, string | undefined>()
+
 function findPackageJsonFile(fs: FS): string | undefined {
+  const cacheKey = process.cwd()
+  if (packageJsonCache.has(cacheKey)) {
+    return packageJsonCache.get(cacheKey)
+  }
+  
   let currDir = process.cwd()
   while (true) {
     const filePath = joinPaths(currDir, 'package.json')
     if (fs.fileExists(filePath)) {
+      packageJsonCache.set(cacheKey, filePath)
       return filePath
     }

     const parentDir = dirname(currDir)
     if (parentDir === currDir) {
+      packageJsonCache.set(cacheKey, undefined)
       return
     }

     currDir = parentDir
   }
 }

---

1152-1152: Consider using joinPaths for consistency.

The code uses resolve from the path module here, but uses joinPaths elsewhere in the codebase for path operations. Consider using joinPaths for consistency with the rest of the codebase.

-    const resolved = resolve(dirname(pkgPath), resolvedImports[0])
+    const resolved = joinPaths(dirname(pkgPath), resolvedImports[0])

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

packages/compiler-sfc/src/script/resolveType.ts (1)

1129-1159: Add validation for package.json imports field and improve error handling.

The function assumes that pkg.imports exists and that resolveImports returns an array. Add validation to handle edge cases where the imports field might be missing or malformed.

 function resolveWithNodeSubpathImports(
   containingFile: string,
   source: string,
   fs: FS,
 ): string | undefined {
   if (!__CJS__) return

   try {
     const pkgPath = findPackageJsonFile(containingFile, fs)
     if (!pkgPath) {
       return
     }

     const pkgStr = fs.readFile(pkgPath)
     if (!pkgStr) {
       return
     }

     const pkg = JSON.parse(pkgStr)
+    if (!pkg.imports || typeof pkg.imports !== 'object') {
+      return
+    }
+    
     const resolvedImports = resolveImports(pkg, source)
     if (!resolvedImports || !resolvedImports.length) {
       return
     }

     const resolved = isAbsolute(resolvedImports[0])
       ? resolvedImports[0]
       : joinPaths(dirname(pkgPath), resolvedImports[0])

     return fs.realpath ? fs.realpath(resolved) : resolved
   } catch (e) {}
 }

packages/compiler-sfc/__tests__/compileScript/resolveType.spec.ts (1)

1201-1235: Test configuration needs setup for Node subpath imports to work.

The test failure indicates that the Node subpath imports resolution is not working correctly. This is because:

1. The __CJS__ flag is not set in the test environment, so resolveWithNodeSubpathImports immediately returns without attempting resolution
2. The resolve.exports package needs to be in dependencies instead of devDependencies for runtime availability

To fix this, you need to:

1. Move resolve.exports from devDependencies to dependencies in packages/compiler-sfc/package.json
2. Set up the test environment to define __CJS__ = true (e.g., via Jest/Vitest setup file)

These changes will ensure the Node subpath imports resolution path is executed during tests.

packages/compiler-sfc/src/script/resolveType.ts (1)

1161-1179: Consider caching package.json lookups for better performance.

The findPackageJsonFile function performs a potentially expensive directory traversal every time it's called. Consider caching the results to improve performance, especially when resolving multiple imports from the same package.

+const packageJsonCache = new Map<string, string | undefined>()
+
 function findPackageJsonFile(
   searchStartPath: string,
   fs: FS,
 ): string | undefined {
+  const cached = packageJsonCache.get(searchStartPath)
+  if (cached !== undefined) {
+    return cached || undefined
+  }
+
   let currDir = searchStartPath
   while (true) {
     const filePath = joinPaths(currDir, 'package.json')
     if (fs.fileExists(filePath)) {
+      packageJsonCache.set(searchStartPath, filePath)
       return filePath
     }

     const parentDir = dirname(currDir)
     if (parentDir === currDir) {
+      packageJsonCache.set(searchStartPath, '')
       return
     }

     currDir = parentDir
   }
 }

Additionally, you may want to invalidate this cache in the invalidateTypeCache function.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.