perf(createlookup): skip lookup for just one item

merceyz · Jan 25, 2020 · f8d089d · f8d089d
1 parent d50ea52
commit f8d089d
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 61 deletions.
diff --git a/benchmark/cases/case_2.js b/benchmark/cases/case_2.js
@@ -66,18 +66,14 @@ module.exports = {
       ],
       disabled && classes.disabled,
       fullWidth && classes.fullWidth,
-      {
-        outlined: [
-          classes.outlined,
-          {
-            primary: classes.outlinedPrimary,
-            secondary: classes.outlinedSecondary,
-          }[color],
-        ],
-      }[variant],
-      {
-        inherit: classes.colorInherit,
-      }[color],
+      variant === 'outlined' && [
+        classes.outlined,
+        {
+          primary: classes.outlinedPrimary,
+          secondary: classes.outlinedSecondary,
+        }[color],
+      ],
+      color === 'inherit' && classes.colorInherit,
     );
   },
 };
diff --git a/src/visitors/createObjectKeyLookups.js b/src/visitors/createObjectKeyLookups.js
@@ -6,7 +6,6 @@ import {
   createLogicalAndExpression,
   isNestedLogicalAndExpression,
 } from '../utils/helpers';
-import generate from '@babel/generator';
 
 function matchLeftOrRight(node, check) {
   return check(node.left) || check(node.right);
@@ -60,6 +59,10 @@ function combineFromArray(arr) {
 
     // Create the objects
     _.map(group => {
+      if (group.length === 1) {
+        return createLogicalAndExpression(group[0]);
+      }
+
       const properties = group.reduce((acc, row) => {
         let key = row[0].right;
         // If possible, use a identifier as the key, saves 2 characters
@@ -71,20 +74,7 @@ function combineFromArray(arr) {
         return acc;
       }, []);
 
-      const lookupExpression = t.memberExpression(
-        t.objectExpression(properties),
-        group[0][0].left,
-        true,
-      );
-      if (group.length > 1) {
-        return lookupExpression;
-      }
-
-      // If the size is the same, use the original
-      const original = createLogicalAndExpression(group[0]);
-      const a = generate(original, { compact: true }).code;
-      const b = generate(lookupExpression, { compact: true }).code;
-      return a.length <= b.length ? original : lookupExpression;
+      return t.memberExpression(t.objectExpression(properties), group[0][0].left, true);
     }),
   )(match);
 

diff --git a/...s/create-lookup/different-matches/code.js → test/fixtures/create-lookup/code.js b/...s/create-lookup/different-matches/code.js → test/fixtures/create-lookup/code.js
@@ -1,6 +1,6 @@
 clsx({
   [foo.a]: bar === 'up',
-  [foo.b]: bar === 'down',
+  [foo.b]: bar === 'down' && !inProp && collapsedHeight === '0px',
   [foo.c]: baz === 'left',
   [foo.d]: baz === 'right',
 });
diff --git a/test/fixtures/create-lookup/multiple-checks/code.js b/test/fixtures/create-lookup/multiple-checks/code.js
diff --git a/test/fixtures/create-lookup/multiple-checks/output.js b/test/fixtures/create-lookup/multiple-checks/output.js
diff --git a/test/fixtures/create-lookup/multiple-matches/code.js b/test/fixtures/create-lookup/multiple-matches/code.js
diff --git a/test/fixtures/create-lookup/multiple-matches/output.js b/test/fixtures/create-lookup/multiple-matches/output.js
diff --git a/...create-lookup/different-matches/output.js → test/fixtures/create-lookup/output.js b/...create-lookup/different-matches/output.js → test/fixtures/create-lookup/output.js
@@ -1,7 +1,7 @@
 clsx(
   {
     up: foo.a,
-    down: foo.b,
+    down: !inProp && collapsedHeight === '0px' && foo.b,
   }[bar],
   {
     left: foo.c,

diff --git a/test/fixtures/create-lookup/same-length/code.js b/test/fixtures/create-lookup/same-length/code.js
diff --git a/test/fixtures/create-lookup/same-length/output.js b/test/fixtures/create-lookup/same-length/output.js
diff --git a/test/fixtures/strip-literals/boolean-literal/output.js b/test/fixtures/strip-literals/boolean-literal/output.js
@@ -1,7 +1,5 @@
 clsx(
   classes.cellHide,
   !print && 'datatables-noprint',
-  {
-    stacked: classes.cellStacked,
-  }[options.responsive],
+  options.responsive === 'stacked' && classes.cellStacked,
 );
diff --git a/test/fixtures/strip-literals/string-literal/output.js b/test/fixtures/strip-literals/string-literal/output.js
@@ -2,7 +2,5 @@ clsx(
   'foo',
   classes.root,
   !print && 'datatables-noprint',
-  {
-    stacked: classes.cellStacked,
-  }[options.responsive],
+  options.responsive === 'stacked' && classes.cellStacked,
 );