chore: tidy svelte example

Author: johnsoncodehk

examples/svelte-language-core/src/index.ts

@@ -13,19 +13,19 @@ export const languageModule: LanguageModule = {
 				fileName,
 				snapshot,
 				kind: FileKind.TextFile,
-				embeddedFiles: getEmbeddeds(fileName, snapshot.getText(0, snapshot.getLength())),
+				embeddedFiles: getEmbeddedFiles(fileName, snapshot.getText(0, snapshot.getLength())),
 				capabilities: FileCapabilities.full,
 				mappings: [],
 			};
 		}
 	},
 	updateFile(sourceFile, snapshot) {
 		sourceFile.snapshot = snapshot;
-		sourceFile.embeddedFiles = getEmbeddeds(sourceFile.fileName, sourceFile.snapshot.getText(0, sourceFile.snapshot.getLength()));
+		sourceFile.embeddedFiles = getEmbeddedFiles(sourceFile.fileName, sourceFile.snapshot.getText(0, sourceFile.snapshot.getLength()));
 	},
 };
 
-function getEmbeddeds(fileName: string, text: string) {
+function getEmbeddedFiles(fileName: string, text: string) {
 
 	try {
 		const tsx = svelte2tsx(text, {
@@ -88,9 +88,9 @@ function getEmbeddeds(fileName: string, text: string) {
 			}
 		}
 
-		const embeddeds: VirtualFile[] = [];
+		const embeddedFiles: VirtualFile[] = [];
 
-		embeddeds.push({
+		embeddedFiles.push({
 			fileName: fileName + '.ts',
 			snapshot: {
 				getText(start, end) {
@@ -114,7 +114,7 @@ function getEmbeddeds(fileName: string, text: string) {
 			embeddedFiles: [],
 		});
 
-		return embeddeds;
+		return embeddedFiles;
 	}
 	catch {
 		return [];

examples/svelte-language-server/src/index.ts

@@ -1,29 +1,16 @@
 import { languageModule } from '@volar-examples/svelte-language-core';
-import useTsPlugin from '@volar-plugins/typescript';
-import { createConnection, startLanguageServer, LanguageServerPlugin } from '@volar/language-server/node';
+import createTsPlugin from '@volar-plugins/typescript';
+import { createConnection, startLanguageServer } from '@volar/language-server/node';
 
-const plugin: LanguageServerPlugin = () => ({
-	extraFileExtensions: [{ extension: 'svelte', isMixedContent: true, scriptKind: 7 }],
-	semanticService: {
+startLanguageServer(
+	createConnection(),
+	() => ({
+		extraFileExtensions: [{ extension: 'svelte', isMixedContent: true, scriptKind: 7 }],
 		getLanguageModules() {
 			return [languageModule];
 		},
 		getLanguageServicePlugins() {
-			return [
-				useTsPlugin(),
-			];
+			return [createTsPlugin()];
 		},
-	},
-	syntacticService: {
-		getLanguageModules() {
-			return [languageModule];
-		},
-		getLanguageServicePlugins() {
-			return [
-				useTsPlugin(),
-			];
-		}
-	},
-});
-
-startLanguageServer(createConnection(), plugin);
+	}),
+);

examples/svelte-tsc/bin/svelte-tsc.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 const fs = require('fs');
-
 const readFileSync = fs.readFileSync;
 const tscPath = require.resolve('typescript/lib/tsc');
-const proxyPath = require.resolve('../out/proxy');
+const proxyPath = require.resolve('../out/index.js');
 
 fs.readFileSync = (...args) => {
 	if (args[0] === tscPath) {
@@ -14,11 +13,8 @@ fs.readFileSync = (...args) => {
 		tryReplace(/supportedJSExtensions = .*(?=;)/, s => s + '.concat([[".svelte"]])');
 		tryReplace(/allSupportedExtensions = .*(?=;)/, s => s + '.concat([[".svelte"]])');
 
-		// proxy startTracing, dumpTracingLegend
-		tryReplace(/ = tracingEnabled\./g, ` = require(${JSON.stringify(proxyPath)}).loadTsLib().`);
-
 		// proxy createProgram apis
-		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyPath)}).createProgramProxy(...arguments);`);
+		tryReplace(/function createProgram\(.+\) {/, s => s + ` return require(${JSON.stringify(proxyPath)}).createProgram(...arguments);`);
 
 		return tsc;
 

examples/svelte-tsc/src/proxy.ts renamed to examples/svelte-tsc/src/index.ts

@@ -2,22 +2,16 @@ import * as ts from 'typescript/lib/tsserverlibrary';
 import * as svelte from '@volar-examples/svelte-language-core';
 import * as svelteTs from '@volar-examples/svelte-typescript';
 
-export function createProgramProxy(
-	options: ts.CreateProgramOptions, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
-	_options?: ts.CompilerOptions,
-	_host?: ts.CompilerHost,
-	_oldProgram?: ts.Program,
-	_configFileParsingDiagnostics?: readonly ts.Diagnostic[],
-) {
+export function createProgram(options: ts.CreateProgramOptions) {
 
 	if (!options.options.noEmit && !options.options.emitDeclarationOnly)
-		return doThrow('js emit is not supported');
+		throw toThrow('js emit is not supported');
 
 	if (!options.options.noEmit && options.options.noEmitOnError)
-		return doThrow('noEmitOnError is not supported');
+		throw toThrow('noEmitOnError is not supported');
 
 	if (!options.host)
-		return doThrow('!options.host');
+		throw toThrow('!options.host');
 
 	let program = options.oldProgram as any;
 
@@ -107,11 +101,7 @@ export function createProgramProxy(
 	return program;
 }
 
-export function loadTsLib() {
-	return ts;
-}
-
-function doThrow(msg: string) {
+function toThrow(msg: string) {
 	console.error(msg);
-	throw msg;
+	return msg;
 }

vue-language-tools/vue-tsc/src/index.ts

@@ -14,13 +14,7 @@ interface ProgramContext {
 	languageService: ReturnType<typeof vueTs.createLanguageService>,
 }
 
-export function createProgram(
-	options: ts.CreateProgramOptions, // rootNamesOrOptions: readonly string[] | CreateProgramOptions,
-	_options?: ts.CompilerOptions,
-	_host?: ts.CompilerHost,
-	_oldProgram?: ts.Program,
-	_configFileParsingDiagnostics?: readonly ts.Diagnostic[],
-) {
+export function createProgram(options: ts.CreateProgramOptions) {
 
 	if (!options.options.noEmit && !options.options.emitDeclarationOnly)
 		throw toThrow('js emit is not supported');