vue-tsc 1.7.8 → 1.7.9

package/bin/vue-tsc.js

@@ -21,10 +21,21 @@ fs.readFileSync = (...args) => {
 
 		// patches logic for checking root file extension in build program for incremental builds
 		if (semver.gt(tsPkg.version, '5.0.0')) {
-			tryReplace(`for (const existingRoot of buildInfoVersionMap.roots) {`, `for (const existingRoot of buildInfoVersionMap.roots
-				.filter(file => !file.toLowerCase().includes('__vls_'))
-				.map(file => file.replace(/\.vue\.(j|t)sx?$/i, '.vue'))
-			) {`);
+			tryReplace(
+				`for (const existingRoot of buildInfoVersionMap.roots) {`,
+				`for (const existingRoot of buildInfoVersionMap.roots
+					.filter(file => !file.toLowerCase().includes('__vls_'))
+					.map(file => file.replace(/\.vue\.(j|t)sx?$/i, '.vue'))
+				) {`
+			);
+		}
+		if (semver.gte(tsPkg.version, '5.0.4')) {
+			tryReplace(
+				`return createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, host);`,
+				s => `buildInfo.program.fileNames = buildInfo.program.fileNames
+					.filter(file => !file.toLowerCase().includes('__vls_'))
+					.map(file => file.replace(/\.vue\.(j|t)sx?$/i, '.vue'));\n` + s
+			);
 		}
 
 		return tsc;

package/out/index.d.ts

@@ -8,7 +8,7 @@ export type _Program = ts.Program & {
 interface ProgramContext {
     projectVersion: number;
     options: ts.CreateProgramOptions;
-    languageServiceHost: vue.LanguageServiceHost;
+    languageHost: vue.TypeScriptLanguageHost;
     vueCompilerOptions: Partial<vue.VueCompilerOptions>;
     languageService: ReturnType<typeof vueTs.createLanguageService>;
 }

package/out/index.js

@@ -5,6 +5,8 @@ const ts = require("typescript");
 const vue = require("@vue/language-core");
 const vueTs = require("@vue/typescript");
 const shared_1 = require("./shared");
+const vscode_uri_1 = require("vscode-uri");
+const fs = require("fs");
 function createProgram(options) {
     if (!options.options.noEmit && !options.options.emitDeclarationOnly)
         throw toThrow('js emit is not supported');
@@ -23,8 +25,8 @@ function createProgram(options) {
         const ctx = {
             projectVersion: 0,
             options,
-            get languageServiceHost() {
-                return vueLsHost;
+            get languageHost() {
+                return languageHost;
             },
             get vueCompilerOptions() {
                 return vueCompilerOptions;
@@ -35,35 +37,62 @@ function createProgram(options) {
         };
         const vueCompilerOptions = getVueCompilerOptions();
         const scripts = new Map();
-        const vueLsHost = new Proxy({
-            // avoid failed with tsc built-in fileExists
-            resolveModuleNames: undefined,
-            resolveModuleNameLiterals: undefined,
-            writeFile: (fileName, content) => {
-                if (fileName.indexOf('__VLS_') === -1) {
-                    ctx.options.host.writeFile(fileName, content, false);
-                }
-            },
+        const languageHost = {
             getCompilationSettings: () => ctx.options.options,
             getScriptFileNames: () => {
                 return ctx.options.rootNames;
             },
-            getScriptVersion,
             getScriptSnapshot,
             getProjectVersion: () => {
-                return ctx.projectVersion.toString();
+                return ctx.projectVersion;
             },
             getProjectReferences: () => ctx.options.projectReferences,
-            isTsc: true,
-        }, {
-            get: (target, property) => {
-                if (property in target) {
-                    return target[property];
-                }
-                return ctx.options.host[property];
+            getCurrentDirectory: () => ctx.options.host.getCurrentDirectory().replace(/\\/g, '/'),
+            getCancellationToken: ctx.options.host.getCancellationToken ? () => ctx.options.host.getCancellationToken() : undefined,
+        };
+        const uriToFileName = (uri) => vscode_uri_1.URI.parse(uri).fsPath.replace(/\\/g, '/');
+        const fileNameToUri = (fileName) => vscode_uri_1.URI.file(fileName).toString();
+        const vueTsLs = vueTs.createLanguageService(languageHost, vueCompilerOptions, ts, {
+            uriToFileName,
+            fileNameToUri,
+            rootUri: vscode_uri_1.URI.parse(fileNameToUri(languageHost.getCurrentDirectory())),
+            fs: {
+                stat(uri) {
+                    if (uri.startsWith('file://')) {
+                        const stats = fs.statSync(uriToFileName(uri), { throwIfNoEntry: false });
+                        if (stats) {
+                            return {
+                                type: stats.isFile() ? 1
+                                    : stats.isDirectory() ? 2
+                                        : stats.isSymbolicLink() ? 64
+                                            : 0,
+                                ctime: stats.ctimeMs,
+                                mtime: stats.mtimeMs,
+                                size: stats.size,
+                            };
+                        }
+                    }
+                },
+                readFile(uri, encoding) {
+                    if (uri.startsWith('file://')) {
+                        return fs.readFileSync(uriToFileName(uri), { encoding: encoding ?? 'utf-8' });
+                    }
+                },
+                readDirectory(uri) {
+                    if (uri.startsWith('file://')) {
+                        const dirName = uriToFileName(uri);
+                        const files = fs.existsSync(dirName) ? fs.readdirSync(dirName, { withFileTypes: true }) : [];
+                        return files.map(file => {
+                            return [file.name, file.isFile() ? 1
+                                    : file.isDirectory() ? 2
+                                        : file.isSymbolicLink() ? 64
+                                            : 0];
+                        });
+                    }
+                    return [];
+                },
             },
         });
-        const vueTsLs = vueTs.createLanguageService(vueLsHost, vueCompilerOptions, ts);
         program = vueTsLs.getProgram();
         program.__vue = ctx;
         function getVueCompilerOptions() {
@@ -73,9 +102,6 @@ function createProgram(options) {
             }
             return {};
         }
-        function getScriptVersion(fileName) {
-            return getScript(fileName)?.version ?? '';
-        }
         function getScriptSnapshot(fileName) {
             return getScript(fileName)?.scriptSnapshot;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-tsc",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -17,12 +17,13 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@vue/language-core": "1.7.8",
-		"@vue/typescript": "1.7.8",
-		"semver": "^7.3.8"
+		"@vue/language-core": "1.7.9",
+		"@vue/typescript": "1.7.9",
+		"semver": "^7.3.8",
+		"vscode-uri": "^3.0.7"
 	},
 	"peerDependencies": {
 		"typescript": "*"
 	},
-	"gitHead": "9841dc5c7b19c2b1d24fcc95a808f29af39710b8"
+	"gitHead": "70f9ebedbc55a8d342ec425cc483dfe39c4b7489"
 }