@danielx/civet 0.6.38 → 0.6.39

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) => {
@@ -7119,7 +7126,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 +8680,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,
@@ -13991,15 +13998,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 +14069,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 +14125,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);
     }

package/dist/main.js

@@ -7118,7 +7118,7 @@ var require_parser = __commonJS({
         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;
@@ -8672,7 +8672,7 @@ var require_parser = __commonJS({
         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,
@@ -13991,15 +13991,55 @@ function compile(src, options) {
   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 +14062,45 @@ function compile(src, options) {
   }
   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 +14118,10 @@ function makeCache() {
       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/main.mjs

@@ -7116,7 +7116,7 @@ var require_parser = __commonJS({
         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;
@@ -8670,7 +8670,7 @@ var require_parser = __commonJS({
         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,
@@ -13978,15 +13978,55 @@ function compile(src, options) {
   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;
   }
@@ -14009,22 +14049,45 @@ function compile(src, options) {
   }
   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) {
@@ -14042,6 +14105,10 @@ function makeCache() {
       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/ts-diagnostic.js

@@ -35,10 +35,13 @@ __export(ts_diagnostic_exports, {
   remapRange: () => remapRange
 });
 module.exports = __toCommonJS(ts_diagnostic_exports);
-var import_typescript = __toESM(require("typescript"));
 var import_vscode_languageserver = __toESM(require("vscode-languageserver"));
 var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
-const { DiagnosticCategory } = import_typescript.default;
+let DiagnosticCategory = {};
+DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
+DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
+DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
+DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
 function remapPosition(position, sourcemapLines) {
   if (!sourcemapLines)
     return position;

package/dist/ts-diagnostic.mjs

@@ -1,7 +1,10 @@
-import ts from "typescript";
+let DiagnosticCategory = {};
+DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
+DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
+DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
+DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
 import vs, { DiagnosticSeverity, Position, Range } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-const { DiagnosticCategory } = ts;
 function remapPosition(position, sourcemapLines) {
   if (!sourcemapLines)
     return position;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.38",
+  "version": "0.6.39",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -70,7 +70,7 @@
     "unplugin": "^1.4.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.6.34",
+    "@danielx/civet": "0.6.38",
     "@danielx/hera": "^0.8.10",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",