@typespec/compiler 0.62.0-dev.1 → 0.62.0-dev.11
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/generated-defs/TypeSpec.d.ts +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/config/config-schema.d.ts +2 -1
- package/dist/src/config/config-schema.d.ts.map +1 -1
- package/dist/src/config/config-schema.js +2 -1
- package/dist/src/config/config-schema.js.map +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +22 -10
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/utils.js +1 -1
- package/dist/src/core/cli/utils.js.map +1 -1
- package/dist/src/core/diagnostics.d.ts +5 -1
- package/dist/src/core/diagnostics.d.ts.map +1 -1
- package/dist/src/core/diagnostics.js +32 -3
- package/dist/src/core/diagnostics.js.map +1 -1
- package/dist/src/core/index.d.ts +1 -1
- package/dist/src/core/index.d.ts.map +1 -1
- package/dist/src/core/index.js +1 -1
- package/dist/src/core/index.js.map +1 -1
- package/dist/src/core/logger/console-sink.d.ts +1 -0
- package/dist/src/core/logger/console-sink.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.js +22 -6
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/logger.js +1 -1
- package/dist/src/core/logger/logger.js.map +1 -1
- package/dist/src/core/messages.d.ts +20 -2
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +7 -1
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +18 -16
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/source-loader.d.ts +1 -1
- package/dist/src/core/source-loader.d.ts.map +1 -1
- package/dist/src/core/source-loader.js +11 -5
- package/dist/src/core/source-loader.js.map +1 -1
- package/dist/src/core/types.d.ts +10 -2
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/experimental/mutators.d.ts +2 -1
- package/dist/src/experimental/mutators.d.ts.map +1 -1
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/type.js +19 -1
- package/dist/src/experimental/typekit/kits/type.js.map +1 -1
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js +13 -20
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/server/diagnostics.d.ts +8 -0
- package/dist/src/server/diagnostics.d.ts.map +1 -0
- package/dist/src/server/diagnostics.js +106 -0
- package/dist/src/server/diagnostics.js.map +1 -0
- package/dist/src/server/emitter-provider.d.ts +22 -0
- package/dist/src/server/emitter-provider.d.ts.map +1 -0
- package/dist/src/server/emitter-provider.js +79 -0
- package/dist/src/server/emitter-provider.js.map +1 -0
- package/dist/src/server/npm-package-provider.d.ts +51 -0
- package/dist/src/server/npm-package-provider.d.ts.map +1 -0
- package/dist/src/server/npm-package-provider.js +201 -0
- package/dist/src/server/npm-package-provider.js.map +1 -0
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +69 -43
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tspconfig/completion.d.ts +11 -0
- package/dist/src/server/tspconfig/completion.d.ts.map +1 -0
- package/dist/src/server/tspconfig/completion.js +176 -0
- package/dist/src/server/tspconfig/completion.js.map +1 -0
- package/dist/src/server/yaml-resolver.d.ts +24 -0
- package/dist/src/server/yaml-resolver.d.ts.map +1 -0
- package/dist/src/server/yaml-resolver.js +253 -0
- package/dist/src/server/yaml-resolver.js.map +1 -0
- package/dist/src/testing/expect.js +1 -1
- package/dist/src/testing/expect.js.map +1 -1
- package/dist/src/testing/test-host.d.ts.map +1 -1
- package/dist/src/testing/test-host.js +22 -1
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/src/testing/types.d.ts +1 -0
- package/dist/src/testing/types.d.ts.map +1 -1
- package/dist/src/testing/types.js.map +1 -1
- package/dist/src/utils/misc.d.ts +5 -0
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +32 -0
- package/dist/src/utils/misc.js.map +1 -1
- package/lib/intrinsics.tsp +2 -2
- package/lib/std/decorators.tsp +1 -1
- package/package.json +2 -1
- package/templates/scaffolding.json +4 -4
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
import { CompletionItemKind } from "vscode-languageserver/node.js";
|
|
2
|
+
import { emitterOptionsSchema, TypeSpecConfigJsonSchema } from "../../config/config-schema.js";
|
|
3
|
+
import { distinctArray } from "../../utils/misc.js";
|
|
4
|
+
import { resolveYamlScalarTarget } from "../yaml-resolver.js";
|
|
5
|
+
export async function provideTspconfigCompletionItems(tspConfigDoc, tspConfigPosition, context) {
|
|
6
|
+
const { fileService, emitterProvider, log } = context;
|
|
7
|
+
const target = resolveYamlScalarTarget(tspConfigDoc, tspConfigPosition, log);
|
|
8
|
+
if (target === undefined) {
|
|
9
|
+
return [];
|
|
10
|
+
}
|
|
11
|
+
const items = resolveTspConfigCompleteItems(await fileService.getPath(tspConfigDoc), target);
|
|
12
|
+
return items;
|
|
13
|
+
async function resolveTspConfigCompleteItems(tspConfigFile, target) {
|
|
14
|
+
const { path: nodePath, type: targetType, siblings } = target;
|
|
15
|
+
const CONFIG_PATH_LENGTH_FOR_EMITTER_LIST = 2;
|
|
16
|
+
if ((nodePath.length === CONFIG_PATH_LENGTH_FOR_EMITTER_LIST &&
|
|
17
|
+
nodePath[0] === "options" &&
|
|
18
|
+
targetType === "key") ||
|
|
19
|
+
(nodePath.length === CONFIG_PATH_LENGTH_FOR_EMITTER_LIST &&
|
|
20
|
+
nodePath[0] === "emit" &&
|
|
21
|
+
targetType === "arr-item")) {
|
|
22
|
+
const emitters = await emitterProvider.listEmitters(tspConfigFile);
|
|
23
|
+
const items = [];
|
|
24
|
+
for (const [name, pkg] of Object.entries(emitters)) {
|
|
25
|
+
if (!siblings.includes(name)) {
|
|
26
|
+
const item = {
|
|
27
|
+
label: name,
|
|
28
|
+
kind: CompletionItemKind.Field,
|
|
29
|
+
documentation: (await pkg.getPackageJsonData())?.description ?? `Emitter from ${name}`,
|
|
30
|
+
insertText: `"${name}"`,
|
|
31
|
+
};
|
|
32
|
+
items.push(item);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return items;
|
|
36
|
+
}
|
|
37
|
+
else if (nodePath.length > CONFIG_PATH_LENGTH_FOR_EMITTER_LIST && nodePath[0] === "options") {
|
|
38
|
+
const emitterName = nodePath[CONFIG_PATH_LENGTH_FOR_EMITTER_LIST - 1];
|
|
39
|
+
const emitter = await emitterProvider.getEmitter(tspConfigFile, emitterName);
|
|
40
|
+
if (!emitter) {
|
|
41
|
+
return [];
|
|
42
|
+
}
|
|
43
|
+
const exports = await emitter.getModuleExports();
|
|
44
|
+
const builtInEmitterSchema = emitterOptionsSchema;
|
|
45
|
+
const itemsFromBuiltIn = builtInEmitterSchema
|
|
46
|
+
? resolveCompleteItems(builtInEmitterSchema, {
|
|
47
|
+
...target,
|
|
48
|
+
path: nodePath.slice(CONFIG_PATH_LENGTH_FOR_EMITTER_LIST),
|
|
49
|
+
})
|
|
50
|
+
: [];
|
|
51
|
+
const itemsFromEmitter = [];
|
|
52
|
+
if (exports?.$lib?.emitter?.options !== undefined) {
|
|
53
|
+
const more = resolveCompleteItems(exports.$lib.emitter.options, {
|
|
54
|
+
...target,
|
|
55
|
+
path: nodePath.slice(CONFIG_PATH_LENGTH_FOR_EMITTER_LIST),
|
|
56
|
+
});
|
|
57
|
+
itemsFromEmitter.push(...more);
|
|
58
|
+
}
|
|
59
|
+
return [...itemsFromBuiltIn, ...itemsFromEmitter];
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const schema = TypeSpecConfigJsonSchema;
|
|
63
|
+
return schema ? resolveCompleteItems(schema, target) : [];
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
*
|
|
68
|
+
* @param schema
|
|
69
|
+
* @param path
|
|
70
|
+
* @param curIndex
|
|
71
|
+
* @param track track the schema we have processed so that we won't have problem for circle reference
|
|
72
|
+
* @returns
|
|
73
|
+
*/
|
|
74
|
+
function findSchemaByPath(schema, path, curIndex, track = new Set()) {
|
|
75
|
+
if (curIndex >= path.length) {
|
|
76
|
+
return [schema];
|
|
77
|
+
}
|
|
78
|
+
if (track.has(schema)) {
|
|
79
|
+
return [];
|
|
80
|
+
}
|
|
81
|
+
const key = path[curIndex];
|
|
82
|
+
const result = [];
|
|
83
|
+
if (schema.type === "array") {
|
|
84
|
+
return findSchemaByPath(schema.items, path, curIndex + 1);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
if (schema.type === "object") {
|
|
88
|
+
if (schema.properties && schema.properties[key]) {
|
|
89
|
+
if (schema.properties[key].deprecated !== true) {
|
|
90
|
+
const found = findSchemaByPath(schema.properties[key], path, curIndex + 1);
|
|
91
|
+
result.push(...found);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
else if (schema.additionalProperties && typeof schema.additionalProperties === "object") {
|
|
95
|
+
const found = findSchemaByPath(schema.additionalProperties, path, curIndex + 1);
|
|
96
|
+
result.push(...found);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
if (schema.oneOf || schema.anyOf || schema.allOf) {
|
|
100
|
+
const choices = [...(schema.anyOf ?? []), ...(schema.oneOf ?? []), ...(schema.allOf ?? [])];
|
|
101
|
+
const founds = choices.flatMap((choice) => findSchemaByPath(choice, path, curIndex), track);
|
|
102
|
+
result.push(...founds);
|
|
103
|
+
}
|
|
104
|
+
return result;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
*
|
|
109
|
+
* @param schema
|
|
110
|
+
* @param track a set to track all the processed schema so that we won't have problem for circle reference
|
|
111
|
+
* @returns
|
|
112
|
+
*/
|
|
113
|
+
function expandPossibleSchema(schema, track = new Set()) {
|
|
114
|
+
if (track.has(schema))
|
|
115
|
+
return [];
|
|
116
|
+
const result = [schema];
|
|
117
|
+
const choices = [...(schema.anyOf ?? []), ...(schema.oneOf ?? []), ...(schema.allOf ?? [])];
|
|
118
|
+
for (const choice of choices) {
|
|
119
|
+
result.push(...expandPossibleSchema(choice, track));
|
|
120
|
+
}
|
|
121
|
+
result.forEach((s) => track.add(s));
|
|
122
|
+
return result;
|
|
123
|
+
}
|
|
124
|
+
function resolveCompleteItems(schema, target) {
|
|
125
|
+
const { path: nodePath, type: targetType } = target;
|
|
126
|
+
// if the target is a key which means it's pointing to an object property, we should remove the last element of the path to get it's parent object for its schema
|
|
127
|
+
const path = targetType === "key" ? nodePath.slice(0, -1) : nodePath;
|
|
128
|
+
const foundSchemas = findSchemaByPath(schema, path, 0);
|
|
129
|
+
const result = [];
|
|
130
|
+
foundSchemas
|
|
131
|
+
.flatMap((s) => expandPossibleSchema(s))
|
|
132
|
+
.forEach((cur) => {
|
|
133
|
+
if (targetType === "key" || targetType === "arr-item") {
|
|
134
|
+
if (cur.type === "object") {
|
|
135
|
+
const props = Object.keys(cur.properties ?? {})
|
|
136
|
+
.filter((key) => !target.siblings.includes(key) && cur.properties[key].deprecated !== true)
|
|
137
|
+
.map((key) => {
|
|
138
|
+
const item = {
|
|
139
|
+
label: key,
|
|
140
|
+
kind: CompletionItemKind.Field,
|
|
141
|
+
documentation: cur.properties[key].description,
|
|
142
|
+
};
|
|
143
|
+
return item;
|
|
144
|
+
});
|
|
145
|
+
result.push(...props);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
if (targetType === "value" || targetType === "arr-item") {
|
|
149
|
+
if (cur.type === "boolean") {
|
|
150
|
+
result.push(...["true", "false"].map((value) => {
|
|
151
|
+
const item = {
|
|
152
|
+
label: value,
|
|
153
|
+
kind: CompletionItemKind.Value,
|
|
154
|
+
documentation: cur.description,
|
|
155
|
+
};
|
|
156
|
+
return item;
|
|
157
|
+
}));
|
|
158
|
+
}
|
|
159
|
+
else if (cur.type === "string" && cur.enum) {
|
|
160
|
+
const enums = cur.enum.map((value) => {
|
|
161
|
+
const item = {
|
|
162
|
+
label: value,
|
|
163
|
+
kind: CompletionItemKind.Value,
|
|
164
|
+
documentation: cur.description,
|
|
165
|
+
insertText: `"${value}"`,
|
|
166
|
+
};
|
|
167
|
+
return item;
|
|
168
|
+
});
|
|
169
|
+
result.push(...enums);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
return distinctArray(result, (t) => t.label);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
//# sourceMappingURL=completion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../../src/server/tspconfig/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Position, TextDocument } from "vscode-languageserver-textdocument";
|
|
2
|
+
import { ServerLog } from "./types.js";
|
|
3
|
+
export interface YamlScalarTarget {
|
|
4
|
+
/**
|
|
5
|
+
* The path of the yaml node at the position, it consists of object's property, array's index, empty string for potential object property (empty line)
|
|
6
|
+
*/
|
|
7
|
+
path: string[];
|
|
8
|
+
/**
|
|
9
|
+
* The final target of the path, either the key or value of the node pointed by the path property
|
|
10
|
+
* - "key" or "value" if the node is pointing to an object property
|
|
11
|
+
* - "arr-item" if the node is pointing to an array item
|
|
12
|
+
*/
|
|
13
|
+
type: "key" | "value" | "arr-item";
|
|
14
|
+
/**
|
|
15
|
+
* actual value of target in the doc
|
|
16
|
+
*/
|
|
17
|
+
source: string;
|
|
18
|
+
/**
|
|
19
|
+
* The siblings of the target node
|
|
20
|
+
*/
|
|
21
|
+
siblings: string[];
|
|
22
|
+
}
|
|
23
|
+
export declare function resolveYamlScalarTarget(document: TextDocument, position: Position, log: (log: ServerLog) => void): YamlScalarTarget | undefined;
|
|
24
|
+
//# sourceMappingURL=yaml-resolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-resolver.d.ts","sourceRoot":"","sources":["../../../src/server/yaml-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAe5E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;OAIG;IACH,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,UAAU,CAAC;IACnC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAQD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,GAC5B,gBAAgB,GAAG,SAAS,CAkJ9B"}
|
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
import { isDocument, isMap, isPair, isScalar, isSeq, parseDocument, visit, } from "yaml";
|
|
2
|
+
import { firstNonWhitespaceCharacterIndex, isWhitespaceStringOrUndefined } from "../utils/misc.js";
|
|
3
|
+
export function resolveYamlScalarTarget(document, position, log) {
|
|
4
|
+
const pos = document.offsetAt(position);
|
|
5
|
+
const content = document.getText();
|
|
6
|
+
const lines = content.split("\n");
|
|
7
|
+
const targetLine = lines[position.line];
|
|
8
|
+
const yamlDoc = parseDocument(content, {
|
|
9
|
+
keepSourceTokens: true,
|
|
10
|
+
});
|
|
11
|
+
if (!yamlDoc) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
if (isCommentLine(targetLine) &&
|
|
15
|
+
position.character > firstNonWhitespaceCharacterIndex(targetLine)) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
if (isWhitespaceStringOrUndefined(targetLine) || isCommentLine(targetLine)) {
|
|
19
|
+
const indent = position.character;
|
|
20
|
+
if (indent === 0) {
|
|
21
|
+
const rootProperties = [];
|
|
22
|
+
if (isMap(yamlDoc.contents)) {
|
|
23
|
+
rootProperties.push(...yamlDoc.contents.items.map((item) => item.key.source ?? ""));
|
|
24
|
+
}
|
|
25
|
+
else if (isScalar(yamlDoc.contents) &&
|
|
26
|
+
!isWhitespaceStringOrUndefined(yamlDoc.contents.source)) {
|
|
27
|
+
rootProperties.push(yamlDoc.contents.source);
|
|
28
|
+
}
|
|
29
|
+
return {
|
|
30
|
+
path: [""],
|
|
31
|
+
type: "key",
|
|
32
|
+
source: "",
|
|
33
|
+
siblings: rootProperties,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
for (let i = position.line - 1; i >= 0; i--) {
|
|
37
|
+
const preLine = lines[i];
|
|
38
|
+
if (isWhitespaceStringOrUndefined(preLine) || isCommentLine(preLine)) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const preIndent = getIndentOfYamlLine(preLine);
|
|
42
|
+
if (preIndent === -1) {
|
|
43
|
+
// we got an empty '-' line
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
if (preIndent === indent) {
|
|
47
|
+
// we found the previous line which should be the sibling of the current line
|
|
48
|
+
const found = findScalarNode(yamlDoc, document.offsetAt({
|
|
49
|
+
line: i,
|
|
50
|
+
character: preIndent,
|
|
51
|
+
}));
|
|
52
|
+
if (!found) {
|
|
53
|
+
log({
|
|
54
|
+
level: "debug",
|
|
55
|
+
message: `Failed to find the scalar node in the found previous sibling line of empty line. curLine: ${targetLine}, preLine: ${preLine}`,
|
|
56
|
+
});
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
const yp = createYamlPathFromVisitScalarNode(found, pos, log);
|
|
60
|
+
if (!yp || yp.path.length === 0) {
|
|
61
|
+
log({
|
|
62
|
+
level: "debug",
|
|
63
|
+
message: `Unexpected found path which should at least contains one segment for the found previous non-empty line item`,
|
|
64
|
+
});
|
|
65
|
+
return undefined;
|
|
66
|
+
}
|
|
67
|
+
// adjust path and sibling for the whitespace line
|
|
68
|
+
if (yp.type === "arr-item") {
|
|
69
|
+
// the sibling node is a plain text value of an array (otherwise there should be an map node under the seq node)
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
return {
|
|
74
|
+
path: [...yp.path.slice(0, yp.path.length - 1), ""],
|
|
75
|
+
type: "key",
|
|
76
|
+
source: "",
|
|
77
|
+
siblings: [...yp.siblings, yp.source],
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
break;
|
|
81
|
+
}
|
|
82
|
+
else if (preIndent < indent) {
|
|
83
|
+
// we found the previous line which should be the parent of the current line
|
|
84
|
+
const found = findScalarNode(yamlDoc, document.offsetAt({
|
|
85
|
+
line: i,
|
|
86
|
+
character: preIndent,
|
|
87
|
+
}));
|
|
88
|
+
if (!found) {
|
|
89
|
+
log({
|
|
90
|
+
level: "debug",
|
|
91
|
+
message: `Failed to find the scalar node in the found previous parent line of empty line. curLine: ${targetLine}, preLine: ${preLine}`,
|
|
92
|
+
});
|
|
93
|
+
return undefined;
|
|
94
|
+
}
|
|
95
|
+
// the parent should be a map or null (potential a map)
|
|
96
|
+
const last = found.path[found.path.length - 1];
|
|
97
|
+
if (isPair(last) &&
|
|
98
|
+
(last.value === null ||
|
|
99
|
+
isMap(last.value) ||
|
|
100
|
+
(isScalar(last.value) && isWhitespaceStringOrUndefined(last.value.source)))) {
|
|
101
|
+
const yp = createYamlPathFromVisitScalarNode(found, pos, log);
|
|
102
|
+
if (!yp || yp.path.length === 0) {
|
|
103
|
+
log({
|
|
104
|
+
level: "debug",
|
|
105
|
+
message: `Unexpected found path which should at least contains one segment for the found previous non-empty line item`,
|
|
106
|
+
});
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
// adjust path and sibling for the whitespace line
|
|
110
|
+
return {
|
|
111
|
+
path: [...yp.path, ""],
|
|
112
|
+
type: "key",
|
|
113
|
+
source: "",
|
|
114
|
+
siblings: isMap(last.value)
|
|
115
|
+
? (last.value?.items.map((item) => item.key.source ?? "") ?? [])
|
|
116
|
+
: [],
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
break;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return undefined;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
const found = findScalarNode(yamlDoc, pos);
|
|
126
|
+
if (!found) {
|
|
127
|
+
log({
|
|
128
|
+
level: "debug",
|
|
129
|
+
message: `Failed to find the scalar node at the position: ${pos}`,
|
|
130
|
+
});
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
133
|
+
const yp = createYamlPathFromVisitScalarNode(found, pos, log);
|
|
134
|
+
return yp;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
function createYamlPathFromVisitScalarNode(info, offset, log) {
|
|
138
|
+
const { key, n, path: nodePath } = info;
|
|
139
|
+
if (nodePath.length === 0) {
|
|
140
|
+
log({
|
|
141
|
+
level: "debug",
|
|
142
|
+
message: `Unexpected path structure, nodePath is empty while we always expect at least a root doc node`,
|
|
143
|
+
});
|
|
144
|
+
return undefined;
|
|
145
|
+
}
|
|
146
|
+
const path = [];
|
|
147
|
+
for (let i = 0; i < nodePath.length; i++) {
|
|
148
|
+
const seg = nodePath[i];
|
|
149
|
+
if (isPair(seg)) {
|
|
150
|
+
path.push(seg.key.source ?? "");
|
|
151
|
+
}
|
|
152
|
+
else if (isSeq(seg)) {
|
|
153
|
+
const next = nodePath.length > i + 1 ? nodePath[i + 1] : n;
|
|
154
|
+
const index = seg.items.findIndex((item) => item === next);
|
|
155
|
+
if (index >= 0) {
|
|
156
|
+
path.push(index.toString());
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
log({
|
|
160
|
+
level: "debug",
|
|
161
|
+
message: `Unexpected path structure. the next element isn't found in the sequence(array): ${next.toJSON()}`,
|
|
162
|
+
});
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
const last = nodePath[nodePath.length - 1];
|
|
168
|
+
if (isDocument(last)) {
|
|
169
|
+
// we are at the root and the content is a pure text (otherwise there should be a Map under document node first)
|
|
170
|
+
return {
|
|
171
|
+
path: [],
|
|
172
|
+
type: key === null ? "key" : "value",
|
|
173
|
+
source: n.source ?? "",
|
|
174
|
+
siblings: [],
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
else if (isPair(last)) {
|
|
178
|
+
if (nodePath.length < 2) {
|
|
179
|
+
log({
|
|
180
|
+
level: "debug",
|
|
181
|
+
message: `Unexpected path structure, the pair node should have a parent node: ${last.toString()}`,
|
|
182
|
+
});
|
|
183
|
+
return undefined;
|
|
184
|
+
}
|
|
185
|
+
const newline = last.srcToken?.sep?.find((t) => t.type === "newline");
|
|
186
|
+
if (key === "value" && newline && newline.offset < offset) {
|
|
187
|
+
// if the scalar node is marked as value but separated by newline from the key, it's more likely that the user is inputting the first property of an object
|
|
188
|
+
// so build the target as an object key
|
|
189
|
+
path.push(n.source ?? "");
|
|
190
|
+
return {
|
|
191
|
+
path,
|
|
192
|
+
type: "key",
|
|
193
|
+
source: n.source ?? "",
|
|
194
|
+
siblings: [],
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const parent = nodePath[nodePath.length - 2];
|
|
199
|
+
const targetSiblings = isMap(parent)
|
|
200
|
+
? parent.items.filter((item) => item !== last).map((item) => item.key.source ?? "")
|
|
201
|
+
: [];
|
|
202
|
+
return {
|
|
203
|
+
path: path,
|
|
204
|
+
type: key === "key" ? "key" : "value",
|
|
205
|
+
source: n.source ?? "",
|
|
206
|
+
siblings: targetSiblings,
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
else if (isSeq(last)) {
|
|
211
|
+
return {
|
|
212
|
+
path: path,
|
|
213
|
+
type: "arr-item",
|
|
214
|
+
source: n.source ?? "",
|
|
215
|
+
siblings: last.items
|
|
216
|
+
.filter((i) => i !== n)
|
|
217
|
+
.map((item) => (isScalar(item) ? (item.source ?? "") : "")),
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
log({
|
|
222
|
+
level: "debug",
|
|
223
|
+
message: `Unexpected path structure, last element is not pair or seq for scalar node: ${last.toString()}`,
|
|
224
|
+
});
|
|
225
|
+
return undefined;
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
function isCommentLine(line) {
|
|
229
|
+
return line.trimStart().startsWith("#");
|
|
230
|
+
}
|
|
231
|
+
/** whitespace and '-' will be considered as indent */
|
|
232
|
+
function getIndentOfYamlLine(line) {
|
|
233
|
+
return line.search(/[^\s-]/);
|
|
234
|
+
}
|
|
235
|
+
function findScalarNode(document, pos) {
|
|
236
|
+
let found = undefined;
|
|
237
|
+
visit(document, {
|
|
238
|
+
Node: (key, n, path) => {
|
|
239
|
+
if (isScalar(n)) {
|
|
240
|
+
const [start, endValue, _endNode] = n.range ?? [];
|
|
241
|
+
if (start === undefined || endValue === undefined)
|
|
242
|
+
return undefined;
|
|
243
|
+
if (start <= pos && pos <= endValue) {
|
|
244
|
+
found = { key, n, path };
|
|
245
|
+
return visit.BREAK;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return undefined;
|
|
249
|
+
},
|
|
250
|
+
});
|
|
251
|
+
return found;
|
|
252
|
+
}
|
|
253
|
+
//# sourceMappingURL=yaml-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-resolver.js","sourceRoot":"","sources":["../../../src/server/yaml-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function expectDiagnosticEmpty(diagnostics) {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
function formatDiagnostics(diagnostics) {
|
|
15
|
-
return diagnostics.map(formatDiagnostic).join("\n");
|
|
15
|
+
return diagnostics.map((x) => formatDiagnostic(x)).join("\n");
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
18
|
* Validate the diagnostic array contains exactly the given diagnostics.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expect.js","sourceRoot":"","sources":["../../../src/testing/expect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAc,QAAQ,EAAQ,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,WAAkC;IACtE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC,4BAA4B,iBAAiB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAkC;IAC3D,OAAO,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"expect.js","sourceRoot":"","sources":["../../../src/testing/expect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-host.d.ts","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test-host.d.ts","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAmC,MAAM,kBAAkB,CAAC;AAKtF,OAAO,EACL,eAAe,EACf,cAAc,EACd,QAAQ,EACR,cAAc,EAEd,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,eAAe;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/C;AA4HD,wBAAsB,oBAAoB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA8E7F;AAED,eAAO,MAAM,mBAAmB,EAAE,mBAOjC,CAAC;AAEF,wBAAsB,cAAc,CAAC,MAAM,GAAE,cAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CASnF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAGhF;AAsFD,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAKhG"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import assert from "assert";
|
|
2
|
-
import { readFile } from "fs/promises";
|
|
2
|
+
import { readdir, readFile, stat } from "fs/promises";
|
|
3
3
|
import { globby } from "globby";
|
|
4
|
+
import { join } from "path";
|
|
4
5
|
import { fileURLToPath, pathToFileURL } from "url";
|
|
5
6
|
import { logDiagnostics, logVerboseTestOutput } from "../core/diagnostics.js";
|
|
6
7
|
import { createLogger } from "../core/logger/logger.js";
|
|
@@ -124,6 +125,7 @@ export async function createTestFileSystem(options) {
|
|
|
124
125
|
addJsFile,
|
|
125
126
|
addRealTypeSpecFile,
|
|
126
127
|
addRealJsFile,
|
|
128
|
+
addRealFolder,
|
|
127
129
|
addTypeSpecLibrary,
|
|
128
130
|
compilerHost,
|
|
129
131
|
fs: virtualFs,
|
|
@@ -139,6 +141,25 @@ export async function createTestFileSystem(options) {
|
|
|
139
141
|
async function addRealTypeSpecFile(path, existingPath) {
|
|
140
142
|
virtualFs.set(resolveVirtualPath(path), await readFile(existingPath, "utf8"));
|
|
141
143
|
}
|
|
144
|
+
async function addRealFolder(folder, existingFolder) {
|
|
145
|
+
const entries = await readdir(existingFolder);
|
|
146
|
+
for (const entry of entries) {
|
|
147
|
+
const existingPath = join(existingFolder, entry);
|
|
148
|
+
const virtualPath = join(folder, entry);
|
|
149
|
+
const s = await stat(existingPath);
|
|
150
|
+
if (s.isFile()) {
|
|
151
|
+
if (existingPath.endsWith(".js")) {
|
|
152
|
+
await addRealJsFile(virtualPath, existingPath);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
await addRealTypeSpecFile(virtualPath, existingPath);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (s.isDirectory()) {
|
|
159
|
+
await addRealFolder(virtualPath, existingPath);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
142
163
|
async function addRealJsFile(path, existingPath) {
|
|
143
164
|
const key = resolveVirtualPath(path);
|
|
144
165
|
const exports = await import(pathToFileURL(existingPath).href);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"test-host.js","sourceRoot":"","sources":["../../../src/testing/test-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface TestFileSystem {
|
|
|
7
7
|
addJsFile(path: string, contents: Record<string, any>): void;
|
|
8
8
|
addRealTypeSpecFile(path: string, realPath: string): Promise<void>;
|
|
9
9
|
addRealJsFile(path: string, realPath: string): Promise<void>;
|
|
10
|
+
addRealFolder(path: string, realPath: string): Promise<void>;
|
|
10
11
|
addTypeSpecLibrary(testLibrary: TypeSpecTestLibrary): Promise<void>;
|
|
11
12
|
}
|
|
12
13
|
export interface TestHost extends TestFileSystem {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/testing/types.ts"],"names":[],"mappings":"AA0DA,MAAM,OAAO,aAAc,SAAQ,KAAK;IAG7B;IAFT,YACE,OAAe,EACR,IAAuC;QAE9C,KAAK,CAAC,OAAO,CAAC,CAAC;QAFR,SAAI,GAAJ,IAAI,CAAmC;IAGhD,CAAC;CACF"}
|