@marko/language-tools 2.5.26 → 2.5.28

package/dist/extractors/script/index.d.ts

@@ -1,4 +1,4 @@
-import type { TaglibLookup } from "@marko/babel-utils";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import type TS from "typescript/lib/tsserverlibrary";
 import { type Parsed } from "../../parser";
 import type { Meta } from "../../util/project";

package/dist/extractors/style/index.d.ts

@@ -1,4 +1,4 @@
-import type { TaglibLookup } from "@marko/babel-utils";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import { type Parsed } from "../../parser";
 import { type Extracted } from "../../util/extractor";
 export interface ExtractStyleOptions {

package/dist/index.js

@@ -744,11 +744,11 @@ var Extracted = class {
     const sourceOffset = this.sourceOffsetAt(generatedOffset);
     if (sourceOffset !== void 0) return this.parsed.positionAt(sourceOffset);
   }
+  sourceRangeAt(generatedStart, generatedEnd) {
+    return this.#generatedToSource.rangeAt(generatedStart, generatedEnd);
+  }
   sourceLocationAt(generatedStart, generatedEnd) {
-    const sourceRange = this.#generatedToSource.rangeAt(
-      generatedStart,
-      generatedEnd
-    );
+    const sourceRange = this.sourceRangeAt(generatedStart, generatedEnd);
     if (sourceRange) {
       return this.parsed.locationAt(sourceRange);
     }
@@ -762,11 +762,11 @@ var Extracted = class {
       return (0, import_htmljs_parser2.getPosition)(this.#generatedLines, generatedOffset);
     }
   }
+  generatedRangeAt(sourceStart, sourceEnd) {
+    return this.#sourceToGenerated.rangeAt(sourceStart, sourceEnd);
+  }
   generatedLocationAt(sourceStart, sourceEnd) {
-    const generatedRange = this.#sourceToGenerated.rangeAt(
-      sourceStart,
-      sourceEnd
-    );
+    const generatedRange = this.generatedRangeAt(sourceStart, sourceEnd);
     if (generatedRange) {
       return (0, import_htmljs_parser2.getLocation)(
         this.#generatedLines,
@@ -2458,11 +2458,11 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
-    const isHTML = def == null ? void 0 : def.html;
-    const importPath = !isHTML ? resolveTagImport(this.#filename, def) : void 0;
+    const importPath = resolveTagImport(this.#filename, def);
+    const isHTML = !importPath && (def == null ? void 0 : def.html);
     let tagIdentifier;
     let isTemplate = false;
-    if (!isHTML && (!def || importPath)) {
+    if (!def || importPath) {
       const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
       const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
       if (isIdentifier || isMarkoFile || !importPath) {

package/dist/index.mjs

@@ -704,11 +704,11 @@ var Extracted = class {
     const sourceOffset = this.sourceOffsetAt(generatedOffset);
     if (sourceOffset !== void 0) return this.parsed.positionAt(sourceOffset);
   }
+  sourceRangeAt(generatedStart, generatedEnd) {
+    return this.#generatedToSource.rangeAt(generatedStart, generatedEnd);
+  }
   sourceLocationAt(generatedStart, generatedEnd) {
-    const sourceRange = this.#generatedToSource.rangeAt(
-      generatedStart,
-      generatedEnd
-    );
+    const sourceRange = this.sourceRangeAt(generatedStart, generatedEnd);
     if (sourceRange) {
       return this.parsed.locationAt(sourceRange);
     }
@@ -722,11 +722,11 @@ var Extracted = class {
       return getPosition(this.#generatedLines, generatedOffset);
     }
   }
+  generatedRangeAt(sourceStart, sourceEnd) {
+    return this.#sourceToGenerated.rangeAt(sourceStart, sourceEnd);
+  }
   generatedLocationAt(sourceStart, sourceEnd) {
-    const generatedRange = this.#sourceToGenerated.rangeAt(
-      sourceStart,
-      sourceEnd
-    );
+    const generatedRange = this.generatedRangeAt(sourceStart, sourceEnd);
     if (generatedRange) {
       return getLocation(
         this.#generatedLines,
@@ -2421,11 +2421,11 @@ constructor(_?: Return) {}
     const tagName = tag.nameText;
     const renderId = this.#getRenderId(tag);
     const def = tagName ? this.#lookup.getTag(tagName) : void 0;
-    const isHTML = def == null ? void 0 : def.html;
-    const importPath = !isHTML ? resolveTagImport(this.#filename, def) : void 0;
+    const importPath = resolveTagImport(this.#filename, def);
+    const isHTML = !importPath && (def == null ? void 0 : def.html);
     let tagIdentifier;
     let isTemplate = false;
-    if (!isHTML && (!def || importPath)) {
+    if (!def || importPath) {
       const isIdentifier = tagName && REG_TAG_NAME_IDENTIFIER.test(tagName);
       const isMarkoFile = importPath == null ? void 0 : importPath.endsWith(".marko");
       if (isIdentifier || isMarkoFile || !importPath) {

package/dist/util/extractor.d.ts

@@ -20,9 +20,17 @@ export declare class Extracted {
     constructor(parsed: Parsed, generated: string, tokens: Token[]);
     sourceOffsetAt(generatedOffset: number): number | undefined;
     sourcePositionAt(generatedOffset: number): Position | undefined;
+    sourceRangeAt(generatedStart: number, generatedEnd: number): {
+        start: number;
+        end: number;
+    } | undefined;
     sourceLocationAt(generatedStart: number, generatedEnd: number): Location | undefined;
     generatedOffsetAt(sourceOffset: number): number | undefined;
     generatedPositionAt(sourceOffset: number): Position | undefined;
+    generatedRangeAt(sourceStart: number, sourceEnd: number): {
+        start: number;
+        end: number;
+    } | undefined;
     generatedLocationAt(sourceStart: number, sourceEnd: number): Location | undefined;
     toString(): string;
 }

package/dist/util/project.d.ts

@@ -1,5 +1,5 @@
-import type { TaglibLookup } from "@marko/babel-utils";
 import type * as Compiler from "@marko/compiler";
+import type { TaglibLookup } from "@marko/compiler/babel-utils";
 import type TS from "typescript/lib/tsserverlibrary";
 import { ScriptLang } from "../extractors/script";
 export interface Meta {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.26",
+  "version": "2.5.28",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"