volar-service-pug 0.0.0 → 0.0.2

package/out/empty.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-console.warn('volar-service-pug: This plugin is not support on web yet.');
+console.warn('volar-service-pug: this module is not yet supported for web.');
 exports.default = () => () => ({});
 //# sourceMappingURL=empty.js.map

package/out/index.d.ts

@@ -1,7 +1,11 @@
-import type { Service, ServiceContext } from '@volar/language-service';
+import { InjectionKey, Service, ServiceContext } 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;

package/out/index.js

@@ -26,9 +26,15 @@ 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) => {
     if (!context) {
         return {};
@@ -37,20 +43,13 @@ exports.default = () => (context) => {
     const htmlPlugin = (0, volar_service_html_1.default)()(context);
     const pugLs = pug.getLanguageService(htmlPlugin.getHtmlLs());
     return {
+        provide: {
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.pugDocument, getPugDocument),
+            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageService, () => pugLs),
+        },
         ...htmlPlugin,
         getPugLs: () => pugLs,
         getPugDocument,
-        resolveRuleContext(context) {
-            worker(context.document, (pugDocument) => {
-                if (pugDocument.ast) {
-                    context.pug = {
-                        rootNode: pugDocument.ast,
-                        languageService: pugLs,
-                    };
-                }
-            });
-            return context;
-        },
         provideCompletionItems(document, position, _) {
             return worker(document, (pugDocument) => {
                 return pugLs.doComplete(pugDocument, position, context.env.documentContext);
@@ -93,7 +92,7 @@ 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_1.transformer.asDocumentSymbol(htmlSymbol, range => pugDoc.map.toSourceRange(range))).filter((symbol) => symbol !== undefined);
+                const pugResult = htmlResult.map(htmlSymbol => language_service_2.transformer.asDocumentSymbol(htmlSymbol, range => pugDoc.map.toSourceRange(range))).filter((symbol) => symbol !== undefined);
                 return pugResult;
             });
         },

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "volar-service-pug",
-	"version": "0.0.0",
+	"version": "0.0.2",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
-		"rules.d.ts",
 		"out/**/*.js",
 		"out/**/*.d.ts"
 	],
@@ -17,7 +16,7 @@
 		"muggle-string": "^0.2.2",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
-		"volar-service-html": "0.0.0",
+		"volar-service-html": "0.0.2",
 		"vscode-html-languageservice": "^5.0.4",
 		"vscode-languageserver-textdocument": "^1.0.8",
 		"vscode-languageserver-types": "^3.17.2"
@@ -29,5 +28,5 @@
 	"browser": {
 		"./out/index.js": "./out/empty.js"
 	},
-	"gitHead": "1011561ac4bbf79c53c3b80c27692569bf861519"
+	"gitHead": "19482084693c7349f461dc75ec52ee6917739c51"
 }

package/rules.d.ts

@@ -1,10 +0,0 @@
-import * as pug from 'volar-service-pug';
-
-declare module '@volar/language-service' {
-	interface RuleContext {
-		pug?: {
-			rootNode: pug.Node;
-			languageService: pug.LanguageService;
-		}
-	}
-}