fix: fix wrong js generation (#118)

manucorporat · web-flow · commit f8394c6a9933 · 2021-12-24T17:25:54.000+01:00
diff --git a/src/optimizer/core/src/collector.rs b/src/optimizer/core/src/collector.rs
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashSet};
 
 use swc_atoms::{js_word, JsWord};
 use swc_ecmascript::ast;
-use swc_ecmascript::visit::{noop_visit_type, Visit, VisitWith};
+use swc_ecmascript::visit::{noop_visit_type, visit_expr, visit_stmt, Visit, VisitWith};
 
 macro_rules! id {
     ($ident: expr) => {
@@ -410,13 +410,13 @@ impl Visit for HookCollect {
 
     fn visit_expr(&mut self, node: &ast::Expr) {
         self.expr_ctxt.push(ExprOrSkip::Expr);
-        swc_ecmascript::visit::visit_expr(self, node);
+        visit_expr(self, node);
         self.expr_ctxt.pop();
     }
 
     fn visit_stmt(&mut self, node: &ast::Stmt) {
         self.expr_ctxt.push(ExprOrSkip::Skip);
-        swc_ecmascript::visit::visit_stmt(self, node);
+        visit_stmt(self, node);
         self.expr_ctxt.pop();
     }
 
diff --git a/src/optimizer/core/src/parse.rs b/src/optimizer/core/src/parse.rs
@@ -28,10 +28,10 @@ use swc_ecmascript::parser::{EsConfig, PResult, Parser, StringInput, Syntax, TsC
 use swc_ecmascript::transforms::{
     fixer,
     hygiene::{self, hygiene_with_config},
-    resolver_with_mark,
+    optimization::simplify,
+    pass, react, resolver_with_mark, typescript,
 };
-use swc_ecmascript::transforms::{optimization::simplify, pass, react, typescript};
-use swc_ecmascript::visit::FoldWith;
+use swc_ecmascript::visit::{FoldWith, VisitMutWith};
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -151,12 +151,17 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
                     };
 
                     let collect = global_collect(&main_module);
-                    let top_level_mark = Mark::fresh(Mark::root());
+                    let global_mark = Mark::fresh(Mark::root());
+
                     let mut hooks: Vec<Hook> = vec![];
+                    let mut main_module = main_module;
+
+                    main_module.visit_mut_with(&mut resolver_with_mark(global_mark));
+
                     let mut main_module = {
                         let mut passes = chain!(
                             pass::Optional::new(
-                                typescript::strip(top_level_mark),
+                                typescript::strip(global_mark),
                                 transpile && is_type_script && !is_jsx
                             ),
                             pass::Optional::new(
@@ -168,7 +173,7 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
                                         ..Default::default()
                                     },
                                     Some(&comments),
-                                    top_level_mark,
+                                    global_mark,
                                 ),
                                 transpile && is_type_script && is_jsx
                             ),
@@ -177,7 +182,7 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
                                     Lrc::clone(&source_map),
                                     Some(&comments),
                                     react_options,
-                                    top_level_mark
+                                    global_mark
                                 ),
                                 transpile && is_jsx
                             ),
@@ -188,44 +193,40 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
                                 Some(&comments),
                                 &mut hooks
                             ),
-                            pass::Optional::new(
-                                resolver_with_mark(top_level_mark),
-                                config.minify != MinifyMode::None
-                            ),
-                            pass::Optional::new(
-                                simplify::simplifier(Default::default()),
-                                config.minify != MinifyMode::None
-                            )
                         );
                         main_module.fold_with(&mut passes)
                     };
 
-                    if config.minify == MinifyMode::Minify {
-                        main_module = optimize(
-                            main_module,
-                            Lrc::clone(&source_map),
-                            Some(&comments),
-                            None,
-                            &MinifyOptions {
-                                compress: Some(CompressOptions {
-                                    ..CompressOptions::default()
-                                }),
-                                mangle: Some(MangleOptions {
-                                    top_level: true,
-                                    ..MangleOptions::default()
-                                }),
-                                rename: true,
-                                wrap: false,
-                                enclose: false,
-                            },
-                            &ExtraOptions { top_level_mark },
-                        );
+                    if config.minify != MinifyMode::None {
+                        let top_level_mark = Mark::fresh(Mark::root());
+                        main_module.visit_mut_with(&mut resolver_with_mark(top_level_mark));
+                        main_module =
+                            main_module.fold_with(&mut simplify::simplifier(Default::default()));
+
+                        if config.minify == MinifyMode::Minify {
+                            main_module = optimize(
+                                main_module,
+                                Lrc::clone(&source_map),
+                                Some(&comments),
+                                None,
+                                &MinifyOptions {
+                                    compress: Some(CompressOptions {
+                                        ..CompressOptions::default()
+                                    }),
+                                    mangle: Some(MangleOptions {
+                                        top_level: true,
+                                        ..MangleOptions::default()
+                                    }),
+                                    rename: true,
+                                    wrap: false,
+                                    enclose: false,
+                                },
+                                &ExtraOptions { top_level_mark },
+                            );
+                        }
 
-                        main_module = main_module
-                            .fold_with(&mut hygiene_with_config(hygiene::Config {
-                                ..Default::default()
-                            }))
-                            .fold_with(&mut fixer(None));
+                        main_module.visit_mut_with(&mut hygiene_with_config(Default::default()));
+                        main_module.visit_mut_with(&mut fixer(None));
                     }
 
                     let mut hooks_analysis: Vec<HookAnalysis> = Vec::with_capacity(hooks.len());
diff --git a/src/optimizer/core/src/snapshots/qwik_core__test__issue_117.snap b/src/optimizer/core/src/snapshots/qwik_core__test__issue_117.snap
@@ -0,0 +1,22 @@
+---
+source: src/optimizer/core/src/test.rs
+expression: output
+
+---
+==INPUT==
+
+
+export const cache = patternCache[cacheKey] || (patternCache[cacheKey]={});
+    
+============================= project/test.tsx ==
+
+export const cache = patternCache[cacheKey] || (patternCache[cacheKey] = {
+});
+
+== HOOKS ==
+
+[]
+
+== DIAGNOSTICS ==
+
+[]
diff --git a/src/optimizer/core/src/test.rs b/src/optimizer/core/src/test.rs
@@ -16,6 +16,7 @@ const Header = qComponent({
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -35,6 +36,7 @@ export const Header = qComponent({
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -57,6 +59,7 @@ export const App = () => {
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -79,6 +82,7 @@ export function App() {
 }
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -100,6 +104,7 @@ export const Header = qComponent({
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -112,6 +117,7 @@ fn example_6() {
 export const sym1 = qHook((ctx) => console.log("1"));
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -141,6 +147,7 @@ const App = qComponent({
     })
 });"#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -164,6 +171,7 @@ const Header = qComponent({
   });
 "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -186,6 +194,7 @@ const Header = qHook((decl1, {decl2}, [decl3]) => {
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -215,6 +224,7 @@ const Header = qHook((decl1, {decl2}, [decl3]) => {
 });
     "#,
         EntryStrategy::Hook,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -247,6 +257,7 @@ export const App = qComponent({
 });
     "#,
         EntryStrategy::Single,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -262,6 +273,7 @@ export const Header = qComponent({
 
     "#,
         EntryStrategy::Single,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -277,6 +289,20 @@ export const Header = qComponent({
 
     "#,
         EntryStrategy::Single,
+        MinifyMode::Simplify,
+        false,
+    );
+}
+
+#[test]
+fn issue_117() {
+    test_input(
+        "project/test.tsx",
+        r#"
+export const cache = patternCache[cacheKey] || (patternCache[cacheKey]={});
+    "#,
+        EntryStrategy::Single,
+        MinifyMode::Simplify,
         false,
     );
 }
@@ -311,16 +337,22 @@ export const Header = qComponent({
 //     }
 // }
 
-fn test_input(filename: &str, code: &str, entry_strategy: EntryStrategy, _print_ast: bool) {
+fn test_input(
+    filename: &str,
+    code: &str,
+    entry_strategy: EntryStrategy,
+    minify: MinifyMode,
+    transpile: bool,
+) {
     let res = transform_modules(TransformModulesOptions {
         root_dir: "/user/qwik/src/".into(),
         input: vec![TransformModuleInput {
             code: code.to_string(),
             path: filename.to_string(),
         }],
         source_maps: true,
-        minify: MinifyMode::Simplify,
-        transpile: false,
+        minify,
+        transpile,
         entry_strategy,
     });
     match res {
diff --git a/src/optimizer/core/src/transform.rs b/src/optimizer/core/src/transform.rs
@@ -10,7 +10,7 @@ use regex::Regex;
 use std::sync::{Arc, Mutex};
 use swc_atoms::JsWord;
 use swc_common::comments::{Comments, SingleThreadedComments};
-use swc_common::{errors::HANDLER, DUMMY_SP};
+use swc_common::{errors::HANDLER, Span, DUMMY_SP};
 use swc_ecmascript::ast;
 use swc_ecmascript::visit::{noop_fold_type, Fold, FoldWith};
 
@@ -240,6 +240,7 @@ impl<'a> Fold for HookTransform<'a> {
     fn fold_call_expr(&mut self, node: ast::CallExpr) -> ast::CallExpr {
         if let ast::ExprOrSuper::Expr(expr) = &node.callee {
             if let ast::Expr::Ident(id) = &**expr {
+                let qhook_span = id.span;
                 if QCOMPONENT.eq(&id.sym) {
                     if let Some(comments) = self.comments {
                         comments.add_pure_comment(node.span.lo);
@@ -319,7 +320,7 @@ impl<'a> Fold for HookTransform<'a> {
                         origin: self.path_data.path.to_string_lossy().into(),
                     });
 
-                    return create_inline_qhook(import_path, &symbol_name);
+                    return create_inline_qhook(import_path, &symbol_name, qhook_span);
                 }
             }
         }
@@ -328,11 +329,11 @@ impl<'a> Fold for HookTransform<'a> {
     }
 }
 
-fn create_inline_qhook(url: JsWord, symbol: &str) -> ast::CallExpr {
+fn create_inline_qhook(url: JsWord, symbol: &str, span: Span) -> ast::CallExpr {
     ast::CallExpr {
         callee: ast::ExprOrSuper::Expr(Box::new(ast::Expr::Ident(ast::Ident::new(
             QHOOK.clone(),
-            DUMMY_SP,
+            span,
         )))),
         span: DUMMY_SP,
         type_args: None,
