@typespec/compiler 1.5.0-dev.0 → 1.5.0-dev.10
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.
- package/dist/manifest.js +2 -2
- package/dist/src/core/code-fixes.d.ts +1 -0
- package/dist/src/core/code-fixes.d.ts.map +1 -1
- package/dist/src/core/code-fixes.js +6 -0
- package/dist/src/core/code-fixes.js.map +1 -1
- package/dist/src/core/helpers/index.d.ts +1 -0
- package/dist/src/core/helpers/index.d.ts.map +1 -1
- package/dist/src/core/helpers/index.js +1 -0
- package/dist/src/core/helpers/index.js.map +1 -1
- package/dist/src/core/helpers/raw-text-cache.d.ts +5 -0
- package/dist/src/core/helpers/raw-text-cache.d.ts.map +1 -0
- package/dist/src/core/helpers/raw-text-cache.js +34 -0
- package/dist/src/core/helpers/raw-text-cache.js.map +1 -0
- package/dist/src/core/helpers/type-name-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/type-name-utils.js +14 -3
- package/dist/src/core/helpers/type-name-utils.js.map +1 -1
- package/dist/src/core/linter-rules/unused-using.rule.js +1 -1
- package/dist/src/core/linter-rules/unused-using.rule.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/internals/index.d.ts +1 -0
- package/dist/src/internals/index.d.ts.map +1 -1
- package/dist/src/internals/index.js +1 -0
- package/dist/src/internals/index.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +1 -1
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +3 -1
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/server/client-config-provider.d.ts +1 -0
- package/dist/src/server/client-config-provider.d.ts.map +1 -1
- package/dist/src/server/client-config-provider.js +3 -10
- package/dist/src/server/client-config-provider.js.map +1 -1
- package/dist/src/server/compile-service.d.ts +7 -7
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +56 -85
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/completion.js +6 -6
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/constants.d.ts +5 -4
- package/dist/src/server/constants.d.ts.map +1 -1
- package/dist/src/server/constants.js +5 -4
- package/dist/src/server/constants.js.map +1 -1
- package/dist/src/server/diagnostics.d.ts.map +1 -1
- package/dist/src/server/diagnostics.js +23 -8
- package/dist/src/server/diagnostics.js.map +1 -1
- package/dist/src/server/entrypoint-resolver.d.ts +5 -0
- package/dist/src/server/entrypoint-resolver.d.ts.map +1 -0
- package/dist/src/server/entrypoint-resolver.js +67 -0
- package/dist/src/server/entrypoint-resolver.js.map +1 -0
- package/dist/src/server/file-service.d.ts +4 -1
- package/dist/src/server/file-service.d.ts.map +1 -1
- package/dist/src/server/file-service.js +30 -0
- package/dist/src/server/file-service.js.map +1 -1
- package/dist/src/server/server-compile-manager.d.ts +55 -0
- package/dist/src/server/server-compile-manager.d.ts.map +1 -0
- package/dist/src/server/server-compile-manager.js +269 -0
- package/dist/src/server/server-compile-manager.js.map +1 -0
- package/dist/src/server/server.js +1 -0
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +136 -39
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/type-details.js +3 -3
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/type-signature.js +29 -6
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/src/server/types.d.ts +7 -3
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/server/types.js.map +1 -1
- package/dist/src/server/update-manager.d.ts +23 -4
- package/dist/src/server/update-manager.d.ts.map +1 -1
- package/dist/src/server/update-manager.js +110 -18
- package/dist/src/server/update-manager.js.map +1 -1
- package/dist/src/testing/test-server-host.d.ts.map +1 -1
- package/dist/src/testing/test-server-host.js +15 -1
- package/dist/src/testing/test-server-host.js.map +1 -1
- package/dist/src/testing/tester.d.ts.map +1 -1
- package/dist/src/testing/tester.js +1 -1
- package/dist/src/testing/tester.js.map +1 -1
- package/dist/src/utils/io.d.ts +2 -2
- package/dist/src/utils/io.d.ts.map +1 -1
- package/dist/src/utils/io.js +1 -1
- package/dist/src/utils/io.js.map +1 -1
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +3 -0
- package/dist/src/utils/misc.js.map +1 -1
- package/lib/std/decorators.tsp +6 -1
- package/package.json +1 -1
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { getSymNode } from "../core/binder.js";
|
|
2
2
|
import { compilerAssert } from "../core/diagnostics.js";
|
|
3
|
+
import { printTypeSpecNode } from "../core/formatter.js";
|
|
4
|
+
import { getRawTextWithCache } from "../core/helpers/raw-text-cache.js";
|
|
3
5
|
import { printIdentifier } from "../core/helpers/syntax-utils.js";
|
|
4
6
|
import { getEntityName, getTypeName, isStdNamespace } from "../core/helpers/type-name-utils.js";
|
|
5
7
|
import { getFullyQualifiedSymbolName } from "../core/type-utils.js";
|
|
6
8
|
import { SyntaxKind, } from "../core/types.js";
|
|
7
9
|
import { walkPropertiesInherited } from "../index.js";
|
|
8
10
|
/** @internal */
|
|
9
|
-
export function getSymbolSignature(program, sym, options = {
|
|
11
|
+
export async function getSymbolSignature(program, sym, options = {
|
|
10
12
|
includeBody: false,
|
|
11
13
|
}) {
|
|
12
14
|
const decl = getSymNode(sym);
|
|
13
15
|
switch (decl?.kind) {
|
|
14
16
|
case SyntaxKind.AliasStatement:
|
|
15
|
-
return fence(`alias ${getAliasSignature(decl)}`);
|
|
17
|
+
return fence(`alias ${await getAliasSignature(decl)}`);
|
|
16
18
|
}
|
|
17
19
|
const entity = sym.type ?? program.checker.getTypeOrValueForNode(decl);
|
|
18
20
|
return getEntitySignature(sym, entity, options);
|
|
@@ -92,8 +94,17 @@ function getInterfaceSignature(type, includeBody) {
|
|
|
92
94
|
return `${type.kind.toLowerCase()} ${getPrintableTypeName(type)} {\n${opDesc.join("\n")}\n}`;
|
|
93
95
|
}
|
|
94
96
|
else {
|
|
95
|
-
|
|
97
|
+
if (type.node &&
|
|
98
|
+
type.node.kind === SyntaxKind.InterfaceStatement &&
|
|
99
|
+
type.node.templateParameters) {
|
|
100
|
+
type.node.templateParameters.forEach((t) => {
|
|
101
|
+
if (t.default) {
|
|
102
|
+
getRawTextWithCache(t);
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
}
|
|
96
106
|
}
|
|
107
|
+
return `${type.kind.toLowerCase()} ${getPrintableTypeName(type)}`;
|
|
97
108
|
}
|
|
98
109
|
/**
|
|
99
110
|
* All properties from 'extends' and 'is' will be included if includeBody is true.
|
|
@@ -108,8 +119,15 @@ function getModelSignature(type, includeBody) {
|
|
|
108
119
|
return `${type.kind.toLowerCase()} ${getPrintableTypeName(type)}{\n${propDesc.map((d) => `${d};`).join("\n")}\n}`;
|
|
109
120
|
}
|
|
110
121
|
else {
|
|
111
|
-
|
|
122
|
+
if (type.node && type.node.kind === SyntaxKind.ModelStatement && type.node.templateParameters) {
|
|
123
|
+
type.node.templateParameters.forEach((t) => {
|
|
124
|
+
if (t.default) {
|
|
125
|
+
getRawTextWithCache(t);
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}
|
|
112
129
|
}
|
|
130
|
+
return `${type.kind.toLowerCase()} ${getPrintableTypeName(type)}`;
|
|
113
131
|
}
|
|
114
132
|
function getFunctionParameterSignature(parameter) {
|
|
115
133
|
const rest = parameter.rest ? "..." : "";
|
|
@@ -143,9 +161,14 @@ function getEnumMemberSignature(member) {
|
|
|
143
161
|
? `${ns}${printIdentifier(member.name, "allow-reserved")}`
|
|
144
162
|
: `${ns}${printIdentifier(member.name, "allow-reserved")}: ${value}`;
|
|
145
163
|
}
|
|
146
|
-
function getAliasSignature(alias) {
|
|
164
|
+
async function getAliasSignature(alias) {
|
|
147
165
|
const fullName = getFullyQualifiedSymbolName(alias.symbol);
|
|
148
|
-
const args = alias.templateParameters.map((t) =>
|
|
166
|
+
const args = await Promise.all(alias.templateParameters.map(async (t, index) => {
|
|
167
|
+
if (t.default) {
|
|
168
|
+
getRawTextWithCache(t.default);
|
|
169
|
+
}
|
|
170
|
+
return await printTypeSpecNode(t);
|
|
171
|
+
}));
|
|
149
172
|
return args.length === 0 ? fullName : `${fullName}<${args.join(", ")}>`;
|
|
150
173
|
}
|
|
151
174
|
function getQualifier(parent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-signature.js","sourceRoot":"","sources":["../../../src/server/type-signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEhG,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAWL,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAStD,gBAAgB;AAChB,MAAM,UAAU,kBAAkB,
|
|
1
|
+
{"version":3,"file":"type-signature.js","sourceRoot":"","sources":["../../../src/server/type-signature.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import type { CompilerHost, Diagnostic, NoTarget, SourceFile, SourceLocation, Ty
|
|
|
6
6
|
import { LoadedCoreTemplates } from "../init/core-templates.js";
|
|
7
7
|
import { EmitterTemplate, InitTemplate, InitTemplateLibrarySpec } from "../init/init-template.js";
|
|
8
8
|
import { ScaffoldingConfig } from "../init/scaffold.js";
|
|
9
|
+
import { CompileTracker, ServerCompileOptions } from "./server-compile-manager.js";
|
|
9
10
|
export type ServerLogLevel = "trace" | "debug" | "info" | "warning" | "error";
|
|
10
11
|
export interface ServerLog {
|
|
11
12
|
level: ServerLogLevel;
|
|
@@ -23,8 +24,9 @@ export interface ServerHost {
|
|
|
23
24
|
export interface CompileResult {
|
|
24
25
|
readonly program: Program;
|
|
25
26
|
readonly document: TextDocument | undefined;
|
|
26
|
-
readonly script: TypeSpecScriptNode;
|
|
27
|
+
readonly script: TypeSpecScriptNode | undefined;
|
|
27
28
|
readonly optionsFromConfig: CompilerOptions;
|
|
29
|
+
readonly tracker: CompileTracker;
|
|
28
30
|
}
|
|
29
31
|
export interface ServerDiagnostic extends Diagnostic {
|
|
30
32
|
target: (SourceLocation & {
|
|
@@ -43,7 +45,7 @@ export interface InternalCompileResult {
|
|
|
43
45
|
export interface Server {
|
|
44
46
|
readonly pendingMessages: readonly ServerLog[];
|
|
45
47
|
readonly workspaceFolders: readonly ServerWorkspaceFolder[];
|
|
46
|
-
compile(document: TextDocument | TextDocumentIdentifier): Promise<CompileResult | undefined>;
|
|
48
|
+
compile(document: TextDocument | TextDocumentIdentifier, additionalOptions: CompilerOptions | undefined, serverCompileOptions: ServerCompileOptions): Promise<CompileResult | undefined>;
|
|
47
49
|
initialize(params: InitializeParams): Promise<InitializeResult>;
|
|
48
50
|
initialized(params: InitializedParams): void;
|
|
49
51
|
workspaceFoldersChanged(e: WorkspaceFoldersChangeEvent): Promise<void>;
|
|
@@ -58,14 +60,16 @@ export interface Server {
|
|
|
58
60
|
renameFiles(params: RenameFilesParams): Promise<void>;
|
|
59
61
|
getSemanticTokens(params: SemanticTokensParams): Promise<SemanticToken[]>;
|
|
60
62
|
buildSemanticTokens(params: SemanticTokensParams): Promise<SemanticTokens>;
|
|
61
|
-
checkChange(change: TextDocumentChangeEvent<TextDocument>):
|
|
63
|
+
checkChange(change: TextDocumentChangeEvent<TextDocument>): void;
|
|
62
64
|
getHover(params: HoverParams): Promise<Hover>;
|
|
63
65
|
getSignatureHelp(params: SignatureHelpParams): Promise<SignatureHelp | undefined>;
|
|
64
66
|
getFoldingRanges(getFoldingRanges: FoldingRangeParams): Promise<FoldingRange[]>;
|
|
65
67
|
getDocumentSymbols(params: DocumentSymbolParams): Promise<DocumentSymbol[]>;
|
|
66
68
|
documentClosed(change: TextDocumentChangeEvent<TextDocument>): void;
|
|
69
|
+
documentOpened(change: TextDocumentChangeEvent<TextDocument>): void;
|
|
67
70
|
getCodeActions(params: CodeActionParams): Promise<CodeAction[]>;
|
|
68
71
|
executeCommand(params: ExecuteCommandParams): Promise<void>;
|
|
72
|
+
reportDiagnostics({ program, document, optionsFromConfig }: CompileResult): void;
|
|
69
73
|
log(log: ServerLog): void;
|
|
70
74
|
getInitProjectContext(): Promise<InitProjectContext>;
|
|
71
75
|
validateInitProjectTemplate(param: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/server/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,2BAA2B,EAC3B,wBAAwB,EACxB,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EAClB,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EACvB,sBAAsB,EACtB,aAAa,EACb,eAAe,EACf,2BAA2B,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,cAAc,EACd,kBAAkB,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/server/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/server/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/server/types.ts"],"names":[],"mappings":"AAyJA,MAAM,CAAN,IAAY,iBAwBX;AAxBD,WAAY,iBAAiB;IAC3B,mEAAS,CAAA;IACT,yDAAI,CAAA;IACJ,2DAAK,CAAA;IACL,yDAAI,CAAA;IACJ,mEAAS,CAAA;IACT,6DAAM,CAAA;IACN,2EAAa,CAAA;IACb,mEAAS,CAAA;IACT,iEAAQ,CAAA;IACR,iEAAQ,CAAA;IACR,sEAAU,CAAA;IACV,4DAAK,CAAA;IACL,kEAAQ,CAAA;IACR,8DAAM,CAAA;IACN,4DAAK,CAAA;IACL,gEAAO,CAAA;IACP,gEAAO,CAAA;IACP,8DAAM,CAAA;IACN,8DAAM,CAAA;IACN,8DAAM,CAAA;IACN,kEAAQ,CAAA;IAER,4EAAa,CAAA;AACf,CAAC,EAxBW,iBAAiB,KAAjB,iBAAiB,QAwB5B"}
|
|
@@ -1,11 +1,29 @@
|
|
|
1
|
+
import { TextDocumentIdentifier } from "vscode-languageserver";
|
|
1
2
|
import { TextDocument } from "vscode-languageserver-textdocument";
|
|
3
|
+
import { ServerLog } from "./types.js";
|
|
4
|
+
interface PendingUpdate {
|
|
5
|
+
latest: TextDocument | TextDocumentIdentifier;
|
|
6
|
+
latestUpdateTimestamp: number;
|
|
7
|
+
}
|
|
8
|
+
export type UpdateType = "opened" | "changed" | "closed" | "renamed";
|
|
9
|
+
type UpdateCallback = (updates: PendingUpdate[]) => Promise<void>;
|
|
2
10
|
/**
|
|
3
11
|
* Track file updates and recompile the affected files after some debounce time.
|
|
4
12
|
*/
|
|
5
|
-
export declare class UpdateManger
|
|
13
|
+
export declare class UpdateManger {
|
|
6
14
|
#private;
|
|
7
|
-
|
|
8
|
-
|
|
15
|
+
private _log;
|
|
16
|
+
constructor(log: (sl: ServerLog) => void);
|
|
17
|
+
setCallback(callback: UpdateCallback): void;
|
|
18
|
+
get docChangedVersion(): number;
|
|
19
|
+
private bumpDocChangedVersion;
|
|
20
|
+
private pushDocChangedTimestamp;
|
|
21
|
+
private readonly WINDOW;
|
|
22
|
+
private readonly DEFAULT_DELAY;
|
|
23
|
+
private readonly DELAY_CANDIDATES;
|
|
24
|
+
private getWindowedDocChangedTimesteps;
|
|
25
|
+
private getAdaptiveDebounceDelay;
|
|
26
|
+
scheduleUpdate(document: TextDocument | TextDocumentIdentifier, UpdateType: UpdateType): void;
|
|
9
27
|
}
|
|
10
28
|
/**
|
|
11
29
|
* Debounces a function but also waits at minimum the specified number of milliseconds until
|
|
@@ -15,5 +33,6 @@ export declare class UpdateManger<T> {
|
|
|
15
33
|
* @param fn The function
|
|
16
34
|
* @param milliseconds Number of milliseconds to debounce/throttle
|
|
17
35
|
*/
|
|
18
|
-
export declare function debounceThrottle(fn: () => void,
|
|
36
|
+
export declare function debounceThrottle(fn: () => void | Promise<void>, getDelay: () => number, log: (sl: ServerLog) => void): () => void;
|
|
37
|
+
export {};
|
|
19
38
|
//# sourceMappingURL=update-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-manager.d.ts","sourceRoot":"","sources":["../../../src/server/update-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-manager.d.ts","sourceRoot":"","sources":["../../../src/server/update-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,UAAU,aAAa;IACrB,MAAM,EAAE,YAAY,GAAG,sBAAsB,CAAC;IAC9C,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;AAErE,KAAK,cAAc,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAClE;;GAEG;AACH,qBAAa,YAAY;;IAQvB,OAAO,CAAC,IAAI,CAA0B;gBAE1B,GAAG,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI;IAsBjC,WAAW,CAAC,QAAQ,EAAE,cAAc;IAI3C,IAAW,iBAAiB,WAE3B;IAED,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAO;IAGrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAiB/B;IAEF,OAAO,CAAC,8BAA8B;IAQtC,OAAO,CAAC,wBAAwB,CAS9B;IAEK,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,sBAAsB,EAAE,UAAU,EAAE,UAAU;CAuB9F;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,MAAM,MAAM,EACtB,GAAG,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,GAC3B,MAAM,IAAI,CAwCZ"}
|
|
@@ -1,33 +1,104 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ENABLE_UPDATE_MANAGER_LOGGING } from "./constants.js";
|
|
2
2
|
/**
|
|
3
3
|
* Track file updates and recompile the affected files after some debounce time.
|
|
4
4
|
*/
|
|
5
5
|
export class UpdateManger {
|
|
6
6
|
#pendingUpdates = new Map();
|
|
7
7
|
#updateCb;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
// overall version which should be bumped for any actual doc change
|
|
9
|
+
#docChangedVersion = 0;
|
|
10
|
+
#scheduleBatchUpdate;
|
|
11
|
+
#docChangedTimesteps = [];
|
|
12
|
+
_log;
|
|
13
|
+
constructor(log) {
|
|
14
|
+
this._log =
|
|
15
|
+
typeof process !== "undefined" &&
|
|
16
|
+
process?.env?.[ENABLE_UPDATE_MANAGER_LOGGING]?.toLowerCase() === "true"
|
|
17
|
+
? (sl) => {
|
|
18
|
+
log({ ...sl, message: `#FromUpdateManager: ${sl.message}` });
|
|
19
|
+
}
|
|
20
|
+
: () => { };
|
|
21
|
+
this.#scheduleBatchUpdate = debounceThrottle(async () => {
|
|
22
|
+
const updates = this.#pendingUpdates;
|
|
23
|
+
this.#pendingUpdates = new Map();
|
|
24
|
+
if (updates.size > 0) {
|
|
25
|
+
await this.#update(Array.from(updates.values()));
|
|
26
|
+
}
|
|
27
|
+
}, this.getAdaptiveDebounceDelay, this._log);
|
|
28
|
+
}
|
|
29
|
+
setCallback(callback) {
|
|
30
|
+
this.#updateCb = callback;
|
|
31
|
+
}
|
|
32
|
+
get docChangedVersion() {
|
|
33
|
+
return this.#docChangedVersion;
|
|
34
|
+
}
|
|
35
|
+
bumpDocChangedVersion() {
|
|
36
|
+
this.#docChangedVersion++;
|
|
37
|
+
}
|
|
38
|
+
pushDocChangedTimestamp() {
|
|
39
|
+
const now = Date.now();
|
|
40
|
+
this.#docChangedTimesteps = [...this.getWindowedDocChangedTimesteps(), now];
|
|
41
|
+
}
|
|
42
|
+
WINDOW = 5000;
|
|
43
|
+
DEFAULT_DELAY = 500;
|
|
44
|
+
// Provider different debounce delay according to whether usr are actively typing, increase the delay if so to avoid unnecessary invoke
|
|
45
|
+
// The category below is suggested from AI, may adjust as needed in the future
|
|
46
|
+
DELAY_CANDIDATES = [
|
|
47
|
+
// IMPORTANT: sort by frequencyInWindow desc, we will pick the first match
|
|
48
|
+
{
|
|
49
|
+
// active typing
|
|
50
|
+
frequencyInWindow: 20,
|
|
51
|
+
delay: 1000,
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
// moderate typing
|
|
55
|
+
frequencyInWindow: 10,
|
|
56
|
+
delay: 800,
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
// light typing
|
|
60
|
+
frequencyInWindow: 0,
|
|
61
|
+
delay: this.DEFAULT_DELAY,
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
getWindowedDocChangedTimesteps() {
|
|
65
|
+
const now = Date.now();
|
|
66
|
+
return this.#docChangedTimesteps.filter((timestamp) => {
|
|
67
|
+
const age = now - timestamp;
|
|
68
|
+
return age < this.WINDOW;
|
|
69
|
+
});
|
|
10
70
|
}
|
|
11
|
-
|
|
71
|
+
getAdaptiveDebounceDelay = () => {
|
|
72
|
+
const frequent = this.getWindowedDocChangedTimesteps().length;
|
|
73
|
+
for (const c of this.DELAY_CANDIDATES) {
|
|
74
|
+
if (frequent >= c.frequencyInWindow) {
|
|
75
|
+
return c.delay;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return this.DEFAULT_DELAY;
|
|
79
|
+
};
|
|
80
|
+
scheduleUpdate(document, UpdateType) {
|
|
81
|
+
if (UpdateType === "changed" || UpdateType === "renamed") {
|
|
82
|
+
// only bump this when the file is actually changed
|
|
83
|
+
// skip open
|
|
84
|
+
this.bumpDocChangedVersion();
|
|
85
|
+
this.pushDocChangedTimestamp();
|
|
86
|
+
}
|
|
12
87
|
const existing = this.#pendingUpdates.get(document.uri);
|
|
13
88
|
if (existing === undefined) {
|
|
14
89
|
this.#pendingUpdates.set(document.uri, {
|
|
15
90
|
latest: document,
|
|
91
|
+
latestUpdateTimestamp: Date.now(),
|
|
16
92
|
});
|
|
17
93
|
}
|
|
18
94
|
else {
|
|
19
95
|
existing.latest = document;
|
|
96
|
+
existing.latestUpdateTimestamp = Date.now();
|
|
20
97
|
}
|
|
21
98
|
this.#scheduleBatchUpdate();
|
|
22
99
|
}
|
|
23
|
-
#
|
|
24
|
-
this.#
|
|
25
|
-
void this.#update(update);
|
|
26
|
-
});
|
|
27
|
-
this.#pendingUpdates.clear();
|
|
28
|
-
}, UPDATE_DEBOUNCE_TIME);
|
|
29
|
-
async #update(update) {
|
|
30
|
-
await this.#updateCb(update.latest);
|
|
100
|
+
async #update(updates) {
|
|
101
|
+
await this.#updateCb?.(updates);
|
|
31
102
|
}
|
|
32
103
|
}
|
|
33
104
|
/**
|
|
@@ -38,19 +109,40 @@ export class UpdateManger {
|
|
|
38
109
|
* @param fn The function
|
|
39
110
|
* @param milliseconds Number of milliseconds to debounce/throttle
|
|
40
111
|
*/
|
|
41
|
-
export function debounceThrottle(fn,
|
|
112
|
+
export function debounceThrottle(fn, getDelay, log) {
|
|
42
113
|
let timeout;
|
|
43
|
-
let lastInvocation =
|
|
114
|
+
let lastInvocation = undefined;
|
|
115
|
+
let executingCount = 0;
|
|
116
|
+
let debounceExecutionId = 0;
|
|
117
|
+
const UPDATE_PARALLEL_LIMIT = 2;
|
|
44
118
|
function maybeCall() {
|
|
45
119
|
clearTimeout(timeout);
|
|
46
|
-
timeout = setTimeout(() => {
|
|
47
|
-
if (
|
|
120
|
+
timeout = setTimeout(async () => {
|
|
121
|
+
if (lastInvocation !== undefined &&
|
|
122
|
+
(Date.now() - lastInvocation < getDelay() || executingCount >= UPDATE_PARALLEL_LIMIT)) {
|
|
48
123
|
maybeCall();
|
|
49
124
|
return;
|
|
50
125
|
}
|
|
51
|
-
|
|
126
|
+
const curId = debounceExecutionId++;
|
|
127
|
+
const s = new Date();
|
|
128
|
+
try {
|
|
129
|
+
executingCount++;
|
|
130
|
+
log({
|
|
131
|
+
level: "debug",
|
|
132
|
+
message: `Starting debounce execution #${curId} at ${s.toISOString()}. Current parallel count: ${executingCount}`,
|
|
133
|
+
});
|
|
134
|
+
await fn();
|
|
135
|
+
}
|
|
136
|
+
finally {
|
|
137
|
+
executingCount--;
|
|
138
|
+
const e = new Date();
|
|
139
|
+
log({
|
|
140
|
+
level: "debug",
|
|
141
|
+
message: `Finish debounce execution #${curId} at ${e.toISOString()}, duration=${e.getTime() - s.getTime()}. Current parallel count: ${executingCount}`,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
52
144
|
lastInvocation = Date.now();
|
|
53
|
-
},
|
|
145
|
+
}, getDelay());
|
|
54
146
|
}
|
|
55
147
|
return maybeCall;
|
|
56
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-manager.js","sourceRoot":"","sources":["../../../src/server/update-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-manager.js","sourceRoot":"","sources":["../../../src/server/update-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-server-host.d.ts","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"test-server-host.d.ts","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,UAAU,EAA0C,MAAM,+BAA+B,CAAC;AAInG,OAAO,EAAE,cAAc,EAAc,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAgB,MAAM,oBAAoB,CAAC;AAItE,OAAO,EAAuB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,cAAe,SAAQ,UAAU,EAAE,cAAc;IAChE,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACxD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC;IACjE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;IACzC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAAU,EAAE,CAAC;IACpD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,wBAAsB,oBAAoB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,2BAqH/F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,EAAE,CAanE"}
|
|
@@ -40,6 +40,10 @@ export async function createTestServerHost(options) {
|
|
|
40
40
|
const document = TextDocument.create(url, "typespec", version, content);
|
|
41
41
|
documents.set(url, document);
|
|
42
42
|
fileSystem.addTypeSpecFile(path, ""); // force virtual file system to create directory where document lives.
|
|
43
|
+
if (!oldDocument) {
|
|
44
|
+
server.documentOpened({ document });
|
|
45
|
+
}
|
|
46
|
+
server.checkChange({ document });
|
|
43
47
|
return document;
|
|
44
48
|
},
|
|
45
49
|
openDocument(path) {
|
|
@@ -49,7 +53,7 @@ export async function createTestServerHost(options) {
|
|
|
49
53
|
getDiagnostics(path) {
|
|
50
54
|
return diagnostics.get(this.getURL(path)) ?? [];
|
|
51
55
|
},
|
|
52
|
-
sendDiagnostics(params) {
|
|
56
|
+
async sendDiagnostics(params) {
|
|
53
57
|
if (params.version && documents.get(params.uri)?.version !== params.version) {
|
|
54
58
|
return;
|
|
55
59
|
}
|
|
@@ -100,6 +104,16 @@ export async function createTestServerHost(options) {
|
|
|
100
104
|
workspaceFolders: null,
|
|
101
105
|
});
|
|
102
106
|
server.initialized({});
|
|
107
|
+
const serverCompile = server.compile;
|
|
108
|
+
server.compile = async (document, additionalOptions, serverCompileOptions) => {
|
|
109
|
+
// Wrap the compile to report diagnostics after compile in test to make sure existing tests
|
|
110
|
+
// that rely on diagnostics to work without having to change each of them to call reportDiagnostics explicitly.
|
|
111
|
+
const result = await serverCompile(document, additionalOptions, serverCompileOptions);
|
|
112
|
+
if (result) {
|
|
113
|
+
await server.reportDiagnostics(result);
|
|
114
|
+
}
|
|
115
|
+
return result;
|
|
116
|
+
};
|
|
103
117
|
serverHost.server = server;
|
|
104
118
|
return serverHost;
|
|
105
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-server-host.js","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAc,cAAc,
|
|
1
|
+
{"version":3,"file":"test-server-host.js","sourceRoot":"","sources":["../../../src/testing/test-server-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tester.d.ts","sourceRoot":"","sources":["../../../src/testing/tester.ts"],"names":[],"mappings":"AAUA,OAAO,EAAgB,UAAU,EAAgC,MAAM,kBAAkB,CAAC;AAQ1F,OAAO,KAAK,EAQV,MAAM,EAGP,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,MAAM,CAKzE;
|
|
1
|
+
{"version":3,"file":"tester.d.ts","sourceRoot":"","sources":["../../../src/testing/tester.ts"],"names":[],"mappings":"AAUA,OAAO,EAAgB,UAAU,EAAgC,MAAM,kBAAkB,CAAC;AAQ1F,OAAO,KAAK,EAQV,MAAM,EAGP,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,MAAM,CAKzE;AA8ZD,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC;IAChD,kBAAkB,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;CACtD"}
|
|
@@ -55,7 +55,7 @@ async function createTesterFs(base, options) {
|
|
|
55
55
|
}, lib, { baseDir: base, conditions: ["import", "default"] });
|
|
56
56
|
if (resolved.type === "module") {
|
|
57
57
|
const virtualPath = computeRelativePath(lib, resolved.mainFile);
|
|
58
|
-
fs.addJsFile(virtualPath, host.getJsImport(resolved.mainFile));
|
|
58
|
+
fs.addJsFile(virtualPath, await host.getJsImport(resolved.mainFile));
|
|
59
59
|
fs.add(resolvePath("node_modules", lib, "package.json"), resolved.manifest.file.text);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tester.js","sourceRoot":"","sources":["../../../src/testing/tester.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tester.js","sourceRoot":"","sources":["../../../src/testing/tester.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils/io.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DiagnosticHandler } from "../core/diagnostics.js";
|
|
2
|
-
import { CompilerHost, DiagnosticTarget, NoTarget, SourceFile } from "../core/types.js";
|
|
2
|
+
import { CompilerHost, DiagnosticTarget, NoTarget, SourceFile, SystemHost } from "../core/types.js";
|
|
3
3
|
export interface FileHandlingOptions {
|
|
4
4
|
allowFileNotFound?: boolean;
|
|
5
5
|
diagnosticTarget?: DiagnosticTarget | typeof NoTarget;
|
|
6
6
|
jsDiagnosticTarget?: DiagnosticTarget;
|
|
7
7
|
}
|
|
8
8
|
export declare function doIO<T>(action: (path: string) => Promise<T>, path: string, reportDiagnostic: DiagnosticHandler, options?: FileHandlingOptions): Promise<T | undefined>;
|
|
9
|
-
export declare function loadFile<T>(host:
|
|
9
|
+
export declare function loadFile<T>(host: SystemHost, path: string, load: (contents: string) => T, reportDiagnostic: DiagnosticHandler, options?: FileHandlingOptions): Promise<[T | undefined, SourceFile]>;
|
|
10
10
|
/**
|
|
11
11
|
* Look for the project root by looking up until a `package.json` is found.
|
|
12
12
|
* @param path Path to start looking
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../../../src/utils/io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,OAAO,
|
|
1
|
+
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../../../src/utils/io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,OAAO,EACL,YAAY,EAEZ,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,mBAAmB;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,QAAQ,CAAC;IACtD,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;CACvC;AAED,wBAAsB,IAAI,CAAC,CAAC,EAC1B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACpC,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,iBAAiB,EACnC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAkCxB;AAED,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,CAAC,EAC7B,gBAAgB,EAAE,iBAAiB,EACnC,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,UAAU,CAAC,CAAC,CAmBtC;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAC5B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB7B"}
|
package/dist/src/utils/io.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createDiagnostic } from "../core/messages.js";
|
|
2
2
|
import { getDirectoryPath, joinPaths } from "../core/path-utils.js";
|
|
3
3
|
import { createSourceFile } from "../core/source-file.js";
|
|
4
|
-
import { NoTarget } from "../core/types.js";
|
|
4
|
+
import { NoTarget, } from "../core/types.js";
|
|
5
5
|
export async function doIO(action, path, reportDiagnostic, options) {
|
|
6
6
|
let result;
|
|
7
7
|
try {
|