vue-tsc 0.33.1 → 0.33.3-patch.1

package/out/apis.d.ts

@@ -1,6 +1,6 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import type { TypeScriptFeaturesRuntimeContext } from '@volar/vue-typescript';
-export declare function register(ts: typeof import('typescript/lib/tsserverlibrary'), { vueDocuments, templateTsLsRaw, scriptTsLsRaw, templateTsHost, scriptTsHost, vueHost }: TypeScriptFeaturesRuntimeContext): {
+import type { TypeScriptRuntime } from '@volar/vue-typescript';
+export declare function register(ts: typeof import('typescript/lib/tsserverlibrary'), context: TypeScriptRuntime): {
     getRootFileNames: () => string[];
     emit: (targetSourceFile?: ts.SourceFile | undefined, _writeFile?: ts.WriteFileCallback | undefined, cancellationToken?: ts.CancellationToken | undefined, emitOnlyDtsFiles?: boolean | undefined, customTransformers?: ts.CustomTransformers | undefined) => ts.EmitResult;
     getSyntacticDiagnostics: (sourceFile?: ts.SourceFile | undefined, cancellationToken?: ts.CancellationToken | undefined) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];

package/out/apis.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const shared = require("@volar/shared");
 const lsTypes = ['script', 'template'];
-function register(ts, { vueDocuments, templateTsLsRaw, scriptTsLsRaw, templateTsHost, scriptTsHost, vueHost }) {
+function register(ts, context) {
     return {
         getRootFileNames,
         emit,
@@ -14,8 +13,8 @@ function register(ts, { vueDocuments, templateTsLsRaw, scriptTsLsRaw, templateTs
     };
     function getRootFileNames() {
         const set = new Set([
-            ...getProgram('script').getRootFileNames().filter(fileName => { var _a; return (_a = scriptTsHost.fileExists) === null || _a === void 0 ? void 0 : _a.call(scriptTsHost, fileName); }),
-            ...getProgram('template').getRootFileNames().filter(fileName => { var _a; return (_a = templateTsHost.fileExists) === null || _a === void 0 ? void 0 : _a.call(templateTsHost, fileName); }),
+            ...getProgram('script')?.getRootFileNames().filter(fileName => context.getTsLsHost('script').fileExists?.(fileName)) ?? [],
+            ...getProgram('template')?.getRootFileNames().filter(fileName => context.getTsLsHost('template')?.fileExists?.(fileName)) ?? [],
         ]);
         return [...set.values()];
     }
@@ -32,78 +31,71 @@ function register(ts, { vueDocuments, templateTsLsRaw, scriptTsLsRaw, templateTs
     }
     function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
         if (sourceFile) {
-            const sourceMap = vueDocuments.fromEmbeddedDocumentUri('script', shared.fsPathToUri(sourceFile.fileName));
-            const vueDocument = sourceMap ? vueDocuments.get(sourceMap.sourceDocument.uri) : undefined;
-            if (vueDocument) {
+            const maped = context.vueFiles.fromEmbeddedFileName('script', sourceFile.fileName);
+            if (maped) {
                 let results = [];
-                const sourceMaps = vueDocument.getSourceMaps();
-                for (const sourceMap of sourceMaps) {
-                    if (sourceMap.lsType === 'nonTs' || !sourceMap.capabilities.diagnostics)
+                const embeddeds = maped.vueFile.getAllEmbeddeds();
+                for (const embedded of embeddeds) {
+                    if (embedded.file.lsType === 'nonTs' || !embedded.file.capabilities.diagnostics)
                         continue;
-                    const program = getProgram(sourceMap.lsType);
-                    const embeddedSourceFile = program.getSourceFile(shared.uriToFsPath(sourceMap.mappedDocument.uri));
+                    const program = getProgram(embedded.file.lsType);
+                    const embeddedSourceFile = program?.getSourceFile(embedded.file.fileName);
                     if (embeddedSourceFile) {
-                        const errors = transformDiagnostics(sourceMap.lsType, program[api](embeddedSourceFile, cancellationToken));
+                        const errors = transformDiagnostics(embedded.file.lsType, program?.[api](embeddedSourceFile, cancellationToken) ?? []);
                         results = results.concat(errors);
                     }
                 }
                 return results;
             }
             else {
-                return getProgram('script')[api](sourceFile, cancellationToken);
+                return getProgram('script')?.[api](sourceFile, cancellationToken) ?? [];
             }
         }
-        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType)[api](sourceFile, cancellationToken))).flat();
+        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType)?.[api](sourceFile, cancellationToken) ?? [])).flat();
     }
     function getGlobalDiagnostics(cancellationToken) {
-        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType).getGlobalDiagnostics(cancellationToken))).flat();
+        return lsTypes.map(lsType => transformDiagnostics(lsType, getProgram(lsType)?.getGlobalDiagnostics(cancellationToken) ?? [])).flat();
     }
     function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-        var _a;
-        const scriptResult = getProgram('script').emit(targetSourceFile, ((_a = vueHost.writeFile) !== null && _a !== void 0 ? _a : ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
-        const templateResult = getProgram('template').emit(targetSourceFile, undefined, 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);
         return {
             emitSkipped: scriptResult.emitSkipped,
             emittedFiles: scriptResult.emittedFiles,
             diagnostics: [
                 ...transformDiagnostics('script', scriptResult.diagnostics),
-                ...transformDiagnostics('template', templateResult.diagnostics),
+                ...transformDiagnostics('template', templateResult?.diagnostics ?? []),
             ],
         };
     }
     function getProgram(lsType) {
-        const program = (lsType === 'script' ? scriptTsLsRaw : templateTsLsRaw).getProgram();
-        if (!program)
-            throw '!program';
-        return program;
+        return context.getTsLs(lsType)?.getProgram();
     }
     // transform
     function transformDiagnostics(lsType, diagnostics) {
-        var _a, _b;
         const result = [];
         for (const diagnostic of diagnostics) {
             if (diagnostic.file !== undefined
                 && diagnostic.start !== undefined
                 && diagnostic.length !== undefined) {
-                const fileName = shared.normalizeFileName(diagnostic.file.fileName);
-                for (const tsOrVueLoc of vueDocuments.fromEmbeddedLocation(lsType, shared.fsPathToUri(fileName), diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
-                    if (!((_a = vueHost.fileExists) === null || _a === void 0 ? void 0 : _a.call(vueHost, shared.uriToFsPath(tsOrVueLoc.uri))))
+                for (const tsOrVueLoc of context.vueFiles.fromEmbeddedLocation(lsType, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, data => !!data.capabilities.diagnostic)) {
+                    if (!context.vueLsHost.fileExists?.(tsOrVueLoc.fileName))
                         continue;
-                    if (tsOrVueLoc.type === 'source-ts' && lsType !== 'script')
+                    if (!tsOrVueLoc.maped && lsType !== 'script')
                         continue;
-                    let file = shared.uriToFsPath(tsOrVueLoc.uri) === fileName
+                    let file = tsOrVueLoc.fileName === diagnostic.file.fileName
                         ? diagnostic.file
                         : undefined;
                     if (!file) {
-                        let docText = (_b = tsOrVueLoc.sourceMap) === null || _b === void 0 ? void 0 : _b.sourceDocument.getText();
+                        let docText = tsOrVueLoc.maped?.vueFile.getContent();
                         if (docText === undefined) {
-                            const snapshot = vueHost.getScriptSnapshot(shared.uriToFsPath(tsOrVueLoc.uri));
+                            const snapshot = context.vueLsHost.getScriptSnapshot(tsOrVueLoc.fileName);
                             if (snapshot) {
                                 docText = snapshot.getText(0, snapshot.getLength());
                             }
                         }
-                        if (docText !== undefined) {
-                            file = ts.createSourceFile(shared.uriToFsPath(tsOrVueLoc.uri), docText, tsOrVueLoc.uri.endsWith('.vue') ? ts.ScriptTarget.JSON : ts.ScriptTarget.Latest);
+                        else {
+                            file = ts.createSourceFile(tsOrVueLoc.fileName, docText, tsOrVueLoc.fileName.endsWith('.vue') ? ts.ScriptTarget.JSON : ts.ScriptTarget.Latest);
                         }
                     }
                     const newDiagnostic = {

package/out/proxy.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProgramProxy = void 0;
 const ts = require("typescript/lib/tsserverlibrary");
-const shared = require("@volar/shared");
 const apis = require("./apis");
 const vue_typescript_1 = require("@volar/vue-typescript");
+const vue_typescript_2 = require("@volar/vue-typescript");
 function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
 _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     if (!options.options.noEmit && !options.options.emitDeclarationOnly)
@@ -21,18 +21,24 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
         getCompilationSettings: () => options.options,
         getVueCompilationSettings: () => vueCompilerOptions,
         getScriptFileNames: () => options.rootNames,
-        getScriptVersion: (fileName) => { var _a, _b; return (_b = (_a = scripts.get(fileName)) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : ''; },
+        getScriptVersion: (fileName) => scripts.get(fileName)?.version ?? '',
         getScriptSnapshot,
         getProjectVersion: () => '',
         getVueProjectVersion: () => '',
         getProjectReferences: () => options.projectReferences,
     };
-    const services = (0, vue_typescript_1.createBasicRuntime)();
-    const tsRuntime = (0, vue_typescript_1.createTypeScriptRuntime)({ typescript: ts, ...services, compilerOptions: vueCompilerOptions }, vueLsHost, false);
-    const tsProgram = tsRuntime.context.scriptTsLsRaw.getProgram(); // TODO: handle template ls?
+    const tsRuntime = (0, vue_typescript_1.createTypeScriptRuntime)({
+        typescript: ts,
+        getCssClasses: () => ({}),
+        getCssVBindRanges: () => [],
+        vueCompilerOptions,
+        vueLsHost: vueLsHost,
+        isVueTsc: true,
+    });
+    const tsProgram = tsRuntime.getTsLs('script').getProgram();
     if (!tsProgram)
         throw '!tsProgram';
-    const tsProgramApis_2 = apis.register(ts, tsRuntime.context);
+    const tsProgramApis_2 = apis.register(ts, tsRuntime);
     const tsProgramProxy = new Proxy(tsProgram, {
         get: (target, property) => {
             tsRuntime.update(true);
@@ -47,12 +53,11 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
     function getVueCompilerOptions() {
         const tsConfig = options.options.configFilePath;
         if (typeof tsConfig === 'string') {
-            return shared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
+            return vue_typescript_2.tsShared.createParsedCommandLine(ts, ts.sys, tsConfig).vueOptions;
         }
         return {};
     }
     function getScriptSnapshot(fileName) {
-        var _a, _b, _c;
         const script = scripts.get(fileName);
         if (script) {
             return script.scriptSnapshot;
@@ -63,7 +68,7 @@ _options, _host, _oldProgram, _configFileParsingDiagnostics) {
                 const scriptSnapshot = ts.ScriptSnapshot.fromString(fileContent);
                 scripts.set(fileName, {
                     scriptSnapshot: scriptSnapshot,
-                    version: (_c = (_b = (_a = ts.sys).createHash) === null || _b === void 0 ? void 0 : _b.call(_a, fileContent)) !== null && _c !== void 0 ? _c : fileContent,
+                    version: ts.sys.createHash?.(fileContent) ?? fileContent,
                 });
                 return scriptSnapshot;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-tsc",
-  "version": "0.33.1",
+  "version": "0.33.3-patch.1",
   "license": "MIT",
   "files": [
     "bin",
@@ -16,11 +16,9 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/shared": "0.33.1",
-    "@volar/vue-typescript": "0.33.1"
+    "@volar/vue-typescript": "0.33.3"
   },
   "peerDependencies": {
     "typescript": "*"
-  },
-  "gitHead": "03eaf26e0b1259ffa2b5690168a2d6a8baa81cbc"
+  }
 }