@danielx/civet 0.6.37 → 0.6.39

package/dist/main.mjs

@@ -890,6 +890,28 @@ var require_lib = __commonJS({
       }
       return expandedOps;
     }
+    function handleThisPrivateShorthands(value) {
+      if (value.privateShorthand) {
+        value = value.children[1].children[1];
+        return [value, false];
+      }
+      if (value.type === "MemberExpression" || value.type === "CallExpression") {
+        let suppressPrefix = value.thisShorthand;
+        value = {
+          ...value,
+          children: value.children.map((c, i) => {
+            if (i === 0) {
+              let s;
+              [c, s] = handleThisPrivateShorthands(c);
+              suppressPrefix || (suppressPrefix = s);
+            }
+            return c;
+          })
+        };
+        return [value, suppressPrefix];
+      }
+      return [value, value.thisShorthand];
+    }
     function processCallMemberExpression(node) {
       const { children } = node;
       for (let i = 0; i < children.length; i++) {
@@ -917,11 +939,15 @@ var require_lib = __commonJS({
               throw new Error("Glob pattern cannot have method definition");
             }
             if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
-              throw new Error("Glob pattern must have call or member expression value");
+              throw new Error(`Glob pattern must have call or member expression value, found ${JSON.stringify(part.value)}`);
             }
+            let suppressPrefix = false;
             let value = part.value ?? part.name;
             const wValue = getTrimmingSpace(part.value);
-            value = prefix.concat(insertTrimmingSpace(value, ""));
+            [value, suppressPrefix] = handleThisPrivateShorthands(value);
+            if (!suppressPrefix) {
+              value = prefix.concat(insertTrimmingSpace(value, ""));
+            }
             if (wValue)
               value.unshift(wValue);
             if (part.type === "SpreadProperty") {
@@ -1135,14 +1161,14 @@ var require_lib = __commonJS({
           chains.push(i);
         } else if (lowerPrecedenceOps.includes(op.token)) {
           processChains(op);
-          first = [];
+          first = void 0;
         }
         i++;
       }
       processChains(op);
       return results;
       function processChains(op2) {
-        if (isRelationalOp(op2)) {
+        if (first && isRelationalOp(op2)) {
           first = expandExistence(first);
         }
         if (chains.length > 1) {
@@ -1151,7 +1177,7 @@ var require_lib = __commonJS({
               results.push(" ", "&&", " ");
             }
             const binop = binops[index];
-            let [pre, op3, post, exp] = binop;
+            let [, , , exp] = binop;
             exp = binop[3] = expandExistence(exp);
             let endIndex;
             if (k < chains.length - 1) {
@@ -1164,10 +1190,13 @@ var require_lib = __commonJS({
             return start = endIndex;
           });
         } else {
-          results.push(first, ...binops.slice(start, i + 1).flat());
+          if (first) {
+            results.push(first);
+          }
+          results.push(...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
-        return chains.length = 0;
+        chains.length = 0;
       }
       function expandExistence(exp) {
         const existence = isExistence(exp);
@@ -1249,6 +1278,23 @@ var require_lib = __commonJS({
         }
       }
     }
+    function replaceBlockExpression(node, child, replacement) {
+      let found = false;
+      const { expressions } = node;
+      for (let i = 0, l = expressions.length; i < l; i++) {
+        const statement = expressions[i];
+        const [, s] = statement;
+        if (s === child) {
+          statement[1] = replacement;
+          replacement.parent = node;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        throw new Error("Could not find child to replace");
+      }
+    }
     function findChildIndex(parent, child) {
       const children = Array.isArray(parent) ? parent : parent.children;
       const len = children.length;
@@ -2135,12 +2181,12 @@ var require_lib = __commonJS({
     }
     function processDeclarationConditions(node) {
       gatherRecursiveAll(node, (n) => {
-        return n.type === "IfStatement" || n.type === "IterationStatement";
+        return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
       }).forEach(processDeclarationConditionStatement);
     }
     function processDeclarationConditionStatement(s) {
       const { condition } = s;
-      if (!condition) {
+      if (!condition?.expression) {
         return;
       }
       processDeclarationCondition(condition.expression);
@@ -2181,6 +2227,27 @@ var require_lib = __commonJS({
           updateParentPointers(newBlock, s);
           break;
         }
+        case "SwitchStatement": {
+          const { blockPrefix, ref: ref2 } = condition.expression;
+          if (!blockPrefix) {
+            return;
+          }
+          s.condition = {
+            type: "ParenthesizedExpression",
+            children: ["(", ref2, ")"],
+            expression: ref2,
+            parent: s
+          };
+          s.children[1] = s.condition;
+          const block = blockWithPrefix([["", [{
+            type: "Declaration",
+            children: ["let ", ...condition.expression.children]
+          }], ";"], ...blockPrefix], makeEmptyBlock());
+          replaceBlockExpression(s.parent, s, block);
+          block.expressions.push(["", s]);
+          s.parent = block;
+          break;
+        }
       }
     }
     function implicitFunctionBlock(f) {
@@ -2629,12 +2696,12 @@ var require_lib = __commonJS({
         }
         if (errors || !isPattern)
           return;
-        let { expression } = s;
-        if (expression.type === "ParenthesizedExpression") {
-          expression = expression.expression;
+        let { condition } = s;
+        if (condition.type === "ParenthesizedExpression") {
+          condition = condition.expression;
         }
-        let hoistDec, refAssignment = [], ref = maybeRef(expression, "m");
-        if (ref !== expression) {
+        let hoistDec, refAssignment = [], ref = maybeRef(condition, "m");
+        if (ref !== condition) {
           hoistDec = {
             type: "Declaration",
             children: ["let ", ref],
@@ -2642,7 +2709,7 @@ var require_lib = __commonJS({
           };
           refAssignment = [{
             type: "AssignmentExpression",
-            children: [ref, " = ", expression]
+            children: [ref, " = ", condition]
           }, ","];
         }
         let prev = [], root = prev;
@@ -2670,7 +2737,7 @@ var require_lib = __commonJS({
               return conditionArray;
             return [" || ", ...conditionArray];
           });
-          const condition = {
+          const condition2 = {
             type: "ParenthesizedExpression",
             children: ["(", ...refAssignment, conditionExpression, ")"],
             expression: conditionExpression
@@ -2705,7 +2772,7 @@ var require_lib = __commonJS({
             next.push("\n", "else ");
           prev.push(["", {
             type: "IfStatement",
-            children: ["if", condition, block, next],
+            children: ["if", condition2, block, next],
             then: block,
             else: next,
             hoistDec
@@ -5358,7 +5425,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id,
           children: [".", id]
-        }]
+        }],
+        thisShorthand: true
       };
     });
     var ThisLiteral$2 = AtThis;
@@ -5379,7 +5447,8 @@ var require_parser = __commonJS({
           type: "PropertyAccess",
           name: id.name,
           children: [".", id]
-        }]
+        }],
+        privateShorthand: true
       };
     });
     var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
@@ -7047,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;
@@ -7231,20 +7300,7 @@ var require_parser = __commonJS({
     function ObjectPropertyDelimiter(ctx, state) {
       return $EVENT_C(ctx, state, "ObjectPropertyDelimiter", ObjectPropertyDelimiter$$);
     }
-    var PropertyDefinition$0 = $TS($S($E(_), AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $1;
-      var at = $2;
-      var id = $3;
-      const value = [at, ".", id];
-      return {
-        type: "Property",
-        children: [ws, id, ": ", ...value],
-        name: id,
-        names: id.names,
-        value
-      };
-    });
-    var PropertyDefinition$1 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$0 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var prop = $2;
       return {
@@ -7252,7 +7308,7 @@ var require_parser = __commonJS({
         children: [ws, ...prop.children]
       };
     });
-    var PropertyDefinition$2 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R6, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var toggle = $2;
       var id = $3;
@@ -7265,7 +7321,7 @@ var require_parser = __commonJS({
         value
       };
     });
-    var PropertyDefinition$3 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
       if (!def.block || def.block.empty)
@@ -7275,7 +7331,7 @@ var require_parser = __commonJS({
         children: [ws, ...def.children]
       };
     });
-    var PropertyDefinition$4 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$3 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var exp = $3;
@@ -7287,7 +7343,7 @@ var require_parser = __commonJS({
         value: exp
       };
     });
-    var PropertyDefinition$5 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$4 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var value = $3;
       switch (value.type) {
@@ -7346,16 +7402,18 @@ var require_parser = __commonJS({
         if (!name)
           return $skip;
       }
+      if (name[0] === "#")
+        name = name.slice(1);
       return {
         type: "Property",
         children: [ws, name, ": ", value],
         name,
-        value,
         names: [],
+        value,
         hoistDec
       };
     });
-    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4, PropertyDefinition$5];
+    var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4];
     function PropertyDefinition(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyDefinition", PropertyDefinition$$);
     }
@@ -8612,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,
@@ -8719,7 +8777,7 @@ var require_parser = __commonJS({
       return {
         type: "SwitchStatement",
         children: $0,
-        expression: condition,
+        condition,
         caseBlock
       };
     });
@@ -13573,7 +13631,10 @@ var SourceMap = function(sourceString) {
         sources: [srcFileName],
         mappings: this.renderMappings(),
         names: [],
-        sourcesContent: [sourceString]
+        sourcesContent: [sourceString],
+        toString: function() {
+          return JSON.stringify(this);
+        }
       };
     },
     updateSourceMap: function(outputStr, inputPos) {
@@ -13917,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;
   }
@@ -13948,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) {
@@ -13981,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;
     }
   };
@@ -13997,5 +14125,6 @@ export {
   generate_default as generate,
   isCompileError,
   parse,
+  prune,
   util_exports as util
 };

package/dist/rollup.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(rollup_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
@@ -52,15 +53,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
   }
-  const transpileToJS = options.js ?? !options.dts;
+  if (options.typecheck && options.js) {
+    throw new Error("Can't have both `typecheck` and `js` be set to `true`.");
+  }
+  const transpileToJS = options.js ?? !(options.dts || options.typecheck);
   const outExt = options.outputExtension ?? (transpileToJS ? ".jsx" : ".tsx");
   let fsMap = /* @__PURE__ */ new Map();
+  const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
   return {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const configPath = import_typescript.default.findConfigFile(process.cwd(), import_typescript.default.sys.fileExists);
         if (!configPath) {
           throw new Error("Could not find 'tsconfig.json'");
@@ -86,7 +91,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       }
     },
     buildEnd() {
-      if (options.dts) {
+      if (options.dts || options.typecheck) {
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), import_typescript.default);
         const host = tsvfs.createVirtualCompilerHost(
           system,
@@ -98,20 +103,55 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           options: compilerOptions,
           host: host.compilerHost
         });
-        for (const file of fsMap.keys()) {
-          const sourceFile = program.getSourceFile(file);
-          program.emit(
-            sourceFile,
-            (filePath, content) => {
-              this.emitFile({
-                source: content,
-                fileName: import_path.default.relative(process.cwd(), filePath),
-                type: "asset"
-              });
+        const diagnostics = import_typescript.default.getPreEmitDiagnostics(program).map((diagnostic) => {
+          const file = diagnostic.file;
+          if (!file)
+            return diagnostic;
+          const sourceMap = sourceMaps.get(file.fileName);
+          if (!sourceMap)
+            return diagnostic;
+          const sourcemapLines = sourceMap.data.lines;
+          const range = (0, import_ts_diagnostic.remapRange)(
+            {
+              start: diagnostic.start || 0,
+              end: (diagnostic.start || 0) + (diagnostic.length || 1)
             },
-            void 0,
-            true
+            sourcemapLines
           );
+          return {
+            ...diagnostic,
+            messageText: (0, import_ts_diagnostic.flattenDiagnosticMessageText)(diagnostic.messageText),
+            length: diagnostic.length,
+            start: range.start
+          };
+        });
+        if (diagnostics.length > 0) {
+          console.error(
+            import_typescript.default.formatDiagnosticsWithColorAndContext(diagnostics, formatHost)
+          );
+        }
+        if (options.dts) {
+          for (const file of fsMap.keys()) {
+            const sourceFile = program.getSourceFile(file);
+            program.emit(
+              sourceFile,
+              async (filePath, content) => {
+                const dir = import_path.default.dirname(filePath);
+                await fs.promises.mkdir(dir, { recursive: true });
+                const pathFromDistDir = import_path.default.relative(
+                  compilerOptions.outDir ?? process.cwd(),
+                  filePath
+                );
+                this.emitFile({
+                  source: content,
+                  fileName: pathFromDistDir,
+                  type: "asset"
+                });
+              },
+              void 0,
+              true
+            );
+          }
         }
       }
     },
@@ -135,13 +175,20 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const code = await fs.promises.readFile(filename, "utf-8");
+      const compiled = import_civet.default.compile(code, {
+        // inlineMap: true,
+        filename: id,
+        js: transpileToJS,
+        sourceMap: true
+      });
+      sourceMaps.set(import_path.default.resolve(process.cwd(), id), compiled.sourceMap);
+      const jsonSourceMap = compiled.sourceMap.json(
+        import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
+        import_path.default.basename(id)
+      );
       let transformed = {
-        code: import_civet.default.compile(code, {
-          inlineMap: true,
-          filename: id,
-          js: transpileToJS
-        }),
-        map: null
+        code: compiled.code,
+        map: jsonSourceMap
       };
       if (options.transformOutput)
         transformed = await options.transformOutput(transformed.code, id);
@@ -150,8 +197,12 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     transform(code, id) {
       if (!/\.civet\.tsx?$/.test(id))
         return null;
-      if (options.dts) {
-        fsMap.set(import_path.default.resolve(process.cwd(), id), code);
+      if (options.dts || options.typecheck) {
+        const resolved = import_path.default.resolve(process.cwd(), id);
+        fsMap.set(resolved, code);
+        const slash = resolved.replace(/\\/g, "/");
+        if (resolved !== slash)
+          fsMap.set(slash, code);
       }
       return null;
     },