chore: Refactor code to improve readability and remove unnecessary co…

…nditional checks
hoangnhan2ka3 · Aug 30, 2024 · 86a110c · 86a110c
1 parent 71c525c
commit 86a110c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -34,7 +34,7 @@ function toVal(mix: ClassValue, options?: TWGOptions): string {
             }
         } else {
             for (y in mix) {
-                if (mix[y] && typeof mix[y] !== "string" && typeof mix[y] !== "object") {
+                if (mix[y] && typeof mix[y] !== "string" && !Array.isArray(mix[y])) {
                     str && (str += " ")
                     str += y
                 } else {

diff --git a/src/lite/processor/ast.ts b/src/lite/processor/ast.ts
@@ -35,9 +35,7 @@ export function transformer(
                     path.traverse({
                         ObjectExpression(innerPath) {
                             try {
-                                // 2. Find outer Object(s) inside callee function
                                 if (!innerPath.findParent(parentPath => parentPath.isObjectExpression() && parentPath.node === innerPath.node)) {
-                                    // 3. First parse ternary and logical conditionals
                                     innerPath.traverse({
                                         ConditionalExpression(innerPath) {
                                             if (innerPath.findParent((parent) => parent.isTemplateLiteral())) {
@@ -55,7 +53,6 @@ export function transformer(
                                         }
                                     })
 
-                                    // 4. And parse the values if it is conditional
                                     innerPath.traverse({
                                         ObjectProperty(innerPath) {
                                             if (
@@ -67,10 +64,8 @@ export function transformer(
                                         }
                                     })
 
-                                    // 5. Then take the outer Object(s) out
                                     const largestObject = generate(innerPath.node).code
 
-                                    // DONE. Final replace the original outer Object(s) with parsed one
                                     innerPath.replaceWith(types.stringLiteral(
                                         parser(...new Function(
                                             `return [${(/['"`]|:\s*1/g).test(largestObject) ? largestObject : ""}]`

diff --git a/src/processor/parser.ts b/src/processor/parser.ts
@@ -27,7 +27,7 @@ function reducer(args: ClassValue[], options?: TWGOptions) {
 /**
  * Transforms the inputs. Map key to each values inside the Object zones.
  * @param {TWGOptions} [options = {separator=":"}] separator. See [docs](https://github.com/hoangnhan2ka3/twg?tab=readme-ov-file#twg-options).
- * @param {ClassValue[]} args The inputs class values.
+ * @param {...ClassValue[]} args The inputs class values.
  * @returns string
  */
 export function parser(options?: TWGOptions) {

diff --git a/tests/dev/replacer.test.ts b/tests/dev/replacer.test.ts
@@ -472,12 +472,13 @@ describe("replacer()", () => {
                             var1: true
                         },
                         {
-                            var2: 0
+                            var2: 0,
+                            var3: 1
                         },
                         className
                     )} />
                 `,
-                expected: `<div className={twg("multiple classes", "var1", "var2", className)} />;`
+                expected: `<div className={twg("multiple classes", "var1", "var2 var3", className)} />;`
             },
             {
                 contents: `
@@ -486,7 +487,7 @@ describe("replacer()", () => {
                         {
                             var1: true,
                             var2: "multiple classes",
-                            var3: true,
+                            var3: 1,
                             var4: true
                         },
                         {