npm - @volar/typescript - Versions diffs - 2.2.0-alpha.4 → 2.2.0-alpha.6 - Mend

@volar/typescript 2.2.0-alpha.4 → 2.2.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/node/decorateLanguageServiceHost.d.ts +1 -1
package/lib/node/decorateLanguageServiceHost.js +21 -44
package/lib/node/decorateProgram.js +9 -0
package/lib/node/proxyCreateProgram.d.ts +1 -1
package/lib/node/proxyCreateProgram.js +1 -1
package/lib/node/transform.d.ts +1 -1
package/lib/node/transform.js +15 -11
package/lib/quickstart/createAsyncLanguageServicePlugin.js +1 -1
package/lib/quickstart/createLanguageServicePlugin.js +1 -1
package/package.json +4 -4

package/lib/node/decorateLanguageServiceHost.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceHost(ts: typeof import('typescript'), language: Language, languageServiceHost: ts.LanguageServiceHost, getLanguageId: (fileName: string) => string): void;
+export declare function decorateLanguageServiceHost(ts: typeof import('typescript'), language: Language, languageServiceHost: ts.LanguageServiceHost): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js CHANGED Viewed

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
 const resolveModuleName_1 = require("../resolveModuleName");
-function decorateLanguageServiceHost(ts, language, languageServiceHost, getLanguageId) {
-    let extraProjectVersion = 0;
+function decorateLanguageServiceHost(ts, language, languageServiceHost) {
     const extensions = language.plugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
         .flat();
@@ -11,7 +10,6 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost, getLangu
     const readDirectory = languageServiceHost.readDirectory?.bind(languageServiceHost);
     const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
     const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
-    const getProjectVersion = languageServiceHost.getProjectVersion?.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
     const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
     // path completion
@@ -54,11 +52,6 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost, getLangu
             };
         }
     }
-    if (getProjectVersion) {
-        languageServiceHost.getProjectVersion = () => {
-            return getProjectVersion() + ':' + extraProjectVersion;
-        };
-    }
     languageServiceHost.getScriptSnapshot = fileName => {
         const virtualScript = updateVirtualScript(fileName);
         if (virtualScript) {
@@ -77,45 +70,29 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost, getLangu
     }
     function updateVirtualScript(fileName) {
         const version = languageServiceHost.getScriptVersion(fileName);
-        if (version !== scripts.get(fileName)?.[0]) {
-            let extension = '.ts';
-            let snapshotSnapshot;
-            let scriptKind = ts.ScriptKind.TS;
-            const snapshot = getScriptSnapshot(fileName);
-            if (snapshot) {
-                extraProjectVersion++;
-                const sourceScript = language.scripts.set(fileName, getLanguageId(fileName), snapshot);
-                if (sourceScript.generated) {
-                    const text = snapshot.getText(0, snapshot.getLength());
-                    let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
-                    const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
-                    if (serviceScript) {
-                        extension = serviceScript.extension;
-                        scriptKind = serviceScript.scriptKind;
-                        patchedText += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
-                    }
-                    snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
-                    if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
-                        console.warn('getExtraScripts() is not available in this use case.');
-                    }
+        let script = scripts.get(fileName);
+        if (script?.[0] !== version) {
+            script = [version];
+            const sourceScript = language.scripts.get(fileName);
+            if (sourceScript?.generated) {
+                const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                if (serviceScript) {
+                    const sourceContents = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
+                    let virtualContents = sourceContents.split('\n').map(line => ' '.repeat(line.length)).join('\n');
+                    virtualContents += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
+                    script[1] = {
+                        extension: serviceScript.extension,
+                        kind: serviceScript.scriptKind,
+                        snapshot: ts.ScriptSnapshot.fromString(virtualContents),
+                    };
+                }
+                if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
+                    console.warn('getExtraServiceScripts() is not available in TS plugin.');
                 }
             }
-            else if (language.scripts.get(fileName)) {
-                extraProjectVersion++;
-                language.scripts.delete(fileName);
-            }
-            if (snapshotSnapshot) {
-                scripts.set(fileName, [
-                    version,
-                    {
-                        extension,
-                        snapshot: snapshotSnapshot,
-                        kind: scriptKind,
-                    }
-                ]);
-            }
+            scripts.set(fileName, script);
         }
-        return scripts.get(fileName)?.[1];
+        return script[1];
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;

package/lib/node/decorateProgram.js CHANGED Viewed

@@ -9,6 +9,7 @@ function decorateProgram(language, program) {
     const getSyntacticDiagnostics = program.getSyntacticDiagnostics;
     const getSemanticDiagnostics = program.getSemanticDiagnostics;
     const getGlobalDiagnostics = program.getGlobalDiagnostics;
+    const getSourceFileByPath = program.getSourceFileByPath;
     // for tsc --noEmit --watch
     // @ts-ignore
     const getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics;
@@ -42,6 +43,14 @@ function decorateProgram(language, program) {
             .map(d => (0, transform_1.transformDiagnostic)(language, d))
             .filter(utils_1.notEmpty);
     };
+    // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`
+    program.getSourceFileByPath = path => {
+        const sourceFile = getSourceFileByPath(path);
+        if (sourceFile) {
+            (0, transform_1.fillSourceFileText)(language, sourceFile);
+        }
+        return sourceFile;
+    };
 }
 exports.decorateProgram = decorateProgram;
 //# sourceMappingURL=decorateProgram.js.map

package/lib/node/proxyCreateProgram.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type * as ts from 'typescript';
 import { LanguagePlugin } from '@volar/language-core';
+import type * as ts from 'typescript';
 export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin[], getLanguageId: (fileName: string) => string): typeof import("typescript").createProgram;

package/lib/node/proxyCreateProgram.js CHANGED Viewed

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyCreateProgram = void 0;
-const decorateProgram_1 = require("./decorateProgram");
 const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
+const decorateProgram_1 = require("./decorateProgram");
 function proxyCreateProgram(ts, original, getLanguagePlugins, getLanguageId) {
     return new Proxy(original, {
         apply: (target, thisArg, args) => {

package/lib/node/transform.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { Language, CodeInformation, SourceMap, SourceScript } from '@volar/langu
 import type * as ts from 'typescript';
 export declare function transformCallHierarchyItem(language: Language, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
 export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language, diagnostic: T): T | undefined;
-export declare function transformSourceFile(sourceFile: ts.SourceFile, sourceText: string): ts.SourceFile;
+export declare function fillSourceFileText(language: Language, sourceFile: ts.SourceFile): void;
 export declare function transformFileTextChanges(language: Language, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
 export declare function transformDocumentSpan<T extends ts.DocumentSpan>(language: Language, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
 export declare function transformSpan(language: Language, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {

package/lib/node/transform.js CHANGED Viewed

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.transformSourceFile = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
-const transformedSourceFiles = new WeakMap();
+const transformedSourceFile = new WeakSet();
 function transformCallHierarchyItem(language, item, filter) {
     const span = transformSpan(language, item.file, item.span, filter);
     const selectionSpan = transformSpan(language, item.file, item.selectionSpan, filter);
@@ -31,11 +31,11 @@ function transformDiagnostic(language, diagnostic) {
             if (serviceScript) {
                 const sourceSpan = transformTextSpan(sourceScript, map, { start: diagnostic.start, length: diagnostic.length }, language_core_1.shouldReportDiagnostics);
                 if (sourceSpan) {
+                    fillSourceFileText(language, diagnostic.file);
                     transformedDiagnostics.set(diagnostic, {
                         ...diagnostic,
                         start: sourceSpan.start,
                         length: sourceSpan.length,
-                        file: transformSourceFile(diagnostic.file, sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())),
                     });
                 }
             }
@@ -50,16 +50,20 @@ function transformDiagnostic(language, diagnostic) {
     return transformedDiagnostics.get(diagnostic);
 }
 exports.transformDiagnostic = transformDiagnostic;
-function transformSourceFile(sourceFile, sourceText) {
-    if (!transformedSourceFiles.has(sourceFile)) {
-        transformedSourceFiles.set(sourceFile, {
-            ...sourceFile,
-            text: sourceText,
-        });
+// fix https://github.com/vuejs/language-tools/issues/4099 without `incremental`
+function fillSourceFileText(language, sourceFile) {
+    if (transformedSourceFile.has(sourceFile)) {
+        return;
+    }
+    transformedSourceFile.add(sourceFile);
+    const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+    if (serviceScript) {
+        sourceFile.text = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())
+            + sourceFile.text.substring(sourceScript.snapshot.getLength());
     }
-    return transformedSourceFiles.get(sourceFile);
+    return;
 }
-exports.transformSourceFile = transformSourceFile;
+exports.fillSourceFileText = fillSourceFileText;
 function transformFileTextChanges(language, changes, filter) {
     const [_, source] = (0, utils_1.getServiceScript)(language, changes.fileName);
     if (source) {

package/lib/quickstart/createAsyncLanguageServicePlugin.js CHANGED Viewed

@@ -62,7 +62,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                             }
                         });
                         (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                        (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost, getLanguageId);
+                        (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                         info.project.markAsDirty();
                         initialized = true;
                     });

package/lib/quickstart/createLanguageServicePlugin.js CHANGED Viewed

@@ -33,7 +33,7 @@ function createLanguageServicePlugin(loadLanguagePlugins, getLanguageId) {
                         }
                     });
                     (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost, getLanguageId);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                 }
                 return info.languageService;
             },

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.2.0-alpha.4",
+	"version": "2.2.0-alpha.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.2.0-alpha.4",
+		"@volar/language-core": "2.2.0-alpha.6",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.2.0-alpha.4"
+		"@volar/language-service": "2.2.0-alpha.6"
 	},
-	"gitHead": "bd85b9c56d71c411fa3342696014c4b5f7436568"
+	"gitHead": "c9eb6bc56a5bf0c7c1fddfc66d35717daf0a630e"
 }