volar-service-html 0.0.1 → 0.0.3

package/out/index.d.ts

@@ -1,17 +1,14 @@
-import type { ServiceContext, Service, InjectionKey } from '@volar/language-service';
+import type { Service } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-export declare const rulesInjectionKey: InjectionKey<{
-    htmlDocument: html.HTMLDocument;
-    languageService: html.LanguageService;
-}>;
-export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;
-export interface PluginInstance extends ReturnType<Service> {
-    getHtmlLs: () => html.LanguageService;
-    updateCustomData(extraData: html.IHTMLDataProvider[]): void;
+export interface Provide {
+    'html/htmlDocument': (document: TextDocument) => html.HTMLDocument | undefined;
+    'html/languageService': () => html.LanguageService;
+    'html/updateCustomData': (extraData: html.IHTMLDataProvider[]) => void;
 }
+export declare function getHtmlDocument(document: TextDocument): html.HTMLDocument;
 declare const _default: (options?: {
     validLang?: string;
     disableCustomData?: boolean;
-}) => (context: ServiceContext | undefined) => PluginInstance;
+}) => Service<Provide>;
 export default _default;

package/out/index.js

@@ -23,13 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHtmlDocument = exports.rulesInjectionKey = void 0;
+exports.getHtmlDocument = void 0;
 const html = __importStar(require("vscode-html-languageservice"));
 const vscode = __importStar(require("vscode-languageserver-protocol"));
 const path = __importStar(require("path"));
 const parserLs = html.getLanguageService();
 const htmlDocuments = new WeakMap();
-exports.rulesInjectionKey = Symbol();
 function getHtmlDocument(document) {
     const cache = htmlDocuments.get(document);
     if (cache) {
@@ -57,24 +56,16 @@ exports.default = (options = {}) => (context) => {
         shouldUpdateCustomData = true;
     });
     return {
-        rules: {
-            provide: {
-                [exports.rulesInjectionKey](document) {
-                    if (document.languageId !== (options.validLang ?? 'html'))
-                        return;
-                    const htmlDocument = getHtmlDocument(document);
-                    if (!htmlDocument)
-                        return;
-                    return {
-                        htmlDocument,
-                        languageService: htmlLs,
-                    };
-                },
+        provide: {
+            'html/htmlDocument': (document) => {
+                if (document.languageId === (options.validLang ?? 'html')) {
+                    return getHtmlDocument(document);
+                }
             },
+            'html/languageService': () => htmlLs,
+            'html/updateCustomData': updateExtraCustomData,
         },
         triggerCharacters,
-        getHtmlLs: () => htmlLs,
-        updateCustomData: updateExtraCustomData,
         async provideCompletionItems(document, position) {
             return worker(document, async (htmlDocument) => {
                 const configs = await context.env.getConfiguration?.('html.completion');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-html",
-	"version": "0.0.1",
+	"version": "0.0.3",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -17,13 +17,5 @@
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-languageserver-textdocument": "^1.0.8"
 	},
-	"peerDependencies": {
-		"@volar/language-service": "*"
-	},
-	"peerDependenciesMeta": {
-		"@volar/language-service": {
-			"optional": true
-		}
-	},
-	"gitHead": "5bf5152f076f25cb1ddbc7aa6978a8d1c7009fd6"
+	"gitHead": "28896539331e31b4ef1064b6839ea0924d5d28d0"
 }