@vue/typescript-plugin 2.0.13 → 2.0.14

package/lib/common.d.ts

@@ -4,5 +4,4 @@ export declare function decorateLanguageServiceForVue(language: vue.Language, la
 export declare function getComponentSpans(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    vueOptions: vue.VueCompilerOptions;
-}, vueCode: vue.VueGeneratedCode, template: NonNullable<vue.VueGeneratedCode['sfc']['template']>, spanTemplateRange: ts.TextSpan): ts.TextSpan[];
+}, vueCode: vue.VueVirtualCode, template: NonNullable<vue.VueVirtualCode['sfc']['template']>, spanTemplateRange: ts.TextSpan): ts.TextSpan[];

package/lib/common.js

@@ -68,7 +68,7 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
         languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
             const result = getEncodedSemanticClassifications(fileName, span, format);
             const file = language.scripts.get(fileName);
-            if (file?.generated?.root instanceof vue.VueGeneratedCode) {
+            if (file?.generated?.root instanceof vue.VueVirtualCode) {
                 const { template } = file.generated.root.sfc;
                 if (template) {
                     for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService, vueOptions }, file.generated.root, template, {
@@ -85,9 +85,9 @@ function decorateLanguageServiceForVue(language, languageService, vueOptions, ts
 }
 exports.decorateLanguageServiceForVue = decorateLanguageServiceForVue;
 function getComponentSpans(vueCode, template, spanTemplateRange) {
-    const { typescript: ts, languageService, vueOptions } = this;
+    const { typescript: ts, languageService } = this;
     const result = [];
-    const validComponentNames = (0, componentInfos_1._getComponentNames)(ts, languageService, vueCode, vueOptions);
+    const validComponentNames = (0, componentInfos_1._getComponentNames)(ts, languageService, vueCode);
     const components = new Set([
         ...validComponentNames,
         ...validComponentNames.map(vue.hyphenateTag),

package/lib/requests/collectExtractProps.js

@@ -5,7 +5,7 @@ const language_core_1 = require("@vue/language-core");
 function collectExtractProps(fileName, templateCodeRange) {
     const { typescript: ts, languageService, language, isTsPlugin, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof language_core_1.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof language_core_1.VueVirtualCode)) {
         return;
     }
     const result = new Map();

package/lib/requests/componentInfos.d.ts

@@ -4,14 +4,12 @@ export declare function getComponentProps(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
     language: vue.Language;
-    vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
 export declare function getComponentEvents(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
     language: vue.Language;
-    vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string, tag: string): string[] | undefined;
 export declare function getTemplateContextProps(this: {
@@ -24,10 +22,9 @@ export declare function getComponentNames(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
     language: vue.Language;
-    vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string): string[] | undefined;
-export declare function _getComponentNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: vue.VueGeneratedCode, vueOptions: vue.VueCompilerOptions): string[];
+export declare function _getComponentNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: vue.VueVirtualCode): string[];
 export declare function getElementAttrs(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;

package/lib/requests/componentInfos.js

@@ -4,9 +4,9 @@ exports.getElementAttrs = exports._getComponentNames = exports.getComponentNames
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 function getComponentProps(fileName, tag, requiredOnly = false) {
-    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const vueCode = volarFile.generated.root;
@@ -21,7 +21,7 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
     }
     const name = tag.split('.');
     let componentSymbol = components.type.getProperty(name[0]);
-    if (!componentSymbol && !vueOptions.nativeTags.includes(name[0])) {
+    if (!componentSymbol) {
         componentSymbol = components.type.getProperty((0, shared_1.camelize)(name[0]))
             ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
     }
@@ -71,9 +71,9 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
 }
 exports.getComponentProps = getComponentProps;
 function getComponentEvents(fileName, tag) {
-    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const vueCode = volarFile.generated.root;
@@ -88,7 +88,7 @@ function getComponentEvents(fileName, tag) {
     }
     const name = tag.split('.');
     let componentSymbol = components.type.getProperty(name[0]);
-    if (!componentSymbol && !vueOptions.nativeTags.includes(name[0])) {
+    if (!componentSymbol) {
         componentSymbol = components.type.getProperty((0, shared_1.camelize)(name[0]))
             ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
     }
@@ -134,7 +134,7 @@ exports.getComponentEvents = getComponentEvents;
 function getTemplateContextProps(fileName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const vueCode = volarFile.generated.root;
@@ -145,9 +145,9 @@ function getTemplateContextProps(fileName) {
 }
 exports.getTemplateContextProps = getTemplateContextProps;
 function getComponentNames(fileName) {
-    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const vueCode = volarFile.generated.root;
@@ -156,24 +156,22 @@ function getComponentNames(fileName) {
         ?.getProperties()
         .map(c => c.name)
         .filter(entry => entry.indexOf('$') === -1 && !entry.startsWith('_'))
-        .filter(entry => !vueOptions.nativeTags.includes(entry))
         ?? [];
 }
 exports.getComponentNames = getComponentNames;
-function _getComponentNames(ts, tsLs, vueCode, vueOptions) {
+function _getComponentNames(ts, tsLs, vueCode) {
     return getVariableType(ts, tsLs, vueCode, '__VLS_components')
         ?.type
         ?.getProperties()
         .map(c => c.name)
         .filter(entry => entry.indexOf('$') === -1 && !entry.startsWith('_'))
-        .filter(entry => !vueOptions.nativeTags.includes(entry))
         ?? [];
 }
 exports._getComponentNames = _getComponentNames;
 function getElementAttrs(fileName, tagName) {
     const { typescript: ts, language, languageService, getFileId } = this;
     const volarFile = language.scripts.get(getFileId(fileName));
-    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
+    if (!(volarFile?.generated?.root instanceof vue.VueVirtualCode)) {
         return;
     }
     const program = languageService.getCurrentProgram();

package/lib/server.js

@@ -23,7 +23,7 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
             const text = data.toString();
             const request = JSON.parse(text);
             const fileName = request.args[0];
-            const project = getProject(fileName);
+            const project = getProject(ts.server.toNormalizedPath(fileName));
             if (request.type === 'projectInfoForFile') {
                 connection.write(JSON.stringify(project
                     ? {
@@ -120,9 +120,9 @@ function cleanupPipeTable() {
     }
 }
 exports.projects = new Map();
-function getProject(fileName) {
+function getProject(filename) {
     for (const [project, data] of exports.projects) {
-        if (project.containsFile(fileName)) {
+        if (project.containsFile(filename)) {
             return data;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.13",
+	"version": "2.0.14",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.2.0-alpha.8",
-		"@vue/language-core": "2.0.13",
+		"@volar/typescript": "2.2.0-alpha.10",
+		"@vue/language-core": "2.0.14",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "591d019acd0d34e390880d69b31fbc7b794b806b"
+	"gitHead": "ce1412067f88b7f9af03a2d3e04c220b4921c363"
 }