refactor: no longer emit js files to out directory

.gitignore

@@ -1,3 +1,6 @@
 out
 node_modules
 *.tsbuildinfo
+*.d.ts
+*.js
+*.map

.vscode/settings.json

@@ -3,7 +3,6 @@
 	"editor.insertSpaces": false,
 	"editor.detectIndentation": false,
 	"files.insertFinalNewline": true,
-	"files.trimFinalNewlines": true,
 	"json.format.keepLines": true,
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"[typescript]": {
@@ -17,5 +16,13 @@
 	},
 	"[jsonc]": {
 		"editor.defaultFormatter": "vscode.json-language-features"
+	},
+	"files.exclude": {
+		"packages/*/*.d.ts": true,
+		"packages/*/*.js": true,
+		"packages/*/*.map": true,
+		"packages/*/lib/**/*.d.ts": true,
+		"packages/*/lib/**/*.js": true,
+		"packages/*/lib/**/*.map": true
 	}
 }

packages/css/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/emmet/package.json

@@ -37,6 +37,6 @@
 		}
 	},
 	"browser": {
-		"./out/index.js": "./out/empty.js"
+		"./index.js": "./empty.js"
 	}
 }

packages/emmet/tsconfig.json

@@ -1,10 +1,6 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 	"references": [
 		{ "path": "../html/tsconfig.json" },
 	],

packages/eslint/tsconfig.json

@@ -1,10 +1,6 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 	"references": [
 		{ "path": "../typescript/tsconfig.json" },
 	],

packages/html/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/json/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/markdown/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/prettier/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/pretty-ts-errors/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/prettyhtml/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/pug-beautify/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/pug/src/index.ts → packages/pug/index.ts

@@ -2,7 +2,7 @@ import { transformDocumentSymbol, type Diagnostic, type DiagnosticSeverity, type
 import { create as createHtmlService } from 'volar-service-html';
 import type * as html from 'vscode-html-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import * as pug from './languageService';
+import * as pug from './lib/languageService';
 
 export interface Provide {
 	'pug/pugDocument': (document: TextDocument) => pug.PugDocument | undefined;

packages/pug/package.json

@@ -36,6 +36,6 @@
 		"@types/node": "latest"
 	},
 	"browser": {
-		"./out/index.js": "./out/empty.js"
+		"./index.js": "./empty.js"
 	}
 }

packages/pug/tsconfig.json

@@ -1,10 +1,6 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 	"references": [
 		{ "path": "../html/tsconfig.json" },
 	],

packages/sass-formatter/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/tsconfig/tsconfig.json

@@ -1,8 +1,4 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 }

packages/tslint/tsconfig.json

@@ -1,10 +1,6 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 	"references": [
 		{ "path": "../typescript/tsconfig.json" },
 	],

packages/typescript-twoslash-queries/tsconfig.json

@@ -1,10 +1,6 @@
 {
 	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"outDir": "out",
-		"rootDir": "src",
-	},
-	"include": [ "src" ],
+	"include": [ "*", "lib/**/*" ],
 	"references": [
 		{ "path": "../typescript/tsconfig.json" },
 	],

packages/typescript/src/index.ts → packages/typescript/index.ts

@@ -2,37 +2,37 @@ import type { CancellationToken, CompletionList, CompletionTriggerKind, FileChan
 import * as semver from 'semver';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { getConfigTitle, isJsonDocument, isTsDocument } from './shared';
+import { getConfigTitle, isJsonDocument, isTsDocument } from './lib/shared';
 
 import { getDocumentRegistry } from '@volar/typescript';
 import * as tsFaster from 'typescript-auto-import-cache';
-import * as _callHierarchy from './features/callHierarchy';
-import * as codeActions from './features/codeAction';
-import * as codeActionResolve from './features/codeActionResolve';
-import * as completions from './features/completions/basic';
-import * as directiveCommentCompletions from './features/completions/directiveComment';
-import * as jsDocCompletions from './features/completions/jsDoc';
-import * as completionResolve from './features/completions/resolve';
-import * as definitions from './features/definition';
-import * as diagnostics from './features/diagnostics';
-import * as documentHighlight from './features/documentHighlight';
-import * as documentSymbol from './features/documentSymbol';
-import * as fileReferences from './features/fileReferences';
-import * as fileRename from './features/fileRename';
-import * as foldingRanges from './features/foldingRanges';
-import * as formatting from './features/formatting';
-import * as hover from './features/hover';
-import * as implementation from './features/implementation';
-import * as inlayHints from './features/inlayHints';
-import * as prepareRename from './features/prepareRename';
-import * as references from './features/references';
-import * as rename from './features/rename';
-import * as selectionRanges from './features/selectionRanges';
-import * as semanticTokens from './features/semanticTokens';
-import * as signatureHelp from './features/signatureHelp';
-import * as typeDefinitions from './features/typeDefinition';
-import * as workspaceSymbols from './features/workspaceSymbol';
-import type { SharedContext } from './types';
+import * as _callHierarchy from './lib/features/callHierarchy';
+import * as codeActions from './lib/features/codeAction';
+import * as codeActionResolve from './lib/features/codeActionResolve';
+import * as completions from './lib/features/completions/basic';
+import * as directiveCommentCompletions from './lib/features/completions/directiveComment';
+import * as jsDocCompletions from './lib/features/completions/jsDoc';
+import * as completionResolve from './lib/features/completions/resolve';
+import * as definitions from './lib/features/definition';
+import * as diagnostics from './lib/features/diagnostics';
+import * as documentHighlight from './lib/features/documentHighlight';
+import * as documentSymbol from './lib/features/documentSymbol';
+import * as fileReferences from './lib/features/fileReferences';
+import * as fileRename from './lib/features/fileRename';
+import * as foldingRanges from './lib/features/foldingRanges';
+import * as formatting from './lib/features/formatting';
+import * as hover from './lib/features/hover';
+import * as implementation from './lib/features/implementation';
+import * as inlayHints from './lib/features/inlayHints';
+import * as prepareRename from './lib/features/prepareRename';
+import * as references from './lib/features/references';
+import * as rename from './lib/features/rename';
+import * as selectionRanges from './lib/features/selectionRanges';
+import * as semanticTokens from './lib/features/semanticTokens';
+import * as signatureHelp from './lib/features/signatureHelp';
+import * as typeDefinitions from './lib/features/typeDefinition';
+import * as workspaceSymbols from './lib/features/workspaceSymbol';
+import type { SharedContext } from './lib/types';
 
 export * from '@volar/typescript';
 

packages/typescript/src/utils/previewer.ts → packages/typescript/lib/utils/previewer.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import type * as Proto from '../protocol';
 import type { SharedContext } from '../types';
 
 export interface IFilePathToResourceConverter {
@@ -33,7 +32,7 @@ function processInlineTags(text: string): string {
 }
 
 function getTagBodyText(
-	tag: Proto.JSDocTagInfo,
+	tag: ts.server.protocol.JSDocTagInfo,
 	filePathConverter: IFilePathToResourceConverter,
 	ctx: SharedContext,
 ): string | undefined {
@@ -76,7 +75,7 @@ function getTagBodyText(
 }
 
 function getTagDocumentation(
-	tag: Proto.JSDocTagInfo,
+	tag: ts.server.protocol.JSDocTagInfo,
 	filePathConverter: IFilePathToResourceConverter,
 	ctx: SharedContext,
 ): string | undefined {
@@ -107,7 +106,7 @@ function getTagDocumentation(
 }
 
 export function plainWithLinks(
-	parts: readonly Proto.SymbolDisplayPart[] | string,
+	parts: readonly ts.server.protocol.SymbolDisplayPart[] | string,
 	filePathConverter: IFilePathToResourceConverter,
 	ctx: SharedContext,
 ): string {
@@ -118,7 +117,7 @@ export function plainWithLinks(
  * Convert `@link` inline tags to markdown links
  */
 function convertLinkTags(
-	parts: readonly Proto.SymbolDisplayPart[] | string | undefined,
+	parts: readonly ts.server.protocol.SymbolDisplayPart[] | string | undefined,
 	filePathConverter: IFilePathToResourceConverter,
 	ctx: SharedContext,
 ): string {
@@ -132,7 +131,7 @@ function convertLinkTags(
 
 	const out: string[] = [];
 
-	let currentLink: { name?: string, target?: Proto.FileSpan, text?: string; } | undefined;
+	let currentLink: { name?: string, target?: ts.server.protocol.FileSpan, text?: string; } | undefined;
 	for (const part of parts) {
 		switch (part.kind) {
 			case 'link':
@@ -184,7 +183,7 @@ function convertLinkTags(
 			case 'linkName':
 				if (currentLink) {
 					currentLink.name = part.text;
-					currentLink.target = (part as Proto.JSDocLinkDisplayPart).target;
+					currentLink.target = (part as ts.server.protocol.JSDocLinkDisplayPart).target;
 				}
 				break;
 
@@ -211,7 +210,7 @@ export function tagsMarkdownPreview(
 }
 
 export function markdownDocumentation(
-	documentation: Proto.SymbolDisplayPart[] | string | undefined,
+	documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined,
 	tags: ts.JSDocTagInfo[] | undefined,
 	filePathConverter: IFilePathToResourceConverter,
 	ctx: SharedContext,
@@ -221,7 +220,7 @@ export function markdownDocumentation(
 
 export function addMarkdownDocumentation(
 	out: string,
-	documentation: Proto.SymbolDisplayPart[] | string | undefined,
+	documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined,
 	tags: ts.JSDocTagInfo[] | undefined,
 	converter: IFilePathToResourceConverter,
 	ctx: SharedContext,

packages/typescript/src/utils/snippetForFunctionCall.ts → packages/typescript/lib/utils/snippetForFunctionCall.ts

@@ -1,9 +1,9 @@
-import type * as Proto from '../protocol';
+import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as PConst from '../protocol.const';
 
 export function snippetForFunctionCall(
 	item: { insertText?: string; label: string; },
-	displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
+	displayParts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>
 ): { snippet: string; parameterCount: number; } {
 	if (item.insertText && typeof item.insertText !== 'string') {
 		return { snippet: item.insertText, parameterCount: 0 };
@@ -24,7 +24,7 @@ export function snippetForFunctionCall(
 
 	function appendJoinedPlaceholders(
 		snippet: string,
-		parts: ReadonlyArray<Proto.SymbolDisplayPart>,
+		parts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>,
 		joiner: string
 	) {
 		for (let i = 0; i < parts.length; ++i) {
@@ -39,14 +39,14 @@ export function snippetForFunctionCall(
 }
 
 interface ParamterListParts {
-	readonly parts: ReadonlyArray<Proto.SymbolDisplayPart>;
+	readonly parts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>;
 	readonly hasOptionalParameters: boolean;
 }
 
 function getParameterListParts(
-	displayParts: ReadonlyArray<Proto.SymbolDisplayPart>
+	displayParts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>
 ): ParamterListParts {
-	const parts: Proto.SymbolDisplayPart[] = [];
+	const parts: ts.server.protocol.SymbolDisplayPart[] = [];
 	let isInMethod = false;
 	let hasOptionalParameters = false;
 	let parenCount = 0;