@danielx/civet 0.6.38 → 0.6.40

package/dist/browser.js

@@ -7,7 +7,14 @@ var Civet = (() => {
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
   var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __commonJS = (cb, mod) => function __require() {
+  var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+    get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+  }) : x)(function(x) {
+    if (typeof require !== "undefined")
+      return require.apply(this, arguments);
+    throw new Error('Dynamic require of "' + x + '" is not supported');
+  });
+  var __commonJS = (cb, mod) => function __require2() {
     return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
   };
   var __export = (target, all) => {
@@ -730,57 +737,107 @@ ${input.slice(result.pos)}
         }
         return [constructInvocation(fn, arg), null];
       }
-      var initialSpacingRe = /^(?:\r?\n|\n)*((?:\r?\n|\n)\s+)/;
-      function dedentBlockString({ $loc, token: str }, spacing, trim = true) {
-        if (spacing == null)
-          spacing = str.match(initialSpacingRe);
-        if (spacing) {
-          str = str.replaceAll(spacing[1], "\n");
-          const l = spacing.length;
-          $loc.pos += l;
-          $loc.length -= l;
+      function getIndentLevel(str, tab) {
+        if (tab != null && tab != 1) {
+          const tabs = str.match(/\t/g);
+          const numTabs = tabs ? tabs.length : 0;
+          return numTabs * tab + /*spaces*/
+          (str.length - numTabs);
+        } else {
+          return str.length;
         }
-        if (trim) {
-          str = str.replace(/^(\r?\n|\n)/, "").replace(/(\r?\n|\n)[ \t]*$/, "");
+      }
+      function reduceIndentLevel(str, dedent, tab) {
+        if (tab != null && tab != 1) {
+          for (let i1 = 0, len1 = str.length; i1 < len1; i1++) {
+            const i = i1;
+            const char = str[i1];
+            if (!dedent) {
+              return str.slice(i);
+            }
+            if (char == "	") {
+              dedent -= tab;
+              if (dedent < 0) {
+                return "".padStart(-dedent, " ") + str.slice(i + 1);
+              }
+            } else {
+              dedent--;
+            }
+          }
+          return "";
+        } else {
+          return str.slice(dedent);
+        }
+      }
+      var indentRe = /\n([ \t]*)(?![ \t]|\r?\n|$)/g;
+      function getIndentOfBlockString(str, tab) {
+        let minLevel = Infinity;
+        let ref1;
+        while (ref1 = indentRe.exec(str)) {
+          const match = ref1;
+          const level = getIndentLevel(match[1], tab);
+          if (level < minLevel) {
+            minLevel = level;
+          }
+        }
+        if (minLevel == Infinity) {
+          minLevel = 0;
+        }
+        return minLevel;
+      }
+      function dedentBlockString({ $loc, token: str }, tab, dedent, trimStart = true, trimEnd = true) {
+        if (dedent == null && /^[ \t]*\r?\n/.test(str)) {
+          dedent = getIndentOfBlockString(str, tab);
+        }
+        if (dedent) {
+          str = str.replace(/(\n)([ \t]*)/g, (_, newline, indent) => {
+            return newline + reduceIndentLevel(indent, dedent, tab);
+          });
+        }
+        if (trimStart) {
+          str = str.replace(/^[ \t]*\r?\n/, "");
+        }
+        if (trimEnd) {
+          str = str.replace(/(\r?\n|\n)[ \t]*$/, "");
         }
         str = str.replace(/(\\.|`|\$\{)/g, (s) => {
           if (s[0] === "\\") {
             return s;
+          } else {
+            return `\\${s}`;
           }
-          return `\\${s}`;
         });
-        return {
-          $loc,
-          token: str
-        };
+        return { $loc, token: str };
       }
-      function dedentBlockSubstitutions($0) {
+      function dedentBlockSubstitutions($0, tab) {
         const [s, strWithSubstitutions, e] = $0;
-        if (strWithSubstitutions.length === 0) {
+        if (!strWithSubstitutions.length) {
           return $0;
         }
-        let initialSpacing, i = 0, l = strWithSubstitutions.length, results = [s];
-        const { token } = strWithSubstitutions[0];
-        if (token) {
-          initialSpacing = token.match(initialSpacingRe);
-        } else {
-          initialSpacing = false;
-        }
-        while (i < l) {
-          let segment = strWithSubstitutions[i];
-          if (segment.token) {
-            segment = dedentBlockString(segment, initialSpacing, false);
-            if (i === 0) {
-              segment.token = segment.token.replace(/^(\r?\n|\n)/, "");
-            }
-            if (i === l - 1) {
-              segment.token = segment.token.replace(/(\r?\n|\n)[ \t]*$/, "");
-            }
-            results.push(segment);
-          } else {
-            results.push(segment);
+        const stringPart = (() => {
+          const results1 = [];
+          for (let i2 = 0, len2 = strWithSubstitutions.length; i2 < len2; i2++) {
+            const part = strWithSubstitutions[i2];
+            results1.push(part.token ?? "s");
           }
-          i++;
+          ;
+          return results1;
+        })().join("");
+        const dedent = /^[ \t]*\r?\n/.test(stringPart) ? getIndentOfBlockString(stringPart, tab) : false;
+        let results = [s];
+        for (let i3 = 0, len3 = strWithSubstitutions.length; i3 < len3; i3++) {
+          const i = i3;
+          let part = strWithSubstitutions[i3];
+          if (part.token != null) {
+            part = dedentBlockString(
+              part,
+              tab,
+              dedent,
+              i === 0,
+              i === strWithSubstitutions.length - 1
+            );
+          }
+          results.push(part);
         }
         results.push(e);
         return {
@@ -1309,17 +1366,17 @@ ${input.slice(result.pos)}
         }
         function arrayRecurse(array) {
           const len2 = array.length;
-          const results1 = [];
+          const results2 = [];
           for (let i = 0; i < len2; i++) {
             const c = array[i];
             if (c === child || Array.isArray(c) && arrayRecurse(c)) {
               return true;
             } else {
-              results1.push(void 0);
+              results2.push(void 0);
             }
           }
           ;
-          return results1;
+          return results2;
         }
         return -1;
       }
@@ -2313,9 +2370,11 @@ ${input.slice(result.pos)}
             }
             if (expr.type === "AssignmentExpression" || expr.type === "UpdateExpression") {
               if (expr.type === "UpdateExpression" && expr.children[0] === expr.assigned) {
-                post.push([", ", lhs]);
+                pre.push("(");
+                post.push([", ", lhs, ")"]);
               } else {
-                pre.push([lhs, ", "]);
+                pre.push(["(", lhs, ", "]);
+                post.push(")");
               }
               return expr.assigned;
             }
@@ -3461,7 +3520,7 @@ ${input.slice(result.pos)}
         gatherRecursive,
         gatherRecursiveAll,
         gatherRecursiveWithinFunction,
-        getIndent,
+        getIndentLevel,
         getTrimmingSpace,
         hasAwait,
         hasYield,
@@ -4470,7 +4529,7 @@ ${input.slice(result.pos)}
       var $R43 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
       var $R44 = $R(new RegExp("[^]*?###", "suy"));
       var $R45 = $R(new RegExp("###(?!#)", "suy"));
-      var $R46 = $R(new RegExp("[^\\r\\n]", "suy"));
+      var $R46 = $R(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
       var $R47 = $R(new RegExp("[ \\t]+", "suy"));
       var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
       var $R49 = $R(new RegExp("['\u2019]s", "suy"));
@@ -5518,7 +5577,7 @@ ${input.slice(result.pos)}
       function CallExpressionRest(ctx, state) {
         return $EVENT_C(ctx, state, "CallExpressionRest", CallExpressionRest$$);
       }
-      var OptionalShorthand$0 = $TS($S($Q(MultiLineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3) {
+      var OptionalShorthand$0 = $TS($S($Q(InlineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3) {
         return {
           type: "Optional",
           children: $0
@@ -5527,8 +5586,8 @@ ${input.slice(result.pos)}
       function OptionalShorthand(ctx, state) {
         return $EVENT(ctx, state, "OptionalShorthand", OptionalShorthand$0);
       }
-      var OptionalDot$0 = $S($Q(MultiLineComment), Dot);
-      var OptionalDot$1 = $S(InsertDot, $Q(MultiLineComment));
+      var OptionalDot$0 = $S($Q(InlineComment), Dot);
+      var OptionalDot$1 = $S(InsertDot, $Q(InlineComment));
       var OptionalDot$$ = [OptionalDot$0, OptionalDot$1];
       function OptionalDot(ctx, state) {
         return $EVENT_C(ctx, state, "OptionalDot", OptionalDot$$);
@@ -5559,7 +5618,7 @@ ${input.slice(result.pos)}
       function MemberBase(ctx, state) {
         return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
       }
-      var MemberExpressionRest$0 = $TS($S($Q(MultiLineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
+      var MemberExpressionRest$0 = $TS($S($Q(InlineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
         var comments = $1;
         var body = $2;
         if (Array.isArray(body))
@@ -5572,7 +5631,7 @@ ${input.slice(result.pos)}
       function MemberExpressionRest(ctx, state) {
         return $EVENT(ctx, state, "MemberExpressionRest", MemberExpressionRest$0);
       }
-      var MemberExpressionRestBody$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), $Q(MultiLineComment), MemberBracketContent), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberExpressionRestBody$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), $Q(InlineComment), MemberBracketContent), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var comments = $2;
         var content = $3;
@@ -5730,7 +5789,7 @@ ${input.slice(result.pos)}
       function AccessStart(ctx, state) {
         return $EVENT(ctx, state, "AccessStart", AccessStart$0);
       }
-      var PropertyAccess$0 = $TS($S(AccessStart, $Q(MultiLineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyAccess$0 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
         var access = $1;
         var comments = $2;
         var id = $3;
@@ -5762,7 +5821,7 @@ ${input.slice(result.pos)}
       function PropertyAccess(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
       }
-      var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(InlineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var object = $3;
         return {
@@ -7119,7 +7178,7 @@ ${input.slice(result.pos)}
           names: exp.names
         };
       });
-      var ArrayElementExpression$2 = $TS($S($E($S($E($S(__, DotDotDot, __)), ExtendedExpression)), $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2) {
+      var ArrayElementExpression$2 = $TS($S($E($S($E($S(__, DotDotDot, __)), PostfixedExpression)), $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2) {
         var expMaybeSpread = $1;
         if (expMaybeSpread) {
           const [spread, exp] = expMaybeSpread;
@@ -8673,7 +8732,7 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var ForStatementParameters$1 = $TS($S(InsertOpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E($S($N(EOS), Expression)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var ForStatementParameters$1 = $TS($S(InsertOpenParen, __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, Semicolon, $E(Expression), Semicolon, $E($S($N(EOS), ExpressionWithIndentedApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         var declaration = $3;
         return {
           declaration,
@@ -9968,7 +10027,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "RegularExpressionFlags", RegularExpressionFlags$0);
       }
       var TemplateLiteral$0 = $TS($S(TripleTick, $Q($C(TemplateBlockCharacters, TemplateSubstitution)), TripleTick), function($skip, $loc, $0, $1, $2, $3) {
-        return dedentBlockSubstitutions($0);
+        return dedentBlockSubstitutions($0, module.config.tab);
       });
       var TemplateLiteral$1 = $TS($S(Backtick, $Q($C(TemplateCharacters, TemplateSubstitution)), Backtick), function($skip, $loc, $0, $1, $2, $3) {
         return {
@@ -9977,7 +10036,7 @@ ${input.slice(result.pos)}
         };
       });
       var TemplateLiteral$2 = $TS($S(TripleDoubleQuote, $Q($C(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
-        return dedentBlockSubstitutions($0);
+        return dedentBlockSubstitutions($0, module.config.tab);
       });
       var TemplateLiteral$3 = $TS($S(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
         var s = $1;
@@ -9985,7 +10044,7 @@ ${input.slice(result.pos)}
         var e = $3;
         return {
           type: "TemplateLiteral",
-          children: [s, dedentBlockString(str), e]
+          children: [s, dedentBlockString(str, module.config.tab), e]
         };
       });
       var TemplateLiteral$4 = CoffeeInterpolatedDoubleQuotedString;
@@ -10065,13 +10124,13 @@ ${input.slice(result.pos)}
       function CoffeeHereCommentStart(ctx, state) {
         return $EVENT(ctx, state, "CoffeeHereCommentStart", CoffeeHereCommentStart$0);
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L109, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L110, 'InlineComment "*/"')), $EXPECT($R46, "InlineComment /[^\\r\\n]/")))), $EXPECT($L110, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+      var InlineComment$0 = $TR($EXPECT($R46, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0 };
       });
       function InlineComment(ctx, state) {
         return $EVENT(ctx, state, "InlineComment", InlineComment$0);
       }
-      var RestOfLine$0 = $S($Q($C(NonNewlineWhitespace, SingleLineComment, MultiLineComment)), EOL);
+      var RestOfLine$0 = $S($Q($C(NonNewlineWhitespace, Comment)), EOL);
       function RestOfLine(ctx, state) {
         return $EVENT(ctx, state, "RestOfLine", RestOfLine$0);
       }
@@ -12481,7 +12540,7 @@ ${input.slice(result.pos)}
           indexOf(indexOfRef) {
             const typeSuffix = {
               ts: true,
-              children: [": <T>(this: T[], searchElement: T) => boolean"]
+              children: [": <T>(this: T[], searchElement: T) => number"]
             };
             module.prelude.push(["", [preludeVar, indexOfRef, typeSuffix, " = [].indexOf", asAny, ";\n"]]);
           },
@@ -12619,8 +12678,8 @@ ${input.slice(result.pos)}
       function Reset(ctx, state) {
         return $EVENT(ctx, state, "Reset", Reset$0);
       }
-      var Init$0 = $TS($S($E(Shebang), $Q(TripleSlashDirective), $Q(DirectivePrologue)), function($skip, $loc, $0, $1, $2, $3) {
-        var directives = $3;
+      var Init$0 = $TS($S($E(Shebang), $Q($C(TripleSlashDirective, $S($C(JSSingleLineComment, JSMultiLineComment), EOS), DirectivePrologue))), function($skip, $loc, $0, $1, $2) {
+        var directives = $2;
         directives.forEach((directive) => {
           if (directive.type === "CivetPrologue") {
             Object.assign(module.config, directive.config);
@@ -12632,15 +12691,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "Init", Init$0);
       }
       var Indent$0 = $TR($EXPECT($R67, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-        let level;
-        if (module.config.tab) {
-          const tabs = $0.match(/\t/g);
-          const numTabs = tabs ? tabs.length : 0;
-          level = numTabs * module.config.tab + /*spaces*/
-          ($0.length - numTabs);
-        } else {
-          level = $0.length;
-        }
+        const level = getIndentLevel($0, module.config.tab);
         return {
           $loc,
           token: $0,
@@ -13438,6 +13489,7 @@ ${input.slice(result.pos)}
         expressionizeIfClause,
         forRange,
         gatherBindingCode,
+        getIndentLevel,
         getTrimmingSpace,
         hasAwait,
         hasYield,
@@ -13991,15 +14043,55 @@ ${input.slice(result.pos)}
     if (filename.endsWith(".coffee") && !/^(#![^\r\n]*(\r\n|\n|\r))?\s*['"]civet/.test(src)) {
       options.parseOptions.coffeeCompat = true;
     }
+    ;
+    const { hits, trace, noCache } = options;
     let events;
-    if (!options.noCache) {
-      events = makeCache();
+    if (!noCache) {
+      events = makeCache({
+        hits: !!hits,
+        trace: !!trace
+      });
+    }
+    let ast;
+    try {
+      parse.config = options.parseOptions || {};
+      ast = prune(parse(src, {
+        filename,
+        events
+      }));
+    } finally {
+      if (hits || trace) {
+        import("fs").then(function({ writeFileSync }) {
+          let ref;
+          if ((ref = events?.meta) && "logs" in ref) {
+            const { logs } = ref;
+            if (trace) {
+              writeFileSync(trace, logs.join("\n"));
+            }
+          }
+          if (hits) {
+            let ref1;
+            if (ref1 = events?.meta.hits) {
+              const hitData = ref1;
+              let total = 0;
+              const data = [...hitData.entries()];
+              const counts = data.sort(([, a], [, b]) => b - a).map(([k, v]) => {
+                total += v;
+                return `${k}: ${v}`;
+              }).join("\n");
+              const hitSummary = `Total: ${total}
+
+${counts}`;
+              return writeFileSync(hits, hitSummary);
+            }
+            ;
+            return;
+          }
+          ;
+          return;
+        });
+      }
     }
-    parse.config = options.parseOptions || {};
-    const ast = prune(parse(src, {
-      filename,
-      events
-    }));
     if (options.ast) {
       return ast;
     }
@@ -14022,22 +14114,45 @@ ${input.slice(result.pos)}
     }
     return result;
   }
-  function makeCache() {
+  function makeCache({ hits, trace } = {}) {
+    const meta = {};
+    let hitCount;
+    if (hits) {
+      hitCount = /* @__PURE__ */ new Map();
+      meta.hits = hitCount;
+    }
+    let logs;
+    if (trace) {
+      logs = [];
+      meta.logs = logs;
+    }
     const stateCache = new StateCache();
     let getStateKey = null;
+    const stack = [];
     const events = {
+      meta,
       enter: function(ruleName, state) {
+        if (hits) {
+          hitCount.set(ruleName, (hitCount.get(ruleName) || 0) + 1);
+        }
         if (uncacheable.has(ruleName)) {
           return;
         }
         ;
         const key = [ruleName, state.pos, ...getStateKey()];
         if (stateCache.has(key)) {
+          if (trace) {
+            logs.push("".padStart(stack.length * 2, " ") + ruleName + ":" + state.pos + "\u{1F4B0}");
+          }
           const result = stateCache.get(key);
           return {
             cache: result ? { ...result } : void 0
           };
         }
+        if (trace) {
+          logs.push("".padStart(stack.length * 2, " ") + ruleName + ":" + state.pos + "\u2192");
+          stack.push(ruleName);
+        }
         return;
       },
       exit: function(ruleName, state, result) {
@@ -14055,6 +14170,10 @@ ${input.slice(result.pos)}
         if (parse.config.verbose && result) {
           console.log(`Parsed ${JSON.stringify(state.input.slice(state.pos, result.pos))} [pos ${state.pos}-${result.pos}] as ${ruleName}`);
         }
+        if (trace) {
+          stack.pop();
+          logs.push("".padStart(stack.length * 2, " ") + ruleName + ":" + state.pos + " " + (result ? "\u2705" : "\u274C"));
+        }
         return;
       }
     };

package/dist/civet

@@ -153,6 +153,14 @@ parseArgs = function(args) {
         options.js = true;
         break;
       }
+      case "--hits": {
+        options.hits = args[++i];
+        break;
+      }
+      case "--trace": {
+        options.trace = args[++i];
+        break;
+      }
       case "--": {
         endOfArgs(++i);
         break;

package/dist/config.js

@@ -84,7 +84,7 @@ async function loadConfig(path2) {
     const js = (0, import_main.compile)(config, { js: true });
     let exports;
     try {
-      exports = await import(`data:text/javascript,${js}`);
+      exports = await import(`data:text/javascript,${encodeURIComponent(js)}`);
     } catch (e) {
       console.error("Error loading config file", path2, e);
     }