@danielx/civet 0.9.6 → 0.9.7

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.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,12 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
4
4
  For each version of Civet, it lists and links to all incorporated PRs,
5
5
  as well as a full diff and commit list.
6
6
 
7
+ ## 0.9.7 (2025-02-24, [diff](https://github.com/DanielXMoore/Civet/compare/v0.9.6...v0.9.7), [commits](https://github.com/DanielXMoore/Civet/commits/v0.9.7))
8
+ * Allow binary operators after nested object literals and bulleted arrays, fix `++` with bulleted arrays [[#1688](https://github.com/DanielXMoore/Civet/pull/1688)]
9
+ * Fix bind property shorthand in JSX [[#1690](https://github.com/DanielXMoore/Civet/pull/1690)]
10
+ * Property `::` types with initializers are optional [[#1701](https://github.com/DanielXMoore/Civet/pull/1701)]
11
+ * Fix LSP when opening files without workspace [[#1702](https://github.com/DanielXMoore/Civet/pull/1702)]
12
+
7
13
  ## 0.9.6 (2025-01-06, [diff](https://github.com/DanielXMoore/Civet/compare/v0.9.5...v0.9.6), [commits](https://github.com/DanielXMoore/Civet/commits/v0.9.6))
8
14
  * `yield*` in pipeline [[#1670](https://github.com/DanielXMoore/Civet/pull/1670)]
9
15
  * Fix implicit return of pipeline with `return`/`throw` [[#1676](https://github.com/DanielXMoore/Civet/pull/1676)]
package/dist/browser.js CHANGED
@@ -1511,7 +1511,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
1511
1511
  type: "TypeSuffix",
1512
1512
  ts: !0,
1513
1513
  children: [": unknown"]
1514
- }, prop.type) {
1514
+ }, prop.initializer && !typeSuffix.optional && typeSuffix.children.unshift(typeSuffix.optional = "?"), prop.type) {
1515
1515
  case "BindingProperty": {
1516
1516
  let ws = prop.children.slice(0, prop.children.indexOf(prop.name));
1517
1517
  results2.push([...ws, prop.name, typeSuffix, prop.delim]);
@@ -6627,6 +6627,7 @@ ${js}`
6627
6627
  ExplicitPropertyGlob,
6628
6628
  PropertyGlob,
6629
6629
  PropertyBind,
6630
+ PropertyBindExplicitArguments,
6630
6631
  SuperProperty,
6631
6632
  MetaProperty,
6632
6633
  ReturnValue,
@@ -7689,10 +7690,14 @@ ${js}`
7689
7690
  function IsLike(ctx, state2) {
7690
7691
  return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
7691
7692
  }
7692
- var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
7693
+ var WRHS$0 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedBulletedArray), function(value) {
7694
+ return [void 0, value[0]];
7695
+ }), WRHS$1 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedImplicitObjectLiteral), function(value) {
7696
+ return [void 0, value[0]];
7697
+ }), WRHS$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
7693
7698
  var wrhs = $2;
7694
7699
  return wrhs || $skip;
7695
- }), WRHS$1 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS), WRHS$$ = [WRHS$0, WRHS$1];
7700
+ }), WRHS$3 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS), WRHS$$ = [WRHS$0, WRHS$1, WRHS$2, WRHS$3];
7696
7701
  function WRHS(ctx, state2) {
7697
7702
  return (0, import_lib2.$EVENT_C)(ctx, state2, "WRHS", WRHS$$);
7698
7703
  }
@@ -7787,11 +7792,12 @@ ${js}`
7787
7792
  function NWTypePostfix(ctx, state2) {
7788
7793
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NWTypePostfix", NWTypePostfix$$);
7789
7794
  }
7790
- var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
7795
+ var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$N)(Whitespace), UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2, $3) {
7796
+ var symbol = $1, assigned = $3;
7791
7797
  return {
7792
7798
  type: "UpdateExpression",
7793
- assigned: $2,
7794
- children: $0
7799
+ assigned,
7800
+ children: [symbol, assigned]
7795
7801
  };
7796
7802
  }), UpdateExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(LeftHandSideExpression, (0, import_lib2.$E)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$EXPECT)($R4, "UpdateExpression /(?!\\p{ID_Start}|[_$0-9(\\[{])/")))), function($skip, $loc, $0, $1, $2) {
7797
7803
  return $2 ? {
@@ -8837,6 +8843,20 @@ ${js}`
8837
8843
  function PropertyBind(ctx, state2) {
8838
8844
  return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBind", PropertyBind$0);
8839
8845
  }
8846
+ var PropertyBindExplicitArguments$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(PropertyAccessModifier), At, OptionalDot, (0, import_lib2.$C)(IdentifierName, PrivateIdentifier), (0, import_lib2.$E)(ExplicitArguments)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
8847
+ var modifier = $1, dot = $3, id = $4, args = $5;
8848
+ return {
8849
+ type: "PropertyBind",
8850
+ name: id.name,
8851
+ children: [modifier, dot, id],
8852
+ // omit `@` from children
8853
+ args: args?.children.slice(1, -1) ?? []
8854
+ // remove the parens from the arg list, or give an empty list
8855
+ };
8856
+ });
8857
+ function PropertyBindExplicitArguments(ctx, state2) {
8858
+ return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBindExplicitArguments", PropertyBindExplicitArguments$0);
8859
+ }
8840
8860
  var SuperProperty$0 = (0, import_lib2.$S)(Super, MemberBracketContent), SuperProperty$1 = (0, import_lib2.$S)(Super, (0, import_lib2.$N)(PropertyAccessModifier), PropertyAccess), SuperProperty$$ = [SuperProperty$0, SuperProperty$1];
8841
8861
  function SuperProperty(ctx, state2) {
8842
8862
  return (0, import_lib2.$EVENT_C)(ctx, state2, "SuperProperty", SuperProperty$$);
@@ -12310,17 +12330,17 @@ ${js}`
12310
12330
  function Debugger(ctx, state2) {
12311
12331
  return (0, import_lib2.$EVENT)(ctx, state2, "Debugger", Debugger$0);
12312
12332
  }
12313
- var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray, MaybeNestedNonPipelineExpression$1 = NestedImplicitObjectLiteral, MaybeNestedNonPipelineExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
12314
- var expression = $2, trailing = $4;
12333
+ var MaybeNestedNonPipelineExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
12334
+ var expression = $4, trailing = $6;
12315
12335
  return expression ? trailing ? [expression, trailing] : expression : $skip;
12316
- }), MaybeNestedNonPipelineExpression$3 = NonPipelineExpression, MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2, MaybeNestedNonPipelineExpression$3];
12336
+ }), MaybeNestedNonPipelineExpression$1 = NonPipelineExpression, MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1];
12317
12337
  function MaybeNestedNonPipelineExpression(ctx, state2) {
12318
12338
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
12319
12339
  }
12320
- var MaybeNestedPostfixedExpression$0 = NestedBulletedArray, MaybeNestedPostfixedExpression$1 = NestedImplicitObjectLiteral, MaybeNestedPostfixedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
12321
- var expression = $2, trailing = $4;
12340
+ var MaybeNestedPostfixedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
12341
+ var expression = $4, trailing = $6;
12322
12342
  return expression ? trailing ? [expression, trailing] : expression : $skip;
12323
- }), MaybeNestedPostfixedExpression$3 = PostfixedExpression, MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2, MaybeNestedPostfixedExpression$3];
12343
+ }), MaybeNestedPostfixedExpression$1 = PostfixedExpression, MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1];
12324
12344
  function MaybeNestedPostfixedExpression(ctx, state2) {
12325
12345
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
12326
12346
  }
@@ -12331,10 +12351,10 @@ ${js}`
12331
12351
  function NestedPostfixedExpressionNoTrailing(ctx, state2) {
12332
12352
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedPostfixedExpressionNoTrailing", NestedPostfixedExpressionNoTrailing$$);
12333
12353
  }
12334
- var MaybeNestedExpression$0 = NestedBulletedArray, MaybeNestedExpression$1 = NestedImplicitObjectLiteral, MaybeNestedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
12335
- var expression = $2, trailing = $4;
12354
+ var MaybeNestedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
12355
+ var expression = $4, trailing = $6;
12336
12356
  return expression ? trailing ? [expression, trailing] : expression : $skip;
12337
- }), MaybeNestedExpression$3 = Expression, MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2, MaybeNestedExpression$3];
12357
+ }), MaybeNestedExpression$1 = Expression, MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1];
12338
12358
  function MaybeNestedExpression(ctx, state2) {
12339
12359
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
12340
12360
  }
@@ -14209,7 +14229,7 @@ ${js}`
14209
14229
  var InlineJSXMemberExpressionRest$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(OptionalShorthand), (0, import_lib2.$Q)(InlineComment), MemberBracketContent), function($skip, $loc, $0, $1, $2, $3) {
14210
14230
  var dot = $1, comments = $2, content = $3;
14211
14231
  return !dot && !comments.length ? content : dot ? dot.type === "Optional" && content.type === "SliceExpression" ? [...dot.children.slice(0, -1), ...comments, content] : [dot, ...comments, content] : [...comments, content];
14212
- }), InlineJSXMemberExpressionRest$1 = PropertyAccess, InlineJSXMemberExpressionRest$2 = PropertyGlob, InlineJSXMemberExpressionRest$3 = PropertyBind, InlineJSXMemberExpressionRest$4 = NonNullAssertion, InlineJSXMemberExpressionRest$$ = [InlineJSXMemberExpressionRest$0, InlineJSXMemberExpressionRest$1, InlineJSXMemberExpressionRest$2, InlineJSXMemberExpressionRest$3, InlineJSXMemberExpressionRest$4];
14232
+ }), InlineJSXMemberExpressionRest$1 = PropertyAccess, InlineJSXMemberExpressionRest$2 = PropertyGlob, InlineJSXMemberExpressionRest$3 = PropertyBindExplicitArguments, InlineJSXMemberExpressionRest$4 = NonNullAssertion, InlineJSXMemberExpressionRest$$ = [InlineJSXMemberExpressionRest$0, InlineJSXMemberExpressionRest$1, InlineJSXMemberExpressionRest$2, InlineJSXMemberExpressionRest$3, InlineJSXMemberExpressionRest$4];
14213
14233
  function InlineJSXMemberExpressionRest(ctx, state2) {
14214
14234
  return (0, import_lib2.$EVENT_C)(ctx, state2, "InlineJSXMemberExpressionRest", InlineJSXMemberExpressionRest$$);
14215
14235
  }
package/dist/main.js CHANGED
@@ -1970,6 +1970,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
1970
1970
  ts: true,
1971
1971
  children: [": unknown"]
1972
1972
  };
1973
+ if (prop.initializer && !typeSuffix.optional) {
1974
+ typeSuffix.children.unshift(typeSuffix.optional = "?");
1975
+ }
1973
1976
  switch (prop.type) {
1974
1977
  case "BindingProperty": {
1975
1978
  const ws = prop.children.slice(0, prop.children.indexOf(prop.name));
@@ -8986,6 +8989,7 @@ var grammar = {
8986
8989
  ExplicitPropertyGlob,
8987
8990
  PropertyGlob,
8988
8991
  PropertyBind,
8992
+ PropertyBindExplicitArguments,
8989
8993
  SuperProperty,
8990
8994
  MetaProperty,
8991
8995
  ReturnValue,
@@ -10519,13 +10523,19 @@ var IsLike$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is, (0, import_lib2.$E)(
10519
10523
  function IsLike(ctx, state2) {
10520
10524
  return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
10521
10525
  }
10522
- var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
10526
+ var WRHS$0 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedBulletedArray), function(value) {
10527
+ return [void 0, value[0]];
10528
+ });
10529
+ var WRHS$1 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedImplicitObjectLiteral), function(value) {
10530
+ return [void 0, value[0]];
10531
+ });
10532
+ var WRHS$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
10523
10533
  var wrhs = $2;
10524
10534
  if (!wrhs) return $skip;
10525
10535
  return wrhs;
10526
10536
  });
10527
- var WRHS$1 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS);
10528
- var WRHS$$ = [WRHS$0, WRHS$1];
10537
+ var WRHS$3 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS);
10538
+ var WRHS$$ = [WRHS$0, WRHS$1, WRHS$2, WRHS$3];
10529
10539
  function WRHS(ctx, state2) {
10530
10540
  return (0, import_lib2.$EVENT_C)(ctx, state2, "WRHS", WRHS$$);
10531
10541
  }
@@ -10664,11 +10674,13 @@ var NWTypePostfix$$ = [NWTypePostfix$0, NWTypePostfix$1, NWTypePostfix$2];
10664
10674
  function NWTypePostfix(ctx, state2) {
10665
10675
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NWTypePostfix", NWTypePostfix$$);
10666
10676
  }
10667
- var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
10677
+ var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$N)(Whitespace), UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2, $3) {
10678
+ var symbol = $1;
10679
+ var assigned = $3;
10668
10680
  return {
10669
10681
  type: "UpdateExpression",
10670
- assigned: $2,
10671
- children: $0
10682
+ assigned,
10683
+ children: [symbol, assigned]
10672
10684
  };
10673
10685
  });
10674
10686
  var UpdateExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(LeftHandSideExpression, (0, import_lib2.$E)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$EXPECT)($R4, "UpdateExpression /(?!\\p{ID_Start}|[_$0-9(\\[{])/")))), function($skip, $loc, $0, $1, $2) {
@@ -12041,6 +12053,23 @@ var PropertyBind$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E
12041
12053
  function PropertyBind(ctx, state2) {
12042
12054
  return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBind", PropertyBind$0);
12043
12055
  }
12056
+ var PropertyBindExplicitArguments$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(PropertyAccessModifier), At, OptionalDot, (0, import_lib2.$C)(IdentifierName, PrivateIdentifier), (0, import_lib2.$E)(ExplicitArguments)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
12057
+ var modifier = $1;
12058
+ var dot = $3;
12059
+ var id = $4;
12060
+ var args = $5;
12061
+ return {
12062
+ type: "PropertyBind",
12063
+ name: id.name,
12064
+ children: [modifier, dot, id],
12065
+ // omit `@` from children
12066
+ args: args?.children.slice(1, -1) ?? []
12067
+ // remove the parens from the arg list, or give an empty list
12068
+ };
12069
+ });
12070
+ function PropertyBindExplicitArguments(ctx, state2) {
12071
+ return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBindExplicitArguments", PropertyBindExplicitArguments$0);
12072
+ }
12044
12073
  var SuperProperty$0 = (0, import_lib2.$S)(Super, MemberBracketContent);
12045
12074
  var SuperProperty$1 = (0, import_lib2.$S)(Super, (0, import_lib2.$N)(PropertyAccessModifier), PropertyAccess);
12046
12075
  var SuperProperty$$ = [SuperProperty$0, SuperProperty$1];
@@ -16547,31 +16576,27 @@ var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPEC
16547
16576
  function Debugger(ctx, state2) {
16548
16577
  return (0, import_lib2.$EVENT)(ctx, state2, "Debugger", Debugger$0);
16549
16578
  }
16550
- var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray;
16551
- var MaybeNestedNonPipelineExpression$1 = NestedImplicitObjectLiteral;
16552
- var MaybeNestedNonPipelineExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16553
- var expression = $2;
16554
- var trailing = $4;
16579
+ var MaybeNestedNonPipelineExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16580
+ var expression = $4;
16581
+ var trailing = $6;
16555
16582
  if (!expression) return $skip;
16556
16583
  if (!trailing) return expression;
16557
16584
  return [expression, trailing];
16558
16585
  });
16559
- var MaybeNestedNonPipelineExpression$3 = NonPipelineExpression;
16560
- var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2, MaybeNestedNonPipelineExpression$3];
16586
+ var MaybeNestedNonPipelineExpression$1 = NonPipelineExpression;
16587
+ var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1];
16561
16588
  function MaybeNestedNonPipelineExpression(ctx, state2) {
16562
16589
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
16563
16590
  }
16564
- var MaybeNestedPostfixedExpression$0 = NestedBulletedArray;
16565
- var MaybeNestedPostfixedExpression$1 = NestedImplicitObjectLiteral;
16566
- var MaybeNestedPostfixedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16567
- var expression = $2;
16568
- var trailing = $4;
16591
+ var MaybeNestedPostfixedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16592
+ var expression = $4;
16593
+ var trailing = $6;
16569
16594
  if (!expression) return $skip;
16570
16595
  if (!trailing) return expression;
16571
16596
  return [expression, trailing];
16572
16597
  });
16573
- var MaybeNestedPostfixedExpression$3 = PostfixedExpression;
16574
- var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2, MaybeNestedPostfixedExpression$3];
16598
+ var MaybeNestedPostfixedExpression$1 = PostfixedExpression;
16599
+ var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1];
16575
16600
  function MaybeNestedPostfixedExpression(ctx, state2) {
16576
16601
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
16577
16602
  }
@@ -16586,17 +16611,15 @@ var NestedPostfixedExpressionNoTrailing$$ = [NestedPostfixedExpressionNoTrailing
16586
16611
  function NestedPostfixedExpressionNoTrailing(ctx, state2) {
16587
16612
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedPostfixedExpressionNoTrailing", NestedPostfixedExpressionNoTrailing$$);
16588
16613
  }
16589
- var MaybeNestedExpression$0 = NestedBulletedArray;
16590
- var MaybeNestedExpression$1 = NestedImplicitObjectLiteral;
16591
- var MaybeNestedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16592
- var expression = $2;
16593
- var trailing = $4;
16614
+ var MaybeNestedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16615
+ var expression = $4;
16616
+ var trailing = $6;
16594
16617
  if (!expression) return $skip;
16595
16618
  if (!trailing) return expression;
16596
16619
  return [expression, trailing];
16597
16620
  });
16598
- var MaybeNestedExpression$3 = Expression;
16599
- var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2, MaybeNestedExpression$3];
16621
+ var MaybeNestedExpression$1 = Expression;
16622
+ var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1];
16600
16623
  function MaybeNestedExpression(ctx, state2) {
16601
16624
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
16602
16625
  }
@@ -18868,7 +18891,7 @@ var InlineJSXMemberExpressionRest$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((
18868
18891
  });
18869
18892
  var InlineJSXMemberExpressionRest$1 = PropertyAccess;
18870
18893
  var InlineJSXMemberExpressionRest$2 = PropertyGlob;
18871
- var InlineJSXMemberExpressionRest$3 = PropertyBind;
18894
+ var InlineJSXMemberExpressionRest$3 = PropertyBindExplicitArguments;
18872
18895
  var InlineJSXMemberExpressionRest$4 = NonNullAssertion;
18873
18896
  var InlineJSXMemberExpressionRest$$ = [InlineJSXMemberExpressionRest$0, InlineJSXMemberExpressionRest$1, InlineJSXMemberExpressionRest$2, InlineJSXMemberExpressionRest$3, InlineJSXMemberExpressionRest$4];
18874
18897
  function InlineJSXMemberExpressionRest(ctx, state2) {
package/dist/main.mjs CHANGED
@@ -1951,6 +1951,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
1951
1951
  ts: true,
1952
1952
  children: [": unknown"]
1953
1953
  };
1954
+ if (prop.initializer && !typeSuffix.optional) {
1955
+ typeSuffix.children.unshift(typeSuffix.optional = "?");
1956
+ }
1954
1957
  switch (prop.type) {
1955
1958
  case "BindingProperty": {
1956
1959
  const ws = prop.children.slice(0, prop.children.indexOf(prop.name));
@@ -8967,6 +8970,7 @@ var grammar = {
8967
8970
  ExplicitPropertyGlob,
8968
8971
  PropertyGlob,
8969
8972
  PropertyBind,
8973
+ PropertyBindExplicitArguments,
8970
8974
  SuperProperty,
8971
8975
  MetaProperty,
8972
8976
  ReturnValue,
@@ -10500,13 +10504,19 @@ var IsLike$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Is, (0, import_lib2.$E)(
10500
10504
  function IsLike(ctx, state2) {
10501
10505
  return (0, import_lib2.$EVENT)(ctx, state2, "IsLike", IsLike$0);
10502
10506
  }
10503
- var WRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
10507
+ var WRHS$0 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedBulletedArray), function(value) {
10508
+ return [void 0, value[0]];
10509
+ });
10510
+ var WRHS$1 = (0, import_lib2.$T)((0, import_lib2.$S)(NestedImplicitObjectLiteral), function(value) {
10511
+ return [void 0, value[0]];
10512
+ });
10513
+ var WRHS$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$S)(Nested, (0, import_lib2.$E)(_)), RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
10504
10514
  var wrhs = $2;
10505
10515
  if (!wrhs) return $skip;
10506
10516
  return wrhs;
10507
10517
  });
10508
- var WRHS$1 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS);
10509
- var WRHS$$ = [WRHS$0, WRHS$1];
10518
+ var WRHS$3 = (0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$S)(EOS, __), _), RHS);
10519
+ var WRHS$$ = [WRHS$0, WRHS$1, WRHS$2, WRHS$3];
10510
10520
  function WRHS(ctx, state2) {
10511
10521
  return (0, import_lib2.$EVENT_C)(ctx, state2, "WRHS", WRHS$$);
10512
10522
  }
@@ -10645,11 +10655,13 @@ var NWTypePostfix$$ = [NWTypePostfix$0, NWTypePostfix$1, NWTypePostfix$2];
10645
10655
  function NWTypePostfix(ctx, state2) {
10646
10656
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NWTypePostfix", NWTypePostfix$$);
10647
10657
  }
10648
- var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
10658
+ var UpdateExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$N)(Whitespace), UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2, $3) {
10659
+ var symbol = $1;
10660
+ var assigned = $3;
10649
10661
  return {
10650
10662
  type: "UpdateExpression",
10651
- assigned: $2,
10652
- children: $0
10663
+ assigned,
10664
+ children: [symbol, assigned]
10653
10665
  };
10654
10666
  });
10655
10667
  var UpdateExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(LeftHandSideExpression, (0, import_lib2.$E)((0, import_lib2.$S)(UpdateExpressionSymbol, (0, import_lib2.$EXPECT)($R4, "UpdateExpression /(?!\\p{ID_Start}|[_$0-9(\\[{])/")))), function($skip, $loc, $0, $1, $2) {
@@ -12022,6 +12034,23 @@ var PropertyBind$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E
12022
12034
  function PropertyBind(ctx, state2) {
12023
12035
  return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBind", PropertyBind$0);
12024
12036
  }
12037
+ var PropertyBindExplicitArguments$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(PropertyAccessModifier), At, OptionalDot, (0, import_lib2.$C)(IdentifierName, PrivateIdentifier), (0, import_lib2.$E)(ExplicitArguments)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
12038
+ var modifier = $1;
12039
+ var dot = $3;
12040
+ var id = $4;
12041
+ var args = $5;
12042
+ return {
12043
+ type: "PropertyBind",
12044
+ name: id.name,
12045
+ children: [modifier, dot, id],
12046
+ // omit `@` from children
12047
+ args: args?.children.slice(1, -1) ?? []
12048
+ // remove the parens from the arg list, or give an empty list
12049
+ };
12050
+ });
12051
+ function PropertyBindExplicitArguments(ctx, state2) {
12052
+ return (0, import_lib2.$EVENT)(ctx, state2, "PropertyBindExplicitArguments", PropertyBindExplicitArguments$0);
12053
+ }
12025
12054
  var SuperProperty$0 = (0, import_lib2.$S)(Super, MemberBracketContent);
12026
12055
  var SuperProperty$1 = (0, import_lib2.$S)(Super, (0, import_lib2.$N)(PropertyAccessModifier), PropertyAccess);
12027
12056
  var SuperProperty$$ = [SuperProperty$0, SuperProperty$1];
@@ -16528,31 +16557,27 @@ var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPEC
16528
16557
  function Debugger(ctx, state2) {
16529
16558
  return (0, import_lib2.$EVENT)(ctx, state2, "Debugger", Debugger$0);
16530
16559
  }
16531
- var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray;
16532
- var MaybeNestedNonPipelineExpression$1 = NestedImplicitObjectLiteral;
16533
- var MaybeNestedNonPipelineExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16534
- var expression = $2;
16535
- var trailing = $4;
16560
+ var MaybeNestedNonPipelineExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16561
+ var expression = $4;
16562
+ var trailing = $6;
16536
16563
  if (!expression) return $skip;
16537
16564
  if (!trailing) return expression;
16538
16565
  return [expression, trailing];
16539
16566
  });
16540
- var MaybeNestedNonPipelineExpression$3 = NonPipelineExpression;
16541
- var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2, MaybeNestedNonPipelineExpression$3];
16567
+ var MaybeNestedNonPipelineExpression$1 = NonPipelineExpression;
16568
+ var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1];
16542
16569
  function MaybeNestedNonPipelineExpression(ctx, state2) {
16543
16570
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
16544
16571
  }
16545
- var MaybeNestedPostfixedExpression$0 = NestedBulletedArray;
16546
- var MaybeNestedPostfixedExpression$1 = NestedImplicitObjectLiteral;
16547
- var MaybeNestedPostfixedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16548
- var expression = $2;
16549
- var trailing = $4;
16572
+ var MaybeNestedPostfixedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16573
+ var expression = $4;
16574
+ var trailing = $6;
16550
16575
  if (!expression) return $skip;
16551
16576
  if (!trailing) return expression;
16552
16577
  return [expression, trailing];
16553
16578
  });
16554
- var MaybeNestedPostfixedExpression$3 = PostfixedExpression;
16555
- var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2, MaybeNestedPostfixedExpression$3];
16579
+ var MaybeNestedPostfixedExpression$1 = PostfixedExpression;
16580
+ var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1];
16556
16581
  function MaybeNestedPostfixedExpression(ctx, state2) {
16557
16582
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
16558
16583
  }
@@ -16567,17 +16592,15 @@ var NestedPostfixedExpressionNoTrailing$$ = [NestedPostfixedExpressionNoTrailing
16567
16592
  function NestedPostfixedExpressionNoTrailing(ctx, state2) {
16568
16593
  return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedPostfixedExpressionNoTrailing", NestedPostfixedExpressionNoTrailing$$);
16569
16594
  }
16570
- var MaybeNestedExpression$0 = NestedBulletedArray;
16571
- var MaybeNestedExpression$1 = NestedImplicitObjectLiteral;
16572
- var MaybeNestedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
16573
- var expression = $2;
16574
- var trailing = $4;
16595
+ var MaybeNestedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedBulletedArray), (0, import_lib2.$N)(NestedImplicitObjectLiteral), PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
16596
+ var expression = $4;
16597
+ var trailing = $6;
16575
16598
  if (!expression) return $skip;
16576
16599
  if (!trailing) return expression;
16577
16600
  return [expression, trailing];
16578
16601
  });
16579
- var MaybeNestedExpression$3 = Expression;
16580
- var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2, MaybeNestedExpression$3];
16602
+ var MaybeNestedExpression$1 = Expression;
16603
+ var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1];
16581
16604
  function MaybeNestedExpression(ctx, state2) {
16582
16605
  return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
16583
16606
  }
@@ -18849,7 +18872,7 @@ var InlineJSXMemberExpressionRest$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((
18849
18872
  });
18850
18873
  var InlineJSXMemberExpressionRest$1 = PropertyAccess;
18851
18874
  var InlineJSXMemberExpressionRest$2 = PropertyGlob;
18852
- var InlineJSXMemberExpressionRest$3 = PropertyBind;
18875
+ var InlineJSXMemberExpressionRest$3 = PropertyBindExplicitArguments;
18853
18876
  var InlineJSXMemberExpressionRest$4 = NonNullAssertion;
18854
18877
  var InlineJSXMemberExpressionRest$$ = [InlineJSXMemberExpressionRest$0, InlineJSXMemberExpressionRest$1, InlineJSXMemberExpressionRest$2, InlineJSXMemberExpressionRest$3, InlineJSXMemberExpressionRest$4];
18855
18878
  function InlineJSXMemberExpressionRest(ctx, state2) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@danielx/civet",
3
3
  "type": "commonjs",
4
- "version": "0.9.6",
4
+ "version": "0.9.7",
5
5
  "description": "CoffeeScript style syntax for TypeScript",
6
6
  "main": "dist/main.js",
7
7
  "module": "dist/main.mjs",