volar-service-pug 0.0.2 → 0.0.3

package/out/index.d.ts

@@ -1,16 +1,11 @@
-import { InjectionKey, Service, ServiceContext } from '@volar/language-service';
+import type { Service } from '@volar/language-service';
 import type * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as pug from './languageService';
-export declare const injectionKeys: {
-    pugDocument: InjectionKey<[TextDocument], pug.PugDocument>;
-    languageService: InjectionKey<[], pug.LanguageService>;
-};
-export interface PluginInstance extends ReturnType<Service> {
-    getHtmlLs: () => html.LanguageService;
-    updateCustomData(extraData: html.IHTMLDataProvider[]): void;
-    getPugLs: () => pug.LanguageService;
-    getPugDocument: (document: TextDocument) => pug.PugDocument | undefined;
+export interface Provide {
+    'pug/pugDocument': (document: TextDocument) => pug.PugDocument | undefined;
+    'pug/languageService': () => pug.LanguageService;
+    'pug/updateCustomData': (extraData: html.IHTMLDataProvider[]) => void;
 }
-declare const _default: () => (context: ServiceContext | undefined) => PluginInstance;
+declare const _default: () => Service<Provide>;
 export default _default;

package/out/index.js

@@ -26,30 +26,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectionKeys = void 0;
 const volar_service_html_1 = __importDefault(require("volar-service-html"));
 const language_service_1 = require("@volar/language-service");
-const language_service_2 = require("@volar/language-service");
 const pug = __importStar(require("./languageService"));
-exports.injectionKeys = {
-    pugDocument: 'pug/pugDocument',
-    languageService: 'pug/languageService',
-};
-exports.default = () => (context) => {
+exports.default = () => (context, modules) => {
+    const htmlService = (0, volar_service_html_1.default)()(context, modules);
     if (!context) {
-        return {};
+        return htmlService;
     }
     const pugDocuments = new WeakMap();
-    const htmlPlugin = (0, volar_service_html_1.default)()(context);
-    const pugLs = pug.getLanguageService(htmlPlugin.getHtmlLs());
+    const pugLs = pug.getLanguageService(htmlService.provide['html/languageService']());
     return {
+        ...htmlService,
         provide: {
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.pugDocument, getPugDocument),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageService, () => pugLs),
+            'pug/pugDocument': getPugDocument,
+            'pug/languageService': () => pugLs,
+            'pug/updateCustomData': htmlService.provide['html/updateCustomData'],
         },
-        ...htmlPlugin,
-        getPugLs: () => pugLs,
-        getPugDocument,
         provideCompletionItems(document, position, _) {
             return worker(document, (pugDocument) => {
                 return pugLs.doComplete(pugDocument, position, context.env.documentContext);
@@ -91,8 +84,8 @@ exports.default = () => (context) => {
         },
         provideDocumentSymbols(document, token) {
             return worker(document, async (pugDoc) => {
-                const htmlResult = await htmlPlugin.provideDocumentSymbols?.(pugDoc.map.virtualFileDocument, token) ?? [];
-                const pugResult = htmlResult.map(htmlSymbol => language_service_2.transformer.asDocumentSymbol(htmlSymbol, range => pugDoc.map.toSourceRange(range))).filter((symbol) => symbol !== undefined);
+                const htmlResult = await htmlService.provideDocumentSymbols?.(pugDoc.map.virtualFileDocument, token) ?? [];
+                const pugResult = htmlResult.map(htmlSymbol => language_service_1.transformer.asDocumentSymbol(htmlSymbol, range => pugDoc.map.toSourceRange(range))).filter((symbol) => symbol !== undefined);
                 return pugResult;
             });
         },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-pug",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/pug"
 	},
 	"dependencies": {
-		"muggle-string": "^0.2.2",
+		"muggle-string": "^0.3.1",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
-		"volar-service-html": "0.0.2",
+		"volar-service-html": "0.0.3",
 		"vscode-html-languageservice": "^5.0.4",
 		"vscode-languageserver-textdocument": "^1.0.8",
 		"vscode-languageserver-types": "^3.17.2"
@@ -28,5 +28,5 @@
 	"browser": {
 		"./out/index.js": "./out/empty.js"
 	},
-	"gitHead": "19482084693c7349f461dc75ec52ee6917739c51"
+	"gitHead": "28896539331e31b4ef1064b6839ea0924d5d28d0"
 }