@danielx/civet 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.1 (2025-03-22, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.0...v0.10.1), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.1))
+* More general expressions in indented forms of `implements` and `with` [[#1720](https://github.com/DanielXMoore/Civet/pull/1720)]
+* Allow `>code` to continue an implicit JSX fragment [[#1721](https://github.com/DanielXMoore/Civet/pull/1721)]
+* Fix hot reload via unplugin in NextJS, fix sourcemaps with `ts: "preserve"` [[#1722](https://github.com/DanielXMoore/Civet/pull/1722)]
+* Farm and Rolldown bundler support [[#1723](https://github.com/DanielXMoore/Civet/pull/1723)]
+
 ## 0.10.0 (2025-03-17, [diff](https://github.com/DanielXMoore/Civet/compare/v0.9.7...v0.10.0), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.0))
 * Document `class with A, B` mixins [[#1703](https://github.com/DanielXMoore/Civet/pull/1703)]
 * Document how to use VSCode plugin [[#1704](https://github.com/DanielXMoore/Civet/pull/1704)]

package/README.md

@@ -17,7 +17,7 @@ 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](source/unplugin),
+  [Vite, esbuild, Astro, Farm, Rolldown, Rollup, Webpack](source/unplugin),
   <!--
   [esbuild](source/esbuild-plugin.civet),
   [Vite](https://github.com/edemaine/vite-plugin-civet),

package/dist/browser.js

@@ -7250,6 +7250,7 @@ ${js}`
     TypeIndexedAccess,
     UnknownAlias,
     TypePrimary,
+    TypeIdentifier,
     ImportType,
     TypeTuple,
     TypeTupleContent,
@@ -8196,7 +8197,7 @@ ${js}`
   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;
     return targets.length ? (targets = targets.map(($) => $.slice(0, -1)), {
       type: "WithClause",
@@ -8270,7 +8271,7 @@ ${js}`
   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, targets = $3;
     if (!targets.length) return $skip;
     let last = targets.at(-1).slice(0, -1);
@@ -13903,7 +13904,7 @@ ${js}`
   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) {
     let jsx = $2.length === 0 ? $1 : {
       type: "JSXFragment",
       children: [
@@ -15004,14 +15005,24 @@ ${js}`
       t,
       children: $0
     };
-  }), TypePrimary$8 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
+  }), TypePrimary$8 = TypeIdentifier, 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) {
+    return $4 ? {
+      type: "TypeParenthesized",
+      children: [$1, $2, $4, $6, $7]
+      // omit AllowAll/RestoreAll
+    } : $skip;
+  }), 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,
       raw: $2.token,
       args: void 0
     };
-  }), 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) {
+  }), 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",
@@ -15019,15 +15030,9 @@ ${js}`
       raw: [$2.name, ...$3.map(([dot, id]) => dot.token + id.name)].join(""),
       args
     };
-  }), 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) {
-    return $4 ? {
-      type: "TypeParenthesized",
-      children: [$1, $2, $4, $6, $7]
-      // omit AllowAll/RestoreAll
-    } : $skip;
-  }), 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$$);
+  }), 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)), ImportType$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'ImportType "import"'), InsertOpenParen, (0, import_lib2.$E)(Trimmed_), StringLiteral, InsertCloseParen), ImportType$$ = [ImportType$0, ImportType$1];
   function ImportType(ctx, state2) {

package/dist/main.js

@@ -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);

package/dist/main.mjs

@@ -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);

package/dist/unplugin/farm.d.ts

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

package/dist/unplugin/farm.js

@@ -0,0 +1,36 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
+var farm_civet_exports = {};
+__export(farm_civet_exports, {
+  default: () => farm_civet_default
+});
+module.exports = __toCommonJS(farm_civet_exports);
+var import_unplugin = __toESM(require("./unplugin.js"));
+var farm_civet_default = import_unplugin.default.farm;

package/dist/unplugin/farm.mjs

@@ -0,0 +1,6 @@
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
+import civetUnplugin from "./unplugin.mjs";
+var farm_civet_default = civetUnplugin.farm;
+export {
+  farm_civet_default as default
+};

package/dist/unplugin/rolldown.d.ts

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

package/dist/unplugin/rolldown.js

@@ -0,0 +1,36 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+var rolldown_civet_exports = {};
+__export(rolldown_civet_exports, {
+  default: () => rolldown_civet_default
+});
+module.exports = __toCommonJS(rolldown_civet_exports);
+var import_unplugin = __toESM(require("./unplugin.js"));
+var rolldown_civet_default = import_unplugin.default.rolldown;

package/dist/unplugin/rolldown.mjs

@@ -0,0 +1,6 @@
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+import civetUnplugin from "./unplugin.mjs";
+var rolldown_civet_default = civetUnplugin.rolldown;
+export {
+  rolldown_civet_default as default
+};

package/dist/unplugin/rspack.d.ts

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

package/dist/unplugin/rspack.js

@@ -0,0 +1,36 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+var rspack_civet_exports = {};
+__export(rspack_civet_exports, {
+  default: () => rspack_civet_default
+});
+module.exports = __toCommonJS(rspack_civet_exports);
+var import_unplugin = __toESM(require("./unplugin.js"));
+var rspack_civet_default = import_unplugin.default.rspack;

package/dist/unplugin/rspack.mjs

@@ -0,0 +1,6 @@
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+import civetUnplugin from "./unplugin.mjs";
+var rspack_civet_default = civetUnplugin.rspack;
+export {
+  rspack_civet_default as default
+};

package/dist/unplugin/unplugin.js

@@ -424,22 +424,30 @@ var rawPlugin = (options = {}, meta) => {
       }
       const basename = id.slice(0, match.index + match[1].length);
       const filename = import_path.default.resolve(rootDir, basename);
+      this.addWatchFile(filename);
       let mtime, cached, resolve;
       if (cache != null) {
-        mtime = (await fs.promises.stat(filename)).mtimeMs;
-        cached = cache?.get(filename);
-        if (cached && cached.mtime === mtime) {
-          if (cached.promise) {
-            await cached.promise;
-          }
-          if (cached.result) {
-            return cached.result;
+        try {
+          mtime = (await fs.promises.stat(filename)).mtimeMs;
+        } catch (e) {
+        }
+        if (mtime != null) {
+          cached = cache.get(filename);
+          if (cached && cached.mtime === mtime) {
+            if (cached.promise) {
+              await cached.promise;
+            }
+            let ref3;
+            if ((ref3 = cached.result) != null) {
+              const result = ref3;
+              return result;
+            }
           }
+          const promise = new Promise((r) => {
+            resolve = r;
+          });
+          cache.set(filename, cached = { mtime, promise });
         }
-        const promise = new Promise((r) => {
-          resolve = r;
-        });
-        cache.set(filename, cached = { mtime, promise });
       }
       try {
         let checkErrors = function() {
@@ -449,7 +457,6 @@ var rawPlugin = (options = {}, meta) => {
           ;
           return;
         };
-        this.addWatchFile(filename);
         let compiled;
         let sourceMap;
         const civetOptions = {
@@ -502,13 +509,14 @@ var rawPlugin = (options = {}, meta) => {
             }
             case "preserve": {
               compiled = compiledTS;
+              sourceMap = civetSourceMap;
               break;
             }
           }
         }
         if (transformTS) {
-          for (let ref3 = import_civet.lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
-            const _spec = ref3[i];
+          for (let ref4 = import_civet.lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref4.length; i < len; i++) {
+            const _spec = ref4[i];
             const spec = _spec;
             if (spec.module?.input) {
               spec.module.token = spec.module.input.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -593,6 +601,16 @@ var rawPlugin = (options = {}, meta) => {
         return modules;
       }
     },
+    rspack(compiler) {
+      if (implicitExtension) {
+        compiler.options ??= {};
+        compiler.options.resolve ??= {};
+        compiler.options.resolve.extensions ??= ["", ".js", ".json", ".wasm"];
+        return compiler.options.resolve.extensions.unshift(".civet");
+      }
+      ;
+      return;
+    },
     webpack(compiler) {
       if (implicitExtension) {
         compiler.options ??= {};
@@ -601,9 +619,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/dist/unplugin/unplugin.mjs

@@ -392,22 +392,30 @@ var rawPlugin = (options = {}, meta) => {
       }
       const basename = id.slice(0, match.index + match[1].length);
       const filename = path.resolve(rootDir, basename);
+      this.addWatchFile(filename);
       let mtime, cached, resolve;
       if (cache != null) {
-        mtime = (await fs.promises.stat(filename)).mtimeMs;
-        cached = cache?.get(filename);
-        if (cached && cached.mtime === mtime) {
-          if (cached.promise) {
-            await cached.promise;
-          }
-          if (cached.result) {
-            return cached.result;
+        try {
+          mtime = (await fs.promises.stat(filename)).mtimeMs;
+        } catch (e) {
+        }
+        if (mtime != null) {
+          cached = cache.get(filename);
+          if (cached && cached.mtime === mtime) {
+            if (cached.promise) {
+              await cached.promise;
+            }
+            let ref3;
+            if ((ref3 = cached.result) != null) {
+              const result = ref3;
+              return result;
+            }
           }
+          const promise = new Promise((r) => {
+            resolve = r;
+          });
+          cache.set(filename, cached = { mtime, promise });
         }
-        const promise = new Promise((r) => {
-          resolve = r;
-        });
-        cache.set(filename, cached = { mtime, promise });
       }
       try {
         let checkErrors = function() {
@@ -417,7 +425,6 @@ var rawPlugin = (options = {}, meta) => {
           ;
           return;
         };
-        this.addWatchFile(filename);
         let compiled;
         let sourceMap;
         const civetOptions = {
@@ -470,13 +477,14 @@ var rawPlugin = (options = {}, meta) => {
             }
             case "preserve": {
               compiled = compiledTS;
+              sourceMap = civetSourceMap;
               break;
             }
           }
         }
         if (transformTS) {
-          for (let ref3 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
-            const _spec = ref3[i];
+          for (let ref4 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref4.length; i < len; i++) {
+            const _spec = ref4[i];
             const spec = _spec;
             if (spec.module?.input) {
               spec.module.token = spec.module.input.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -561,6 +569,16 @@ var rawPlugin = (options = {}, meta) => {
         return modules;
       }
     },
+    rspack(compiler) {
+      if (implicitExtension) {
+        compiler.options ??= {};
+        compiler.options.resolve ??= {};
+        compiler.options.resolve.extensions ??= ["", ".js", ".json", ".wasm"];
+        return compiler.options.resolve.extensions.unshift(".civet");
+      }
+      ;
+      return;
+    },
     webpack(compiler) {
       if (implicitExtension) {
         compiler.options ??= {};
@@ -569,9 +587,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -33,6 +33,36 @@
       "require": "./dist/unplugin/unplugin.js",
       "import": "./dist/unplugin/unplugin.mjs"
     },
+    "./astro": {
+      "types": "./dist/unplugin/astro.d.ts",
+      "require": "./dist/unplugin/astro.js",
+      "import": "./dist/unplugin/astro.mjs"
+    },
+    "./esbuild": {
+      "types": "./dist/unplugin/esbuild.d.ts",
+      "require": "./dist/unplugin/esbuild.js",
+      "import": "./dist/unplugin/esbuild.mjs"
+    },
+    "./farm": {
+      "types": "./dist/unplugin/farm.d.ts",
+      "require": "./dist/unplugin/farm.js",
+      "import": "./dist/unplugin/farm.mjs"
+    },
+    "./rolldown": {
+      "types": "./dist/unplugin/rolldown.d.ts",
+      "require": "./dist/unplugin/rolldown.js",
+      "import": "./dist/unplugin/rolldown.mjs"
+    },
+    "./rollup": {
+      "types": "./dist/unplugin/rollup.d.ts",
+      "require": "./dist/unplugin/rollup.js",
+      "import": "./dist/unplugin/rollup.mjs"
+    },
+    "./rspack": {
+      "types": "./dist/unplugin/rspack.d.ts",
+      "require": "./dist/unplugin/rspack.js",
+      "import": "./dist/unplugin/rspack.mjs"
+    },
     "./vite": {
       "types": "./dist/unplugin/vite.d.ts",
       "require": "./dist/unplugin/vite.js",
@@ -43,21 +73,6 @@
       "require": "./dist/unplugin/webpack.js",
       "import": "./dist/unplugin/webpack.mjs"
     },
-    "./rollup": {
-      "types": "./dist/unplugin/rollup.d.ts",
-      "require": "./dist/unplugin/rollup.js",
-      "import": "./dist/unplugin/rollup.mjs"
-    },
-    "./esbuild": {
-      "types": "./dist/unplugin/esbuild.d.ts",
-      "require": "./dist/unplugin/esbuild.js",
-      "import": "./dist/unplugin/esbuild.mjs"
-    },
-    "./astro": {
-      "types": "./dist/unplugin/astro.d.ts",
-      "require": "./dist/unplugin/astro.js",
-      "import": "./dist/unplugin/astro.mjs"
-    },
     "./ts-diagnostic": {
       "require": "./dist/ts-diagnostic.js",
       "import": "./dist/ts-diagnostic.mjs"
@@ -92,7 +107,7 @@
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
     "@typescript/vfs": "^1.6.0",
-    "unplugin": "^2.1.0"
+    "unplugin": "^2.2.1"
   },
   "devDependencies": {
     "@danielx/civet": "0.9.4",