@danielx/civet 0.8.5 → 0.8.6

package/CHANGELOG.md

@@ -4,6 +4,11 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.6 (2024-10-21, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.5...v0.8.6), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.6))
+* Fix CLI with complex `NODE_OPTIONS`, LSP cleanup [[#1482](https://github.com/DanielXMoore/Civet/pull/1482)]
+* `if` conditions continued by binary op on next line [[#1483](https://github.com/DanielXMoore/Civet/pull/1483)]
+* `from ... import/export` (reversed `import`/`export`) [[#1484](https://github.com/DanielXMoore/Civet/pull/1484)]
+
 ## 0.8.5 (2024-10-21, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.4...v0.8.5), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.5))
 * Reverse slices and inequality slices with implicit parts [[#1478](https://github.com/DanielXMoore/Civet/pull/1478)]
 * Indented types after binary type operators [[#1479](https://github.com/DanielXMoore/Civet/pull/1479)]

package/dist/browser.js

@@ -7757,6 +7757,8 @@ ${js}`
     NamedImports,
     OperatorNamedImports,
     FromClause,
+    ImpliedFromClause,
+    ImpliedFrom,
     ImportAssertion,
     TypeAndImportSpecifier,
     ImportSpecifier,
@@ -8441,7 +8443,7 @@ ${js}`
   var $R29 = (0, import_lib4.$R)(new RegExp("[:.]", "suy"));
   var $R30 = (0, import_lib4.$R)(new RegExp("(?=for|if|loop|unless|until|while)", "suy"));
   var $R31 = (0, import_lib4.$R)(new RegExp("(?=loop|comptime|do|for|until|while)", "suy"));
-  var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s]+', "suy"));
+  var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s=>]+', "suy"));
   var $R33 = (0, import_lib4.$R)(new RegExp("(?=[0-9.])", "suy"));
   var $R34 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
   var $R35 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -9950,14 +9952,22 @@ ${js}`
   var CallExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, NamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     return dynamizeImportDeclarationExpression($0);
   });
-  var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(FromClause, __, Import, _, NamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var imports = $5;
+    return dynamizeImportDeclarationExpression([i, iws, imports, fws, from]);
+  });
+  var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var rest = $3;
     return processCallMemberExpression({
       type: "CallExpression",
       children: [$1, ...$2, ...rest.flat()]
     });
   });
-  var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var member = $1;
     var trailing = $2;
     var rest = $3;
@@ -9970,7 +9980,7 @@ ${js}`
     }
     return member;
   });
-  var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3];
+  var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3, CallExpression$4];
   function CallExpression(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "CallExpression", CallExpression$$);
   }
@@ -14000,9 +14010,12 @@ ${js}`
   function ForBinding(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "ForBinding", ForBinding$0);
   }
-  var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, import_lib4.$C)(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
-    var condition = $2;
-    var caseBlock = $3;
+  var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, ForbidNewlineBinaryOp, (0, import_lib4.$E)((0, import_lib4.$C)(EmptyCondition, Condition)), RestoreNewlineBinaryOp, CaseBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var s = $1;
+    var condition = $3;
+    var caseBlock = $5;
+    if (!condition)
+      return $skip;
     if (condition.type === "EmptyCondition") {
       caseBlock.clauses.forEach(({ cases }) => {
         if (cases) {
@@ -14022,7 +14035,8 @@ ${js}`
     }
     return {
       type: "SwitchStatement",
-      children: $0,
+      children: [s, condition, caseBlock],
+      // omit NewlineBinaryOp control
       condition,
       caseBlock
     };
@@ -14390,8 +14404,8 @@ ${js}`
   function SingleLineExpressionWithIndentedApplicationForbidden(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineExpressionWithIndentedApplicationForbidden", SingleLineExpressionWithIndentedApplicationForbidden$0);
   }
-  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib4.$E)(Expression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-    var exp = $4;
+  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, (0, import_lib4.$E)(Expression), RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var exp = $3;
     if (exp)
       return exp;
     return $skip;
@@ -14780,36 +14794,41 @@ ${js}`
       children: [imp, $0.slice(1)]
     };
   });
-  var ImportDeclaration$1 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
-    var imports = value[4];
-    var from = value[6];
-    return { "type": "ImportDeclaration", "ts": true, "children": value, "imports": imports, "from": from };
-  });
-  var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-    var behavior = $4;
-    var imports = $6;
-    var from = $8;
+  var ImportDeclaration$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(Import, __), ImpliedImport), Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var i = $1;
+    var behavior = $3;
+    var ws1 = $4;
+    var imports = $5;
+    var ws2 = $6;
+    var from = $7;
     imports.specifiers.forEach((spec) => {
       state.operators.set(spec.binding.name, spec.behavior ?? behavior);
     });
     return {
       type: "ImportDeclaration",
-      children: [$1, $2, trimFirstSpace($5), imports, $7, from],
-      // omit $3 = Operator and $4 = OperatorBehavior
+      children: [i, trimFirstSpace(ws1), imports, ws2, from],
+      // omit $2 = Operator and $3 = OperatorBehavior
       imports,
       from
     };
   });
-  var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ImportClause, __, FromClause), function(value) {
-    var imports = value[2];
-    var from = value[4];
-    return { "type": "ImportDeclaration", "children": value, "imports": imports, "from": from };
+  var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var t = $3;
+    var imports = $4;
+    var from = $6;
+    return {
+      type: "ImportDeclaration",
+      children: $0,
+      imports,
+      from,
+      ts: !!t
+    };
   });
-  var ImportDeclaration$4 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
+  var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
     var module = value[2];
     return { "type": "ImportDeclaration", "children": value, "module": module };
   });
-  var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ImportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var i = $1;
     var t = $2;
     var imports = $3;
@@ -14822,22 +14841,40 @@ ${js}`
     const children = [i, t, imports, w, from];
     return { type: "ImportDeclaration", ts: !!t, children, imports, from };
   });
-  var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-    var i = $1;
-    var behavior = $3;
-    var imports = $5;
-    var from = $7;
+  var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var behavior = $6;
+    var ows = $7;
+    var imports = $8;
     imports.specifiers.forEach((spec) => {
       state.operators.set(spec.binding.name, spec.behavior ?? behavior);
     });
     return {
       type: "ImportDeclaration",
-      children: [$1, trimFirstSpace($4), imports, $6, from],
-      // omit $2 = Operator and $3 = OperatorBehavior
+      children: [i, iws, trimFirstSpace(ows), imports, fws, from],
+      // omit Operator and OperatorBehavior
       imports,
       from
     };
   });
+  var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var t = $5;
+    var imports = $6;
+    return {
+      type: "ImportDeclaration",
+      children: [i, iws, t, imports, fws, from],
+      imports,
+      from,
+      ts: !!t
+    };
+  });
   var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3, ImportDeclaration$4, ImportDeclaration$5, ImportDeclaration$6];
   function ImportDeclaration(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "ImportDeclaration", ImportDeclaration$$);
@@ -14922,6 +14959,21 @@ ${js}`
   function FromClause(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "FromClause", FromClause$0);
   }
+  var ImpliedFromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$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_lib4.$EVENT)(ctx, state2, "ImpliedFromClause", ImpliedFromClause$0);
+  }
+  var ImpliedFrom$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'ImpliedFrom ""'), function($skip, $loc, $0, $1) {
+    return { $loc, token: "from " };
+  });
+  function ImpliedFrom(ctx, state2) {
+    return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
+  }
   var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L124, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L125, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var keyword = $2;
     var object = $5;
@@ -15054,7 +15106,7 @@ ${js}`
   function UnprocessedModuleSpecifier(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "UnprocessedModuleSpecifier", UnprocessedModuleSpecifier$$);
   }
-  var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
+  var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s=>]+/'), function($skip, $loc, $0, $1) {
     var spec = $0;
     return { $loc, token: `"${spec}"` };
   });
@@ -15107,13 +15159,26 @@ ${js}`
     return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
   });
   var ExportDeclaration$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
+    var exports = $3;
+    return { type: "ExportDeclaration", ts: exports.ts, children: $0 };
+  });
+  var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var from = $1;
+    var fws = $2;
+    var e = $3;
+    var ews = $4;
+    var exports = $5;
+    return {
+      type: "ExportDeclaration",
+      ts: exports.ts,
+      children: [e, ews, exports, " ", from, trimFirstSpace(fws)]
+    };
   });
-  var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var declaration = $4;
     return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
   });
-  var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4];
+  var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4, ExportDeclaration$5];
   function ExportDeclaration(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "ExportDeclaration", ExportDeclaration$$);
   }

package/dist/civet

@@ -90,7 +90,7 @@ async function parseArgs(args, isTTY = process.stdin.isTTY) {
         results.push(`-${char}`);
       }
       ;
-      args.splice(i, 1 + i - i, ...results);
+      args.splice(i, i + 1 - i, ...results);
       continue;
     }
     switch (arg) {
@@ -305,9 +305,6 @@ async function repl(args, options) {
       };
     } else {
       const execArgv = ["--experimental-vm-modules"];
-      if (process.env.NODE_OPTIONS) {
-        execArgv.push(process.env.NODE_OPTIONS);
-      }
       const { fork } = await import("node:child_process");
       fork(__filename, args, {
         execArgv,
@@ -650,9 +647,6 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
         const debugRe = /--debug|--inspect/;
         const isDebug = typeof v8debug === "object" || debugRe.test(process.execArgv.join(" ")) || debugRe.test(process.env.NODE_OPTIONS ?? "");
-        if (process.env.NODE_OPTIONS) {
-          execArgv.push(process.env.NODE_OPTIONS);
-        }
         if (isDebug) {
           execArgv.push("--inspect=" + (process.debugPort + 1));
         }

package/dist/main.js

@@ -7733,6 +7733,8 @@ var grammar = {
   NamedImports,
   OperatorNamedImports,
   FromClause,
+  ImpliedFromClause,
+  ImpliedFrom,
   ImportAssertion,
   TypeAndImportSpecifier,
   ImportSpecifier,
@@ -8417,7 +8419,7 @@ var $R28 = (0, import_lib4.$R)(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s)", "suy"));
 var $R29 = (0, import_lib4.$R)(new RegExp("[:.]", "suy"));
 var $R30 = (0, import_lib4.$R)(new RegExp("(?=for|if|loop|unless|until|while)", "suy"));
 var $R31 = (0, import_lib4.$R)(new RegExp("(?=loop|comptime|do|for|until|while)", "suy"));
-var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s]+', "suy"));
+var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s=>]+', "suy"));
 var $R33 = (0, import_lib4.$R)(new RegExp("(?=[0-9.])", "suy"));
 var $R34 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
 var $R35 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -9926,14 +9928,22 @@ var CallExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Super, Arguments
 var CallExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, NamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   return dynamizeImportDeclarationExpression($0);
 });
-var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(FromClause, __, Import, _, NamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var imports = $5;
+  return dynamizeImportDeclarationExpression([i, iws, imports, fws, from]);
+});
+var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
   var rest = $3;
   return processCallMemberExpression({
     type: "CallExpression",
     children: [$1, ...$2, ...rest.flat()]
   });
 });
-var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+var CallExpression$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
   var member = $1;
   var trailing = $2;
   var rest = $3;
@@ -9946,7 +9956,7 @@ var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression
   }
   return member;
 });
-var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3];
+var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3, CallExpression$4];
 function CallExpression(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "CallExpression", CallExpression$$);
 }
@@ -13976,9 +13986,12 @@ var ForBinding$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)(
 function ForBinding(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForBinding", ForBinding$0);
 }
-var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, import_lib4.$C)(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
-  var condition = $2;
-  var caseBlock = $3;
+var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, ForbidNewlineBinaryOp, (0, import_lib4.$E)((0, import_lib4.$C)(EmptyCondition, Condition)), RestoreNewlineBinaryOp, CaseBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var s = $1;
+  var condition = $3;
+  var caseBlock = $5;
+  if (!condition)
+    return $skip;
   if (condition.type === "EmptyCondition") {
     caseBlock.clauses.forEach(({ cases }) => {
       if (cases) {
@@ -13998,7 +14011,8 @@ var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, imp
   }
   return {
     type: "SwitchStatement",
-    children: $0,
+    children: [s, condition, caseBlock],
+    // omit NewlineBinaryOp control
     condition,
     caseBlock
   };
@@ -14366,8 +14380,8 @@ var SingleLineExpressionWithIndentedApplicationForbidden$0 = (0, import_lib4.$TS
 function SingleLineExpressionWithIndentedApplicationForbidden(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineExpressionWithIndentedApplicationForbidden", SingleLineExpressionWithIndentedApplicationForbidden$0);
 }
-var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib4.$E)(Expression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  var exp = $4;
+var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, (0, import_lib4.$E)(Expression), RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var exp = $3;
   if (exp)
     return exp;
   return $skip;
@@ -14756,36 +14770,41 @@ var ImportDeclaration$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, Id
     children: [imp, $0.slice(1)]
   };
 });
-var ImportDeclaration$1 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
-  var imports = value[4];
-  var from = value[6];
-  return { "type": "ImportDeclaration", "ts": true, "children": value, "imports": imports, "from": from };
-});
-var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-  var behavior = $4;
-  var imports = $6;
-  var from = $8;
+var ImportDeclaration$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(Import, __), ImpliedImport), Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var i = $1;
+  var behavior = $3;
+  var ws1 = $4;
+  var imports = $5;
+  var ws2 = $6;
+  var from = $7;
   imports.specifiers.forEach((spec) => {
     state.operators.set(spec.binding.name, spec.behavior ?? behavior);
   });
   return {
     type: "ImportDeclaration",
-    children: [$1, $2, trimFirstSpace($5), imports, $7, from],
-    // omit $3 = Operator and $4 = OperatorBehavior
+    children: [i, trimFirstSpace(ws1), imports, ws2, from],
+    // omit $2 = Operator and $3 = OperatorBehavior
     imports,
     from
   };
 });
-var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ImportClause, __, FromClause), function(value) {
-  var imports = value[2];
-  var from = value[4];
-  return { "type": "ImportDeclaration", "children": value, "imports": imports, "from": from };
+var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var t = $3;
+  var imports = $4;
+  var from = $6;
+  return {
+    type: "ImportDeclaration",
+    children: $0,
+    imports,
+    from,
+    ts: !!t
+  };
 });
-var ImportDeclaration$4 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
+var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
   var module2 = value[2];
   return { "type": "ImportDeclaration", "children": value, "module": module2 };
 });
-var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ImportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var i = $1;
   var t = $2;
   var imports = $3;
@@ -14798,22 +14817,40 @@ var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport
   const children = [i, t, imports, w, from];
   return { type: "ImportDeclaration", ts: !!t, children, imports, from };
 });
-var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  var i = $1;
-  var behavior = $3;
-  var imports = $5;
-  var from = $7;
+var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var behavior = $6;
+  var ows = $7;
+  var imports = $8;
   imports.specifiers.forEach((spec) => {
     state.operators.set(spec.binding.name, spec.behavior ?? behavior);
   });
   return {
     type: "ImportDeclaration",
-    children: [$1, trimFirstSpace($4), imports, $6, from],
-    // omit $2 = Operator and $3 = OperatorBehavior
+    children: [i, iws, trimFirstSpace(ows), imports, fws, from],
+    // omit Operator and OperatorBehavior
     imports,
     from
   };
 });
+var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var t = $5;
+  var imports = $6;
+  return {
+    type: "ImportDeclaration",
+    children: [i, iws, t, imports, fws, from],
+    imports,
+    from,
+    ts: !!t
+  };
+});
 var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3, ImportDeclaration$4, ImportDeclaration$5, ImportDeclaration$6];
 function ImportDeclaration(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ImportDeclaration", ImportDeclaration$$);
@@ -14898,6 +14935,21 @@ var FromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(From, __, ModuleSpec
 function FromClause(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "FromClause", FromClause$0);
 }
+var ImpliedFromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(From, __), ImpliedFrom), ModuleSpecifier), function($skip, $loc, $0, $1, $2) {
+  var module2 = $2;
+  if (!Array.isArray(module2))
+    return $0;
+  return [$1, ...module2];
+});
+function ImpliedFromClause(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFromClause", ImpliedFromClause$0);
+}
+var ImpliedFrom$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'ImpliedFrom ""'), function($skip, $loc, $0, $1) {
+  return { $loc, token: "from " };
+});
+function ImpliedFrom(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
+}
 var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L124, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L125, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var keyword = $2;
   var object = $5;
@@ -15030,7 +15082,7 @@ var UnprocessedModuleSpecifier$$ = [UnprocessedModuleSpecifier$0, UnprocessedMod
 function UnprocessedModuleSpecifier(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "UnprocessedModuleSpecifier", UnprocessedModuleSpecifier$$);
 }
-var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
+var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s=>]+/'), function($skip, $loc, $0, $1) {
   var spec = $0;
   return { $loc, token: `"${spec}"` };
 });
@@ -15083,13 +15135,26 @@ var ExportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_li
   return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
 });
 var ExportDeclaration$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-  return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
+  var exports2 = $3;
+  return { type: "ExportDeclaration", ts: exports2.ts, children: $0 };
+});
+var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var from = $1;
+  var fws = $2;
+  var e = $3;
+  var ews = $4;
+  var exports2 = $5;
+  return {
+    type: "ExportDeclaration",
+    ts: exports2.ts,
+    children: [e, ews, exports2, " ", from, trimFirstSpace(fws)]
+  };
 });
-var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ExportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var declaration = $4;
   return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
 });
-var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4];
+var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4, ExportDeclaration$5];
 function ExportDeclaration(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ExportDeclaration", ExportDeclaration$$);
 }

package/dist/main.mjs

@@ -7713,6 +7713,8 @@ var grammar = {
   NamedImports,
   OperatorNamedImports,
   FromClause,
+  ImpliedFromClause,
+  ImpliedFrom,
   ImportAssertion,
   TypeAndImportSpecifier,
   ImportSpecifier,
@@ -8397,7 +8399,7 @@ var $R28 = (0, import_lib4.$R)(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s)", "suy"));
 var $R29 = (0, import_lib4.$R)(new RegExp("[:.]", "suy"));
 var $R30 = (0, import_lib4.$R)(new RegExp("(?=for|if|loop|unless|until|while)", "suy"));
 var $R31 = (0, import_lib4.$R)(new RegExp("(?=loop|comptime|do|for|until|while)", "suy"));
-var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s]+', "suy"));
+var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s=>]+', "suy"));
 var $R33 = (0, import_lib4.$R)(new RegExp("(?=[0-9.])", "suy"));
 var $R34 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
 var $R35 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -9906,14 +9908,22 @@ var CallExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Super, Arguments
 var CallExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, NamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   return dynamizeImportDeclarationExpression($0);
 });
-var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(FromClause, __, Import, _, NamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var imports = $5;
+  return dynamizeImportDeclarationExpression([i, iws, imports, fws, from]);
+});
+var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
   var rest = $3;
   return processCallMemberExpression({
     type: "CallExpression",
     children: [$1, ...$2, ...rest.flat()]
   });
 });
-var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+var CallExpression$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
   var member = $1;
   var trailing = $2;
   var rest = $3;
@@ -9926,7 +9936,7 @@ var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression
   }
   return member;
 });
-var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3];
+var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3, CallExpression$4];
 function CallExpression(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "CallExpression", CallExpression$$);
 }
@@ -13956,9 +13966,12 @@ var ForBinding$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)(
 function ForBinding(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForBinding", ForBinding$0);
 }
-var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, import_lib4.$C)(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
-  var condition = $2;
-  var caseBlock = $3;
+var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, ForbidNewlineBinaryOp, (0, import_lib4.$E)((0, import_lib4.$C)(EmptyCondition, Condition)), RestoreNewlineBinaryOp, CaseBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var s = $1;
+  var condition = $3;
+  var caseBlock = $5;
+  if (!condition)
+    return $skip;
   if (condition.type === "EmptyCondition") {
     caseBlock.clauses.forEach(({ cases }) => {
       if (cases) {
@@ -13978,7 +13991,8 @@ var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, imp
   }
   return {
     type: "SwitchStatement",
-    children: $0,
+    children: [s, condition, caseBlock],
+    // omit NewlineBinaryOp control
     condition,
     caseBlock
   };
@@ -14346,8 +14360,8 @@ var SingleLineExpressionWithIndentedApplicationForbidden$0 = (0, import_lib4.$TS
 function SingleLineExpressionWithIndentedApplicationForbidden(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineExpressionWithIndentedApplicationForbidden", SingleLineExpressionWithIndentedApplicationForbidden$0);
 }
-var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib4.$E)(Expression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  var exp = $4;
+var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, (0, import_lib4.$E)(Expression), RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var exp = $3;
   if (exp)
     return exp;
   return $skip;
@@ -14736,36 +14750,41 @@ var ImportDeclaration$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, Id
     children: [imp, $0.slice(1)]
   };
 });
-var ImportDeclaration$1 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
-  var imports = value[4];
-  var from = value[6];
-  return { "type": "ImportDeclaration", "ts": true, "children": value, "imports": imports, "from": from };
-});
-var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-  var behavior = $4;
-  var imports = $6;
-  var from = $8;
+var ImportDeclaration$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(Import, __), ImpliedImport), Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var i = $1;
+  var behavior = $3;
+  var ws1 = $4;
+  var imports = $5;
+  var ws2 = $6;
+  var from = $7;
   imports.specifiers.forEach((spec) => {
     state.operators.set(spec.binding.name, spec.behavior ?? behavior);
   });
   return {
     type: "ImportDeclaration",
-    children: [$1, $2, trimFirstSpace($5), imports, $7, from],
-    // omit $3 = Operator and $4 = OperatorBehavior
+    children: [i, trimFirstSpace(ws1), imports, ws2, from],
+    // omit $2 = Operator and $3 = OperatorBehavior
     imports,
     from
   };
 });
-var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ImportClause, __, FromClause), function(value) {
-  var imports = value[2];
-  var from = value[4];
-  return { "type": "ImportDeclaration", "children": value, "imports": imports, "from": from };
+var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var t = $3;
+  var imports = $4;
+  var from = $6;
+  return {
+    type: "ImportDeclaration",
+    children: $0,
+    imports,
+    from,
+    ts: !!t
+  };
 });
-var ImportDeclaration$4 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
+var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
   var module = value[2];
   return { "type": "ImportDeclaration", "children": value, "module": module };
 });
-var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ImportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var i = $1;
   var t = $2;
   var imports = $3;
@@ -14778,22 +14797,40 @@ var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport
   const children = [i, t, imports, w, from];
   return { type: "ImportDeclaration", ts: !!t, children, imports, from };
 });
-var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-  var i = $1;
-  var behavior = $3;
-  var imports = $5;
-  var from = $7;
+var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var behavior = $6;
+  var ows = $7;
+  var imports = $8;
   imports.specifiers.forEach((spec) => {
     state.operators.set(spec.binding.name, spec.behavior ?? behavior);
   });
   return {
     type: "ImportDeclaration",
-    children: [$1, trimFirstSpace($4), imports, $6, from],
-    // omit $2 = Operator and $3 = OperatorBehavior
+    children: [i, iws, trimFirstSpace(ows), imports, fws, from],
+    // omit Operator and OperatorBehavior
     imports,
     from
   };
 });
+var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var from = $1;
+  var fws = $2;
+  var i = $3;
+  var iws = $4;
+  var t = $5;
+  var imports = $6;
+  return {
+    type: "ImportDeclaration",
+    children: [i, iws, t, imports, fws, from],
+    imports,
+    from,
+    ts: !!t
+  };
+});
 var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3, ImportDeclaration$4, ImportDeclaration$5, ImportDeclaration$6];
 function ImportDeclaration(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ImportDeclaration", ImportDeclaration$$);
@@ -14878,6 +14915,21 @@ var FromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(From, __, ModuleSpec
 function FromClause(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "FromClause", FromClause$0);
 }
+var ImpliedFromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$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_lib4.$EVENT)(ctx, state2, "ImpliedFromClause", ImpliedFromClause$0);
+}
+var ImpliedFrom$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'ImpliedFrom ""'), function($skip, $loc, $0, $1) {
+  return { $loc, token: "from " };
+});
+function ImpliedFrom(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
+}
 var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L124, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L125, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var keyword = $2;
   var object = $5;
@@ -15010,7 +15062,7 @@ var UnprocessedModuleSpecifier$$ = [UnprocessedModuleSpecifier$0, UnprocessedMod
 function UnprocessedModuleSpecifier(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "UnprocessedModuleSpecifier", UnprocessedModuleSpecifier$$);
 }
-var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
+var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s=>]+/'), function($skip, $loc, $0, $1) {
   var spec = $0;
   return { $loc, token: `"${spec}"` };
 });
@@ -15063,13 +15115,26 @@ var ExportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_li
   return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
 });
 var ExportDeclaration$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-  return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
+  var exports = $3;
+  return { type: "ExportDeclaration", ts: exports.ts, children: $0 };
+});
+var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var from = $1;
+  var fws = $2;
+  var e = $3;
+  var ews = $4;
+  var exports = $5;
+  return {
+    type: "ExportDeclaration",
+    ts: exports.ts,
+    children: [e, ews, exports, " ", from, trimFirstSpace(fws)]
+  };
 });
-var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ExportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var declaration = $4;
   return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
 });
-var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4];
+var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4, ExportDeclaration$5];
 function ExportDeclaration(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ExportDeclaration", ExportDeclaration$$);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -95,7 +95,7 @@
     "unplugin": "^1.12.2"
   },
   "devDependencies": {
-    "@danielx/civet": "0.8.4",
+    "@danielx/civet": "0.8.5",
     "@danielx/hera": "^0.8.16",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",