@danielx/civet 0.8.6 → 0.8.8

package/dist/main.mjs

@@ -518,6 +518,7 @@ __export(lib_exports, {
   hasImportDeclaration: () => hasImportDeclaration,
   hasYield: () => hasYield,
   insertTrimmingSpace: () => insertTrimmingSpace,
+  isComma: () => isComma,
   isEmptyBareBlock: () => isEmptyBareBlock,
   isFunction: () => isFunction,
   isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
@@ -2120,6 +2121,9 @@ function serialize(value, context) {
         throw new TypeError("cannot serialize native function");
       }
       if (/^class[\s{]/u.test(string)) {
+        if (!Object.isExtensible(val)) {
+          string = `Object.preventExtensions(${string})`;
+        }
         return string;
       }
       if (stack.has(val)) {
@@ -2147,6 +2151,9 @@ function serialize(value, context) {
         }
         string = `Object.defineProperties(${string},${recurse(props)})`;
       }
+      if (!Object.isExtensible(val)) {
+        string = `Object.preventExtensions(${string})`;
+      }
       stack.delete(val);
       return string;
     } else if (typeof val === "symbol") {
@@ -2300,11 +2307,21 @@ function serialize(value, context) {
 }
 
 // source/parser/function.civet
+function getTypeArguments(args) {
+  while (typeof args === "object" && args != null && "args" in args) {
+    args = args.args;
+  }
+  if (!Array.isArray(args)) {
+    throw new Error("getTypeArguments could not find relevant array");
+  }
+  return args.filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "TypeArgument");
+}
 function isVoidType(t) {
-  return t?.type === "TypeLiteral" && t.t.type === "VoidType";
+  return typeof t === "object" && t != null && "type" in t && t.type === "TypeLiteral" && "t" in t && typeof t.t === "object" && t.t != null && "type" in t.t && t.t.type === "VoidType";
 }
 function isPromiseVoidType(t) {
-  return t?.type === "TypeIdentifier" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
+  let args;
+  return typeof t === "object" && t != null && "type" in t && t.type === "TypeIdentifier" && "raw" in t && t.raw === "Promise" && (args = getTypeArguments(t.args?.args)).length === 1 && isVoidType(args[0].t);
 }
 function implicitFunctionBlock(f) {
   if (f.abstract || f.block || f.signature?.optional)
@@ -2890,7 +2907,7 @@ function processParams(f) {
   if (isConstructor) {
     const { ancestor } = findAncestor(f, ($5) => $5.type === "ClassExpression");
     if (ancestor != null) {
-      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($6) => $6.type === "FieldDefinition").map(($7) => $7.id).filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "Identifier").map(($8) => $8.name));
+      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($6) => $6.type === "FieldDefinition").map(($7) => $7.id).filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "Identifier").map(($8) => $8.name));
       const classExpressions = ancestor.body.expressions;
       let index = findChildIndex(classExpressions, f);
       assert.notEqual(index, -1, "Could not find constructor in class");
@@ -2942,10 +2959,10 @@ function processParams(f) {
   if (isConstructor) {
     const superCalls = gatherNodes(
       expressions,
-      (a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "CallExpression" && "children" in a1 && Array.isArray(a1.children) && a1.children.length >= 1 && typeof a1.children[0] === "object" && a1.children[0] != null && "token" in a1.children[0] && a1.children[0].token === "super"
+      (a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "CallExpression" && "children" in a2 && Array.isArray(a2.children) && a2.children.length >= 1 && typeof a2.children[0] === "object" && a2.children[0] != null && "token" in a2.children[0] && a2.children[0].token === "super"
     );
     if (superCalls.length) {
-      const { child } = findAncestor(superCalls[0], (a2) => a2 === block);
+      const { child } = findAncestor(superCalls[0], (a3) => a3 === block);
       const index = findChildIndex(expressions, child);
       if (index < 0) {
         throw new Error("Could not find super call within top-level expressions");
@@ -2955,6 +2972,7 @@ function processParams(f) {
     }
   }
   expressions.unshift(...prefix);
+  braceBlock(block);
 }
 function processSignature(f) {
   const { block, signature } = f;
@@ -3077,11 +3095,11 @@ function processCoffeeDo(ws, expression) {
               parameter = {
                 ...parameter,
                 initializer: void 0,
-                children: parameter.children.filter((a3) => a3 !== initializer)
+                children: parameter.children.filter((a4) => a4 !== initializer)
               };
             } else {
               args.push(parameter.children.filter(
-                (a4) => a4 !== parameter.typeSuffix
+                (a5) => a5 !== parameter.typeSuffix
               ));
             }
           }
@@ -3154,7 +3172,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a5) => a5 === ref
+    (a6) => a6 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -7529,6 +7547,8 @@ var grammar = {
   BooleanLiteral,
   _BooleanLiteral,
   CoffeeScriptBooleanLiteral,
+  SymbolLiteral,
+  SymbolElement,
   Identifier,
   IdentifierName,
   IdentifierReference,
@@ -7629,6 +7649,7 @@ var grammar = {
   WhileClause,
   ForStatement,
   ForClause,
+  ForStatementControlWithWhen,
   ForStatementControl,
   WhenCondition,
   CoffeeForStatementParameters,
@@ -8051,6 +8072,7 @@ var grammar = {
   NestedTypeArgumentList,
   NestedTypeArgument,
   SingleLineTypeArgumentList,
+  WTypeArgument,
   TypeArgumentDelimited,
   TypeArgument,
   TypeArgumentDelimiter,
@@ -8912,10 +8934,10 @@ var RHS$$ = [RHS$0, RHS$1];
 function RHS(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "RHS", RHS$$);
 }
-var UnaryExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(IndentedApplicationAllowed, (0, import_lib4.$P)(UnaryOp), (0, import_lib4.$C)(ArrayLiteral, NestedArgumentList), (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var UnaryExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(IndentedApplicationAllowed, (0, import_lib4.$P)(UnaryOp), (0, import_lib4.$C)(ArrayLiteral, NestedArgumentList), (0, import_lib4.$N)(CallExpressionRest), (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var pre = $2;
   var args = $3;
-  var post = $4;
+  var post = $5;
   return processUnaryNestedExpression(pre, args, post) ?? $skip;
 });
 var UnaryExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$Q)(UnaryOp), UnaryBody, (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
@@ -9362,8 +9384,9 @@ var PrimaryExpression$7 = ClassExpression;
 var PrimaryExpression$8 = RegularExpressionLiteral;
 var PrimaryExpression$9 = ParenthesizedExpression;
 var PrimaryExpression$10 = Placeholder;
-var PrimaryExpression$11 = JSXImplicitFragment;
-var PrimaryExpression$$ = [PrimaryExpression$0, PrimaryExpression$1, PrimaryExpression$2, PrimaryExpression$3, PrimaryExpression$4, PrimaryExpression$5, PrimaryExpression$6, PrimaryExpression$7, PrimaryExpression$8, PrimaryExpression$9, PrimaryExpression$10, PrimaryExpression$11];
+var PrimaryExpression$11 = SymbolLiteral;
+var PrimaryExpression$12 = JSXImplicitFragment;
+var PrimaryExpression$$ = [PrimaryExpression$0, PrimaryExpression$1, PrimaryExpression$2, PrimaryExpression$3, PrimaryExpression$4, PrimaryExpression$5, PrimaryExpression$6, PrimaryExpression$7, PrimaryExpression$8, PrimaryExpression$9, PrimaryExpression$10, PrimaryExpression$11, PrimaryExpression$12];
 function PrimaryExpression(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "PrimaryExpression", PrimaryExpression$$);
 }
@@ -10192,7 +10215,7 @@ var PropertyAccessModifier$$ = [PropertyAccessModifier$0, PropertyAccessModifier
 function PropertyAccessModifier(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "PropertyAccessModifier", PropertyAccessModifier$$);
 }
-var PropertyAccess$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(AccessStart, (0, import_lib4.$C)(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
+var PropertyAccess$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(AccessStart, (0, import_lib4.$C)(TemplateLiteral, StringLiteral, IntegerLiteral, SymbolLiteral)), function($skip, $loc, $0, $1, $2) {
   var dot = $1;
   var literal = $2;
   return {
@@ -11736,6 +11759,40 @@ var CoffeeScriptBooleanLiteral$$ = [CoffeeScriptBooleanLiteral$0, CoffeeScriptBo
 function CoffeeScriptBooleanLiteral(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "CoffeeScriptBooleanLiteral", CoffeeScriptBooleanLiteral$$);
 }
+var SymbolLiteral$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Colon, IdentifierName), function($skip, $loc, $0, $1, $2) {
+  var colon = $1;
+  var id = $2;
+  const { name, children: [token] } = id;
+  if (config.symbols.includes(name)) {
+    return {
+      type: "SymbolLiteral",
+      children: [
+        { ...colon, token: "Symbol." },
+        token
+      ],
+      name
+    };
+  } else {
+    return {
+      type: "SymbolLiteral",
+      children: [
+        { ...colon, token: 'Symbol.for("' },
+        token,
+        '")'
+      ],
+      name
+    };
+  }
+});
+function SymbolLiteral(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "SymbolLiteral", SymbolLiteral$0);
+}
+var SymbolElement$0 = (0, import_lib4.$T)((0, import_lib4.$S)(SymbolLiteral), function(value) {
+  return ["[", value[0], "]"];
+});
+function SymbolElement(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "SymbolElement", SymbolElement$0);
+}
 var Identifier$0 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($R17, "Identifier /(?=\\p{ID_Start}|[_$])/"), (0, import_lib4.$N)(ReservedWord), IdentifierName), function(value) {
   var id = value[2];
   return id;
@@ -12483,7 +12540,8 @@ var PropertyName$3 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4
 });
 var PropertyName$4 = IdentifierName;
 var PropertyName$5 = LengthShorthand;
-var PropertyName$$ = [PropertyName$0, PropertyName$1, PropertyName$2, PropertyName$3, PropertyName$4, PropertyName$5];
+var PropertyName$6 = SymbolElement;
+var PropertyName$$ = [PropertyName$0, PropertyName$1, PropertyName$2, PropertyName$3, PropertyName$4, PropertyName$5, PropertyName$6];
 function PropertyName(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "PropertyName", PropertyName$$);
 }
@@ -12745,7 +12803,8 @@ function MethodSignature(ctx, state2) {
 var ClassElementName$0 = PropertyName;
 var ClassElementName$1 = LengthShorthand;
 var ClassElementName$2 = PrivateIdentifier;
-var ClassElementName$$ = [ClassElementName$0, ClassElementName$1, ClassElementName$2];
+var ClassElementName$3 = SymbolElement;
+var ClassElementName$$ = [ClassElementName$0, ClassElementName$1, ClassElementName$2, ClassElementName$3];
 function ClassElementName(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ClassElementName", ClassElementName$$);
 }
@@ -13702,7 +13761,7 @@ var ForStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForClause, BlockOr
 function ForStatement(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForStatement", ForStatement$0);
 }
-var ForClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For, (0, import_lib4.$E)((0, import_lib4.$S)((0, import_lib4.$E)(_), Star)), __, ForStatementControl), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ForClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For, (0, import_lib4.$E)((0, import_lib4.$S)((0, import_lib4.$E)(_), Star)), __, ForStatementControlWithWhen), function($skip, $loc, $0, $1, $2, $3, $4) {
   var generator = $2;
   var c = $4;
   const { children, declaration } = c;
@@ -13719,26 +13778,41 @@ var ForClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For, (0, import_lib4.
 function ForClause(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForClause", ForClause$0);
 }
+var ForStatementControlWithWhen$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForStatementControl, (0, import_lib4.$E)(WhenCondition)), function($skip, $loc, $0, $1, $2) {
+  var control = $1;
+  var condition = $2;
+  if (!condition)
+    return control;
+  const expressions = [["", {
+    type: "ContinueStatement",
+    children: ["continue"]
+  }]];
+  const block = {
+    type: "BlockStatement",
+    expressions,
+    children: [expressions],
+    bare: true
+  };
+  return {
+    ...control,
+    blockPrefix: [
+      ...control.blockPrefix,
+      ["", {
+        type: "IfStatement",
+        then: block,
+        children: ["if (!", makeLeftHandSideExpression(trimFirstSpace(condition)), ") ", block]
+      }, ";"]
+    ]
+  };
+});
+function ForStatementControlWithWhen(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "ForStatementControlWithWhen", ForStatementControlWithWhen$0);
+}
 var ForStatementControl$0 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$N)(CoffeeForLoopsEnabled), ForStatementParameters), function(value) {
   return value[1];
 });
-var ForStatementControl$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(CoffeeForLoopsEnabled, CoffeeForStatementParameters, (0, import_lib4.$E)(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
-  var condition = $3;
-  if (condition) {
-    const block = "continue";
-    $2 = {
-      ...$2,
-      blockPrefix: [
-        ...$2.blockPrefix,
-        ["", {
-          type: "IfStatement",
-          then: block,
-          children: ["if (!(", trimFirstSpace(condition), ")) ", block]
-        }, ";"]
-      ]
-    };
-  }
-  return $2;
+var ForStatementControl$1 = (0, import_lib4.$T)((0, import_lib4.$S)(CoffeeForLoopsEnabled, CoffeeForStatementParameters), function(value) {
+  return value[1];
 });
 var ForStatementControl$$ = [ForStatementControl$0, ForStatementControl$1];
 function ForStatementControl(ctx, state2) {
@@ -18318,11 +18392,12 @@ function TypeArrowFunction(ctx, state2) {
 }
 var TypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(OpenAngleBracket, (0, import_lib4.$P)((0, import_lib4.$S)(__, TypeArgumentDelimited)), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
   var args = $2;
-  args = args.map(([ws, arg]) => [ws, ...arg]);
+  args = args.flatMap(([ws, [arg, delim]]) => [prepend(ws, arg), delim]);
+  args.pop();
   return {
     type: "TypeArguments",
     ts: true,
-    types: args.map(([, t]) => t),
+    args,
     children: $0
   };
 });
@@ -18334,10 +18409,15 @@ var ImplicitTypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeAppli
   var ws = $3;
   var args = $4;
   var close = $5;
-  let last = args[args.length - 1];
-  if (last?.token === ",")
+  const last = args[args.length - 1];
+  if (isComma(last))
     args = args.slice(0, -1);
-  return [open, ws, args, close];
+  return {
+    type: "TypeArguments",
+    ts: true,
+    args,
+    children: [open, ws, args, close]
+  };
 });
 function ImplicitTypeArguments(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ImplicitTypeArguments", ImplicitTypeArguments$0);
@@ -18355,10 +18435,10 @@ var ForbiddenImplicitTypeCalls$$ = [ForbiddenImplicitTypeCalls$0, ForbiddenImpli
 function ForbiddenImplicitTypeCalls(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ForbiddenImplicitTypeCalls", ForbiddenImplicitTypeCalls$$);
 }
-var TypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$N)(EOS), TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$N)(EOS), (0, import_lib4.$E)(_), TypeArgument)), (0, import_lib4.$P)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var TypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$N)(EOS), TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$N)(EOS), WTypeArgument)), (0, import_lib4.$P)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
   return [
     $2,
-    ...$3.flatMap(([comma, eos, ws, arg]) => [comma, prepend(ws, arg)]),
+    ...$3.flatMap(([comma, eos, arg]) => [comma, arg]),
     ...$4.flatMap(
       ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
     )
@@ -18373,10 +18453,10 @@ var TypeArgumentList$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
   ];
 });
 var TypeArgumentList$2 = NestedTypeArgumentList;
-var TypeArgumentList$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$E)(_), TypeArgument))), function($skip, $loc, $0, $1, $2) {
+var TypeArgumentList$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, WTypeArgument))), function($skip, $loc, $0, $1, $2) {
   return [
     $1,
-    ...$2.flatMap(([comma, ws, arg]) => [comma, prepend(ws, arg)])
+    ...$2.flatMap(([comma, arg]) => [comma, arg])
   ];
 });
 var TypeArgumentList$$ = [TypeArgumentList$0, TypeArgumentList$1, TypeArgumentList$2, TypeArgumentList$3];
@@ -18403,17 +18483,25 @@ var NestedTypeArgument$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Nested, Sing
 function NestedTypeArgument(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "NestedTypeArgument", NestedTypeArgument$0);
 }
-var SingleLineTypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument), (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), Comma), (0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument)))), function($skip, $loc, $0, $1, $2) {
-  return [$1, ...$2.flat()];
+var SingleLineTypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(WTypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), Comma), WTypeArgument))), function($skip, $loc, $0, $1, $2) {
+  return [$1, ...$2];
 });
 function SingleLineTypeArgumentList(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineTypeArgumentList", SingleLineTypeArgumentList$0);
 }
+var WTypeArgument$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument), function($skip, $loc, $0, $1, $2) {
+  return prepend($1, $2);
+});
+function WTypeArgument(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "WTypeArgument", WTypeArgument$0);
+}
 var TypeArgumentDelimited$0 = (0, import_lib4.$S)(TypeArgument, TypeArgumentDelimiter);
 function TypeArgumentDelimited(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TypeArgumentDelimited", TypeArgumentDelimited$0);
 }
-var TypeArgument$0 = Type;
+var TypeArgument$0 = (0, import_lib4.$T)(Type, function(value) {
+  return { "type": "TypeArgument", "ts": true, "t": value, "children": [value] };
+});
 function TypeArgument(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TypeArgument", TypeArgument$0);
 }
@@ -18501,6 +18589,7 @@ var CivetOption$0 = (0, import_lib4.$TR)((0, import_lib4.$EXPECT)($R96, "CivetOp
         value = 0;
       break;
     case "globals":
+    case "symbols":
       value = value.split(",").filter(Boolean);
       break;
   }
@@ -18876,6 +18965,7 @@ var Reset$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'Reset ""'), fu
     repl: false,
     rewriteTsImports: true,
     server: false,
+    symbols: wellKnownSymbols,
     tab: void 0,
     // default behavior = same as space
     verbose: false
@@ -19172,6 +19262,21 @@ function parseProgram(input, options) {
     });
   }
 }
+var wellKnownSymbols = [
+  "asyncIterator",
+  "hasInstance",
+  "isConcatSpreadable",
+  "iterator",
+  "match",
+  "matchAll",
+  "replace",
+  "search",
+  "species",
+  "split",
+  "toPrimitive",
+  "toStringTag",
+  "unscopables"
+];
 
 // source/sourcemap.civet
 var sourcemap_exports = {};

package/dist/types.d.ts

@@ -30,6 +30,7 @@ declare module "@danielx/civet" {
     rewriteCivetImports: string
     rewriteTsImports: boolean
     server: boolean
+    symbols: string[]
     tab: number
     verbose: boolean
     comptime: boolean

package/dist/unplugin/unplugin.js

@@ -105,6 +105,7 @@ var rawPlugin = (options = {}, meta) => {
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
+  let aliasResolver;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
@@ -121,7 +122,7 @@ var rawPlugin = (options = {}, meta) => {
     };
   };
   const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
-  return {
+  const plugin = {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
@@ -375,8 +376,14 @@ var rawPlugin = (options = {}, meta) => {
       }
     },
     resolveId(id, importer, options2) {
+      if (aliasResolver != null) {
+        id = aliasResolver(id);
+      }
       if (/\0/.test(id))
         return null;
+      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
+        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
+      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref1;
@@ -519,35 +526,28 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
           config.resolve.extensions.push(".civet");
         }
-        ;
-        return;
       },
       async transformIndexHtml(html) {
-        return html.replace(
-          /<!--[^]*?-->|<[^<>]*>/g,
-          (tag) => {
-            return tag.replace(
-              /<\s*script\b[^<>]*>/gi,
-              (script) => {
-                return script.replace(
-                  /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
-                  (attr, name, value) => {
-                    return name.toLowerCase() === "src" && value ? attr.replace(
-                      /(\.civet)(['"]?)$/,
-                      (_, extension, endQuote) => {
-                        return `${extension}${outExt}?transform${endQuote}`;
-                      }
-                    ) : attr;
+        return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
+          return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
+            return script.replace(
+              /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
+              (attr, name, value) => {
+                return name.toLowerCase() === "src" && value ? attr.replace(
+                  /(\.civet)(['"]?)$/,
+                  (_, extension, endQuote) => {
+                    return `${extension}${outExt}?transform${endQuote}`;
                   }
-                );
+                ) : attr;
               }
             );
-          }
-        );
+          });
+        });
       },
       handleHotUpdate({ file, server, modules }) {
-        if (!file.endsWith(".civet"))
+        if (!file.endsWith(".civet")) {
           return;
+        }
         const resolvedId = slash(import_path.default.resolve(file) + outExt);
         const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
@@ -556,8 +556,33 @@ var rawPlugin = (options = {}, meta) => {
         }
         return modules;
       }
+    },
+    webpack(compiler) {
+      if (implicitExtension) {
+        compiler.options.resolve.extensions.unshift(".civet");
+      }
+      return aliasResolver = (id) => {
+        let ref2;
+        for (const key in ref2 = compiler.options.resolve.alias) {
+          const value = ref2[key];
+          if (key.endsWith("$")) {
+            if (id === key.slice(0, -1)) {
+              return typeof value === "string" ? value : "\0";
+            }
+          } else {
+            if (id === key || id.startsWith(key + "/")) {
+              if (!(typeof value === "string")) {
+                return "\0";
+              }
+              return value + id.slice(key.length);
+            }
+          }
+        }
+        return id;
+      };
     }
   };
+  return plugin;
 };
 var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
 var unplugin_civet_default = unplugin;

package/dist/unplugin/unplugin.mjs

@@ -73,6 +73,7 @@ var rawPlugin = (options = {}, meta) => {
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
+  let aliasResolver;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
@@ -89,7 +90,7 @@ var rawPlugin = (options = {}, meta) => {
     };
   };
   const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
-  return {
+  const plugin = {
     name: "unplugin-civet",
     enforce: "pre",
     async buildStart() {
@@ -343,8 +344,14 @@ var rawPlugin = (options = {}, meta) => {
       }
     },
     resolveId(id, importer, options2) {
+      if (aliasResolver != null) {
+        id = aliasResolver(id);
+      }
       if (/\0/.test(id))
         return null;
+      if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
+        importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
+      }
       let postfix;
       ({ id, postfix } = cleanCivetId(id));
       let ref1;
@@ -487,35 +494,28 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
           config.resolve.extensions.push(".civet");
         }
-        ;
-        return;
       },
       async transformIndexHtml(html) {
-        return html.replace(
-          /<!--[^]*?-->|<[^<>]*>/g,
-          (tag) => {
-            return tag.replace(
-              /<\s*script\b[^<>]*>/gi,
-              (script) => {
-                return script.replace(
-                  /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
-                  (attr, name, value) => {
-                    return name.toLowerCase() === "src" && value ? attr.replace(
-                      /(\.civet)(['"]?)$/,
-                      (_, extension, endQuote) => {
-                        return `${extension}${outExt}?transform${endQuote}`;
-                      }
-                    ) : attr;
+        return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
+          return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
+            return script.replace(
+              /([:_\p{ID_Start}][:\p{ID_Continue}]*)(\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]*))?/gu,
+              (attr, name, value) => {
+                return name.toLowerCase() === "src" && value ? attr.replace(
+                  /(\.civet)(['"]?)$/,
+                  (_, extension, endQuote) => {
+                    return `${extension}${outExt}?transform${endQuote}`;
                   }
-                );
+                ) : attr;
               }
             );
-          }
-        );
+          });
+        });
       },
       handleHotUpdate({ file, server, modules }) {
-        if (!file.endsWith(".civet"))
+        if (!file.endsWith(".civet")) {
           return;
+        }
         const resolvedId = slash(path.resolve(file) + outExt);
         const module = server.moduleGraph.getModuleById(resolvedId);
         if (module) {
@@ -524,8 +524,33 @@ var rawPlugin = (options = {}, meta) => {
         }
         return modules;
       }
+    },
+    webpack(compiler) {
+      if (implicitExtension) {
+        compiler.options.resolve.extensions.unshift(".civet");
+      }
+      return aliasResolver = (id) => {
+        let ref2;
+        for (const key in ref2 = compiler.options.resolve.alias) {
+          const value = ref2[key];
+          if (key.endsWith("$")) {
+            if (id === key.slice(0, -1)) {
+              return typeof value === "string" ? value : "\0";
+            }
+          } else {
+            if (id === key || id.startsWith(key + "/")) {
+              if (!(typeof value === "string")) {
+                return "\0";
+              }
+              return value + id.slice(key.length);
+            }
+          }
+        }
+        return id;
+      };
     }
   };
+  return plugin;
 };
 var unplugin = createUnplugin(rawPlugin);
 var unplugin_civet_default = unplugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",