@volar/typescript 2.4.0-alpha.8 → 2.4.0-alpha.9

package/lib/protocol/createSys.d.ts

@@ -1,7 +1,7 @@
 import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
-export declare function createSys(sys: ts.System | undefined, { fs, onDidChangeWatchedFiles }: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
+export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
     asUri(fileName: string): URI;
     asFileName(uri: URI): string;
 }): ts.System & {

package/lib/protocol/createSys.js

@@ -5,7 +5,7 @@ const path = require("path-browserify");
 const utilities_1 = require("../typescript/utilities");
 const vscode_uri_1 = require("vscode-uri");
 let currentCwd = '';
-function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, uriConverter) {
+function createSys(sys, env, getCurrentDirectory, uriConverter) {
     let version = 0;
     const caseSensitive = sys?.useCaseSensitiveFileNames ?? false;
     const root = {
@@ -15,7 +15,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
         requestedRead: false,
     };
     const promises = new Set();
-    const fileWatcher = onDidChangeWatchedFiles?.(({ changes }) => {
+    const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
         version++;
         for (const change of changes) {
             const changeUri = vscode_uri_1.URI.parse(change.uri);
@@ -108,7 +108,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
         const dir = getDir(dirName);
         if (dir.exists === undefined) {
             dir.exists = false;
-            const result = fs?.stat(uriConverter.asUri(dirName));
+            const result = env.fs?.stat(uriConverter.asUri(dirName));
             if (typeof result === 'object' && 'then' in result) {
                 const promise = result;
                 promises.add(promise);
@@ -149,7 +149,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
         return exists();
     }
     function handleStat(fileName, file) {
-        const result = fs?.stat(uriConverter.asUri(fileName));
+        const result = env.fs?.stat(uriConverter.asUri(fileName));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -222,7 +222,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
         }
         file.requestedText = true;
         const uri = uriConverter.asUri(fileName);
-        const result = fs?.readFile(uri, encoding);
+        const result = env.fs?.readFile(uri, encoding);
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -247,7 +247,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
             return;
         }
         dir.requestedRead = true;
-        const result = fs?.readDirectory(uriConverter.asUri(dirName || '.'));
+        const result = env.fs?.readDirectory(uriConverter.asUri(dirName || '.'));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -269,7 +269,7 @@ function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, ur
         for (const [name, _fileType] of result) {
             let fileType = _fileType;
             if (fileType === 64) {
-                const stat = fs?.stat(uriConverter.asUri(dirName + '/' + name));
+                const stat = env.fs?.stat(uriConverter.asUri(dirName + '/' + name));
                 if (typeof stat === 'object' && 'then' in stat) {
                     const promise = stat;
                     promises.add(promise);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.8",
+	"version": "2.4.0-alpha.9",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.8",
+		"@volar/language-core": "2.4.0-alpha.9",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.0-alpha.8"
+		"@volar/language-service": "2.4.0-alpha.9"
 	},
-	"gitHead": "2b5644585168133d5a5c5144e15e1ee52b265d0b"
+	"gitHead": "4a3fc1bf36eb12ccd58bc8cb25f11f1a9f7b2300"
 }