@marko/language-tools 2.3.1 → 2.4.1

package/marko.internal.d.ts

@@ -24,13 +24,13 @@ declare global {
 
       export function getGlobal<Override>(
         override: Override,
-      ): 1 extends Override & 0 ? Marko.Global : Override;
+      ): [0] extends [1 & Override] ? Marko.Global : Override;
 
-      export function attrTagNames<Input, Keys extends keyof Input>(
+      export function attrTagNames<Input, Keys extends keyof Input & string>(
         input: Input,
       ): Record<string, never> & {
         [Key in Keys as `@${Input[Key] extends infer Value
-          ? Value extends { renderBody?: any }
+          ? Value extends Marko.AttrTag<any>
             ? Key
             : never
           : never}`]: Input[Key];
@@ -144,7 +144,7 @@ declare global {
       export function renderPreferLocal<Name, Fallback>(
         name: Name,
         fallback: Fallback,
-      ): 0 extends 1 & Name ? Fallback : DynamicRenderer<Name>;
+      ): [0] extends [1 & Name] ? Fallback : DynamicRenderer<Name>;
       export function renderDynamicTag<Name>(tag: Name): DynamicRenderer<Name>;
 
       export function returnTag<
@@ -211,7 +211,7 @@ declare global {
 
       export function forAttrTag<
         Value extends Iterable<any> | readonly any[],
-        Return,
+        const Return,
       >(
         input: {
           of: Value;
@@ -226,12 +226,12 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item extends Record<PropertyKey, any>
+          | (infer Item extends Record<PropertyKey, any>)
           ? AttrTagByListSize<Value, Item>
           : never;
       };
 
-      export function forAttrTag<Value extends object, Return>(
+      export function forAttrTag<Value extends object, const Return>(
         input: {
           in: Value;
         },
@@ -239,7 +239,7 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item extends Record<PropertyKey, any>
+          | (infer Item extends Record<PropertyKey, any>)
           ? AttrTagByObjectSize<Value, Item>
           : never;
       };
@@ -248,7 +248,7 @@ declare global {
         From extends void | number,
         To extends number,
         Step extends void | number,
-        Return,
+        const Return,
       >(
         input: {
           from?: From;
@@ -259,18 +259,18 @@ declare global {
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item extends Record<PropertyKey, any>
+          | (infer Item extends Record<PropertyKey, any>)
           ? number extends From | To | Step
-            ? MaybeRepeatable<Item>
+            ? undefined | Marko.AttrTag<Item>
             : Step extends 0
               ? never
               : [To] extends [From extends void ? 0 : From]
                 ? undefined
-                : Repeatable<Item>
+                : Marko.AttrTag<Item>
           : never;
       };
 
-      export function forAttrTag<Return>(attrs: {
+      export function forAttrTag<const Return>(attrs: {
         input:
           | {
               of: any;
@@ -287,8 +287,8 @@ declare global {
       }): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
-          | infer Item extends Record<PropertyKey, any>
-          ? MaybeRepeatable<Item>
+          | (infer Item extends Record<PropertyKey, any>)
+          ? undefined | Marko.AttrTag<Item>
           : never;
       };
 
@@ -296,9 +296,13 @@ declare global {
         ...attrs: Attrs
       ): MergeAttrTags<Attrs>;
 
+      export function repeatedAttrTag<AttrTag>(
+        ...attrTags: Marko.AttrTag<AttrTag>[]
+      ): AttrTag;
+
       // TODO: this could be improved.
       // currently falls back to DefaultRenderer too eagerly.
-      export type DynamicRenderer<Name> = 0 extends 1 & Name
+      export type DynamicRenderer<Name> = [0] extends [1 & Name]
         ? DefaultRenderer
         : [Name] extends [Marko.Template]
           ? TemplateRenderer<Name>
@@ -306,14 +310,10 @@ declare global {
             ? NativeTagRenderer<Name>
             : [Name] extends [AnyMarkoBody]
               ? BodyRenderer<Name>
-              : [Name] extends [{ renderBody?: AnyMarkoBody }]
-                ? [Name["renderBody"]] extends [AnyMarkoBody]
-                  ? BodyRenderer<Name["renderBody"]>
-                  : BaseRenderer<
-                      RenderBodyInput<
-                        BodyParameters<Exclude<Name["renderBody"], void>>
-                      >
-                    >
+              : [Name] extends [
+                    { renderBody?: infer Name extends AnyMarkoBody },
+                  ]
+                ? BodyRenderer<Name>
                 : DefaultRenderer;
 
       export type TemplateRenderer<Template> = Template extends {
@@ -345,12 +345,8 @@ declare global {
       export interface BodyRenderer<Body extends AnyMarkoBody> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_internal_input extends unknown>(
-          input: Marko.Directives &
-            RenderBodyInput<BodyParameters<Body>> &
-            Relate<
-              __marko_internal_input,
-              Marko.Directives & RenderBodyInput<BodyParameters<Body>>
-            >,
+          ...args: BodyParamsWithDefault<Body> &
+            Relate<__marko_internal_input, BodyParamsWithDefault<Body>>
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
           BodyReturnType<Body>
@@ -397,17 +393,14 @@ type ReturnAndScope<Scope, Return> = {
   scope: Scope;
 };
 
-type RenderBodyInput<Args extends readonly unknown[]> = Args extends {
-  length: infer Length;
-}
-  ? number extends Length
-    ? { value?: Args }
-    : 0 extends Length
-      ? { value?: [] }
-      : { value: Args }
-  : never;
+type BodyParamsWithDefault<Body extends AnyMarkoBody> =
+  Body extends Marko.Body<infer Params, any>
+    ? Params extends []
+      ? [input?: Record<string, never>]
+      : Params
+    : never;
 
-type Scopes<Input> = 0 extends 1 & Input
+type Scopes<Input> = [0] extends [1 & Input]
   ? never
   : Input extends Record<any, unknown>
     ? MergeScopes<FlatScopes<Input>>
@@ -425,7 +418,7 @@ type ComponentEventHandlers<Component extends Marko.Component> = {
 
 type FlatScopes<Input extends object, Objects = Input> = Input[keyof Input &
   (string | number)] extends infer Prop
-  ? 0 extends 1 & Prop
+  ? [0] extends [1 & Prop]
     ? unknown
     : Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
       ? unknown extends Scope
@@ -472,30 +465,25 @@ type MergeAttrTag<A, B> = {
       : never;
 };
 
-type MergeAttrTagValue<A, B> = A extends readonly any[]
-  ? B extends readonly any[]
-    ? [...A, ...B]
+type MergeAttrTagValue<A, B> = A extends readonly (infer AType)[]
+  ? B extends readonly (infer BType)[]
+    ? AType | BType
     : B extends void
       ? A
-      : [...A, B]
+      : AType | B
   : A extends void
     ? B
     : B extends void
       ? A
-      : [A, B];
+      : A | B;
 
 type AttrTagByListSize<T, Item> = T extends
-  | readonly [any, any, ...any[]]
-  | readonly [...any[], any, any]
-  | readonly [any, ...any[], any]
-  ? Repeated<Item>
-  : T extends readonly [any]
-    ? Item
-    : T extends readonly [any, ...any[]] | readonly [...any[], any]
-      ? Repeatable<Item>
-      : T extends readonly []
-        ? undefined
-        : MaybeRepeatable<Item>;
+  | readonly [any, ...any[]]
+  | readonly [...any[], any]
+  ? Marko.AttrTag<Item>
+  : T extends readonly []
+    ? undefined
+    : undefined | Marko.AttrTag<Item>;
 
 type AttrTagByObjectSize<
   Value,
@@ -505,22 +493,7 @@ type AttrTagByObjectSize<
 > = CheckNever<
   Keys,
   undefined,
-  CheckUnionSize<
-    KnownKeys,
-    [Keys] extends [KnownKeys] ? Item : Repeatable<Item>,
-    Repeated<Item>,
-    MaybeRepeatable<Item>
-  >
->;
-
-type CheckUnionSize<T, IfOne, IfMany, Else, Copy = T> = CheckNever<
-  T,
-  Else,
-  T extends T
-    ? (Copy extends T ? never : true) extends never
-      ? IfOne
-      : IfMany
-    : never
+  CheckNever<KnownKeys, Marko.AttrTag<Item>, undefined | Marko.AttrTag<Item>>
 >;
 
 type RecordKeys<T> = keyof {
@@ -545,8 +518,4 @@ type UnionToIntersection<T> = (T extends any ? (_: T) => any : never) extends (
   ? U
   : never;
 
-type Repeated<T> = [T, T, ...T[]];
-type Repeatable<T> = T | Repeated<T>;
-type MaybeRepeatable<T> = undefined | Repeatable<T>;
-
 export {};

package/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/helper-validator-identifier": "^7.22.20",
-    "@babel/parser": "^7.23.9",
-    "@luxass/strip-json-comments": "^1.2.0",
+    "@babel/parser": "^7.25.8",
+    "@luxass/strip-json-comments": "^1.3.2",
     "htmljs-parser": "^5.5.2",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.23.5",
-    "@marko/compiler": "^5.34.6",
-    "@marko/translator-default": "^5.31.13",
+    "@babel/code-frame": "^7.25.7",
+    "@marko/compiler": "^5.37.19",
+    "@marko/translator-default": "^6.0.19",
     "@types/babel__code-frame": "^7.0.6",
-    "@types/babel__helper-validator-identifier": "^7.15.2",
-    "@typescript/vfs": "^1.5.0",
-    "marko": "^5.32.7",
+    "@typescript/vfs": "^1.6.0",
+    "marko": "^5.35.27",
     "mitata": "^0.1.8",
-    "tsx": "^4.7.0"
+    "tsx": "^4.19.1"
   },
   "exports": {
     ".": {

package/dist/extractors/script/util/is-valid-identifier.d.ts

@@ -1 +0,0 @@
-export declare function isValidIdentifier(name: string): boolean;