@vue/language-service 1.7.3 → 1.7.5

package/out/helpers.d.ts

@@ -3,8 +3,8 @@ import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function checkPropsOfTag(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, sourceFile: embedded.VirtualFile, tag: string, nativeTags: Set<string>, requiredOnly?: boolean): string[];
 export declare function checkEventsOfTag(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, sourceFile: embedded.VirtualFile, tag: string, nativeTags: Set<string>): string[];
 export declare function checkComponentNames(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, sourceFile: embedded.VirtualFile, nativeTags: Set<string>): string[];
-export declare function checkNativeTags(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, fileName: string): Set<string>;
-export declare function getElementAttrs(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, fileName: string, tagName: string): string[];
+export declare function checkNativeTags(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, tsLsHost: ts.LanguageServiceHost): Set<string>;
+export declare function getElementAttrs(ts: typeof import('typescript/lib/tsserverlibrary'), tsLs: ts.LanguageService, tsLsHost: ts.LanguageServiceHost, tagName: string): string[];
 type Tags = Map<string, {
     offsets: number[];
     attrs: Map<string, {

package/out/helpers.js

@@ -120,12 +120,12 @@ function checkComponentNames(ts, tsLs, sourceFile, nativeTags) {
         ?? [];
 }
 exports.checkComponentNames = checkComponentNames;
-function checkNativeTags(ts, tsLs, fileName) {
-    const sharedTypesFileName = fileName.substring(0, fileName.lastIndexOf('/')) + '/' + language_core_1.sharedTypes.baseName;
+function checkNativeTags(ts, tsLs, tsLsHost) {
+    const sharedTypesFileName = tsLsHost.getCurrentDirectory() + '/' + language_core_1.sharedTypes.baseName;
     const result = new Set();
     let tsSourceFile;
     if (tsSourceFile = tsLs.getProgram()?.getSourceFile(sharedTypesFileName)) {
-        const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === 'IntrinsicElements');
+        const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === '__VLS_IntrinsicElements');
         const checker = tsLs.getProgram()?.getTypeChecker();
         if (checker && typeNode) {
             const type = checker.getTypeFromTypeNode(typeNode.type);
@@ -138,11 +138,11 @@ function checkNativeTags(ts, tsLs, fileName) {
     return result;
 }
 exports.checkNativeTags = checkNativeTags;
-function getElementAttrs(ts, tsLs, fileName, tagName) {
-    const sharedTypesFileName = fileName.substring(0, fileName.lastIndexOf('/')) + '/' + language_core_1.sharedTypes.baseName;
+function getElementAttrs(ts, tsLs, tsLsHost, tagName) {
+    const sharedTypesFileName = tsLsHost.getCurrentDirectory() + '/' + language_core_1.sharedTypes.baseName;
     let tsSourceFile;
     if (tsSourceFile = tsLs.getProgram()?.getSourceFile(sharedTypesFileName)) {
-        const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === 'IntrinsicElements');
+        const typeNode = tsSourceFile.statements.find((node) => ts.isTypeAliasDeclaration(node) && node.name.getText() === '__VLS_IntrinsicElements');
         const checker = tsLs.getProgram()?.getTypeChecker();
         if (checker && typeNode) {
             const type = checker.getTypeFromTypeNode(typeNode.type);

package/out/ideFeatures/nameCasing.js

@@ -18,7 +18,7 @@ async function convertTagName(ts, context, uri, casing) {
     const template = desc.template;
     const document = context.documents.getDocumentByFileName(rootFile.snapshot, rootFile.fileName);
     const edits = [];
-    const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, rootFile.fileName);
+    const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, context.typescript.languageServiceHost);
     const components = (0, helpers_1.checkComponentNames)(ts, context.typescript.languageService, rootFile, nativeTags);
     const tags = (0, helpers_1.getTemplateTagsAndAttrs)(rootFile);
     for (const [tagName, { offsets }] of tags) {
@@ -52,7 +52,7 @@ async function convertAttrName(ts, context, uri, casing) {
     const template = desc.template;
     const document = context.documents.getDocumentByFileName(rootFile.snapshot, rootFile.fileName);
     const edits = [];
-    const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, rootFile.fileName);
+    const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, context.typescript.languageServiceHost);
     const components = (0, helpers_1.checkComponentNames)(ts, context.typescript.languageService, rootFile, nativeTags);
     const tags = (0, helpers_1.getTemplateTagsAndAttrs)(rootFile);
     for (const [tagName, { attrs }] of tags) {
@@ -137,7 +137,7 @@ function detect(ts, context, uri) {
         if (!context.typescript) {
             return [];
         }
-        const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, file.fileName);
+        const nativeTags = (0, helpers_1.checkNativeTags)(ts, context.typescript.languageService, context.typescript.languageServiceHost);
         const components = (0, helpers_1.checkComponentNames)(ts, context.typescript.languageService, file, nativeTags);
         const tagNames = (0, helpers_1.getTemplateTagsAndAttrs)(file);
         const result = [];

package/out/index.d.ts

@@ -1,5 +1,6 @@
 export * from '@volar/language-service';
+export * from '@vue/language-core';
 export * from './ideFeatures/nameCasing';
 export * from './languageService';
-export * from './types';
-export { injectionKeys } from './plugins/vue';
+export { TagNameCasing, AttrNameCasing } from './types';
+export { Provide } from './plugins/vue';

package/out/index.js

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectionKeys = void 0;
+exports.AttrNameCasing = exports.TagNameCasing = void 0;
 __exportStar(require("@volar/language-service"), exports);
+__exportStar(require("@vue/language-core"), exports);
 __exportStar(require("./ideFeatures/nameCasing"), exports);
 __exportStar(require("./languageService"), exports);
-__exportStar(require("./types"), exports);
-var vue_1 = require("./plugins/vue");
-Object.defineProperty(exports, "injectionKeys", { enumerable: true, get: function () { return vue_1.injectionKeys; } });
+var types_1 = require("./types");
+Object.defineProperty(exports, "TagNameCasing", { enumerable: true, get: function () { return types_1.TagNameCasing; } });
+Object.defineProperty(exports, "AttrNameCasing", { enumerable: true, get: function () { return types_1.AttrNameCasing; } });
 //# sourceMappingURL=index.js.map

package/out/languageService.d.ts

@@ -1,9 +1,8 @@
-import createJsonPlugin from 'volar-service-json';
+import { Config } from '@volar/language-service';
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import { Config } from '@volar/language-service';
+import createJsonService from 'volar-service-json';
 export interface Settings {
-    json?: Parameters<typeof createJsonPlugin>[0];
+    json?: Parameters<typeof createJsonService>[0];
 }
-export declare function resolveConfig(config: Config, // volar.config.js
-compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: vue.VueCompilerOptions, settings?: Settings, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Config;
+export declare function resolveConfig(config: Config, compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: Partial<vue.VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), settings?: Settings, codegenStack?: boolean): Config;

package/out/languageService.js

@@ -1,32 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveConfig = void 0;
+const vue = require("@vue/language-core");
+const shared_1 = require("@vue/shared");
 const volar_service_css_1 = require("volar-service-css");
 const volar_service_emmet_1 = require("volar-service-emmet");
 const volar_service_html_1 = require("volar-service-html");
 const volar_service_json_1 = require("volar-service-json");
 const volar_service_pug_1 = require("volar-service-pug");
+const volar_service_pug_beautify_1 = require("volar-service-pug-beautify");
 const volar_service_typescript_1 = require("volar-service-typescript");
 const volar_service_typescript_twoslash_queries_1 = require("volar-service-typescript-twoslash-queries");
-const vue = require("@vue/language-core");
 const vscode = require("vscode-languageserver-protocol");
+const nameCasing_1 = require("./ideFeatures/nameCasing");
 const vue_1 = require("./plugins/vue");
 const vue_autoinsert_dotvalue_1 = require("./plugins/vue-autoinsert-dotvalue");
+const vue_autoinsert_parentheses_1 = require("./plugins/vue-autoinsert-parentheses");
+const vue_autoinsert_space_1 = require("./plugins/vue-autoinsert-space");
 const vue_codelens_references_1 = require("./plugins/vue-codelens-references");
-const vue_twoslash_queries_1 = require("./plugins/vue-twoslash-queries");
 const vue_template_1 = require("./plugins/vue-template");
+const vue_twoslash_queries_1 = require("./plugins/vue-twoslash-queries");
 const vue_visualize_hidden_callback_param_1 = require("./plugins/vue-visualize-hidden-callback-param");
-const shared_1 = require("@vue/shared");
-const volar_service_pug_beautify_1 = require("volar-service-pug-beautify");
-const vue_autoinsert_parentheses_1 = require("./plugins/vue-autoinsert-parentheses");
-const vue_autoinsert_space_1 = require("./plugins/vue-autoinsert-space");
 const types_1 = require("./types");
-const nameCasing_1 = require("./ideFeatures/nameCasing");
-function resolveConfig(config, // volar.config.js
-compilerOptions = {}, vueCompilerOptions = vue.resolveVueCompilerOptions({}), settings, ts = require('typescript'), codegenStack = false) {
-    const vueLanguageModules = vue.createLanguages(compilerOptions, vueCompilerOptions, ts, codegenStack);
+function resolveConfig(config, compilerOptions = {}, vueCompilerOptions = {}, ts = require('typescript'), settings, codegenStack = false) {
+    const resolvedVueCompilerOptions = vue.resolveVueCompilerOptions(vueCompilerOptions);
+    const vueLanguageModules = vue.createLanguages(compilerOptions, resolvedVueCompilerOptions, ts, codegenStack);
     config.languages = Object.assign({}, vueLanguageModules, config.languages);
-    config.services = resolvePlugins(config.services, vueCompilerOptions, settings);
+    config.services = resolvePlugins(config.services, resolvedVueCompilerOptions, settings);
     return config;
 }
 exports.resolveConfig = resolveConfig;
@@ -193,21 +193,27 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
         };
     };
     services.html ??= (0, vue_template_1.default)({
-        templateLanguagePlugin: (0, volar_service_html_1.default)(),
-        getScanner: (document, htmlPlugin) => {
-            return htmlPlugin.getHtmlLs().createScanner(document.getText());
+        baseService: (0, volar_service_html_1.default)(),
+        getScanner: (htmlService, document) => {
+            return htmlService.provide['html/languageService']().createScanner(document.getText());
+        },
+        updateCustomData(htmlService, extraData) {
+            htmlService.provide['html/updateCustomData'](extraData);
         },
         isSupportedDocument: (document) => document.languageId === 'html',
         vueCompilerOptions,
     });
     services.pug ??= (0, vue_template_1.default)({
-        templateLanguagePlugin: (0, volar_service_pug_1.default)(),
-        getScanner: (document, pugPlugin) => {
-            const pugDocument = pugPlugin.getPugDocument(document);
+        baseService: (0, volar_service_pug_1.default)(),
+        getScanner: (pugService, document) => {
+            const pugDocument = pugService.provide['pug/pugDocument'](document);
             if (pugDocument) {
-                return pugPlugin.getPugLs().createScanner(pugDocument);
+                return pugService.provide['pug/languageService']().createScanner(pugDocument);
             }
         },
+        updateCustomData(pugService, extraData) {
+            pugService.provide['pug/updateCustomData'](extraData);
+        },
         isSupportedDocument: (document) => document.languageId === 'jade',
         vueCompilerOptions,
     });

package/out/plugins/vue-template.d.ts

@@ -1,10 +1,12 @@
-import createHtmlPlugin from 'volar-service-html';
+import { Service } from '@volar/language-service';
 import * as html from 'vscode-html-languageservice';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { VueCompilerOptions } from '../types';
-export default function useVueTemplateLanguagePlugin<T extends ReturnType<typeof createHtmlPlugin>>(options: {
-    getScanner(document: TextDocument, t: ReturnType<T>): html.Scanner | undefined;
-    templateLanguagePlugin: T;
+declare const _default: <S extends Service>(options: {
+    getScanner(service: ReturnType<S>, document: TextDocument): html.Scanner | undefined;
+    updateCustomData(service: ReturnType<S>, extraData: html.IHTMLDataProvider[]): void;
+    baseService: S;
     isSupportedDocument: (document: TextDocument) => boolean;
     vueCompilerOptions: VueCompilerOptions;
-}): T;
+}) => Service;
+export default _default;