[swc] Improve import

Cargo.toml

@@ -12,6 +12,7 @@ license = "Apache-2.0"
 repository = "https://github.com/mantou132/gem.git"
 
 [workspace.dependencies]
+indexmap = { version = "2.6.0" }
 regex = { version = "1.10.4", default-features = false }
 serde = "1.0.203"
 serde_json = "1.0.117"

crates/swc-plugin-gem/Cargo.toml

@@ -21,6 +21,7 @@ swc_ecma_ast = { workspace = true }
 once_cell = { workspace = true }
 tracing = { workspace = true }
 regex = { workspace = true }
+indexmap = { workspace = true, features = ["serde"] }
 
 [dev-dependencies]
 swc_ecma_parser = { workspace = true }

crates/swc-plugin-gem/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swc-plugin-gem",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "swc plugin for Gem",
   "keywords": [
     "swc-plugin",

crates/swc-plugin-gem/src/lib.rs

@@ -1,6 +1,7 @@
 use serde::Deserialize;
 use swc_common::pass::Optional;
 use swc_core::ecma::visit::VisitMutWith;
+use swc_core::plugin::metadata::TransformPluginMetadataContextKind;
 use swc_core::plugin::{plugin_transform, proxies::TransformPluginProgramMetadata};
 use swc_ecma_ast::Program;
 use visitors::import::gen_once_dts;
@@ -35,6 +36,8 @@ pub fn process_transform(mut program: Program, data: TransformPluginProgramMetad
     let config =
         serde_json::from_str::<PluginConfig>(plugin_config).expect("invalid config for gem plugin");
 
+    let _file_name = data.get_context(&TransformPluginMetadataContextKind::Filename);
+
     // 执行在每个文件
     if config.auto_import_dts {
         gen_once_dts();

crates/swc-plugin-gem/src/visitors/import.rs

@@ -1,8 +1,9 @@
+use indexmap::IndexMap;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::Deserialize;
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{HashMap, HashSet},
     fs,
     path::Path,
 };
@@ -27,7 +28,7 @@ enum MemberOrMemberAs {
 #[serde(rename_all = "camelCase")]
 struct AutoImportContent {
     members: HashMap<String, Vec<MemberOrMemberAs>>,
-    elements: HashMap<String, HashMap<String, String>>,
+    elements: IndexMap<String, IndexMap<String, String>>,
 }
 
 struct AutoImportConfig {
@@ -157,7 +158,7 @@ impl VisitMut for TransformVisitor {
         node.visit_mut_children_with(self);
 
         let mut out: Vec<ImportDecl> = vec![];
-        let mut available_import: HashMap<String, BTreeMap<String, String>> = HashMap::new();
+        let mut available_import: HashMap<String, IndexMap<String, String>> = HashMap::new();
 
         for used_member in self.used_members.iter() {
             if !self.defined_members.contains(used_member) {
@@ -203,6 +204,7 @@ impl VisitMut for TransformVisitor {
                         with: None,
                         phase: Default::default(),
                     });
+                    break;
                 }
             }
         }
@@ -252,3 +254,18 @@ pub fn gen_once_dts() {
     )
     .expect("create dts error");
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn should_return_default_config() {
+        let content: &str = include_str!("../auto-import.json");
+        let config = serde_json::from_str::<AutoImportContent>(content).unwrap();
+        assert_eq!(
+            format!("{:?}", config.elements.get("duoyun-ui").unwrap().keys()),
+            r#"["dy-pat-*", "dy-input-*", "dy-*"]"#
+        )
+    }
+}

crates/swc-plugin-gem/src/visitors/memo.rs

@@ -20,6 +20,11 @@ impl TransformVisitor {
         self.private_props.get(self.current_index).unwrap()
     }
 
+    fn start_visit_mut_class(&mut self) {
+        self.private_props = Vec::new();
+        self.current_index = 0;
+    }
+
     fn visit_mut_class(&mut self, node: &mut Box<Class>) {
         for prop in self.private_props.iter() {
             node.body.push(ClassMember::PrivateProp(PrivateProp {
@@ -54,12 +59,16 @@ impl VisitMut for TransformVisitor {
     noop_visit_mut_type!();
 
     fn visit_mut_class_decl(&mut self, node: &mut ClassDecl) {
+        self.start_visit_mut_class();
+
         node.visit_mut_children_with(self);
 
         self.visit_mut_class(&mut node.class);
     }
 
     fn visit_mut_class_expr(&mut self, node: &mut ClassExpr) {
+        self.start_visit_mut_class();
+
         node.visit_mut_children_with(self);
 
         self.visit_mut_class(&mut node.class);
@@ -80,6 +89,10 @@ impl VisitMut for TransformVisitor {
     }
 
     fn visit_mut_return_stmt(&mut self, node: &mut ReturnStmt) {
+        // why? 类表达式会直接走到这里来？
+        if self.private_props.is_empty() {
+            return;
+        }
         node.arg = Some(Box::new(Expr::Assign(AssignExpr {
             span: DUMMY_SP,
             op: AssignOp::Assign,

crates/swc-plugin-gem/tests/fixture/auto-import/elements/input.ts

@@ -4,6 +4,7 @@ export class MyElement extends GemElement {
   render() {
     return html`
       <dy-use></dy-use>
+      <dy-pat-console></dy-pat-console>
       ${html`<gem-link></gem-link>`}
     `;
   }

crates/swc-plugin-gem/tests/fixture/auto-import/elements/output.ts

@@ -1,11 +1,13 @@
 // @ts-nocheck
-import { GemElement, html } from "@mantou/gem";
-import "@mantou/gem/elements/link"
-import "duoyun-ui/elements/use"
+import { html, GemElement } from "@mantou/gem";
+import "@mantou/gem/elements/link";
+import "duoyun-ui/elements/use";
+import "duoyun-ui/patterns/console";
 export class MyElement extends GemElement {
     render() {
         return html`
       <dy-use></dy-use>
+      <dy-pat-console></dy-pat-console>
       ${html`<gem-link></gem-link>`}
     `;
     }

crates/swc-plugin-gem/tests/fixture/auto-import/members/output.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { adoptedStyle, attribute, css, customElement, emitter, html, styleMap, template } from "@mantou/gem";
+import { css, adoptedStyle, customElement, attribute, emitter, template, styleMap, html } from "@mantou/gem";
 import { render, Emitter, GemElement } from '@mantou/gem';
 const style = css``;
 @adoptedStyle(style)

crates/swc-plugin-gem/tests/fixture/memo/input.ts

@@ -1,8 +1,19 @@
 // @ts-nocheck
-
-class MyElement {
+class MyElement {}
+class MyElement1 {
   @memo(['src'])
   get #src() {
+    if (bool) return '#src';
     return '#src';
   }
 }
+class MyElement2 {
+  get #src() {
+    if (bool) return '#src';
+    return '#src';
+  }
+  @memo(['src'])
+  get #src2() {
+    return '#src';
+  }
+}

crates/swc-plugin-gem/tests/fixture/memo/output.ts

@@ -1,9 +1,22 @@
 // @ts-nocheck
-class MyElement {
+class MyElement {}
+class MyElement1 {
     @memo(['src'])
     get #_src() {
+        if (bool) return this.#src = '#src';
         return this.#src = '#src';
     }
     #src;
   }
+class MyElement2 {
+  get #src() {
+    if (bool) return '#src';
+    return '#src';
+  }
+  @memo(['src'])
+  get #_src2() {
+      return this.#src2 = '#src';
+  }
+  #src2;
+}
 

crates/swc-plugin-gem/tests/fixture/path/output.ts

@@ -1,3 +1,3 @@
 // @ts-nocheck
-import '@mantou/gem/index.js';
-import '@mantou/gem/helper/react-shim.js';
+import "@mantou/gem.js";
+import "@mantou/gem/helper/react-shim.js";

packages/language-service/src/hover.ts

@@ -86,9 +86,9 @@ export class StyleHoverProvider {
     if (!match) return null;
 
     const matchContent = match.groups!.content;
-    const content = `:host { ${removeSlot(matchContent)} }`;
+    const content = `.parent { ${removeSlot(matchContent)} }`;
     const matchStartOffset = match.index + match.groups!.start.length;
-    const virtualOffset = currentOffset - matchStartOffset + 8;
+    const virtualOffset = currentOffset - matchStartOffset + 9;
 
     if (content[virtualOffset] === SLOT_TOKEN) return null;
 

packages/language-service/src/style.ts

@@ -20,9 +20,10 @@ export class StyleCompletionItemProvider {
     if (!match) return;
 
     const matchContent = match.groups!.content;
+    const content = `.parent { ${removeSlot(matchContent)} }`;
     const matchStartOffset = match.index + match.groups!.start.length;
-    const virtualOffset = currentOffset - matchStartOffset + 8; // accounting for :host { }
-    const virtualDocument = createVirtualDocument('css', `:host { ${removeSlot(matchContent)} }`);
+    const virtualOffset = currentOffset - matchStartOffset + 9;
+    const virtualDocument = createVirtualDocument('css', content);
     const vCss = this.#cssLanguageService.parseStylesheet(virtualDocument);
 
     const completions = this.#cssLanguageService.doComplete(