@danielx/civet 0.10.0 → 0.10.2

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;
 }
@@ -1583,7 +1583,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);
 }
@@ -1692,7 +1692,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 [];
@@ -1787,7 +1787,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];
@@ -2054,12 +2054,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 {
@@ -2376,7 +2376,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));
@@ -2486,7 +2486,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));
@@ -2807,7 +2807,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) {
@@ -4240,7 +4240,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];
@@ -4461,7 +4461,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 = [
   ["||", "??"],
   ["^^"],
@@ -4797,7 +4797,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, " && ")), " || ");
@@ -5316,7 +5316,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;
 }
@@ -5870,7 +5870,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;
@@ -6032,7 +6032,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") {
@@ -6255,7 +6255,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];
@@ -6700,7 +6700,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");
@@ -6846,7 +6846,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);
@@ -7014,7 +7014,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 = [
@@ -9615,6 +9615,7 @@ var grammar = {
   TypeIndexedAccess,
   UnknownAlias,
   TypePrimary,
+  TypeIdentifier,
   ImportType,
   TypeTuple,
   TypeTupleContent,
@@ -11182,7 +11183,7 @@ var ExtendsClause$0 = (0, import_lib2.$S)(ExtendsToken, __, ExtendsTarget);
 function ExtendsClause(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
 }
-var WithClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, With, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, ExtendsTarget, (0, import_lib2.$E)(_), (0, import_lib2.$E)(Comma))), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var WithClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, With, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, Expression, (0, import_lib2.$E)(_), (0, import_lib2.$E)(Comma))), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var targets = $4;
   if (!targets.length) return $skip;
   targets = targets.map(($) => $.slice(0, -1));
@@ -11274,7 +11275,7 @@ var ExtendsTarget$0 = (0, import_lib2.$TV)(LeftHandSideExpressionWithObjectAppli
 function ExtendsTarget(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExtendsTarget", ExtendsTarget$0);
 }
-var ImplementsClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImplementsToken, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, ImplementsTarget, ArrayBulletDelimiter)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImplementsClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImplementsToken, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, TypeIdentifier, ArrayBulletDelimiter)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
   var i = $1;
   var targets = $3;
   if (!targets.length) return $skip;
@@ -18402,7 +18403,7 @@ var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)(
 function Yield(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Yield", Yield$0);
 }
-var JSXImplicitFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(JSXTag, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, JSXTag))), function($skip, $loc, $0, $1, $2) {
+var JSXImplicitFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(JSXTag, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, (0, import_lib2.$C)(JSXTag, JSXAngleChild)))), function($skip, $loc, $0, $1, $2) {
   const jsx = $2.length === 0 ? $1 : {
     type: "JSXFragment",
     children: [
@@ -19856,7 +19857,20 @@ var TypePrimary$7 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     children: $0
   };
 });
-var TypePrimary$8 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
+var TypePrimary$8 = TypeIdentifier;
+var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), OpenParen, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(MaybeNestedType, (0, import_lib2.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  if (!$4) return $skip;
+  return {
+    type: "TypeParenthesized",
+    children: [$1, $2, $4, $6, $7]
+    // omit AllowAll/RestoreAll
+  };
+});
+var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9];
+function TypePrimary(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypePrimary", TypePrimary$$);
+}
+var TypeIdentifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
   return {
     type: "TypeIdentifier",
     children: $0,
@@ -19864,7 +19878,7 @@ var TypePrimary$8 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     args: void 0
   };
 });
-var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Identifier, (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)((0, import_lib2.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Identifier, (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)((0, import_lib2.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var args = $4;
   return {
     type: "TypeIdentifier",
@@ -19873,17 +19887,9 @@ var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     args
   };
 });
-var TypePrimary$10 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), OpenParen, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(MaybeNestedType, (0, import_lib2.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  if (!$4) return $skip;
-  return {
-    type: "TypeParenthesized",
-    children: [$1, $2, $4, $6, $7]
-    // omit AllowAll/RestoreAll
-  };
-});
-var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9, TypePrimary$10];
-function TypePrimary(ctx, state2) {
-  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypePrimary", TypePrimary$$);
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+function TypeIdentifier(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
 var ImportType$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, (0, import_lib2.$E)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)(TypeArguments));
 var ImportType$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'ImportType "import"'), InsertOpenParen, (0, import_lib2.$E)(Trimmed_), StringLiteral, InsertCloseParen);
@@ -21162,7 +21168,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,
@@ -21476,7 +21482,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) {
@@ -21516,7 +21522,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;
@@ -21612,7 +21618,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;
 }
@@ -1564,7 +1564,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);
 }
@@ -1673,7 +1673,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 [];
@@ -1768,7 +1768,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];
@@ -2035,12 +2035,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 {
@@ -2357,7 +2357,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));
@@ -2467,7 +2467,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));
@@ -2788,7 +2788,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) {
@@ -4221,7 +4221,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];
@@ -4442,7 +4442,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 = [
   ["||", "??"],
   ["^^"],
@@ -4778,7 +4778,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, " && ")), " || ");
@@ -5297,7 +5297,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;
 }
@@ -5851,7 +5851,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;
@@ -6013,7 +6013,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") {
@@ -6236,7 +6236,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];
@@ -6681,7 +6681,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");
@@ -6827,7 +6827,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);
@@ -6995,7 +6995,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 = [
@@ -9596,6 +9596,7 @@ var grammar = {
   TypeIndexedAccess,
   UnknownAlias,
   TypePrimary,
+  TypeIdentifier,
   ImportType,
   TypeTuple,
   TypeTupleContent,
@@ -11163,7 +11164,7 @@ var ExtendsClause$0 = (0, import_lib2.$S)(ExtendsToken, __, ExtendsTarget);
 function ExtendsClause(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
 }
-var WithClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, With, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, ExtendsTarget, (0, import_lib2.$E)(_), (0, import_lib2.$E)(Comma))), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var WithClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, With, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, Expression, (0, import_lib2.$E)(_), (0, import_lib2.$E)(Comma))), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var targets = $4;
   if (!targets.length) return $skip;
   targets = targets.map(($) => $.slice(0, -1));
@@ -11255,7 +11256,7 @@ var ExtendsTarget$0 = (0, import_lib2.$TV)(LeftHandSideExpressionWithObjectAppli
 function ExtendsTarget(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExtendsTarget", ExtendsTarget$0);
 }
-var ImplementsClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImplementsToken, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, ImplementsTarget, ArrayBulletDelimiter)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImplementsClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImplementsToken, PushIndent, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, TypeIdentifier, ArrayBulletDelimiter)), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
   var i = $1;
   var targets = $3;
   if (!targets.length) return $skip;
@@ -18383,7 +18384,7 @@ var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)(
 function Yield(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Yield", Yield$0);
 }
-var JSXImplicitFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(JSXTag, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, JSXTag))), function($skip, $loc, $0, $1, $2) {
+var JSXImplicitFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(JSXTag, (0, import_lib2.$Q)((0, import_lib2.$S)(Nested, (0, import_lib2.$C)(JSXTag, JSXAngleChild)))), function($skip, $loc, $0, $1, $2) {
   const jsx = $2.length === 0 ? $1 : {
     type: "JSXFragment",
     children: [
@@ -19837,7 +19838,20 @@ var TypePrimary$7 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     children: $0
   };
 });
-var TypePrimary$8 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
+var TypePrimary$8 = TypeIdentifier;
+var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), OpenParen, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(MaybeNestedType, (0, import_lib2.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  if (!$4) return $skip;
+  return {
+    type: "TypeParenthesized",
+    children: [$1, $2, $4, $6, $7]
+    // omit AllowAll/RestoreAll
+  };
+});
+var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9];
+function TypePrimary(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypePrimary", TypePrimary$$);
+}
+var TypeIdentifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
   return {
     type: "TypeIdentifier",
     children: $0,
@@ -19845,7 +19859,7 @@ var TypePrimary$8 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     args: void 0
   };
 });
-var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Identifier, (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)((0, import_lib2.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Identifier, (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)((0, import_lib2.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var args = $4;
   return {
     type: "TypeIdentifier",
@@ -19854,17 +19868,9 @@ var TypePrimary$9 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)
     args
   };
 });
-var TypePrimary$10 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), OpenParen, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(MaybeNestedType, (0, import_lib2.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  if (!$4) return $skip;
-  return {
-    type: "TypeParenthesized",
-    children: [$1, $2, $4, $6, $7]
-    // omit AllowAll/RestoreAll
-  };
-});
-var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9, TypePrimary$10];
-function TypePrimary(ctx, state2) {
-  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypePrimary", TypePrimary$$);
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+function TypeIdentifier(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
 var ImportType$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, (0, import_lib2.$E)((0, import_lib2.$S)(Dot, IdentifierName)), (0, import_lib2.$E)(TypeArguments));
 var ImportType$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'ImportType "import"'), InsertOpenParen, (0, import_lib2.$E)(Trimmed_), StringLiteral, InsertCloseParen);
@@ -21143,7 +21149,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,
@@ -21457,7 +21463,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) {
@@ -21497,7 +21503,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;
@@ -21599,7 +21605,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.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (options: import("./unplugin.js").PluginOptions) => JsPlugin;
+export default _default;