@volar/typescript 2.3.5-alpha.1 → 2.4.0-alpha.0

package/index.d.ts

@@ -1,7 +1,52 @@
+export * from './lib/common';
 export * from './lib/node/decorateLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
 export * from './lib/node/decorateProgram';
 export * from './lib/node/proxyCreateProgram';
 export * from './lib/protocol/createProject';
 export * from './lib/protocol/createSys';
-export * from './lib/common';
+import type { VirtualCode } from '@volar/language-core';
+import type * as ts from 'typescript';
+declare module '@volar/language-core' {
+    interface Language<T> {
+        typescript?: {
+            configFileName: string | undefined;
+            sys: ts.System & {
+                version?: number;
+                sync?(): Promise<number>;
+            };
+            languageServiceHost: ts.LanguageServiceHost;
+            getExtraServiceScript(fileName: string): TypeScriptExtraServiceScript | undefined;
+            asScriptId(fileName: string): T;
+            asFileName(scriptId: T): string;
+        };
+    }
+    interface LanguagePlugin<T = unknown, K extends VirtualCode = VirtualCode> {
+        typescript?: TypeScriptGenericOptions<K> & TypeScriptNonTSPluginOptions<K>;
+    }
+}
+/**
+ * The following options available to all situations.
+ */
+interface TypeScriptGenericOptions<K> {
+    extraFileExtensions: ts.FileExtensionInfo[];
+    resolveHiddenExtensions?: boolean;
+    getServiceScript(root: K): TypeScriptServiceScript | undefined;
+}
+/**
+ * The following options will not be available in TS plugin.
+ */
+interface TypeScriptNonTSPluginOptions<K> {
+    getExtraServiceScripts?(fileName: string, rootVirtualCode: K): TypeScriptExtraServiceScript[];
+    resolveLanguageServiceHost?(host: ts.LanguageServiceHost): ts.LanguageServiceHost;
+}
+export interface TypeScriptServiceScript {
+    code: VirtualCode;
+    extension: '.ts' | '.js' | '.mts' | '.mjs' | '.cjs' | '.cts' | '.d.ts' | string;
+    scriptKind: ts.ScriptKind;
+    /** See #188 */
+    preventLeadingOffset?: boolean;
+}
+export interface TypeScriptExtraServiceScript extends TypeScriptServiceScript {
+    fileName: string;
+}

package/index.js

@@ -14,11 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lib/common"), exports);
 __exportStar(require("./lib/node/decorateLanguageService"), exports);
 __exportStar(require("./lib/node/decorateLanguageServiceHost"), exports);
 __exportStar(require("./lib/node/decorateProgram"), exports);
 __exportStar(require("./lib/node/proxyCreateProgram"), exports);
 __exportStar(require("./lib/protocol/createProject"), exports);
 __exportStar(require("./lib/protocol/createSys"), exports);
-__exportStar(require("./lib/common"), exports);
 //# sourceMappingURL=index.js.map

package/lib/node/proxyCreateProgram.d.ts

@@ -1,3 +1,6 @@
-import { LanguagePlugin } from '@volar/language-core';
+import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[]): typeof import("typescript").createProgram;
+export declare function proxyCreateProgram(ts: typeof import('typescript'), original: typeof ts['createProgram'], create: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[] | {
+    languagePlugins: LanguagePlugin<string>[];
+    setup?(language: Language<string>): void;
+}): typeof import("typescript").createProgram;

package/lib/node/proxyCreateProgram.js

@@ -29,7 +29,7 @@ const objectEqual = (a, b) => {
     }
     return true;
 };
-function proxyCreateProgram(ts, original, getLanguagePlugins) {
+function proxyCreateProgram(ts, original, create) {
     const sourceFileSnapshots = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
     const parsedSourceFiles = new WeakMap();
     let lastOptions;
@@ -47,7 +47,13 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
                 || !objectEqual(options.options, lastOptions.options)) {
                 moduleResolutionCache = ts.createModuleResolutionCache(options.host.getCurrentDirectory(), options.host.getCanonicalFileName, options.options);
                 lastOptions = options;
-                languagePlugins = getLanguagePlugins(ts, options);
+                const created = create(ts, options);
+                if (Array.isArray(created)) {
+                    languagePlugins = created;
+                }
+                else {
+                    languagePlugins = created.languagePlugins;
+                }
                 language = (0, language_core_1.createLanguage)([
                     ...languagePlugins,
                     { getLanguageId: common_1.resolveFileLanguageId },
@@ -79,6 +85,9 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
                         language.scripts.delete(fileName);
                     }
                 });
+                if ('setup' in created) {
+                    created.setup?.(language);
+                }
             }
             const originalHost = options.host;
             const extensions = languagePlugins

package/lib/node/transform.d.ts

@@ -1,6 +1,7 @@
-import type { CodeInformation, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
+import type { CodeInformation, SourceScript } from '@volar/language-core';
 import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
+import type { TypeScriptServiceScript } from '../..';
 export declare function transformCallHierarchyItem(language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
 export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
 export declare function fillSourceFileText(language: Language<string>, sourceFile: ts.SourceFile): void;

package/lib/node/utils.d.ts

@@ -1,2 +1,3 @@
-import type { Language, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
+import type { Language, SourceScript } from '@volar/language-core';
+import type { TypeScriptServiceScript } from '../..';
 export declare function getServiceScript(language: Language<string>, fileName: string): [serviceScript: TypeScriptServiceScript, targetScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: undefined, targetScript: undefined];

package/lib/protocol/createProject.d.ts

@@ -1,5 +1,6 @@
-import { Language, TypeScriptExtraServiceScript } from '@volar/language-core';
+import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
+import type { TypeScriptExtraServiceScript } from '../..';
 import type { createSys } from './createSys';
 export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCurrentDirectory' | 'getCompilationSettings' | 'getProjectReferences' | 'getScriptFileNames' | 'getProjectVersion' | 'getScriptSnapshot'> {
 }

package/lib/quickstart/runTsc.d.ts

@@ -1,4 +1,7 @@
 import type * as ts from 'typescript';
-import type { LanguagePlugin } from '@volar/language-core';
-export declare let getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[];
+import type { Language, LanguagePlugin } from '@volar/language-core';
+export declare let getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[] | {
+    plugins: LanguagePlugin<string>[];
+    setup?(language: Language<string>): void;
+};
 export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.5-alpha.1",
+	"version": "2.4.0-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.5-alpha.1",
+		"@volar/language-core": "2.4.0-alpha.0",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.3.5-alpha.1"
+		"@volar/language-service": "2.4.0-alpha.0"
 	},
-	"gitHead": "111bfae316c66a087a497e12740d46fc2c74cab0"
+	"gitHead": "007fc74c461e2fd3fb269bf4f3924cc23c35ba56"
 }