npm - @danielx/civet - Versions diffs - 0.6.11 → 0.6.12 - Mend

@danielx/civet 0.6.11 → 0.6.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/browser.js CHANGED Viewed

@@ -664,12 +664,12 @@ var Civet = (() => {
               } else {
                 endIndex = i + 1;
               }
-              results = results.concat(first, ...binops.slice(start, endIndex));
+              results.push(first, ...binops.slice(start, endIndex).flat());
               first = [exp].concat(binops.slice(index + 1, endIndex));
               start = endIndex;
             });
           } else {
-            results = results.concat(first, ...binops.slice(start, i + 1));
+            results.push(first, ...binops.slice(start, i + 1).flat());
             start = i + 1;
           }
           chains.length = 0;
@@ -1586,11 +1586,20 @@ var Civet = (() => {
             });
             break;
           }
-          case "ConditionFragment":
+          case "ConditionFragment": {
+            let { children } = pattern;
+            if (children.length) {
+              let [first, ...rest] = children;
+              let [ws, ...op] = first;
+              ws = [" "].concat(ws);
+              first = [ws, ...op];
+              children = [first, ...rest];
+            }
             conditions.push(
-              [ref, " ", pattern.children]
+              processBinaryOpExpression([ref, children])
             );
             break;
+          }
           case "RegularExpressionLiteral": {
             conditions.push(
               ["typeof ", ref, " === 'string'"],
@@ -8210,7 +8219,7 @@ ${input.slice(result.pos)}
         return {
           type: "BlockStatement",
           expressions,
-          children: [$1, expressions, $2],
+          children: [$1, $2, expressions, $3, $4],
           bare: false,
           empty: true
         };
@@ -8278,8 +8287,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Block$0 = ExplicitBlock;
-      var Block$1 = ImplicitNestedBlock;
+      var Block$0 = ImplicitNestedBlock;
+      var Block$1 = ExplicitBlock;
       var Block$2 = ThenClause;
       var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;

package/dist/main.js CHANGED Viewed

@@ -663,12 +663,12 @@ var require_lib = __commonJS({
             } else {
               endIndex = i + 1;
             }
-            results = results.concat(first, ...binops.slice(start, endIndex));
+            results.push(first, ...binops.slice(start, endIndex).flat());
             first = [exp].concat(binops.slice(index + 1, endIndex));
             start = endIndex;
           });
         } else {
-          results = results.concat(first, ...binops.slice(start, i + 1));
+          results.push(first, ...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
         chains.length = 0;
@@ -1585,11 +1585,20 @@ var require_lib = __commonJS({
           });
           break;
         }
-        case "ConditionFragment":
+        case "ConditionFragment": {
+          let { children } = pattern;
+          if (children.length) {
+            let [first, ...rest] = children;
+            let [ws, ...op] = first;
+            ws = [" "].concat(ws);
+            first = [ws, ...op];
+            children = [first, ...rest];
+          }
           conditions.push(
-            [ref, " ", pattern.children]
+            processBinaryOpExpression([ref, children])
           );
           break;
+        }
         case "RegularExpressionLiteral": {
           conditions.push(
             ["typeof ", ref, " === 'string'"],
@@ -8209,7 +8218,7 @@ ${input.slice(result.pos)}
       return {
         type: "BlockStatement",
         expressions,
-        children: [$1, expressions, $2],
+        children: [$1, $2, expressions, $3, $4],
         bare: false,
         empty: true
       };
@@ -8277,8 +8286,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Block$0 = ExplicitBlock;
-    var Block$1 = ImplicitNestedBlock;
+    var Block$0 = ImplicitNestedBlock;
+    var Block$1 = ExplicitBlock;
     var Block$2 = ThenClause;
     var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;

package/dist/main.mjs CHANGED Viewed

@@ -661,12 +661,12 @@ var require_lib = __commonJS({
             } else {
               endIndex = i + 1;
             }
-            results = results.concat(first, ...binops.slice(start, endIndex));
+            results.push(first, ...binops.slice(start, endIndex).flat());
             first = [exp].concat(binops.slice(index + 1, endIndex));
             start = endIndex;
           });
         } else {
-          results = results.concat(first, ...binops.slice(start, i + 1));
+          results.push(first, ...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
         chains.length = 0;
@@ -1583,11 +1583,20 @@ var require_lib = __commonJS({
           });
           break;
         }
-        case "ConditionFragment":
+        case "ConditionFragment": {
+          let { children } = pattern;
+          if (children.length) {
+            let [first, ...rest] = children;
+            let [ws, ...op] = first;
+            ws = [" "].concat(ws);
+            first = [ws, ...op];
+            children = [first, ...rest];
+          }
           conditions.push(
-            [ref, " ", pattern.children]
+            processBinaryOpExpression([ref, children])
           );
           break;
+        }
         case "RegularExpressionLiteral": {
           conditions.push(
             ["typeof ", ref, " === 'string'"],
@@ -8207,7 +8216,7 @@ ${input.slice(result.pos)}
       return {
         type: "BlockStatement",
         expressions,
-        children: [$1, expressions, $2],
+        children: [$1, $2, expressions, $3, $4],
         bare: false,
         empty: true
       };
@@ -8275,8 +8284,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Block$0 = ExplicitBlock;
-    var Block$1 = ImplicitNestedBlock;
+    var Block$0 = ImplicitNestedBlock;
+    var Block$1 = ExplicitBlock;
     var Block$2 = ThenClause;
     var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",