ucn 3.7.24 → 3.7.26

package/core/imports.js

@@ -35,7 +35,7 @@ function extractImports(content, language) {
         }
     }
 
-    return { imports: [], dynamicCount: 0 };
+    return { imports: [], dynamicCount: 0, importAliases: null };
 }
 
 /**
@@ -83,7 +83,7 @@ function resolveImport(importPath, fromFile, config = {}) {
         // Check aliases
         if (config.aliases) {
             for (const [alias, target] of Object.entries(config.aliases)) {
-                if (importPath.startsWith(alias)) {
+                if (importPath === alias || importPath.startsWith(alias + '/')) {
                     const relativePath = importPath.slice(alias.length);
                     const targetPath = path.join(config.root || fromDir, target, relativePath);
                     return resolveFilePath(targetPath, config.extensions || getExtensions(config.language));
@@ -101,7 +101,9 @@ function resolveImport(importPath, fromFile, config = {}) {
                         const match = importPath.match(regex);
                         if (match) {
                             for (const target of targets) {
-                                const resolved = target.replace('*', match[1] || '');
+                                let resolved = target;
+                            let groupIdx = 1;
+                            resolved = resolved.replace(/\*/g, () => match[groupIdx++] || '');
                                 const basePath = tsconfig.baseUrl || path.dirname(tsconfig.configPath);
                                 const fullPath = path.join(basePath, resolved);
                                 const result = resolveFilePath(fullPath, config.extensions || getExtensions(config.language));
@@ -221,7 +223,7 @@ function resolveGoImport(importPath, fromFile, projectRoot) {
     const { modulePath, root } = goMod;
 
     // Check if the import is within this module
-    if (importPath.startsWith(modulePath)) {
+    if (importPath === modulePath || importPath.startsWith(modulePath + '/')) {
         // Convert module path to relative path
         // e.g., "github.com/user/proj/pkg/util" -> "pkg/util"
         const relativePath = importPath.slice(modulePath.length).replace(/^\//, '');
@@ -231,7 +233,7 @@ function resolveGoImport(importPath, fromFile, projectRoot) {
         if (fs.existsSync(pkgDir) && fs.statSync(pkgDir).isDirectory()) {
             // Return the first .go file in the directory (not _test.go)
             try {
-                const files = fs.readdirSync(pkgDir);
+                const files = fs.readdirSync(pkgDir).sort();
                 for (const file of files) {
                     if (file.endsWith('.go') && !file.endsWith('_test.go')) {
                         return path.join(pkgDir, file);
@@ -331,9 +333,10 @@ function resolveRustImport(importPath, fromFile, projectRoot) {
             superCount++;
             rest = rest.slice('super::'.length);
         }
-        // For mod.rs: module IS the directory, so super:: goes up N levels
+        // For mod.rs/lib.rs/main.rs: module IS the directory, so super:: goes up N levels
         // For regular .rs: file is a submodule of the directory, so super:: goes up (N-1) levels
-        const isMod = path.basename(fromFile) === 'mod.rs';
+        const basename = path.basename(fromFile);
+        const isMod = basename === 'mod.rs' || basename === 'lib.rs' || basename === 'main.rs';
         const ups = isMod ? superCount : superCount - 1;
         for (let i = 0; i < ups; i++) {
             dir = path.dirname(dir);
@@ -347,9 +350,9 @@ function resolveRustImport(importPath, fromFile, projectRoot) {
         const rest = importPath.slice('self::'.length);
         const segments = rest.split('::');
         const basename = path.basename(fromFile);
-        // For mod.rs: self:: resolves within the directory containing mod.rs
+        // For mod.rs/lib.rs/main.rs: self:: resolves within the directory containing the file
         // For regular .rs: self:: resolves within a subdirectory named after the file stem
-        const dir = basename === 'mod.rs'
+        const dir = (basename === 'mod.rs' || basename === 'lib.rs' || basename === 'main.rs')
             ? fromDir
             : path.join(fromDir, path.basename(fromFile, '.rs'));
         return resolveRustModulePath(dir, segments);
@@ -384,17 +387,17 @@ function resolveFilePath(basePath, extensions) {
     // Try adding extensions
     for (const ext of extensions) {
         const withExt = basePath + ext;
-        if (fs.existsSync(withExt)) return withExt;
+        try { if (fs.existsSync(withExt) && fs.statSync(withExt).isFile()) return withExt; } catch { /* skip */ }
     }
 
     // Try index files (index.js for JS/TS, __init__.py for Python)
     for (const ext of extensions) {
         const indexPath = path.join(basePath, 'index' + ext);
-        if (fs.existsSync(indexPath)) return indexPath;
+        try { if (fs.existsSync(indexPath) && fs.statSync(indexPath).isFile()) return indexPath; } catch { /* skip */ }
     }
     // Python __init__.py
     const initPath = path.join(basePath, '__init__.py');
-    if (fs.existsSync(initPath)) return initPath;
+    try { if (fs.existsSync(initPath) && fs.statSync(initPath).isFile()) return initPath; } catch { /* skip */ }
 
     return null;
 }
@@ -435,6 +438,9 @@ function findTsConfig(fromDir, rootDir) {
     const normalizedRoot = rootDir ? path.resolve(rootDir) : null;
 
     while (true) {
+        // Check boundary BEFORE loading — don't escape the project root
+        if (normalizedRoot && !currentDir.startsWith(normalizedRoot + path.sep) && currentDir !== normalizedRoot) break;
+
         const tsconfigPath = path.join(currentDir, 'tsconfig.json');
         if (fs.existsSync(tsconfigPath)) {
             try {
@@ -448,7 +454,6 @@ function findTsConfig(fromDir, rootDir) {
 
         const parent = path.dirname(currentDir);
         if (parent === currentDir) break;
-        if (normalizedRoot && !currentDir.startsWith(normalizedRoot)) break;
         currentDir = parent;
     }
 
@@ -506,7 +511,7 @@ function loadTsConfig(tsconfigPath, visited) {
     const mergedPaths = { ...basePaths, ...(config.compilerOptions?.paths || {}) };
     const compiledPaths = Object.entries(mergedPaths).map(([pattern, targets]) => ({
         pattern,
-        regex: new RegExp('^' + pattern.replace(/[.+^$[\]\\{}()|]/g, '\\$&').replace('*', '(.*)') + '$'),
+        regex: new RegExp('^' + pattern.replace(/[.+^$[\]\\{}()|]/g, '\\$&').replace(/\*/g, '(.*)') + '$'),
         targets
     }));
 
@@ -567,5 +572,6 @@ function stripJsonComments(content) {
 module.exports = {
     extractImports,
     extractExports,
-    resolveImport
+    resolveImport,
+    resolveFilePath
 };