@danielx/civet 0.9.7 → 0.10.0

package/dist/main.mjs

@@ -495,12 +495,14 @@ __export(lib_civet_exports, {
   attachPostfixStatementAsExpression: () => attachPostfixStatementAsExpression,
   blockWithPrefix: () => blockWithPrefix,
   braceBlock: () => braceBlock,
+  bracedBlock: () => bracedBlock,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
   convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
   convertWithClause: () => convertWithClause,
   dedentBlockString: () => dedentBlockString,
   dedentBlockSubstitutions: () => dedentBlockSubstitutions,
   deepCopy: () => deepCopy,
+  duplicateBlock: () => duplicateBlock,
   dynamizeImportDeclaration: () => dynamizeImportDeclaration,
   dynamizeImportDeclarationExpression: () => dynamizeImportDeclarationExpression,
   expressionizeTypeIf: () => expressionizeTypeIf,
@@ -757,9 +759,49 @@ function isExit(node) {
     }
     case "SwitchStatement": {
       return (
-        // Ensure exhaustive by requiring an else/default clause
-        node.caseBlock.clauses.some(($) => $.type === "DefaultClause") && // Every clause should exit
-        node.caseBlock.clauses.every(isExit)
+        // Every clause should exit, or continue to next clause
+        (() => {
+          let results = true;
+          for (const clause of node.caseBlock.clauses) {
+            let m1;
+            if (m1 = clause.type, m1 === "CaseClause" || m1 === "WhenClause" || m1 === "DefaultClause") {
+              if (!(!(clause.type === "WhenClause" && clause.break) && !gatherRecursiveWithinFunction(clause.block, ($) => $.type === "BreakStatement").length)) {
+                results = false;
+                break;
+              }
+            } else {
+              if (!isExit(clause.block)) {
+                results = false;
+                break;
+              }
+            }
+          }
+          return results;
+        })() && // Ensure exhaustive by requiring an else/default clause
+        (() => {
+          let results1 = false;
+          let i3 = 0;
+          for (const clause of node.caseBlock.clauses) {
+            const i = i3++;
+            if (clause.type === "DefaultClause" && // Require default clause to exit or continue to next clause
+            // (checked above) and eventually reach an exiting clause
+            (() => {
+              let results2 = false;
+              for (const later of node.caseBlock.clauses.slice(i)) {
+                let m2;
+                if ((m2 = later.type, m2 === "CaseClause" || m2 === "WhenClause" || m2 === "DefaultClause") && isExit(later.block)) {
+                  results2 = true;
+                  break;
+                }
+              }
+              return results2;
+            })()) {
+              results1 = true;
+              break;
+            }
+          }
+          return results1;
+        })()
       );
     }
     case "TryStatement": {
@@ -822,18 +864,18 @@ function insertTrimmingSpace(target, c) {
     if (target.length === 0) {
       return c;
     }
-    const results = [];
-    for (let i3 = 0, len3 = target.length; i3 < len3; i3++) {
-      const i = i3;
-      const e = target[i3];
+    const results3 = [];
+    for (let i4 = 0, len3 = target.length; i4 < len3; i4++) {
+      const i = i4;
+      const e = target[i4];
       if (i === 0) {
-        results.push(insertTrimmingSpace(e, c));
+        results3.push(insertTrimmingSpace(e, c));
       } else {
-        results.push(e);
+        results3.push(e);
       }
     }
     ;
-    return results;
+    return results3;
   } else if (isParent(target)) {
     const oldChildren = target.children;
     target = {
@@ -1068,8 +1110,8 @@ function startsWithPredicate(node, predicate, skip = isWhitespaceOrEmpty) {
     return void 0;
   }
   if (Array.isArray(node)) {
-    for (let i4 = 0, len4 = node.length; i4 < len4; i4++) {
-      const child = node[i4];
+    for (let i5 = 0, len4 = node.length; i5 < len4; i5++) {
+      const child = node[i5];
       if (skip(child)) {
         continue;
       }
@@ -1108,9 +1150,9 @@ function deepCopy(root) {
       if (Array.isArray(node)) {
         const array = new Array(node.length);
         copied.set(node, array);
-        for (let i5 = 0, len5 = node.length; i5 < len5; i5++) {
-          const i = i5;
-          const item = node[i5];
+        for (let i6 = 0, len5 = node.length; i6 < len5; i6++) {
+          const i = i6;
+          const item = node[i6];
           array[i] = recurse(item);
         }
       } else if (node?.type === "Ref") {
@@ -1137,9 +1179,9 @@ function replaceNode(node, newNode, parent) {
     throw new Error("replaceNode failed: node has no parent");
   }
   function recurse(children) {
-    for (let i6 = 0, len6 = children.length; i6 < len6; i6++) {
-      const i = i6;
-      const child = children[i6];
+    for (let i7 = 0, len6 = children.length; i7 < len6; i7++) {
+      const i = i7;
+      const child = children[i7];
       if (child === node) {
         children[i] = newNode;
         return true;
@@ -1176,9 +1218,9 @@ function replaceNodes(root, predicate, replacer) {
       return root;
     }
   }
-  for (let i7 = 0, len7 = array.length; i7 < len7; i7++) {
-    const i = i7;
-    const node = array[i7];
+  for (let i8 = 0, len7 = array.length; i8 < len7; i8++) {
+    const i = i8;
+    const node = array[i8];
     if (!(node != null)) {
       return;
     }
@@ -1302,8 +1344,8 @@ function updateParentPointers(node, parent, depth = 1) {
     return;
   }
   if (Array.isArray(node)) {
-    for (let i8 = 0, len8 = node.length; i8 < len8; i8++) {
-      const child = node[i8];
+    for (let i9 = 0, len8 = node.length; i9 < len8; i9++) {
+      const child = node[i9];
       updateParentPointers(child, parent, depth);
     }
     return;
@@ -1313,8 +1355,8 @@ function updateParentPointers(node, parent, depth = 1) {
     node.parent = parent;
   }
   if (depth && isParent(node)) {
-    for (let ref8 = node.children, i9 = 0, len9 = ref8.length; i9 < len9; i9++) {
-      const child = ref8[i9];
+    for (let ref8 = node.children, i10 = 0, len9 = ref8.length; i10 < len9; i10++) {
+      const child = ref8[i10];
       updateParentPointers(child, node, depth - 1);
     }
   }
@@ -1511,9 +1553,9 @@ function wrapWithReturn(expression, parent = expression?.parent, semi = false) {
 }
 function flatJoin(array, separator) {
   const result = [];
-  for (let i10 = 0, len10 = array.length; i10 < len10; i10++) {
-    const i = i10;
-    const items = array[i10];
+  for (let i11 = 0, len10 = array.length; i11 < len10; i11++) {
+    const i = i11;
+    const items = array[i11];
     if (i) {
       result.push(separator);
     }
@@ -3136,12 +3178,10 @@ function assignResults(node, collect) {
     }
     case "IfStatement": {
       assignResults(exp.then, collect);
-      if (exp.then.bare && !exp.then.semicolon) {
-        exp.then.children.push(exp.then.semicolon = ";");
-      }
       if (exp.else) {
         assignResults(exp.else.block, collect);
       } else {
+        braceBlock(exp.then);
         exp.children.push([" else {", collect("void 0"), "}"]);
       }
       return;
@@ -4225,6 +4265,11 @@ function duplicateBlock(block) {
     children
   };
 }
+function bracedBlock(block) {
+  block = duplicateBlock(block);
+  braceBlock(block);
+  return block;
+}
 function makeEmptyBlock() {
   const expressions = [];
   return {
@@ -5346,7 +5391,7 @@ function processDeclarations(statements) {
           });
         }
       }
-      if (initializer) {
+      if (initializer && blockContainingStatement(declaration)) {
         prependStatementExpressionBlock(initializer, declaration);
       }
     }
@@ -9249,8 +9294,6 @@ var grammar = {
   NamedImports,
   OperatorNamedImports,
   FromClause,
-  ImpliedFromClause,
-  ImpliedFrom,
   ImportAssertion,
   TypeAndImportSpecifier,
   ImportSpecifier,
@@ -9686,16 +9729,16 @@ var $L13 = (0, import_lib2.$L)("=>");
 var $L14 = (0, import_lib2.$L)("\u21D2");
 var $L15 = (0, import_lib2.$L)("import");
 var $L16 = (0, import_lib2.$L)(":");
-var $L17 = (0, import_lib2.$L)(",");
-var $L18 = (0, import_lib2.$L)(" ");
-var $L19 = (0, import_lib2.$L)("<");
-var $L20 = (0, import_lib2.$L)("implements");
-var $L21 = (0, import_lib2.$L)("<:");
-var $L22 = (0, import_lib2.$L)("^");
-var $L23 = (0, import_lib2.$L)("<?");
-var $L24 = (0, import_lib2.$L)("-");
-var $L25 = (0, import_lib2.$L)("import.meta");
-var $L26 = (0, import_lib2.$L)("return.value");
+var $L17 = (0, import_lib2.$L)(" ");
+var $L18 = (0, import_lib2.$L)("<");
+var $L19 = (0, import_lib2.$L)("implements");
+var $L20 = (0, import_lib2.$L)("<:");
+var $L21 = (0, import_lib2.$L)("^");
+var $L22 = (0, import_lib2.$L)("<?");
+var $L23 = (0, import_lib2.$L)("-");
+var $L24 = (0, import_lib2.$L)("import.meta");
+var $L25 = (0, import_lib2.$L)("return.value");
+var $L26 = (0, import_lib2.$L)(",");
 var $L27 = (0, import_lib2.$L)("tighter");
 var $L28 = (0, import_lib2.$L)("looser");
 var $L29 = (0, import_lib2.$L)("same");
@@ -9938,7 +9981,7 @@ var $R16 = (0, import_lib2.$R)(new RegExp(`(?=[0-9.'"tfyno])`, "suy"));
 var $R17 = (0, import_lib2.$R)(new RegExp("(?=true|false|yes|no|on|off)", "suy"));
 var $R18 = (0, import_lib2.$R)(new RegExp("(?=\\p{ID_Start}|[_$])", "suy"));
 var $R19 = (0, import_lib2.$R)(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
-var $R20 = (0, import_lib2.$R)(new RegExp("(?=\\[|\\s*[.\u2022])", "suy"));
+var $R20 = (0, import_lib2.$R)(new RegExp("(?=\\[|\\s*[.\u2022\\/])", "suy"));
 var $R21 = (0, import_lib2.$R)(new RegExp("([<>])(=?)|([\u2264\u2265])", "suy"));
 var $R22 = (0, import_lib2.$R)(new RegExp("[ \\t]*", "suy"));
 var $R23 = (0, import_lib2.$R)(new RegExp("[ \\t]+", "suy"));
@@ -11120,32 +11163,43 @@ 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)(__, With, __, ExtendsTarget, (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L17, 'WithClause ","'), __, ExtendsTarget))), 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, ExtendsTarget, (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));
+  return {
+    type: "WithClause",
+    children: $0,
+    targets
+  };
+});
+var WithClause$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, With, NotDedented, ExtendsTarget, (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$E)(_), Comma, NotDedented, ExtendsTarget))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var ws = $3;
   var t = $4;
   var rest = $5;
   return {
     type: "WithClause",
     children: $0,
-    targets: [[ws, t], ...rest.map(([_comma, ws2, target]) => [ws2, target])]
+    targets: [[ws, t], ...rest.map(([ws1, _comma, ws2, target]) => [prepend(ws1, ws2), target])]
   };
 });
+var WithClause$$ = [WithClause$0, WithClause$1];
 function WithClause(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "WithClause", WithClause$0);
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "WithClause", WithClause$$);
 }
-var ExtendsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, (0, import_lib2.$E)(_), ExtendsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
-  var l = $1;
-  var ws = $2;
+var ExtendsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, InsertSpace, ExtendsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ws = $1;
+  var s = $2;
   var t = $3;
   return {
     type: "Extends",
     children: [
-      ws || { $loc: l.$loc, token: " " },
+      ws.length ? ws : s,
       t
     ]
   };
 });
-var ExtendsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Extends), function($skip, $loc, $0, $1, $2) {
+var ExtendsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, Extends), function($skip, $loc, $0, $1, $2) {
   return {
     type: "Extends",
     children: $0
@@ -11155,13 +11209,13 @@ var ExtendsToken$$ = [ExtendsToken$0, ExtendsToken$1];
 function ExtendsToken(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ExtendsToken", ExtendsToken$$);
 }
-var ExtendsShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L19, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
+var ExtendsShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L18, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "extends " };
 });
 function ExtendsShorthand(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExtendsShorthand", ExtendsShorthand$0);
 }
-var NotExtendsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, (0, import_lib2.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var NotExtendsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, (0, import_lib2.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var l = $1;
   var ws1 = $2;
   var ws2 = $3;
@@ -11187,7 +11241,7 @@ function NotExtendsToken(ctx, state2) {
 var OmittedNegation$0 = (0, import_lib2.$T)((0, import_lib2.$S)(ExclamationPoint), function(value) {
   return "";
 });
-var OmittedNegation$1 = (0, import_lib2.$T)((0, import_lib2.$S)(Not, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'OmittedNegation " "')), (0, import_lib2.$E)(_)), function(value) {
+var OmittedNegation$1 = (0, import_lib2.$T)((0, import_lib2.$S)(Not, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'OmittedNegation " "')), (0, import_lib2.$E)(_)), function(value) {
   return value[2];
 });
 var OmittedNegation$$ = [OmittedNegation$0, OmittedNegation$1];
@@ -11201,16 +11255,28 @@ 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, ImplementsTarget, (0, import_lib2.$Q)((0, import_lib2.$S)(Comma, ImplementsTarget))), function($skip, $loc, $0, $1, $2, $3) {
+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 i = $1;
+  var targets = $3;
+  if (!targets.length) return $skip;
+  const last = targets.at(-1).slice(0, -1);
+  targets = targets.slice(0, -1).concat(last);
+  return {
+    ts: true,
+    children: [i, targets]
+  };
+});
+var ImplementsClause$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImplementsToken, ImplementsTarget, (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$E)(_), Comma, ImplementsTarget))), function($skip, $loc, $0, $1, $2, $3) {
   return {
     ts: true,
     children: $0
   };
 });
+var ImplementsClause$$ = [ImplementsClause$0, ImplementsClause$1];
 function ImplementsClause(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "ImplementsClause", ImplementsClause$0);
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "ImplementsClause", ImplementsClause$$);
 }
-var ImplementsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, __, ImplementsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImplementsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, NotDedented, ImplementsShorthand, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var token = $3;
@@ -11220,7 +11286,7 @@ var ImplementsToken$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, __, Implem
   }
   return { children };
 });
-var ImplementsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L20, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+var ImplementsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(NotDedented, (0, import_lib2.$EXPECT)($L19, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   $2 = { $loc, token: $2 };
   return [$1, $2];
 });
@@ -11228,7 +11294,7 @@ var ImplementsToken$$ = [ImplementsToken$0, ImplementsToken$1];
 function ImplementsToken(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ImplementsToken", ImplementsToken$$);
 }
-var ImplementsShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L21, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
+var ImplementsShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L20, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "implements " };
 });
 function ImplementsShorthand(ctx, state2) {
@@ -11668,7 +11734,7 @@ var OptionalDot$$ = [OptionalDot$0, OptionalDot$1];
 function OptionalDot(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "OptionalDot", OptionalDot$$);
 }
-var NonNullAssertion$0 = (0, import_lib2.$T)((0, import_lib2.$S)(ExclamationPoint, (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L22, 'NonNullAssertion "^"'), (0, import_lib2.$EXPECT)($L23, 'NonNullAssertion "<?"'), (0, import_lib2.$EXPECT)($L3, 'NonNullAssertion "="')))), function(value) {
+var NonNullAssertion$0 = (0, import_lib2.$T)((0, import_lib2.$S)(ExclamationPoint, (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L21, 'NonNullAssertion "^"'), (0, import_lib2.$EXPECT)($L22, 'NonNullAssertion "<?"'), (0, import_lib2.$EXPECT)($L3, 'NonNullAssertion "="')))), function(value) {
   return { "type": "NonNullAssertion", "ts": true, "children": [value[0]] };
 });
 function NonNullAssertion(ctx, state2) {
@@ -11928,7 +11994,7 @@ var PropertyAccess$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(AccessStart, (0,
     ]
   };
 });
-var PropertyAccess$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AccessStart, (0, import_lib2.$EXPECT)($L24, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+var PropertyAccess$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AccessStart, (0, import_lib2.$EXPECT)($L23, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var neg = $2;
   var num = $3;
@@ -12058,7 +12124,7 @@ function SuperProperty(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "SuperProperty", SuperProperty$$);
 }
 var MetaProperty$0 = (0, import_lib2.$S)(New, Dot, Target);
-var MetaProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L25, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var MetaProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L24, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 var MetaProperty$2 = ReturnValue;
@@ -12066,7 +12132,7 @@ var MetaProperty$$ = [MetaProperty$0, MetaProperty$1, MetaProperty$2];
 function MetaProperty(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MetaProperty", MetaProperty$$);
 }
-var ReturnValue$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L26, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib2.$S)(Return, (0, import_lib2.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
+var ReturnValue$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L25, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib2.$S)(Return, (0, import_lib2.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
   return { type: "ReturnValue", children: [$1[0]] };
 });
 function ReturnValue(ctx, state2) {
@@ -12622,7 +12688,7 @@ var BindingElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     initializer
   };
 });
-var BindingElement$2 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L17, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
+var BindingElement$2 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L26, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
   return {
     type: "ElisionElement",
     children: [""],
@@ -13549,7 +13615,7 @@ var UpcomingAssignment$0 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, impor
 function UpcomingAssignment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "UpcomingAssignment", UpcomingAssignment$0);
 }
-var ArrayLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R20, "ArrayLiteral /(?=\\[|\\s*[.\u2022])/"), _ArrayLiteral), function(value) {
+var ArrayLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R20, "ArrayLiteral /(?=\\[|\\s*[.\u2022\\/])/"), _ArrayLiteral), function(value) {
   return value[1];
 });
 function ArrayLiteral(ctx, state2) {
@@ -14333,7 +14399,7 @@ function SnugNamedProperty(ctx, state2) {
 var PropertyName$0 = NumericLiteral;
 var PropertyName$1 = ComputedPropertyName;
 var PropertyName$2 = StringLiteral;
-var PropertyName$3 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(IdentifierName), (0, import_lib2.$EXPECT)($L24, 'PropertyName "-"'), (0, import_lib2.$EXPECT)($R25, "PropertyName /(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"))), function($skip, $loc, $0, $1) {
+var PropertyName$3 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(IdentifierName), (0, import_lib2.$EXPECT)($L23, 'PropertyName "-"'), (0, import_lib2.$EXPECT)($R25, "PropertyName /(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"))), function($skip, $loc, $0, $1) {
   return {
     token: `"${$1}"`,
     $loc
@@ -14810,7 +14876,7 @@ var BinaryOpSymbol$6 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.
   };
 });
 var BinaryOpSymbol$7 = (0, import_lib2.$EXPECT)($L79, 'BinaryOpSymbol "+"');
-var BinaryOpSymbol$8 = (0, import_lib2.$EXPECT)($L24, 'BinaryOpSymbol "-"');
+var BinaryOpSymbol$8 = (0, import_lib2.$EXPECT)($L23, 'BinaryOpSymbol "-"');
 var BinaryOpSymbol$9 = (0, import_lib2.$EXPECT)($L80, 'BinaryOpSymbol "<="');
 var BinaryOpSymbol$10 = (0, import_lib2.$T)((0, import_lib2.$EXPECT)($L81, 'BinaryOpSymbol "\u2264"'), function(value) {
   return "<=";
@@ -14819,7 +14885,7 @@ var BinaryOpSymbol$11 = (0, import_lib2.$EXPECT)($L82, 'BinaryOpSymbol ">="');
 var BinaryOpSymbol$12 = (0, import_lib2.$T)((0, import_lib2.$EXPECT)($L83, 'BinaryOpSymbol "\u2265"'), function(value) {
   return ">=";
 });
-var BinaryOpSymbol$13 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L23, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
+var BinaryOpSymbol$13 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L22, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
   return {
     $loc,
     token: "instanceof",
@@ -14842,7 +14908,7 @@ var BinaryOpSymbol$15 = (0, import_lib2.$EXPECT)($L85, 'BinaryOpSymbol "<<"');
 var BinaryOpSymbol$16 = (0, import_lib2.$T)((0, import_lib2.$EXPECT)($L86, 'BinaryOpSymbol "\u226A"'), function(value) {
   return "<<";
 });
-var BinaryOpSymbol$17 = (0, import_lib2.$EXPECT)($L19, 'BinaryOpSymbol "<"');
+var BinaryOpSymbol$17 = (0, import_lib2.$EXPECT)($L18, 'BinaryOpSymbol "<"');
 var BinaryOpSymbol$18 = (0, import_lib2.$EXPECT)($L87, 'BinaryOpSymbol ">>>"');
 var BinaryOpSymbol$19 = (0, import_lib2.$T)((0, import_lib2.$EXPECT)($L88, 'BinaryOpSymbol "\u22D9"'), function(value) {
   return ">>>";
@@ -14979,7 +15045,7 @@ var BinaryOpSymbol$48 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is), function($
 });
 var BinaryOpSymbol$49 = In;
 var BinaryOpSymbol$50 = (0, import_lib2.$EXPECT)($L117, 'BinaryOpSymbol "&"');
-var BinaryOpSymbol$51 = (0, import_lib2.$EXPECT)($L22, 'BinaryOpSymbol "^"');
+var BinaryOpSymbol$51 = (0, import_lib2.$EXPECT)($L21, 'BinaryOpSymbol "^"');
 var BinaryOpSymbol$52 = (0, import_lib2.$EXPECT)($L118, 'BinaryOpSymbol "|"');
 var BinaryOpSymbol$$ = [BinaryOpSymbol$0, BinaryOpSymbol$1, BinaryOpSymbol$2, BinaryOpSymbol$3, BinaryOpSymbol$4, BinaryOpSymbol$5, BinaryOpSymbol$6, BinaryOpSymbol$7, BinaryOpSymbol$8, BinaryOpSymbol$9, BinaryOpSymbol$10, BinaryOpSymbol$11, BinaryOpSymbol$12, BinaryOpSymbol$13, BinaryOpSymbol$14, BinaryOpSymbol$15, BinaryOpSymbol$16, BinaryOpSymbol$17, BinaryOpSymbol$18, BinaryOpSymbol$19, BinaryOpSymbol$20, BinaryOpSymbol$21, BinaryOpSymbol$22, BinaryOpSymbol$23, BinaryOpSymbol$24, BinaryOpSymbol$25, BinaryOpSymbol$26, BinaryOpSymbol$27, BinaryOpSymbol$28, BinaryOpSymbol$29, BinaryOpSymbol$30, BinaryOpSymbol$31, BinaryOpSymbol$32, BinaryOpSymbol$33, BinaryOpSymbol$34, BinaryOpSymbol$35, BinaryOpSymbol$36, BinaryOpSymbol$37, BinaryOpSymbol$38, BinaryOpSymbol$39, BinaryOpSymbol$40, BinaryOpSymbol$41, BinaryOpSymbol$42, BinaryOpSymbol$43, BinaryOpSymbol$44, BinaryOpSymbol$45, BinaryOpSymbol$46, BinaryOpSymbol$47, BinaryOpSymbol$48, BinaryOpSymbol$49, BinaryOpSymbol$50, BinaryOpSymbol$51, BinaryOpSymbol$52];
 function BinaryOpSymbol(ctx, state2) {
@@ -15074,7 +15140,7 @@ var UnaryOp$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(Del
   if (!ws) return [op, [" "]];
   return [op, ws];
 });
-var UnaryOp$3 = (0, import_lib2.$T)((0, import_lib2.$S)(Not, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R30, "UnaryOp /[:.]/")), (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'UnaryOp " "')), (0, import_lib2.$E)(_)), function(value) {
+var UnaryOp$3 = (0, import_lib2.$T)((0, import_lib2.$S)(Not, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R30, "UnaryOp /[:.]/")), (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'UnaryOp " "')), (0, import_lib2.$E)(_)), function(value) {
   return [value[0], value[3]];
 });
 var UnaryOp$$ = [UnaryOp$0, UnaryOp$1, UnaryOp$2, UnaryOp$3];
@@ -15313,12 +15379,7 @@ var IfStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)
     condition = negateCondition(condition);
   }
   if (block.bare && e) {
-    const semicolon = ";";
-    block = {
-      ...block,
-      semicolon,
-      children: [...block.children, semicolon]
-    };
+    block = bracedBlock(block);
   }
   return {
     type: "IfStatement",
@@ -15334,11 +15395,7 @@ var IfStatement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(IfClause, BlockOrEm
   var block = $2;
   var e = $3;
   if (block.bare && e) {
-    block = {
-      ...block,
-      semicolon: ";",
-      children: [...block.children, ";"]
-    };
+    block = bracedBlock(block);
   }
   return {
     type: "IfStatement",
@@ -16682,7 +16739,7 @@ var ImportDeclaration$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImpliedImport
   const children = [i, t, imports, w, from];
   return { type: "ImportDeclaration", ts: !!t, children, imports, from };
 });
-var ImportDeclaration$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImpliedFromClause, __, Import, __, Operator, (0, import_lib2.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+var ImportDeclaration$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(FromClause, __, Import, __, Operator, (0, import_lib2.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
   var from = $1;
   var fws = $2;
   var i = $3;
@@ -16704,7 +16761,7 @@ var ImportDeclaration$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImpliedFromCl
     from
   };
 });
-var ImportDeclaration$6 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImpliedFromClause, __, Import, __, (0, import_lib2.$E)((0, import_lib2.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var ImportDeclaration$6 = (0, import_lib2.$TS)((0, import_lib2.$S)(FromClause, __, Import, __, (0, import_lib2.$E)((0, import_lib2.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var from = $1;
   var fws = $2;
   var i = $3;
@@ -16802,20 +16859,6 @@ var FromClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(From, __, ModuleSpec
 function FromClause(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "FromClause", FromClause$0);
 }
-var ImpliedFromClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(From, __), ImpliedFrom), ModuleSpecifier), function($skip, $loc, $0, $1, $2) {
-  var module = $2;
-  if (!Array.isArray(module)) return $0;
-  return [$1, ...module];
-});
-function ImpliedFromClause(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "ImpliedFromClause", ImpliedFromClause$0);
-}
-var ImpliedFrom$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'ImpliedFrom ""'), function($skip, $loc, $0, $1) {
-  return { $loc, token: "from " };
-});
-function ImpliedFrom(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
-}
 var ImportAssertion$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L134, 'ImportAssertion "with"'), (0, import_lib2.$EXPECT)($L135, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib2.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var keyword = $2;
   var object = $5;
@@ -16897,7 +16940,7 @@ function OperatorImportSpecifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "OperatorImportSpecifier", OperatorImportSpecifier$$);
 }
 var ImportAsToken$0 = (0, import_lib2.$S)(__, As);
-var ImportAsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, __, Colon, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImportAsToken$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Loc, __, Colon, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var c = $3;
@@ -17010,7 +17053,7 @@ var ExportDeclaration$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(Export, __, E
   var exports = $3;
   return { type: "ExportDeclaration", ts: exports.ts, children: $0 };
 });
-var ExportDeclaration$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(ImpliedFromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ExportDeclaration$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(FromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var from = $1;
   var fws = $2;
   var e = $3;
@@ -17713,7 +17756,7 @@ var Loc$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'Loc ""'), functi
 function Loc(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Loc", Loc$0);
 }
-var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L144, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L144, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'Abstract " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1, ts: true };
 });
 function Abstract(ctx, state2) {
@@ -17767,7 +17810,7 @@ var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L1
 function By(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "By", By$0);
 }
-var Caret$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'))), function($skip, $loc, $0, $1, $2) {
+var Caret$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L21, 'Caret "^"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L21, 'Caret "^"'))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Caret(ctx, state2) {
@@ -17827,7 +17870,7 @@ var Colon$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)(
 function Colon(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Colon", Colon$0);
 }
-var Comma$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L17, 'Comma ","'), function($skip, $loc, $0, $1) {
+var Comma$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L26, 'Comma ","'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Comma(ctx, state2) {
@@ -17999,7 +18042,7 @@ var Hash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L178, 'Hash "#"'), f
 function Hash(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Hash", Hash$0);
 }
-var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L179, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
+var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L179, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L17, 'If " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function If(ctx, state2) {
@@ -18077,7 +18120,7 @@ var Of$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L1
 function Of(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Of", Of$0);
 }
-var OpenAngleBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L19, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+var OpenAngleBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L18, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function OpenAngleBracket(ctx, state2) {
@@ -18411,7 +18454,7 @@ var JSXElement$$ = [JSXElement$0, JSXElement$1, JSXElement$2];
 function JSXElement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
 }
-var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L230, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L18, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L230, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   return { type: "JSXElement", children: $0, tag: $2 };
 });
 function JSXSelfClosingElement(ctx, state2) {
@@ -18430,7 +18473,7 @@ var PopJSXStack$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'PopJSXSt
 function PopJSXStack(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "PopJSXStack", PopJSXStack$0);
 }
-var JSXOpeningElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXOpeningElement ">"'));
+var JSXOpeningElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L18, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXOpeningElement ">"'));
 function JSXOpeningElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXOpeningElement", JSXOpeningElement$0);
 }
@@ -19811,7 +19854,7 @@ 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)(Type, (0, import_lib2.$S)(EOS, Type))), RestoreAll, __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+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",

package/package.json

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