npm - vue-tsc - Versions diffs - 0.31.4 → 0.33.0-patch.1 - Mend

vue-tsc 0.31.4 → 0.33.0-patch.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/README.md CHANGED Viewed

@@ -13,7 +13,7 @@ Roadmap:
 - [x] Make `typescript` as peerDependencies
 - [x] Cleaner dependencies (remove `prettyhtml`, `prettier` etc.) (with `vscode-vue-languageservice` version >= 0.26.4)
 - [x] dts emit support
-- [ ] Watch mode support
+- [x] Watch mode support
 ## Using
@@ -29,8 +29,8 @@ Check out https://github.com/johnsoncodehk/volar/discussions/640#discussioncomme
 ## Sponsors
-This company is [sponsoring this project](https://github.com/sponsors/johnsoncodehk) to improve your DX. 💪
-<a href="https://github.com/Leniolabs">
-  <img itemprop="image" src="https://github.com/Leniolabs.png" width="100" height="100">
-</a>
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/johnsoncodehk/sponsors/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/johnsoncodehk/sponsors/sponsors.svg'/>
+  </a>
+</p>

package/bin/vue-tsc.js CHANGED Viewed

@@ -8,13 +8,25 @@ const proxyPath = require.resolve('../out/proxy');
 fs.readFileSync = (...args) => {
     if (args[0] === tscPath) {
         let tsc = readFileSync(...args);
+        // add *.vue files to allow extensions
         tsc = tsc.replace(
-            `function createIncrementalProgram(_a) {`,
-            `function createIncrementalProgram(_a) { console.error('incremental mode is not yet supported'); throw 'incremental mode is not yet supported';`,
+            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"]];`,
+            `ts.supportedTSExtensions = [[".ts", ".tsx", ".d.ts"], [".cts", ".d.cts"], [".mts", ".d.mts"], [".vue"]];`,
+        );
+        tsc = tsc.replace(
+            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"]];`,
+            `ts.supportedJSExtensions = [[".js", ".jsx"], [".mjs"], [".cjs"], [".vue"]];`,
         );
         tsc = tsc.replace(
-            `function createWatchProgram(host) {`,
-            `function createWatchProgram(host) { console.error('watch mode is not yet supported'); throw 'watch mode is not yet supported';`,
+            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"]];`,
+            `var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"], [".vue"]];`,
+        );
+        // proxy createProgram apis
+        tsc = tsc.replace(
+            `function createIncrementalProgram(_a) {`,
+            `function createIncrementalProgram(_a) { console.error('incremental mode is not yet supported'); throw 'incremental mode is not yet supported';`,
         );
         tsc = tsc.replace(
             `function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) {`,

package/out/apis.d.ts ADDED Viewed

@@ -0,0 +1,10 @@
+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): {
+    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[];
+    getSemanticDiagnostics: (sourceFile?: ts.SourceFile | undefined, cancellationToken?: ts.CancellationToken | undefined) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
+    getGlobalDiagnostics: (cancellationToken?: ts.CancellationToken | undefined) => readonly ts.Diagnostic[];
+    getBindAndCheckDiagnostics: (sourceFile?: ts.SourceFile | undefined, cancellationToken?: ts.CancellationToken | undefined) => readonly ts.DiagnosticWithLocation[] | readonly ts.Diagnostic[];
+};

package/out/apis.js ADDED Viewed

@@ -0,0 +1,130 @@
+"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 }) {
+    return {
+        getRootFileNames,
+        emit,
+        getSyntacticDiagnostics,
+        getSemanticDiagnostics,
+        getGlobalDiagnostics,
+        getBindAndCheckDiagnostics,
+    };
+    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); }),
+        ]);
+        return [...set.values()];
+    }
+    // for vue-tsc --noEmit --watch
+    function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, 'getBindAndCheckDiagnostics');
+    }
+    // for vue-tsc --noEmit
+    function getSyntacticDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, 'getSyntacticDiagnostics');
+    }
+    function getSemanticDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, 'getSemanticDiagnostics');
+    }
+    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) {
+                let results = [];
+                const sourceMaps = vueDocument.getSourceMaps();
+                for (const sourceMap of sourceMaps) {
+                    if (sourceMap.lsType === 'nonTs' || !sourceMap.capabilities.diagnostics)
+                        continue;
+                    const program = getProgram(sourceMap.lsType);
+                    const embeddedSourceFile = program.getSourceFile(shared.uriToFsPath(sourceMap.mappedDocument.uri));
+                    if (embeddedSourceFile) {
+                        const errors = transformDiagnostics(sourceMap.lsType, program[api](embeddedSourceFile, cancellationToken));
+                        results = results.concat(errors);
+                    }
+                }
+                return results;
+            }
+            else {
+                return getProgram('script')[api](sourceFile, cancellationToken);
+            }
+        }
+        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();
+    }
+    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);
+        return {
+            emitSkipped: scriptResult.emitSkipped,
+            emittedFiles: scriptResult.emittedFiles,
+            diagnostics: [
+                ...transformDiagnostics('script', scriptResult.diagnostics),
+                ...transformDiagnostics('template', templateResult.diagnostics),
+            ],
+        };
+    }
+    function getProgram(lsType) {
+        const program = (lsType === 'script' ? scriptTsLsRaw : templateTsLsRaw).getProgram();
+        if (!program)
+            throw '!program';
+        return program;
+    }
+    // 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))))
+                        continue;
+                    if (tsOrVueLoc.type === 'source-ts' && lsType !== 'script')
+                        continue;
+                    let file = shared.uriToFsPath(tsOrVueLoc.uri) === fileName
+                        ? diagnostic.file
+                        : undefined;
+                    if (!file) {
+                        let docText = (_b = tsOrVueLoc.sourceMap) === null || _b === void 0 ? void 0 : _b.sourceDocument.getText();
+                        if (docText === undefined) {
+                            const snapshot = vueHost.getScriptSnapshot(shared.uriToFsPath(tsOrVueLoc.uri));
+                            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);
+                        }
+                    }
+                    const newDiagnostic = {
+                        ...diagnostic,
+                        file,
+                        start: tsOrVueLoc.range.start,
+                        length: tsOrVueLoc.range.end - tsOrVueLoc.range.start,
+                    };
+                    const relatedInformation = diagnostic.relatedInformation;
+                    if (relatedInformation) {
+                        newDiagnostic.relatedInformation = transformDiagnostics(lsType, relatedInformation);
+                    }
+                    result.push(newDiagnostic);
+                }
+            }
+            else if (diagnostic.file === undefined) {
+                result.push(diagnostic);
+            }
+        }
+        return result;
+    }
+}
+exports.register = register;
+//# sourceMappingURL=apis.js.map

package/out/apis.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"apis.js","sourceRoot":"","sources":["../src/apis.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAIxC,MAAM,OAAO,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAU,CAAC;AAEhD,SAAgB,QAAQ,CACvB,EAAmD,EACnD,EAAE,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,EAAoC;IAGzH,OAAO;QACN,gBAAgB;QAChB,IAAI;QACJ,uBAAuB;QACvB,sBAAsB;QACtB,oBAAoB;QACpB,0BAA0B;KAC1B,CAAC;IAEF,SAAS,gBAAgB;QACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC;YACnB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAC,OAAA,MAAA,YAAY,CAAC,UAAU,6DAAG,QAAQ,CAAC,CAAA,EAAA,CAAC;YAClG,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAC,OAAA,MAAA,cAAc,CAAC,UAAU,+DAAG,QAAQ,CAAC,CAAA,EAAA,CAAC;SACtG,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,+BAA+B;IAC/B,SAAS,0BAA0B,CAAC,UAA0B,EAAE,iBAAwC;QACvG,OAAO,8BAA8B,CAAC,UAAU,EAAE,iBAAiB,EAAE,4BAA4B,CAAC,CAAC;IACpG,CAAC;IAED,uBAAuB;IACvB,SAAS,uBAAuB,CAAC,UAA0B,EAAE,iBAAwC;QACpG,OAAO,8BAA8B,CAAC,UAAU,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,CAAC;IACjG,CAAC;IACD,SAAS,sBAAsB,CAAC,UAA0B,EAAE,iBAAwC;QACnG,OAAO,8BAA8B,CAAC,UAAU,EAAE,iBAAiB,EAAE,wBAAwB,CAAC,CAAC;IAChG,CAAC;IAED,SAAS,8BAA8B,CACtC,UAAqC,EACrC,iBAAmD,EACnD,GAAwF;QAGxF,IAAI,UAAU,EAAE;YAEf,MAAM,SAAS,GAAG,YAAY,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1G,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE3F,IAAI,WAAW,EAAE;gBAEhB,IAAI,OAAO,GAAU,EAAE,CAAC;gBAExB,MAAM,UAAU,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC;gBAE/C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;oBAEnC,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW;wBACtE,SAAS;oBAEV,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;oBAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;oBAEnG,IAAI,kBAAkB,EAAE;wBAEvB,MAAM,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAAC,MAAM,EAAG,OAAe,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;wBACpH,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;qBACjC;iBACD;gBAED,OAAO,OAAO,CAAC;aACf;iBACI;gBACJ,OAAQ,UAAU,CAAC,QAAQ,CAAS,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;aACzE;SACD;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAG,UAAU,CAAC,MAAM,CAAS,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACpI,CAAC;IAED,SAAS,oBAAoB,CAAC,iBAAwC;QACrE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/H,CAAC;IACD,SAAS,IAAI,CAAC,gBAAgC,EAAE,UAAiC,EAAE,iBAAwC,EAAE,gBAA0B,EAAE,kBAA0C;;QAClM,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QACnK,MAAM,cAAc,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QACzI,OAAO;YACN,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,WAAW,EAAE;gBACZ,GAAG,oBAAoB,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC;gBAC3D,GAAG,oBAAoB,CAAC,UAAU,EAAE,cAAc,CAAC,WAAW,CAAC;aAC/D;SACD,CAAC;IACH,CAAC;IACD,SAAS,UAAU,CAAC,MAA6B;QAChD,MAAM,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;QACrF,IAAI,CAAC,OAAO;YAAE,MAAM,UAAU,CAAC;QAC/B,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,YAAY;IACZ,SAAS,oBAAoB,CAAwF,MAA6B,EAAE,WAAyB;;QAC5K,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACrC,IACC,UAAU,CAAC,IAAI,KAAK,SAAS;mBAC1B,UAAU,CAAC,KAAK,KAAK,SAAS;mBAC9B,UAAU,CAAC,MAAM,KAAK,SAAS,EACjC;gBACD,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpE,KAAK,MAAM,UAAU,IAAI,YAAY,CAAC,oBAAoB,CACzD,MAAM,EACN,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,EAC5B,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,EACpC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CACtC,EAAE;oBAEF,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,UAAU,wDAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;wBAC5D,SAAS;oBAEV,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,KAAK,QAAQ;wBACzD,SAAS;oBAEV,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,QAAQ;wBACzD,CAAC,CAAC,UAAU,CAAC,IAAI;wBACjB,CAAC,CAAC,SAAS,CAAC;oBACb,IAAI,CAAC,IAAI,EAAE;wBAEV,IAAI,OAAO,GAAG,MAAA,UAAU,CAAC,SAAS,0CAAE,cAAc,CAAC,OAAO,EAAE,CAAC;wBAE7D,IAAI,OAAO,KAAK,SAAS,EAAE;4BAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;4BAC/E,IAAI,QAAQ,EAAE;gCACb,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;6BACpD;yBACD;wBAED,IAAI,OAAO,KAAK,SAAS,EAAE;4BAC1B,IAAI,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;yBACxJ;qBACD;oBACD,MAAM,aAAa,GAAM;wBACxB,GAAG,UAAU;wBACb,IAAI;wBACJ,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,KAAK;wBAC7B,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK;qBACrD,CAAC;oBACF,MAAM,kBAAkB,GAAI,UAA4B,CAAC,kBAAkB,CAAC;oBAC5E,IAAI,kBAAkB,EAAE;wBACtB,aAA+B,CAAC,kBAAkB,GAAG,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;qBACvG;oBACD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBAC3B;aACD;iBACI,IACJ,UAAU,CAAC,IAAI,KAAK,SAAS,EAC5B;gBACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACxB;SACD;QACD,OAAO,MAAM,CAAC;IACf,CAAC;AACF,CAAC;AAjKD,4BAiKC"}

package/out/proxy.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import * as ts from 'typescript/lib/tsserverlibrary';
+export declare function createProgramProxy(options: ts.CreateProgramOptions, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
+_options?: ts.CompilerOptions, _host?: ts.CompilerHost, _oldProgram?: ts.Program, _configFileParsingDiagnostics?: readonly ts.Diagnostic[]): void | ts.Program;

package/out/proxy.js CHANGED Viewed

@@ -2,56 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProgramProxy = void 0;
 const ts = require("typescript/lib/tsserverlibrary");
-const vue = require("vscode-vue-languageservice");
-const path = require("path");
 const shared = require("@volar/shared");
-function createProgramProxy(options) {
+const apis = require("./apis");
+const vue_typescript_1 = require("@volar/vue-typescript");
+function createProgramProxy(options, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
+_options, _host, _oldProgram, _configFileParsingDiagnostics) {
     if (!options.options.noEmit && !options.options.emitDeclarationOnly)
         return doThrow('js emit is not support');
     if (!options.host)
         return doThrow('!options.host');
-    if (!options.host.readDirectory)
-        return doThrow('!options.host.readDirectory');
     const host = options.host;
-    const readDirectory = options.host.readDirectory;
-    const parseConfigHost = {
-        useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
-        readDirectory: (path, extensions, exclude, include, depth) => {
-            return readDirectory(path, ['.vue'], exclude, include, depth);
-        },
-        fileExists: fileName => host.fileExists(fileName),
-        readFile: fileName => host.readFile(fileName),
-    };
-    const fileNames = [
-        ...options.rootNames,
-        ...getVueFileNames(),
-    ];
     const vueCompilerOptions = getVueCompilerOptions();
-    const scriptSnapshots = new Map();
+    const scripts = new Map();
     const vueLsHost = {
         ...host,
+        resolveModuleNames: undefined,
         writeFile: undefined,
         getCompilationSettings: () => options.options,
         getVueCompilationSettings: () => vueCompilerOptions,
-        getScriptFileNames: () => fileNames,
-        getScriptVersion: () => '',
+        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 : ''; },
         getScriptSnapshot,
         getProjectVersion: () => '',
         getVueProjectVersion: () => '',
         getProjectReferences: () => options.projectReferences,
     };
-    const vueLs = vue.createLanguageService({ typescript: ts }, vueLsHost);
-    const program = vueLs.__internal__.tsProgramProxy;
-    return program;
-    function getVueFileNames() {
-        const tsConfig = options.options.configFilePath;
-        if (typeof tsConfig === 'string') {
-            const tsConfigFile = ts.readJsonConfigFile(tsConfig, host.readFile);
-            const { fileNames } = ts.parseJsonSourceFileConfigFileContent(tsConfigFile, parseConfigHost, path.dirname(tsConfig), options.options, path.basename(tsConfig));
-            return fileNames;
-        }
-        return [];
+    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?
+    if (!tsProgram)
+        throw '!tsProgram';
+    const tsProgramApis_2 = apis.register(ts, tsRuntime.context);
+    const tsProgramProxy = new Proxy(tsProgram, {
+        get: (target, property) => {
+            tsRuntime.update(true);
+            return tsProgramApis_2[property] || target[property];
+        },
+    });
+    for (const rootName of options.rootNames) {
+        // register file watchers
+        host.getSourceFile(rootName, ts.ScriptTarget.ESNext);
     }
+    return tsProgramProxy;
     function getVueCompilerOptions() {
         const tsConfig = options.options.configFilePath;
         if (typeof tsConfig === 'string') {
@@ -60,15 +52,19 @@ function createProgramProxy(options) {
         return {};
     }
     function getScriptSnapshot(fileName) {
-        const scriptSnapshot = scriptSnapshots.get(fileName);
-        if (scriptSnapshot) {
-            return scriptSnapshot;
+        var _a, _b, _c;
+        const script = scripts.get(fileName);
+        if (script) {
+            return script.scriptSnapshot;
         }
         if (host.fileExists(fileName)) {
             const fileContent = host.readFile(fileName);
             if (fileContent !== undefined) {
                 const scriptSnapshot = ts.ScriptSnapshot.fromString(fileContent);
-                scriptSnapshots.set(fileName, scriptSnapshot);
+                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,
+                });
                 return scriptSnapshot;
             }
         }

package/out/proxy.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,10 +1,10 @@
 {
   "name": "vue-tsc",
-  "version": "0.31.4",
+  "version": "0.33.0-patch.1",
   "license": "MIT",
   "files": [
     "bin",
-    "out/proxy.js"
+    "out"
   ],
   "repository": {
     "type": "git",
@@ -15,11 +15,10 @@
     "vue-tsc": "./bin/vue-tsc.js"
   },
   "dependencies": {
-    "@volar/shared": "0.31.4",
-    "vscode-vue-languageservice": "0.31.4"
+    "@volar/shared": "0.33.0",
+    "@volar/vue-typescript": "0.33.0"
   },
   "peerDependencies": {
     "typescript": "*"
-  },
-  "gitHead": "d22236527bf25280672ea21552599ea0a3fb44b0"
+  }
 }