@danielx/civet 0.10.4 → 0.10.5

package/CHANGELOG.md

@@ -4,6 +4,11 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.10.5 (2025-06-30, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.4...v0.10.5), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.5))
+* `this` and `@` are valid types (within classes) [[#1743](https://github.com/DanielXMoore/Civet/pull/1743)]
+* Fix CoffeeScript comments getting treated as `length` shorthand [[#1750](https://github.com/DanielXMoore/Civet/pull/1750)]
+* update lsp typescript [[#1753](https://github.com/DanielXMoore/Civet/pull/1753)]
+
 ## 0.10.4 (2025-05-17, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.3...v0.10.4), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.4))
 * Fix implicit returns in IIFEs with "civet -implicitReturns" [[#1737](https://github.com/DanielXMoore/Civet/pull/1737)]
 * Typed pinned arguments such as `(^x: T) =>`; forbid implicit object literals in pinned patterns [[#1736](https://github.com/DanielXMoore/Civet/pull/1736)]

package/dist/babel-plugin.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\babel-plugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/babel-plugin.civet.jsx
 var babel_plugin_civet_exports = {};
 __export(babel_plugin_civet_exports, {
   default: () => babel_plugin_civet_default

package/dist/babel-plugin.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\babel-plugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/babel-plugin.civet.jsx
 import { compile } from "./main.mjs";
 function babel_plugin_civet_default(api, civetOptions) {
   return {

package/dist/browser.js

@@ -400,7 +400,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     }
   });
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\browser.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/browser.civet.jsx
   var browser_civet_exports = {};
   __export(browser_civet_exports, {
     ParseError: () => import_lib2.ParseError,
@@ -422,7 +422,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
   // source/parser.hera
   var import_lib2 = __toESM(require_machine());
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
   var lib_civet_exports = {};
   __export(lib_civet_exports, {
     addPostfixStatement: () => addPostfixStatement,
@@ -502,7 +502,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     wrapTypeInPromise: () => wrapTypeInPromise
   });
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/util.civet.jsx
   function len(arr, length) {
     return arr.length === length;
   }
@@ -1238,7 +1238,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     return result;
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/traversal.civet.jsx
   function gatherRecursiveWithinFunction(node, predicate) {
     return gatherRecursive(node, predicate, isFunction);
   }
@@ -1312,7 +1312,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     return predicate(node) && nodes.push(node), nodes;
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/ref.civet.jsx
   var range = (start, end) => {
     let length = end - start;
     if (length <= 0) return [];
@@ -1388,7 +1388,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/binding.civet.jsx
   function adjustAtBindings(statements, asThis = !1) {
     for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
       let binding = ref1[i1], { ref } = binding;
@@ -1586,12 +1586,12 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     return pattern;
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
   init_browser_shim();
   init_browser_shim();
   init_browser_shim();
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
   var preludeVar = "var ";
   function ts(children) {
     return {
@@ -1927,7 +1927,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/generate.civet.jsx
   function stringify(node) {
     try {
       return JSON.stringify(removeParentPointers(node));
@@ -1995,7 +1995,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
   function expressionizeComptime(statement) {
     let { expressions } = statement.block, expression = wrapIIFE(expressions, hasAwait(expressions));
     return makeNode({
@@ -2229,7 +2229,7 @@ ${js}`
     return recurse(value);
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/function.civet.jsx
   var concatAssign = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
   function getTypeArguments(args) {
     for (; typeof args == "object" && args != null && "args" in args; )
@@ -3258,7 +3258,7 @@ ${js}`
     ).length > 1 && (fn.ampersandBlock = !1), fn;
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/block.civet.jsx
   function blockWithPrefix(prefixStatements, block) {
     if (prefixStatements && prefixStatements.length) {
       let expressions = [...prefixStatements, ...block.expressions];
@@ -3408,7 +3408,7 @@ ${js}`
       };
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
   var precedenceOrder = [
     ["||", "??"],
     ["^^"],
@@ -3602,7 +3602,7 @@ ${js}`
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/pattern-matching.civet.jsx
   function processPatternTest(lhs, patterns) {
     let { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m"), conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
     return makeLeftHandSideExpression(makeNode({
@@ -4006,7 +4006,7 @@ ${js}`
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/declaration.civet.jsx
   function len2(arr, length) {
     return arr.length === length;
   }
@@ -4415,7 +4415,7 @@ ${js}`
     return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/unary.civet.jsx
   function processUnaryExpression(pre, exp, post) {
     if (!(pre.length || post))
       return exp;
@@ -4526,7 +4526,7 @@ ${js}`
     return processUnaryExpression(pre, args, post);
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/pipe.civet.jsx
   function constructInvocation(fn, arg) {
     let expr = fn.expr;
     for (; expr.type === "ParenthesizedExpression"; )
@@ -4687,7 +4687,7 @@ ${js}`
     }
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/for.civet.jsx
   function processRangeExpression(start, ws1, range2, end) {
     ws1 = [ws1, range2.children[0]];
     let ws2 = range2.children[1], comma = { $loc: range2.$loc, token: "," }, ref;
@@ -5010,7 +5010,7 @@ ${js}`
     };
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/auto-dec.civet.jsx
   var concatAssign2 = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
   function findDecs(statements) {
     let declarationNames = gatherNodes(statements, ($) => $.type === "Declaration").flatMap((d) => d.names), globals = getConfig().globals || [];
@@ -5092,7 +5092,7 @@ ${js}`
     scopes.pop();
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/string.civet.jsx
   function getIndentLevel(str, tab) {
     if (tab != null && tab != 1) {
       let tabs = str.match(/\t/g), numTabs = tabs ? tabs.length : 0;
@@ -5202,7 +5202,7 @@ ${js}`
     return JSON.stringify(str);
   }
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
   var xor = (a, b) => a ? !b && a : b;
   function addPostfixStatement(statement, ws, post) {
     let expressions = [
@@ -6646,6 +6646,7 @@ ${js}`
     AccessModifier,
     FieldDefinition,
     ThisLiteral,
+    BasicThisLiteral,
     HashThis,
     LengthShorthand,
     AtThis,
@@ -8475,9 +8476,7 @@ ${js}`
   function FieldDefinition(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
   }
-  var ThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
-    return { type: "Identifier", name: "this", children: [value[0]] };
-  }), ThisLiteral$1 = HashThis, ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+  var ThisLiteral$0 = HashThis, ThisLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
     var at = $1, id = $2;
     return {
       type: "MemberExpression",
@@ -8494,10 +8493,16 @@ ${js}`
       }],
       thisShorthand: !0
     };
-  }), ThisLiteral$3 = AtThis, ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
+  }), ThisLiteral$2 = BasicThisLiteral, ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2];
   function ThisLiteral(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "ThisLiteral", ThisLiteral$$);
   }
+  var BasicThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
+    return { type: "Identifier", name: "this", children: [value[0]] };
+  }), BasicThisLiteral$1 = AtThis, BasicThisLiteral$$ = [BasicThisLiteral$0, BasicThisLiteral$1];
+  function BasicThisLiteral(ctx, state2) {
+    return (0, import_lib2.$EVENT_C)(ctx, state2, "BasicThisLiteral", BasicThisLiteral$$);
+  }
   var HashThis$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(AtThis), LengthShorthand, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$E)((0, import_lib2.$S)(Not, __)), ActualIn)), (0, import_lib2.$EXPECT)($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
     var at = $1, id = $2, beforeIn = $3;
     return beforeIn != null && at == null ? ['"', id.name, '"'] : {
@@ -8528,7 +8533,7 @@ ${js}`
   function HashThis(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "HashThis", HashThis$$);
   }
-  var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeCommentEnabled), Hash, NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
     let id = "length";
     return {
       type: "Identifier",
@@ -15042,7 +15047,13 @@ ${js}`
       raw: [$2.name, ...$3.map(([dot, id]) => dot.token + id.name)].join(""),
       args
     };
-  }), TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+  }), TypeIdentifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BasicThisLiteral), function($skip, $loc, $0, $1, $2) {
+    return {
+      type: "TypeIdentifier",
+      children: $0,
+      raw: $2.name
+    };
+  }), TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1, TypeIdentifier$2];
   function TypeIdentifier(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
   }
@@ -16114,7 +16125,7 @@ ${js}`
     "unscopables"
   ];
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
   var sourcemap_civet_exports = {};
   __export(sourcemap_civet_exports, {
     SourceMap: () => SourceMap,
@@ -16283,7 +16294,7 @@ ${js}`
       return [lastMapping[2], lastMapping[3]];
   };
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
   var StateCache = class {
     cache = /* @__PURE__ */ new Map();
     get(key) {
@@ -16306,7 +16317,7 @@ ${js}`
     }
   };
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
   var { SourceMap: SourceMap2 } = sourcemap_civet_exports;
   var ParseErrors = class extends Error {
     name = "ParseErrors";
@@ -16456,7 +16467,7 @@ ${counts}`;
     return err instanceof import_lib2.ParseError || err instanceof ParseErrors;
   };
 
-  // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\browser.civet.jsx
+  // unplugin-civet:/home/daniel/apps/Civet/source/browser.civet.jsx
   async function runScripts(type = "text/civet") {
     let scripts = window.document.querySelectorAll(`script[type=${JSON.stringify(type)}]`);
     for (let i1 = 0, len3 = scripts.length; i1 < len3; i1++) {

package/dist/civet

@@ -29,7 +29,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\cli.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/cli.civet.jsx
 var cli_civet_exports = {};
 __export(cli_civet_exports, {
   cli: () => cli,

package/dist/config.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\config.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/config.civet.jsx
 var config_civet_exports = {};
 __export(config_civet_exports, {
   default: () => config_civet_default,

package/dist/config.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\config.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/config.civet.jsx
 import path from "path";
 import fs from "fs/promises";
 import { compile } from "./main.mjs";

package/dist/esbuild-plugin.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\esbuild-plugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/esbuild-plugin.civet.jsx
 var esbuild_plugin_civet_exports = {};
 __export(esbuild_plugin_civet_exports, {
   default: () => esbuild_plugin_civet_default

package/dist/esm.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\esm.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/esm.civet.jsx
 import { readFile } from "fs/promises";
 import { dirname } from "path";
 import { pathToFileURL, fileURLToPath } from "url";

package/dist/main.js

@@ -483,7 +483,7 @@ ${body}`;
   }
 });
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
 var main_civet_exports = {};
 __export(main_civet_exports, {
   ParseError: () => import_lib2.ParseError,
@@ -504,7 +504,7 @@ module.exports = __toCommonJS(main_civet_exports);
 // source/parser.hera
 var import_lib2 = __toESM(require_machine());
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
 var lib_civet_exports = {};
 __export(lib_civet_exports, {
   addPostfixStatement: () => addPostfixStatement,
@@ -584,7 +584,7 @@ __export(lib_civet_exports, {
   wrapTypeInPromise: () => wrapTypeInPromise
 });
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/util.civet.jsx
 function len(arr, length) {
   return arr.length === length;
 }
@@ -1585,7 +1585,7 @@ function flatJoin(array, separator) {
   return result;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/traversal.civet.jsx
 function gatherRecursiveWithinFunction(node, predicate) {
   return gatherRecursive(node, predicate, isFunction);
 }
@@ -1694,7 +1694,7 @@ function gatherRecursiveAll(node, predicate) {
   return nodes;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/ref.civet.jsx
 var range = (start, end) => {
   const length = end - start;
   if (length <= 0) return [];
@@ -1789,7 +1789,7 @@ function populateRefs(statements) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/binding.civet.jsx
 function adjustAtBindings(statements, asThis = false) {
   for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
     const binding = ref1[i1];
@@ -2056,12 +2056,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
   return pattern;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
 var import_node_path = require("node:path");
 var import_node_module = require("node:module");
 var import_node_vm = __toESM(require("node:vm"));
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
 var preludeVar = "var ";
 function ts(children) {
   return {
@@ -2378,7 +2378,7 @@ function extractPreludeFor(node) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/generate.civet.jsx
 function stringify(node) {
   try {
     return JSON.stringify(removeParentPointers(node));
@@ -2488,7 +2488,7 @@ function prune(node) {
   return node;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
 function expressionizeComptime(statement) {
   const { expressions } = statement.block;
   const expression = wrapIIFE(expressions, hasAwait(expressions));
@@ -2809,7 +2809,7 @@ function serialize(value, context) {
   return recurse(value);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/function.civet.jsx
 var concatAssign = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function getTypeArguments(args) {
   while (typeof args === "object" && args != null && "args" in args) {
@@ -4242,7 +4242,7 @@ function makeAmpersandFunction(rhs) {
   return fn;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/block.civet.jsx
 function blockWithPrefix(prefixStatements, block) {
   if (prefixStatements && prefixStatements.length) {
     const expressions = [...prefixStatements, ...block.expressions];
@@ -4463,7 +4463,7 @@ function blockContainingStatement(exp) {
   };
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
 var precedenceOrder = [
   ["||", "??"],
   ["^^"],
@@ -4799,7 +4799,7 @@ function expandChainedComparisons([first, binops]) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/pattern-matching.civet.jsx
 function processPatternTest(lhs, patterns) {
   const { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m");
   const conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
@@ -5318,7 +5318,7 @@ function aliasBinding(p, ref) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/declaration.civet.jsx
 function len2(arr, length) {
   return arr.length === length;
 }
@@ -5872,7 +5872,7 @@ function convertWithClause(withClause, extendsClause) {
   return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/unary.civet.jsx
 function processUnaryExpression(pre, exp, post) {
   if (!(pre.length || post)) {
     return exp;
@@ -6034,7 +6034,7 @@ function processUnaryNestedExpression(pre, args, post) {
   return processUnaryExpression(pre, args, post);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/pipe.civet.jsx
 function constructInvocation(fn, arg) {
   let expr = fn.expr;
   while (expr.type === "ParenthesizedExpression") {
@@ -6257,7 +6257,7 @@ function processPipelineExpressions(statements) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/for.civet.jsx
 function processRangeExpression(start, ws1, range2, end) {
   ws1 = [ws1, range2.children[0]];
   const ws2 = range2.children[1];
@@ -6702,7 +6702,7 @@ function processForInOf($0) {
   };
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/auto-dec.civet.jsx
 var concatAssign2 = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function findDecs(statements) {
   const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
@@ -6848,7 +6848,7 @@ function createVarDecs(block, scopes, pushVar) {
   scopes.pop();
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/string.civet.jsx
 function getIndentLevel(str, tab) {
   if (tab != null && tab != 1) {
     const tabs = str.match(/\t/g);
@@ -7016,7 +7016,7 @@ function quoteString(str) {
   return JSON.stringify(str);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
 var xor = (a, b) => a ? !b && a : b;
 function addPostfixStatement(statement, ws, post) {
   const expressions = [
@@ -9011,6 +9011,7 @@ var grammar = {
   AccessModifier,
   FieldDefinition,
   ThisLiteral,
+  BasicThisLiteral,
   HashThis,
   LengthShorthand,
   AtThis,
@@ -11548,11 +11549,8 @@ var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2
 function FieldDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
 }
-var ThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
-  return { "type": "Identifier", "name": "this", "children": [value[0]] };
-});
-var ThisLiteral$1 = HashThis;
-var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+var ThisLiteral$0 = HashThis;
+var ThisLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
   var at = $1;
   var id = $2;
   return {
@@ -11571,11 +11569,19 @@ var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_
     thisShorthand: true
   };
 });
-var ThisLiteral$3 = AtThis;
-var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
+var ThisLiteral$2 = BasicThisLiteral;
+var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2];
 function ThisLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ThisLiteral", ThisLiteral$$);
 }
+var BasicThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
+  return { "type": "Identifier", "name": "this", "children": [value[0]] };
+});
+var BasicThisLiteral$1 = AtThis;
+var BasicThisLiteral$$ = [BasicThisLiteral$0, BasicThisLiteral$1];
+function BasicThisLiteral(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "BasicThisLiteral", BasicThisLiteral$$);
+}
 var HashThis$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(AtThis), LengthShorthand, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$E)((0, import_lib2.$S)(Not, __)), ActualIn)), (0, import_lib2.$EXPECT)($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
   var at = $1;
   var id = $2;
@@ -11612,7 +11618,7 @@ var HashThis$$ = [HashThis$0, HashThis$1, HashThis$2];
 function HashThis(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HashThis", HashThis$$);
 }
-var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeCommentEnabled), Hash, NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   const id = "length";
   return {
     type: "Identifier",
@@ -19904,7 +19910,14 @@ var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     args
   };
 });
-var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+var TypeIdentifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BasicThisLiteral), function($skip, $loc, $0, $1, $2) {
+  return {
+    type: "TypeIdentifier",
+    children: $0,
+    raw: $2.name
+  };
+});
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1, TypeIdentifier$2];
 function TypeIdentifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
@@ -21185,7 +21198,7 @@ var wellKnownSymbols = [
   "unscopables"
 ];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
 var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
@@ -21499,7 +21512,7 @@ var remapPosition = function(position, sourcemapLines) {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
 var StateCache = class {
   cache = /* @__PURE__ */ new Map();
   get(key) {
@@ -21539,7 +21552,7 @@ var StateCache = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\worker-pool.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/worker-pool.civet.jsx
 var WorkerPool = class {
   idle;
   spawned;
@@ -21635,7 +21648,7 @@ var WorkerPool = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
 var { SourceMap: SourceMap2 } = sourcemap_civet_exports;
 var ParseErrors = class extends Error {
   name = "ParseErrors";

package/dist/main.mjs

@@ -485,7 +485,7 @@ ${body}`;
 // source/parser.hera
 var import_lib2 = __toESM(require_machine());
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
 var lib_civet_exports = {};
 __export(lib_civet_exports, {
   addPostfixStatement: () => addPostfixStatement,
@@ -565,7 +565,7 @@ __export(lib_civet_exports, {
   wrapTypeInPromise: () => wrapTypeInPromise
 });
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/util.civet.jsx
 function len(arr, length) {
   return arr.length === length;
 }
@@ -1566,7 +1566,7 @@ function flatJoin(array, separator) {
   return result;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/traversal.civet.jsx
 function gatherRecursiveWithinFunction(node, predicate) {
   return gatherRecursive(node, predicate, isFunction);
 }
@@ -1675,7 +1675,7 @@ function gatherRecursiveAll(node, predicate) {
   return nodes;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/ref.civet.jsx
 var range = (start, end) => {
   const length = end - start;
   if (length <= 0) return [];
@@ -1770,7 +1770,7 @@ function populateRefs(statements) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/binding.civet.jsx
 function adjustAtBindings(statements, asThis = false) {
   for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
     const binding = ref1[i1];
@@ -2037,12 +2037,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
   return pattern;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
 import { resolve, dirname } from "node:path";
 import { createRequire } from "node:module";
 import vm from "node:vm";
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
 var preludeVar = "var ";
 function ts(children) {
   return {
@@ -2359,7 +2359,7 @@ function extractPreludeFor(node) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/generate.civet.jsx
 function stringify(node) {
   try {
     return JSON.stringify(removeParentPointers(node));
@@ -2469,7 +2469,7 @@ function prune(node) {
   return node;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
 function expressionizeComptime(statement) {
   const { expressions } = statement.block;
   const expression = wrapIIFE(expressions, hasAwait(expressions));
@@ -2790,7 +2790,7 @@ function serialize(value, context) {
   return recurse(value);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/function.civet.jsx
 var concatAssign = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function getTypeArguments(args) {
   while (typeof args === "object" && args != null && "args" in args) {
@@ -4223,7 +4223,7 @@ function makeAmpersandFunction(rhs) {
   return fn;
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/block.civet.jsx
 function blockWithPrefix(prefixStatements, block) {
   if (prefixStatements && prefixStatements.length) {
     const expressions = [...prefixStatements, ...block.expressions];
@@ -4444,7 +4444,7 @@ function blockContainingStatement(exp) {
   };
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
 var precedenceOrder = [
   ["||", "??"],
   ["^^"],
@@ -4780,7 +4780,7 @@ function expandChainedComparisons([first, binops]) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/pattern-matching.civet.jsx
 function processPatternTest(lhs, patterns) {
   const { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m");
   const conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
@@ -5299,7 +5299,7 @@ function aliasBinding(p, ref) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/declaration.civet.jsx
 function len2(arr, length) {
   return arr.length === length;
 }
@@ -5853,7 +5853,7 @@ function convertWithClause(withClause, extendsClause) {
   return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/unary.civet.jsx
 function processUnaryExpression(pre, exp, post) {
   if (!(pre.length || post)) {
     return exp;
@@ -6015,7 +6015,7 @@ function processUnaryNestedExpression(pre, args, post) {
   return processUnaryExpression(pre, args, post);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/pipe.civet.jsx
 function constructInvocation(fn, arg) {
   let expr = fn.expr;
   while (expr.type === "ParenthesizedExpression") {
@@ -6238,7 +6238,7 @@ function processPipelineExpressions(statements) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/for.civet.jsx
 function processRangeExpression(start, ws1, range2, end) {
   ws1 = [ws1, range2.children[0]];
   const ws2 = range2.children[1];
@@ -6683,7 +6683,7 @@ function processForInOf($0) {
   };
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/auto-dec.civet.jsx
 var concatAssign2 = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function findDecs(statements) {
   const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
@@ -6829,7 +6829,7 @@ function createVarDecs(block, scopes, pushVar) {
   scopes.pop();
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/string.civet.jsx
 function getIndentLevel(str, tab) {
   if (tab != null && tab != 1) {
     const tabs = str.match(/\t/g);
@@ -6997,7 +6997,7 @@ function quoteString(str) {
   return JSON.stringify(str);
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
 var xor = (a, b) => a ? !b && a : b;
 function addPostfixStatement(statement, ws, post) {
   const expressions = [
@@ -8992,6 +8992,7 @@ var grammar = {
   AccessModifier,
   FieldDefinition,
   ThisLiteral,
+  BasicThisLiteral,
   HashThis,
   LengthShorthand,
   AtThis,
@@ -11529,11 +11530,8 @@ var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2
 function FieldDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
 }
-var ThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
-  return { "type": "Identifier", "name": "this", "children": [value[0]] };
-});
-var ThisLiteral$1 = HashThis;
-var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+var ThisLiteral$0 = HashThis;
+var ThisLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
   var at = $1;
   var id = $2;
   return {
@@ -11552,11 +11550,19 @@ var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_
     thisShorthand: true
   };
 });
-var ThisLiteral$3 = AtThis;
-var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
+var ThisLiteral$2 = BasicThisLiteral;
+var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2];
 function ThisLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ThisLiteral", ThisLiteral$$);
 }
+var BasicThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
+  return { "type": "Identifier", "name": "this", "children": [value[0]] };
+});
+var BasicThisLiteral$1 = AtThis;
+var BasicThisLiteral$$ = [BasicThisLiteral$0, BasicThisLiteral$1];
+function BasicThisLiteral(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "BasicThisLiteral", BasicThisLiteral$$);
+}
 var HashThis$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(AtThis), LengthShorthand, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$E)((0, import_lib2.$S)(Not, __)), ActualIn)), (0, import_lib2.$EXPECT)($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
   var at = $1;
   var id = $2;
@@ -11593,7 +11599,7 @@ var HashThis$$ = [HashThis$0, HashThis$1, HashThis$2];
 function HashThis(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HashThis", HashThis$$);
 }
-var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeCommentEnabled), Hash, NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   const id = "length";
   return {
     type: "Identifier",
@@ -19885,7 +19891,14 @@ var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     args
   };
 });
-var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+var TypeIdentifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BasicThisLiteral), function($skip, $loc, $0, $1, $2) {
+  return {
+    type: "TypeIdentifier",
+    children: $0,
+    raw: $2.name
+  };
+});
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1, TypeIdentifier$2];
 function TypeIdentifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
@@ -21166,7 +21179,7 @@ var wellKnownSymbols = [
   "unscopables"
 ];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
 var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
@@ -21480,7 +21493,7 @@ var remapPosition = function(position, sourcemapLines) {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
 var StateCache = class {
   cache = /* @__PURE__ */ new Map();
   get(key) {
@@ -21520,7 +21533,7 @@ var StateCache = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\worker-pool.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/worker-pool.civet.jsx
 var WorkerPool = class {
   idle;
   spawned;
@@ -21622,7 +21635,7 @@ var WorkerPool = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
 var { SourceMap: SourceMap2 } = sourcemap_civet_exports;
 var ParseErrors = class extends Error {
   name = "ParseErrors";

package/dist/node-worker.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\node-worker.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/node-worker.civet.jsx
 import { parentPort } from "node:worker_threads";
 import module from "node:module";
 try {

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/farm.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\farm.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/farm.civet.jsx
 var farm_civet_exports = {};
 __export(farm_civet_exports, {
   default: () => farm_civet_default

package/dist/unplugin/farm.mjs

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

package/dist/unplugin/rolldown.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\rolldown.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
 var rolldown_civet_exports = {};
 __export(rolldown_civet_exports, {
   default: () => rolldown_civet_default

package/dist/unplugin/rolldown.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rolldown_civet_default = civetUnplugin.rolldown;
 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/rspack.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\rspack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
 var rspack_civet_exports = {};
 __export(rspack_civet_exports, {
   default: () => rspack_civet_default

package/dist/unplugin/rspack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rspack_civet_default = civetUnplugin.rspack;
 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";

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, { lib, 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";

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.10.4",
+  "version": "0.10.5",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",