vue-tsc 0.33.9 → 0.34.2

package/out/apis.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const lsTypes = ['script', 'template'];
 function register(ts, context) {
     return {
         getRootFileNames,
@@ -12,11 +11,7 @@ function register(ts, context) {
         getBindAndCheckDiagnostics,
     };
     function getRootFileNames() {
-        const set = new Set([
-            ...getProgram('script')?.getRootFileNames().filter(fileName => context.getTsLsHost('script').fileExists?.(fileName)) ?? [],
-            ...getProgram('template')?.getRootFileNames().filter(fileName => context.getTsLsHost('template')?.fileExists?.(fileName)) ?? [],
-        ]);
-        return [...set.values()];
+        return getProgram().getRootFileNames().filter(fileName => context.getTsLsHost().fileExists?.(fileName));
     }
     // for vue-tsc --noEmit --watch
     function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
@@ -31,58 +26,41 @@ function register(ts, context) {
     }
     function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
         if (sourceFile) {
-            const mapped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName);
+            const mapped = context.vueFiles.fromEmbeddedFileName(sourceFile.fileName);
             if (mapped) {
-                let results = [];
-                const embeddeds = mapped.vueFile.getAllEmbeddeds();
-                for (const embedded of embeddeds) {
-                    if (embedded.file.lsType === 'nonTs' || !embedded.file.capabilities.diagnostics)
-                        continue;
-                    const program = getProgram(embedded.file.lsType);
-                    const embeddedSourceFile = program?.getSourceFile(embedded.file.fileName);
-                    if (embeddedSourceFile) {
-                        const errors = transformDiagnostics(embedded.file.lsType, program?.[api](embeddedSourceFile, cancellationToken) ?? []);
-                        results = results.concat(errors);
-                    }
-                }
-                return results;
-            }
-            else {
-                return getProgram('script')?.[api](sourceFile, cancellationToken) ?? [];
+                if (!mapped.embedded.file.capabilities.diagnostics)
+                    return [];
+                const program = getProgram();
+                const errors = transformDiagnostics(program?.[api](sourceFile, cancellationToken) ?? []);
+                return errors;
             }
         }
-        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType)?.[api](sourceFile, cancellationToken) ?? [])).flat();
+        return transformDiagnostics(getProgram()[api](sourceFile, cancellationToken) ?? []);
     }
     function getGlobalDiagnostics(cancellationToken) {
-        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType)?.getGlobalDiagnostics(cancellationToken) ?? [])).flat();
+        return transformDiagnostics(getProgram().getGlobalDiagnostics(cancellationToken) ?? []);
     }
     function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-        const scriptResult = getProgram('script').emit(targetSourceFile, (context.vueLsHost.writeFile ?? ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
-        const templateResult = getProgram('template')?.emit(targetSourceFile, undefined, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        const scriptResult = getProgram().emit(targetSourceFile, (context.vueLsHost.writeFile ?? ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         return {
             emitSkipped: scriptResult.emitSkipped,
             emittedFiles: scriptResult.emittedFiles,
-            diagnostics: [
-                ...transformDiagnostics('script', scriptResult.diagnostics),
-                ...transformDiagnostics('template', templateResult?.diagnostics ?? []),
-            ],
+            diagnostics: transformDiagnostics(scriptResult.diagnostics),
         };
     }
-    function getProgram(lsType) {
-        return context.getTsLs(lsType)?.getProgram();
+    function getProgram() {
+        return context.getTsLs().getProgram();
     }
     // transform
-    function transformDiagnostics(lsType, diagnostics) {
+    function transformDiagnostics(diagnostics) {
         const result = [];
         for (const diagnostic of diagnostics) {
             if (diagnostic.file !== undefined
                 && diagnostic.start !== undefined
                 && diagnostic.length !== undefined) {
-                for (const tsOrVueLoc of context.vueFiles.fromEmbeddedLocation(lsType, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
+                for (const tsOrVueLoc of context.vueFiles.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
                     if (!context.vueLsHost.fileExists?.(tsOrVueLoc.fileName))
                         continue;
-                    if (!tsOrVueLoc.mapped && lsType !== 'script')
-                        continue;
                     let file = tsOrVueLoc.fileName === diagnostic.file.fileName
                         ? diagnostic.file
                         : undefined;
@@ -106,7 +84,7 @@ function register(ts, context) {
                     };
                     const relatedInformation = diagnostic.relatedInformation;
                     if (relatedInformation) {
-                        newDiagnostic.relatedInformation = transformDiagnostics(lsType, relatedInformation);
+                        newDiagnostic.relatedInformation = transformDiagnostics(relatedInformation);
                     }
                     result.push(newDiagnostic);
                 }

package/out/proxy.js

@@ -44,7 +44,7 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         isVueTsc: true,
     });
     tsRuntime.update(true); // must update before getProgram() to update virtual scripts
-    const tsProgram = tsRuntime.getTsLs('script').getProgram();
+    const tsProgram = tsRuntime.getTsLs().getProgram();
     if (!tsProgram)
         throw '!tsProgram';
     const proxyApis = apis.register(ts, tsRuntime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.33.9",
+  "version": "0.34.2",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,10 +16,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/vue-typescript": "0.33.9"
+    "@volar/vue-typescript": "0.34.2"
   },
   "peerDependencies": {
     "typescript": "*"
   },
-  "gitHead": "9031e662fe238df7ec385ddde6a91e1e363a4af4"
+  "gitHead": "468f95dad9421f9c55f0674751ffd7afd45b8777"
 }