@volar/language-core 1.4.0-alpha.0 → 1.4.0-alpha.10

package/out/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);

package/out/languageContext.d.ts

@@ -1,7 +1,9 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { LanguageModule, LanguageServiceHost } from './types';
 export type LanguageContext = ReturnType<typeof createLanguageContext>;
-export declare function createLanguageContext(host: LanguageServiceHost, languageModules: LanguageModule[]): {
+export declare function createLanguageContext(host: LanguageServiceHost, modules: {
+    typescript?: typeof import('typescript/lib/tsserverlibrary');
+}, languageModules: LanguageModule[]): {
     typescript: {
         languageServiceHost: ts.LanguageServiceHost;
     };

package/out/languageContext.js

@@ -1,10 +1,10 @@
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageContext = void 0;
 const path_1 = require("path");
 const virtualFiles_1 = require("./virtualFiles");
 const types_1 = require("./types");
-function createLanguageContext(host, languageModules) {
-    var _a;
+function createLanguageContext(host, modules, languageModules) {
     for (const languageModule of languageModules.reverse()) {
         if (languageModule.proxyLanguageServiceHost) {
             const proxyApis = languageModule.proxyLanguageServiceHost(host);
@@ -21,7 +21,7 @@ function createLanguageContext(host, languageModules) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     const virtualFiles = (0, virtualFiles_1.createVirtualFiles)(languageModules);
-    const ts = (_a = host.getTypeScriptModule) === null || _a === void 0 ? void 0 : _a.call(host);
+    const ts = modules.typescript;
     const scriptSnapshots = new Map();
     const sourceTsFileVersions = new Map();
     const sourceFileVersions = new Map();
@@ -29,7 +29,6 @@ function createLanguageContext(host, languageModules) {
     const _tsHost = {
         fileExists: host.fileExists
             ? fileName => {
-                var _a, _b;
                 const ext = fileName.substring(fileName.lastIndexOf('.'));
                 if (ext === '.js'
                     || ext === '.ts'
@@ -46,14 +45,14 @@ function createLanguageContext(host, languageModules) {
                     if (!virtualFiles.hasSource(sourceFileName)) {
                         const scriptSnapshot = host.getScriptSnapshot(sourceFileName);
                         if (scriptSnapshot) {
-                            virtualFiles.updateSource(sourceFileName, scriptSnapshot, (_a = host.getScriptLanguageId) === null || _a === void 0 ? void 0 : _a.call(host, sourceFileName));
+                            virtualFiles.updateSource(sourceFileName, scriptSnapshot, host.getScriptLanguageId?.(sourceFileName));
                         }
                     }
                 }
                 if (virtualFiles.hasVirtualFile(fileName)) {
                     return true;
                 }
-                return !!((_b = host.fileExists) === null || _b === void 0 ? void 0 : _b.call(host, fileName));
+                return !!host.fileExists?.(fileName);
             }
             : undefined,
         getProjectVersion: () => {
@@ -63,8 +62,7 @@ function createLanguageContext(host, languageModules) {
         getScriptVersion,
         getScriptSnapshot,
         readDirectory: (_path, extensions, exclude, include, depth) => {
-            var _a, _b;
-            const result = (_b = (_a = host.readDirectory) === null || _a === void 0 ? void 0 : _a.call(host, _path, extensions, exclude, include, depth)) !== null && _b !== void 0 ? _b : [];
+            const result = host.readDirectory?.(_path, extensions, exclude, include, depth) ?? [];
             for (const { fileName } of virtualFiles.allSources()) {
                 const vuePath2 = path_1.posix.join(_path, path_1.posix.basename(fileName));
                 if (path_1.posix.relative(_path.toLowerCase(), fileName.toLowerCase()).startsWith('..')) {
@@ -112,8 +110,7 @@ function createLanguageContext(host, languageModules) {
         }),
     };
     function update() {
-        var _a, _b, _c;
-        const newProjectVersion = (_a = host.getProjectVersion) === null || _a === void 0 ? void 0 : _a.call(host);
+        const newProjectVersion = host.getProjectVersion?.();
         const shouldUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
         lastProjectVersion = newProjectVersion;
         if (!shouldUpdate)
@@ -136,7 +133,7 @@ function createLanguageContext(host, languageModules) {
             if (sourceFileVersions.get(fileName) !== newVersion) {
                 // update
                 sourceFileVersions.set(fileName, newVersion);
-                virtualFiles.updateSource(fileName, snapshot, (_b = host.getScriptLanguageId) === null || _b === void 0 ? void 0 : _b.call(host, fileName));
+                virtualFiles.updateSource(fileName, snapshot, host.getScriptLanguageId?.(fileName));
                 virtualFilesUpdatedNum++;
             }
         }
@@ -148,7 +145,7 @@ function createLanguageContext(host, languageModules) {
         for (const fileName of [...remainRootFiles]) {
             const snapshot = host.getScriptSnapshot(fileName);
             if (snapshot) {
-                const virtualFile = virtualFiles.updateSource(fileName, snapshot, (_c = host.getScriptLanguageId) === null || _c === void 0 ? void 0 : _c.call(host, fileName));
+                const virtualFile = virtualFiles.updateSource(fileName, snapshot, host.getScriptLanguageId?.(fileName));
                 if (virtualFile) {
                     remainRootFiles.delete(fileName);
                 }
@@ -180,9 +177,8 @@ function createLanguageContext(host, languageModules) {
         for (const { root: rootVirtualFile } of virtualFiles.allSources()) {
             if (!shouldUpdateTsProject) {
                 (0, virtualFiles_1.forEachEmbeddedFile)(rootVirtualFile, embedded => {
-                    var _a;
                     if (embedded.kind === types_1.FileKind.TypeScriptHostFile) {
-                        if (virtualFileVersions.has(embedded.fileName) && ((_a = virtualFileVersions.get(embedded.fileName)) === null || _a === void 0 ? void 0 : _a.virtualFileSnapshot) !== embedded.snapshot) {
+                        if (virtualFileVersions.has(embedded.fileName) && virtualFileVersions.get(embedded.fileName)?.virtualFileSnapshot !== embedded.snapshot) {
                             shouldUpdateTsProject = true;
                         }
                     }

package/out/sourceMaps.js

@@ -1,3 +1,4 @@
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MirrorMap = void 0;
 const SourceMaps = require("@volar/source-map");

package/out/types.d.ts

@@ -59,7 +59,6 @@ export interface LanguageModule<T extends VirtualFile = VirtualFile> {
     proxyLanguageServiceHost?(host: LanguageServiceHost): Partial<LanguageServiceHost>;
 }
 export interface LanguageServiceHost extends ts.LanguageServiceHost {
-    getTypeScriptModule?(): typeof import('typescript/lib/tsserverlibrary');
     getScriptLanguageId?(fileName: string): string | undefined;
     isTsc?: boolean;
 }

package/out/types.js

@@ -1,3 +1,4 @@
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileKind = exports.MirrorBehaviorCapabilities = exports.FileRangeCapabilities = exports.FileCapabilities = void 0;
 var FileCapabilities;

package/out/virtualFiles.d.ts

@@ -1,6 +1,7 @@
 import { SourceMap } from '@volar/source-map';
+import type * as ts from 'typescript/lib/tsserverlibrary';
 import { MirrorMap } from './sourceMaps';
-import type { LanguageModule, FileRangeCapabilities, VirtualFile } from './types';
+import type { FileRangeCapabilities, LanguageModule, VirtualFile } from './types';
 export type VirtualFiles = ReturnType<typeof createVirtualFiles>;
 export interface Source {
     fileName: string;

package/out/virtualFiles.js

@@ -1,3 +1,4 @@
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forEachEmbeddedFile = exports.createVirtualFiles = void 0;
 const source_map_1 = require("@volar/source-map");
@@ -31,11 +32,10 @@ function createVirtualFiles(languageModules) {
             }
         },
         deleteSource(fileName) {
-            var _a, _b;
             const key = normalizePath(fileName);
             const value = sourceFiles.get(key);
             if (value) {
-                (_b = (_a = value.languageModule).deleteFile) === null || _b === void 0 ? void 0 : _b.call(_a, value.root);
+                value.languageModule.deleteFile?.(value.root);
                 sourceFiles.delete(key); // deleted
                 sourceFilesDirty = true;
             }
@@ -81,7 +81,7 @@ function createVirtualFiles(languageModules) {
             sources.add(map.source);
         }
         for (const source of sources) {
-            const sourceFileName = source !== null && source !== void 0 ? source : getVirtualFilesMap().get(normalizePath(virtualFile.fileName)).source.fileName;
+            const sourceFileName = source ?? getVirtualFilesMap().get(normalizePath(virtualFile.fileName)).source.fileName;
             if (!sourceMapsBySourceFileName.has(sourceFileName)) {
                 sourceMapsBySourceFileName.set(sourceFileName, [
                     sourceFileName,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.4.0-alpha.0",
+	"version": "1.4.0-alpha.10",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.4.0-alpha.0"
+		"@volar/source-map": "1.4.0-alpha.10"
 	},
-	"gitHead": "2607410cae341cf802b446062d446ad497be2057"
+	"gitHead": "715bc5f17a0d1cadd4190712dcaff732989eb330"
 }