@marko/language-tools 2.5.33 → 2.5.35

package/dist/extractors/script/util/attach-scopes.d.ts

@@ -1,4 +1,4 @@
-import { type Node, Parsed, Repeatable, Repeated } from "../../../parser";
+import { type Node, Parsed, type Range, Repeatable, Repeated } from "../../../parser";
 import type { ScriptParser } from "./script-parser";
 export interface Options {
     parsed: Parsed;
@@ -58,5 +58,11 @@ export declare function getHoistSources(body: Node.ParentNode["body"]): Repeatab
 export declare function getMutatedVars(node: Node.ParentNode): Set<VarBinding> | undefined;
 export declare function isMutatedVar(node: Node.ParentNode, name: string): boolean;
 export declare function hasHoists(node: Node.ParentTag): boolean;
-export declare function getBoundAttrMemberExpressionStartOffset(value: Node.AttrValue): number | undefined;
+export declare function getBoundAttrRange(value: Node.AttrValue): {
+    value: Range;
+    types: undefined | Range;
+    member: undefined | (Range & {
+        computed: boolean;
+    });
+} | undefined;
 export {};

package/dist/index.js

@@ -1079,7 +1079,7 @@ function isTextOnlyScript(tag) {
 // src/extractors/script/util/attach-scopes.ts
 var ATTR_UNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
-var BoundAttrMemberExpressionStartOffsets = /* @__PURE__ */ new WeakMap();
+var BoundAttrValueRange = /* @__PURE__ */ new WeakMap();
 function crawlProgramScope(parsed, scriptParser) {
   var _a;
   const { program, read } = parsed;
@@ -1240,37 +1240,55 @@ ${read({
                 case 10 /* AttrNamed */: {
                   switch ((_a2 = attr.value) == null ? void 0 : _a2.type) {
                     case 13 /* AttrValue */: {
-                      const parsedValue = scriptParser.expressionAt(
+                      let parsedValue = scriptParser.expressionAt(
                         attr.value.value.start,
                         read(attr.value.value)
                       );
                       if (parsedValue) {
-                        switch (parsedValue.type) {
-                          case "Identifier":
-                            if (attr.value.bound) {
-                              const binding = resolveWritableVar(
-                                parentScope,
-                                parsedValue.name
-                              );
-                              if (binding) {
-                                binding.mutated = true;
-                                (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
-                                  binding
-                                );
-                              }
-                            }
-                            break;
-                          case "MemberExpression":
-                            if (attr.value.bound) {
-                              BoundAttrMemberExpressionStartOffsets.set(
-                                attr.value,
-                                parsedValue.property.start - 1
+                        if (!attr.value.bound) {
+                          checkForMutations(parentScope, parsedValue);
+                        } else {
+                          let types;
+                          if (parsedValue.type === "TSAsExpression" || parsedValue.type === "TSSatisfiesExpression") {
+                            types = {
+                              start: parsedValue.expression.end + 1,
+                              end: parsedValue.end
+                            };
+                            parsedValue = parsedValue.expression;
+                          }
+                          if (parsedValue.type === "Identifier") {
+                            const binding = resolveWritableVar(
+                              parentScope,
+                              parsedValue.name
+                            );
+                            if (binding) {
+                              binding.mutated = true;
+                              (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
+                                binding
                               );
                             }
-                            break;
-                          default:
-                            checkForMutations(parentScope, parsedValue);
-                            break;
+                            BoundAttrValueRange.set(attr.value, {
+                              types,
+                              value: {
+                                start: parsedValue.start,
+                                end: parsedValue.end
+                              },
+                              member: void 0
+                            });
+                          } else if (parsedValue.type === "MemberExpression") {
+                            BoundAttrValueRange.set(attr.value, {
+                              types,
+                              value: {
+                                start: parsedValue.start,
+                                end: parsedValue.property.start - 1
+                              },
+                              member: {
+                                start: parsedValue.property.start,
+                                end: parsedValue.property.end,
+                                computed: parsedValue.computed
+                              }
+                            });
+                          }
                         }
                       }
                       break;
@@ -1355,8 +1373,8 @@ function isMutatedVar(node, name) {
 function hasHoists(node) {
   return node.body ? Scopes.get(node.body).hoists : false;
 }
-function getBoundAttrMemberExpressionStartOffset(value) {
-  return BoundAttrMemberExpressionStartOffsets.get(value);
+function getBoundAttrRange(value) {
+  return BoundAttrValueRange.get(value);
 }
 function resolveWritableVar(scope, name) {
   var _a;
@@ -2083,7 +2101,7 @@ var ScriptExtractor = class {
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${isExternalComponentFile ? "Component['input']" : "Record<string, unknown>"}} Input */
+          `/** @typedef {Record<string, unknown>} Input */
 `
         );
       }
@@ -2095,13 +2113,14 @@ var ScriptExtractor = class {
             `import type Component from "${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
             )}";
+export { type Component }
 `
           );
         } else {
           this.#extractor.write(
             `/** @typedef {import("${stripExt(
               (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : Marko.Component<Input${typeArgsStr}>} Component */
 `
           );
         }
@@ -2594,42 +2613,41 @@ scope: ${scopeExpr}
                   this.#copyWithMutationsReplaced(value.params);
                   this.#copyWithMutationsReplaced(value.body);
                   break;
-                case 13 /* AttrValue */:
+                case 13 /* AttrValue */: {
+                  const boundRange = value.bound && getBoundAttrRange(value);
                   this.#extractor.write('"').copy(defaultMapPosition).copy(name).write('": (\n');
-                  if (value.bound) {
-                    const memberExpressionStart = getBoundAttrMemberExpressionStartOffset(value);
-                    if (memberExpressionStart === void 0) {
-                      const valueLiteral = this.#read(value.value);
-                      this.#extractor.copy(value.value).write(`
+                  if (boundRange) {
+                    if (!boundRange.member) {
+                      const valueLiteral = this.#read(boundRange.value);
+                      this.#extractor.copy(boundRange.value).copy(boundRange.types).write(`
 )${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write(
                         `Change"(_${valueLiteral}) {
 ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}`
-                      ).copy(value.value).write(`= _${valueLiteral};
+                      ).copy(boundRange.value).write(`= _${valueLiteral};
 }`);
-                    } else if (this.#code[memberExpressionStart] === "[") {
-                      const memberObjectRange = {
-                        start: value.value.start,
-                        end: memberExpressionStart + 1
-                      };
-                      const memberPropertyRange = {
-                        start: memberObjectRange.end,
-                        end: value.value.end - 1
-                      };
-                      const memberPropertyCloseRange = {
-                        start: memberPropertyRange.end,
-                        end: value.value.end
-                      };
-                      this.#extractor.copy(memberObjectRange).copy(memberPropertyRange).copy(memberPropertyCloseRange).write(`
-)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(memberObjectRange).write("\n`${\n").copy(memberPropertyRange).write("\n}Change`\n").copy(memberPropertyCloseRange).write("\n)");
+                    } else if (boundRange.member.computed) {
+                      this.#extractor.copy(boundRange.value).copy({
+                        start: boundRange.value.end,
+                        end: boundRange.value.end + 1
+                      }).copy(boundRange.member).copy({
+                        start: boundRange.member.end,
+                        end: boundRange.member.end + 1
+                      }).copy(boundRange.types).write(`
+)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(boundRange.value).write("[`${\n").copy(boundRange.member).write("\n}Change`])");
                     } else {
-                      this.#extractor.copy(value.value).write(`
-)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change"').write(": ").copy(value.value).write(`Change`);
+                      const memberRange = {
+                        start: boundRange.value.start,
+                        end: boundRange.member.end
+                      };
+                      this.#extractor.copy(memberRange).copy(boundRange.types).write(`
+)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(memberRange).write("Change)");
                     }
                   } else {
                     this.#copyWithMutationsReplaced(value.value);
                     this.#extractor.write("\n)");
                   }
                   break;
+                }
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
@@ -3324,9 +3342,9 @@ function getForTagType(parsed, tag) {
         case "in":
           return 2 /* in */;
         case "to":
-        case "from":
-        case "step":
           return 3 /* to */;
+        case "until":
+          return 4 /* until */;
       }
     }
   }
@@ -3340,6 +3358,8 @@ function getForTagRuntime(parsed, tag) {
       return "forInTag";
     case 3 /* to */:
       return "forToTag";
+    case 4 /* until */:
+      return "forUntilTag";
     default:
       return "forTag";
   }
@@ -3352,6 +3372,8 @@ function getForAttrTagRuntime(parsed, tag) {
       return "forInAttrTag";
     case 3 /* to */:
       return "forToAttrTag";
+    case 4 /* until */:
+      return "forUntilAttrTag";
     default:
       return "forAttrTag";
   }
@@ -3894,7 +3916,12 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
-      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      if (ts.isExportDeclaration(statement)) {
+        return statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      } else if (ts.isTypeAliasDeclaration(statement)) {
+        return statement.name.text === "Component";
+      }
+      return false;
     }
     function isVariableStatementForName(statement, name) {
       if (ts.isVariableStatement(statement)) {

package/dist/index.mjs

@@ -1039,7 +1039,7 @@ function isTextOnlyScript(tag) {
 // src/extractors/script/util/attach-scopes.ts
 var ATTR_UNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
-var BoundAttrMemberExpressionStartOffsets = /* @__PURE__ */ new WeakMap();
+var BoundAttrValueRange = /* @__PURE__ */ new WeakMap();
 function crawlProgramScope(parsed, scriptParser) {
   var _a;
   const { program, read } = parsed;
@@ -1200,37 +1200,55 @@ ${read({
                 case 10 /* AttrNamed */: {
                   switch ((_a2 = attr.value) == null ? void 0 : _a2.type) {
                     case 13 /* AttrValue */: {
-                      const parsedValue = scriptParser.expressionAt(
+                      let parsedValue = scriptParser.expressionAt(
                         attr.value.value.start,
                         read(attr.value.value)
                       );
                       if (parsedValue) {
-                        switch (parsedValue.type) {
-                          case "Identifier":
-                            if (attr.value.bound) {
-                              const binding = resolveWritableVar(
-                                parentScope,
-                                parsedValue.name
-                              );
-                              if (binding) {
-                                binding.mutated = true;
-                                (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
-                                  binding
-                                );
-                              }
-                            }
-                            break;
-                          case "MemberExpression":
-                            if (attr.value.bound) {
-                              BoundAttrMemberExpressionStartOffsets.set(
-                                attr.value,
-                                parsedValue.property.start - 1
+                        if (!attr.value.bound) {
+                          checkForMutations(parentScope, parsedValue);
+                        } else {
+                          let types;
+                          if (parsedValue.type === "TSAsExpression" || parsedValue.type === "TSSatisfiesExpression") {
+                            types = {
+                              start: parsedValue.expression.end + 1,
+                              end: parsedValue.end
+                            };
+                            parsedValue = parsedValue.expression;
+                          }
+                          if (parsedValue.type === "Identifier") {
+                            const binding = resolveWritableVar(
+                              parentScope,
+                              parsedValue.name
+                            );
+                            if (binding) {
+                              binding.mutated = true;
+                              (parentScope.mutatedBindings ||= /* @__PURE__ */ new Set()).add(
+                                binding
                               );
                             }
-                            break;
-                          default:
-                            checkForMutations(parentScope, parsedValue);
-                            break;
+                            BoundAttrValueRange.set(attr.value, {
+                              types,
+                              value: {
+                                start: parsedValue.start,
+                                end: parsedValue.end
+                              },
+                              member: void 0
+                            });
+                          } else if (parsedValue.type === "MemberExpression") {
+                            BoundAttrValueRange.set(attr.value, {
+                              types,
+                              value: {
+                                start: parsedValue.start,
+                                end: parsedValue.property.start - 1
+                              },
+                              member: {
+                                start: parsedValue.property.start,
+                                end: parsedValue.property.end,
+                                computed: parsedValue.computed
+                              }
+                            });
+                          }
                         }
                       }
                       break;
@@ -1315,8 +1333,8 @@ function isMutatedVar(node, name) {
 function hasHoists(node) {
   return node.body ? Scopes.get(node.body).hoists : false;
 }
-function getBoundAttrMemberExpressionStartOffset(value) {
-  return BoundAttrMemberExpressionStartOffsets.get(value);
+function getBoundAttrRange(value) {
+  return BoundAttrValueRange.get(value);
 }
 function resolveWritableVar(scope, name) {
   var _a;
@@ -2046,7 +2064,7 @@ var ScriptExtractor = class {
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${isExternalComponentFile ? "Component['input']" : "Record<string, unknown>"}} Input */
+          `/** @typedef {Record<string, unknown>} Input */
 `
         );
       }
@@ -2058,13 +2076,14 @@ var ScriptExtractor = class {
             `import type Component from "${stripExt(
               relativeImportPath(this.#filename, componentFileName)
             )}";
+export { type Component }
 `
           );
         } else {
           this.#extractor.write(
             `/** @typedef {import("${stripExt(
               relativeImportPath(this.#filename, componentFileName)
-            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : never} Component */
+            )}") extends infer Component ? Component extends { default: infer Component } ? Component : Component : Marko.Component<Input${typeArgsStr}>} Component */
 `
           );
         }
@@ -2557,42 +2576,41 @@ scope: ${scopeExpr}
                   this.#copyWithMutationsReplaced(value.params);
                   this.#copyWithMutationsReplaced(value.body);
                   break;
-                case 13 /* AttrValue */:
+                case 13 /* AttrValue */: {
+                  const boundRange = value.bound && getBoundAttrRange(value);
                   this.#extractor.write('"').copy(defaultMapPosition).copy(name).write('": (\n');
-                  if (value.bound) {
-                    const memberExpressionStart = getBoundAttrMemberExpressionStartOffset(value);
-                    if (memberExpressionStart === void 0) {
-                      const valueLiteral = this.#read(value.value);
-                      this.#extractor.copy(value.value).write(`
+                  if (boundRange) {
+                    if (!boundRange.member) {
+                      const valueLiteral = this.#read(boundRange.value);
+                      this.#extractor.copy(boundRange.value).copy(boundRange.types).write(`
 )${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write(
                         `Change"(_${valueLiteral}) {
 ${isMutatedVar(tag.parent, valueLiteral) ? `${varLocal("return")}.mutate.` : ""}`
-                      ).copy(value.value).write(`= _${valueLiteral};
+                      ).copy(boundRange.value).write(`= _${valueLiteral};
 }`);
-                    } else if (this.#code[memberExpressionStart] === "[") {
-                      const memberObjectRange = {
-                        start: value.value.start,
-                        end: memberExpressionStart + 1
-                      };
-                      const memberPropertyRange = {
-                        start: memberObjectRange.end,
-                        end: value.value.end - 1
-                      };
-                      const memberPropertyCloseRange = {
-                        start: memberPropertyRange.end,
-                        end: value.value.end
-                      };
-                      this.#extractor.copy(memberObjectRange).copy(memberPropertyRange).copy(memberPropertyCloseRange).write(`
-)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(memberObjectRange).write("\n`${\n").copy(memberPropertyRange).write("\n}Change`\n").copy(memberPropertyCloseRange).write("\n)");
+                    } else if (boundRange.member.computed) {
+                      this.#extractor.copy(boundRange.value).copy({
+                        start: boundRange.value.end,
+                        end: boundRange.value.end + 1
+                      }).copy(boundRange.member).copy({
+                        start: boundRange.member.end,
+                        end: boundRange.member.end + 1
+                      }).copy(boundRange.types).write(`
+)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(boundRange.value).write("[`${\n").copy(boundRange.member).write("\n}Change`])");
                     } else {
-                      this.#extractor.copy(value.value).write(`
-)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change"').write(": ").copy(value.value).write(`Change`);
+                      const memberRange = {
+                        start: boundRange.value.start,
+                        end: boundRange.member.end
+                      };
+                      this.#extractor.copy(memberRange).copy(boundRange.types).write(`
+)${SEP_COMMA_NEW_LINE}"`).copy(defaultMapPosition).copy(name).write('Change": (\n').copy(memberRange).write("Change)");
                     }
                   } else {
                     this.#copyWithMutationsReplaced(value.value);
                     this.#extractor.write("\n)");
                   }
                   break;
+                }
               }
             } else if (attr.args) {
               this.#extractor.write('"').copy(name).write('": ');
@@ -3287,9 +3305,9 @@ function getForTagType(parsed, tag) {
         case "in":
           return 2 /* in */;
         case "to":
-        case "from":
-        case "step":
           return 3 /* to */;
+        case "until":
+          return 4 /* until */;
       }
     }
   }
@@ -3303,6 +3321,8 @@ function getForTagRuntime(parsed, tag) {
       return "forInTag";
     case 3 /* to */:
       return "forToTag";
+    case 4 /* until */:
+      return "forUntilTag";
     default:
       return "forTag";
   }
@@ -3315,6 +3335,8 @@ function getForAttrTagRuntime(parsed, tag) {
       return "forInAttrTag";
     case 3 /* to */:
       return "forToAttrTag";
+    case 4 /* until */:
+      return "forUntilAttrTag";
     default:
       return "forAttrTag";
   }
@@ -3857,7 +3879,12 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
-      return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      if (ts.isExportDeclaration(statement)) {
+        return statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && ts.isIdentifier(statement.exportClause.elements[0].name) && statement.exportClause.elements[0].name.escapedText === "Component";
+      } else if (ts.isTypeAliasDeclaration(statement)) {
+        return statement.name.text === "Component";
+      }
+      return false;
     }
     function isVariableStatementForName(statement, name) {
       if (ts.isVariableStatement(statement)) {

package/marko.internal.d.ts

@@ -224,6 +224,21 @@ declare global {
         content: BodyContent,
       ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
 
+      export function forUntilTag<
+        From extends void | number,
+        Until extends number,
+        Step extends void | number,
+        BodyContent extends Marko.Body<[index: number], void>,
+      >(
+        input: {
+          from?: From;
+          until: Until;
+          step?: Step;
+          by?: (index: number) => string;
+        },
+        content: BodyContent,
+      ): ReturnAndScope<BodyContentScope<BodyContent>, void>;
+
       export function forTag<BodyContent extends AnyMarkoBody>(
         input: (
           | {
@@ -231,6 +246,11 @@ declare global {
               to: number;
               step?: number;
             }
+          | {
+              from?: number;
+              until: number;
+              step?: number;
+            }
           | {
               in: object | false | void | null;
             }
@@ -301,6 +321,32 @@ declare global {
           : never;
       };
 
+      export function forUntilAttrTag<
+        From extends void | number,
+        Until extends number,
+        Step extends void | number,
+        const Return,
+      >(
+        input: {
+          from?: From;
+          until: Until;
+          step?: Step;
+        },
+        content: (index: number) => Return,
+      ): {
+        [Key in keyof Return]: Return[Key] extends
+          | readonly (infer Item)[]
+          | (infer Item extends Record<PropertyKey, any>)
+          ? number extends From | Until | Step
+            ? undefined | Marko.AttrTag<Item>
+            : Step extends 0
+              ? never
+              : [Until] extends [From extends void ? 0 : From]
+                ? undefined
+                : Marko.AttrTag<Item>
+          : never;
+      };
+
       export function forAttrTag<const Return>(
         input:
           | {
@@ -313,6 +359,11 @@ declare global {
               from?: number;
               to: number;
               step?: number;
+            }
+          | {
+              from?: number;
+              until: number;
+              step?: number;
             },
         content: (...args: unknown[]) => Return,
       ): {

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.33",
+  "version": "2.5.35",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.3",
+    "@babel/parser": "^7.28.4",
     "@luxass/strip-json-comments": "^1.4.0",
     "htmljs-parser": "^5.7.4",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.27.1",
-    "@marko/compiler": "^5.39.33",
+    "@marko/compiler": "^5.39.35",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.1",
-    "marko": "^5.37.47",
+    "marko": "^5.37.55",
     "mitata": "^1.0.34",
-    "tsx": "^4.20.4"
+    "tsx": "^4.20.5"
   },
   "exports": {
     ".": {