chore: update swc (QwikDev#1360)

IlyasShabi · Sep 21, 2022 · c0d8df2 · c0d8df2
1 parent 91f7bf6
commit c0d8df2
Show file tree

Hide file tree

Showing 60 changed files with 690 additions and 905 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/qwik/src/optimizer/core/Cargo.toml b/packages/qwik/src/optimizer/core/Cargo.toml
@@ -13,24 +13,24 @@ categories = ["development-tools", "development-tools::cargo-plugins"]
 crate-type = ["rlib"]
 
 [dependencies]
-swc_ecmascript = { version = "0.188.0", features = ["parser", "transforms", "module", "typescript", "optimization", "minifier", "react", "utils", "visit", "codegen", "utils"] }
-swc_common = { version = "0.27.0", features = ["sourcemap"] }
-swc_atoms = "0.4.0"
-serde = "1.0.142"
+swc_ecmascript = { version = "0.201.5", features = ["codegen", "utils", "visit", "parser", "transforms", "typescript", "react", "optimization"] }
+swc_common = { version = "0.28.8", features = ["sourcemap"] }
+swc_atoms = "0.4.15"
+serde = "1.0.144"
 serde_bytes = "0.11.7"
-serde_json = "1.0.83"
+serde_json = "1.0.85"
 simple-error = "0.2.3"
 base64 = "0.13.0"
 pathdiff = "0.2.1"
 relative-path = "1.7.2"
 lazy_static = "1.4.0"
-anyhow = "1.0.60"
+anyhow = "1.0.65"
 derivative = "2.2.0"
 rayon = "1.5.3"
 path-slash="0.2.1"
 
 [dev-dependencies]
-insta = "1.14.0"
+insta = "1.20.0"
 
 [features]
 fs=[]

diff --git a/packages/qwik/src/optimizer/core/src/code_move.rs b/packages/qwik/src/optimizer/core/src/code_move.rs
@@ -92,15 +92,15 @@ pub fn new_module(ctx: NewModuleCtx) -> Result<(ast::Module, SingleThreadedComme
                         span: DUMMY_SP,
                         type_only: false,
                         asserts: None,
-                        src: ast::Str {
+                        src: Box::new(ast::Str {
                             span: DUMMY_SP,
                             value: fix_path(
                                 &ctx.path.abs_dir,
                                 &ctx.path.base_dir,
                                 import.source.as_ref(),
                             )?,
                             raw: None,
-                        },
+                        }),
                         specifiers: vec![specifier],
                     },
                 )));
@@ -115,15 +115,15 @@ pub fn new_module(ctx: NewModuleCtx) -> Result<(ast::Module, SingleThreadedComme
                         span: DUMMY_SP,
                         type_only: false,
                         asserts: None,
-                        src: ast::Str {
+                        src: Box::new(ast::Str {
                             span: DUMMY_SP,
                             value: fix_path(
                                 &ctx.path.abs_dir,
                                 &ctx.path.base_dir,
                                 &format!("./{}", ctx.path.file_stem),
                             )?,
                             raw: None,
-                        },
+                        }),
                         specifiers: vec![ast::ImportSpecifier::Named(ast::ImportNamedSpecifier {
                             is_type_only: false,
                             span: DUMMY_SP,
@@ -182,7 +182,7 @@ pub fn fix_path<S: AsRef<Path>, D: AsRef<Path>>(
 fn create_named_export(expr: Box<ast::Expr>, name: &str) -> ast::ModuleItem {
     ast::ModuleItem::ModuleDecl(ast::ModuleDecl::ExportDecl(ast::ExportDecl {
         span: DUMMY_SP,
-        decl: ast::Decl::Var(ast::VarDecl {
+        decl: ast::Decl::Var(Box::new(ast::VarDecl {
             span: DUMMY_SP,
             kind: ast::VarDeclKind::Const,
             declare: false,
@@ -195,7 +195,7 @@ fn create_named_export(expr: Box<ast::Expr>, name: &str) -> ast::ModuleItem {
                 ))),
                 init: Some(expr),
             }],
-        }),
+        })),
     }))
 }
 
@@ -280,11 +280,11 @@ fn new_entry_module(hooks: &[&HookAnalysis], explicit_extensions: bool) -> ast::
                     span: DUMMY_SP,
                     type_only: false,
                     asserts: None,
-                    src: Some(ast::Str {
+                    src: Some(Box::new(ast::Str {
                         span: DUMMY_SP,
                         value: JsWord::from(src),
                         raw: None,
-                    }),
+                    })),
                     specifiers: vec![ast::ExportSpecifier::Named(ast::ExportNamedSpecifier {
                         is_type_only: false,
                         span: DUMMY_SP,
@@ -367,13 +367,13 @@ fn transform_fn(node: ast::FnExpr, use_lexical_scope: &Id, scoped_idents: &[Id])
         stmts.append(&mut body.stmts);
     }
     ast::FnExpr {
-        function: ast::Function {
+        function: Box::new(ast::Function {
             body: Some(ast::BlockStmt {
                 span: DUMMY_SP,
                 stmts,
             }),
-            ..node.function
-        },
+            ..*node.function
+        }),
         ..node
     }
 }
@@ -386,7 +386,7 @@ const fn create_return_stmt(expr: Box<ast::Expr>) -> ast::Stmt {
 }
 
 fn create_use_lexical_scope(use_lexical_scope: &Id, scoped_idents: &[Id]) -> ast::Stmt {
-    ast::Stmt::Decl(ast::Decl::Var(ast::VarDecl {
+    ast::Stmt::Decl(ast::Decl::Var(Box::new(ast::VarDecl {
         span: DUMMY_SP,
         declare: false,
         kind: ast::VarDeclKind::Const,
@@ -415,5 +415,5 @@ fn create_use_lexical_scope(use_lexical_scope: &Id, scoped_idents: &[Id]) -> ast
                     .collect(),
             }),
         }],
-    }))
+    })))
 }
diff --git a/packages/qwik/src/optimizer/core/src/collector.rs b/packages/qwik/src/optimizer/core/src/collector.rs
@@ -25,7 +25,7 @@ pub fn new_ident_from_id(id: &Id) -> ast::Ident {
     )
 }
 
-#[derive(PartialEq, Clone, Copy)]
+#[derive(Eq, PartialEq, Clone, Copy)]
 pub enum ImportKind {
     Named,
     All,

diff --git a/packages/qwik/src/optimizer/core/src/filter_exports.rs b/packages/qwik/src/optimizer/core/src/filter_exports.rs
@@ -46,7 +46,7 @@ impl<'a> VisitMut for StripExportsVisitor<'a> {
 fn empty_module_item(ident: ast::Ident) -> ast::ModuleItem {
     ast::ModuleItem::ModuleDecl(ast::ModuleDecl::ExportDecl(ast::ExportDecl {
         span: DUMMY_SP,
-        decl: ast::Decl::Var(ast::VarDecl {
+        decl: ast::Decl::Var(Box::new(ast::VarDecl {
             span: DUMMY_SP,
             kind: ast::VarDeclKind::Const,
             declare: false,
@@ -77,6 +77,6 @@ fn empty_module_item(ident: ast::Ident) -> ast::ModuleItem {
                     }),
                 }))),
             }],
-        }),
+        })),
     }))
 }
diff --git a/packages/qwik/src/optimizer/core/src/parse.rs b/packages/qwik/src/optimizer/core/src/parse.rs
@@ -470,6 +470,7 @@ pub fn emit_source_code(
             minify: false,
             target: ast::EsVersion::latest(),
             ascii_only: false,
+            omit_last_semi: false,
         };
         let mut emitter = swc_ecmascript::codegen::Emitter {
             cfg: config,

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_1.snap
@@ -26,7 +26,7 @@ export const renderHeader_zBbHWn4e8Cg = ()=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";wCAG8B,IAAM;IAChC,QACK,GAAG,CAAC,OAAO,uGACd;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";wCAG8B,IAAM;IAChC,QACK,GAAG,CAAC,OAAO,uGACd;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -55,7 +55,7 @@ export const renderHeader_component_U6Kkv07sbpQ = ()=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"kDAQiC,IAAM;IACrC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;CACf\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"kDAQiC,IAAM;IACrC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_10.snap
@@ -50,7 +50,7 @@ export const Header_WlR3xnI6u38 = (decl1, { decl2  }, [decl3])=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\"kCAEiB,CAAC,KAAK,EAAE,EAAC,KAAK,CAAA,EAAC,EAAE,CAAC,KAAK,CAAC,GAAK;IAE1C,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,AAAC;IACvB,MAAM,CAAC;IACP,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,AAAC;IAC1B,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,AAAC;IAC1B,MAAM,CAAC,MAAM,EAAE;QAAC,MAAM;KAAC,EAAE;QAAC,MAAM;KAAC,EAAE;QAAC,GAAG,EAAE,MAAM;KAAC,CAAC,CAAC;IAClD,MAAM,IAAI;QACN,IAAI,GAAG,MAAM,CAAC;QACd,MAAM,GAAG;YACL,OAAO,OAAO,CAAC;SAClB;KACJ;IAED,QACK,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,GAAK,OAAO,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,IAChE;CACJ\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\"kCAEiB,CAAC,KAAK,EAAE,EAAC,KAAK,CAAA,EAAC,EAAE,CAAC,KAAK,CAAC,GAAK;IAE1C,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,AAAC;IACvB,MAAM,CAAC;IACP,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,AAAC;IAC1B,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,AAAC;IAC1B,MAAM,CAAC,MAAM,EAAE;QAAC,MAAM;KAAC,EAAE;QAAC,MAAM;KAAC,EAAE;QAAC,GAAG,EAAE,MAAM;KAAC,CAAC,CAAC;IAClD,MAAM,IAAI;QACN,IAAI,GAAG,MAAM,CAAC;QACd,MAAM,GAAG;YACL,OAAO,OAAO,CAAC;QACnB;KACH;IAED,QACK,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,GAAK,OAAO,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,IAChE;AACL,CAAC\"}")
 /*
 {
   "origin": "project/test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap
@@ -65,7 +65,7 @@ export const Header_component_UVBJuFYfvDo = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;;;4CAMiC,IAAM;IACnC,QACK,MAAM,CAAC,OAAO,mFAAuB;;YAClC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC;;QAC1B,EAAE,MAAM,EACV;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;;;4CAMiC,IAAM;IACnC,QACK,MAAM,CAAC,OAAO,mFAAuB;;YAClC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC;;QAC1B,EAAE,MAAM,EACV;AACN,CAAC\"}")
 /*
 {
   "origin": "project/test.tsx",
@@ -94,7 +94,7 @@ export const App_component_wGkRHWXaqjs = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;yCAc8B,IAAM;IAChC,QACK,MAAM,GAAE,GAAG,EAAE,GAAG,MAAM,EACzB;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;yCAc8B,IAAM;IAChC,QACK,MAAM,GAAE,GAAG,EAAE,GAAG,MAAM,EACzB;AACN,CAAC\"}")
 /*
 {
   "origin": "project/test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_2.snap
@@ -22,7 +22,7 @@ export const Header_component_J4uyIhaBNR4 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAEiC,IAAM;IACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,+GACd;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAEiC,IAAM;IACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,+GACd;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_3.snap
@@ -25,7 +25,7 @@ export const App_Header_component_B9F3YeqcO1w = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";gDAG8B,IAAM;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,uHACd;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";gDAG8B,IAAM;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,uHACd;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -81,7 +81,7 @@ export const App = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AACA,OAAO,MAAM,GAAG,GAAG,IAAM;IACrB,MAAM,MAAM,iBAAG,uGAKb,AAAC;IACH,OAAO,MAAM,CAAC;CACjB,CAAE\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AACA,OAAO,MAAM,GAAG,GAAG,IAAM;IACrB,MAAM,MAAM,iBAAG,uGAKb,AAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAE\"}")
 == DIAGNOSTICS ==
 
 []
diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_4.snap
@@ -25,7 +25,7 @@ export const App_Header_component_B9F3YeqcO1w = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";gDAG8B,IAAM;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,uHACd;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";gDAG8B,IAAM;IAC5B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,uHACd;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -81,7 +81,7 @@ export function App() {
 }
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AACA,OAAO,SAAS,GAAG,GAAG;IAClB,MAAM,MAAM,iBAAG,uGAKb,AAAC;IACH,OAAO,MAAM,CAAC;CACjB\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AACA,OAAO,SAAS,GAAG,GAAG;IAClB,MAAM,MAAM,iBAAG,uGAKb,AAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC\"}")
 == DIAGNOSTICS ==
 
 []
diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_5.snap
@@ -29,7 +29,7 @@ export const Header_component_J4uyIhaBNR4 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAEiC,IAAM;IACnC,SACM;;YACE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,GAAK,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG;;YAC1C,CAAC,GAAG,CAAC,OAAO,8GAAiC;;QACjD,IACF;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAEiC,IAAM;IACnC,SACM;;YACE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,GAAK,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG;;YAC1C,CAAC,GAAG,CAAC,OAAO,8GAAiC;;QACjD,IACF;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_7.snap
@@ -29,7 +29,7 @@ export const Header_component_J4uyIhaBNR4 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAGiC,IAAM;IACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,+GACd;CACH\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAGiC,IAAM;IACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,QACK,GAAG,CAAC,OAAO,+GACd;AACJ,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -66,7 +66,7 @@ export const App_component_ckEPmXZlub0 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";yCAUuB,IAAM;IACzB,QACK,MAAM,IACT;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";yCAUuB,IAAM;IACzB,QACK,MAAM,IACT;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_8.snap
@@ -26,7 +26,7 @@ export const Header_component_J4uyIhaBNR4 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAGiC,IAAM;IACnC,6FAOG;CACN\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";4CAGiC,IAAM;IACnC,6FAOG;AACP,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -58,7 +58,7 @@ export const Header_component_1_2B8d0oH9ZWc = (hola)=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";8CAIa,CAAC,IAAI,GAAK;IACf,MAAM,IAAI,GAAG,IAAI,AAAC;IAClB,MAAM,EAAC,SAAS,CAAA,EAAE,KAAK,CAAA,EAAC,GAAG,IAAI,AAAC;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,AAAC;IACzC,QACK,MAAM,IACT;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";8CAIa,CAAC,IAAI,GAAK;IACf,MAAM,IAAI,GAAG,IAAI,AAAC;IAClB,MAAM,EAAC,SAAS,CAAA,EAAE,KAAK,CAAA,EAAC,GAAG,IAAI,AAAC;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,AAAC;IACzC,QACK,MAAM,IACT;AACN,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_9.snap
@@ -34,7 +34,7 @@ export const Header_WjUaUQN7Oxg = (decl1, { decl2  }, [decl3])=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"kCAEiB,CAAC,KAAK,EAAE,EAAC,KAAK,CAAA,EAAC,EAAE,CAAC,KAAK,CAAC,GAAK;IAC1C,MAAM,EAAC,KAAK,CAAA,EAAE,GAAG,EAAE,KAAK,CAAA,EAAC,GAAG,IAAI,AAAC;IACjC,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,AAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,AAAC;IACvB,SAAS,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,CAAA,EAAC,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;IAC9C,MAAM,MAAM;QACR,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,CAAA,EAAC,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;KACxC;IACD,IAAG,EAAE,CAAA,OAAM,MAAM,EAAC,EAAE;IACpB,IAAG,EAAE,CAAA,OAAM,EAAC,MAAM,CAAA,EAAC,EAAC,EAAE;CACzB\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"kCAEiB,CAAC,KAAK,EAAE,EAAC,KAAK,CAAA,EAAC,EAAE,CAAC,KAAK,CAAC,GAAK;IAC1C,MAAM,EAAC,KAAK,CAAA,EAAE,GAAG,EAAE,KAAK,CAAA,EAAC,GAAG,IAAI,AAAC;IACjC,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,AAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,AAAC;IACvB,SAAS,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,CAAA,EAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,MAAM,MAAM;QACR,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,CAAA,EAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KACvC;IACD,IAAG,CAAC,EAAC,OAAM,MAAM,EAAC,CAAC,CAAC;IACpB,IAAG,CAAC,EAAC,OAAM,EAAC,MAAM,CAAA,EAAC,EAAC,CAAC,CAAC;AAC1B,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capture_imports.snap
@@ -60,7 +60,7 @@ export const App_component_ckEPmXZlub0 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;yCAM8B,IAAM;IAChC,6GAA4B,CAAC;IAC7B,iHAAgB,CAAC;CACpB\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;yCAM8B,IAAM;IAChC,6GAA4B,CAAC;IAC7B,iHAAgB,CAAC;AACrB,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/...es/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap b/...es/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_capturing_fn_class.snap
@@ -46,7 +46,7 @@ export const App_component_ckEPmXZlub0 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";yCAG8B,IAAM;IAChC,SAAS,IAAI,GAAG;QACd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;KACrB;IACD,MAAM,KAAK;KAAG;IACd,MAAM,KAAK;KAAG;IAEd,uFAMG;CACN\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";yCAG8B,IAAM;IAChC,SAAS,IAAI,GAAG;QACd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,MAAM,KAAK;KAAG;IACd,MAAM,KAAK;KAAG;IAEd,uFAMG;AACP,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -77,7 +77,7 @@ export const App_component_1_w0t0o3QMovU = ()=>{
 export { _hW } from "@builder.io/qwik";
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";2CAUa,IAAM;IACb,IAAI,EAAE,CAAC;IACP,IAAI,KAAK,EAAE,CAAC;IACZ,qBACI,KAAC,KAAG,KAAO,CACd;CACF\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";2CAUa,IAAM;IACb,IAAI,EAAE,CAAC;IACP,IAAI,KAAK,EAAE,CAAC;IACZ,qBACI,KAAC,KAAG,KAAO,CACd;AACH,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/...k/src/optimizer/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap b/...k/src/optimizer/core/src/snapshots/qwik_core__test__example_custom_inlined_functions.snap
@@ -44,7 +44,7 @@ export const Lightweight = (props)=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AAAA,SAAkC,IAAI,EAAE,SAAS,QAAQ,kBAAkB,CAAC;AAE5E,OAAO,MAAM,UAAU,GAAG,CAAC,GAAG,GAAK;IAC/B,SAAS,CAAC,GAAG,CAAC,CAAC;CAClB,CAAC;AAEF,OAAO,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;AAEzC,OAAO,MAAM,GAAG,iBAAG,yFAQjB,CAAC;AAEH,OAAO,MAAM,WAAW,GAAG,CAAC,KAAK,GAAK;IAClC,mGAEE,CAAC;CACN,CAAE\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"AACA;;AAAA,SAAkC,IAAI,EAAE,SAAS,QAAQ,kBAAkB,CAAC;AAE5E,OAAO,MAAM,UAAU,GAAG,CAAC,GAAG,GAAK;IAC/B,SAAS,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF,OAAO,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;AAEzC,OAAO,MAAM,GAAG,iBAAG,yFAQjB,CAAC;AAEH,OAAO,MAAM,WAAW,GAAG,CAAC,KAAK,GAAK;IAClC,mGAEE,CAAC;AACP,CAAC,CAAE\"}")
 ============================= app_component_usememo_6sc9kvki3y0.js (ENTRY POINT)==
 
 import { useLexicalScope } from "@builder.io/qwik";
@@ -81,7 +81,7 @@ export const Lightweight_useMemo_UIcxVTQF1a8 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"+CAoBa,IAAM;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;CAC5B\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"+CAoBa,IAAM;IACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC\"}")
 /*
 {
   "origin": "test.tsx",
@@ -119,7 +119,7 @@ export const App_component_ckEPmXZlub0 = (props)=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAS8B,CAAC,KAAK,GAAK;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC;QAAC,KAAK,EAAE,CAAC;KAAC,CAAC,AAAC;IACnC;;OAEE,CAAC;IACH;;OAEG;CACN\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAS8B,CAAC,KAAK,GAAK;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC;QAAC,KAAK,EAAE,CAAC;KAAC,CAAC,AAAC;IACnC;;OAEE,CAAC;IACH;;OAEG;AACP,CAAC\"}")
 /*
 {
   "origin": "test.tsx",

diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap
@@ -61,7 +61,7 @@ export const _____slug___component_vgk6N3QaQd4 = ()=>{
 };
 
 
-Some("{\"version\":3,\"sources\":[\"/user/qwik/src/src/routes/_repl/[id]/[[...slug]].tsx\"],\"names\":[],\"mappings\":\";;iDAI0B,IAAM;IAC5B,qBACI,KAAC,KAAG;QAAC,QAAQ;MACP,CACR;CACL\"}")
+Some("{\"version\":3,\"sources\":[\"/user/qwik/src/src/routes/_repl/[id]/[[...slug]].tsx\"],\"names\":[],\"mappings\":\";;iDAI0B,IAAM;IAC5B,qBACI,KAAC,KAAG;QAAC,QAAQ;MACP,CACR;AACN,CAAC\"}")
 /*
 {
   "origin": "src/routes/_repl/[id]/[[...slug]].tsx",
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ pub fn new_ident_from_id(id: &Id) -> ast::Ident { @@
         )
     }
-    #[derive(PartialEq, Clone, Copy)]
+    #[derive(Eq, PartialEq, Clone, Copy)]
     pub enum ImportKind {
         Named,
         All,
@@ Expand Down @@