swc-project · kdy1 · Nov 28, 2023 · Nov 26, 2023 · Nov 26, 2023 · Nov 26, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/constify/package.json b/packages/constify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-constify",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "SWC plugin for optimization",
   "main": "swc_plugin_constify.wasm",
   "scripts": {

diff --git a/packages/constify/transform/Cargo.toml b/packages/constify/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_constify"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.29.0"
+version = "0.30.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/emotion/package.json b/packages/emotion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-emotion",
-  "version": "2.5.104",
+  "version": "2.5.105",
   "description": "SWC plugin for emotion css-in-js library",
   "main": "swc_plugin_emotion.wasm",
   "scripts": {

diff --git a/packages/emotion/transform/Cargo.toml b/packages/emotion/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_emotion"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.65.0"
+version = "0.66.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-jest",
-  "version": "1.5.104",
+  "version": "1.5.105",
   "description": "SWC plugin for jest",
   "main": "swc_plugin_jest.wasm",
   "scripts": {

diff --git a/packages/loadable-components/package.json b/packages/loadable-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-loadable-components",
-  "version": "0.3.104",
+  "version": "0.3.105",
   "description": "SWC plugin for `@loadable/components`",
   "main": "swc_plugin_loadable_components.wasm",
   "scripts": {

diff --git a/packages/noop/package.json b/packages/noop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-noop",
-  "version": "1.5.102",
+  "version": "1.5.103",
   "description": "Noop SWC plugin, for debugging",
   "main": "swc_plugin_noop.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/package.json b/packages/react-remove-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-react-remove-properties",
-  "version": "1.5.104",
+  "version": "1.5.105",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-react-remove-properties",
   "main": "swc_plugin_react_remove_properties.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/transform/Cargo.toml b/packages/react-remove-properties/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "react_remove_properties"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.17.0"
+version = "0.18.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/relay/package.json b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-relay",
-  "version": "1.5.104",
+  "version": "1.5.105",
   "description": "SWC plugin for relay",
   "main": "swc_plugin_relay.wasm",
   "types": "./types.d.ts",

diff --git a/packages/relay/transform/Cargo.toml b/packages/relay/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_relay"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.37.0"
+version = "0.38.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/remove-console/package.json b/packages/remove-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-remove-console",
-  "version": "1.5.104",
+  "version": "1.5.105",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-remove-console",
   "main": "swc_plugin_remove_console.wasm",
   "scripts": {

diff --git a/packages/remove-console/transform/Cargo.toml b/packages/remove-console/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "remove_console"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.18.0"
+version = "0.19.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/styled-components/package.json b/packages/styled-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-styled-components",
-  "version": "1.5.104",
+  "version": "1.5.105",
   "description": "SWC plugin for styled-components",
   "main": "swc_plugin_styled_components.wasm",
   "scripts": {

diff --git a/packages/styled-components/transform/Cargo.toml b/packages/styled-components/transform/Cargo.toml
@@ -6,7 +6,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0"
 name = "styled_components"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.89.0"
+version = "0.90.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/styled-components/transform/src/visitors/assign_style_required.rs b/packages/styled-components/transform/src/visitors/assign_style_required.rs
diff --git a/packages/styled-components/transform/src/visitors/display_name_and_id.rs b/packages/styled-components/transform/src/visitors/display_name_and_id.rs
@@ -266,63 +266,40 @@ impl VisitMut for DisplayNameAndId {
 
             Expr::Call(CallExpr {
                 callee: Callee::Expr(callee),
-                args,
                 ..
             }) => {
                 (
-                    // styled()
-                    self.state.borrow().is_styled(&*callee)
+                    // callee is styled.div
+                    self.state.borrow().is_styled(callee)
                         && get_property_as_ident(callee)
-                            .map(|v| v == "withConfig")
+                            .map(|v| v != "withConfig")
                             .unwrap_or(false)
                 ) || (
-                    // styled(x)({})
-                    self.state.borrow().is_styled(&*callee)
+                    // callee is styled(MyComponent)
+                    self.state.borrow().is_styled(callee)
                         && !get_callee(callee)
                             .map(|callee| callee.is_member())
                             .unwrap_or(false)
                 ) || (
-                    // styled(x).attrs()({})
+                    // callee is styled(MyComponent).attrs(...)
                     self.state.borrow().is_styled(callee)
                         && get_callee(callee)
-                            .map(|callee| {
-                                callee.is_member()
-                                    && get_property_as_ident(callee)
-                                        .map(|v| v == "withConfig")
-                                        .unwrap_or(false)
-                            })
+                            .and_then(get_property_as_ident)
+                            .map(|v| v != "withConfig")
                             .unwrap_or(false)
                 ) || (
-                    // styled(x).withConfig({})
-                    self.state.borrow().is_styled(&*callee)
+                    // callee is styled(MyComponent).withConfig({ ... }), and componentId or
+                    // displayName is not set
+                    self.state.borrow().is_styled(callee)
                         && get_callee(callee)
-                            .map(|callee| {
-                                callee.is_member()
-                                    && get_property_as_ident(callee)
-                                        .map(|v| v == "withConfig")
-                                        .unwrap_or(false)
-                                    && !args.is_empty()
-                                    && args[0].spread.is_none()
-                                    && match &*args[0].expr {
-                                        Expr::Object(first_arg) => {
-                                            !first_arg.props.iter().any(|prop| match prop {
-                                                PropOrSpread::Prop(prop) => {
-                                                    match get_prop_name(prop) {
-                                                        Some(PropName::Ident(prop_name)) => {
-                                                            matches!(
-                                                                &*prop_name.sym,
-                                                                "componentId" | "displayName"
-                                                            )
-                                                        }
-                                                        _ => false,
-                                                    }
-                                                }
-                                                _ => false,
-                                            })
-                                        }
-                                        _ => false,
-                                    }
-                            })
+                            .and_then(get_property_as_ident)
+                            .map(|v| v == "withConfig")
+                            .unwrap_or(false)
+                        && Expr::as_call(callee)
+                            .and_then(|with_config_call| with_config_call.args.get(0))
+                            .filter(|first_arg| first_arg.spread.is_none())
+                            .and_then(|first_arg| first_arg.expr.as_object())
+                            .map(|first_arg_obj| !already_has(first_arg_obj))
                             .unwrap_or(false)
                 )
             }

diff --git a/packages/styled-components/transform/src/visitors/mod.rs b/packages/styled-components/transform/src/visitors/mod.rs
@@ -1,4 +1,3 @@
-pub mod assign_style_required;
 pub mod display_name_and_id;
 pub mod minify;
 pub mod pure_annotation;

diff --git a/packages/styled-components/transform/tests/fixtures/.allow-chains-of-member-calls/.babelrc b/packages/styled-components/transform/tests/fixtures/.allow-chains-of-member-calls/.babelrc
diff --git a/packages/styled-components/transform/tests/fixtures/.css-declared-after-component/.babelrc b/packages/styled-components/transform/tests/fixtures/.css-declared-after-component/.babelrc
diff --git a/...-components/transform/tests/fixtures/.transpile-template-literals-without-config/.babelrc b/...-components/transform/tests/fixtures/.transpile-template-literals-without-config/.babelrc
diff --git a/...components/transform/tests/fixtures/.transpile-template-literals-without-config/output.js b/...components/transform/tests/fixtures/.transpile-template-literals-without-config/output.js
diff --git a/...ages/styled-components/transform/tests/fixtures/add-identifier-and-display-name/output.js b/...ages/styled-components/transform/tests/fixtures/add-identifier-and-display-name/output.js
@@ -35,23 +35,31 @@ const WrappedComponent3 = styled(Inner).withConfig({
 })({});
 const WrappedComponent4 = styled(Inner).attrs(()=>({
         something: 'else'
-    }))({});
+    })).withConfig({
+    displayName: "WrappedComponent4",
+    componentId: "sc-e0d5b7ad-8"
+})({});
 const WrappedComponent5 = styled.div.attrs(()=>({
         something: 'else'
-    }))({});
+    })).withConfig({
+    displayName: "WrappedComponent5",
+    componentId: "sc-e0d5b7ad-9"
+})({});
 const WrappedComponent6 = styled.div.attrs(()=>({
         something: 'else'
     })).withConfig({
     displayName: "WrappedComponent6",
-    componentId: "sc-e0d5b7ad-8"
+    componentId: "sc-e0d5b7ad-10"
 })``;
 const WrappedComponent7 = styled.div.withConfig({
     shouldForwardProp: ()=>{},
     displayName: "WrappedComponent7",
-    componentId: "sc-e0d5b7ad-9"
+    componentId: "sc-e0d5b7ad-11"
 })({});
 const WrappedComponent8 = styled.div.withConfig({
-    shouldForwardProp: ()=>{}
+    shouldForwardProp: ()=>{},
+    displayName: "WrappedComponent8",
+    componentId: "sc-e0d5b7ad-12"
 }).attrs(()=>({
         something: 'else'
     }))({});
@@ -60,5 +68,5 @@ const WrappedComponent9 = styled.div.attrs(()=>({
     })).withConfig({
     shouldForwardProp: ()=>{},
     displayName: "WrappedComponent9",
-    componentId: "sc-e0d5b7ad-10"
+    componentId: "sc-e0d5b7ad-13"
 })({});
diff --git a/...res/.allow-chains-of-member-calls/code.js → ...ures/allow-chains-of-member-calls/code.js b/...res/.allow-chains-of-member-calls/code.js → ...ures/allow-chains-of-member-calls/code.js