@marko/language-tools 2.5.14 → 2.5.15

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 (2) hide show
  1. package/marko.internal.d.ts +15 -14
  2. package/package.json +1 -1
@@ -471,20 +471,21 @@ type ComponentEventHandlers<Component extends Marko.Component> = {
471
471
  >]: Component[K] extends (...args: any) => any ? Component[K] : never;
472
472
  };
473
473
 
474
- type FlatScopes<Input extends object, Objects = Input> = Input[keyof Input &
475
- (string | number)] extends infer Prop
476
- ? [0] extends [1 & Prop]
477
- ? unknown
478
- : Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
479
- ? unknown extends Scope
480
- ? never
481
- : Scope
482
- : Prop extends object
483
- ? Prop extends Extract<Objects, Prop>
484
- ? never
485
- : FlatScopes<Prop, Objects | Prop>
486
- : never
487
- : unknown;
474
+ type FlatScopes<Input> = [0] extends [1 & Input]
475
+ ? never
476
+ :
477
+ | (Input[("content" | "renderBody") & keyof Input] extends infer Prop
478
+ ? Prop extends (...args: any[]) => { [Marko._.scope]: infer Scope }
479
+ ? Scope
480
+ : never
481
+ : never)
482
+ | (Input[string & keyof Input] extends infer Prop
483
+ ? Prop extends { [Symbol.iterator]: any }
484
+ ? Prop extends readonly any[]
485
+ ? never
486
+ : FlatScopes<Prop>
487
+ : never
488
+ : never);
488
489
 
489
490
  type MergeScopes<Scopes> = {
490
491
  [K in Scopes extends Scopes ? keyof Scopes : never]: Scopes extends Scopes
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@marko/language-tools",
3
3
  "description": "Marko Language Tools",
4
- "version": "2.5.14",
4
+ "version": "2.5.15",
5
5
  "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
6
6
  "peerDependencies": {
7
7
  "@marko/compiler": "^5.28.4"