@marko/language-server 0.12.3 → 0.12.4

package/dist/utils/parser.d.ts

@@ -0,0 +1,176 @@
+import { TagType, Range, Ranges } from "htmljs-parser";
+export { Range, Ranges };
+export declare const UNFINISHED: number;
+export declare enum NodeType {
+    Program = 0,
+    Tag = 1,
+    OpenTagName = 2,
+    ShorthandId = 3,
+    ShorthandClassName = 4,
+    TagVar = 5,
+    TagArgs = 6,
+    TagParams = 7,
+    AttrNamed = 8,
+    AttrName = 9,
+    AttrArgs = 10,
+    AttrValue = 11,
+    AttrMethod = 12,
+    AttrSpread = 13,
+    AttrTag = 14,
+    Text = 15,
+    CDATA = 16,
+    Doctype = 17,
+    Declaration = 18,
+    Comment = 19,
+    Statement = 20,
+    Placeholder = 21,
+    Scriptlet = 22
+}
+export declare namespace Node {
+    type AnyNode = Program | Tag | OpenTagName | ShorthandId | ShorthandClassName | TagVar | TagArgs | TagParams | AttrNamed | AttrName | AttrArgs | AttrValue | AttrMethod | AttrSpread | AttrTag | Text | CDATA | Doctype | Declaration | Comment | Statement | Placeholder | Scriptlet;
+    type ParentNode = Program | Tag | AttrTag;
+    type StaticNode = Comment | Statement;
+    type ParentTag = Tag | AttrTag;
+    type AttrNode = AttrNamed | AttrSpread | AttrTag;
+    type ChildNode = Tag | AttrTag | Text | Doctype | Declaration | CDATA | Comment | Placeholder | Scriptlet;
+    interface Program extends Range {
+        type: NodeType.Program;
+        parent: undefined;
+        static: StaticNode[];
+        body: ChildNode[];
+    }
+    interface Tag extends Range {
+        type: NodeType.Tag;
+        parent: ParentNode;
+        owner: undefined;
+        concise: boolean;
+        open: Range;
+        close: Range | undefined;
+        nameText: string | undefined;
+        bodyType: Exclude<TagType, "statement">;
+        name: OpenTagName;
+        var: TagVar | undefined;
+        args: TagArgs | undefined;
+        params: TagParams | undefined;
+        shorthandId: ShorthandId | undefined;
+        shorthandClassNames: ShorthandClassName[] | undefined;
+        attrs: AttrNode[] | undefined;
+        selfClosed: boolean;
+        body: undefined | ChildNode[];
+    }
+    interface AttrTag extends Range {
+        type: NodeType.AttrTag;
+        parent: ParentTag;
+        owner: ParentTag | undefined;
+        concise: boolean;
+        open: Range;
+        close: Range | undefined;
+        nameText: string | undefined;
+        bodyType: TagType.html;
+        name: OpenTagName;
+        var: TagVar | undefined;
+        args: TagArgs | undefined;
+        params: TagParams | undefined;
+        shorthandId: ShorthandId | undefined;
+        shorthandClassNames: ShorthandClassName[] | undefined;
+        attrs: AttrNode[] | undefined;
+        selfClosed: boolean;
+        body: undefined | ChildNode[];
+    }
+    interface OpenTagName extends Ranges.Template {
+        type: NodeType.OpenTagName;
+        parent: ParentTag;
+    }
+    interface ShorthandId extends Ranges.Template {
+        type: NodeType.ShorthandId;
+        parent: ParentTag;
+    }
+    interface ShorthandClassName extends Ranges.Template {
+        type: NodeType.ShorthandClassName;
+        parent: ParentTag;
+    }
+    interface TagVar extends Ranges.Value {
+        type: NodeType.TagVar;
+        parent: ParentTag;
+    }
+    interface TagArgs extends Ranges.Value {
+        type: NodeType.TagArgs;
+        parent: ParentTag;
+    }
+    interface TagParams extends Ranges.Value {
+        type: NodeType.TagParams;
+        parent: ParentTag;
+    }
+    interface Statement extends Range {
+        type: NodeType.Statement;
+        parent: ParentNode;
+    }
+    interface Text extends Range {
+        type: NodeType.Text;
+        parent: ParentNode;
+    }
+    interface CDATA extends Ranges.Value {
+        type: NodeType.CDATA;
+        parent: ParentNode;
+    }
+    interface Doctype extends Ranges.Value {
+        type: NodeType.Doctype;
+        parent: ParentNode;
+    }
+    interface Declaration extends Ranges.Value {
+        type: NodeType.Declaration;
+        parent: ParentNode;
+    }
+    interface Comment extends Ranges.Value {
+        type: NodeType.Comment;
+        parent: ParentNode;
+    }
+    interface Placeholder extends Ranges.Value {
+        type: NodeType.Placeholder;
+        parent: ParentNode;
+        escape: boolean;
+    }
+    interface Scriptlet extends Ranges.Value {
+        type: NodeType.Scriptlet;
+        parent: ParentNode;
+        block: boolean;
+    }
+    interface AttrNamed extends Range {
+        type: NodeType.AttrNamed;
+        parent: ParentTag;
+        name: AttrName;
+        args: undefined | AttrArgs;
+        value: undefined | AttrValue | AttrMethod;
+    }
+    interface AttrName extends Range {
+        type: NodeType.AttrName;
+        parent: AttrNamed;
+    }
+    interface AttrArgs extends Ranges.Value {
+        type: NodeType.AttrArgs;
+        parent: AttrNamed;
+    }
+    interface AttrValue extends Range {
+        type: NodeType.AttrValue;
+        parent: AttrNamed;
+        value: Range;
+        bound: boolean;
+    }
+    interface AttrMethod extends Range {
+        type: NodeType.AttrMethod;
+        parent: AttrNamed;
+        params: Range;
+        body: Range;
+    }
+    interface AttrSpread extends Ranges.Value {
+        type: NodeType.AttrSpread;
+        parent: ParentTag;
+    }
+}
+export declare function parse(source: string): {
+    read: (range: Range) => string;
+    locationAt: (range: Range) => import("htmljs-parser").Location;
+    positionAt: (offset: number) => import("htmljs-parser").Position;
+    nodeAt: (offset: number) => Node.AnyNode;
+    program: Node.Program;
+};

package/dist/utils/utils.d.ts

@@ -1,11 +1,4 @@
-import { type CompletionList, type InsertReplaceEdit, TextEdit, Position, Range } from "vscode-languageserver";
+import { Range } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "./htmljs-parser";
 export declare const START_OF_FILE: Range;
-export declare function findNonControlFlowParent(tag: ParserEvents.OpenTagName): ParserEvents.OpenTag | null;
-export declare function rangeFromEvent(document: TextDocument, event: ParserEvents.Any): Range;
 export declare function createTextDocument(filename: string): TextDocument;
-export declare function shiftCompletionRanges(list: CompletionList, offset: Position): CompletionList;
-export declare function shiftEdit(edit: TextEdit | InsertReplaceEdit, offset: Position): void;
-export declare function shiftRange(range: Range | undefined, offset: Position): void;
-export declare function shiftPosition(pos: Position, offset: Position): Position;

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@marko/language-server",
   "description": "Marko Language Server",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "bin": {
     "marko-language-server": "./bin.js"
   },
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "dependencies": {
     "@marko/babel-utils": "^5.21.1",
-    "@marko/compiler": "^5.21.4",
+    "@marko/compiler": "^5.21.6",
     "@marko/translator-default": "^5.21.2",
-    "htmljs-parser": "^2.11.3",
+    "htmljs-parser": "^5.0.1",
     "lasso-package-root": "^1.0.1",
     "marko": "^5.21.2",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "prettier-plugin-marko": "^1.2.1",
     "resolve-from": "^5.0.0",
-    "tsx": "^3.4.2",
+    "tsx": "^3.6.0",
     "vscode-css-languageservice": "^6.0.1",
     "vscode-languageserver": "^8.0.1",
     "vscode-languageserver-textdocument": "^1.0.5",

package/dist/utils/completions/index.d.ts

@@ -1,6 +0,0 @@
-export * from "./types/attributeModifier";
-export * from "./types/attributeName";
-export * from "./types/closeTag";
-export * from "./types/openTag";
-export * from "./types/openTagName";
-export * from "./types/styleContent";

package/dist/utils/completions/types/attributeModifier.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams, CompletionList } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function attributeModifier(_taglib: TaglibLookup, _document: TextDocument, _params: CompletionParams, _event: ParserEvents.OpenTagName): CompletionList;

package/dist/utils/completions/types/attributeName.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams, CompletionList } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function attributeName(taglib: TaglibLookup, document: TextDocument, _params: CompletionParams, event: ParserEvents.AttributeName): CompletionList;

package/dist/utils/completions/types/closeTag.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams, CompletionList } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function closeTag(_taglib: TaglibLookup, document: TextDocument, _params: CompletionParams, event: ParserEvents.CloseTag): CompletionList | undefined;

package/dist/utils/completions/types/openTag.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams, CompletionList } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function openTag(_taglib: TaglibLookup, doc: TextDocument, params: CompletionParams, event: ParserEvents.OpenTag): CompletionList | undefined;

package/dist/utils/completions/types/openTagName.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams, CompletionList } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function openTagName(taglib: TaglibLookup, document: TextDocument, params: CompletionParams, event: ParserEvents.OpenTagName): CompletionList;

package/dist/utils/completions/types/styleContent.d.ts

@@ -1,5 +0,0 @@
-import { type CompletionParams } from "vscode-languageserver";
-import { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function styleContent(_taglib: TaglibLookup, document: TextDocument, params: CompletionParams, event: ParserEvents.StyleContent): import("vscode-languageserver-types").CompletionList;

package/dist/utils/definitions/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./types/attributeName";
-export * from "./types/openTagName";

package/dist/utils/definitions/types/attributeName.d.ts

@@ -1,5 +0,0 @@
-import { type TextDocumentPositionParams, LocationLink } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { TaglibLookup } from "../../compiler";
-import type { ParserEvents } from "../../htmljs-parser";
-export declare function attributeName(taglib: TaglibLookup, document: TextDocument, _params: TextDocumentPositionParams, event: ParserEvents.AttributeName): LocationLink[];

package/dist/utils/definitions/types/openTagName.d.ts

@@ -1,5 +0,0 @@
-import { type TextDocumentPositionParams, LocationLink } from "vscode-languageserver";
-import type { TextDocument } from "vscode-languageserver-textdocument";
-import type { ParserEvents } from "../../htmljs-parser";
-import type { TaglibLookup } from "../../compiler";
-export declare function openTagName(taglib: TaglibLookup, document: TextDocument, _params: TextDocumentPositionParams, event: ParserEvents.OpenTagName): LocationLink[];

package/dist/utils/htmljs-parser.d.ts

@@ -1,128 +0,0 @@
-import type { TaglibLookup } from "./compiler";
-export declare namespace ParserEvents {
-    export interface Error {
-        type: "error";
-        code: string;
-        message: string;
-        pos: number;
-        endPos: number;
-    }
-    export interface OpenTagName extends Tag {
-        type: "openTagName";
-    }
-    export interface OpenTag extends Tag {
-        type: "openTag";
-        argument: {
-            pos: number;
-            endPos: number;
-            value: string;
-        } | undefined;
-        params: {
-            pos: number;
-            endPos: number;
-            value: string;
-        } | undefined;
-        shorthandClassNames: {
-            value: string;
-            rawParts: {
-                text: string;
-                pos: number;
-                endPos: number;
-            }[];
-        }[] | undefined;
-        attributes: Attribute[];
-        nestedTags: {
-            [x: string]: Tag;
-        } | undefined;
-        openTagOnly: boolean;
-        selfClosed: boolean;
-        tagNameEndPos: number;
-        isNestedTag: boolean;
-        isRepeated: boolean;
-        targetProperty: string | undefined;
-    }
-    export interface CloseTag {
-        type: "closeTag";
-        tagName: string;
-        pos: number;
-        endPos: number;
-    }
-    export interface Placeholder {
-        type: "placeholder";
-        escape: boolean;
-        pos: number;
-        endPos: number;
-        value: string;
-        withinTagName: string;
-        withinOpenTag: string;
-        withinAttribute: boolean;
-        withinBody: boolean;
-        withinString: boolean;
-    }
-    export interface AttributeName {
-        type: "attributeName";
-        tag: OpenTag;
-        name: string;
-        pos: number;
-        endPos: number;
-    }
-    export interface AttributeModifier {
-        type: "attributeModifier";
-        tag: OpenTag;
-        name: string;
-        modifier: string;
-        pos: number;
-        endPos: number;
-    }
-    export interface AttributeValue {
-        type: "attributeValue";
-        tag: OpenTag;
-        name: string;
-        value: string;
-        pos: number;
-        endPos: number;
-    }
-    export interface Text {
-        type: "text";
-        value: string;
-        pos: number;
-        endPos: number;
-        parent: OpenTag | null;
-    }
-    export interface StyleContent {
-        type: "styleContent";
-        language: "css" | "less" | "scss";
-        block: boolean;
-        content: string;
-        pos: number;
-        endPos: number;
-    }
-    export type Any = Error | OpenTagName | OpenTag | CloseTag | Placeholder | AttributeName | AttributeModifier | AttributeValue | Text | StyleContent;
-    interface Tag {
-        tagName: string;
-        tagNameExpression: string | undefined;
-        emptyTagName: boolean;
-        concise: boolean;
-        pos: number;
-        endPos: number;
-        parent: OpenTag | null;
-    }
-    interface Attribute {
-        name: string;
-        argument: {
-            pos: number;
-            endPos: number;
-            value: string;
-        } | undefined;
-        value: string | undefined;
-        pos: number;
-        endPos: number;
-    }
-    export {};
-}
-export declare function parseUntilOffset(options: {
-    offset: number;
-    text: string;
-    taglib: TaglibLookup;
-    includeErrors?: boolean;
-}): ParserEvents.Any | null;