feat(es/resolver): Use different syntax context for unresolved refs

crates/swc/benches/typescript.rs

@@ -10,7 +10,7 @@ use swc::config::{Config, IsModule, JscConfig, Options, SourceMapsConfig};
 use swc_common::{errors::Handler, FileName, FilePathMapping, Mark, SourceFile, SourceMap};
 use swc_ecma_ast::{EsVersion, Program};
 use swc_ecma_parser::{Syntax, TsConfig};
-use swc_ecma_transforms::{fixer, hygiene, resolver, resolver_with_mark, typescript};
+use swc_ecma_transforms::{fixer, hygiene, resolver, typescript};
 use swc_ecma_visit::FoldWith;
 
 static SOURCE: &str = include_str!("assets/Observable.ts");
@@ -45,10 +45,12 @@ fn parse(c: &swc::Compiler) -> (Arc<SourceFile>, Program) {
 
 fn as_es(c: &swc::Compiler) -> Program {
     let program = parse(c).1;
-    let mark = Mark::fresh(Mark::root());
+    let unresolved_mark = Mark::new();
+    let top_level_mark = Mark::new();
+
     program
-        .fold_with(&mut resolver_with_mark(mark))
-        .fold_with(&mut typescript::strip(mark))
+        .fold_with(&mut resolver(unresolved_mark, top_level_mark, true))
+        .fold_with(&mut typescript::strip(top_level_mark))
 }
 
 fn base_tr_group(c: &mut Criterion) {
@@ -83,7 +85,7 @@ fn base_tr_resolver_and_hygiene(b: &mut Bencher) {
             black_box(c.run_transform(&handler, true, || {
                 module
                     .clone()
-                    .fold_with(&mut resolver())
+                    .fold_with(&mut resolver(Mark::new(), Mark::new(), false))
                     .fold_with(&mut hygiene())
             }))
         });

crates/swc/src/builder.rs

@@ -31,8 +31,12 @@ pub struct PassBuilder<'a, 'b, P: swc_ecma_visit::Fold> {
     handler: &'b Handler,
     env: Option<swc_ecma_preset_env::Config>,
     pass: P,
-    /// [Mark] for top level bindings and unresolved identifier references.
+    /// [Mark] for top level bindings .
     top_level_mark: Mark,
+
+    /// [Mark] for unresolved refernces.
+    unresolved_mark: Mark,
+
     target: EsVersion,
     loose: bool,
     assumptions: Assumptions,
@@ -50,6 +54,7 @@ impl<'a, 'b, P: swc_ecma_visit::Fold> PassBuilder<'a, 'b, P> {
         loose: bool,
         assumptions: Assumptions,
         top_level_mark: Mark,
+        unresolved_mark: Mark,
         pass: P,
     ) -> Self {
         PassBuilder {
@@ -58,6 +63,7 @@ impl<'a, 'b, P: swc_ecma_visit::Fold> PassBuilder<'a, 'b, P> {
             env: None,
             pass,
             top_level_mark,
+            unresolved_mark,
             target: EsVersion::Es5,
             loose,
             assumptions,
@@ -80,6 +86,7 @@ impl<'a, 'b, P: swc_ecma_visit::Fold> PassBuilder<'a, 'b, P> {
             env: self.env,
             pass,
             top_level_mark: self.top_level_mark,
+            unresolved_mark: self.unresolved_mark,
             target: self.target,
             loose: self.loose,
             assumptions: self.assumptions,
@@ -318,6 +325,7 @@ impl<'a, 'b, P: swc_ecma_visit::Fold> PassBuilder<'a, 'b, P> {
                 options: self.minify,
                 cm: self.cm.clone(),
                 comments: comments.cloned(),
+                unresolved_mark: self.unresolved_mark,
                 top_level_mark: self.top_level_mark,
             }),
             Optional::new(
@@ -333,6 +341,7 @@ struct MinifierPass {
     options: Option<JsMinifyOptions>,
     cm: Lrc<SourceMap>,
     comments: Option<SingleThreadedComments>,
+    unresolved_mark: Mark,
     top_level_mark: Mark,
 }
 
@@ -368,6 +377,7 @@ impl VisitMut for MinifierPass {
                     None,
                     &opts,
                     &swc_ecma_minifier::option::ExtraOptions {
+                        unresolved_mark: self.unresolved_mark,
                         top_level_mark: self.top_level_mark,
                     },
                 )

crates/swc/src/config/mod.rs

@@ -53,9 +53,7 @@ use swc_ecma_transforms::{
     optimization::{const_modules, json_parse, simplifier},
     pass::{noop, Optional},
     proposals::{decorators, export_default_from, import_assertions},
-    react,
-    resolver::ts_resolver,
-    resolver_with_mark,
+    react, resolver,
     typescript::{self, TSEnumConfig},
     Assumptions,
 };
@@ -166,7 +164,7 @@ pub struct Options {
     pub disable_fixer: bool,
 
     #[serde(skip_deserializing, default)]
-    pub global_mark: Option<Mark>,
+    pub top_level_mark: Option<Mark>,
 
     #[cfg(not(target_arch = "wasm32"))]
     #[serde(default = "default_cwd")]
@@ -310,9 +308,8 @@ impl Options {
             }
         });
 
-        let top_level_mark = self
-            .global_mark
-            .unwrap_or_else(|| Mark::fresh(Mark::root()));
+        let unresolved_mark = Mark::new();
+        let top_level_mark = self.top_level_mark.unwrap_or_else(Mark::new);
 
         let es_version = target.unwrap_or_default();
 
@@ -329,12 +326,14 @@ impl Options {
         if syntax.typescript() {
             assumptions.set_class_methods = !transform.use_define_for_class_fields;
             assumptions.set_public_class_fields = !transform.use_define_for_class_fields;
-
-            program.visit_mut_with(&mut ts_resolver(top_level_mark));
-        } else {
-            program.visit_mut_with(&mut resolver_with_mark(top_level_mark));
         }
 
+        program.visit_mut_with(&mut resolver(
+            unresolved_mark,
+            top_level_mark,
+            syntax.typescript(),
+        ));
+
         if program.is_module() {
             js_minify = js_minify.map(|c| {
                 let compress = c
@@ -408,6 +407,7 @@ impl Options {
             }
         };
 
+        let unresolved_ctxt = SyntaxContext::empty().apply_mark(unresolved_mark);
         let top_level_ctxt = SyntaxContext::empty().apply_mark(top_level_mark);
 
         let pass = chain!(
@@ -421,26 +421,34 @@ impl Options {
             json_parse_pass
         );
 
-        let pass = PassBuilder::new(cm, handler, loose, assumptions, top_level_mark, pass)
-            .target(es_version)
-            .skip_helper_injection(self.skip_helper_injection)
-            .minify(js_minify)
-            .hygiene(if self.disable_hygiene {
-                None
-            } else {
-                Some(hygiene::Config { keep_class_names })
-            })
-            .fixer(!self.disable_fixer)
-            .preset_env(config.env)
-            .regenerator(regenerator)
-            .finalize(
-                base_url,
-                paths.into_iter().collect(),
-                base,
-                syntax,
-                config.module,
-                comments,
-            );
+        let pass = PassBuilder::new(
+            cm,
+            handler,
+            loose,
+            assumptions,
+            top_level_mark,
+            unresolved_mark,
+            pass,
+        )
+        .target(es_version)
+        .skip_helper_injection(self.skip_helper_injection)
+        .minify(js_minify)
+        .hygiene(if self.disable_hygiene {
+            None
+        } else {
+            Some(hygiene::Config { keep_class_names })
+        })
+        .fixer(!self.disable_fixer)
+        .preset_env(config.env)
+        .regenerator(regenerator)
+        .finalize(
+            base_url,
+            paths.into_iter().collect(),
+            base,
+            syntax,
+            config.module,
+            comments,
+        );
 
         let keep_import_assertions = experimental.keep_import_assertions;
 
@@ -511,6 +519,7 @@ impl Options {
                 program: &program,
                 lint_config: &lints,
                 top_level_ctxt,
+                unresolved_ctxt,
                 es_version,
                 source_map: cm.clone(),
             })),

crates/swc/src/lib.rs

@@ -150,7 +150,7 @@ use swc_ecma_transforms::{
     hygiene,
     modules::path::NodeImportResolver,
     pass::noop,
-    resolver_with_mark,
+    resolver,
 };
 use swc_ecma_visit::{noop_visit_type, FoldWith, Visit, VisitMutWith, VisitWith};
 pub use swc_error_reporters::handler::{try_with_handler, HandlerOpts};
@@ -1037,20 +1037,25 @@ impl Compiler {
                 Default::default()
             };
 
-            let top_level_mark = Mark::fresh(Mark::root());
+            let unresolved_mark = Mark::new();
+            let top_level_mark = Mark::new();
 
             let is_mangler_enabled = min_opts.mangle.is_some();
 
             let module = self.run_transform(handler, false, || {
-                let module = module.fold_with(&mut resolver_with_mark(top_level_mark));
+                let module =
+                    module.fold_with(&mut resolver(unresolved_mark, top_level_mark, false));
 
                 let mut module = swc_ecma_minifier::optimize(
                     module,
                     self.cm.clone(),
                     Some(&comments),
                     None,
                     &min_opts,
-                    &swc_ecma_minifier::option::ExtraOptions { top_level_mark },
+                    &swc_ecma_minifier::option::ExtraOptions {
+                        unresolved_mark,
+                        top_level_mark,
+                    },
                 );
 
                 if !is_mangler_enabled {

crates/swc/tests/rust_api.rs

@@ -161,7 +161,7 @@ fn shopify_2_same_opt() {
             skip_helper_injection: false,
             disable_hygiene: false,
             disable_fixer: false,
-            global_mark: None,
+            top_level_mark: None,
             cwd: "/Users/kdy1/projects/example-swcify".into(),
             filename: "/Users/kdy1/projects/example-swcify/src/App/App.tsx".into(),
             env_name: "development".into(),

crates/swc/tests/tsc-references/InvalidNonInstantiatedModule_es2015.2.minified.js

@@ -1 +0,0 @@
-M;

crates/swc/tests/tsc-references/InvalidNonInstantiatedModule_es5.2.minified.js

@@ -1 +0,0 @@
-M;

crates/swc/tests/tsc-references/asOpEmitParens_es2015.2.minified.js

@@ -1 +1 @@
-x, x.y, new (x());
+x.y, new (x());

crates/swc/tests/tsc-references/asOpEmitParens_es5.2.minified.js

@@ -1 +1 @@
-x, x.y, new (x());
+x.y, new (x());

crates/swc/tests/tsc-references/circularImportAlias_es2015.1.normal.js

@@ -7,13 +7,13 @@ var B;
     }
     B1.D = D;
 })(B || (B = {}));
-var A;
-(function(A1) {
+var A1;
+(function(A) {
     class C {
     }
-    A1.C = C;
+    A.C = C;
     var b = B;
-    A1.b = b;
-})(A || (A = {}));
+    A.b = b;
+})(A1 || (A1 = {}));
 var c;
 var c = new B.a.C();

crates/swc/tests/tsc-references/circularImportAlias_es2015.2.minified.js

@@ -1,13 +1,13 @@
-var B, A;
+var B, A1;
 !function(B1) {
     var a = A;
     B1.a = a;
     class D extends a.C {
     }
     B1.D = D;
-}(B || (B = {})), function(A1) {
-    A1.C = class {
+}(B || (B = {})), function(A) {
+    A.C = class {
     };
     var b = B;
-    A1.b = b;
-}(A || (A = {})), new B.a.C();
+    A.b = b;
+}(A1 || (A1 = {})), new B.a.C();

crates/swc/tests/tsc-references/circularImportAlias_es5.1.normal.js

@@ -16,15 +16,15 @@ var B;
     }(a.C);
     B1.D = D;
 })(B || (B = {}));
-var A;
-(function(A1) {
+var A1;
+(function(A) {
     var C = function C() {
         "use strict";
         swcHelpers.classCallCheck(this, C);
     };
-    A1.C = C;
+    A.C = C;
     var b = B;
-    A1.b = b;
-})(A || (A = {}));
+    A.b = b;
+})(A1 || (A1 = {}));
 var c;
 var c = new B.a.C();

crates/swc/tests/tsc-references/circularImportAlias_es5.2.minified.js

@@ -1,4 +1,4 @@
-var B, A;
+var B, A1;
 import * as swcHelpers from "@swc/helpers";
 !function(B1) {
     var a = A;
@@ -13,12 +13,12 @@ import * as swcHelpers from "@swc/helpers";
         return D;
     }(a.C);
     B1.D = D;
-}(B || (B = {})), function(A1) {
+}(B || (B = {})), function(A) {
     var C = function() {
         "use strict";
         swcHelpers.classCallCheck(this, C);
     };
-    A1.C = C;
+    A.C = C;
     var b = B;
-    A1.b = b;
-}(A || (A = {})), new B.a.C();
+    A.b = b;
+}(A1 || (A1 = {})), new B.a.C();

crates/swc/tests/tsc-references/classExtendsItselfIndirectly2_es2015.1.normal.js

@@ -6,12 +6,12 @@ var M;
     }
     M1.D = D;
 })(M || (M = {}));
-var N;
-(function(N1) {
+var N1;
+(function(N) {
     class E extends M.D {
     }
-    N1.E = E;
-})(N || (N = {}));
+    N.E = E;
+})(N1 || (N1 = {}));
 var O;
 (function(O) {
     class C2 extends Q.E2 {

crates/swc/tests/tsc-references/classExtendsItselfIndirectly2_es2015.2.minified.js

@@ -1,12 +1,12 @@
-var M, N, O;
+var M, N1, O;
 class C extends N.E {
 }
 (M || (M = {})).D = class extends C {
-}, function(N1) {
+}, function(N) {
     class E extends M.D {
     }
-    N1.E = E;
-}(N || (N = {})), function(O) {
+    N.E = E;
+}(N1 || (N1 = {})), function(O) {
     class C2 extends Q.E2 {
     }
     let P;