@marko/language-tools 2.5.62 → 2.5.64

package/dist/index.js

@@ -2641,6 +2641,7 @@ function ${templateName}() {
     )}<${internalInput}, Marko.Directives & Input${typeArgsStr}>) => (${varShared(
       "ReturnWithScope"
     )}<${internalInput}, ${returnTypeStr}>)`;
+    const apiVar = varLocal("api");
     const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
       this.#api,
       this.#runtimeTypes,
@@ -2648,7 +2649,7 @@ function ${templateName}() {
       typeArgsStr,
       returnTypeStr
     ) : ""}
-  ${this.#interop ? `api: "${this.#api}",` : ""}
+  ${this.#interop ? `api: typeof ${apiVar},` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
     : () => <${internalInputWithExtends}, ${typeParamsStr.slice(
@@ -2656,6 +2657,13 @@ function ${templateName}() {
       -1
     )}>${renderAndReturn};` : `(): () => <${internalInputWithExtends}>${renderAndReturn};`}
 }>`;
+    if (this.#interop) {
+      this.#extractor.write(
+        `const ${apiVar} = "${this.#api}";
+export { ${apiVar} as "~api" };
+`
+      );
+    }
     this.#extractor.write(`export default new `).anchor(START_OF_FILE);
     if (this.#scriptLang === "ts" /* ts */) {
       this.#extractor.write(`(

package/dist/index.mjs

@@ -2603,6 +2603,7 @@ function ${templateName}() {
     )}<${internalInput}, Marko.Directives & Input${typeArgsStr}>) => (${varShared(
       "ReturnWithScope"
     )}<${internalInput}, ${returnTypeStr}>)`;
+    const apiVar = varLocal("api");
     const templateOverrideClass = `${templateBaseClass}<{${this.#runtimeTypes ? getRuntimeOverrides(
       this.#api,
       this.#runtimeTypes,
@@ -2610,7 +2611,7 @@ function ${templateName}() {
       typeArgsStr,
       returnTypeStr
     ) : ""}
-  ${this.#interop ? `api: "${this.#api}",` : ""}
+  ${this.#interop ? `api: typeof ${apiVar},` : ""}
   _${typeParamsStr ? `<${internalApply} = 1>(): ${internalApply} extends 0
     ? ${typeParamsStr}() => <${internalInputWithExtends}>${renderAndReturn}
     : () => <${internalInputWithExtends}, ${typeParamsStr.slice(
@@ -2618,6 +2619,13 @@ function ${templateName}() {
       -1
     )}>${renderAndReturn};` : `(): () => <${internalInputWithExtends}>${renderAndReturn};`}
 }>`;
+    if (this.#interop) {
+      this.#extractor.write(
+        `const ${apiVar} = "${this.#api}";
+export { ${apiVar} as "~api" };
+`
+      );
+    }
     this.#extractor.write(`export default new `).anchor(START_OF_FILE);
     if (this.#scriptLang === "ts" /* ts */) {
       this.#extractor.write(`(

package/dist/parser.d.ts

@@ -43,7 +43,7 @@ export declare namespace Node {
     type AttrNode = AttrNamed | AttrSpread;
     type ControlFlowTag = Tag & {
         nameText: "if" | "else" | "else-if" | "for" | "while";
-        bodyType: TagType.html;
+        bodyType: typeof TagType.html;
     };
     type ChildNode = Tag | AttrTag | Text | Doctype | Declaration | CDATA | Placeholder | Scriptlet;
     interface Commentable {
@@ -87,7 +87,7 @@ export declare namespace Node {
         open: Range;
         close: Range | undefined;
         nameText: string;
-        bodyType: TagType.html;
+        bodyType: typeof TagType.html;
         name: OpenTagName;
         var: TagVar | undefined;
         args: TagArgs | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/language-tools",
-  "version": "2.5.62",
+  "version": "2.5.64",
   "description": "Marko Language Tools",
   "keywords": [
     "analysis",
@@ -37,15 +37,15 @@
   },
   "dependencies": {
     "@luxass/strip-json-comments": "^1.4.0",
-    "@marko/compiler": "^5.39.63",
-    "htmljs-parser": "^5.10.2",
+    "@marko/compiler": "^5.39.66",
+    "htmljs-parser": "^5.11.0",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",
     "@typescript/vfs": "^1.6.4",
-    "marko": "^5.38.36",
+    "marko": "^5.39.11",
     "mitata": "^1.0.34",
-    "tsx": "^4.21.0"
+    "tsx": "^4.22.4"
   }
 }