@overkill-dev/type-test 0.0.5 → 0.0.7
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/config/adapter-facts.js +15 -0
- package/config/adapter-facts.js.map +1 -0
- package/generated-input-path.js +5 -0
- package/generated-input-path.js.map +1 -0
- package/package-version.js +34 -0
- package/package-version.js.map +1 -0
- package/package.json +8 -12
- package/packages/type-test/assertion-reference.d.ts +3 -12
- package/packages/type-test/assertion-reference.d.ts.map +1 -1
- package/packages/type-test/assertion-reference.js +0 -12
- package/packages/type-test/assertion-reference.js.map +1 -1
- package/packages/type-test/checker-boundary-validation.js +13 -10
- package/packages/type-test/checker-boundary-validation.js.map +1 -1
- package/packages/type-test/checker-diagnostics.js +2 -2
- package/packages/type-test/checker-diagnostics.js.map +1 -1
- package/packages/type-test/checker-evidence.js.map +1 -1
- package/packages/type-test/checker-project.js +5 -3
- package/packages/type-test/checker-project.js.map +1 -1
- package/packages/type-test/checker-resolution.js +15 -24
- package/packages/type-test/checker-resolution.js.map +1 -1
- package/packages/type-test/checker.entry-point.js +33 -14
- package/packages/type-test/checker.entry-point.js.map +1 -1
- package/packages/type-test/compiler-file-system.js +67 -0
- package/packages/type-test/compiler-file-system.js.map +1 -0
- package/packages/type-test/compiler-lifetime.js +52 -0
- package/packages/type-test/compiler-lifetime.js.map +1 -0
- package/packages/type-test/compiler-plan.js +92 -44
- package/packages/type-test/compiler-plan.js.map +1 -1
- package/packages/type-test/family-backend.entry-point.js +3 -3
- package/packages/type-test/family-backend.entry-point.js.map +1 -1
- package/packages/type-test/frozen-inputs.js +68 -97
- package/packages/type-test/frozen-inputs.js.map +1 -1
- package/packages/type-test/frozen-project.js +63 -41
- package/packages/type-test/frozen-project.js.map +1 -1
- package/packages/type-test/generated-imports.js +45 -31
- package/packages/type-test/generated-imports.js.map +1 -1
- package/packages/type-test/generated-input.entry-point.js +4 -3
- package/packages/type-test/generated-input.entry-point.js.map +1 -1
- package/packages/type-test/generated-module-plan.js +9 -14
- package/packages/type-test/generated-module-plan.js.map +1 -1
- package/packages/type-test/installed-compiler.js +112 -0
- package/packages/type-test/installed-compiler.js.map +1 -0
- package/packages/type-test/native-execution.js +6 -6
- package/packages/type-test/native-execution.js.map +1 -1
- package/packages/type-test/native-reference-expression.js +5 -29
- package/packages/type-test/native-reference-expression.js.map +1 -1
- package/packages/type-test/native-reference.js +16 -43
- package/packages/type-test/native-reference.js.map +1 -1
- package/packages/type-test/native-results.js +1 -1
- package/packages/type-test/native-results.js.map +1 -1
- package/packages/type-test/native-translation.js +33 -54
- package/packages/type-test/native-translation.js.map +1 -1
- package/packages/type-test/profile-settings.d.ts +19 -7
- package/packages/type-test/profile-settings.d.ts.map +1 -1
- package/packages/type-test/profile-settings.js +3 -2
- package/packages/type-test/profile-settings.js.map +1 -1
- package/packages/type-test/profile.entry-point.d.ts +8 -11
- package/packages/type-test/profile.entry-point.d.ts.map +1 -1
- package/packages/type-test/profile.entry-point.js +1 -5
- package/packages/type-test/profile.entry-point.js.map +1 -1
- package/packages/type-test/scope-assertions.js +40 -37
- package/packages/type-test/scope-assertions.js.map +1 -1
- package/packages/type-test/source-analysis.js +109 -14
- package/packages/type-test/source-analysis.js.map +1 -1
- package/packages/type-test/source-options.js +81 -30
- package/packages/type-test/source-options.js.map +1 -1
- package/packages/type-test/source-ownership.js +48 -46
- package/packages/type-test/source-ownership.js.map +1 -1
- package/packages/type-test/type-test.entry-point.d.ts +9 -60
- package/packages/type-test/type-test.entry-point.d.ts.map +1 -1
- package/packages/type-test/type-test.entry-point.js +2 -27
- package/packages/type-test/type-test.entry-point.js.map +1 -1
- package/readme.md +75 -171
- package/software-bill-of-materials.cyclonedx.json +14 -31
- package/packages/type-test/check.entry-point.d.ts +0 -13
- package/packages/type-test/check.entry-point.d.ts.map +0 -1
- package/packages/type-test/check.entry-point.js +0 -82
- package/packages/type-test/check.entry-point.js.map +0 -1
- package/packages/type-test/decorator-translation.js +0 -58
- package/packages/type-test/decorator-translation.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope-assertions.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/scope-assertions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAuB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"scope-assertions.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/scope-assertions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,104 @@
|
|
|
1
|
-
|
|
1
|
+
import { compilerFileSystem } from "./compiler-file-system.js";
|
|
2
|
+
const programSymbols = new WeakMap();
|
|
3
|
+
function sourceSymbols(analysis) {
|
|
4
|
+
const existing = programSymbols.get(analysis.program);
|
|
5
|
+
if (existing !== undefined) {
|
|
6
|
+
return existing;
|
|
7
|
+
}
|
|
8
|
+
const cache = new WeakMap();
|
|
9
|
+
programSymbols.set(analysis.program, cache);
|
|
10
|
+
return cache;
|
|
11
|
+
}
|
|
12
|
+
async function canonicalSourceFile(analysis, path) {
|
|
13
|
+
const canonical = compilerFileSystem.realpath(path);
|
|
14
|
+
const names = await analysis.program.getSourceFileNames();
|
|
15
|
+
const matches = names.filter(function sameFile(name) {
|
|
16
|
+
return compilerFileSystem.realpath(name) === canonical;
|
|
17
|
+
});
|
|
18
|
+
if (matches.length > 1) {
|
|
19
|
+
throw new Error(`Callback source has ambiguous project identities: ${path}`);
|
|
20
|
+
}
|
|
21
|
+
const [name] = matches;
|
|
22
|
+
return name === undefined ? undefined : await analysis.program.getSourceFile(name);
|
|
23
|
+
}
|
|
24
|
+
export function sourceIdentifiers(analysis, file) {
|
|
25
|
+
const identifiers = [];
|
|
26
|
+
function visit(node) {
|
|
27
|
+
if (analysis.compiler.isIdentifier(node)) {
|
|
28
|
+
identifiers.push(node);
|
|
29
|
+
}
|
|
30
|
+
node.forEachChild(visit);
|
|
31
|
+
}
|
|
32
|
+
visit(file);
|
|
33
|
+
return identifiers;
|
|
34
|
+
}
|
|
35
|
+
export async function loadSourceSymbols(analysis, identifiers) {
|
|
36
|
+
const cache = sourceSymbols(analysis);
|
|
37
|
+
const nodes = identifiers.filter(function unresolved(node) {
|
|
38
|
+
return !cache.has(node) && !analysis.compiler.isShorthandPropertyAssignment(node.parent);
|
|
39
|
+
});
|
|
40
|
+
if (nodes.length === 0) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const symbols = await analysis.checker.getSymbolAtLocation(nodes);
|
|
44
|
+
if (symbols.length !== nodes.length) {
|
|
45
|
+
throw new Error('Incomplete compiler symbol evidence.');
|
|
46
|
+
}
|
|
47
|
+
const aliases = new Map();
|
|
48
|
+
const queries = nodes.map(async function cacheSymbol(node, index) {
|
|
49
|
+
const symbol = symbols[index];
|
|
50
|
+
const isAlias = symbol?.flags === analysis.compiler.SymbolFlags.Alias;
|
|
51
|
+
const lookup = isAlias
|
|
52
|
+
? aliases.get(symbol) ?? analysis.checker.getAliasedSymbol(symbol)
|
|
53
|
+
: Promise.resolve(symbol);
|
|
54
|
+
if (isAlias) {
|
|
55
|
+
aliases.set(symbol, lookup);
|
|
56
|
+
}
|
|
57
|
+
cache.set(node, lookup);
|
|
58
|
+
return await lookup;
|
|
59
|
+
});
|
|
60
|
+
await Promise.all(queries);
|
|
61
|
+
}
|
|
62
|
+
export async function originalSourceFile(analysis, path) {
|
|
63
|
+
const file = await analysis.program.getSourceFile(path) ?? await canonicalSourceFile(analysis, path);
|
|
64
|
+
if (file !== undefined) {
|
|
65
|
+
await loadSourceSymbols(analysis, sourceIdentifiers(analysis, file));
|
|
66
|
+
}
|
|
67
|
+
return file;
|
|
68
|
+
}
|
|
69
|
+
async function referencedSymbol(analysis, node) {
|
|
2
70
|
const location = analysis.compiler.isIdentifier(node) ? node.parent : node;
|
|
3
|
-
|
|
71
|
+
const symbol = await (analysis.compiler.isShorthandPropertyAssignment(location)
|
|
4
72
|
? analysis.checker.getShorthandAssignmentValueSymbol(location)
|
|
5
|
-
: analysis.checker.getSymbolAtLocation(node);
|
|
73
|
+
: analysis.checker.getSymbolAtLocation(node));
|
|
74
|
+
return symbol?.flags === analysis.compiler.SymbolFlags.Alias
|
|
75
|
+
? await analysis.checker.getAliasedSymbol(symbol)
|
|
76
|
+
: symbol;
|
|
77
|
+
}
|
|
78
|
+
export async function sourceSymbol(analysis, node) {
|
|
79
|
+
const cache = sourceSymbols(analysis);
|
|
80
|
+
const existing = cache.get(node);
|
|
81
|
+
if (existing !== undefined) {
|
|
82
|
+
return await existing;
|
|
83
|
+
}
|
|
84
|
+
const lookup = referencedSymbol(analysis, node);
|
|
85
|
+
cache.set(node, lookup);
|
|
86
|
+
return await lookup;
|
|
87
|
+
}
|
|
88
|
+
export function sourceChildren(node) {
|
|
89
|
+
const children = [];
|
|
90
|
+
node.forEachChild(function collect(child) {
|
|
91
|
+
children.push(child);
|
|
92
|
+
});
|
|
93
|
+
return children;
|
|
6
94
|
}
|
|
7
|
-
export function
|
|
8
|
-
const
|
|
9
|
-
|
|
95
|
+
export async function sourceDeclarations(symbol) {
|
|
96
|
+
const declarations = await Promise.all(symbol.declarations.map(async function resolveDeclaration(handle) {
|
|
97
|
+
return await handle.resolve();
|
|
98
|
+
}));
|
|
99
|
+
return declarations.filter(function resolved(declaration) {
|
|
100
|
+
return declaration !== undefined;
|
|
101
|
+
});
|
|
10
102
|
}
|
|
11
103
|
export function immutableInitializer(analysis, node) {
|
|
12
104
|
const { compiler } = analysis;
|
|
@@ -47,25 +139,28 @@ function bindingAssignment(analysis, node) {
|
|
|
47
139
|
}
|
|
48
140
|
return false;
|
|
49
141
|
}
|
|
50
|
-
export function validateFunctionBinding(analysis, name) {
|
|
51
|
-
const symbol = sourceSymbol(analysis, name);
|
|
142
|
+
export async function validateFunctionBinding(analysis, name) {
|
|
143
|
+
const symbol = await sourceSymbol(analysis, name);
|
|
52
144
|
if (symbol === undefined) {
|
|
53
145
|
throw new Error('Cannot establish callback function binding.');
|
|
54
146
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
147
|
+
const bindingName = analysis.compiler.isIdentifier(name) ? name.text : symbol.name;
|
|
148
|
+
async function visit(node) {
|
|
149
|
+
if (analysis.compiler.isIdentifier(node) && node.text === bindingName &&
|
|
150
|
+
await sourceSymbol(analysis, node) === symbol && bindingAssignment(analysis, node)) {
|
|
58
151
|
throw new Error('Callback function bindings cannot be reassigned.');
|
|
59
152
|
}
|
|
60
|
-
|
|
153
|
+
for (const child of sourceChildren(node)) {
|
|
154
|
+
await visit(child);
|
|
155
|
+
}
|
|
61
156
|
}
|
|
62
|
-
const declarations = symbol
|
|
157
|
+
const declarations = await sourceDeclarations(symbol);
|
|
63
158
|
const files = new Set(declarations.map(function declarationFile(declaration) {
|
|
64
159
|
return declaration.getSourceFile();
|
|
65
160
|
}));
|
|
66
161
|
for (const file of files) {
|
|
67
162
|
if (!file.isDeclarationFile) {
|
|
68
|
-
visit(file);
|
|
163
|
+
await visit(file);
|
|
69
164
|
}
|
|
70
165
|
}
|
|
71
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-analysis.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/source-analysis.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"source-analysis.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/source-analysis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { immutableInitializer, sourceSymbol, transparentExpression } from "./source-analysis.js";
|
|
2
|
-
export function supportedCall(analysis, call) {
|
|
3
|
-
const
|
|
1
|
+
import { immutableInitializer, sourceChildren, sourceIdentifiers, loadSourceSymbols, sourceDeclarations, sourceSymbol, transparentExpression } from "./source-analysis.js";
|
|
2
|
+
export async function supportedCall(analysis, call) {
|
|
3
|
+
const signature = await analysis.checker.getResolvedSignature(call);
|
|
4
|
+
const declaration = await signature.declaration?.resolve();
|
|
4
5
|
const path = declaration?.getSourceFile().fileName.replaceAll('\\', '/') ?? '';
|
|
5
6
|
return /\/(?:source\/(?:engine|authoring|packages\/(?:engine|test))|node_modules\/@overkill-dev\/(?:engine|test))\//u
|
|
6
7
|
.test(path);
|
|
@@ -20,7 +21,7 @@ function staticReference(analysis, node) {
|
|
|
20
21
|
return compiler.isImportSpecifier(node.parent) || compiler.isTypeQueryNode(node.parent) ||
|
|
21
22
|
compiler.isQualifiedName(node.parent);
|
|
22
23
|
}
|
|
23
|
-
function allowedUse(analysis, node) {
|
|
24
|
+
async function allowedUse(analysis, node) {
|
|
24
25
|
const use = storageUse(analysis, node);
|
|
25
26
|
const { parent } = use;
|
|
26
27
|
const { compiler } = analysis;
|
|
@@ -29,7 +30,7 @@ function allowedUse(analysis, node) {
|
|
|
29
30
|
}
|
|
30
31
|
return compiler.isCallExpression(parent) && parent.arguments.some(function matching(argument) {
|
|
31
32
|
return argument === use;
|
|
32
|
-
}) && supportedCall(analysis, parent);
|
|
33
|
+
}) && await supportedCall(analysis, parent);
|
|
33
34
|
}
|
|
34
35
|
function storageAlias(analysis, node) {
|
|
35
36
|
const use = storageUse(analysis, node);
|
|
@@ -41,23 +42,73 @@ function storageAlias(analysis, node) {
|
|
|
41
42
|
}
|
|
42
43
|
return undefined;
|
|
43
44
|
}
|
|
44
|
-
function
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
45
|
+
function addBindingNames(compiler, bindings, addName) {
|
|
46
|
+
if (compiler.isNamespaceImport(bindings)) {
|
|
47
|
+
addName(bindings.name.text);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
for (const binding of bindings.elements) {
|
|
51
|
+
addName(binding.name.text);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function addImportNames(compiler, clause, addName) {
|
|
56
|
+
if (clause.name !== undefined) {
|
|
57
|
+
addName(clause.name.text);
|
|
58
|
+
}
|
|
59
|
+
if (clause.namedBindings !== undefined) {
|
|
60
|
+
addBindingNames(compiler, clause.namedBindings, addName);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function referenceNames(analysis, file, symbol) {
|
|
64
|
+
const names = new Set([symbol.name]);
|
|
65
|
+
for (const statement of file.statements) {
|
|
66
|
+
if (analysis.compiler.isImportEqualsDeclaration(statement)) {
|
|
67
|
+
names.add(statement.name.text);
|
|
68
|
+
}
|
|
69
|
+
if (analysis.compiler.isImportDeclaration(statement) && statement.importClause !== undefined) {
|
|
70
|
+
addImportNames(analysis.compiler, statement.importClause, function addReferenceName(name) {
|
|
71
|
+
names.add(name);
|
|
72
|
+
});
|
|
55
73
|
}
|
|
56
|
-
compiler.forEachChild(node, visit);
|
|
57
74
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
75
|
+
return names;
|
|
76
|
+
}
|
|
77
|
+
async function validateStorageReference(analysis, node, validate) {
|
|
78
|
+
const alias = storageAlias(analysis, node);
|
|
79
|
+
if (alias !== undefined) {
|
|
80
|
+
await validate(alias);
|
|
81
|
+
}
|
|
82
|
+
else if (!await allowedUse(analysis, node)) {
|
|
83
|
+
throw new Error('Callback options may be mutated or escape static source ownership.');
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
async function validateFileReferences(analysis, file, symbol, validate) {
|
|
87
|
+
const names = referenceNames(analysis, file, symbol);
|
|
88
|
+
const identifiers = sourceIdentifiers(analysis, file).filter(function matchingName(node) {
|
|
89
|
+
return names.has(node.text);
|
|
90
|
+
});
|
|
91
|
+
await loadSourceSymbols(analysis, identifiers);
|
|
92
|
+
async function visit(node) {
|
|
93
|
+
if (analysis.compiler.isIdentifier(node) && names.has(node.text) &&
|
|
94
|
+
await sourceSymbol(analysis, node) === symbol) {
|
|
95
|
+
await validateStorageReference(analysis, node, validate);
|
|
96
|
+
}
|
|
97
|
+
for (const child of sourceChildren(node)) {
|
|
98
|
+
await visit(child);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
await visit(file);
|
|
102
|
+
}
|
|
103
|
+
async function validateReferences(analysis, symbol, validate) {
|
|
104
|
+
const names = await analysis.program.getSourceFileNames();
|
|
105
|
+
const paths = names.filter(function applicationSource(path) {
|
|
106
|
+
return !/[/\\]node_modules[/\\]/u.test(path) && !/\.d\.[cm]?ts$/u.test(path);
|
|
107
|
+
});
|
|
108
|
+
for (const path of paths) {
|
|
109
|
+
const file = await analysis.program.getSourceFile(path);
|
|
110
|
+
if (file !== undefined && !file.isDeclarationFile && !file.fileName.includes('/node_modules/')) {
|
|
111
|
+
await validateFileReferences(analysis, file, symbol, validate);
|
|
61
112
|
}
|
|
62
113
|
}
|
|
63
114
|
}
|
|
@@ -75,34 +126,34 @@ function exportedStorage(analysis, declaration) {
|
|
|
75
126
|
return modifier.kind === compiler.SyntaxKind.ExportKeyword;
|
|
76
127
|
});
|
|
77
128
|
}
|
|
78
|
-
function validateInitializers(analysis, symbol, validate) {
|
|
79
|
-
const declarations = symbol
|
|
129
|
+
async function validateInitializers(analysis, symbol, validate) {
|
|
130
|
+
const declarations = await sourceDeclarations(symbol);
|
|
80
131
|
for (const declaration of declarations) {
|
|
81
132
|
if (exportedStorage(analysis, declaration)) {
|
|
82
133
|
throw new Error('Exported callback options escape static source ownership.');
|
|
83
134
|
}
|
|
84
135
|
const initializer = immutableInitializer(analysis, declaration);
|
|
85
136
|
if (initializer !== undefined) {
|
|
86
|
-
validate(initializer);
|
|
137
|
+
await validate(initializer);
|
|
87
138
|
}
|
|
88
139
|
}
|
|
89
140
|
}
|
|
90
|
-
export function validateCallbackStorage(analysis, initial) {
|
|
141
|
+
export async function validateCallbackStorage(analysis, initial) {
|
|
91
142
|
const seen = new Set();
|
|
92
|
-
function validate(input) {
|
|
143
|
+
async function validate(input) {
|
|
93
144
|
const inner = transparentExpression(analysis, input);
|
|
94
145
|
if (inner !== undefined) {
|
|
95
|
-
validate(inner);
|
|
146
|
+
await validate(inner);
|
|
96
147
|
return;
|
|
97
148
|
}
|
|
98
|
-
const symbol = analysis.compiler.isIdentifier(input) ? sourceSymbol(analysis, input) : undefined;
|
|
149
|
+
const symbol = analysis.compiler.isIdentifier(input) ? await sourceSymbol(analysis, input) : undefined;
|
|
99
150
|
if (symbol === undefined || seen.has(symbol)) {
|
|
100
151
|
return;
|
|
101
152
|
}
|
|
102
153
|
seen.add(symbol);
|
|
103
|
-
validateInitializers(analysis, symbol, validate);
|
|
104
|
-
validateReferences(analysis, symbol, validate);
|
|
154
|
+
await validateInitializers(analysis, symbol, validate);
|
|
155
|
+
await validateReferences(analysis, symbol, validate);
|
|
105
156
|
}
|
|
106
|
-
validate(initial);
|
|
157
|
+
await validate(initial);
|
|
107
158
|
}
|
|
108
159
|
//# sourceMappingURL=source-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-options.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/source-options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"source-options.js","sourceRoot":"","sources":["../../../../../source/packages/type-test/source-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { resolveSourceLocation, isTableBodyOrigin } from "@overkill-dev/engine";
|
|
2
|
-
import { sourceSymbol, immutableInitializer, transparentExpression, validateFunctionBinding } from "./source-analysis.js";
|
|
2
|
+
import { sourceSymbol, sourceDeclarations, originalSourceFile, immutableInitializer, transparentExpression, validateFunctionBinding } from "./source-analysis.js";
|
|
3
3
|
import { validateCallbackStorage, supportedCall } from "./source-options.js";
|
|
4
4
|
function isSourceBody(compiler, node) {
|
|
5
5
|
return compiler.isArrowFunction(node) || compiler.isFunctionExpression(node) ||
|
|
6
6
|
compiler.isFunctionDeclaration(node) || compiler.isMethodDeclaration(node);
|
|
7
7
|
}
|
|
8
|
-
function callbackDeclarations(analysis, expression) {
|
|
9
|
-
|
|
8
|
+
async function callbackDeclarations(analysis, expression) {
|
|
9
|
+
const symbol = await sourceSymbol(analysis, expression);
|
|
10
|
+
return symbol === undefined ? [] : await sourceDeclarations(symbol);
|
|
10
11
|
}
|
|
11
12
|
function constantExpression(analysis, declarations) {
|
|
12
13
|
const declaration = declarations.length === 1 ? declarations[0] : undefined;
|
|
@@ -16,27 +17,27 @@ function constantExpression(analysis, declarations) {
|
|
|
16
17
|
}
|
|
17
18
|
return initializer;
|
|
18
19
|
}
|
|
19
|
-
function declarationExpression(analysis, expression) {
|
|
20
|
-
const declarations = callbackDeclarations(analysis, expression);
|
|
20
|
+
async function declarationExpression(analysis, expression) {
|
|
21
|
+
const declarations = await callbackDeclarations(analysis, expression);
|
|
21
22
|
const implementations = declarations.filter(function implemented(node) {
|
|
22
23
|
return isSourceBody(analysis.compiler, node) && node.body !== undefined;
|
|
23
24
|
});
|
|
24
25
|
const [implementation] = implementations;
|
|
25
26
|
if (implementations.length === 1 && implementation !== undefined) {
|
|
26
27
|
if (analysis.compiler.isFunctionDeclaration(implementation)) {
|
|
27
|
-
validateFunctionBinding(analysis, implementation.name ?? expression);
|
|
28
|
+
await validateFunctionBinding(analysis, implementation.name ?? expression);
|
|
28
29
|
}
|
|
29
30
|
return implementation;
|
|
30
31
|
}
|
|
31
32
|
return constantExpression(analysis, declarations);
|
|
32
33
|
}
|
|
33
|
-
function nextExpression(analysis, node) {
|
|
34
|
+
async function nextExpression(analysis, node) {
|
|
34
35
|
return transparentExpression(analysis, node) ??
|
|
35
|
-
(analysis.compiler.isIdentifier(node) ? declarationExpression(analysis, node) : undefined);
|
|
36
|
+
(analysis.compiler.isIdentifier(node) ? await declarationExpression(analysis, node) : undefined);
|
|
36
37
|
}
|
|
37
|
-
function originalExpression(analysis, initial) {
|
|
38
|
+
async function originalExpression(analysis, initial) {
|
|
38
39
|
let expression = initial;
|
|
39
|
-
let next = nextExpression(analysis, expression);
|
|
40
|
+
let next = await nextExpression(analysis, expression);
|
|
40
41
|
const seen = new Set([initial]);
|
|
41
42
|
while (next !== undefined) {
|
|
42
43
|
if (seen.has(next)) {
|
|
@@ -44,23 +45,23 @@ function originalExpression(analysis, initial) {
|
|
|
44
45
|
}
|
|
45
46
|
seen.add(next);
|
|
46
47
|
expression = next;
|
|
47
|
-
next = nextExpression(analysis, expression);
|
|
48
|
+
next = await nextExpression(analysis, expression);
|
|
48
49
|
}
|
|
49
50
|
return expression;
|
|
50
51
|
}
|
|
51
|
-
export function declaredBody(analysis, initial) {
|
|
52
|
+
export async function declaredBody(analysis, initial) {
|
|
52
53
|
let expression = initial;
|
|
53
54
|
while (analysis.compiler.isParenthesizedExpression(expression) ||
|
|
54
55
|
analysis.compiler.isExpressionWithTypeArguments(expression)) {
|
|
55
56
|
expression = expression.expression;
|
|
56
57
|
}
|
|
57
|
-
const resolved = originalExpression(analysis, expression);
|
|
58
|
+
const resolved = await originalExpression(analysis, expression);
|
|
58
59
|
if (isSourceBody(analysis.compiler, resolved) && resolved.body !== undefined) {
|
|
59
60
|
return resolved;
|
|
60
61
|
}
|
|
61
62
|
throw new Error('Callback source is not a statically identifiable function body.');
|
|
62
63
|
}
|
|
63
|
-
function propertyExpression(analysis, property) {
|
|
64
|
+
async function propertyExpression(analysis, property) {
|
|
64
65
|
if (analysis.compiler.isPropertyAssignment(property)) {
|
|
65
66
|
return property.initializer;
|
|
66
67
|
}
|
|
@@ -68,18 +69,18 @@ function propertyExpression(analysis, property) {
|
|
|
68
69
|
return property;
|
|
69
70
|
}
|
|
70
71
|
if (analysis.compiler.isShorthandPropertyAssignment(property)) {
|
|
71
|
-
return declarationExpression(analysis, property);
|
|
72
|
+
return await declarationExpression(analysis, property);
|
|
72
73
|
}
|
|
73
74
|
throw new Error('Unsupported callback property source.');
|
|
74
75
|
}
|
|
75
|
-
function objectField(analysis, input, field) {
|
|
76
|
-
validateCallbackStorage(analysis, input);
|
|
77
|
-
const node = originalExpression(analysis, input);
|
|
76
|
+
async function objectField(analysis, input, field) {
|
|
77
|
+
await validateCallbackStorage(analysis, input);
|
|
78
|
+
const node = await originalExpression(analysis, input);
|
|
78
79
|
if (!analysis.compiler.isObjectLiteralExpression(node)) {
|
|
79
80
|
throw new Error('Unsupported callback options expression.');
|
|
80
81
|
}
|
|
81
82
|
const property = node.properties.findLast(function named(entry) {
|
|
82
|
-
return entry
|
|
83
|
+
return !analysis.compiler.isSpreadAssignment(entry) &&
|
|
83
84
|
(analysis.compiler.isIdentifier(entry.name) || analysis.compiler.isStringLiteral(entry.name)) &&
|
|
84
85
|
entry.name.text === field;
|
|
85
86
|
});
|
|
@@ -93,15 +94,15 @@ function objectField(analysis, input, field) {
|
|
|
93
94
|
if (property === undefined) {
|
|
94
95
|
throw new Error(`Callback definition has no explicit ${field} source.`);
|
|
95
96
|
}
|
|
96
|
-
return propertyExpression(analysis, property);
|
|
97
|
+
return await propertyExpression(analysis, property);
|
|
97
98
|
}
|
|
98
|
-
function validatedCases(analysis, input) {
|
|
99
|
-
const source = objectField(analysis, input, 'cases');
|
|
100
|
-
validateCallbackStorage(analysis, source);
|
|
99
|
+
async function validatedCases(analysis, input) {
|
|
100
|
+
const source = await objectField(analysis, input, 'cases');
|
|
101
|
+
await validateCallbackStorage(analysis, source);
|
|
101
102
|
return source;
|
|
102
103
|
}
|
|
103
|
-
function tableCaseExpression(analysis, input, index) {
|
|
104
|
-
const cases = originalExpression(analysis, validatedCases(analysis, input));
|
|
104
|
+
async function tableCaseExpression(analysis, input, index) {
|
|
105
|
+
const cases = await originalExpression(analysis, await validatedCases(analysis, input));
|
|
105
106
|
if (!analysis.compiler.isArrayLiteralExpression(cases)) {
|
|
106
107
|
throw new Error('Low-level table cases require static source ownership.');
|
|
107
108
|
}
|
|
@@ -112,7 +113,7 @@ function tableCaseExpression(analysis, input, index) {
|
|
|
112
113
|
if (row === undefined) {
|
|
113
114
|
throw new Error('Table case source index is missing.');
|
|
114
115
|
}
|
|
115
|
-
return objectField(analysis, row, 'body');
|
|
116
|
+
return await objectField(analysis, row, 'body');
|
|
116
117
|
}
|
|
117
118
|
const authoringNames = new Set([
|
|
118
119
|
'test',
|
|
@@ -124,34 +125,35 @@ const authoringNames = new Set([
|
|
|
124
125
|
'withRuntime',
|
|
125
126
|
'defineParameterizedTestBody'
|
|
126
127
|
]);
|
|
127
|
-
function expressionName(analysis, expression) {
|
|
128
|
+
async function expressionName(analysis, expression) {
|
|
128
129
|
const location = analysis.compiler.isPropertyAccessExpression(expression) ? expression.name : expression;
|
|
129
|
-
|
|
130
|
+
const symbol = await sourceSymbol(analysis, location);
|
|
131
|
+
return symbol?.name;
|
|
130
132
|
}
|
|
131
|
-
function authoringName(analysis, expression, seen) {
|
|
132
|
-
const name = expressionName(analysis, expression);
|
|
133
|
+
async function authoringName(analysis, expression, seen) {
|
|
134
|
+
const name = await expressionName(analysis, expression);
|
|
133
135
|
if (name !== undefined && authoringNames.has(name)) {
|
|
134
136
|
return name;
|
|
135
137
|
}
|
|
136
138
|
if (seen.has(expression)) {
|
|
137
139
|
throw new Error('Cyclic authoring API alias.');
|
|
138
140
|
}
|
|
139
|
-
const next = nextExpression(analysis, expression);
|
|
140
|
-
return next === undefined ? name : authoringName(analysis, next, new Set([...seen, expression]));
|
|
141
|
+
const next = await nextExpression(analysis, expression);
|
|
142
|
+
return next === undefined ? name : await authoringName(analysis, next, new Set([...seen, expression]));
|
|
141
143
|
}
|
|
142
|
-
function callName(analysis, call) {
|
|
143
|
-
return authoringName(analysis, call.expression, new Set());
|
|
144
|
+
async function callName(analysis, call) {
|
|
145
|
+
return await authoringName(analysis, call.expression, new Set());
|
|
144
146
|
}
|
|
145
|
-
function positionalBody(analysis, call, first, name) {
|
|
147
|
+
async function positionalBody(analysis, call, first, name) {
|
|
146
148
|
const positional = ['test', 'withResource', 'withResources', 'withRuntime'];
|
|
147
149
|
const body = call.arguments[1];
|
|
148
150
|
if (name !== undefined && positional.includes(name) && body !== undefined) {
|
|
149
151
|
return body;
|
|
150
152
|
}
|
|
151
|
-
return objectField(analysis, first, name === 'table' ? 'test' : 'body');
|
|
153
|
+
return await objectField(analysis, first, name === 'table' ? 'test' : 'body');
|
|
152
154
|
}
|
|
153
|
-
function bodyExpression(analysis, call, origin) {
|
|
154
|
-
const name = callName(analysis, call);
|
|
155
|
+
async function bodyExpression(analysis, call, origin) {
|
|
156
|
+
const name = await callName(analysis, call);
|
|
155
157
|
const first = call.arguments[0];
|
|
156
158
|
if (first === undefined) {
|
|
157
159
|
throw new Error('Callback construction has no arguments.');
|
|
@@ -160,9 +162,9 @@ function bodyExpression(analysis, call, origin) {
|
|
|
160
162
|
return first;
|
|
161
163
|
}
|
|
162
164
|
if (name === 'createTable' && isTableBodyOrigin(origin)) {
|
|
163
|
-
return tableCaseExpression(analysis, first, origin.tableIndex);
|
|
165
|
+
return await tableCaseExpression(analysis, first, origin.tableIndex);
|
|
164
166
|
}
|
|
165
|
-
return positionalBody(analysis, call, first, name);
|
|
167
|
+
return await positionalBody(analysis, call, first, name);
|
|
166
168
|
}
|
|
167
169
|
function callAtOffset(analysis, file, offset) {
|
|
168
170
|
const calls = [];
|
|
@@ -171,7 +173,7 @@ function callAtOffset(analysis, file, offset) {
|
|
|
171
173
|
if (analysis.compiler.isCallExpression(node)) {
|
|
172
174
|
calls.push(node);
|
|
173
175
|
}
|
|
174
|
-
|
|
176
|
+
node.forEachChild(visit);
|
|
175
177
|
}
|
|
176
178
|
}
|
|
177
179
|
visit(file);
|
|
@@ -181,17 +183,17 @@ function callAtOffset(analysis, file, offset) {
|
|
|
181
183
|
}
|
|
182
184
|
return call;
|
|
183
185
|
}
|
|
184
|
-
function locatedCall(analysis, origin) {
|
|
186
|
+
async function locatedCall(analysis, origin) {
|
|
185
187
|
const location = resolveSourceLocation(origin.location);
|
|
186
188
|
if (location.kind !== 'known' || location.line === null || location.column === null) {
|
|
187
189
|
throw new Error('Type-test checking requires a known callback source location.');
|
|
188
190
|
}
|
|
189
|
-
const file = analysis
|
|
191
|
+
const file = await originalSourceFile(analysis, location.file);
|
|
190
192
|
if (file === undefined) {
|
|
191
193
|
throw new Error(`Callback source is outside the checker project: ${location.file}`);
|
|
192
194
|
}
|
|
193
195
|
const call = callAtOffset(analysis, file, file.getPositionOfLineAndCharacter(location.line - 1, location.column - 1));
|
|
194
|
-
if (!supportedCall(analysis, call)) {
|
|
196
|
+
if (!await supportedCall(analysis, call)) {
|
|
195
197
|
throw new Error('Callback anchor does not identify a supported authoring API.');
|
|
196
198
|
}
|
|
197
199
|
return call;
|
|
@@ -202,9 +204,9 @@ function preferredOrigin(origin) {
|
|
|
202
204
|
}
|
|
203
205
|
return resolveSourceLocation(origin.forwarded.location).kind === 'known' ? origin.forwarded : origin;
|
|
204
206
|
}
|
|
205
|
-
export function resolveBodyOrigin(analysis, supplied) {
|
|
207
|
+
export async function resolveBodyOrigin(analysis, supplied) {
|
|
206
208
|
const origin = preferredOrigin(supplied);
|
|
207
|
-
return declaredBody(analysis, bodyExpression(analysis, locatedCall(analysis, origin), origin));
|
|
209
|
+
return await declaredBody(analysis, await bodyExpression(analysis, await locatedCall(analysis, origin), origin));
|
|
208
210
|
}
|
|
209
211
|
export function namedBodyParameter(analysis, body) {
|
|
210
212
|
const parameter = body.parameters[0];
|