feat: Support dynamic imports (#706)

crates/stc_ts_file_analyzer/src/analyzer/expr/call_new.rs

@@ -111,11 +111,28 @@ impl Analyzer<'_, '_> {
             }
             RCallee::Expr(callee) => callee,
             RCallee::Import(..) => {
+                let base = self.storage.path(self.ctx.module_id);
+
+                let src = args.iter().next().and_then(|arg| match arg {
+                    RExprOrSpread { spread: None, expr } => match &**expr {
+                        RExpr::Lit(RLit::Str(RStr { span, value, .. })) => Some(value.clone()),
+                        _ => None,
+                    },
+                    _ => None,
+                });
+                let dep_id = src.and_then(|src| self.loader.module_id(&base, &src));
+
+                if let Some(dep_id) = dep_id {
+                    if let Some(dep) = self.data.imports.get(&(self.ctx.module_id, dep_id)) {
+                        return Ok(dep.clone());
+                    }
+                }
+
                 return Err(ErrorKind::Unimplemented {
                     span: e.span,
                     msg: "validation of dynamic import".to_string(),
                 }
-                .into())
+                .into());
             }
         };
 

crates/stc_ts_file_analyzer/src/analyzer/import.rs

@@ -1,4 +1,3 @@
-#[cfg(not(feature = "no-threading"))]
 use rayon::prelude::*;
 use rnode::{Visit, VisitWith};
 use stc_ts_ast_rnode::{
@@ -102,20 +101,31 @@ impl Analyzer<'_, '_> {
             normal_imports.push((ctxt, base.clone(), dep_id, import.src.clone(), import));
         }
 
-        #[cfg(feature = "no-threading")]
-        let iter = normal_imports.into_iter();
-        #[cfg(not(feature = "no-threading"))]
-        let iter = normal_imports.into_par_iter();
+        let import_results = if cfg!(feature = "no-threading") {
+            let iter = normal_imports.into_iter();
 
-        let import_results = GLOBALS.with(|globals| {
-            iter.map(|(ctxt, base, dep_id, module_specifier, import)| {
-                GLOBALS.set(globals, || {
-                    let res = loader.load_non_circular_dep(&base, &module_specifier);
-                    (ctxt, dep_id, import, res)
+            GLOBALS.with(|globals| {
+                iter.map(|(ctxt, base, dep_id, module_specifier, import)| {
+                    GLOBALS.set(globals, || {
+                        let res = loader.load_non_circular_dep(&base, &module_specifier);
+                        (ctxt, dep_id, import, res)
+                    })
+                })
+                .collect::<Vec<_>>()
+            })
+        } else {
+            let iter = normal_imports.into_par_iter();
+
+            GLOBALS.with(|globals| {
+                iter.map(|(ctxt, base, dep_id, module_specifier, import)| {
+                    GLOBALS.set(globals, || {
+                        let res = loader.load_non_circular_dep(&base, &module_specifier);
+                        (ctxt, dep_id, import, res)
+                    })
                 })
+                .collect::<Vec<_>>()
             })
-            .collect::<Vec<_>>()
-        });
+        };
 
         for (ctxt, dep_id, import, res) in import_results {
             let span = import.span;
@@ -321,8 +331,8 @@ where
     fn visit(&mut self, expr: &RCallExpr) {
         let span = expr.span();
 
-        match expr.callee {
-            RCallee::Expr(box RExpr::Ident(ref i)) if i.sym == js_word!("require") => {
+        match &expr.callee {
+            RCallee::Expr(box RExpr::Ident(i)) if i.sym == js_word!("require") => {
                 let src = expr
                     .args
                     .iter()
@@ -334,6 +344,16 @@ where
                     .unwrap();
                 self.to.push((self.cur_ctxt, DepInfo { span, src }));
             }
+            RCallee::Import(import) => {
+                let src = expr.args.first().and_then(|v| match *v.expr {
+                    RExpr::Lit(RLit::Str(RStr { ref value, .. })) => Some(value.clone()),
+                    _ => None,
+                });
+
+                if let Some(src) = src {
+                    self.to.push((self.cur_ctxt, DepInfo { span, src }));
+                }
+            }
             _ => {}
         }
     }

crates/stc_ts_type_checker/tests/conformance.pass.txt

@@ -164,6 +164,7 @@ classes/classExpressions/classWithStaticFieldInParameterBindingPattern.3.ts
 classes/classExpressions/classWithStaticFieldInParameterBindingPattern.ts
 classes/classExpressions/classWithStaticFieldInParameterInitializer.3.ts
 classes/classExpressions/classWithStaticFieldInParameterInitializer.ts
+classes/classExpressions/extendClassExpressionFromModule.ts
 classes/classExpressions/genericClassExpressionInFunction.ts
 classes/classExpressions/modifierOnClassExpressionMemberInFunction.ts
 classes/classStaticBlock/classStaticBlock1.ts
@@ -369,6 +370,16 @@ declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateNam
 declarationEmit/typeofImportTypeOnlyExport.ts
 decorators/1.0lib-noErrors.ts
 directives/ts-expect-error-nocheck.ts
+dynamicImport/importCallExpression3ES2020.ts
+dynamicImport/importCallExpressionDeclarationEmit2.ts
+dynamicImport/importCallExpressionInAMD3.ts
+dynamicImport/importCallExpressionInCJS4.ts
+dynamicImport/importCallExpressionInExportEqualsAMD.ts
+dynamicImport/importCallExpressionInExportEqualsCJS.ts
+dynamicImport/importCallExpressionInExportEqualsUMD.ts
+dynamicImport/importCallExpressionInScriptContext1.ts
+dynamicImport/importCallExpressionInSystem3.ts
+dynamicImport/importCallExpressionInUMD3.ts
 emitter/es2015/asyncGenerators/emitter.asyncGenerators.classMethods.es2015.ts
 emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionDeclarations.es2015.ts
 emitter/es2015/asyncGenerators/emitter.asyncGenerators.functionExpressions.es2015.ts
@@ -1592,6 +1603,7 @@ externalModules/exportDefaultClassNameWithObject.ts
 externalModules/exportNonLocalDeclarations.ts
 externalModules/exportNonVisibleType.ts
 externalModules/globalAugmentationModuleResolution.ts
+externalModules/importImportOnlyModule.ts
 externalModules/multipleExportDefault1.ts
 externalModules/multipleExportDefault2.ts
 externalModules/multipleExportDefault3.ts

crates/stc_ts_type_checker/tests/conformance/classes/classExpressions/extendClassExpressionFromModule.stats.rust-debug

@@ -2,5 +2,5 @@ Stats {
     required_error: 0,
     matched_error: 0,
     extra_error: 0,
-    panic: 1,
+    panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpression1ES2020.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 4,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpression3ES2020.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpression4ES2020.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 2,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionCheckReturntype1.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 2,
     matched_error: 0,
-    extra_error: 3,
+    extra_error: 2,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionDeclarationEmit2.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionDeclarationEmit3.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 4,
+    extra_error: 3,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES5AMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES5CJS.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES5System.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES5UMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES6AMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES6CJS.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES6System.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionES6UMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 6,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInAMD1.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 4,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInAMD3.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInAMD4.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 2,
+    extra_error: 4,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInCJS1.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 4,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInCJS2.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 2,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInCJS4.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInCJS5.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 2,
+    extra_error: 4,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInExportEqualsAMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInExportEqualsCJS.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInExportEqualsUMD.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInScriptContext1.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInSystem1.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 4,
+    extra_error: 1,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInSystem3.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 1,
+    extra_error: 0,
     panic: 0,
 }

crates/stc_ts_type_checker/tests/conformance/dynamicImport/importCallExpressionInSystem4.stats.rust-debug

@@ -1,6 +1,6 @@
 Stats {
     required_error: 0,
     matched_error: 0,
-    extra_error: 2,
+    extra_error: 4,
     panic: 0,
 }