volar-service-typescript 0.0.0 → 0.0.1

package/out/index.d.ts

@@ -1,3 +1,11 @@
-import type { Service } from '@volar/language-service';
+import { InjectionKey, Service } from '@volar/language-service';
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+export declare const rulesInjectionKey: InjectionKey<{
+    sourceFile: ts.SourceFile;
+    languageService: ts.LanguageService;
+    languageServiceHost: ts.LanguageServiceHost;
+    getTextDocument(uri: string): TextDocument | undefined;
+}>;
 declare const _default: () => Service;
 export default _default;

package/out/index.js

@@ -23,6 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.rulesInjectionKey = void 0;
+const language_service_1 = require("@volar/language-service");
 const semver = __importStar(require("semver"));
 const vscode = __importStar(require("vscode-languageserver-protocol"));
 const shared_1 = require("./shared");
@@ -53,6 +55,7 @@ const signatureHelp = __importStar(require("./services/signatureHelp"));
 const typeDefinitions = __importStar(require("./services/typeDefinition"));
 const workspaceSymbols = __importStar(require("./services/workspaceSymbol"));
 const tsconfig = __importStar(require("./services/tsconfig"));
+exports.rulesInjectionKey = Symbol();
 exports.default = () => (contextOrNull, modules) => {
     const jsDocTriggerCharacter = '*';
     const directiveCommentTriggerCharacter = '@';
@@ -72,7 +75,7 @@ exports.default = () => (contextOrNull, modules) => {
     }
     const context = contextOrNull;
     if (!modules?.typescript) {
-        console.warn('[volar-service-typescript] context.typescript not found, @volar/typescript plugin disabled. Make sure you have provide tsdk in language client.');
+        console.warn('[volar-service-typescript] context.typescript not found, volar-service-typescript is disabled. Make sure you have provide tsdk in language client.');
         return {};
     }
     const ts = modules.typescript;
@@ -140,35 +143,43 @@ exports.default = () => (contextOrNull, modules) => {
     const doFormatting = formatting.register(syntacticCtx);
     const getFoldingRanges = foldingRanges.register(syntacticCtx);
     return {
+        rules: {
+            provide: {
+                [exports.rulesInjectionKey](document, type) {
+                    if ((0, shared_1.isTsDocument)(document)) {
+                        if (type === language_service_1.RuleType.Format || type === language_service_1.RuleType.Syntax) {
+                            prepareSyntacticService(document);
+                            const sourceFile = syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
+                            if (sourceFile) {
+                                return {
+                                    sourceFile,
+                                    languageService: syntacticCtx.typescript.languageService,
+                                    languageServiceHost: syntacticCtx.typescript.languageServiceHost,
+                                    getTextDocument: syntacticCtx.getTextDocument,
+                                };
+                            }
+                        }
+                        else {
+                            const sourceFile = semanticCtx.typescript.languageService.getProgram()?.getSourceFile(context.env.uriToFileName(document.uri));
+                            if (sourceFile) {
+                                return {
+                                    sourceFile,
+                                    languageService: semanticCtx.typescript.languageService,
+                                    languageServiceHost: semanticCtx.typescript.languageServiceHost,
+                                    getTextDocument: semanticCtx.getTextDocument,
+                                };
+                            }
+                        }
+                    }
+                },
+            },
+        },
         ...triggerCharacters,
         triggerCharacters: [
             ...basicTriggerCharacters,
             jsDocTriggerCharacter,
             directiveCommentTriggerCharacter,
         ],
-        resolveRuleContext(ruleCtx, type) {
-            if ((0, shared_1.isTsDocument)(ruleCtx.document)) {
-                let sourceFile;
-                if (type === 'format' || type === 'syntax') {
-                    prepareSyntacticService(ruleCtx.document);
-                    sourceFile = syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
-                }
-                else {
-                    sourceFile = semanticCtx.typescript.languageService.getProgram()?.getSourceFile(context.env.uriToFileName(ruleCtx.document.uri));
-                }
-                if (sourceFile) {
-                    ruleCtx.typescript = {
-                        sourceFile,
-                        getTextDocument: syntacticCtx.getTextDocument,
-                        ...syntacticCtx.typescript,
-                    };
-                }
-                else {
-                    console.warn('[volar-service-typescript] sourceFile not found', ruleCtx.document.uri);
-                }
-            }
-            return ruleCtx;
-        },
         provideAutoInsertionEdit(document, position, ctx) {
             if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
                 && ctx.lastChange.text.endsWith('>')) {

package/out/utils/typeConverters.d.ts

@@ -1,4 +1,4 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare namespace SymbolKind {
-    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 10 | 22 | 11 | 6 | 7 | 13 | 12 | 9 | 26 | 15;
+    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 6 | 7 | 9 | 10 | 11 | 12 | 13 | 15 | 22 | 26;
 }

package/package.json

@@ -1,10 +1,9 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.0",
+	"version": "0.0.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
-		"rules.d.ts",
 		"out/**/*.js",
 		"out/**/*.d.ts"
 	],
@@ -28,5 +27,5 @@
 	"peerDependencies": {
 		"@volar/language-service": "*"
 	},
-	"gitHead": "1011561ac4bbf79c53c3b80c27692569bf861519"
+	"gitHead": "5bf5152f076f25cb1ddbc7aa6978a8d1c7009fd6"
 }

package/rules.d.ts

@@ -1,13 +0,0 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import type { TextDocument } from 'vscode-languageserver-textdocument';
-
-declare module '@volar/language-service' {
-	interface RuleContext {
-		typescript?: {
-			sourceFile: ts.SourceFile;
-			getTextDocument(uri: string): TextDocument | undefined;
-			languageService: ts.LanguageService;
-			languageServiceHost: ts.LanguageServiceHost;
-		}
-	}
-}