@danielx/civet 0.6.17 → 0.6.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/browser.js +105 -57
  2. package/dist/main.js +105 -57
  3. package/dist/main.mjs +105 -57
  4. package/package.json +1 -1
package/dist/browser.js CHANGED
@@ -3884,23 +3884,24 @@ ${input.slice(result.pos)}
3884
3884
  var $R46 = $R(new RegExp("[^\\r\\n]", "suy"));
3885
3885
  var $R47 = $R(new RegExp("[ \\t]+", "suy"));
3886
3886
  var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
3887
- var $R49 = $R(new RegExp("\\s", "suy"));
3888
- var $R50 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3889
- var $R51 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3890
- var $R52 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3891
- var $R53 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3892
- var $R54 = $R(new RegExp("[<>]", "suy"));
3893
- var $R55 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3894
- var $R56 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3895
- var $R57 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3896
- var $R58 = $R(new RegExp("[+-]?", "suy"));
3897
- var $R59 = $R(new RegExp("[+-]", "suy"));
3898
- var $R60 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3899
- var $R61 = $R(new RegExp("[\\t ]*", "suy"));
3900
- var $R62 = $R(new RegExp("[\\s]*", "suy"));
3901
- var $R63 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3902
- var $R64 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3903
- var $R65 = $R(new RegExp("[ \\t]*", "suy"));
3887
+ var $R49 = $R(new RegExp("['\u2019]s", "suy"));
3888
+ var $R50 = $R(new RegExp("\\s", "suy"));
3889
+ var $R51 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3890
+ var $R52 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3891
+ var $R53 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3892
+ var $R54 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3893
+ var $R55 = $R(new RegExp("[<>]", "suy"));
3894
+ var $R56 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3895
+ var $R57 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3896
+ var $R58 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3897
+ var $R59 = $R(new RegExp("[+-]?", "suy"));
3898
+ var $R60 = $R(new RegExp("[+-]", "suy"));
3899
+ var $R61 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3900
+ var $R62 = $R(new RegExp("[\\t ]*", "suy"));
3901
+ var $R63 = $R(new RegExp("[\\s]*", "suy"));
3902
+ var $R64 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3903
+ var $R65 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3904
+ var $R66 = $R(new RegExp("[ \\t]*", "suy"));
3904
3905
  var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
3905
3906
  var statements = $4;
3906
3907
  processProgram({
@@ -6648,6 +6649,8 @@ ${input.slice(result.pos)}
6648
6649
  var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
6649
6650
  var dot = $1;
6650
6651
  var str = $2;
6652
+ if (Array.isArray(dot))
6653
+ dot = dot[0];
6651
6654
  return {
6652
6655
  type: "Index",
6653
6656
  children: [
@@ -6660,6 +6663,8 @@ ${input.slice(result.pos)}
6660
6663
  var MemberBracketContent$2 = $TS($S(Dot, IntegerLiteral), function($skip, $loc, $0, $1, $2) {
6661
6664
  var dot = $1;
6662
6665
  var num = $2;
6666
+ if (Array.isArray(dot))
6667
+ dot = dot[0];
6663
6668
  return {
6664
6669
  type: "Index",
6665
6670
  children: [
@@ -9905,10 +9910,24 @@ ${input.slice(result.pos)}
9905
9910
  var NestedPropertyDefinition$0 = $TS($S(Nested, $P($S(PropertyDefinition, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
9906
9911
  var ws = $1;
9907
9912
  var inlineProps = $2;
9908
- return inlineProps.map(([prop, delimiter], i) => ({
9909
- ...prop,
9910
- children: [...i === 0 ? ws : [], ...prop.children, delimiter]
9911
- }));
9913
+ return inlineProps.flatMap(([prop, delim], i) => {
9914
+ if (!Array.isArray(prop))
9915
+ prop = [prop];
9916
+ if (i === 0) {
9917
+ const [first, ...rest] = prop;
9918
+ prop = [{ ...first, children: [...ws, ...first.children] }, ...rest];
9919
+ }
9920
+ const last = prop[prop.length - 1];
9921
+ prop = [
9922
+ ...prop.slice(0, prop.length - 1),
9923
+ {
9924
+ ...last,
9925
+ delim,
9926
+ children: [...last.children, delim]
9927
+ }
9928
+ ];
9929
+ return prop;
9930
+ });
9912
9931
  });
9913
9932
  function NestedPropertyDefinition(state) {
9914
9933
  let eventData;
@@ -10019,12 +10038,15 @@ ${input.slice(result.pos)}
10019
10038
  }
10020
10039
  }
10021
10040
  var PropertyDefinitionList$0 = $TV($P($S(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
10022
- return $0.map(([prop, delim]) => {
10023
- return {
10024
- ...prop,
10041
+ return $0.flatMap(([prop, delim]) => {
10042
+ prop = Array.isArray(prop) ? prop : [prop];
10043
+ let last = prop[prop.length - 1];
10044
+ last = {
10045
+ ...last,
10025
10046
  delim,
10026
- children: [...prop.children, delim]
10047
+ children: [...last.children, delim]
10027
10048
  };
10049
+ return [...prop.slice(0, prop.length - 1), last];
10028
10050
  });
10029
10051
  });
10030
10052
  function PropertyDefinitionList(state) {
@@ -10108,8 +10130,19 @@ ${input.slice(result.pos)}
10108
10130
  var PropertyDefinition$5 = $TS($S(__, CallExpression), function($skip, $loc, $0, $1, $2) {
10109
10131
  var ws = $1;
10110
10132
  var value = $2;
10111
- if (value.type === "Identifier") {
10112
- return { ...value, children: [ws, ...value.children] };
10133
+ switch (value.type) {
10134
+ case "Identifier":
10135
+ return { ...value, children: [ws, ...value.children] };
10136
+ case "ObjectExpression":
10137
+ let first = value.properties[0];
10138
+ if (first) {
10139
+ first = {
10140
+ ...first,
10141
+ children: [ws, ...first.children],
10142
+ hoistDec: value.hoistDec
10143
+ };
10144
+ }
10145
+ return [first, ...value.properties.slice(1)];
10113
10146
  }
10114
10147
  const last = lastAccessInCallExpression(value);
10115
10148
  if (!last)
@@ -17529,6 +17562,13 @@ ${input.slice(result.pos)}
17529
17562
  var Dot$0 = $TV($EXPECT($L6, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
17530
17563
  return { $loc, token: $1 };
17531
17564
  });
17565
+ var Dot$1 = $TS($S($EXPECT($R49, fail, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
17566
+ var ws = $2;
17567
+ return [
17568
+ { $loc, token: "." },
17569
+ insertTrimmingSpace(ws, "")
17570
+ ];
17571
+ });
17532
17572
  function Dot(state) {
17533
17573
  let eventData;
17534
17574
  if (state.events) {
@@ -17540,12 +17580,12 @@ ${input.slice(result.pos)}
17540
17580
  }
17541
17581
  }
17542
17582
  if (state.tokenize) {
17543
- const result = $TOKEN("Dot", state, Dot$0(state));
17583
+ const result = $TOKEN("Dot", state, Dot$0(state) || Dot$1(state));
17544
17584
  if (state.events)
17545
17585
  state.events.exit?.("Dot", state, result, eventData);
17546
17586
  return result;
17547
17587
  } else {
17548
- const result = Dot$0(state);
17588
+ const result = Dot$0(state) || Dot$1(state);
17549
17589
  if (state.events)
17550
17590
  state.events.exit?.("Dot", state, result, eventData);
17551
17591
  return result;
@@ -17907,7 +17947,7 @@ ${input.slice(result.pos)}
17907
17947
  return result;
17908
17948
  }
17909
17949
  }
17910
- var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R49, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17950
+ var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17911
17951
  return { $loc, token: $1 };
17912
17952
  });
17913
17953
  function Import(state) {
@@ -19485,7 +19525,7 @@ ${input.slice(result.pos)}
19485
19525
  return result;
19486
19526
  }
19487
19527
  }
19488
- var JSXIdentifierName$0 = $R$0($EXPECT($R50, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19528
+ var JSXIdentifierName$0 = $R$0($EXPECT($R51, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19489
19529
  function JSXIdentifierName(state) {
19490
19530
  let eventData;
19491
19531
  if (state.events) {
@@ -19723,7 +19763,7 @@ ${input.slice(result.pos)}
19723
19763
  return result;
19724
19764
  }
19725
19765
  }
19726
- var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19766
+ var JSXAttributeSpace$0 = $R$0($EXPECT($R52, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19727
19767
  function JSXAttributeSpace(state) {
19728
19768
  let eventData;
19729
19769
  if (state.events) {
@@ -19746,7 +19786,7 @@ ${input.slice(result.pos)}
19746
19786
  return result;
19747
19787
  }
19748
19788
  }
19749
- var JSXShorthandString$0 = $TR($EXPECT($R52, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19789
+ var JSXShorthandString$0 = $TR($EXPECT($R53, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19750
19790
  return quoteString($0);
19751
19791
  });
19752
19792
  var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -19835,7 +19875,7 @@ ${input.slice(result.pos)}
19835
19875
  }
19836
19876
  return [open, value, close];
19837
19877
  });
19838
- var JSXAttributeValue$4 = $R$0($EXPECT($R53, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19878
+ var JSXAttributeValue$4 = $R$0($EXPECT($R54, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19839
19879
  function JSXAttributeValue(state) {
19840
19880
  let eventData;
19841
19881
  if (state.events) {
@@ -19885,7 +19925,7 @@ ${input.slice(result.pos)}
19885
19925
  return result;
19886
19926
  }
19887
19927
  }
19888
- var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R54, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19928
+ var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R55, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19889
19929
  var op = $2;
19890
19930
  var rhs = $3;
19891
19931
  return [[], op, [], rhs];
@@ -19940,7 +19980,7 @@ ${input.slice(result.pos)}
19940
19980
  return result;
19941
19981
  }
19942
19982
  }
19943
- var InlineJSXUnaryOp$0 = $TR($EXPECT($R55, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19983
+ var InlineJSXUnaryOp$0 = $TR($EXPECT($R56, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19944
19984
  return { $loc, token: $0 };
19945
19985
  });
19946
19986
  function InlineJSXUnaryOp(state) {
@@ -20430,7 +20470,7 @@ ${input.slice(result.pos)}
20430
20470
  return result;
20431
20471
  }
20432
20472
  }
20433
- var JSXCommentContent$0 = $TR($EXPECT($R56, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20473
+ var JSXCommentContent$0 = $TR($EXPECT($R57, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20434
20474
  return { $loc, token: $0.replace(/\*\//g, "* /") };
20435
20475
  });
20436
20476
  function JSXCommentContent(state) {
@@ -20455,7 +20495,7 @@ ${input.slice(result.pos)}
20455
20495
  return result;
20456
20496
  }
20457
20497
  }
20458
- var JSXText$0 = $TR($EXPECT($R57, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20498
+ var JSXText$0 = $TR($EXPECT($R58, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20459
20499
  return {
20460
20500
  type: "JSXText",
20461
20501
  token: $0,
@@ -21423,7 +21463,7 @@ ${input.slice(result.pos)}
21423
21463
  return result;
21424
21464
  }
21425
21465
  }
21426
- var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21466
+ var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R60, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21427
21467
  function TypeIndexSignature(state) {
21428
21468
  let eventData;
21429
21469
  if (state.events) {
@@ -21874,17 +21914,25 @@ ${input.slice(result.pos)}
21874
21914
  return result;
21875
21915
  }
21876
21916
  }
21877
- var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
21878
- var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
21917
+ var TypeElement$0 = $TS($S(__, IdentifierName, $E(_), DotDotDot, $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
21918
+ var ws = $1;
21919
+ var name = $2;
21920
+ var space = $3;
21921
+ var dots = $4;
21922
+ var colon = $5;
21923
+ var type = $6;
21924
+ return [ws, dots, space, name, colon, type];
21925
+ });
21926
+ var TypeElement$1 = $TS($S(Type, $E(_), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
21879
21927
  var type = $1;
21880
- var dots = $2;
21881
- if (!dots)
21882
- return type;
21928
+ var space = $2;
21929
+ var dots = $3;
21883
21930
  const ws = getTrimmingSpace(type);
21884
21931
  if (!ws)
21885
- return [dots[1], dots[0], type];
21886
- return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
21932
+ return [dots, space, type];
21933
+ return [ws, dots, space, insertTrimmingSpace(type, "")];
21887
21934
  });
21935
+ var TypeElement$2 = $S($E($S(__, DotDotDot)), $E($S(__, IdentifierName, __, $E($S(QuestionMark, $E(_))), Colon, __)), Type);
21888
21936
  function TypeElement(state) {
21889
21937
  let eventData;
21890
21938
  if (state.events) {
@@ -21896,12 +21944,12 @@ ${input.slice(result.pos)}
21896
21944
  }
21897
21945
  }
21898
21946
  if (state.tokenize) {
21899
- const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
21947
+ const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state));
21900
21948
  if (state.events)
21901
21949
  state.events.exit?.("TypeElement", state, result, eventData);
21902
21950
  return result;
21903
21951
  } else {
21904
- const result = TypeElement$0(state) || TypeElement$1(state);
21952
+ const result = TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state);
21905
21953
  if (state.events)
21906
21954
  state.events.exit?.("TypeElement", state, result, eventData);
21907
21955
  return result;
@@ -21935,7 +21983,7 @@ ${input.slice(result.pos)}
21935
21983
  return result;
21936
21984
  }
21937
21985
  }
21938
- var NestedType$0 = $S(Nested, Type, ArrayElementDelimiter);
21986
+ var NestedType$0 = $S(Nested, TypeElement, ArrayElementDelimiter);
21939
21987
  function NestedType(state) {
21940
21988
  let eventData;
21941
21989
  if (state.events) {
@@ -22498,7 +22546,7 @@ ${input.slice(result.pos)}
22498
22546
  return result;
22499
22547
  }
22500
22548
  }
22501
- var Shebang$0 = $S($R$0($EXPECT($R60, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22549
+ var Shebang$0 = $S($R$0($EXPECT($R61, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22502
22550
  function Shebang(state) {
22503
22551
  let eventData;
22504
22552
  if (state.events) {
@@ -22521,11 +22569,11 @@ ${input.slice(result.pos)}
22521
22569
  return result;
22522
22570
  }
22523
22571
  }
22524
- var CivetPrologue$0 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22572
+ var CivetPrologue$0 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22525
22573
  var content = value[2];
22526
22574
  return content;
22527
22575
  });
22528
- var CivetPrologue$1 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22576
+ var CivetPrologue$1 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22529
22577
  var content = value[2];
22530
22578
  return content;
22531
22579
  });
@@ -22551,7 +22599,7 @@ ${input.slice(result.pos)}
22551
22599
  return result;
22552
22600
  }
22553
22601
  }
22554
- var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R62, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22602
+ var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22555
22603
  var options = $3;
22556
22604
  return {
22557
22605
  type: "CivetPrologue",
@@ -22581,7 +22629,7 @@ ${input.slice(result.pos)}
22581
22629
  return result;
22582
22630
  }
22583
22631
  }
22584
- var CivetOption$0 = $TR($EXPECT($R63, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22632
+ var CivetOption$0 = $TR($EXPECT($R64, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22585
22633
  const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
22586
22634
  if (l)
22587
22635
  return l.toUpperCase();
@@ -22617,7 +22665,7 @@ ${input.slice(result.pos)}
22617
22665
  return result;
22618
22666
  }
22619
22667
  }
22620
- var UnknownPrologue$0 = $S($R$0($EXPECT($R61, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22668
+ var UnknownPrologue$0 = $S($R$0($EXPECT($R62, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22621
22669
  function UnknownPrologue(state) {
22622
22670
  let eventData;
22623
22671
  if (state.events) {
@@ -22687,7 +22735,7 @@ ${input.slice(result.pos)}
22687
22735
  return result;
22688
22736
  }
22689
22737
  }
22690
- var EOL$0 = $TR($EXPECT($R64, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22738
+ var EOL$0 = $TR($EXPECT($R65, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22691
22739
  return { $loc, token: $0 };
22692
22740
  });
22693
22741
  function EOL(state) {
@@ -23873,7 +23921,7 @@ ${input.slice(result.pos)}
23873
23921
  return result;
23874
23922
  }
23875
23923
  }
23876
- var Indent$0 = $TR($EXPECT($R65, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23924
+ var Indent$0 = $TR($EXPECT($R66, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23877
23925
  let level;
23878
23926
  if (module.config.tab) {
23879
23927
  const tabs = $0.match(/\t/g);
package/dist/main.js CHANGED
@@ -3883,23 +3883,24 @@ ${input.slice(result.pos)}
3883
3883
  var $R46 = $R(new RegExp("[^\\r\\n]", "suy"));
3884
3884
  var $R47 = $R(new RegExp("[ \\t]+", "suy"));
3885
3885
  var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
3886
- var $R49 = $R(new RegExp("\\s", "suy"));
3887
- var $R50 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3888
- var $R51 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3889
- var $R52 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3890
- var $R53 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3891
- var $R54 = $R(new RegExp("[<>]", "suy"));
3892
- var $R55 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3893
- var $R56 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3894
- var $R57 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3895
- var $R58 = $R(new RegExp("[+-]?", "suy"));
3896
- var $R59 = $R(new RegExp("[+-]", "suy"));
3897
- var $R60 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3898
- var $R61 = $R(new RegExp("[\\t ]*", "suy"));
3899
- var $R62 = $R(new RegExp("[\\s]*", "suy"));
3900
- var $R63 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3901
- var $R64 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3902
- var $R65 = $R(new RegExp("[ \\t]*", "suy"));
3886
+ var $R49 = $R(new RegExp("['\u2019]s", "suy"));
3887
+ var $R50 = $R(new RegExp("\\s", "suy"));
3888
+ var $R51 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3889
+ var $R52 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3890
+ var $R53 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3891
+ var $R54 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3892
+ var $R55 = $R(new RegExp("[<>]", "suy"));
3893
+ var $R56 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3894
+ var $R57 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3895
+ var $R58 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3896
+ var $R59 = $R(new RegExp("[+-]?", "suy"));
3897
+ var $R60 = $R(new RegExp("[+-]", "suy"));
3898
+ var $R61 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3899
+ var $R62 = $R(new RegExp("[\\t ]*", "suy"));
3900
+ var $R63 = $R(new RegExp("[\\s]*", "suy"));
3901
+ var $R64 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3902
+ var $R65 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3903
+ var $R66 = $R(new RegExp("[ \\t]*", "suy"));
3903
3904
  var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
3904
3905
  var statements = $4;
3905
3906
  processProgram({
@@ -6647,6 +6648,8 @@ ${input.slice(result.pos)}
6647
6648
  var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
6648
6649
  var dot = $1;
6649
6650
  var str = $2;
6651
+ if (Array.isArray(dot))
6652
+ dot = dot[0];
6650
6653
  return {
6651
6654
  type: "Index",
6652
6655
  children: [
@@ -6659,6 +6662,8 @@ ${input.slice(result.pos)}
6659
6662
  var MemberBracketContent$2 = $TS($S(Dot, IntegerLiteral), function($skip, $loc, $0, $1, $2) {
6660
6663
  var dot = $1;
6661
6664
  var num = $2;
6665
+ if (Array.isArray(dot))
6666
+ dot = dot[0];
6662
6667
  return {
6663
6668
  type: "Index",
6664
6669
  children: [
@@ -9904,10 +9909,24 @@ ${input.slice(result.pos)}
9904
9909
  var NestedPropertyDefinition$0 = $TS($S(Nested, $P($S(PropertyDefinition, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
9905
9910
  var ws = $1;
9906
9911
  var inlineProps = $2;
9907
- return inlineProps.map(([prop, delimiter], i) => ({
9908
- ...prop,
9909
- children: [...i === 0 ? ws : [], ...prop.children, delimiter]
9910
- }));
9912
+ return inlineProps.flatMap(([prop, delim], i) => {
9913
+ if (!Array.isArray(prop))
9914
+ prop = [prop];
9915
+ if (i === 0) {
9916
+ const [first, ...rest] = prop;
9917
+ prop = [{ ...first, children: [...ws, ...first.children] }, ...rest];
9918
+ }
9919
+ const last = prop[prop.length - 1];
9920
+ prop = [
9921
+ ...prop.slice(0, prop.length - 1),
9922
+ {
9923
+ ...last,
9924
+ delim,
9925
+ children: [...last.children, delim]
9926
+ }
9927
+ ];
9928
+ return prop;
9929
+ });
9911
9930
  });
9912
9931
  function NestedPropertyDefinition(state) {
9913
9932
  let eventData;
@@ -10018,12 +10037,15 @@ ${input.slice(result.pos)}
10018
10037
  }
10019
10038
  }
10020
10039
  var PropertyDefinitionList$0 = $TV($P($S(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
10021
- return $0.map(([prop, delim]) => {
10022
- return {
10023
- ...prop,
10040
+ return $0.flatMap(([prop, delim]) => {
10041
+ prop = Array.isArray(prop) ? prop : [prop];
10042
+ let last = prop[prop.length - 1];
10043
+ last = {
10044
+ ...last,
10024
10045
  delim,
10025
- children: [...prop.children, delim]
10046
+ children: [...last.children, delim]
10026
10047
  };
10048
+ return [...prop.slice(0, prop.length - 1), last];
10027
10049
  });
10028
10050
  });
10029
10051
  function PropertyDefinitionList(state) {
@@ -10107,8 +10129,19 @@ ${input.slice(result.pos)}
10107
10129
  var PropertyDefinition$5 = $TS($S(__, CallExpression), function($skip, $loc, $0, $1, $2) {
10108
10130
  var ws = $1;
10109
10131
  var value = $2;
10110
- if (value.type === "Identifier") {
10111
- return { ...value, children: [ws, ...value.children] };
10132
+ switch (value.type) {
10133
+ case "Identifier":
10134
+ return { ...value, children: [ws, ...value.children] };
10135
+ case "ObjectExpression":
10136
+ let first = value.properties[0];
10137
+ if (first) {
10138
+ first = {
10139
+ ...first,
10140
+ children: [ws, ...first.children],
10141
+ hoistDec: value.hoistDec
10142
+ };
10143
+ }
10144
+ return [first, ...value.properties.slice(1)];
10112
10145
  }
10113
10146
  const last = lastAccessInCallExpression(value);
10114
10147
  if (!last)
@@ -17528,6 +17561,13 @@ ${input.slice(result.pos)}
17528
17561
  var Dot$0 = $TV($EXPECT($L6, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
17529
17562
  return { $loc, token: $1 };
17530
17563
  });
17564
+ var Dot$1 = $TS($S($EXPECT($R49, fail, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
17565
+ var ws = $2;
17566
+ return [
17567
+ { $loc, token: "." },
17568
+ insertTrimmingSpace(ws, "")
17569
+ ];
17570
+ });
17531
17571
  function Dot(state) {
17532
17572
  let eventData;
17533
17573
  if (state.events) {
@@ -17539,12 +17579,12 @@ ${input.slice(result.pos)}
17539
17579
  }
17540
17580
  }
17541
17581
  if (state.tokenize) {
17542
- const result = $TOKEN("Dot", state, Dot$0(state));
17582
+ const result = $TOKEN("Dot", state, Dot$0(state) || Dot$1(state));
17543
17583
  if (state.events)
17544
17584
  state.events.exit?.("Dot", state, result, eventData);
17545
17585
  return result;
17546
17586
  } else {
17547
- const result = Dot$0(state);
17587
+ const result = Dot$0(state) || Dot$1(state);
17548
17588
  if (state.events)
17549
17589
  state.events.exit?.("Dot", state, result, eventData);
17550
17590
  return result;
@@ -17906,7 +17946,7 @@ ${input.slice(result.pos)}
17906
17946
  return result;
17907
17947
  }
17908
17948
  }
17909
- var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R49, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17949
+ var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17910
17950
  return { $loc, token: $1 };
17911
17951
  });
17912
17952
  function Import(state) {
@@ -19484,7 +19524,7 @@ ${input.slice(result.pos)}
19484
19524
  return result;
19485
19525
  }
19486
19526
  }
19487
- var JSXIdentifierName$0 = $R$0($EXPECT($R50, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19527
+ var JSXIdentifierName$0 = $R$0($EXPECT($R51, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19488
19528
  function JSXIdentifierName(state) {
19489
19529
  let eventData;
19490
19530
  if (state.events) {
@@ -19722,7 +19762,7 @@ ${input.slice(result.pos)}
19722
19762
  return result;
19723
19763
  }
19724
19764
  }
19725
- var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19765
+ var JSXAttributeSpace$0 = $R$0($EXPECT($R52, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19726
19766
  function JSXAttributeSpace(state) {
19727
19767
  let eventData;
19728
19768
  if (state.events) {
@@ -19745,7 +19785,7 @@ ${input.slice(result.pos)}
19745
19785
  return result;
19746
19786
  }
19747
19787
  }
19748
- var JSXShorthandString$0 = $TR($EXPECT($R52, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19788
+ var JSXShorthandString$0 = $TR($EXPECT($R53, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19749
19789
  return quoteString($0);
19750
19790
  });
19751
19791
  var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -19834,7 +19874,7 @@ ${input.slice(result.pos)}
19834
19874
  }
19835
19875
  return [open, value, close];
19836
19876
  });
19837
- var JSXAttributeValue$4 = $R$0($EXPECT($R53, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19877
+ var JSXAttributeValue$4 = $R$0($EXPECT($R54, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19838
19878
  function JSXAttributeValue(state) {
19839
19879
  let eventData;
19840
19880
  if (state.events) {
@@ -19884,7 +19924,7 @@ ${input.slice(result.pos)}
19884
19924
  return result;
19885
19925
  }
19886
19926
  }
19887
- var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R54, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19927
+ var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R55, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19888
19928
  var op = $2;
19889
19929
  var rhs = $3;
19890
19930
  return [[], op, [], rhs];
@@ -19939,7 +19979,7 @@ ${input.slice(result.pos)}
19939
19979
  return result;
19940
19980
  }
19941
19981
  }
19942
- var InlineJSXUnaryOp$0 = $TR($EXPECT($R55, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19982
+ var InlineJSXUnaryOp$0 = $TR($EXPECT($R56, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19943
19983
  return { $loc, token: $0 };
19944
19984
  });
19945
19985
  function InlineJSXUnaryOp(state) {
@@ -20429,7 +20469,7 @@ ${input.slice(result.pos)}
20429
20469
  return result;
20430
20470
  }
20431
20471
  }
20432
- var JSXCommentContent$0 = $TR($EXPECT($R56, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20472
+ var JSXCommentContent$0 = $TR($EXPECT($R57, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20433
20473
  return { $loc, token: $0.replace(/\*\//g, "* /") };
20434
20474
  });
20435
20475
  function JSXCommentContent(state) {
@@ -20454,7 +20494,7 @@ ${input.slice(result.pos)}
20454
20494
  return result;
20455
20495
  }
20456
20496
  }
20457
- var JSXText$0 = $TR($EXPECT($R57, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20497
+ var JSXText$0 = $TR($EXPECT($R58, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20458
20498
  return {
20459
20499
  type: "JSXText",
20460
20500
  token: $0,
@@ -21422,7 +21462,7 @@ ${input.slice(result.pos)}
21422
21462
  return result;
21423
21463
  }
21424
21464
  }
21425
- var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21465
+ var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R60, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21426
21466
  function TypeIndexSignature(state) {
21427
21467
  let eventData;
21428
21468
  if (state.events) {
@@ -21873,17 +21913,25 @@ ${input.slice(result.pos)}
21873
21913
  return result;
21874
21914
  }
21875
21915
  }
21876
- var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
21877
- var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
21916
+ var TypeElement$0 = $TS($S(__, IdentifierName, $E(_), DotDotDot, $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
21917
+ var ws = $1;
21918
+ var name = $2;
21919
+ var space = $3;
21920
+ var dots = $4;
21921
+ var colon = $5;
21922
+ var type = $6;
21923
+ return [ws, dots, space, name, colon, type];
21924
+ });
21925
+ var TypeElement$1 = $TS($S(Type, $E(_), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
21878
21926
  var type = $1;
21879
- var dots = $2;
21880
- if (!dots)
21881
- return type;
21927
+ var space = $2;
21928
+ var dots = $3;
21882
21929
  const ws = getTrimmingSpace(type);
21883
21930
  if (!ws)
21884
- return [dots[1], dots[0], type];
21885
- return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
21931
+ return [dots, space, type];
21932
+ return [ws, dots, space, insertTrimmingSpace(type, "")];
21886
21933
  });
21934
+ var TypeElement$2 = $S($E($S(__, DotDotDot)), $E($S(__, IdentifierName, __, $E($S(QuestionMark, $E(_))), Colon, __)), Type);
21887
21935
  function TypeElement(state) {
21888
21936
  let eventData;
21889
21937
  if (state.events) {
@@ -21895,12 +21943,12 @@ ${input.slice(result.pos)}
21895
21943
  }
21896
21944
  }
21897
21945
  if (state.tokenize) {
21898
- const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
21946
+ const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state));
21899
21947
  if (state.events)
21900
21948
  state.events.exit?.("TypeElement", state, result, eventData);
21901
21949
  return result;
21902
21950
  } else {
21903
- const result = TypeElement$0(state) || TypeElement$1(state);
21951
+ const result = TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state);
21904
21952
  if (state.events)
21905
21953
  state.events.exit?.("TypeElement", state, result, eventData);
21906
21954
  return result;
@@ -21934,7 +21982,7 @@ ${input.slice(result.pos)}
21934
21982
  return result;
21935
21983
  }
21936
21984
  }
21937
- var NestedType$0 = $S(Nested, Type, ArrayElementDelimiter);
21985
+ var NestedType$0 = $S(Nested, TypeElement, ArrayElementDelimiter);
21938
21986
  function NestedType(state) {
21939
21987
  let eventData;
21940
21988
  if (state.events) {
@@ -22497,7 +22545,7 @@ ${input.slice(result.pos)}
22497
22545
  return result;
22498
22546
  }
22499
22547
  }
22500
- var Shebang$0 = $S($R$0($EXPECT($R60, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22548
+ var Shebang$0 = $S($R$0($EXPECT($R61, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22501
22549
  function Shebang(state) {
22502
22550
  let eventData;
22503
22551
  if (state.events) {
@@ -22520,11 +22568,11 @@ ${input.slice(result.pos)}
22520
22568
  return result;
22521
22569
  }
22522
22570
  }
22523
- var CivetPrologue$0 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22571
+ var CivetPrologue$0 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22524
22572
  var content = value[2];
22525
22573
  return content;
22526
22574
  });
22527
- var CivetPrologue$1 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22575
+ var CivetPrologue$1 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22528
22576
  var content = value[2];
22529
22577
  return content;
22530
22578
  });
@@ -22550,7 +22598,7 @@ ${input.slice(result.pos)}
22550
22598
  return result;
22551
22599
  }
22552
22600
  }
22553
- var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R62, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22601
+ var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22554
22602
  var options = $3;
22555
22603
  return {
22556
22604
  type: "CivetPrologue",
@@ -22580,7 +22628,7 @@ ${input.slice(result.pos)}
22580
22628
  return result;
22581
22629
  }
22582
22630
  }
22583
- var CivetOption$0 = $TR($EXPECT($R63, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22631
+ var CivetOption$0 = $TR($EXPECT($R64, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22584
22632
  const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
22585
22633
  if (l)
22586
22634
  return l.toUpperCase();
@@ -22616,7 +22664,7 @@ ${input.slice(result.pos)}
22616
22664
  return result;
22617
22665
  }
22618
22666
  }
22619
- var UnknownPrologue$0 = $S($R$0($EXPECT($R61, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22667
+ var UnknownPrologue$0 = $S($R$0($EXPECT($R62, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22620
22668
  function UnknownPrologue(state) {
22621
22669
  let eventData;
22622
22670
  if (state.events) {
@@ -22686,7 +22734,7 @@ ${input.slice(result.pos)}
22686
22734
  return result;
22687
22735
  }
22688
22736
  }
22689
- var EOL$0 = $TR($EXPECT($R64, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22737
+ var EOL$0 = $TR($EXPECT($R65, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22690
22738
  return { $loc, token: $0 };
22691
22739
  });
22692
22740
  function EOL(state) {
@@ -23872,7 +23920,7 @@ ${input.slice(result.pos)}
23872
23920
  return result;
23873
23921
  }
23874
23922
  }
23875
- var Indent$0 = $TR($EXPECT($R65, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23923
+ var Indent$0 = $TR($EXPECT($R66, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23876
23924
  let level;
23877
23925
  if (module2.config.tab) {
23878
23926
  const tabs = $0.match(/\t/g);
package/dist/main.mjs CHANGED
@@ -3881,23 +3881,24 @@ ${input.slice(result.pos)}
3881
3881
  var $R46 = $R(new RegExp("[^\\r\\n]", "suy"));
3882
3882
  var $R47 = $R(new RegExp("[ \\t]+", "suy"));
3883
3883
  var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
3884
- var $R49 = $R(new RegExp("\\s", "suy"));
3885
- var $R50 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3886
- var $R51 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3887
- var $R52 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3888
- var $R53 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3889
- var $R54 = $R(new RegExp("[<>]", "suy"));
3890
- var $R55 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3891
- var $R56 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3892
- var $R57 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3893
- var $R58 = $R(new RegExp("[+-]?", "suy"));
3894
- var $R59 = $R(new RegExp("[+-]", "suy"));
3895
- var $R60 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3896
- var $R61 = $R(new RegExp("[\\t ]*", "suy"));
3897
- var $R62 = $R(new RegExp("[\\s]*", "suy"));
3898
- var $R63 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3899
- var $R64 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3900
- var $R65 = $R(new RegExp("[ \\t]*", "suy"));
3884
+ var $R49 = $R(new RegExp("['\u2019]s", "suy"));
3885
+ var $R50 = $R(new RegExp("\\s", "suy"));
3886
+ var $R51 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
3887
+ var $R52 = $R(new RegExp("[\\s>]|\\/>", "suy"));
3888
+ var $R53 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
3889
+ var $R54 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
3890
+ var $R55 = $R(new RegExp("[<>]", "suy"));
3891
+ var $R56 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
3892
+ var $R57 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
3893
+ var $R58 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
3894
+ var $R59 = $R(new RegExp("[+-]?", "suy"));
3895
+ var $R60 = $R(new RegExp("[+-]", "suy"));
3896
+ var $R61 = $R(new RegExp("#![^\\r\\n]*", "suy"));
3897
+ var $R62 = $R(new RegExp("[\\t ]*", "suy"));
3898
+ var $R63 = $R(new RegExp("[\\s]*", "suy"));
3899
+ var $R64 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
3900
+ var $R65 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
3901
+ var $R66 = $R(new RegExp("[ \\t]*", "suy"));
3901
3902
  var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
3902
3903
  var statements = $4;
3903
3904
  processProgram({
@@ -6645,6 +6646,8 @@ ${input.slice(result.pos)}
6645
6646
  var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
6646
6647
  var dot = $1;
6647
6648
  var str = $2;
6649
+ if (Array.isArray(dot))
6650
+ dot = dot[0];
6648
6651
  return {
6649
6652
  type: "Index",
6650
6653
  children: [
@@ -6657,6 +6660,8 @@ ${input.slice(result.pos)}
6657
6660
  var MemberBracketContent$2 = $TS($S(Dot, IntegerLiteral), function($skip, $loc, $0, $1, $2) {
6658
6661
  var dot = $1;
6659
6662
  var num = $2;
6663
+ if (Array.isArray(dot))
6664
+ dot = dot[0];
6660
6665
  return {
6661
6666
  type: "Index",
6662
6667
  children: [
@@ -9902,10 +9907,24 @@ ${input.slice(result.pos)}
9902
9907
  var NestedPropertyDefinition$0 = $TS($S(Nested, $P($S(PropertyDefinition, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
9903
9908
  var ws = $1;
9904
9909
  var inlineProps = $2;
9905
- return inlineProps.map(([prop, delimiter], i) => ({
9906
- ...prop,
9907
- children: [...i === 0 ? ws : [], ...prop.children, delimiter]
9908
- }));
9910
+ return inlineProps.flatMap(([prop, delim], i) => {
9911
+ if (!Array.isArray(prop))
9912
+ prop = [prop];
9913
+ if (i === 0) {
9914
+ const [first, ...rest] = prop;
9915
+ prop = [{ ...first, children: [...ws, ...first.children] }, ...rest];
9916
+ }
9917
+ const last = prop[prop.length - 1];
9918
+ prop = [
9919
+ ...prop.slice(0, prop.length - 1),
9920
+ {
9921
+ ...last,
9922
+ delim,
9923
+ children: [...last.children, delim]
9924
+ }
9925
+ ];
9926
+ return prop;
9927
+ });
9909
9928
  });
9910
9929
  function NestedPropertyDefinition(state) {
9911
9930
  let eventData;
@@ -10016,12 +10035,15 @@ ${input.slice(result.pos)}
10016
10035
  }
10017
10036
  }
10018
10037
  var PropertyDefinitionList$0 = $TV($P($S(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
10019
- return $0.map(([prop, delim]) => {
10020
- return {
10021
- ...prop,
10038
+ return $0.flatMap(([prop, delim]) => {
10039
+ prop = Array.isArray(prop) ? prop : [prop];
10040
+ let last = prop[prop.length - 1];
10041
+ last = {
10042
+ ...last,
10022
10043
  delim,
10023
- children: [...prop.children, delim]
10044
+ children: [...last.children, delim]
10024
10045
  };
10046
+ return [...prop.slice(0, prop.length - 1), last];
10025
10047
  });
10026
10048
  });
10027
10049
  function PropertyDefinitionList(state) {
@@ -10105,8 +10127,19 @@ ${input.slice(result.pos)}
10105
10127
  var PropertyDefinition$5 = $TS($S(__, CallExpression), function($skip, $loc, $0, $1, $2) {
10106
10128
  var ws = $1;
10107
10129
  var value = $2;
10108
- if (value.type === "Identifier") {
10109
- return { ...value, children: [ws, ...value.children] };
10130
+ switch (value.type) {
10131
+ case "Identifier":
10132
+ return { ...value, children: [ws, ...value.children] };
10133
+ case "ObjectExpression":
10134
+ let first = value.properties[0];
10135
+ if (first) {
10136
+ first = {
10137
+ ...first,
10138
+ children: [ws, ...first.children],
10139
+ hoistDec: value.hoistDec
10140
+ };
10141
+ }
10142
+ return [first, ...value.properties.slice(1)];
10110
10143
  }
10111
10144
  const last = lastAccessInCallExpression(value);
10112
10145
  if (!last)
@@ -17526,6 +17559,13 @@ ${input.slice(result.pos)}
17526
17559
  var Dot$0 = $TV($EXPECT($L6, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
17527
17560
  return { $loc, token: $1 };
17528
17561
  });
17562
+ var Dot$1 = $TS($S($EXPECT($R49, fail, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
17563
+ var ws = $2;
17564
+ return [
17565
+ { $loc, token: "." },
17566
+ insertTrimmingSpace(ws, "")
17567
+ ];
17568
+ });
17529
17569
  function Dot(state) {
17530
17570
  let eventData;
17531
17571
  if (state.events) {
@@ -17537,12 +17577,12 @@ ${input.slice(result.pos)}
17537
17577
  }
17538
17578
  }
17539
17579
  if (state.tokenize) {
17540
- const result = $TOKEN("Dot", state, Dot$0(state));
17580
+ const result = $TOKEN("Dot", state, Dot$0(state) || Dot$1(state));
17541
17581
  if (state.events)
17542
17582
  state.events.exit?.("Dot", state, result, eventData);
17543
17583
  return result;
17544
17584
  } else {
17545
- const result = Dot$0(state);
17585
+ const result = Dot$0(state) || Dot$1(state);
17546
17586
  if (state.events)
17547
17587
  state.events.exit?.("Dot", state, result, eventData);
17548
17588
  return result;
@@ -17904,7 +17944,7 @@ ${input.slice(result.pos)}
17904
17944
  return result;
17905
17945
  }
17906
17946
  }
17907
- var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R49, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17947
+ var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
17908
17948
  return { $loc, token: $1 };
17909
17949
  });
17910
17950
  function Import(state) {
@@ -19482,7 +19522,7 @@ ${input.slice(result.pos)}
19482
19522
  return result;
19483
19523
  }
19484
19524
  }
19485
- var JSXIdentifierName$0 = $R$0($EXPECT($R50, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19525
+ var JSXIdentifierName$0 = $R$0($EXPECT($R51, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
19486
19526
  function JSXIdentifierName(state) {
19487
19527
  let eventData;
19488
19528
  if (state.events) {
@@ -19720,7 +19760,7 @@ ${input.slice(result.pos)}
19720
19760
  return result;
19721
19761
  }
19722
19762
  }
19723
- var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19763
+ var JSXAttributeSpace$0 = $R$0($EXPECT($R52, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
19724
19764
  function JSXAttributeSpace(state) {
19725
19765
  let eventData;
19726
19766
  if (state.events) {
@@ -19743,7 +19783,7 @@ ${input.slice(result.pos)}
19743
19783
  return result;
19744
19784
  }
19745
19785
  }
19746
- var JSXShorthandString$0 = $TR($EXPECT($R52, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19786
+ var JSXShorthandString$0 = $TR($EXPECT($R53, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19747
19787
  return quoteString($0);
19748
19788
  });
19749
19789
  var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -19832,7 +19872,7 @@ ${input.slice(result.pos)}
19832
19872
  }
19833
19873
  return [open, value, close];
19834
19874
  });
19835
- var JSXAttributeValue$4 = $R$0($EXPECT($R53, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19875
+ var JSXAttributeValue$4 = $R$0($EXPECT($R54, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
19836
19876
  function JSXAttributeValue(state) {
19837
19877
  let eventData;
19838
19878
  if (state.events) {
@@ -19882,7 +19922,7 @@ ${input.slice(result.pos)}
19882
19922
  return result;
19883
19923
  }
19884
19924
  }
19885
- var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R54, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19925
+ var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R55, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
19886
19926
  var op = $2;
19887
19927
  var rhs = $3;
19888
19928
  return [[], op, [], rhs];
@@ -19937,7 +19977,7 @@ ${input.slice(result.pos)}
19937
19977
  return result;
19938
19978
  }
19939
19979
  }
19940
- var InlineJSXUnaryOp$0 = $TR($EXPECT($R55, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19980
+ var InlineJSXUnaryOp$0 = $TR($EXPECT($R56, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
19941
19981
  return { $loc, token: $0 };
19942
19982
  });
19943
19983
  function InlineJSXUnaryOp(state) {
@@ -20427,7 +20467,7 @@ ${input.slice(result.pos)}
20427
20467
  return result;
20428
20468
  }
20429
20469
  }
20430
- var JSXCommentContent$0 = $TR($EXPECT($R56, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20470
+ var JSXCommentContent$0 = $TR($EXPECT($R57, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20431
20471
  return { $loc, token: $0.replace(/\*\//g, "* /") };
20432
20472
  });
20433
20473
  function JSXCommentContent(state) {
@@ -20452,7 +20492,7 @@ ${input.slice(result.pos)}
20452
20492
  return result;
20453
20493
  }
20454
20494
  }
20455
- var JSXText$0 = $TR($EXPECT($R57, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20495
+ var JSXText$0 = $TR($EXPECT($R58, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
20456
20496
  return {
20457
20497
  type: "JSXText",
20458
20498
  token: $0,
@@ -21420,7 +21460,7 @@ ${input.slice(result.pos)}
21420
21460
  return result;
21421
21461
  }
21422
21462
  }
21423
- var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21463
+ var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R60, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
21424
21464
  function TypeIndexSignature(state) {
21425
21465
  let eventData;
21426
21466
  if (state.events) {
@@ -21871,17 +21911,25 @@ ${input.slice(result.pos)}
21871
21911
  return result;
21872
21912
  }
21873
21913
  }
21874
- var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
21875
- var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
21914
+ var TypeElement$0 = $TS($S(__, IdentifierName, $E(_), DotDotDot, $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
21915
+ var ws = $1;
21916
+ var name = $2;
21917
+ var space = $3;
21918
+ var dots = $4;
21919
+ var colon = $5;
21920
+ var type = $6;
21921
+ return [ws, dots, space, name, colon, type];
21922
+ });
21923
+ var TypeElement$1 = $TS($S(Type, $E(_), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
21876
21924
  var type = $1;
21877
- var dots = $2;
21878
- if (!dots)
21879
- return type;
21925
+ var space = $2;
21926
+ var dots = $3;
21880
21927
  const ws = getTrimmingSpace(type);
21881
21928
  if (!ws)
21882
- return [dots[1], dots[0], type];
21883
- return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
21929
+ return [dots, space, type];
21930
+ return [ws, dots, space, insertTrimmingSpace(type, "")];
21884
21931
  });
21932
+ var TypeElement$2 = $S($E($S(__, DotDotDot)), $E($S(__, IdentifierName, __, $E($S(QuestionMark, $E(_))), Colon, __)), Type);
21885
21933
  function TypeElement(state) {
21886
21934
  let eventData;
21887
21935
  if (state.events) {
@@ -21893,12 +21941,12 @@ ${input.slice(result.pos)}
21893
21941
  }
21894
21942
  }
21895
21943
  if (state.tokenize) {
21896
- const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
21944
+ const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state));
21897
21945
  if (state.events)
21898
21946
  state.events.exit?.("TypeElement", state, result, eventData);
21899
21947
  return result;
21900
21948
  } else {
21901
- const result = TypeElement$0(state) || TypeElement$1(state);
21949
+ const result = TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state);
21902
21950
  if (state.events)
21903
21951
  state.events.exit?.("TypeElement", state, result, eventData);
21904
21952
  return result;
@@ -21932,7 +21980,7 @@ ${input.slice(result.pos)}
21932
21980
  return result;
21933
21981
  }
21934
21982
  }
21935
- var NestedType$0 = $S(Nested, Type, ArrayElementDelimiter);
21983
+ var NestedType$0 = $S(Nested, TypeElement, ArrayElementDelimiter);
21936
21984
  function NestedType(state) {
21937
21985
  let eventData;
21938
21986
  if (state.events) {
@@ -22495,7 +22543,7 @@ ${input.slice(result.pos)}
22495
22543
  return result;
22496
22544
  }
22497
22545
  }
22498
- var Shebang$0 = $S($R$0($EXPECT($R60, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22546
+ var Shebang$0 = $S($R$0($EXPECT($R61, fail, "Shebang /#![^\\r\\n]*/")), EOL);
22499
22547
  function Shebang(state) {
22500
22548
  let eventData;
22501
22549
  if (state.events) {
@@ -22518,11 +22566,11 @@ ${input.slice(result.pos)}
22518
22566
  return result;
22519
22567
  }
22520
22568
  }
22521
- var CivetPrologue$0 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22569
+ var CivetPrologue$0 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22522
22570
  var content = value[2];
22523
22571
  return content;
22524
22572
  });
22525
- var CivetPrologue$1 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22573
+ var CivetPrologue$1 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
22526
22574
  var content = value[2];
22527
22575
  return content;
22528
22576
  });
@@ -22548,7 +22596,7 @@ ${input.slice(result.pos)}
22548
22596
  return result;
22549
22597
  }
22550
22598
  }
22551
- var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R62, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22599
+ var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
22552
22600
  var options = $3;
22553
22601
  return {
22554
22602
  type: "CivetPrologue",
@@ -22578,7 +22626,7 @@ ${input.slice(result.pos)}
22578
22626
  return result;
22579
22627
  }
22580
22628
  }
22581
- var CivetOption$0 = $TR($EXPECT($R63, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22629
+ var CivetOption$0 = $TR($EXPECT($R64, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22582
22630
  const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
22583
22631
  if (l)
22584
22632
  return l.toUpperCase();
@@ -22614,7 +22662,7 @@ ${input.slice(result.pos)}
22614
22662
  return result;
22615
22663
  }
22616
22664
  }
22617
- var UnknownPrologue$0 = $S($R$0($EXPECT($R61, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22665
+ var UnknownPrologue$0 = $S($R$0($EXPECT($R62, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
22618
22666
  function UnknownPrologue(state) {
22619
22667
  let eventData;
22620
22668
  if (state.events) {
@@ -22684,7 +22732,7 @@ ${input.slice(result.pos)}
22684
22732
  return result;
22685
22733
  }
22686
22734
  }
22687
- var EOL$0 = $TR($EXPECT($R64, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22735
+ var EOL$0 = $TR($EXPECT($R65, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
22688
22736
  return { $loc, token: $0 };
22689
22737
  });
22690
22738
  function EOL(state) {
@@ -23870,7 +23918,7 @@ ${input.slice(result.pos)}
23870
23918
  return result;
23871
23919
  }
23872
23920
  }
23873
- var Indent$0 = $TR($EXPECT($R65, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23921
+ var Indent$0 = $TR($EXPECT($R66, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
23874
23922
  let level;
23875
23923
  if (module.config.tab) {
23876
23924
  const tabs = $0.match(/\t/g);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@danielx/civet",
3
- "version": "0.6.17",
3
+ "version": "0.6.18",
4
4
  "description": "CoffeeScript style syntax for TypeScript",
5
5
  "main": "dist/main.js",
6
6
  "module": "dist/main.mjs",