vue-tsc 2.0.6 → 2.0.10

package/index.d.ts

@@ -1,3 +1,2 @@
-import type * as ts from 'typescript';
 export declare function run(): void;
-export declare function createFakeGlobalTypesHolder(options: ts.CreateProgramOptions): string | undefined;
+export declare function removeEmitGlobalTypes(dts: string): string;

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFakeGlobalTypesHolder = exports.run = void 0;
+exports.removeEmitGlobalTypes = exports.run = void 0;
 const runTsc_1 = require("@volar/typescript/lib/quickstart/runTsc");
 const vue = require("@vue/language-core");
 const windowsPathReg = /\\/g;
@@ -11,19 +11,31 @@ function run() {
         const { configFilePath } = options.options;
         const vueOptions = typeof configFilePath === 'string'
             ? vue.createParsedCommandLine(ts, ts.sys, configFilePath.replace(windowsPathReg, '/')).vueOptions
-            : {};
-        const resolvedVueOptions = vue.resolveVueCompilerOptions(vueOptions);
-        const { extensions } = resolvedVueOptions;
-        const fakeGlobalTypesHolder = createFakeGlobalTypesHolder(options);
-        if (runExtensions.length === extensions.length
-            && runExtensions.every(ext => extensions.includes(ext))) {
-            const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, fileName => fileName === fakeGlobalTypesHolder, options.options, resolvedVueOptions, false);
+            : vue.resolveVueCompilerOptions({});
+        if (runExtensions.length === vueOptions.extensions.length
+            && runExtensions.every(ext => vueOptions.extensions.includes(ext))) {
+            const writeFile = options.host.writeFile.bind(options.host);
+            options.host.writeFile = (fileName, contents, ...args) => {
+                if (fileName.endsWith('.d.ts')
+                    && vueLanguagePlugin
+                        .getCanonicalFileName(fileName.replace(windowsPathReg, '/'))
+                        .slice(0, -5) === vueLanguagePlugin.pluginContext.globalTypesHolder) {
+                    contents = removeEmitGlobalTypes(contents);
+                }
+                return writeFile(fileName, contents, ...args);
+            };
+            const vueLanguagePlugin = vue.createVueLanguagePlugin(ts, id => id, options.host?.useCaseSensitiveFileNames?.() ?? false, () => '', () => options.rootNames.map(rootName => rootName.replace(windowsPathReg, '/')), options.options, vueOptions, false);
             return [vueLanguagePlugin];
         }
         else {
-            runExtensions = extensions;
+            runExtensions = vueOptions.extensions;
             throw extensionsChangedException;
         }
+    }, fileName => {
+        if (runExtensions.some(ext => fileName.endsWith(ext))) {
+            return 'vue';
+        }
+        return vue.resolveCommonLanguageId(fileName);
     });
     try {
         main();
@@ -35,34 +47,8 @@ function run() {
     }
 }
 exports.run = run;
-function createFakeGlobalTypesHolder(options) {
-    const firstVueFile = options.rootNames.find(fileName => fileName.endsWith('.vue'));
-    if (firstVueFile) {
-        const fakeFileName = firstVueFile + '__VLS_globalTypes.vue';
-        options.rootNames.push(fakeFileName);
-        const fileExists = options.host.fileExists.bind(options.host);
-        const readFile = options.host.readFile.bind(options.host);
-        const writeFile = options.host.writeFile.bind(options.host);
-        options.host.fileExists = fileName => {
-            if (fileName.endsWith('__VLS_globalTypes.vue')) {
-                return true;
-            }
-            return fileExists(fileName);
-        };
-        options.host.readFile = fileName => {
-            if (fileName.endsWith('__VLS_globalTypes.vue')) {
-                return '<script setup lang="ts"></script>';
-            }
-            return readFile(fileName);
-        };
-        options.host.writeFile = (fileName, ...args) => {
-            if (fileName.endsWith('__VLS_globalTypes.vue.d.ts')) {
-                return;
-            }
-            return writeFile(fileName, ...args);
-        };
-        return fakeFileName.replace(windowsPathReg, '/');
-    }
+function removeEmitGlobalTypes(dts) {
+    return dts.replace(/[^\n]*__VLS_globalTypesStart[\w\W]*__VLS_globalTypesEnd[^\n]*\n/, '');
 }
-exports.createFakeGlobalTypesHolder = createFakeGlobalTypesHolder;
+exports.removeEmitGlobalTypes = removeEmitGlobalTypes;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vue-tsc",
-	"version": "2.0.6",
+	"version": "2.0.10",
 	"license": "MIT",
 	"files": [
 		"bin",
@@ -16,8 +16,8 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.1.2",
-		"@vue/language-core": "2.0.6",
+		"@volar/typescript": "~2.2.0-alpha.5",
+		"@vue/language-core": "2.0.10",
 		"semver": "^7.5.4"
 	},
 	"peerDependencies": {
@@ -26,5 +26,5 @@
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "feb990ccec85f6330bba37c8b1d1287f0980274c"
+	"gitHead": "a20a2ee950b63a949660b7e8faf0faed0e5bad33"
 }