perf(es/ast): Properly box variants

bindings/binding_core_node/src/bundle.rs

@@ -275,23 +275,23 @@ impl swc_core::bundler::Hook for Hook {
 
         Ok(vec![
             KeyValueProp {
-                key: PropName::Ident(Ident::new("url".into(), span)),
+                key: PropName::Ident(Ident::new_no_ctxt("url".into(), span)),
                 value: Box::new(Expr::Lit(Lit::Str(Str {
                     span,
                     raw: None,
                     value: file_name.into(),
                 }))),
             },
             KeyValueProp {
-                key: PropName::Ident(Ident::new("main".into(), span)),
+                key: PropName::Ident(Ident::new_no_ctxt("main".into(), span)),
                 value: Box::new(if module_record.is_entry {
                     Expr::Member(MemberExpr {
                         span,
                         obj: Box::new(Expr::MetaProp(MetaPropExpr {
                             span,
                             kind: MetaPropKind::ImportMeta,
                         })),
-                        prop: MemberProp::Ident(Ident::new("main".into(), span)),
+                        prop: MemberProp::Ident(Ident::new_no_ctxt("main".into(), span)),
                     })
                 } else {
                     Expr::Lit(Lit::Bool(Bool { span, value: false }))

bindings/binding_core_node/src/minify.rs

@@ -34,7 +34,7 @@ enum MinifyTarget {
 impl MinifyTarget {
     fn to_file(&self, cm: Lrc<SourceMap>) -> Lrc<SourceFile> {
         match self {
-            MinifyTarget::Single(code) => cm.new_source_file(FileName::Anon, code.clone()),
+            MinifyTarget::Single(code) => cm.new_source_file(FileName::Anon.into(), code.clone()),
             MinifyTarget::Map(codes) => {
                 assert_eq!(
                     codes.len(),
@@ -44,7 +44,7 @@ impl MinifyTarget {
 
                 let (filename, code) = codes.iter().next().unwrap();
 
-                cm.new_source_file(FileName::Real(filename.clone().into()), code.clone())
+                cm.new_source_file(FileName::Real(filename.clone().into()).into(), code.clone())
             }
         }
     }

bindings/binding_core_node/src/parse.rs

@@ -45,7 +45,7 @@ impl Task for ParseTask {
         let fm = self
             .c
             .cm
-            .new_source_file(self.filename.clone(), self.src.clone());
+            .new_source_file(self.filename.clone().into(), self.src.clone());
 
         let comments = if options.comments {
             Some(self.c.comments() as &dyn Comments)
@@ -178,7 +178,7 @@ pub fn parse_sync(src: String, opts: Buffer, filename: Option<String>) -> napi::
 
     let program = try_with(c.cm.clone(), false, ErrorFormat::Normal, |handler| {
         c.run(|| {
-            let fm = c.cm.new_source_file(filename, src);
+            let fm = c.cm.new_source_file(filename.into(), src);
 
             let comments = if options.comments {
                 Some(c.comments() as &dyn Comments)

bindings/binding_core_node/src/transform.rs

@@ -71,9 +71,9 @@ impl Task for TransformTask {
                     Input::Source { src } => {
                         let fm = self.c.cm.new_source_file(
                             if options.filename.is_empty() {
-                                FileName::Anon
+                                FileName::Anon.into()
                             } else {
-                                FileName::Real(options.filename.clone().into())
+                                FileName::Real(options.filename.clone().into()).into()
                             },
                             src.to_string(),
                         );
@@ -150,9 +150,9 @@ pub fn transform_sync(s: String, is_module: bool, opts: Buffer) -> napi::Result<
                 } else {
                     let fm = c.cm.new_source_file(
                         if options.filename.is_empty() {
-                            FileName::Anon
+                            FileName::Anon.into()
                         } else {
-                            FileName::Real(options.filename.clone().into())
+                            FileName::Real(options.filename.clone().into()).into()
                         },
                         s,
                     );

bindings/binding_core_wasm/__tests__/simple.js

@@ -103,12 +103,13 @@ describe("parse", () => {
               "body": [
                 {
                   "body": [],
+                  "ctxt": 0,
                   "declare": false,
                   "decorators": [],
                   "identifier": {
+                    "ctxt": 2,
                     "optional": false,
                     "span": {
-                      "ctxt": 2,
                       "end": 289,
                       "start": 286,
                     },
@@ -118,7 +119,6 @@ describe("parse", () => {
                   "implements": [],
                   "isAbstract": false,
                   "span": {
-                    "ctxt": 0,
                     "end": 292,
                     "start": 280,
                   },
@@ -130,7 +130,6 @@ describe("parse", () => {
               ],
               "interpreter": null,
               "span": {
-                "ctxt": 0,
                 "end": 292,
                 "start": 280,
               },
@@ -150,12 +149,13 @@ describe("parse", () => {
               "body": [
                 {
                   "body": [],
+                  "ctxt": 0,
                   "declare": false,
                   "decorators": [],
                   "identifier": {
+                    "ctxt": 2,
                     "optional": false,
                     "span": {
-                      "ctxt": 2,
                       "end": 302,
                       "start": 299,
                     },
@@ -165,7 +165,6 @@ describe("parse", () => {
                   "implements": [],
                   "isAbstract": false,
                   "span": {
-                    "ctxt": 0,
                     "end": 305,
                     "start": 293,
                   },
@@ -177,7 +176,6 @@ describe("parse", () => {
               ],
               "interpreter": null,
               "span": {
-                "ctxt": 0,
                 "end": 305,
                 "start": 293,
               },

bindings/binding_typescript_wasm/__tests__/__snapshots__/transform.js.snap

@@ -77,15 +77,6 @@ exports[`transform in strip-only mode should throw an error when it encounters a
 "
 `;
 
-exports[`transform in strip-only mode should throw an error with a descriptive message when it encounters a decorator 1`] = `
-"  x Decorators are not supported
-   ,----
- 1 | class Foo { @decorator foo() {} }
-   :             ^^^^^^^^^^
-   \`----
-"
-`;
-
 exports[`transform should strip types 1`] = `
 "
         export const foo         = 1;

bindings/binding_typescript_wasm/__tests__/transform.js

@@ -115,14 +115,6 @@ describe("transform", () => {
             ).rejects.toMatchSnapshot();
         });
 
-        it("should throw an error with a descriptive message when it encounters a decorator", async () => {
-            await expect(
-                swc.transform("class Foo { @decorator foo() {} }", {
-                    mode: "strip-only",
-                })
-            ).rejects.toMatchSnapshot();
-        });
-
         it("should throw an error when it encounters a namespace", async () => {
             await expect(
                 swc.transform("namespace Foo {}", {

crates/binding_macros/src/wasm.rs

@@ -111,7 +111,7 @@ macro_rules! build_minify_sync {
                       .map_err(|e| $crate::wasm::anyhow::anyhow!("failed to parse options: {}", e))?
                   };
 
-                  let fm = c.cm.new_source_file($crate::wasm::FileName::Anon, s.into());
+                  let fm = c.cm.new_source_file($crate::wasm::FileName::Anon.into(), s.into());
                   let program = $crate::wasm::anyhow::Context::context(c.minify(fm, handler, &opts), "failed to minify file")?;
 
                   program
@@ -167,7 +167,7 @@ macro_rules! build_parse_sync {
                         .map_err(|e| $crate::wasm::anyhow::anyhow!("failed to parse options: {}", e))?
                   };
 
-                  let fm = c.cm.new_source_file($crate::wasm::FileName::Anon, s.into());
+                  let fm = c.cm.new_source_file($crate::wasm::FileName::Anon.into(), s.into());
 
                   let cmts = c.comments().clone();
                   let comments = if opts.comments {
@@ -371,9 +371,9 @@ macro_rules! build_transform_sync {
                       Ok(s) => {
                           let fm = c.cm.new_source_file(
                               if opts.filename.is_empty() {
-                                $crate::wasm::FileName::Anon
+                                $crate::wasm::FileName::Anon.into()
                               } else {
-                                $crate::wasm::FileName::Real(opts.filename.clone().into())
+                                $crate::wasm::FileName::Real(opts.filename.clone().into()).into()
                               },
                               s.into(),
                           );

crates/dbg-swc/src/bundle.rs

@@ -28,7 +28,7 @@ pub fn bundle(cm: Arc<SourceMap>, entry_url: &str) -> Result<ModuleRecord> {
         let code =
             String::from_utf8(output.stdout).context("deno bundle emitted non-utf8 output")?;
 
-        let fm = cm.new_source_file(FileName::Anon, code);
+        let fm = cm.new_source_file(FileName::Anon.into(), code);
         parse_js(fm).context("failed to parse js filed emitted by `deno bundle`")
     })
     .with_context(|| format!("failed to bundle `{}`", entry_url))

crates/dbg-swc/src/util/minifier.rs

@@ -96,7 +96,7 @@ pub fn get_terser_output(file: &Path, compress: bool, mangle: bool) -> Result<St
 
         // Drop comments
         let cm = Arc::new(SourceMap::default());
-        let fm = cm.new_source_file(FileName::Anon, output);
+        let fm = cm.new_source_file(FileName::Anon.into(), output);
         let m = parse_js(fm)?;
 
         let code = print_js(cm, &m.module, true)?;

crates/jsdoc/src/ast.rs

@@ -232,7 +232,7 @@ pub struct ExprWithTypeArgs {
     pub span: Span,
 
     // TODO parent: HeritageClause | JSDocAugmentsTag | JSDocImplementsTag;
-    pub expr: Box<Expr>,
+    pub expr: Expr,
 }
 
 #[ast_node]

crates/jsdoc/src/input.rs

@@ -34,7 +34,7 @@ impl<'i> Input<'i> {
 
     #[inline(always)]
     pub fn span(self) -> Span {
-        Span::new(self.start, self.end, Default::default())
+        Span::new(self.start, self.end)
     }
 }
 
@@ -57,7 +57,7 @@ impl_slice!(RangeTo);
 impl<'i> From<Input<'i>> for Text {
     fn from(i: Input) -> Self {
         Self {
-            span: Span::new(i.start, i.end, Default::default()),
+            span: Span::new(i.start, i.end),
             value: i.src.into(),
         }
     }

crates/jsdoc/src/lib.rs

@@ -3,7 +3,7 @@ use nom::{
     error::ErrorKind,
     IResult, InputIter, Slice,
 };
-use swc_common::{Span, Spanned, SyntaxContext};
+use swc_common::{Span, Spanned};
 
 pub use self::input::Input;
 use crate::ast::*;
@@ -32,7 +32,7 @@ pub fn parse(i: Input) -> IResult<Input, JsDoc> {
     Ok((
         i,
         JsDoc {
-            span: Span::new(lo, hi, SyntaxContext::empty()),
+            span: Span::new(lo, hi),
             tags,
             description,
         },
@@ -563,7 +563,7 @@ fn parse_name_path(mut i: Input) -> IResult<Input, NamePath> {
                 return Ok((
                     i,
                     NamePath {
-                        span: Span::new(lo, i.span().hi, Default::default()),
+                        span: Span::new(lo, i.span().hi),
                         components,
                     },
                 ));

crates/jsdoc/tests/fixtures/abstracttag.debug

@@ -1,20 +1,20 @@
 [
     JsDoc {
-        span: 1..1#0,
+        span: 1..1,
         description: Text {
-            span: 1..1#0,
+            span: 1..1,
             value: "",
         },
         tags: [
             TagItem {
-                span: 1..12#0,
+                span: 1..12,
                 tag_name: Text {
-                    span: 1..12#0,
+                    span: 1..12,
                     value: "constructor",
                 },
                 tag: Class(
                     ClassTag {
-                        span: 1..12#0,
+                        span: 1..12,
                         ty: None,
                         name: None,
                     },
@@ -23,42 +23,42 @@
         ],
     },
     JsDoc {
-        span: 46..46#0,
+        span: 46..46,
         description: Text {
-            span: 46..46#0,
+            span: 46..46,
             value: "",
         },
         tags: [
             TagItem {
-                span: 46..54#0,
+                span: 46..54,
                 tag_name: Text {
-                    span: 46..54#0,
+                    span: 46..54,
                     value: "abstract",
                 },
                 tag: Abstract(
                     AbstractTag {
-                        span: 46..54#0,
+                        span: 46..54,
                     },
                 ),
             },
         ],
     },
     JsDoc {
-        span: 100..100#0,
+        span: 100..100,
         description: Text {
-            span: 100..100#0,
+            span: 100..100,
             value: "",
         },
         tags: [
             TagItem {
-                span: 100..111#0,
+                span: 100..111,
                 tag_name: Text {
-                    span: 100..111#0,
+                    span: 100..111,
                     value: "constructor",
                 },
                 tag: Class(
                     ClassTag {
-                        span: 100..111#0,
+                        span: 100..111,
                         ty: None,
                         name: None,
                     },
@@ -67,21 +67,21 @@
         ],
     },
     JsDoc {
-        span: 150..150#0,
+        span: 150..150,
         description: Text {
-            span: 150..150#0,
+            span: 150..150,
             value: "",
         },
         tags: [
             TagItem {
-                span: 150..157#0,
+                span: 150..157,
                 tag_name: Text {
-                    span: 150..157#0,
+                    span: 150..157,
                     value: "virtual",
                 },
                 tag: Abstract(
                     AbstractTag {
-                        span: 150..157#0,
+                        span: 150..157,
                     },
                 ),
             },