refactor(un-jsx): remove ternary inlining

pionxzh · May 7, 2024 · 96b034f · 96b034f
1 parent 6726af4
commit 96b034f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 89 deletions.
diff --git a/packages/unminify/src/transformations/__tests__/un-jsx.spec.ts b/packages/unminify/src/transformations/__tests__/un-jsx.spec.ts
@@ -235,70 +235,6 @@ function fn() {
 `,
 )
 
-inlineTest('jsx with dynamic Component tag - ternary with constant boolean',
-  `
-function fn() {
-  return React.createElement(
-    true ? "a" : "div",
-    null,
-    "Hello",
-  );
-}
-`,
-  `
-function fn() {
-  return <div>Hello</div>;
-}
-`,
-)
-
-inlineTest('jsx with dynamic Component tag - ternary with constant boolean in a variable',
-  `
-const Foo = () => {
-  const r = true;
-  const g = false;
-  return jsxs("div", {
-    children: [
-      jsx(r ? "a" : "div", { children: "bar" }, "b"),
-      jsx(g ? "p" : "div", { children: "baz" }, c),
-    ]
-  });
-};
-`,
-  `
-const Foo = () => {
-  return <div><a key="b">bar</a><div key={c}>baz</div></div>;
-};
-`,
-)
-
-inlineTest('jsx with dynamic Component tag - ternary with constant value in a variable',
-  `
-function fn() {
-  const truthy = "wakaru"
-  const truthyComp = React.createElement(
-    truthy ? "a" : "div",
-    null,
-    "Hello",
-  );
-
-  const falsy = ""
-  const falsyComp = React.createElement(
-    falsy ? "a" : "div",
-    null,
-    "Hello",
-  );
-}
-`,
-  `
-function fn() {
-  const truthyComp = <a>Hello</a>;
-
-  const falsyComp = <div>Hello</div>;
-}
-`,
-)
-
 inlineTest('jsx with child text that should be wrapped',
   `
 function fn() {

diff --git a/packages/unminify/src/transformations/un-jsx.ts b/packages/unminify/src/transformations/un-jsx.ts
@@ -154,31 +154,7 @@ function toJSX(j: JSCodeshift, path: ASTPath<CallExpression>, pragmas: string[],
         tag = j.jsxIdentifier(name)
 
         const variableDeclaration = j.variableDeclaration('const', [j.variableDeclarator(j.identifier(name), type)])
-        const isVariableDeclaration = root.find(j.VariableDeclarator, {
-            id: {
-                type: 'Identifier',
-                name: variableDeclaration.declarations[0].init?.test?.name,
-            },
-        })
-
-        // if ternary operator variable value exist
-        if (isVariableDeclaration.length) {
-            isVariableDeclaration.forEach((path: any) => {
-                removeDeclarationIfUnused(j, path, path.node.id.name)
-                if (path.node.init.value) {
-                    tag = { ...tag, name: variableDeclaration.declarations[0].init.consequent.value }
-                }
-                else {
-                    tag = { ...tag, name: variableDeclaration.declarations[0].init.alternate.value }
-                }
-            })
-        }
-        else {
-            if (variableDeclaration.declarations[0].init?.alternate?.value) {
-                tag = { ...tag, name: variableDeclaration.declarations[0].init.alternate.value }
-            }
-        }
-        // insertBefore(j, path, variableDeclaration)
+        insertBefore(j, path, variableDeclaration)
         scope.markAsStale()
     }
     if (!tag) return null