@danielx/civet 0.7.17 → 0.7.19

package/README.md

@@ -16,13 +16,14 @@ The modern way to write TypeScript.
 - [Civet VSCode Extension](https://marketplace.visualstudio.com/items?itemName=DanielX.civet)
 - [Discord Server](https://discord.gg/xkrW9GebBc)
 - Plugins for
-  [Vite, esbuild, Astro, Rollup, Webpack, Rspack](integration/unplugin)
+  [Vite, esbuild, Astro, Rollup, Webpack, Rspack](source/unplugin),
   <!--
   [esbuild](source/esbuild-plugin.civet),
   [Vite](https://github.com/edemaine/vite-plugin-civet),
   -->
   [ESM/CJS loader](source/esm.civet),
   [Babel](source/babel-plugin.mjs),
+  [Jest](https://github.com/DanielXMoore/Civet/blob/main/integration/jest),
   [Gulp](integration/gulp),
   [Bun](source/bun-civet.civet)
 - Starter templates for [Solid](https://github.com/orenelbaum/solid-civet-template) and [Solid Start](https://github.com/orenelbaum/solid-start-civet-template)

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // ../Hera/dist/machine.js
+  // node_modules/@danielx/hera/dist/machine.js
   var require_machine = __commonJS({
-    "../Hera/dist/machine.js"(exports, module) {
+    "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -66,7 +66,7 @@ var Civet = (() => {
         $EVENT: () => $EVENT2,
         $EVENT_C: () => $EVENT_C2,
         $EXPECT: () => $EXPECT2,
-        $L: () => $L229,
+        $L: () => $L231,
         $N: () => $N2,
         $P: () => $P2,
         $Q: () => $Q2,
@@ -91,7 +91,7 @@ var Civet = (() => {
           return result;
         };
       }
-      function $L229(str) {
+      function $L231(str) {
         return function(_ctx, state2) {
           const { input, pos } = state2, { length } = str, end = pos + length;
           if (input.substring(pos, end) === str) {
@@ -5653,6 +5653,7 @@ ${js}`
             }
           }
         }
+        const refsToDeclare = /* @__PURE__ */ new Set();
         i = len3 - 1;
         while (i >= 0) {
           const lastAssignment = $1[i];
@@ -5686,6 +5687,7 @@ ${js}`
               }
             } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
               processBindingPatternLHS(lhs, tail);
+              gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
             }
           }
           i--;
@@ -5716,6 +5718,17 @@ ${js}`
           }
           i--;
         }
+        if (refsToDeclare.size) {
+          if (exp.hoistDec) {
+            exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+          } else {
+            exp.hoistDec = {
+              type: "Declaration",
+              children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+              names: []
+            };
+          }
+        }
         exp.names = $1.flatMap(([, l]) => l.names || []);
         if (tail.length) {
           const index = exp.children.indexOf($2);
@@ -5852,7 +5865,7 @@ ${js}`
     });
   }
   function processStatementExpressions(statements) {
-    gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+    gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
       const exp = _exp;
       const { statement } = exp;
       let ref11;
@@ -5982,11 +5995,11 @@ ${js}`
   function processPlaceholders(statements) {
     const placeholderMap = /* @__PURE__ */ new Map();
     const liftedIfs = /* @__PURE__ */ new Set();
-    gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+    gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
       const exp = _exp;
       let ancestor;
       if (exp.subtype === ".") {
-        ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+        ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
         ancestor = ancestor?.parent;
         while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
           ancestor = ancestor.parent;
@@ -7271,8 +7284,10 @@ ${js}`
   var $L224 = (0, import_lib3.$L)("asserts");
   var $L225 = (0, import_lib3.$L)("keyof");
   var $L226 = (0, import_lib3.$L)("???");
-  var $L227 = (0, import_lib3.$L)("[]");
-  var $L228 = (0, import_lib3.$L)("civet");
+  var $L227 = (0, import_lib3.$L)("unique");
+  var $L228 = (0, import_lib3.$L)("symbol");
+  var $L229 = (0, import_lib3.$L)("[]");
+  var $L230 = (0, import_lib3.$L)("civet");
   var $R0 = (0, import_lib3.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
   var $R1 = (0, import_lib3.$R)(new RegExp("&(?=\\s)", "suy"));
   var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -9781,10 +9796,10 @@ ${js}`
       block
     };
   });
-  var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3) {
-    var open = $1;
-    var op = $2;
-    var close = $3;
+  var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(ArrowFunction), OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var open = $2;
+    var op = $3;
+    var close = $4;
     if (op.special && op.call && !op.negated)
       return op.call;
     const refA = makeRef("a"), refB = makeRef("b"), body = processBinaryOpExpression([refA, [
@@ -16111,10 +16126,13 @@ ${js}`
   var TypeLiteral$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L208, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
     return { type: "VoidType", $loc, token: $1 };
   });
-  var TypeLiteral$4 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+  var TypeLiteral$4 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "unique"'), _, (0, import_lib3.$EXPECT)($L228, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+    return { type: "UniqueSymbolType", children: $0 };
+  });
+  var TypeLiteral$5 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L229, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "[]" };
   });
-  var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4];
+  var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
   function TypeLiteral(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLiteral", TypeLiteral$$);
   }
@@ -16237,7 +16255,7 @@ ${js}`
   function CivetPrologue(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
   }
-  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L228, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L230, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
     var options = $3;
     return {
       type: "CivetPrologue",

package/dist/civet

@@ -516,10 +516,17 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
     options.config ??= await (0, import_config.findConfig)(process.cwd());
   }
   if (options.config) {
+    const parsed = await (0, import_config.loadConfig)(options.config);
     options = {
-      ...await (0, import_config.loadConfig)(options.config),
+      ...parsed,
       ...options
     };
+    if (parsed.parseOptions && options.parseOptions) {
+      options.parseOptions = {
+        ...parsed.parseOptions,
+        ...options.parseOptions
+      };
+    }
   }
   if (options.typescript) {
     const unpluginOptions = {

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);
 
-// ../Hera/dist/machine.js
+// node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "../Hera/dist/machine.js"(exports2, module2) {
+  "node_modules/@danielx/hera/dist/machine.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -58,7 +58,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L229,
+      $L: () => $L231,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -83,7 +83,7 @@ var require_machine = __commonJS({
         return result;
       };
     }
-    function $L229(str) {
+    function $L231(str) {
       return function(_ctx, state2) {
         const { input, pos } = state2, { length } = str, end = pos + length;
         if (input.substring(pos, end) === str) {
@@ -5631,6 +5631,7 @@ function processAssignments(statements) {
           }
         }
       }
+      const refsToDeclare = /* @__PURE__ */ new Set();
       i = len3 - 1;
       while (i >= 0) {
         const lastAssignment = $1[i];
@@ -5664,6 +5665,7 @@ function processAssignments(statements) {
             }
           } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
             processBindingPatternLHS(lhs, tail);
+            gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
           }
         }
         i--;
@@ -5694,6 +5696,17 @@ function processAssignments(statements) {
         }
         i--;
       }
+      if (refsToDeclare.size) {
+        if (exp.hoistDec) {
+          exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+        } else {
+          exp.hoistDec = {
+            type: "Declaration",
+            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+            names: []
+          };
+        }
+      }
       exp.names = $1.flatMap(([, l]) => l.names || []);
       if (tail.length) {
         const index = exp.children.indexOf($2);
@@ -5830,7 +5843,7 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
     const exp = _exp;
     const { statement } = exp;
     let ref11;
@@ -5960,11 +5973,11 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
       ancestor = ancestor?.parent;
       while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;
@@ -7249,8 +7262,10 @@ var $L223 = (0, import_lib3.$L)("namespace");
 var $L224 = (0, import_lib3.$L)("asserts");
 var $L225 = (0, import_lib3.$L)("keyof");
 var $L226 = (0, import_lib3.$L)("???");
-var $L227 = (0, import_lib3.$L)("[]");
-var $L228 = (0, import_lib3.$L)("civet");
+var $L227 = (0, import_lib3.$L)("unique");
+var $L228 = (0, import_lib3.$L)("symbol");
+var $L229 = (0, import_lib3.$L)("[]");
+var $L230 = (0, import_lib3.$L)("civet");
 var $R0 = (0, import_lib3.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
 var $R1 = (0, import_lib3.$R)(new RegExp("&(?=\\s)", "suy"));
 var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -9759,10 +9774,10 @@ var FunctionExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(FunctionSign
     block
   };
 });
-var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3) {
-  var open = $1;
-  var op = $2;
-  var close = $3;
+var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(ArrowFunction), OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var open = $2;
+  var op = $3;
+  var close = $4;
   if (op.special && op.call && !op.negated)
     return op.call;
   const refA = makeRef("a"), refB = makeRef("b"), body = processBinaryOpExpression([refA, [
@@ -16089,10 +16104,13 @@ var TypeLiteral$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EX
 var TypeLiteral$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L208, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { type: "VoidType", $loc, token: $1 };
 });
-var TypeLiteral$4 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+var TypeLiteral$4 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "unique"'), _, (0, import_lib3.$EXPECT)($L228, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+  return { type: "UniqueSymbolType", children: $0 };
+});
+var TypeLiteral$5 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L229, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "[]" };
 });
-var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4];
+var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
 function TypeLiteral(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLiteral", TypeLiteral$$);
 }
@@ -16215,7 +16233,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 function CivetPrologue(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
 }
-var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L228, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L230, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../Hera/dist/machine.js
+// node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "../Hera/dist/machine.js"(exports, module) {
+  "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -56,7 +56,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L229,
+      $L: () => $L231,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -81,7 +81,7 @@ var require_machine = __commonJS({
         return result;
       };
     }
-    function $L229(str) {
+    function $L231(str) {
       return function(_ctx, state2) {
         const { input, pos } = state2, { length } = str, end = pos + length;
         if (input.substring(pos, end) === str) {
@@ -5611,6 +5611,7 @@ function processAssignments(statements) {
           }
         }
       }
+      const refsToDeclare = /* @__PURE__ */ new Set();
       i = len3 - 1;
       while (i >= 0) {
         const lastAssignment = $1[i];
@@ -5644,6 +5645,7 @@ function processAssignments(statements) {
             }
           } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
             processBindingPatternLHS(lhs, tail);
+            gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
           }
         }
         i--;
@@ -5674,6 +5676,17 @@ function processAssignments(statements) {
         }
         i--;
       }
+      if (refsToDeclare.size) {
+        if (exp.hoistDec) {
+          exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+        } else {
+          exp.hoistDec = {
+            type: "Declaration",
+            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+            names: []
+          };
+        }
+      }
       exp.names = $1.flatMap(([, l]) => l.names || []);
       if (tail.length) {
         const index = exp.children.indexOf($2);
@@ -5810,7 +5823,7 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
     const exp = _exp;
     const { statement } = exp;
     let ref11;
@@ -5940,11 +5953,11 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
       ancestor = ancestor?.parent;
       while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;
@@ -7229,8 +7242,10 @@ var $L223 = (0, import_lib3.$L)("namespace");
 var $L224 = (0, import_lib3.$L)("asserts");
 var $L225 = (0, import_lib3.$L)("keyof");
 var $L226 = (0, import_lib3.$L)("???");
-var $L227 = (0, import_lib3.$L)("[]");
-var $L228 = (0, import_lib3.$L)("civet");
+var $L227 = (0, import_lib3.$L)("unique");
+var $L228 = (0, import_lib3.$L)("symbol");
+var $L229 = (0, import_lib3.$L)("[]");
+var $L230 = (0, import_lib3.$L)("civet");
 var $R0 = (0, import_lib3.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
 var $R1 = (0, import_lib3.$R)(new RegExp("&(?=\\s)", "suy"));
 var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -9739,10 +9754,10 @@ var FunctionExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(FunctionSign
     block
   };
 });
-var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3) {
-  var open = $1;
-  var op = $2;
-  var close = $3;
+var FunctionExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(ArrowFunction), OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var open = $2;
+  var op = $3;
+  var close = $4;
   if (op.special && op.call && !op.negated)
     return op.call;
   const refA = makeRef("a"), refB = makeRef("b"), body = processBinaryOpExpression([refA, [
@@ -16069,10 +16084,13 @@ var TypeLiteral$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EX
 var TypeLiteral$3 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L208, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { type: "VoidType", $loc, token: $1 };
 });
-var TypeLiteral$4 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+var TypeLiteral$4 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L227, 'TypeLiteral "unique"'), _, (0, import_lib3.$EXPECT)($L228, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+  return { type: "UniqueSymbolType", children: $0 };
+});
+var TypeLiteral$5 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L229, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "[]" };
 });
-var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4];
+var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
 function TypeLiteral(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLiteral", TypeLiteral$$);
 }
@@ -16195,7 +16213,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 function CivetPrologue(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
 }
-var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L228, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L230, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R89, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",

package/dist/unplugin/astro.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/astro.civet.jsx
 var astro_civet_exports = {};
 __export(astro_civet_exports, {
   default: () => astro_civet_default

package/dist/unplugin/astro.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
 var astro_civet_default = function(opts = {}) {
   return {

package/dist/unplugin/esbuild.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/esbuild.civet.jsx
 var esbuild_civet_exports = {};
 __export(esbuild_civet_exports, {
   default: () => esbuild_civet_default

package/dist/unplugin/esbuild.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/esbuild.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var esbuild_civet_default = civetUnplugin.esbuild;
 export {

package/dist/unplugin/rollup.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/rollup.civet.jsx
 var rollup_civet_exports = {};
 __export(rollup_civet_exports, {
   default: () => rollup_civet_default

package/dist/unplugin/rollup.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/rollup.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rollup_civet_default = civetUnplugin.rollup;
 export {

package/dist/unplugin/unplugin.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/unplugin.civet.jsx
 var unplugin_civet_exports = {};
 __export(unplugin_civet_exports, {
   default: () => unplugin_civet_default,
@@ -46,7 +46,7 @@ var import_os = __toESM(require("os"));
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -246,7 +246,6 @@ var rawPlugin = (options = {}, meta) => {
           compilerOptions,
           ts
         );
-        host.compilerHost.getDirectories = system.getDirectories;
         const program = ts.createProgram({
           rootNames: useConfigFileNames ? configFileNames : [...fsMap.keys()],
           options: compilerOptions,

package/dist/unplugin/unplugin.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
 import civet, { SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
@@ -14,7 +14,7 @@ import os from "os";
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -214,7 +214,6 @@ var rawPlugin = (options = {}, meta) => {
           compilerOptions,
           ts
         );
-        host.compilerHost.getDirectories = system.getDirectories;
         const program = ts.createProgram({
           rootNames: useConfigFileNames ? configFileNames : [...fsMap.keys()],
           options: compilerOptions,

package/dist/unplugin/vite.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/vite.civet.jsx
 var vite_civet_exports = {};
 __export(vite_civet_exports, {
   default: () => vite_civet_default

package/dist/unplugin/vite.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/vite.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var vite_civet_default = civetUnplugin.vite;
 export {

package/dist/unplugin/webpack.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/webpack.civet.jsx
 var webpack_civet_exports = {};
 __export(webpack_civet_exports, {
   default: () => webpack_civet_default

package/dist/unplugin/webpack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+// unplugin-civet:/home/daniel/apps/civet/source/unplugin/webpack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var webpack_civet_default = civetUnplugin.webpack;
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.7.17",
+  "version": "0.7.19",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -82,12 +82,12 @@
   "license": "MIT",
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
-    "@typescript/vfs": "^1.5.3",
+    "@typescript/vfs": "^1.6.0",
     "unplugin": "^1.6.0"
   },
   "devDependencies": {
     "@danielx/civet": "0.7.16",
-    "@danielx/hera": "^0.8.14",
+    "@danielx/hera": "^0.8.16",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",