@marko/language-tools 1.0.0 → 1.0.2

package/dist/index.js

@@ -1748,6 +1748,7 @@ var ScriptExtractor = class {
     let typeParamsStr = "";
     let typeArgsStr = "";
     let jsDocTemplateTagsStr = "";
+    const hasComponent = componentClassBody || componentFileName;
     if (inputType) {
       if (inputType.typeParameters) {
         let sep = SEP_EMPTY;
@@ -1767,35 +1768,43 @@ var ScriptExtractor = class {
         }
       }
     } else {
-      const hasComponent = componentClassBody || componentFileName;
       if (this.#scriptLang === "ts" /* ts */) {
         this.#extractor.write(
-          hasComponent ? 'export type Input = Component["input"];\n' : `export interface Input {}
+          hasComponent ? "export type Input = Component['input'];\n" : `export interface Input {}
 `
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${hasComponent ? 'Component["input"]' : "Record<string, unknown>"}} Input */
+          `/** @typedef {${hasComponent ? "Component['input']" : "Record<string, unknown>"}} Input */
 `
         );
       }
     }
     if (!componentClassBody && componentFileName) {
-      this.#extractor.write(
-        `import Component from "${stripExt(
-          (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
-        )}";
+      if (this.#scriptLang === "ts" /* ts */) {
+        this.#extractor.write(
+          `import type Component from "${stripExt(
+            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+          )}";
 `
-      );
+        );
+      } else {
+        this.#extractor.write(
+          `/** @typedef {import("${stripExt(
+            (0, import_relative_import_path.relativeImportPath)(this.#filename, componentFileName)
+          )}").default} Component */
+`
+        );
+      }
     } else {
       const body2 = componentClassBody || " {}";
       if (this.#scriptLang === "ts" /* ts */) {
         this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          `abstract class Component${typeParamsStr} extends Marko.Component<${hasComponent && !inputType ? "{}" : `Input${typeArgsStr}`}>`
         ).copy(body2).write("\nexport { type Component }\n");
       } else {
         this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
+  * @extends {Marko.Component${hasComponent && !inputType ? "" : `<Input${typeArgsStr}>`}}
   * @abstract
   */
 `);
@@ -1808,24 +1817,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) {
@@ -2510,6 +2521,12 @@ const attrTags = ${varShared(
       } else {
         this.#extractor.write("}\n})()");
       }
+      this.#extractor.write(SEP_COMMA_NEW_LINE);
+    }
+    if (tag.type === 16 /* AttrTag */) {
+      this.#extractor.write(
+        `[Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`
+      );
     }
     if (!hasInput) {
       this.#writeTagNameComment(tag);
@@ -2523,6 +2540,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

@@ -1715,6 +1715,7 @@ var ScriptExtractor = class {
     let typeParamsStr = "";
     let typeArgsStr = "";
     let jsDocTemplateTagsStr = "";
+    const hasComponent = componentClassBody || componentFileName;
     if (inputType) {
       if (inputType.typeParameters) {
         let sep = SEP_EMPTY;
@@ -1734,35 +1735,43 @@ var ScriptExtractor = class {
         }
       }
     } else {
-      const hasComponent = componentClassBody || componentFileName;
       if (this.#scriptLang === "ts" /* ts */) {
         this.#extractor.write(
-          hasComponent ? 'export type Input = Component["input"];\n' : `export interface Input {}
+          hasComponent ? "export type Input = Component['input'];\n" : `export interface Input {}
 `
         );
       } else {
         this.#extractor.write(
-          `/** @typedef {${hasComponent ? 'Component["input"]' : "Record<string, unknown>"}} Input */
+          `/** @typedef {${hasComponent ? "Component['input']" : "Record<string, unknown>"}} Input */
 `
         );
       }
     }
     if (!componentClassBody && componentFileName) {
-      this.#extractor.write(
-        `import Component from "${stripExt(
-          relativeImportPath(this.#filename, componentFileName)
-        )}";
+      if (this.#scriptLang === "ts" /* ts */) {
+        this.#extractor.write(
+          `import type Component from "${stripExt(
+            relativeImportPath(this.#filename, componentFileName)
+          )}";
 `
-      );
+        );
+      } else {
+        this.#extractor.write(
+          `/** @typedef {import("${stripExt(
+            relativeImportPath(this.#filename, componentFileName)
+          )}").default} Component */
+`
+        );
+      }
     } else {
       const body2 = componentClassBody || " {}";
       if (this.#scriptLang === "ts" /* ts */) {
         this.#extractor.write(
-          `abstract class Component${typeParamsStr} extends Marko.Component<Input${typeArgsStr}>`
+          `abstract class Component${typeParamsStr} extends Marko.Component<${hasComponent && !inputType ? "{}" : `Input${typeArgsStr}`}>`
         ).copy(body2).write("\nexport { type Component }\n");
       } else {
         this.#extractor.write(`/**${jsDocTemplateTagsStr}
-  * @extends {Marko.Component<Input${typeArgsStr}>}
+  * @extends {Marko.Component${hasComponent && !inputType ? "" : `<Input${typeArgsStr}>`}}
   * @abstract
   */
 `);
@@ -1775,24 +1784,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) {
@@ -2477,6 +2488,12 @@ const attrTags = ${varShared(
       } else {
         this.#extractor.write("}\n})()");
       }
+      this.#extractor.write(SEP_COMMA_NEW_LINE);
+    }
+    if (tag.type === 16 /* AttrTag */) {
+      this.#extractor.write(
+        `[Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`
+      );
     }
     if (!hasInput) {
       this.#writeTagNameComment(tag);
@@ -2490,6 +2507,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> & {
@@ -389,22 +393,20 @@ type ComponentEventHandlers<Component extends Marko.Component> = {
   >]: Component[K] extends (...args: any) => any ? Component[K] : never;
 };
 
-type FlatScopes<
-  Input extends object,
-  Objects = Input
-> = Input[keyof Input] extends infer Prop
-  ? Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
+type FlatScopes<Input extends object, Objects = Input> = Input[keyof Input &
+  (string | number)] extends infer Prop
+  ? 0 extends 1 & Prop
+    ? unknown
+    : Prop extends (...args: any) => { [Marko._.scope]: infer Scope }
     ? unknown extends Scope
       ? never
       : Scope
-    : 0 extends 1 & Prop
-    ? never
     : Prop extends object
     ? Prop extends Extract<Objects, Prop>
       ? never
       : FlatScopes<Prop, Objects | Prop>
     : never
-  : never;
+  : unknown;
 
 type MergeScopes<Scopes> = {
   [K in Scopes extends Scopes ? keyof Scopes : never]: Scopes extends Scopes

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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",
+    "@babel/parser": "^7.21.3",
+    "htmljs-parser": "^5.4.3",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@marko/compiler": "^5.23.6",
+    "@marko/compiler": "^5.27.1",
     "@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.25.1",
     "mitata": "^0.1.6",
-    "tsx": "^3.12.3"
+    "tsx": "^3.12.5"
   },
   "exports": {
     ".": {