Fix for prefix overlapping in some cases

awslabs · Nov 12, 2024 · d73fed2 · d73fed2
1 parent 2d223bf
commit d73fed2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/llrt_core/src/module_loader/loader.rs b/llrt_core/src/module_loader/loader.rs
@@ -138,13 +138,19 @@ impl CustomLoader {
             return (false, false, name, name);
         }
 
+        // If it starts with CJS_IMPORT_PREFIX, mark as from_cjs_import
         if let Some(cjs_path) = name.strip_prefix(CJS_IMPORT_PREFIX) {
-            // If it starts with CJS_IMPORT_PREFIX, mark as from_cjs_import
+            if let Some(cjs_path) = cjs_path.strip_prefix(CJS_LOADER_PREFIX) {
+                return (true, false, cjs_path, cjs_path);
+            }
             return (true, false, name, cjs_path);
         }
 
+        // If it starts with CJS_LOADER_PREFIX, mark as is_cjs
         if let Some(cjs_path) = name.strip_prefix(CJS_LOADER_PREFIX) {
-            // If it starts with CJS_LOADER_PREFIX, mark as is_cjs
+            if let Some(cjs_path) = cjs_path.strip_prefix(CJS_IMPORT_PREFIX) {
+                return (false, true, cjs_path, cjs_path);
+            }
             return (false, true, cjs_path, cjs_path);
         }