@marko/language-tools 2.1.6 → 2.1.8

package/dist/index.js

@@ -2148,7 +2148,9 @@ constructor(_?: Return) {}
     const renderId = this.#getRenderId(tag);
     if (renderId) {
       this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")}, ${renderId}, `
+        `${varShared("assertRendered")}(${varShared(
+          "rendered"
+        )}, ${renderId}, `
       );
     }
     if (tagName) {
@@ -3276,7 +3278,9 @@ var marko_default = {
             code += "<return ";
             if (valueType) {
               code += `= ${castType(
-                typeChecker.typeToString(typeChecker.getTypeOfSymbol(valueType))
+                typeChecker.typeToString(
+                  typeChecker.getTypeOfSymbol(valueType)
+                )
               )}`;
             } else {
               code += `...${castType(typeChecker.typeToString(returnType))}`;
@@ -3384,13 +3388,11 @@ var HTMLExtractor = class {
   #read;
   #nodeDetails;
   #nodeIdCounter;
-  #dynamicAttrValueCounter;
   constructor(parsed) {
     this.#extractor = new Extractor(parsed);
     this.#read = parsed.read.bind(parsed);
     this.#nodeDetails = {};
     this.#nodeIdCounter = 0;
-    this.#dynamicAttrValueCounter = 0;
     parsed.program.body.forEach((node) => this.#visitNode(node));
   }
   end() {
@@ -3423,6 +3425,8 @@ var HTMLExtractor = class {
           start: node.start + 1,
           end: node.start + 2
         }) === "!";
+        this.#extractor.write("placeholder");
+        break;
     }
     return isDynamic || hasDynamicBody;
   }
@@ -3495,7 +3499,7 @@ var HTMLExtractor = class {
         this.#extractor.write('"');
         break;
       case 3 /* Dynamic */:
-        this.#extractor.write(`="dynamic${this.#dynamicAttrValueCounter++}"`);
+        this.#extractor.write(`="dynamic"`);
         break;
     }
   }

package/dist/index.mjs

@@ -2116,7 +2116,9 @@ constructor(_?: Return) {}
     const renderId = this.#getRenderId(tag);
     if (renderId) {
       this.#extractor.write(
-        `${varShared("assertRendered")}(${varShared("rendered")}, ${renderId}, `
+        `${varShared("assertRendered")}(${varShared(
+          "rendered"
+        )}, ${renderId}, `
       );
     }
     if (tagName) {
@@ -3244,7 +3246,9 @@ var marko_default = {
             code += "<return ";
             if (valueType) {
               code += `= ${castType(
-                typeChecker.typeToString(typeChecker.getTypeOfSymbol(valueType))
+                typeChecker.typeToString(
+                  typeChecker.getTypeOfSymbol(valueType)
+                )
               )}`;
             } else {
               code += `...${castType(typeChecker.typeToString(returnType))}`;
@@ -3352,13 +3356,11 @@ var HTMLExtractor = class {
   #read;
   #nodeDetails;
   #nodeIdCounter;
-  #dynamicAttrValueCounter;
   constructor(parsed) {
     this.#extractor = new Extractor(parsed);
     this.#read = parsed.read.bind(parsed);
     this.#nodeDetails = {};
     this.#nodeIdCounter = 0;
-    this.#dynamicAttrValueCounter = 0;
     parsed.program.body.forEach((node) => this.#visitNode(node));
   }
   end() {
@@ -3391,6 +3393,8 @@ var HTMLExtractor = class {
           start: node.start + 1,
           end: node.start + 2
         }) === "!";
+        this.#extractor.write("placeholder");
+        break;
     }
     return isDynamic || hasDynamicBody;
   }
@@ -3463,7 +3467,7 @@ var HTMLExtractor = class {
         this.#extractor.write('"');
         break;
       case 3 /* Dynamic */:
-        this.#extractor.write(`="dynamic${this.#dynamicAttrValueCounter++}"`);
+        this.#extractor.write(`="dynamic"`);
         break;
     }
   }

package/marko.internal.d.ts

@@ -7,7 +7,7 @@ declare global {
     // Extend the Body type to keep track of what is yielded (used for scope hoisted types).
     export interface Body<
       in Params extends readonly any[] = [],
-      out Return = void
+      out Return = void,
     > {
       (...params: Params): MarkoReturn<Return>;
     }
@@ -23,11 +23,11 @@ declare global {
       export const any: any;
 
       export function getGlobal<Override>(
-        override: Override
+        override: Override,
       ): 1 extends Override & 0 ? Marko.Global : Override;
 
       export function attrTagNames<Input, Keys extends keyof Input>(
-        input: Input
+        input: Input,
       ): Record<string, never> & {
         [Key in Keys as `@${Input[Key] extends infer Value
           ? Value extends { renderBody?: any }
@@ -58,7 +58,7 @@ declare global {
       ): string;
 
       export function state<Component>(
-        component: Component
+        component: Component,
       ): Component extends {
         state: infer State extends object;
       }
@@ -71,13 +71,13 @@ declare global {
       >;
 
       export function instance<Constructor>(
-        constructor: Constructor
+        constructor: Constructor,
       ): Constructor extends abstract new (...args: any) => infer Instance
         ? Instance
         : never;
 
       export function readScopes<Rendered>(
-        rendered: Rendered
+        rendered: Rendered,
       ): MergeScopes<
         Rendered extends { scopes: Record<any, infer Scope> } ? Scope : never
       > &
@@ -86,7 +86,7 @@ declare global {
       export function assertRendered<Index extends number, Rendered, Result>(
         rendered: Rendered,
         index: Index,
-        result: Result
+        result: Result,
       ): asserts rendered is Rendered & {
         scopes: Record<
           Index,
@@ -123,7 +123,7 @@ declare global {
           | ((...args: any) => any)
           | false
           | void,
-        Args extends readonly any[]
+        Args extends readonly any[],
       >(
         owner: Owner,
         handler: Handler,
@@ -135,37 +135,37 @@ declare global {
         : (...args: any) => any; // If typescript ever actually supports partial application maybe we do this.
 
       export function renderTemplate<Name extends Marko.Template>(
-        imported: Promise<{ default: Name }>
+        imported: Promise<{ default: Name }>,
       ): TemplateRenderer<Name>;
       export function renderNativeTag<Name extends string>(
-        tag: Name
+        tag: Name,
       ): NativeTagRenderer<Name>;
       export const missingTag: DefaultRenderer;
       export function renderPreferLocal<Name, Fallback>(
         name: Name,
-        fallback: Fallback
+        fallback: Fallback,
       ): 0 extends 1 & Name ? Fallback : DynamicRenderer<Name>;
       export function renderDynamicTag<Name>(tag: Name): DynamicRenderer<Name>;
 
       export function returnTag<
-        Input extends { value: unknown; valueChange?: (value: any) => void }
+        Input extends { value: unknown; valueChange?: (value: any) => void },
       >(input: Input): Input;
 
       export function forTag<
         Value,
+        Item extends Value extends
+          | readonly (infer Item)[]
+          | Iterable<infer Item>
+          ? Item
+          : unknown,
         RenderBody extends Marko.Body<
-          [
-            value: Value extends readonly (infer Item)[] | Iterable<infer Item>
-              ? Item
-              : unknown,
-            index: number,
-            all: Value
-          ],
+          [item: Item, index: number, all: Value],
           void
-        >
+        >,
       >(input: {
         of: Value;
         renderBody: RenderBody;
+        by?: (item: Item, index: number) => string;
       }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
 
       export function forTag<
@@ -173,22 +173,24 @@ declare global {
         RenderBody extends Marko.Body<
           [key: keyof Value, value: Value[keyof Value]],
           void
-        >
+        >,
       >(input: {
         in: Value;
         renderBody: RenderBody;
+        by?: (value: Value[keyof Value], key: keyof Value) => string;
       }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
 
       export function forTag<
         From extends void | number,
         To extends number,
         Step extends void | number,
-        RenderBody extends Marko.Body<[index: number], void>
+        RenderBody extends Marko.Body<[index: number], void>,
       >(input: {
         from?: From;
         to: To;
         step?: Step;
         renderBody: RenderBody;
+        by?: (index: number) => string;
       }): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
 
       export function forTag<RenderBody extends AnyMarkoBody>(
@@ -204,12 +206,12 @@ declare global {
           | {
               of: readonly unknown[] | Iterable<unknown>;
             }
-        ) & { renderBody?: RenderBody }
+        ) & { renderBody?: RenderBody; by?: (...args: unknown[]) => string },
       ): ReturnAndScope<RenderBodyScope<RenderBody>, void>;
 
       export function forAttrTag<
         Value extends Iterable<any> | readonly any[],
-        Return
+        Return,
       >(
         input: {
           of: Value;
@@ -219,8 +221,8 @@ declare global {
             ? Item
             : unknown,
           index: number,
-          all: Value
-        ) => Return
+          all: Value,
+        ) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
@@ -233,7 +235,7 @@ declare global {
         input: {
           in: Value;
         },
-        renderBody: (key: keyof Value, value: Value[keyof Value]) => Return
+        renderBody: (key: keyof Value, value: Value[keyof Value]) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
@@ -246,14 +248,14 @@ declare global {
         From extends void | number,
         To extends number,
         Step extends void | number,
-        Return
+        Return,
       >(
         input: {
           from?: From;
           to: To;
           step?: Step;
         },
-        renderBody: (index: number) => Return
+        renderBody: (index: number) => Return,
       ): {
         [Key in keyof Return]: Return[Key] extends
           | readonly (infer Item)[]
@@ -261,10 +263,10 @@ declare global {
           ? number extends From | To | Step
             ? MaybeRepeatable<Item>
             : Step extends 0
-            ? never
-            : [To] extends [From extends void ? 0 : From]
-            ? undefined
-            : Repeatable<Item>
+              ? never
+              : [To] extends [From extends void ? 0 : From]
+                ? undefined
+                : Repeatable<Item>
           : never;
       };
 
@@ -299,29 +301,31 @@ declare global {
       export type DynamicRenderer<Name> = 0 extends 1 & Name
         ? DefaultRenderer
         : [Name] extends [Marko.Template]
-        ? TemplateRenderer<Name>
-        : [Name] extends [string]
-        ? 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>>>
-            >
-        : DefaultRenderer;
+          ? TemplateRenderer<Name>
+          : [Name] extends [string]
+            ? 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>>
+                      >
+                    >
+                : DefaultRenderer;
 
       export type TemplateRenderer<Template> = Template extends {
         _: infer Renderer;
       }
         ? Renderer
         : Template extends Marko.Template<
-            infer Input extends Record<string, unknown>,
-            infer Return
-          >
-        ? BaseRenderer<Input, Return>
-        : never;
+              infer Input extends Record<string, unknown>,
+              infer Return
+            >
+          ? BaseRenderer<Input, Return>
+          : never;
 
       export interface NativeTagRenderer<Name extends string> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
@@ -331,7 +335,7 @@ declare global {
             Relate<
               __marko_internal_input,
               Marko.Directives & Marko.NativeTags[Name]["input"]
-            >
+            >,
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
           Marko.NativeTags[Name]["return"]
@@ -346,7 +350,7 @@ declare global {
             Relate<
               __marko_internal_input,
               Marko.Directives & RenderBodyInput<BodyParameters<Body>>
-            >
+            >,
         ) => ReturnAndScope<
           Scopes<__marko_internal_input>,
           BodyReturnType<Body>
@@ -355,19 +359,19 @@ declare global {
 
       export interface BaseRenderer<
         Input extends Record<PropertyKey, unknown>,
-        Return = void
+        Return = void,
       > {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_input_with_scope extends unknown>(
           input: Marko.Directives &
             Input &
-            Relate<__marko_input_with_scope, Marko.Directives & Input>
+            Relate<__marko_input_with_scope, Marko.Directives & Input>,
         ) => ReturnAndScope<Scopes<__marko_input_with_scope>, Return>;
       }
 
       export interface DefaultRenderer {
         (): () => <Input extends Record<PropertyKey, unknown>>(
-          input: Input
+          input: Input,
         ) => ReturnAndScope<Scopes<Input>, void>;
       }
 
@@ -399,15 +403,15 @@ type RenderBodyInput<Args extends readonly unknown[]> = Args extends {
   ? number extends Length
     ? { value?: Args }
     : 0 extends Length
-    ? { value?: [] }
-    : { value: Args }
+      ? { value?: [] }
+      : { value: Args }
   : never;
 
 type Scopes<Input> = 0 extends 1 & Input
   ? never
   : Input extends Record<any, unknown>
-  ? MergeScopes<FlatScopes<Input>>
-  : never;
+    ? MergeScopes<FlatScopes<Input>>
+    : never;
 
 type ComponentEventHandlers<Component extends Marko.Component> = {
   [K in Exclude<
@@ -424,14 +428,14 @@ type FlatScopes<Input extends object, Objects = Input> = Input[keyof Input &
   ? 0 extends 1 & Prop
     ? unknown
     : Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
-    ? unknown extends Scope
-      ? never
-      : Scope
-    : Prop extends object
-    ? Prop extends Extract<Objects, Prop>
-      ? never
-      : FlatScopes<Prop, Objects | Prop>
-    : never
+      ? unknown extends Scope
+        ? never
+        : Scope
+      : Prop extends object
+        ? Prop extends Extract<Objects, Prop>
+          ? never
+          : FlatScopes<Prop, Objects | Prop>
+        : never
   : unknown;
 
 type MergeScopes<Scopes> = {
@@ -451,12 +455,12 @@ type MergeOptionalScopes<Scopes> = {
 type MergeAttrTags<Attrs extends readonly any[]> = Attrs extends readonly [
   infer A,
   infer B,
-  ...infer Rest
+  ...infer Rest,
 ]
   ? MergeAttrTags<[MergeAttrTag<A, B>, ...Rest]>
   : Attrs extends readonly [infer A]
-  ? A
-  : never;
+    ? A
+    : never;
 
 type MergeAttrTag<A, B> = {
   [K in keyof A | keyof B]: K extends keyof A
@@ -464,21 +468,21 @@ type MergeAttrTag<A, B> = {
       ? MergeAttrTagValue<A[K], B[K]>
       : A[K]
     : K extends keyof B
-    ? B[K]
-    : never;
+      ? B[K]
+      : never;
 };
 
 type MergeAttrTagValue<A, B> = A extends readonly any[]
   ? B extends readonly any[]
     ? [...A, ...B]
     : B extends void
-    ? A
-    : [...A, B]
+      ? A
+      : [...A, B]
   : A extends void
-  ? B
-  : B extends void
-  ? A
-  : [A, B];
+    ? B
+    : B extends void
+      ? A
+      : [A, B];
 
 type AttrTagByListSize<T, Item> = T extends
   | readonly [any, any, ...any[]]
@@ -486,18 +490,18 @@ type AttrTagByListSize<T, Item> = T extends
   | 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>;
+    ? Item
+    : T extends readonly [any, ...any[]] | readonly [...any[], any]
+      ? Repeatable<Item>
+      : T extends readonly []
+        ? undefined
+        : MaybeRepeatable<Item>;
 
 type AttrTagByObjectSize<
   Value,
   Item,
   Keys = RecordKeys<Value>,
-  KnownKeys = KnownRecordKeys<Value>
+  KnownKeys = KnownRecordKeys<Value>,
 > = CheckNever<
   Keys,
   undefined,
@@ -527,16 +531,16 @@ type KnownRecordKeys<T> = keyof {
   [Key in keyof T as string extends Key
     ? never
     : number extends Key
-    ? never
-    : symbol extends Key
-    ? never
-    : CheckNever<T[Key], never, Key>]: 0;
+      ? never
+      : symbol extends Key
+        ? never
+        : CheckNever<T[Key], never, Key>]: 0;
 };
 
 type CheckNever<T, If, Else> = [T] extends [never] ? If : Else;
 
 type UnionToIntersection<T> = (T extends any ? (_: T) => any : never) extends (
-  _: infer U
+  _: infer U,
 ) => any
   ? U
   : never;

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "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.0",
-    "htmljs-parser": "^5.5.0",
+    "@babel/parser": "^7.23.5",
+    "htmljs-parser": "^5.5.1",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.22.13",
-    "@marko/compiler": "^5.33.2",
-    "@marko/translator-default": "^5.31.3",
-    "@types/babel__code-frame": "^7.0.4",
-    "@types/babel__helper-validator-identifier": "^7.15.0",
+    "@babel/code-frame": "^7.23.5",
+    "@marko/compiler": "^5.34.1",
+    "@marko/translator-default": "^5.31.8",
+    "@types/babel__code-frame": "^7.0.6",
+    "@types/babel__helper-validator-identifier": "^7.15.2",
     "@typescript/vfs": "^1.5.0",
-    "marko": "^5.31.10",
+    "marko": "^5.32.0",
     "mitata": "^0.1.6",
-    "tsx": "^3.13.0"
+    "tsx": "^4.6.2"
   },
   "exports": {
     ".": {