Make tsserver a thin wrapper around tsserverlibrary

Author: jakebailey

Herebyfile.mjs

@@ -177,6 +177,10 @@ function createBundler(entrypoint, outfile, taskOptions = {}) {
             sourcesContent: false,
             treeShaking: taskOptions.treeShaking,
             packages: "external",
+            external: ["typescript", "./typescript.js"],
+            alias: {
+                typescript: "./typescript.js",
+            },
             logLevel: "warning",
             // legalComments: "none", // If we add copyright headers to the source files, uncomment.
         };
@@ -384,7 +388,7 @@ const { main: tsserver, watch: watchTsserver } = entrypointBuildTask({
     srcEntrypoint: "./src/tsserver/server.ts",
     builtEntrypoint: "./built/local/tsserver/server.js",
     output: "./built/local/tsserver.js",
-    mainDeps: [generateLibs],
+    mainDeps: [generateLibs, services],
 });
 export { tsserver, watchTsserver };
 

src/tsconfig-eslint.json

@@ -1,6 +1,9 @@
 {
     "extends": "./tsconfig-base",
     "compilerOptions": {
-        "types": ["node", "mocha", "chai"]
+        "types": ["node", "mocha", "chai"],
+        "paths": {
+            "typescript": ["./typescript/typescript"]
+        }
     }
 }

src/tsserver/_namespaces/ts.server.ts

@@ -1,18 +1,12 @@
-import { LanguageServiceMode } from "./_namespaces/ts";
-import {
-    Logger,
-    LogLevel,
-    ServerCancellationToken,
-    SessionOptions,
-} from "./_namespaces/ts.server";
+import * as ts from "typescript";
 
 /** @internal */
 export function getLogLevel(level: string | undefined) {
     if (level) {
         const l = level.toLowerCase();
-        for (const name in LogLevel) {
+        for (const name in ts.server.LogLevel) {
             if (isNaN(+name) && l === name.toLowerCase()) {
-                return LogLevel[name] as any as LogLevel;
+                return ts.server.LogLevel[name] as any as ts.server.LogLevel;
             }
         }
     }
@@ -21,22 +15,22 @@ export function getLogLevel(level: string | undefined) {
 
 /** @internal */
 export interface StartSessionOptions {
-    globalPlugins: SessionOptions["globalPlugins"];
-    pluginProbeLocations: SessionOptions["pluginProbeLocations"];
-    allowLocalPluginLoads: SessionOptions["allowLocalPluginLoads"];
-    useSingleInferredProject: SessionOptions["useSingleInferredProject"];
-    useInferredProjectPerProjectRoot: SessionOptions["useInferredProjectPerProjectRoot"];
-    suppressDiagnosticEvents: SessionOptions["suppressDiagnosticEvents"];
-    noGetErrOnBackgroundUpdate: SessionOptions["noGetErrOnBackgroundUpdate"];
-    serverMode: SessionOptions["serverMode"];
+    globalPlugins: ts.server.SessionOptions["globalPlugins"];
+    pluginProbeLocations: ts.server.SessionOptions["pluginProbeLocations"];
+    allowLocalPluginLoads: ts.server.SessionOptions["allowLocalPluginLoads"];
+    useSingleInferredProject: ts.server.SessionOptions["useSingleInferredProject"];
+    useInferredProjectPerProjectRoot: ts.server.SessionOptions["useInferredProjectPerProjectRoot"];
+    suppressDiagnosticEvents: ts.server.SessionOptions["suppressDiagnosticEvents"];
+    noGetErrOnBackgroundUpdate: ts.server.SessionOptions["noGetErrOnBackgroundUpdate"];
+    serverMode: ts.server.SessionOptions["serverMode"];
 }
 
 /** @internal */
 export interface StartInput {
     args: readonly string[];
-    logger: Logger;
-    cancellationToken: ServerCancellationToken;
-    serverMode: LanguageServiceMode | undefined;
+    logger: ts.server.Logger;
+    cancellationToken: ts.server.ServerCancellationToken;
+    serverMode: ts.LanguageServiceMode | undefined;
     unknownServerMode?: string;
-    startSession: (option: StartSessionOptions, logger: Logger, cancellationToken: ServerCancellationToken) => void;
+    startSession: (option: StartSessionOptions, logger: ts.server.Logger, cancellationToken: ts.server.ServerCancellationToken) => void;
 }