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

package/lib/node/decorateProgram.js

@@ -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,18 @@ 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
+    program.getSourceFileByPath = path => {
+        const sourceFile = getSourceFileByPath(path);
+        if (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 sourceFile;
+    };
 }
 exports.decorateProgram = decorateProgram;
 //# sourceMappingURL=decorateProgram.js.map

package/lib/node/proxyCreateProgram.d.ts

@@ -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

@@ -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

@@ -2,7 +2,6 @@ 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 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

@@ -1,10 +1,9 @@
 "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.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();
 function transformCallHierarchyItem(language, item, filter) {
     const span = transformSpan(language, item.file, item.span, filter);
     const selectionSpan = transformSpan(language, item.file, item.selectionSpan, filter);
@@ -35,7 +34,6 @@ function transformDiagnostic(language, diagnostic) {
                         ...diagnostic,
                         start: sourceSpan.start,
                         length: sourceSpan.length,
-                        file: transformSourceFile(diagnostic.file, sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())),
                     });
                 }
             }
@@ -50,16 +48,6 @@ 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,
-        });
-    }
-    return transformedSourceFiles.get(sourceFile);
-}
-exports.transformSourceFile = transformSourceFile;
 function transformFileTextChanges(language, changes, filter) {
     const [_, source] = (0, utils_1.getServiceScript)(language, changes.fileName);
     if (source) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.2.0-alpha.4",
+	"version": "2.2.0-alpha.5",
 	"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.5",
 		"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.5"
 	},
-	"gitHead": "bd85b9c56d71c411fa3342696014c4b5f7436568"
+	"gitHead": "d28a26415df929b2cc949df276fc27e7961b0925"
 }