@danielx/civet 0.5.14 → 0.5.15

package/dist/browser.js

@@ -5,88 +5,6 @@ var Civet = (() => {
     return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
   };
 
-  // source/generate.coffee
-  var require_generate = __commonJS({
-    "source/generate.coffee"(exports, module) {
-      "civet coffeeCompat";
-      var gen;
-      var prune;
-      gen = function(node, options) {
-        var $loc, token;
-        if (node === null || node === void 0) {
-          return "";
-        }
-        if (typeof node === "string") {
-          if (options != null) {
-            if (typeof options.updateSourceMap === "function") {
-              options.updateSourceMap(node);
-            }
-          }
-          return node;
-        }
-        if (Array.isArray(node)) {
-          return node.map(function(child) {
-            return gen(child, options);
-          }).join("");
-        }
-        if (typeof node === "object") {
-          if (options.js && node.ts) {
-            return "";
-          }
-          if (!options.js && node.js) {
-            return "";
-          }
-          if (node.$loc != null) {
-            ({ token, $loc } = node);
-            if (options != null) {
-              if (typeof options.updateSourceMap === "function") {
-                options.updateSourceMap(token, $loc.pos);
-              }
-            }
-            return token;
-          }
-          if (!node.children) {
-            debugger;
-            throw new Error("Unknown node", JSON.stringify(node));
-          }
-          return gen(node.children, options);
-        }
-        debugger;
-        throw new Error("Unknown node", JSON.stringify(node));
-      };
-      module.exports = gen;
-      prune = function(node) {
-        var a;
-        if (node === null || node === void 0) {
-          return;
-        }
-        if (node.length === 0) {
-          return;
-        }
-        if (Array.isArray(node)) {
-          a = node.map(function(n) {
-            return prune(n);
-          }).filter(function(n) {
-            return !!n;
-          });
-          if (a.length > 1) {
-            return a;
-          }
-          if (a.length === 1) {
-            return a[0];
-          }
-          return;
-        }
-        if (node.children != null) {
-          node.children = prune(node.children) || [];
-          return node;
-        }
-        return node;
-      };
-      gen.prune = prune;
-    }
-  });
-
   // source/parser.hera
   var require_parser = __commonJS({
     "source/parser.hera"(exports, module) {
@@ -11002,8 +10920,9 @@ ${input.slice(result.pos)}
           children: children.jsxChildren.length ? [...$0, ["</", open[1], ">"]] : [open.slice(0, -1), " />"]
         };
       });
-      var JSXElement$3 = $TS($S(JSXOpeningElement), function($skip, $loc, $0, $1) {
-        throw new Error(`could not parse JSX element "${require_generate()($0)}" at pos ${$loc.pos}`);
+      var JSXElement$3 = $TV(JSXOpeningElement, function($skip, $loc, $0, $1) {
+        var elt = $0;
+        throw new Error(`could not parse JSX element "${elt[0]}${elt[1]}${elt[elt.length - 1]}" at pos ${$loc.pos}`);
       });
       function JSXElement(state) {
         if (state.events) {
@@ -11653,7 +11572,7 @@ ${input.slice(result.pos)}
         }
         return $skip;
       });
-      var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+      var JSXNestedChildren$1 = $TV($Y($C(EOS, $EXPECT($L17, fail, 'JSXNestedChildren "}"'))), function($skip, $loc, $0, $1) {
         return { children: [], jsxChildren: [] };
       });
       function JSXNestedChildren(state) {
@@ -14782,6 +14701,88 @@ ${input.slice(result.pos)}
     }
   });
 
+  // source/generate.coffee
+  var require_generate = __commonJS({
+    "source/generate.coffee"(exports, module) {
+      "civet coffeeCompat";
+      var gen;
+      var prune;
+      gen = function(node, options) {
+        var $loc, token;
+        if (node === null || node === void 0) {
+          return "";
+        }
+        if (typeof node === "string") {
+          if (options != null) {
+            if (typeof options.updateSourceMap === "function") {
+              options.updateSourceMap(node);
+            }
+          }
+          return node;
+        }
+        if (Array.isArray(node)) {
+          return node.map(function(child) {
+            return gen(child, options);
+          }).join("");
+        }
+        if (typeof node === "object") {
+          if (options.js && node.ts) {
+            return "";
+          }
+          if (!options.js && node.js) {
+            return "";
+          }
+          if (node.$loc != null) {
+            ({ token, $loc } = node);
+            if (options != null) {
+              if (typeof options.updateSourceMap === "function") {
+                options.updateSourceMap(token, $loc.pos);
+              }
+            }
+            return token;
+          }
+          if (!node.children) {
+            debugger;
+            throw new Error("Unknown node", JSON.stringify(node));
+          }
+          return gen(node.children, options);
+        }
+        debugger;
+        throw new Error("Unknown node", JSON.stringify(node));
+      };
+      module.exports = gen;
+      prune = function(node) {
+        var a;
+        if (node === null || node === void 0) {
+          return;
+        }
+        if (node.length === 0) {
+          return;
+        }
+        if (Array.isArray(node)) {
+          a = node.map(function(n) {
+            return prune(n);
+          }).filter(function(n) {
+            return !!n;
+          });
+          if (a.length > 1) {
+            return a;
+          }
+          if (a.length === 1) {
+            return a[0];
+          }
+          return;
+        }
+        if (node.children != null) {
+          node.children = prune(node.children) || [];
+          return node;
+        }
+        return node;
+      };
+      gen.prune = prune;
+    }
+  });
+
   // source/util.coffee
   var require_util = __commonJS({
     "source/util.coffee"(exports, module) {
@@ -15119,11 +15120,13 @@ ${input.slice(result.pos)}
       var makeCache;
       var parse;
       var prune;
+      var uncacheable;
       var util;
       ({ parse } = require_parser());
       ({ prune } = gen = require_generate());
       ({ SourceMap, base64Encode } = util = require_util());
       defaultOptions = {};
+      uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
       module.exports = {
         parse,
         compile: function(src, options = defaultOptions) {
@@ -15176,69 +15179,9 @@ ${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode(JSON.strin
           exit: function(ruleName, state, result) {
             var cache;
             cache = caches.get(ruleName);
-            if (!cache) {
-              switch (ruleName) {
-                case "TrackIndented":
-                case "Samedent":
-                case "IndentedFurther":
-                case "PushIndent":
-                case "PopIndent":
-                case "Nested":
-                case "InsertIndent":
-                case "Arguments":
-                case "ArgumentsWithTrailingCallExpressions":
-                case "ApplicationStart":
-                case "CallExpression":
-                case "CallExpressionRest":
-                case "LeftHandSideExpression":
-                case "ActualAssignment":
-                case "UpdateExpression":
-                case "UnaryExpression":
-                case "BinaryOpExpression":
-                case "BinaryOpRHS":
-                case "ConditionalExpression":
-                case "ShortCircuitExpression":
-                case "ImplicitNestedBlock":
-                case "ObjectLiteral":
-                case "NestedObject":
-                case "NestedImplicitObjectLiteral":
-                case "BracedObjectLiteralContent":
-                case "NestedPropertyDefinitions":
-                case "NestedImplicitPropertyDefinition":
-                case "NestedImplicitPropertyDefinitions":
-                case "NestedBlockStatement":
-                case "NestedElement":
-                case "NestedElementList":
-                case "NestedBindingElement":
-                case "NestedBindingElements":
-                case "NestedInterfaceProperty":
-                case "MemberExpression":
-                case "PrimaryExpression":
-                case "IndentedApplicationAllowed":
-                case "ExpressionWithIndentedApplicationSuppressed":
-                case "SuppressIndentedApplication":
-                case "AssignmentExpressionTail":
-                case "AssignmentExpression":
-                case "ExtendedExpression":
-                case "Expression":
-                case "MemberExpressionRest":
-                case "ElseClause":
-                case "CoffeeCommentEnabled":
-                case "SingleLineComment":
-                case "Debugger":
-                case "JSXElement":
-                case "TypedJSXElement":
-                case "JSXFragment":
-                case "TypedJSXFragment":
-                case "JSXChild":
-                case "JSXChildren":
-                case "JSXNestedChildren":
-                case "JSXMixedChildren":
-                  break;
-                default:
-                  cache = /* @__PURE__ */ new Map();
-                  caches.set(ruleName, cache);
-              }
+            if (!cache && !uncacheable.has(ruleName)) {
+              cache = /* @__PURE__ */ new Map();
+              caches.set(ruleName, cache);
             }
             if (cache) {
               if (result) {

package/dist/main.js

@@ -4,88 +4,6 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// source/generate.coffee
-var require_generate = __commonJS({
-  "source/generate.coffee"(exports2, module2) {
-    "civet coffeeCompat";
-    var gen2;
-    var prune2;
-    gen2 = function(node, options) {
-      var $loc, token;
-      if (node === null || node === void 0) {
-        return "";
-      }
-      if (typeof node === "string") {
-        if (options != null) {
-          if (typeof options.updateSourceMap === "function") {
-            options.updateSourceMap(node);
-          }
-        }
-        return node;
-      }
-      if (Array.isArray(node)) {
-        return node.map(function(child) {
-          return gen2(child, options);
-        }).join("");
-      }
-      if (typeof node === "object") {
-        if (options.js && node.ts) {
-          return "";
-        }
-        if (!options.js && node.js) {
-          return "";
-        }
-        if (node.$loc != null) {
-          ({ token, $loc } = node);
-          if (options != null) {
-            if (typeof options.updateSourceMap === "function") {
-              options.updateSourceMap(token, $loc.pos);
-            }
-          }
-          return token;
-        }
-        if (!node.children) {
-          debugger;
-          throw new Error("Unknown node", JSON.stringify(node));
-        }
-        return gen2(node.children, options);
-      }
-      debugger;
-      throw new Error("Unknown node", JSON.stringify(node));
-    };
-    module2.exports = gen2;
-    prune2 = function(node) {
-      var a;
-      if (node === null || node === void 0) {
-        return;
-      }
-      if (node.length === 0) {
-        return;
-      }
-      if (Array.isArray(node)) {
-        a = node.map(function(n) {
-          return prune2(n);
-        }).filter(function(n) {
-          return !!n;
-        });
-        if (a.length > 1) {
-          return a;
-        }
-        if (a.length === 1) {
-          return a[0];
-        }
-        return;
-      }
-      if (node.children != null) {
-        node.children = prune2(node.children) || [];
-        return node;
-      }
-      return node;
-    };
-    gen2.prune = prune2;
-  }
-});
-
 // source/parser.hera
 var require_parser = __commonJS({
   "source/parser.hera"(exports2, module2) {
@@ -11001,8 +10919,9 @@ ${input.slice(result.pos)}
         children: children.jsxChildren.length ? [...$0, ["</", open[1], ">"]] : [open.slice(0, -1), " />"]
       };
     });
-    var JSXElement$3 = $TS($S(JSXOpeningElement), function($skip, $loc, $0, $1) {
-      throw new Error(`could not parse JSX element "${require_generate()($0)}" at pos ${$loc.pos}`);
+    var JSXElement$3 = $TV(JSXOpeningElement, function($skip, $loc, $0, $1) {
+      var elt = $0;
+      throw new Error(`could not parse JSX element "${elt[0]}${elt[1]}${elt[elt.length - 1]}" at pos ${$loc.pos}`);
     });
     function JSXElement(state) {
       if (state.events) {
@@ -11652,7 +11571,7 @@ ${input.slice(result.pos)}
       }
       return $skip;
     });
-    var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+    var JSXNestedChildren$1 = $TV($Y($C(EOS, $EXPECT($L17, fail, 'JSXNestedChildren "}"'))), function($skip, $loc, $0, $1) {
       return { children: [], jsxChildren: [] };
     });
     function JSXNestedChildren(state) {
@@ -14781,6 +14700,88 @@ ${input.slice(result.pos)}
   }
 });
 
+// source/generate.coffee
+var require_generate = __commonJS({
+  "source/generate.coffee"(exports2, module2) {
+    "civet coffeeCompat";
+    var gen2;
+    var prune2;
+    gen2 = function(node, options) {
+      var $loc, token;
+      if (node === null || node === void 0) {
+        return "";
+      }
+      if (typeof node === "string") {
+        if (options != null) {
+          if (typeof options.updateSourceMap === "function") {
+            options.updateSourceMap(node);
+          }
+        }
+        return node;
+      }
+      if (Array.isArray(node)) {
+        return node.map(function(child) {
+          return gen2(child, options);
+        }).join("");
+      }
+      if (typeof node === "object") {
+        if (options.js && node.ts) {
+          return "";
+        }
+        if (!options.js && node.js) {
+          return "";
+        }
+        if (node.$loc != null) {
+          ({ token, $loc } = node);
+          if (options != null) {
+            if (typeof options.updateSourceMap === "function") {
+              options.updateSourceMap(token, $loc.pos);
+            }
+          }
+          return token;
+        }
+        if (!node.children) {
+          debugger;
+          throw new Error("Unknown node", JSON.stringify(node));
+        }
+        return gen2(node.children, options);
+      }
+      debugger;
+      throw new Error("Unknown node", JSON.stringify(node));
+    };
+    module2.exports = gen2;
+    prune2 = function(node) {
+      var a;
+      if (node === null || node === void 0) {
+        return;
+      }
+      if (node.length === 0) {
+        return;
+      }
+      if (Array.isArray(node)) {
+        a = node.map(function(n) {
+          return prune2(n);
+        }).filter(function(n) {
+          return !!n;
+        });
+        if (a.length > 1) {
+          return a;
+        }
+        if (a.length === 1) {
+          return a[0];
+        }
+        return;
+      }
+      if (node.children != null) {
+        node.children = prune2(node.children) || [];
+        return node;
+      }
+      return node;
+    };
+    gen2.prune = prune2;
+  }
+});
+
 // source/util.coffee
 var require_util = __commonJS({
   "source/util.coffee"(exports2, module2) {
@@ -15116,11 +15117,13 @@ var gen;
 var makeCache;
 var parse;
 var prune;
+var uncacheable;
 var util;
 ({ parse } = require_parser());
 ({ prune } = gen = require_generate());
 ({ SourceMap, base64Encode } = util = require_util());
 defaultOptions = {};
+uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
 module.exports = {
   parse,
   compile: function(src, options = defaultOptions) {
@@ -15173,69 +15176,9 @@ makeCache = function() {
     exit: function(ruleName, state, result) {
       var cache;
       cache = caches.get(ruleName);
-      if (!cache) {
-        switch (ruleName) {
-          case "TrackIndented":
-          case "Samedent":
-          case "IndentedFurther":
-          case "PushIndent":
-          case "PopIndent":
-          case "Nested":
-          case "InsertIndent":
-          case "Arguments":
-          case "ArgumentsWithTrailingCallExpressions":
-          case "ApplicationStart":
-          case "CallExpression":
-          case "CallExpressionRest":
-          case "LeftHandSideExpression":
-          case "ActualAssignment":
-          case "UpdateExpression":
-          case "UnaryExpression":
-          case "BinaryOpExpression":
-          case "BinaryOpRHS":
-          case "ConditionalExpression":
-          case "ShortCircuitExpression":
-          case "ImplicitNestedBlock":
-          case "ObjectLiteral":
-          case "NestedObject":
-          case "NestedImplicitObjectLiteral":
-          case "BracedObjectLiteralContent":
-          case "NestedPropertyDefinitions":
-          case "NestedImplicitPropertyDefinition":
-          case "NestedImplicitPropertyDefinitions":
-          case "NestedBlockStatement":
-          case "NestedElement":
-          case "NestedElementList":
-          case "NestedBindingElement":
-          case "NestedBindingElements":
-          case "NestedInterfaceProperty":
-          case "MemberExpression":
-          case "PrimaryExpression":
-          case "IndentedApplicationAllowed":
-          case "ExpressionWithIndentedApplicationSuppressed":
-          case "SuppressIndentedApplication":
-          case "AssignmentExpressionTail":
-          case "AssignmentExpression":
-          case "ExtendedExpression":
-          case "Expression":
-          case "MemberExpressionRest":
-          case "ElseClause":
-          case "CoffeeCommentEnabled":
-          case "SingleLineComment":
-          case "Debugger":
-          case "JSXElement":
-          case "TypedJSXElement":
-          case "JSXFragment":
-          case "TypedJSXFragment":
-          case "JSXChild":
-          case "JSXChildren":
-          case "JSXNestedChildren":
-          case "JSXMixedChildren":
-            break;
-          default:
-            cache = /* @__PURE__ */ new Map();
-            caches.set(ruleName, cache);
-        }
+      if (!cache && !uncacheable.has(ruleName)) {
+        cache = /* @__PURE__ */ new Map();
+        caches.set(ruleName, cache);
       }
       if (cache) {
         if (result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {