npm - @volar/typescript - Versions diffs - 2.0.0-alpha.3 → 2.0.0-alpha.4 - Mend

@volar/typescript 2.0.0-alpha.3 → 2.0.0-alpha.4

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 (19) hide show

package/index.d.ts +2 -1
package/index.js +2 -1
package/lib/node/decorateLanguageService.d.ts +1 -1
package/lib/node/decorateLanguageService.js +90 -242
package/lib/node/decorateProgram.d.ts +3 -0
package/lib/node/decorateProgram.js +48 -0
package/lib/node/proxyCreateProgram.d.ts +3 -0
package/lib/node/proxyCreateProgram.js +122 -0
package/lib/node/transform.d.ts +10 -0
package/lib/node/transform.js +137 -0
package/lib/node/utils.d.ts +3 -0
package/lib/node/utils.js +26 -0
package/lib/starters/createAsyncTSServerPlugin.d.ts +3 -0
package/lib/starters/createAsyncTSServerPlugin.js +82 -0
package/lib/starters/createTSServerPlugin.d.ts +7 -0
package/lib/starters/createTSServerPlugin.js +60 -0
package/lib/starters/runTsc.d.ts +4 -0
package/lib/starters/runTsc.js +44 -0
package/package.json +5 -4

package/index.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 export * from './lib/documentRegistry';
 export * from './lib/node/decorateLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
+export * from './lib/node/decorateProgram';
+export * from './lib/node/proxyCreateProgram';
 export * from './lib/protocol/createProject';
 export * from './lib/protocol/createSys';
-export * from './lib/protocol/getProgram';

package/index.js CHANGED Viewed

@@ -17,7 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/documentRegistry"), exports);
 __exportStar(require("./lib/node/decorateLanguageService"), exports);
 __exportStar(require("./lib/node/decorateLanguageServiceHost"), exports);
+__exportStar(require("./lib/node/decorateProgram"), exports);
+__exportStar(require("./lib/node/proxyCreateProgram"), exports);
 __exportStar(require("./lib/protocol/createProject"), exports);
 __exportStar(require("./lib/protocol/createSys"), exports);
-__exportStar(require("./lib/protocol/getProgram"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1,3 +1,3 @@
 import { FileProvider } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function decorateLanguageService(virtualFiles: FileProvider, languageService: ts.LanguageService, isTsPlugin: boolean): void;
+export declare function decorateLanguageService(files: FileProvider, languageService: ts.LanguageService): void;

package/lib/node/decorateLanguageService.js CHANGED Viewed

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateLanguageService = void 0;
 const language_core_1 = require("@volar/language-core");
 const dedupe_1 = require("./dedupe");
-function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
-    const transformedDiagnostics = new WeakMap();
+const utils_1 = require("./utils");
+const transform_1 = require("./transform");
+function decorateLanguageService(files, languageService) {
     // ignored methods
     const { getNavigationTree, getOutliningSpans, } = languageService;
     languageService.getNavigationTree = (fileName) => {
-        const [virtualFile] = getVirtualFileAndMap(fileName);
+        const [virtualFile] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             const tree = getNavigationTree(fileName);
             tree.childItems = undefined;
@@ -19,7 +20,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         }
     };
     languageService.getOutliningSpans = (fileName) => {
-        const [virtualFile] = getVirtualFileAndMap(fileName);
+        const [virtualFile] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             return [];
         }
@@ -30,16 +31,16 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     // methods
     const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getImplementationAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
     languageService.prepareCallHierarchy = (fileName, position) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    const item = prepareCallHierarchy(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
+                    const item = prepareCallHierarchy(fileName, generateOffset + sourceFile.snapshot.getLength());
                     if (Array.isArray(item)) {
-                        return item.map(item => transformCallHierarchyItem(item, language_core_1.isCallHierarchyEnabled));
+                        return item.map(item => (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled));
                     }
                     else if (item) {
-                        return transformCallHierarchyItem(item, language_core_1.isCallHierarchyEnabled);
+                        return (0, transform_1.transformCallHierarchyItem)(files, item, language_core_1.isCallHierarchyEnabled);
                     }
                 }
             }
@@ -50,11 +51,11 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     };
     languageService.provideCallHierarchyIncomingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyIncomingCalls(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
+                    calls = provideCallHierarchyIncomingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
                 }
             }
         }
@@ -63,10 +64,10 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         }
         return calls
             .map(call => {
-            const from = transformCallHierarchyItem(call.from, language_core_1.isCallHierarchyEnabled);
+            const from = (0, transform_1.transformCallHierarchyItem)(files, call.from, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => transformSpan(call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
-                .filter(notEmpty);
+                .map(span => (0, transform_1.transformSpan)(files, call.from.file, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .filter(utils_1.notEmpty);
             return {
                 from,
                 fromSpans,
@@ -75,11 +76,11 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     };
     languageService.provideCallHierarchyOutgoingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
-                    calls = provideCallHierarchyOutgoingCalls(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
+                    calls = provideCallHierarchyOutgoingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
                 }
             }
         }
@@ -88,10 +89,10 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         }
         return calls
             .map(call => {
-            const to = transformCallHierarchyItem(call.to, language_core_1.isCallHierarchyEnabled);
+            const to = (0, transform_1.transformCallHierarchyItem)(files, call.to, language_core_1.isCallHierarchyEnabled);
             const fromSpans = call.fromSpans
-                .map(span => transformSpan(fileName, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
-                .filter(notEmpty);
+                .map(span => (0, transform_1.transformSpan)(files, fileName, span, language_core_1.isCallHierarchyEnabled)?.textSpan)
+                .filter(utils_1.notEmpty);
             return {
                 to,
                 fromSpans,
@@ -101,18 +102,18 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     languageService.organizeImports = (args, formatOptions, preferences) => {
         const unresolved = organizeImports(args, formatOptions, preferences);
         const resolved = unresolved
-            .map(changes => transformFileTextChanges(changes, language_core_1.isCodeActionsEnabled))
-            .filter(notEmpty);
+            .map(changes => (0, transform_1.transformFileTextChanges)(files, changes, language_core_1.isCodeActionsEnabled))
+            .filter(utils_1.notEmpty);
         return resolved;
     };
     languageService.getQuickInfoAtPosition = (fileName, position) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isHoverEnabled)(mapping.data)) {
-                    const result = getQuickInfoAtPosition(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
+                    const result = getQuickInfoAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength());
                     if (result) {
-                        const textSpan = transformSpan(fileName, result.textSpan, language_core_1.isHoverEnabled)?.textSpan;
+                        const textSpan = (0, transform_1.transformSpan)(files, fileName, result.textSpan, language_core_1.isHoverEnabled)?.textSpan;
                         if (textSpan) {
                             return {
                                 ...result,
@@ -142,30 +143,30 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
                 ...highlights,
                 highlightSpans: highlights.highlightSpans
                     .map(span => {
-                    const textSpan = transformSpan(span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled)?.textSpan;
+                    const textSpan = (0, transform_1.transformSpan)(files, span.fileName ?? highlights.fileName, span.textSpan, language_core_1.isHighlightEnabled)?.textSpan;
                     if (textSpan) {
                         return {
                             ...span,
-                            contextSpan: transformSpan(span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
+                            contextSpan: (0, transform_1.transformSpan)(files, span.fileName ?? highlights.fileName, span.contextSpan, language_core_1.isHighlightEnabled)?.textSpan,
                             textSpan,
                         };
                     }
                 })
-                    .filter(notEmpty),
+                    .filter(utils_1.notEmpty),
             };
         });
         return resolved;
     };
     languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     const por = typeof positionOrRange === 'number'
-                        ? generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0)
+                        ? generateOffset + sourceFile.snapshot.getLength()
                         : {
-                            pos: generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + (isTsPlugin ? sourceFile.snapshot.getLength() : 0),
+                            pos: generateOffset + sourceFile.snapshot.getLength(),
+                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceFile.snapshot.getLength(),
                         };
                     return getApplicableRefactors(fileName, por, preferences, triggerReason, kind, includeInteractiveActions);
                 }
@@ -178,15 +179,15 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     };
     languageService.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     const por = typeof positionOrRange === 'number'
-                        ? generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0)
+                        ? generateOffset + sourceFile.snapshot.getLength()
                         : {
-                            pos: generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0),
-                            end: generateOffset + positionOrRange.end - positionOrRange.pos + (isTsPlugin ? sourceFile.snapshot.getLength() : 0),
+                            pos: generateOffset + sourceFile.snapshot.getLength(),
+                            end: generateOffset + positionOrRange.end - positionOrRange.pos + sourceFile.snapshot.getLength(),
                         };
                     edits = getEditsForRefactor(fileName, formatOptions, por, refactorName, actionName, preferences);
                 }
@@ -197,19 +198,19 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         }
         if (edits) {
             edits.edits = edits.edits
-                .map(edit => transformFileTextChanges(edit, language_core_1.isCodeActionsEnabled))
-                .filter(notEmpty);
+                .map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeActionsEnabled))
+                .filter(utils_1.notEmpty);
             return edits;
         }
     };
     languageService.getRenameInfo = (fileName, position, options) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isRenameEnabled)(mapping.data)) {
-                    const info = getRenameInfo(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), options);
+                    const info = getRenameInfo(fileName, generateOffset + sourceFile.snapshot.getLength(), options);
                     if (info.canRename) {
-                        const span = transformSpan(fileName, info.triggerSpan, language_core_1.isRenameEnabled);
+                        const span = (0, transform_1.transformSpan)(files, fileName, info.triggerSpan, language_core_1.isRenameEnabled);
                         if (span) {
                             info.triggerSpan = span.textSpan;
                             return info;
@@ -231,13 +232,13 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     };
     languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateStart, mapping] of map.getGeneratedOffsets(start)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     for (const [generateEnd, mapping] of map.getGeneratedOffsets(end)) {
                         if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
-                            fixes = getCodeFixesAtPosition(fileName, generateStart + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), generateEnd + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), errorCodes, formatOptions, preferences);
+                            fixes = getCodeFixesAtPosition(fileName, generateStart + sourceFile.snapshot.getLength(), generateEnd + sourceFile.snapshot.getLength(), errorCodes, formatOptions, preferences);
                             break;
                         }
                     }
@@ -249,13 +250,13 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
             fixes = getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences);
         }
         fixes = fixes.map(fix => {
-            fix.changes = fix.changes.map(edit => transformFileTextChanges(edit, language_core_1.isCodeActionsEnabled)).filter(notEmpty);
+            fix.changes = fix.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeActionsEnabled)).filter(utils_1.notEmpty);
             return fix;
         });
         return fixes;
     };
     languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             let start;
             let end;
@@ -271,16 +272,14 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
                 start = 0;
                 end = 0;
             }
-            if (isTsPlugin) {
-                start += sourceFile.snapshot.getLength();
-                end += sourceFile.snapshot.getLength();
-            }
+            start += sourceFile.snapshot.getLength();
+            end += sourceFile.snapshot.getLength();
             const result = getEncodedSemanticClassifications(fileName, { start, length: end - start }, format);
             const spans = [];
             for (let i = 0; i < result.spans.length; i += 3) {
-                for (const [sourceStart, mapping] of map.getSourceOffsets(result.spans[i] - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
+                for (const [sourceStart, mapping] of map.getSourceOffsets(result.spans[i] - sourceFile.snapshot.getLength())) {
                     if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
-                        for (const [sourceEnd, mapping] of map.getSourceOffsets(result.spans[i] + result.spans[i + 1] - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
+                        for (const [sourceEnd, mapping] of map.getSourceOffsets(result.spans[i] + result.spans[i + 1] - sourceFile.snapshot.getLength())) {
                             if ((0, language_core_1.isSemanticTokensEnabled)(mapping.data)) {
                                 spans.push(sourceStart, sourceEnd - sourceStart, result.spans[i + 2]);
                                 break;
@@ -299,18 +298,18 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     };
     languageService.getSyntacticDiagnostics = (fileName) => {
         return getSyntacticDiagnostics(fileName)
-            .map(diagnostic => transformDiagnostic(diagnostic))
-            .filter(notEmpty);
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
     };
     languageService.getSemanticDiagnostics = (fileName) => {
         return getSemanticDiagnostics(fileName)
-            .map(diagnostic => transformDiagnostic(diagnostic))
-            .filter(notEmpty);
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
     };
     languageService.getSuggestionDiagnostics = (fileName) => {
         return getSuggestionDiagnostics(fileName)
-            .map(diagnostic => transformDiagnostic(diagnostic))
-            .filter(notEmpty);
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
     };
     languageService.getDefinitionAndBoundSpan = (fileName, position) => {
         const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, position => getDefinitionAndBoundSpan(fileName, position), function* (result) {
@@ -319,15 +318,15 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
             }
         });
         const textSpan = unresolved
-            .map(s => transformSpan(fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
-            .filter(notEmpty)[0];
+            .map(s => (0, transform_1.transformSpan)(files, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
+            .filter(utils_1.notEmpty)[0];
         if (!textSpan)
             return;
         const definitions = unresolved
             .map(s => s.definitions
-            ?.map(s => transformDocumentSpan(s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
-            .filter(notEmpty))
-            .filter(notEmpty)
+            ?.map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            .filter(utils_1.notEmpty))
+            .filter(utils_1.notEmpty)
             .flat();
         return {
             textSpan,
@@ -345,17 +344,17 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         const resolved = unresolved
             .flat()
             .map(symbol => {
-            const definition = transformDocumentSpan(symbol.definition, language_core_1.isDefinitionEnabled);
+            const definition = (0, transform_1.transformDocumentSpan)(files, symbol.definition, language_core_1.isDefinitionEnabled);
             if (definition) {
                 return {
                     definition,
                     references: symbol.references
-                        .map(r => transformDocumentSpan(r, language_core_1.isReferencesEnabled))
-                        .filter(notEmpty),
+                        .map(r => (0, transform_1.transformDocumentSpan)(files, r, language_core_1.isReferencesEnabled))
+                        .filter(utils_1.notEmpty),
                 };
             }
         })
-            .filter(notEmpty);
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeReferencedSymbols)(resolved);
     };
     languageService.getDefinitionAtPosition = (fileName, position) => {
@@ -366,8 +365,8 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => transformDocumentSpan(s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getTypeDefinitionAtPosition = (fileName, position) => {
@@ -378,8 +377,8 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => transformDocumentSpan(s, language_core_1.isTypeDefinitionEnabled))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isTypeDefinitionEnabled))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getImplementationAtPosition = (fileName, position) => {
@@ -390,8 +389,8 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => transformDocumentSpan(s, language_core_1.isImplementationEnabled))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isImplementationEnabled))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.findRenameLocations = (fileName, position, findInStrings, findInComments, preferences) => {
@@ -402,8 +401,8 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => transformDocumentSpan(s, language_core_1.isRenameEnabled))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isRenameEnabled))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getReferencesAtPosition = (fileName, position) => {
@@ -414,21 +413,21 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         });
         const resolved = unresolved
             .flat()
-            .map(s => transformDocumentSpan(s, language_core_1.isReferencesEnabled))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isReferencesEnabled))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
-                    const result = getCompletionsAtPosition(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), options, formattingSettings);
+                    const result = getCompletionsAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength(), options, formattingSettings);
                     if (result) {
                         for (const entry of result.entries) {
-                            entry.replacementSpan = transformSpan(fileName, entry.replacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
+                            entry.replacementSpan = (0, transform_1.transformSpan)(files, fileName, entry.replacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
                         }
-                        result.optionalReplacementSpan = transformSpan(fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
+                        result.optionalReplacementSpan = (0, transform_1.transformSpan)(files, fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
                     }
                     return result;
                 }
@@ -442,13 +441,13 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
         const details = getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
         if (details?.codeActions) {
             for (const codeAction of details.codeActions) {
-                codeAction.changes = codeAction.changes.map(edit => transformFileTextChanges(edit, language_core_1.isCodeLensEnabled)).filter(notEmpty);
+                codeAction.changes = codeAction.changes.map(edit => (0, transform_1.transformFileTextChanges)(files, edit, language_core_1.isCodeLensEnabled)).filter(utils_1.notEmpty);
             }
         }
         return details;
     };
     languageService.provideInlayHints = (fileName, span, preferences) => {
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             let start;
             let end;
@@ -464,14 +463,12 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
                 start = 0;
                 end = 0;
             }
-            if (isTsPlugin) {
-                start += sourceFile.snapshot.getLength();
-                end += sourceFile.snapshot.getLength();
-            }
+            start += sourceFile.snapshot.getLength();
+            end += sourceFile.snapshot.getLength();
             const result = provideInlayHints(fileName, { start, length: end - start }, preferences);
             const hints = [];
             for (const hint of result) {
-                for (const [sourcePosition, mapping] of map.getSourceOffsets(hint.position - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
+                for (const [sourcePosition, mapping] of map.getSourceOffsets(hint.position - sourceFile.snapshot.getLength())) {
                     if ((0, language_core_1.isInlayHintsEnabled)(mapping.data)) {
                         hints.push({
                             ...hint,
@@ -490,18 +487,18 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
     languageService.getFileReferences = (fileName) => {
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
-            .map(s => transformDocumentSpan(s, language_core_1.isReferencesEnabled))
-            .filter(notEmpty);
+            .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isReferencesEnabled))
+            .filter(utils_1.notEmpty);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
         let results = [];
         const processedFilePositions = new Set();
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
+        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
         if (virtualFile) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
-                    process(fileName, generateOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
+                    process(fileName, generateOffset + sourceFile.snapshot.getLength());
                 }
             }
         }
@@ -519,167 +516,18 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
             results = results.concat(result);
             for (const ref of getLinkedCodes(result)) {
                 processedFilePositions.add(ref[0] + ':' + ref[1]);
-                const [virtualFile, sourceFile] = getVirtualFileAndMap(ref[0]);
+                const [virtualFile, sourceFile] = (0, utils_1.getVirtualFileAndMap)(files, ref[0]);
                 if (!virtualFile)
                     continue;
-                const linkedCodeMap = virtualFiles.getLinkedCodeMap(virtualFile);
+                const linkedCodeMap = files.getLinkedCodeMap(virtualFile);
                 if (!linkedCodeMap)
                     continue;
-                for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
-                    process(ref[0], linkedCodeOffset + (isTsPlugin ? sourceFile.snapshot.getLength() : 0));
-                }
-            }
-        }
-    }
-    // transforms
-    function transformCallHierarchyItem(item, filter) {
-        const span = transformSpan(item.file, item.span, filter);
-        const selectionSpan = transformSpan(item.file, item.selectionSpan, filter);
-        return {
-            ...item,
-            span: span?.textSpan ?? { start: 0, length: 0 },
-            selectionSpan: selectionSpan?.textSpan ?? { start: 0, length: 0 },
-        };
-    }
-    function transformDiagnostic(diagnostic) {
-        if (!transformedDiagnostics.has(diagnostic)) {
-            if (diagnostic.start !== undefined && diagnostic.file) {
-                transformedDiagnostics.set(diagnostic, undefined);
-                const [virtualFile, sourceFile, map] = getVirtualFileAndMap(diagnostic.file?.fileName);
-                if (virtualFile) {
-                    for (const [sourceOffset, mapping] of map.getSourceOffsets(diagnostic.start - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
-                        if ((0, language_core_1.shouldReportDiagnostics)(mapping.data)) {
-                            transformedDiagnostics.set(diagnostic, {
-                                ...diagnostic,
-                                start: sourceOffset,
-                            });
-                            break;
-                        }
-                    }
+                for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - sourceFile.snapshot.getLength())) {
+                    process(ref[0], linkedCodeOffset + sourceFile.snapshot.getLength());
                 }
-                else {
-                    transformedDiagnostics.set(diagnostic, diagnostic);
-                }
-            }
-            else {
-                transformedDiagnostics.set(diagnostic, diagnostic);
-            }
-            if (diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = diagnostic.relatedInformation
-                    .map(transformDiagnostic)
-                    .filter(notEmpty);
             }
         }
-        return transformedDiagnostics.get(diagnostic);
-    }
-    function transformFileTextChanges(changes, filter) {
-        const [_, source] = getVirtualFileAndMap(changes.fileName);
-        if (source) {
-            return {
-                ...changes,
-                fileName: source.fileName,
-                textChanges: changes.textChanges.map(c => {
-                    const span = transformSpan(changes.fileName, c.span, filter);
-                    if (span) {
-                        return {
-                            ...c,
-                            span: span.textSpan,
-                        };
-                    }
-                }).filter(notEmpty),
-            };
-        }
-        else {
-            return changes;
-        }
-    }
-    function transformDocumentSpan(documentSpan, filter, shouldFallback) {
-        let textSpan = transformSpan(documentSpan.fileName, documentSpan.textSpan, filter);
-        if (!textSpan && shouldFallback) {
-            const [virtualFile, source] = getVirtualFileAndMap(documentSpan.fileName);
-            if (virtualFile) {
-                textSpan = {
-                    fileName: source.fileName,
-                    textSpan: { start: 0, length: 0 },
-                };
-            }
-        }
-        if (!textSpan)
-            return;
-        const contextSpan = transformSpan(documentSpan.fileName, documentSpan.contextSpan, filter);
-        const originalTextSpan = transformSpan(documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
-        const originalContextSpan = transformSpan(documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
-        return {
-            ...documentSpan,
-            fileName: textSpan.fileName,
-            textSpan: textSpan.textSpan,
-            contextSpan: contextSpan?.textSpan,
-            originalFileName: originalTextSpan?.fileName,
-            originalTextSpan: originalTextSpan?.textSpan,
-            originalContextSpan: originalContextSpan?.textSpan,
-        };
-    }
-    function transformSpan(fileName, textSpan, filter) {
-        if (!fileName)
-            return;
-        if (!textSpan)
-            return;
-        const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
-        if (virtualFile) {
-            for (const sourceStart of map.getSourceOffsets(textSpan.start - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
-                if (filter(sourceStart[1].data)) {
-                    for (const sourceEnd of map.getSourceOffsets(textSpan.start + textSpan.length - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
-                        if (filter(sourceEnd[1].data)) {
-                            return {
-                                fileName: sourceFile.fileName,
-                                textSpan: {
-                                    start: sourceStart[0],
-                                    length: sourceEnd[0] - sourceStart[0],
-                                },
-                            };
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            return {
-                fileName,
-                textSpan,
-            };
-        }
-    }
-    function getVirtualFileAndMap(fileName) {
-        if (isTsPlugin) {
-            const sourceFile = virtualFiles.getSourceFile(fileName);
-            if (sourceFile?.virtualFile) {
-                for (const virtualFile of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
-                    const ext = virtualFile.fileName.substring(fileName.length);
-                    if (virtualFile.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
-                        for (const map of virtualFiles.getMaps(virtualFile)) {
-                            if (map[1][0] === sourceFile.snapshot) {
-                                return [virtualFile, sourceFile, map[1][1]];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            const [virtualFile, sourceFile] = virtualFiles.getVirtualFile(fileName);
-            if (virtualFile) {
-                for (const map of virtualFiles.getMaps(virtualFile)) {
-                    if (map[1][0] === sourceFile.snapshot) {
-                        return [virtualFile, sourceFile, map[1][1]];
-                    }
-                }
-            }
-        }
-        return [undefined, undefined, undefined];
     }
 }
 exports.decorateLanguageService = decorateLanguageService;
-function notEmpty(value) {
-    return value !== null && value !== undefined;
-}
 //# sourceMappingURL=decorateLanguageService.js.map

package/lib/node/decorateProgram.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type { FileProvider } from '@volar/language-core';
+import type * as ts from 'typescript/lib/tsserverlibrary';
+export declare function decorateProgram(files: FileProvider, program: ts.Program): void;

package/lib/node/decorateProgram.js ADDED Viewed

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorateProgram = void 0;
+const utils_1 = require("./utils");
+const transform_1 = require("./transform");
+function decorateProgram(files, program) {
+    const emit = program.emit;
+    // for tsc --noEmit
+    const getSyntacticDiagnostics = program.getSyntacticDiagnostics;
+    const getSemanticDiagnostics = program.getSemanticDiagnostics;
+    const getGlobalDiagnostics = program.getGlobalDiagnostics;
+    // for tsc --noEmit --watch
+    // @ts-ignore
+    const getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics;
+    program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+        const result = emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        return {
+            emitSkipped: result.emitSkipped,
+            emittedFiles: result.emittedFiles,
+            diagnostics: result.diagnostics
+                .map(d => (0, transform_1.transformDiagnostic)(files, d))
+                .filter(utils_1.notEmpty),
+        };
+    };
+    program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
+        return getSyntacticDiagnostics(sourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
+    };
+    program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
+        return getSemanticDiagnostics(sourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
+    };
+    program.getGlobalDiagnostics = (cancellationToken) => {
+        return getGlobalDiagnostics(cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
+    };
+    // @ts-ignore
+    program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
+        return getBindAndCheckDiagnostics(sourceFile, cancellationToken)
+            .map(d => (0, transform_1.transformDiagnostic)(files, d))
+            .filter(utils_1.notEmpty);
+    };
+}
+exports.decorateProgram = decorateProgram;
+//# sourceMappingURL=decorateProgram.js.map

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

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

package/lib/node/proxyCreateProgram.js ADDED Viewed

@@ -0,0 +1,122 @@
+"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");
+function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
+    return new Proxy(original, {
+        apply: (target, thisArg, args) => {
+            const options = args[0];
+            assert(!!options.host, '!!options.host');
+            const originalHost = options.host;
+            options.host = { ...originalHost };
+            options.options.allowArbitraryExtensions = true;
+            const sourceFileToSnapshotMap = new WeakMap();
+            const files = (0, language_core_1.createFileProvider)(getLanguagePlugins(ts, options), ts.sys.useCaseSensitiveFileNames, fileName => {
+                let snapshot;
+                assert(originalSourceFiles.has(fileName), `originalSourceFiles.has(${fileName})`);
+                const sourceFile = originalSourceFiles.get(fileName);
+                if (sourceFile) {
+                    snapshot = sourceFileToSnapshotMap.get(sourceFile);
+                    if (!snapshot) {
+                        snapshot = {
+                            getChangeRange() {
+                                return undefined;
+                            },
+                            getLength() {
+                                return sourceFile.text.length;
+                            },
+                            getText(start, end) {
+                                return sourceFile.text.substring(start, end);
+                            },
+                        };
+                        sourceFileToSnapshotMap.set(sourceFile, snapshot);
+                    }
+                }
+                if (snapshot) {
+                    files.updateSourceFile(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                }
+                else {
+                    files.deleteSourceFile(fileName);
+                }
+            });
+            const originalSourceFiles = new Map();
+            const parsedSourceFiles = new WeakMap();
+            const arbitraryExtensions = extensions.map(ext => `.d${ext}.ts`);
+            const moduleResolutionHost = {
+                ...originalHost,
+                fileExists(fileName) {
+                    for (let i = 0; i < arbitraryExtensions.length; i++) {
+                        if (fileName.endsWith(arbitraryExtensions[i])) {
+                            return originalHost.fileExists(fileName.slice(0, -arbitraryExtensions[i].length) + extensions[i]);
+                        }
+                    }
+                    return originalHost.fileExists(fileName);
+                },
+            };
+            options.host.getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
+                const originalSourceFile = originalHost.getSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile);
+                originalSourceFiles.set(fileName, originalSourceFile);
+                if (originalSourceFile && extensions.some(ext => fileName.endsWith(ext))) {
+                    let sourceFile2 = parsedSourceFiles.get(originalSourceFile);
+                    if (!sourceFile2) {
+                        const sourceFile = files.getSourceFile(fileName);
+                        assert(!!sourceFile, '!!sourceFile');
+                        let patchedText = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
+                        let scriptKind = ts.ScriptKind.TS;
+                        const virtualFile = sourceFile.virtualFile?.[0];
+                        if (virtualFile) {
+                            for (const file of (0, language_core_1.forEachEmbeddedFile)(virtualFile)) {
+                                if (file.typescript) {
+                                    scriptKind = file.typescript.scriptKind;
+                                    patchedText += file.snapshot.getText(0, file.snapshot.getLength());
+                                    break;
+                                }
+                            }
+                        }
+                        sourceFile2 = ts.createSourceFile(sourceFile.fileName, patchedText, 99, true, scriptKind);
+                        // @ts-expect-error
+                        sourceFile2.version = originalSourceFile.version;
+                        parsedSourceFiles.set(originalSourceFile, sourceFile2);
+                    }
+                    return sourceFile2;
+                }
+                return originalSourceFile;
+            };
+            options.host.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options) => {
+                return moduleNames.map(name => {
+                    return resolveModuleName(name.text, containingFile, options, redirectedReference);
+                });
+            };
+            options.host.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options) => {
+                return moduleNames.map(name => {
+                    return resolveModuleName(name, containingFile, options, redirectedReference).resolvedModule;
+                });
+            };
+            const program = Reflect.apply(target, thisArg, [options]);
+            (0, decorateProgram_1.decorateProgram)(files, program);
+            return program;
+            function resolveModuleName(name, containingFile, options, redirectedReference) {
+                const resolved = ts.resolveModuleName(name, containingFile, options, moduleResolutionHost, originalHost.getModuleResolutionCache?.(), redirectedReference);
+                if (resolved.resolvedModule) {
+                    for (let i = 0; i < arbitraryExtensions.length; i++) {
+                        if (resolved.resolvedModule.resolvedFileName.endsWith(arbitraryExtensions[i])) {
+                            const sourceFileName = resolved.resolvedModule.resolvedFileName.slice(0, -arbitraryExtensions[i].length) + extensions[i];
+                            resolved.resolvedModule.resolvedFileName = sourceFileName;
+                            resolved.resolvedModule.extension = extensions[i];
+                        }
+                    }
+                }
+                return resolved;
+            }
+        },
+    });
+}
+exports.proxyCreateProgram = proxyCreateProgram;
+function assert(condition, message) {
+    if (!condition) {
+        console.error(message);
+        throw new Error(message);
+    }
+}
+//# sourceMappingURL=proxyCreateProgram.js.map

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

@@ -0,0 +1,10 @@
+import { FileProvider, CodeInformation } from '@volar/language-core';
+import type * as ts from 'typescript/lib/tsserverlibrary';
+export declare function transformCallHierarchyItem(files: FileProvider, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(files: FileProvider, diagnostic: T): T | undefined;
+export declare function transformFileTextChanges(files: FileProvider, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
+export declare function transformDocumentSpan<T extends ts.DocumentSpan>(files: FileProvider, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
+export declare function transformSpan(files: FileProvider, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
+    fileName: string;
+    textSpan: ts.TextSpan;
+} | undefined;

package/lib/node/transform.js ADDED Viewed

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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();
+function transformCallHierarchyItem(files, item, filter) {
+    const span = transformSpan(files, item.file, item.span, filter);
+    const selectionSpan = transformSpan(files, item.file, item.selectionSpan, filter);
+    return {
+        ...item,
+        span: span?.textSpan ?? { start: 0, length: 0 },
+        selectionSpan: selectionSpan?.textSpan ?? { start: 0, length: 0 },
+    };
+}
+exports.transformCallHierarchyItem = transformCallHierarchyItem;
+function transformDiagnostic(files, diagnostic) {
+    if (!transformedDiagnostics.has(diagnostic)) {
+        transformedDiagnostics.set(diagnostic, undefined);
+        const { relatedInformation } = diagnostic;
+        if (relatedInformation) {
+            diagnostic.relatedInformation = relatedInformation
+                .map(d => transformDiagnostic(files, d))
+                .filter(utils_1.notEmpty);
+        }
+        if (diagnostic.file !== undefined
+            && diagnostic.start !== undefined
+            && diagnostic.length !== undefined) {
+            const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, diagnostic.file.fileName);
+            if (virtualFile) {
+                const sourceRange = transformRange(sourceFile, map, diagnostic.start, diagnostic.start + diagnostic.length, language_core_1.shouldReportDiagnostics);
+                if (sourceRange) {
+                    transformedDiagnostics.set(diagnostic, {
+                        ...diagnostic,
+                        start: sourceRange[0],
+                        length: sourceRange[1] - sourceRange[0],
+                    });
+                }
+            }
+            else {
+                transformedDiagnostics.set(diagnostic, diagnostic);
+            }
+        }
+        else {
+            transformedDiagnostics.set(diagnostic, diagnostic);
+        }
+    }
+    return transformedDiagnostics.get(diagnostic);
+}
+exports.transformDiagnostic = transformDiagnostic;
+function transformFileTextChanges(files, changes, filter) {
+    const [_, source] = (0, utils_1.getVirtualFileAndMap)(files, changes.fileName);
+    if (source) {
+        return {
+            ...changes,
+            fileName: source.fileName,
+            textChanges: changes.textChanges.map(c => {
+                const span = transformSpan(files, changes.fileName, c.span, filter);
+                if (span) {
+                    return {
+                        ...c,
+                        span: span.textSpan,
+                    };
+                }
+            }).filter(utils_1.notEmpty),
+        };
+    }
+    else {
+        return changes;
+    }
+}
+exports.transformFileTextChanges = transformFileTextChanges;
+function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
+    let textSpan = transformSpan(files, documentSpan.fileName, documentSpan.textSpan, filter);
+    if (!textSpan && shouldFallback) {
+        const [virtualFile, source] = (0, utils_1.getVirtualFileAndMap)(files, documentSpan.fileName);
+        if (virtualFile) {
+            textSpan = {
+                fileName: source.fileName,
+                textSpan: { start: 0, length: 0 },
+            };
+        }
+    }
+    if (!textSpan)
+        return;
+    const contextSpan = transformSpan(files, documentSpan.fileName, documentSpan.contextSpan, filter);
+    const originalTextSpan = transformSpan(files, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
+    const originalContextSpan = transformSpan(files, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
+    return {
+        ...documentSpan,
+        fileName: textSpan.fileName,
+        textSpan: textSpan.textSpan,
+        contextSpan: contextSpan?.textSpan,
+        originalFileName: originalTextSpan?.fileName,
+        originalTextSpan: originalTextSpan?.textSpan,
+        originalContextSpan: originalContextSpan?.textSpan,
+    };
+}
+exports.transformDocumentSpan = transformDocumentSpan;
+function transformSpan(files, fileName, textSpan, filter) {
+    if (!fileName)
+        return;
+    if (!textSpan)
+        return;
+    const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+    if (virtualFile) {
+        const sourceRange = transformRange(sourceFile, map, textSpan.start, textSpan.start + textSpan.length, filter);
+        if (sourceRange) {
+            return {
+                fileName: sourceFile.fileName,
+                textSpan: {
+                    start: sourceRange[0],
+                    length: sourceRange[1] - sourceRange[0],
+                },
+            };
+        }
+    }
+    else {
+        return {
+            fileName,
+            textSpan,
+        };
+    }
+}
+exports.transformSpan = transformSpan;
+function transformRange(sourceFile, map, start, end, filter) {
+    for (const sourceStart of map.getSourceOffsets(start - sourceFile.snapshot.getLength())) {
+        if (filter(sourceStart[1].data)) {
+            for (const sourceEnd of map.getSourceOffsets(end - sourceFile.snapshot.getLength())) {
+                if (sourceEnd > sourceStart && filter(sourceEnd[1].data)) {
+                    return [sourceStart[0], sourceEnd[0]];
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=transform.js.map

package/lib/node/utils.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { FileProvider } from '@volar/language-core';
+export declare function notEmpty<T>(value: T | null | undefined): value is T;
+export declare function getVirtualFileAndMap(files: FileProvider, fileName: string): readonly [import("@volar/language-core").VirtualFile, import("@volar/language-core").SourceFile, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];

package/lib/node/utils.js ADDED Viewed

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVirtualFileAndMap = exports.notEmpty = void 0;
+const language_core_1 = require("@volar/language-core");
+function notEmpty(value) {
+    return value !== null && value !== undefined;
+}
+exports.notEmpty = notEmpty;
+function getVirtualFileAndMap(files, fileName) {
+    const sourceFile = files.getSourceFile(fileName);
+    if (sourceFile?.virtualFile) {
+        for (const virtualFile of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
+            const ext = virtualFile.fileName.substring(fileName.length);
+            if (virtualFile.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
+                for (const map of files.getMaps(virtualFile)) {
+                    if (map[1][0] === sourceFile.snapshot) {
+                        return [virtualFile, sourceFile, map[1][1]];
+                    }
+                }
+            }
+        }
+    }
+    return [undefined, undefined, undefined];
+}
+exports.getVirtualFileAndMap = getVirtualFileAndMap;
+//# sourceMappingURL=utils.js.map

package/lib/starters/createAsyncTSServerPlugin.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import { LanguagePlugin } from '@volar/language-core';
+export declare function createAsyncTSServerPlugin(extensions: string[], scriptKind: ts.ScriptKind, loadLanguagePlugins: (ts: typeof import('typescript/lib/tsserverlibrary'), info: ts.server.PluginCreateInfo) => Promise<LanguagePlugin[]>): ts.server.PluginModuleFactory;

package/lib/starters/createAsyncTSServerPlugin.js ADDED Viewed

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAsyncTSServerPlugin = void 0;
+const decorateLanguageService_1 = require("../node/decorateLanguageService");
+const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
+const language_core_1 = require("@volar/language-core");
+const createTSServerPlugin_1 = require("./createTSServerPlugin");
+const externalFiles = new WeakMap();
+function createAsyncTSServerPlugin(extensions, scriptKind, loadLanguagePlugins) {
+    return (modules) => {
+        const { typescript: ts } = modules;
+        const pluginModule = {
+            create(info) {
+                const emptySnapshot = ts.ScriptSnapshot.fromString('');
+                const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
+                const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
+                const getScriptKind = info.languageServiceHost.getScriptKind?.bind(info.languageServiceHost);
+                const getProjectVersion = info.languageServiceHost.getProjectVersion?.bind(info.languageServiceHost);
+                let initialized = false;
+                info.languageServiceHost.getScriptSnapshot = (fileName) => {
+                    if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
+                        return emptySnapshot;
+                    }
+                    return getScriptSnapshot(fileName);
+                };
+                info.languageServiceHost.getScriptVersion = (fileName) => {
+                    if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
+                        return 'initializing...';
+                    }
+                    return getScriptVersion(fileName);
+                };
+                if (getScriptKind) {
+                    info.languageServiceHost.getScriptKind = (fileName) => {
+                        if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
+                            return scriptKind; // TODO: bypass upstream bug
+                        }
+                        return getScriptKind(fileName);
+                    };
+                }
+                if (getProjectVersion) {
+                    info.languageServiceHost.getProjectVersion = () => {
+                        if (!initialized) {
+                            return getProjectVersion() + ',initializing...';
+                        }
+                        return getProjectVersion();
+                    };
+                }
+                loadLanguagePlugins(ts, info).then(languagePlugins => {
+                    const files = (0, language_core_1.createFileProvider)(languagePlugins, ts.sys.useCaseSensitiveFileNames, (fileName) => {
+                        const snapshot = getScriptSnapshot(fileName);
+                        if (snapshot) {
+                            files.updateSourceFile(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                        }
+                        else {
+                            files.deleteSourceFile(fileName);
+                        }
+                    });
+                    (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts, extensions);
+                    info.project.markAsDirty();
+                    initialized = true;
+                });
+                return info.languageService;
+            },
+            getExternalFiles(project, updateLevel = 0) {
+                if (updateLevel >= (1)
+                    || !externalFiles.has(project)) {
+                    const oldFiles = externalFiles.get(project);
+                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions);
+                    externalFiles.set(project, newFiles);
+                    if (oldFiles && !(0, createTSServerPlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
+                        project.refreshDiagnostics();
+                    }
+                }
+                return externalFiles.get(project);
+            },
+        };
+        return pluginModule;
+    };
+}
+exports.createAsyncTSServerPlugin = createAsyncTSServerPlugin;
+//# sourceMappingURL=createAsyncTSServerPlugin.js.map

package/lib/starters/createTSServerPlugin.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import { LanguagePlugin } from '@volar/language-core';
+export declare function createTSServerPlugin(init: (ts: typeof import('typescript/lib/tsserverlibrary'), info: ts.server.PluginCreateInfo) => {
+    languagePlugins: LanguagePlugin[];
+    extensions: string[];
+}): ts.server.PluginModuleFactory;
+export declare function arrayItemsEqual(a: string[], b: string[]): boolean;

package/lib/starters/createTSServerPlugin.js ADDED Viewed

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.arrayItemsEqual = exports.createTSServerPlugin = void 0;
+const decorateLanguageService_1 = require("../node/decorateLanguageService");
+const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
+const language_core_1 = require("@volar/language-core");
+const externalFiles = new WeakMap();
+const projectExternalFileExtensions = new WeakMap();
+function createTSServerPlugin(init) {
+    return (modules) => {
+        const { typescript: ts } = modules;
+        const pluginModule = {
+            create(info) {
+                const { languagePlugins, extensions } = init(ts, info);
+                projectExternalFileExtensions.set(info.project, extensions);
+                const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
+                const files = (0, language_core_1.createFileProvider)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
+                    const snapshot = getScriptSnapshot(fileName);
+                    if (snapshot) {
+                        files.updateSourceFile(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                    }
+                    else {
+                        files.deleteSourceFile(fileName);
+                    }
+                });
+                (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
+                (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts, extensions);
+                return info.languageService;
+            },
+            getExternalFiles(project, updateLevel = 0) {
+                if (updateLevel >= (1)
+                    || !externalFiles.has(project)) {
+                    const oldFiles = externalFiles.get(project);
+                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project));
+                    externalFiles.set(project, newFiles);
+                    if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
+                        project.refreshDiagnostics();
+                    }
+                }
+                return externalFiles.get(project);
+            },
+        };
+        return pluginModule;
+    };
+}
+exports.createTSServerPlugin = createTSServerPlugin;
+function arrayItemsEqual(a, b) {
+    if (a.length !== b.length) {
+        return false;
+    }
+    const set = new Set(a);
+    for (const file of b) {
+        if (!set.has(file)) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.arrayItemsEqual = arrayItemsEqual;
+//# sourceMappingURL=createTSServerPlugin.js.map

package/lib/starters/runTsc.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import type { LanguagePlugin } from '@volar/language-core';
+export declare let getLanguagePlugins: (ts: typeof import('typescript/lib/tsserverlibrary'), options: ts.CreateProgramOptions) => LanguagePlugin[];
+export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;

package/lib/starters/runTsc.js ADDED Viewed

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runTsc = exports.getLanguagePlugins = void 0;
+const fs = require("fs");
+let getLanguagePlugins = () => [];
+exports.getLanguagePlugins = getLanguagePlugins;
+function runTsc(tscPath, extensions, _getLanguagePlugins) {
+    exports.getLanguagePlugins = _getLanguagePlugins;
+    const proxyApiPath = require.resolve('../node/proxyCreateProgram');
+    const currentFilePath = require.resolve('./runTsc');
+    const readFileSync = fs.readFileSync;
+    fs.readFileSync = (...args) => {
+        if (args[0] === tscPath) {
+            let tsc = readFileSync(...args);
+            // add allow extensions
+            const extsText = extensions.map(ext => `"${ext}"`).join(', ');
+            tsc = replace(tsc, /supportedTSExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
+            tsc = replace(tsc, /supportedJSExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
+            tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
+            // proxy createProgram
+            tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
+                + `new Proxy({}, { get(_target, p, _receiver) {return eval(p); } } ), `
+                + `_createProgram, `
+                + `[${extsText}], `
+                + `require(${JSON.stringify(currentFilePath)}).getLanguagePlugins`
+                + `);\n`
+                + s.replace('createProgram', '_createProgram'));
+            return tsc;
+        }
+        return readFileSync(...args);
+    };
+    require(tscPath);
+}
+exports.runTsc = runTsc;
+function replace(text, ...[search, replace]) {
+    const before = text;
+    text = text.replace(search, replace);
+    const after = text;
+    if (after === before) {
+        throw 'Search string not found: ' + JSON.stringify(search.toString());
+    }
+    return after;
+}
+//# sourceMappingURL=runTsc.js.map

package/package.json CHANGED Viewed

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