Update identifiers matcher and invalid/unsupported condition error me…

…ssage
aaronccasanova · Jun 12, 2022 · 1dd2b84 · 1dd2b84
1 parent f5fcabe
commit 1dd2b84
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/.changeset/violet-terms-lie.md b/.changeset/violet-terms-lie.md
@@ -0,0 +1,5 @@
+---
+'truuu': patch
+---
+
+Updated identifiers matcher and invalid/unsupported condition error message
diff --git a/packages/truuu/README.md b/packages/truuu/README.md
@@ -11,26 +11,26 @@ npm i -g truuu
 ## Usage
 
 ```sh
-$ truuu 'isFoo && !isBar'
+$ truuu 'isPizza && !hasPineapple'
 ```
 
 ```
-╔══════════════════════════════════════════════╗
-║        _____ ____  _   _ _   _ _   _         ║
-║       |_   _|  _ \| | | | | | | | | |        ║
-║         | | | |_) | | | | | | | | | |        ║
-║         | | |  _ <| |_| | |_| | |_| |        ║
-║         |_| |_| \_\\___/ \___/ \___/         ║
-║                                              ║
-╟────────────────────┬───────┬─────────────────╢
-║       isFoo        │ isBar │ isFoo && !isBar ║
-╟────────────────────┼───────┼─────────────────╢
-║       false        │ false │      false      ║
-╟────────────────────┼───────┼─────────────────╢
-║       false        │ true  │      false      ║
-╟────────────────────┼───────┼─────────────────╢
-║        true        │ false │      true       ║
-╟────────────────────┼───────┼─────────────────╢
-║        true        │ true  │      false      ║
-╚════════════════════╧═══════╧═════════════════╝
+╔══════════════════════════════════════════════════════════════╗
+║                _____ ____  _   _ _   _ _   _                 ║
+║               |_   _|  _ \| | | | | | | | | |                ║
+║                 | | | |_) | | | | | | | | | |                ║
+║                 | | |  _ <| |_| | |_| | |_| |                ║
+║                 |_| |_| \_\\___/ \___/ \___/                 ║
+║                                                              ║
+╟────────────────────┬──────────────┬──────────────────────────╢
+║      isPizza       │ hasPineapple │ isPizza && !hasPineapple ║
+╟────────────────────┼──────────────┼──────────────────────────╢
+║       false        │    false     │          false           ║
+╟────────────────────┼──────────────┼──────────────────────────╢
+║       false        │     true     │          false           ║
+╟────────────────────┼──────────────┼──────────────────────────╢
+║        true        │    false     │           true           ║
+╟────────────────────┼──────────────┼──────────────────────────╢
+║        true        │     true     │          false           ║
+╚════════════════════╧══════════════╧══════════════════════════╝
 ```
diff --git a/packages/truuu/rollup.config.js b/packages/truuu/rollup.config.js
@@ -44,6 +44,7 @@ export default {
     }),
   ],
   external: [
+    'node:vm',
     ...Object.keys(pkg.dependencies ?? {}),
     // @ts-ignore
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument

diff --git a/packages/truuu/src/index.ts b/packages/truuu/src/index.ts
@@ -13,7 +13,13 @@ if (typeof input !== 'string') exit('Please enter a JavaScript condition')
 
 // Extract unique identifiers from the input condition
 const identifiers = Array.from(
-  new Set([...input.matchAll(/\w+/g)].map(([identifier]) => identifier ?? '')),
+  new Set(
+    // https://regex101.com/r/ueqoAD/1
+    // https://stackoverflow.com/a/2108007
+    [...input.matchAll(/(?!true|false\b)\b[\w.]+/g)].map(
+      ([identifier]) => identifier ?? '',
+    ),
+  ),
 )
 
 if (!identifiers.length) exit('Error: No variables found in the condition')
@@ -32,7 +38,7 @@ for (const permutation of permutations) {
     input,
   )
 
-  const errorMessage = `Error: Invalid JavaScript condition ${chalk.red(
+  const errorMessage = `Error: Invalid or unsupported JavaScript condition ${chalk.red(
     `'${input}'`,
   )}`