volar-service-typescript 0.0.27-patch.1 → 0.0.28

package/index.js

@@ -178,8 +178,8 @@ function create(ts) {
                     }
                 },
             };
-            let syntacticHostCtx = {
-                projectVersion: 0,
+            const syntacticHostCtx = {
+                projectVersion: -1,
                 document: undefined,
                 fileName: '',
                 fileVersion: 0,
@@ -241,24 +241,28 @@ function create(ts) {
                 languageServiceHost,
                 languageService,
                 ts,
-                uriToFileName: uri => {
-                    const [_virtualCode, file] = context.documents.getVirtualCodeByUri(uri);
-                    if (file) {
-                        return context.env.typescript.uriToFileName(file.id);
-                    }
-                    else {
-                        return context.env.typescript.uriToFileName(uri);
+                uriToFileName(uri) {
+                    const virtualScript = getVirtualScriptByUri(uri);
+                    if (virtualScript) {
+                        return virtualScript.fileName;
                     }
+                    return context.env.typescript.uriToFileName(uri);
                 },
-                fileNameToUri: fileName => {
+                fileNameToUri(fileName) {
                     const uri = context.env.typescript.fileNameToUri(fileName);
-                    const file = context.language.files.get(uri);
-                    if (file?.generated) {
-                        const script = file.generated.languagePlugin.typescript?.getScript(file.generated.code);
-                        if (script) {
-                            return context.documents.getVirtualCodeUri(uri, script.code.id);
+                    const sourceFile = context.language.files.get(uri);
+                    const extraScript = context.language.typescript.getExtraScript(fileName);
+                    let virtualCode = extraScript?.code;
+                    if (!virtualCode && sourceFile?.generated?.languagePlugin.typescript) {
+                        const mainScript = sourceFile.generated.languagePlugin.typescript.getScript(sourceFile.generated.code);
+                        if (mainScript) {
+                            virtualCode = mainScript.code;
                         }
                     }
+                    if (virtualCode) {
+                        const sourceFile = context.language.files.getByVirtualCode(virtualCode);
+                        return context.documents.getVirtualCodeUri(sourceFile.id, virtualCode.id);
+                    }
                     return uri;
                 },
                 getTextDocument(uri) {
@@ -497,15 +501,31 @@ function create(ts) {
                 },
             };
             function isSemanticDocument(document, withJson = false) {
-                const [virtualCode, sourceFile] = context.documents.getVirtualCodeByUri(document.uri);
-                if (virtualCode) {
-                    return sourceFile.generated?.languagePlugin.typescript?.getScript(sourceFile.generated.code)?.code === virtualCode;
+                const virtualScript = getVirtualScriptByUri(document.uri);
+                if (virtualScript) {
+                    return true;
                 }
-                else if (withJson) {
-                    return (0, shared_1.isTsDocument)(document) || (0, shared_1.isJsonDocument)(document);
+                if (withJson && (0, shared_1.isJsonDocument)(document)) {
+                    return true;
                 }
-                else {
-                    return (0, shared_1.isTsDocument)(document);
+                return (0, shared_1.isTsDocument)(document);
+            }
+            function getVirtualScriptByUri(uri) {
+                const [virtualCode, sourceFile] = context.documents.getVirtualCodeByUri(uri);
+                if (virtualCode && sourceFile.generated?.languagePlugin.typescript) {
+                    const { getScript, getExtraScripts } = sourceFile.generated?.languagePlugin.typescript;
+                    const sourceFileName = context.env.typescript.uriToFileName(sourceFile.id);
+                    if (getScript(sourceFile.generated.code)?.code === virtualCode) {
+                        return {
+                            fileName: sourceFileName,
+                            code: virtualCode,
+                        };
+                    }
+                    for (const extraScript of getExtraScripts?.(sourceFileName, sourceFile.generated.code) ?? []) {
+                        if (extraScript.code === virtualCode) {
+                            return extraScript;
+                        }
+                    }
                 }
             }
             async function worker(token, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.27-patch.1",
+	"version": "0.0.28",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -37,12 +37,13 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.0.0",
-		"@volar/typescript": "~2.0.0"
+		"@volar/language-service": "~2.0.1",
+		"@volar/typescript": "~2.0.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
-	}
+	},
+	"gitHead": "863d2892a08a959d8948c1a32094907cdcfd4be7"
 }