@danielx/civet 0.7.2 → 0.7.3

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // node_modules/@danielx/hera/dist/machine.js
+  // ../Hera/dist/machine.js
   var require_machine = __commonJS({
-    "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+    "../Hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -2842,21 +2842,9 @@ ${input.slice(result.pos)}
           const { children, name, value } = p;
           const [ws] = children;
           switch (value && value.type) {
-            case "ArrayBindingPattern": {
-              let bindings = nonMatcherBindings(value);
-              if (!bindings.length) {
-                bindings = void 0;
-              }
-              return {
-                ...p,
-                children: [ws, name, bindings && ": ", bindings, p.delim]
-              };
-            }
+            case "ArrayBindingPattern":
             case "ObjectBindingPattern": {
-              let bindings = nonMatcherBindings(value);
-              if (!bindings.properties.length) {
-                bindings = void 0;
-              }
+              const bindings = nonMatcherBindings(value);
               return {
                 ...p,
                 children: [ws, name, bindings && ": ", bindings, p.delim]
@@ -4080,19 +4068,17 @@ ${input.slice(result.pos)}
   }
   var generate_default = gen;
   function prune(node) {
-    if (node === null || node === void 0) {
+    if (!(node != null)) {
       return;
     }
-    if (node.length === 0) {
+    if (typeof node === "string" && node.length === 0) {
       return;
     }
     if (node.parent != null) {
       delete node.parent;
     }
     if (Array.isArray(node)) {
-      const a = node.map(function(n) {
-        return prune(n);
-      }).filter(($) => !!$);
+      const a = node.map(prune).filter(($) => $);
       if (a.length > 1) {
         return a;
       }
@@ -5810,6 +5796,7 @@ ${input.slice(result.pos)}
     NonPipelineArgumentPart,
     BinaryOpExpression,
     BinaryOpRHS,
+    IsLike,
     WRHS,
     SingleLineBinaryOpRHS,
     RHS,
@@ -7225,22 +7212,12 @@ ${input.slice(result.pos)}
   function BinaryOpExpression(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "BinaryOpExpression", BinaryOpExpression$0);
   }
-  var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), (0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), IsLike, (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
     var ws1 = $1;
     var op = $2;
     var ws2 = $3;
     var patterns = $4;
-    return [
-      ws1,
-      {
-        type: "PatternTest",
-        children: op,
-        special: true,
-        negated: !!op[2]
-      },
-      ws2,
-      patterns
-    ];
+    return [ws1, op, ws2, patterns];
   });
   var BinaryOpRHS$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(BinaryOp, RHS), function($skip, $loc, $0, $1, $2) {
     var op = $1;
@@ -7259,6 +7236,18 @@ ${input.slice(result.pos)}
   function BinaryOpRHS(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "BinaryOpRHS", BinaryOpRHS$$);
   }
+  var IsLike$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var not = $3;
+    return {
+      type: "PatternTest",
+      children: $0,
+      special: true,
+      negated: !!not
+    };
+  });
+  function IsLike(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
+  }
   var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
     var wrhs = $2;
     if (!wrhs)
@@ -9275,7 +9264,28 @@ ${input.slice(result.pos)}
       expression: fn
     };
   });
-  var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, IsLike, __, PatternExpressionList, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var open = $1;
+    var ws1 = $2;
+    var op = $3;
+    var ws2 = $4;
+    var rhs = $5;
+    var close = $6;
+    const refA = makeRef("a");
+    const fn = makeAmpersandFunction({
+      ref: refA,
+      body: processBinaryOpExpression([refA, [
+        [ws1, op, ws2, rhs]
+        // BinaryOpRHS
+      ]])
+    });
+    return {
+      type: "ParenthesizedExpression",
+      children: [open, fn, close],
+      expression: fn
+    };
+  });
+  var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var open = $1;
     var ws1 = $2;
     var op = $4;
@@ -9296,7 +9306,7 @@ ${input.slice(result.pos)}
       expression: fn
     };
   });
-  var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4];
+  var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4, FunctionExpression$5];
   function FunctionExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "FunctionExpression", FunctionExpression$$);
   }

package/dist/main.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/@danielx/hera/dist/machine.js
+// ../Hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/@danielx/hera/dist/machine.js"(exports2, module2) {
+  "../Hera/dist/machine.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -2835,21 +2835,9 @@ function elideMatchersFromPropertyBindings(properties) {
         const { children, name, value } = p;
         const [ws] = children;
         switch (value && value.type) {
-          case "ArrayBindingPattern": {
-            let bindings = nonMatcherBindings(value);
-            if (!bindings.length) {
-              bindings = void 0;
-            }
-            return {
-              ...p,
-              children: [ws, name, bindings && ": ", bindings, p.delim]
-            };
-          }
+          case "ArrayBindingPattern":
           case "ObjectBindingPattern": {
-            let bindings = nonMatcherBindings(value);
-            if (!bindings.properties.length) {
-              bindings = void 0;
-            }
+            const bindings = nonMatcherBindings(value);
             return {
               ...p,
               children: [ws, name, bindings && ": ", bindings, p.delim]
@@ -4073,19 +4061,17 @@ function gen(node, options) {
 }
 var generate_default = gen;
 function prune(node) {
-  if (node === null || node === void 0) {
+  if (!(node != null)) {
     return;
   }
-  if (node.length === 0) {
+  if (typeof node === "string" && node.length === 0) {
     return;
   }
   if (node.parent != null) {
     delete node.parent;
   }
   if (Array.isArray(node)) {
-    const a = node.map(function(n) {
-      return prune(n);
-    }).filter(($) => !!$);
+    const a = node.map(prune).filter(($) => $);
     if (a.length > 1) {
       return a;
     }
@@ -5803,6 +5789,7 @@ var grammar = {
   NonPipelineArgumentPart,
   BinaryOpExpression,
   BinaryOpRHS,
+  IsLike,
   WRHS,
   SingleLineBinaryOpRHS,
   RHS,
@@ -7218,22 +7205,12 @@ var BinaryOpExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnaryExpress
 function BinaryOpExpression(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "BinaryOpExpression", BinaryOpExpression$0);
 }
-var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), (0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), IsLike, (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws1 = $1;
   var op = $2;
   var ws2 = $3;
   var patterns = $4;
-  return [
-    ws1,
-    {
-      type: "PatternTest",
-      children: op,
-      special: true,
-      negated: !!op[2]
-    },
-    ws2,
-    patterns
-  ];
+  return [ws1, op, ws2, patterns];
 });
 var BinaryOpRHS$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(BinaryOp, RHS), function($skip, $loc, $0, $1, $2) {
   var op = $1;
@@ -7252,6 +7229,18 @@ var BinaryOpRHS$$ = [BinaryOpRHS$0, BinaryOpRHS$1, BinaryOpRHS$2, BinaryOpRHS$3]
 function BinaryOpRHS(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BinaryOpRHS", BinaryOpRHS$$);
 }
+var IsLike$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var not = $3;
+  return {
+    type: "PatternTest",
+    children: $0,
+    special: true,
+    negated: !!not
+  };
+});
+function IsLike(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
+}
 var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var wrhs = $2;
   if (!wrhs)
@@ -9268,7 +9257,28 @@ var FunctionExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, (
     expression: fn
   };
 });
-var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, IsLike, __, PatternExpressionList, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var open = $1;
+  var ws1 = $2;
+  var op = $3;
+  var ws2 = $4;
+  var rhs = $5;
+  var close = $6;
+  const refA = makeRef("a");
+  const fn = makeAmpersandFunction({
+    ref: refA,
+    body: processBinaryOpExpression([refA, [
+      [ws1, op, ws2, rhs]
+      // BinaryOpRHS
+    ]])
+  });
+  return {
+    type: "ParenthesizedExpression",
+    children: [open, fn, close],
+    expression: fn
+  };
+});
+var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var open = $1;
   var ws1 = $2;
   var op = $4;
@@ -9289,7 +9299,7 @@ var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, _
     expression: fn
   };
 });
-var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4];
+var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4, FunctionExpression$5];
 function FunctionExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FunctionExpression", FunctionExpression$$);
 }

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/@danielx/hera/dist/machine.js
+// ../Hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+  "../Hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -2819,21 +2819,9 @@ function elideMatchersFromPropertyBindings(properties) {
         const { children, name, value } = p;
         const [ws] = children;
         switch (value && value.type) {
-          case "ArrayBindingPattern": {
-            let bindings = nonMatcherBindings(value);
-            if (!bindings.length) {
-              bindings = void 0;
-            }
-            return {
-              ...p,
-              children: [ws, name, bindings && ": ", bindings, p.delim]
-            };
-          }
+          case "ArrayBindingPattern":
           case "ObjectBindingPattern": {
-            let bindings = nonMatcherBindings(value);
-            if (!bindings.properties.length) {
-              bindings = void 0;
-            }
+            const bindings = nonMatcherBindings(value);
             return {
               ...p,
               children: [ws, name, bindings && ": ", bindings, p.delim]
@@ -4057,19 +4045,17 @@ function gen(node, options) {
 }
 var generate_default = gen;
 function prune(node) {
-  if (node === null || node === void 0) {
+  if (!(node != null)) {
     return;
   }
-  if (node.length === 0) {
+  if (typeof node === "string" && node.length === 0) {
     return;
   }
   if (node.parent != null) {
     delete node.parent;
   }
   if (Array.isArray(node)) {
-    const a = node.map(function(n) {
-      return prune(n);
-    }).filter(($) => !!$);
+    const a = node.map(prune).filter(($) => $);
     if (a.length > 1) {
       return a;
     }
@@ -5787,6 +5773,7 @@ var grammar = {
   NonPipelineArgumentPart,
   BinaryOpExpression,
   BinaryOpRHS,
+  IsLike,
   WRHS,
   SingleLineBinaryOpRHS,
   RHS,
@@ -7202,22 +7189,12 @@ var BinaryOpExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnaryExpress
 function BinaryOpExpression(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "BinaryOpExpression", BinaryOpExpression$0);
 }
-var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), (0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$E)(_), IndentedFurther, Nested), IsLike, (0, import_lib2.$E)(_), PatternExpressionList), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws1 = $1;
   var op = $2;
   var ws2 = $3;
   var patterns = $4;
-  return [
-    ws1,
-    {
-      type: "PatternTest",
-      children: op,
-      special: true,
-      negated: !!op[2]
-    },
-    ws2,
-    patterns
-  ];
+  return [ws1, op, ws2, patterns];
 });
 var BinaryOpRHS$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(BinaryOp, RHS), function($skip, $loc, $0, $1, $2) {
   var op = $1;
@@ -7236,6 +7213,18 @@ var BinaryOpRHS$$ = [BinaryOpRHS$0, BinaryOpRHS$1, BinaryOpRHS$2, BinaryOpRHS$3]
 function BinaryOpRHS(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BinaryOpRHS", BinaryOpRHS$$);
 }
+var IsLike$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is, (0, import_lib2.$E)(_), (0, import_lib2.$E)((0, import_lib2.$S)(Not, (0, import_lib2.$E)(_))), Like), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var not = $3;
+  return {
+    type: "PatternTest",
+    children: $0,
+    special: true,
+    negated: !!not
+  };
+});
+function IsLike(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
+}
 var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var wrhs = $2;
   if (!wrhs)
@@ -9252,7 +9241,28 @@ var FunctionExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, (
     expression: fn
   };
 });
-var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, IsLike, __, PatternExpressionList, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var open = $1;
+  var ws1 = $2;
+  var op = $3;
+  var ws2 = $4;
+  var rhs = $5;
+  var close = $6;
+  const refA = makeRef("a");
+  const fn = makeAmpersandFunction({
+    ref: refA,
+    body: processBinaryOpExpression([refA, [
+      [ws1, op, ws2, rhs]
+      // BinaryOpRHS
+    ]])
+  });
+  return {
+    type: "ParenthesizedExpression",
+    children: [open, fn, close],
+    expression: fn
+  };
+});
+var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R13, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var open = $1;
   var ws1 = $2;
   var op = $4;
@@ -9273,7 +9283,7 @@ var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, _
     expression: fn
   };
 });
-var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4];
+var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3, FunctionExpression$4, FunctionExpression$5];
 function FunctionExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FunctionExpression", FunctionExpression$$);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",