@marko/language-tools 1.0.0 → 1.0.1

package/dist/index.js

@@ -1808,24 +1808,26 @@ var ScriptExtractor = class {
       this.#extractor.write("(");
     }
     if (this.#scriptLang === "ts" /* ts */) {
-      this.#extractor.write(`function ${templateName}${typeParamsStr}(this: void) {
-  const input = 1 as any as Input${typeArgsStr};
-  const component = 1 as any as Component${typeArgsStr};
-`);
+      this.#extractor.write(
+        `function ${templateName}${typeParamsStr}(this: void) {
+`
+      );
     } else {
       this.#extractor.write(`/**${jsDocTemplateTagsStr}
 * @this {void}
 */
 function ${templateName}() {
-  const input = /** @type {Input${typeArgsStr}} */(${varShared("any")});
-  const component = /** @type {Component${typeArgsStr}} */(${varShared(
-        "any"
-      )});
 `);
     }
-    this.#extractor.write(`  const out = ${varShared("out")};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+  const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
-  ${varShared("noop")}({ input, out, component, state });
+  const $global = ${varShared("getGlobal")}(
+    // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
+    (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
+  );
+  const out = ${varShared("out")};
+  ${varShared("noop")}({ input, component, state, out, $global });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.renderBody) {
@@ -2523,6 +2525,9 @@ const attrTags = ${varShared(
     }
     this.#extractor.write("}");
   }
+  #getCastedType(type) {
+    return this.#scriptLang === "ts" /* ts */ ? `${varShared("any")} as ${type}` : `/** @type {${type}} */(${varShared("any")})`;
+  }
   #copyWithMutationsReplaced(range) {
     const mutations = this.#mutationOffsets;
     if (!mutations)

package/dist/index.mjs

@@ -1775,24 +1775,26 @@ var ScriptExtractor = class {
       this.#extractor.write("(");
     }
     if (this.#scriptLang === "ts" /* ts */) {
-      this.#extractor.write(`function ${templateName}${typeParamsStr}(this: void) {
-  const input = 1 as any as Input${typeArgsStr};
-  const component = 1 as any as Component${typeArgsStr};
-`);
+      this.#extractor.write(
+        `function ${templateName}${typeParamsStr}(this: void) {
+`
+      );
     } else {
       this.#extractor.write(`/**${jsDocTemplateTagsStr}
 * @this {void}
 */
 function ${templateName}() {
-  const input = /** @type {Input${typeArgsStr}} */(${varShared("any")});
-  const component = /** @type {Component${typeArgsStr}} */(${varShared(
-        "any"
-      )});
 `);
     }
-    this.#extractor.write(`  const out = ${varShared("out")};
+    this.#extractor.write(`  const input = ${this.#getCastedType(`Input${typeArgsStr}`)};
+  const component = ${this.#getCastedType(`Component${typeArgsStr}`)};
   const state = ${varShared("state")}(component);
-  ${varShared("noop")}({ input, out, component, state });
+  const $global = ${varShared("getGlobal")}(
+    // @ts-expect-error We expect the compiler to error because we are checking if the MarkoRun.Context is defined.
+    (${varShared("error")}, ${this.#getCastedType("MarkoRun.Context")})
+  );
+  const out = ${varShared("out")};
+  ${varShared("noop")}({ input, component, state, out, $global });
 `);
     const body = this.#processBody(program);
     if (body == null ? void 0 : body.renderBody) {
@@ -2490,6 +2492,9 @@ const attrTags = ${varShared(
     }
     this.#extractor.write("}");
   }
+  #getCastedType(type) {
+    return this.#scriptLang === "ts" /* ts */ ? `${varShared("any")} as ${type}` : `/** @type {${type}} */(${varShared("any")})`;
+  }
   #copyWithMutationsReplaced(range) {
     const mutations = this.#mutationOffsets;
     if (!mutations)

package/dist/util/extractor.d.ts

@@ -11,17 +11,17 @@ export declare class Extractor {
     #private;
     constructor(parsed: Parsed);
     write(str: string): this;
-    copy(range: Range | string | false | void | null): this;
+    copy(range: Range | string | false | void | undefined | null): this;
     end(): Extracted;
 }
 export declare class Extracted {
     #private;
     constructor(parsed: Parsed, generated: string, tokens: Token[]);
-    sourceOffsetAt(generatedOffset: number): number | void;
-    sourcePositionAt(generatedOffset: number): Position | void;
+    sourceOffsetAt(generatedOffset: number): number | undefined;
+    sourcePositionAt(generatedOffset: number): Position | undefined;
     sourceLocationAt(generatedStart: number, generatedEnd: number): Location | undefined;
-    generatedOffsetAt(sourceOffset: number): number | void;
-    generatedPositionAt(sourceOffset: number): Position | void;
+    generatedOffsetAt(sourceOffset: number): number | undefined;
+    generatedPositionAt(sourceOffset: number): Position | undefined;
     generatedLocationAt(sourceStart: number, sourceEnd: number): Location | undefined;
     toString(): string;
 }

package/marko.internal.d.ts

@@ -19,6 +19,10 @@ declare global {
       export const never: never;
       export const any: any;
 
+      export function getGlobal<Override>(
+        override: Override
+      ): 1 extends Override & 0 ? Marko.Global : Override;
+
       export function attrTagNames<Input, Keys extends keyof Input>(
         input: Input
       ): Record<string, never> & {

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.19.1",
     "@babel/parser": "^7.21.2",
-    "htmljs-parser": "^5.2.4",
+    "htmljs-parser": "^5.4.0",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@marko/compiler": "^5.23.6",
+    "@marko/compiler": "^5.26.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__helper-validator-identifier": "^7.15.0",
     "@typescript/vfs": "^1.4.0",
-    "marko": "^5.22.7",
+    "marko": "^5.24.0",
     "mitata": "^0.1.6",
     "tsx": "^3.12.3"
   },