brighterscript 0.66.0-alpha.4 → 0.66.0-alpha.6
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/CHANGELOG.md +29 -0
- package/dist/DiagnosticMessages.d.ts +21 -3
- package/dist/DiagnosticMessages.js +35 -2
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.d.ts +1 -0
- package/dist/LanguageServer.js +8 -5
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Program.d.ts +20 -8
- package/dist/Program.js +107 -60
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +14 -2
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +15 -13
- package/dist/Scope.js +26 -65
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +17 -10
- package/dist/SymbolTable.js +48 -26
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.d.ts +2 -0
- package/dist/XmlScope.js +38 -0
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/creators.d.ts +3 -1
- package/dist/astUtils/creators.js +14 -4
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +24 -5
- package/dist/astUtils/reflection.js +58 -13
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +85 -3
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/bscPlugin/CallExpressionInfo.d.ts +3 -3
- package/dist/bscPlugin/CallExpressionInfo.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +4 -4
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +44 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +353 -20
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +1452 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js.map +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +9 -4
- package/dist/bscPlugin/hover/HoverProcessor.js +64 -67
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +162 -4
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +20 -16
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +22 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +194 -42
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +621 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +7 -2
- package/dist/diagnosticUtils.js +43 -15
- package/dist/diagnosticUtils.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +10 -8
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +3 -20
- package/dist/files/BrsFile.js +7 -355
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +2 -248
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +1 -6
- package/dist/files/XmlFile.js +0 -13
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +0 -36
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/globalCallables.js +1 -5
- package/dist/globalCallables.js.map +1 -1
- package/dist/interfaces.d.ts +22 -2
- package/dist/interfaces.js +4 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/lexer/Lexer.d.ts +12 -0
- package/dist/lexer/Lexer.js +27 -2
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +40 -0
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/Token.d.ts +4 -0
- package/dist/lexer/Token.js.map +1 -1
- package/dist/lexer/TokenKind.d.ts +4 -0
- package/dist/lexer/TokenKind.js +10 -1
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/AstNode.d.ts +8 -1
- package/dist/parser/AstNode.js +16 -0
- package/dist/parser/AstNode.js.map +1 -1
- package/dist/parser/Expression.d.ts +16 -1
- package/dist/parser/Expression.js +75 -11
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.d.ts +7 -0
- package/dist/parser/Parser.js +55 -7
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +330 -4
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +1 -1
- package/dist/parser/Statement.d.ts +18 -6
- package/dist/parser/Statement.js +54 -16
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/Parser.spec.js +2 -1
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js +16 -8
- package/dist/parser/tests/controlFlow/For.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/ForEach.spec.js +12 -6
- package/dist/parser/tests/controlFlow/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/While.spec.js +8 -4
- package/dist/parser/tests/controlFlow/While.spec.js.map +1 -1
- package/dist/parser/tests/expression/Call.spec.js +4 -4
- package/dist/parser/tests/expression/Call.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +13 -13
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +1 -34
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.js +1 -257
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +8 -0
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +6 -3
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/ReturnStatement.spec.js +5 -3
- package/dist/parser/tests/statement/ReturnStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Set.spec.js +26 -13
- package/dist/parser/tests/statement/Set.spec.js.map +1 -1
- package/dist/roku-types/data.json +156 -111
- package/dist/roku-types/index.d.ts +2 -27
- package/dist/types/ArrayType.d.ts +4 -1
- package/dist/types/ArrayType.js +43 -7
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +31 -2
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.d.ts +11 -0
- package/dist/types/AssociativeArrayType.js +52 -0
- package/dist/types/AssociativeArrayType.js.map +1 -0
- package/dist/types/BaseFunctionType.d.ts +2 -1
- package/dist/types/BaseFunctionType.js +1 -1
- package/dist/types/BaseFunctionType.js.map +1 -1
- package/dist/types/BooleanType.d.ts +2 -4
- package/dist/types/BooleanType.js +6 -7
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscType.d.ts +8 -4
- package/dist/types/BscType.js +42 -14
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BscTypeKind.d.ts +2 -0
- package/dist/types/BscTypeKind.js +2 -0
- package/dist/types/BscTypeKind.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.d.ts +20 -0
- package/dist/types/BuiltInInterfaceAdder.js +139 -0
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -0
- package/dist/types/BuiltInInterfaceAdder.spec.d.ts +1 -0
- package/dist/types/BuiltInInterfaceAdder.spec.js +109 -0
- package/dist/types/BuiltInInterfaceAdder.spec.js.map +1 -0
- package/dist/types/ClassType.d.ts +6 -1
- package/dist/types/ClassType.js +26 -2
- package/dist/types/ClassType.js.map +1 -1
- package/dist/types/ComponentType.d.ts +26 -0
- package/dist/types/ComponentType.js +80 -0
- package/dist/types/ComponentType.js.map +1 -0
- package/dist/types/DoubleType.d.ts +2 -4
- package/dist/types/DoubleType.js +6 -7
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/DynamicType.d.ts +2 -2
- package/dist/types/DynamicType.js +3 -1
- package/dist/types/DynamicType.js.map +1 -1
- package/dist/types/EnumType.d.ts +4 -5
- package/dist/types/EnumType.js +8 -7
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/FloatType.d.ts +2 -4
- package/dist/types/FloatType.js +6 -7
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/FunctionType.d.ts +2 -1
- package/dist/types/FunctionType.js +6 -2
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/IntegerType.d.ts +2 -4
- package/dist/types/IntegerType.js +6 -7
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +2 -1
- package/dist/types/InterfaceType.js +8 -4
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +2 -2
- package/dist/types/InvalidType.d.ts +1 -1
- package/dist/types/InvalidType.js +5 -1
- package/dist/types/InvalidType.js.map +1 -1
- package/dist/types/LongIntegerType.d.ts +2 -4
- package/dist/types/LongIntegerType.js +6 -7
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/ObjectType.d.ts +3 -3
- package/dist/types/ObjectType.js +3 -1
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +14 -0
- package/dist/types/ReferenceType.js +114 -13
- package/dist/types/ReferenceType.js.map +1 -1
- package/dist/types/ReferenceType.spec.js +15 -0
- package/dist/types/ReferenceType.spec.js.map +1 -1
- package/dist/types/StringType.d.ts +2 -4
- package/dist/types/StringType.js +5 -6
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +2 -1
- package/dist/types/TypedFunctionType.js +10 -3
- package/dist/types/TypedFunctionType.js.map +1 -1
- package/dist/types/UninitializedType.d.ts +2 -1
- package/dist/types/UninitializedType.js +1 -1
- package/dist/types/UninitializedType.js.map +1 -1
- package/dist/types/UnionType.d.ts +4 -2
- package/dist/types/UnionType.js +25 -4
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/UnionType.spec.js +46 -19
- package/dist/types/UnionType.spec.js.map +1 -1
- package/dist/types/VoidType.d.ts +2 -1
- package/dist/types/VoidType.js +6 -2
- package/dist/types/VoidType.js.map +1 -1
- package/dist/types/helpers.d.ts +2 -0
- package/dist/types/helpers.js +18 -3
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +25 -2
- package/dist/util.js +179 -13
- package/dist/util.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TypePropertyReferenceType = exports.ReferenceType = exports.referenceTypeFactory = void 0;
|
|
3
|
+
exports.BinaryOperatorReferenceType = exports.TypePropertyReferenceType = exports.ReferenceType = exports.referenceTypeFactory = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
const BscType_1 = require("./BscType");
|
|
6
6
|
const DynamicType_1 = require("./DynamicType");
|
|
@@ -28,6 +28,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
28
28
|
this.referenceChain = new Set();
|
|
29
29
|
this.propertyTypeReference = new Map();
|
|
30
30
|
this.memberTypeReferences = new Map();
|
|
31
|
+
this.callFuncMemberTypeReferences = new Map();
|
|
31
32
|
this.futureMemberTableProvider = () => {
|
|
32
33
|
return {
|
|
33
34
|
getSymbolType: (innerName, innerOptions) => {
|
|
@@ -36,10 +37,26 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
36
37
|
return resolvedType.getMemberType(innerName, innerOptions);
|
|
37
38
|
}
|
|
38
39
|
},
|
|
39
|
-
setCachedType: (innerName,
|
|
40
|
+
setCachedType: (innerName, innerResolvedTypeCacheEntry, options) => {
|
|
40
41
|
const resolvedType = this.resolve();
|
|
41
42
|
if (resolvedType) {
|
|
42
|
-
resolvedType.memberTable.setCachedType(innerName,
|
|
43
|
+
resolvedType.memberTable.setCachedType(innerName, innerResolvedTypeCacheEntry, options);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
};
|
|
48
|
+
this.futureCallFuncMemberTableProvider = () => {
|
|
49
|
+
return {
|
|
50
|
+
getSymbolType: (innerName, innerOptions) => {
|
|
51
|
+
const resolvedType = this.resolve();
|
|
52
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
53
|
+
return resolvedType.getCallFuncType(innerName, innerOptions);
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
setCachedType: (innerName, innerResolvedTypeCacheEntry, options) => {
|
|
57
|
+
const resolvedType = this.resolve();
|
|
58
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
59
|
+
resolvedType.getCallFuncTable().setCachedType(innerName, innerResolvedTypeCacheEntry, options);
|
|
43
60
|
}
|
|
44
61
|
}
|
|
45
62
|
};
|
|
@@ -61,7 +78,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
61
78
|
if (propName === 'isResolvable') {
|
|
62
79
|
return () => {
|
|
63
80
|
let resultSoFar = this.resolve();
|
|
64
|
-
while ((0, reflection_1.isReferenceType)(resultSoFar)) {
|
|
81
|
+
while (resultSoFar && (0, reflection_1.isReferenceType)(resultSoFar)) {
|
|
65
82
|
resultSoFar = resultSoFar.getTarget();
|
|
66
83
|
}
|
|
67
84
|
return !!resultSoFar;
|
|
@@ -114,6 +131,24 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
114
131
|
return memberTypeReference;
|
|
115
132
|
};
|
|
116
133
|
}
|
|
134
|
+
else if (propName === 'getCallFuncType') {
|
|
135
|
+
// We're looking for a callfunc member of a reference type
|
|
136
|
+
// Since we don't know what type this is, yet, return ReferenceType
|
|
137
|
+
return (memberName, options) => {
|
|
138
|
+
const resolvedType = this.resolve();
|
|
139
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
140
|
+
return resolvedType.getCallFuncType(memberName, options);
|
|
141
|
+
}
|
|
142
|
+
const refLookUp = `${memberName.toLowerCase()}-${options.flags}-callfunc`;
|
|
143
|
+
let callFuncMemberTypeReference = this.callFuncMemberTypeReferences.get(refLookUp);
|
|
144
|
+
if (callFuncMemberTypeReference) {
|
|
145
|
+
return callFuncMemberTypeReference;
|
|
146
|
+
}
|
|
147
|
+
callFuncMemberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureCallFuncMemberTableProvider);
|
|
148
|
+
this.callFuncMemberTypeReferences.set(refLookUp, callFuncMemberTypeReference);
|
|
149
|
+
return callFuncMemberTypeReference;
|
|
150
|
+
};
|
|
151
|
+
}
|
|
117
152
|
else if (propName === 'toString') {
|
|
118
153
|
// This type was never found
|
|
119
154
|
// For diagnostics, we should return the expected name of of the type
|
|
@@ -134,6 +169,19 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
134
169
|
else if (propName === 'memberTable') {
|
|
135
170
|
return this.memberTable;
|
|
136
171
|
}
|
|
172
|
+
else if (propName === 'getMemberTable') {
|
|
173
|
+
return () => {
|
|
174
|
+
return this.memberTable;
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
else if (propName === 'callFuncTable') {
|
|
178
|
+
return this.callFuncMemberTable;
|
|
179
|
+
}
|
|
180
|
+
else if (propName === 'getCallFuncTable') {
|
|
181
|
+
return () => {
|
|
182
|
+
return this.callFuncMemberTable;
|
|
183
|
+
};
|
|
184
|
+
}
|
|
137
185
|
else if (propName === 'isTypeCompatible') {
|
|
138
186
|
return (targetType) => {
|
|
139
187
|
return (0, reflection_1.isDynamicType)(targetType);
|
|
@@ -148,6 +196,15 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
148
196
|
return false;
|
|
149
197
|
};
|
|
150
198
|
}
|
|
199
|
+
else if (propName === 'addBuiltInInterfaces') {
|
|
200
|
+
// this is an unknown type. There is no use in adding built in interfaces
|
|
201
|
+
// return no-op function
|
|
202
|
+
return () => { };
|
|
203
|
+
}
|
|
204
|
+
else if (propName === 'hasAddedBuiltInInterfaces') {
|
|
205
|
+
// this is an unknown type. There is no use in adding built in interfaces
|
|
206
|
+
return true;
|
|
207
|
+
}
|
|
151
208
|
}
|
|
152
209
|
if (!innerType) {
|
|
153
210
|
innerType = DynamicType_1.DynamicType.instance;
|
|
@@ -162,7 +219,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
162
219
|
let innerType = this.resolve();
|
|
163
220
|
// Look for circular references
|
|
164
221
|
if (!innerType || this.referenceChain.has(innerType)) {
|
|
165
|
-
|
|
222
|
+
return false;
|
|
166
223
|
}
|
|
167
224
|
const result = Reflect.set(innerType, name, value, innerType);
|
|
168
225
|
this.referenceChain.clear();
|
|
@@ -184,9 +241,9 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
184
241
|
// could not find this member
|
|
185
242
|
return;
|
|
186
243
|
}
|
|
187
|
-
if ((0, reflection_1.
|
|
244
|
+
if ((0, reflection_1.isAnyReferenceType)(resolvedType)) {
|
|
188
245
|
// If this is a referenceType, keep digging down until we have a non reference Type.
|
|
189
|
-
while ((0, reflection_1.
|
|
246
|
+
while (resolvedType && (0, reflection_1.isAnyReferenceType)(resolvedType)) {
|
|
190
247
|
if (this.referenceChain.has(resolvedType)) {
|
|
191
248
|
// this is a circular reference
|
|
192
249
|
this.circRefCount++;
|
|
@@ -199,9 +256,9 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
199
256
|
this.referenceChain.add(resolvedType);
|
|
200
257
|
resolvedType = resolvedType.getTarget();
|
|
201
258
|
}
|
|
202
|
-
this.tableProvider().setCachedType(this.memberKey, resolvedType, { flags: this.flags });
|
|
259
|
+
this.tableProvider().setCachedType(this.memberKey, { type: resolvedType }, { flags: this.flags });
|
|
203
260
|
}
|
|
204
|
-
if (!(0, reflection_1.
|
|
261
|
+
if (resolvedType && !(0, reflection_1.isAnyReferenceType)(resolvedType)) {
|
|
205
262
|
this.circRefCount = 0;
|
|
206
263
|
this.referenceChain.clear();
|
|
207
264
|
}
|
|
@@ -234,11 +291,12 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
234
291
|
// eslint-disable-next-line no-constructor-return
|
|
235
292
|
return new Proxy(this, {
|
|
236
293
|
get: (target, propName, receiver) => {
|
|
294
|
+
var _a;
|
|
237
295
|
if (propName === '__reflection') {
|
|
238
296
|
// Cheeky way to get `isTypePropertyReferenceType` reflection to work
|
|
239
297
|
return { name: 'TypePropertyReferenceType' };
|
|
240
298
|
}
|
|
241
|
-
if ((0, reflection_1.
|
|
299
|
+
if ((0, reflection_1.isAnyReferenceType)(this.outerType) && !this.outerType.isResolvable()) {
|
|
242
300
|
if (propName === 'getMemberType') {
|
|
243
301
|
//If we're calling `getMemberType()`, we need it to proxy to using the actual symbol table
|
|
244
302
|
//So if that symbol is ever populated, the correct type is passed through
|
|
@@ -250,9 +308,9 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
250
308
|
var _a, _b;
|
|
251
309
|
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.getMemberType(innerName, innerOptions);
|
|
252
310
|
},
|
|
253
|
-
setCachedType: (innerName,
|
|
311
|
+
setCachedType: (innerName, innerTypeCacheEntry, innerOptions) => {
|
|
254
312
|
var _a, _b;
|
|
255
|
-
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.memberTable.setCachedType(innerName,
|
|
313
|
+
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.memberTable.setCachedType(innerName, innerTypeCacheEntry, innerOptions);
|
|
256
314
|
}
|
|
257
315
|
};
|
|
258
316
|
});
|
|
@@ -262,7 +320,7 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
262
320
|
return () => false;
|
|
263
321
|
}
|
|
264
322
|
}
|
|
265
|
-
let inner = this.outerType[this.propertyName];
|
|
323
|
+
let inner = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName];
|
|
266
324
|
if (!inner) {
|
|
267
325
|
inner = DynamicType_1.DynamicType.instance;
|
|
268
326
|
}
|
|
@@ -285,4 +343,47 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
285
343
|
}
|
|
286
344
|
}
|
|
287
345
|
exports.TypePropertyReferenceType = TypePropertyReferenceType;
|
|
346
|
+
/**
|
|
347
|
+
* Use this class for when there is a binary operator and either the left hand side and/or the right hand side
|
|
348
|
+
* are ReferenceTypes
|
|
349
|
+
*/
|
|
350
|
+
class BinaryOperatorReferenceType extends BscType_1.BscType {
|
|
351
|
+
constructor(leftType, operator, rightType, binaryOpResolver) {
|
|
352
|
+
super(operator.text);
|
|
353
|
+
this.leftType = leftType;
|
|
354
|
+
this.operator = operator;
|
|
355
|
+
this.rightType = rightType;
|
|
356
|
+
// eslint-disable-next-line no-constructor-return
|
|
357
|
+
return new Proxy(this, {
|
|
358
|
+
get: (target, propName, receiver) => {
|
|
359
|
+
var _a;
|
|
360
|
+
if (propName === '__reflection') {
|
|
361
|
+
// Cheeky way to get `BinaryOperatorReferenceType` reflection to work
|
|
362
|
+
return { name: 'BinaryOperatorReferenceType' };
|
|
363
|
+
}
|
|
364
|
+
let resultType = (_a = this.cachedType) !== null && _a !== void 0 ? _a : DynamicType_1.DynamicType.instance;
|
|
365
|
+
if (!this.cachedType) {
|
|
366
|
+
if (((0, reflection_1.isAnyReferenceType)(this.leftType) && !this.leftType.isResolvable()) ||
|
|
367
|
+
((0, reflection_1.isAnyReferenceType)(this.rightType) && !this.rightType.isResolvable())) {
|
|
368
|
+
if (propName === 'isResolvable') {
|
|
369
|
+
return () => false;
|
|
370
|
+
}
|
|
371
|
+
if (propName === 'getTarget') {
|
|
372
|
+
return () => undefined;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
else {
|
|
376
|
+
resultType = binaryOpResolver(this.leftType, this.operator, this.rightType);
|
|
377
|
+
this.cachedType = resultType;
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
if (resultType) {
|
|
381
|
+
const result = Reflect.get(resultType, propName, resultType);
|
|
382
|
+
return result;
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
exports.BinaryOperatorReferenceType = BinaryOperatorReferenceType;
|
|
288
389
|
//# sourceMappingURL=ReferenceType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,9 @@ const ClassType_1 = require("./ClassType");
|
|
|
13
13
|
const reflection_1 = require("../astUtils/reflection");
|
|
14
14
|
const TypedFunctionType_1 = require("./TypedFunctionType");
|
|
15
15
|
const NamespaceType_1 = require("./NamespaceType");
|
|
16
|
+
const creators_1 = require("../astUtils/creators");
|
|
17
|
+
const TokenKind_1 = require("../lexer/TokenKind");
|
|
18
|
+
const util_1 = require("../util");
|
|
16
19
|
const runtimeFlag = SymbolTable_2.SymbolTypeFlag.runtime;
|
|
17
20
|
describe('ReferenceType', () => {
|
|
18
21
|
it('can be checked with reflection', () => {
|
|
@@ -63,6 +66,18 @@ describe('ReferenceType', () => {
|
|
|
63
66
|
table.addSymbol('someVar3', null, ref1, SymbolTable_2.SymbolTypeFlag.runtime);
|
|
64
67
|
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbol('someVar0', SymbolTable_2.SymbolTypeFlag.runtime)[0].type, DynamicType_1.DynamicType);
|
|
65
68
|
});
|
|
69
|
+
it('catches circular references in a binary expression', () => {
|
|
70
|
+
const table = new SymbolTable_1.SymbolTable('test');
|
|
71
|
+
const ref = new ReferenceType_1.ReferenceType('notHere', 'notHere', runtimeFlag, () => table);
|
|
72
|
+
const binRef = new ReferenceType_1.BinaryOperatorReferenceType(ref, (0, creators_1.createToken)(TokenKind_1.TokenKind.Plus), StringType_1.StringType.instance, (l, o, r) => {
|
|
73
|
+
return util_1.util.binaryOperatorResultType(l, o, r);
|
|
74
|
+
});
|
|
75
|
+
const binRef2 = new ReferenceType_1.BinaryOperatorReferenceType(ref, (0, creators_1.createToken)(TokenKind_1.TokenKind.Plus), binRef, (l, o, r) => {
|
|
76
|
+
return util_1.util.binaryOperatorResultType(l, o, r);
|
|
77
|
+
});
|
|
78
|
+
table.addSymbol('notHere', null, binRef2, SymbolTable_2.SymbolTypeFlag.runtime);
|
|
79
|
+
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbolType('notHere', { flags: SymbolTable_2.SymbolTypeFlag.runtime }), DynamicType_1.DynamicType);
|
|
80
|
+
});
|
|
66
81
|
});
|
|
67
82
|
});
|
|
68
83
|
describe('PropertyReferenceType', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,gDAA6C;AAC7C,gDAAgD;AAChD,0DAAqD;AACrD,+CAA4C;AAC5C,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import type { GetTypeOptions } from '../interfaces';
|
|
2
1
|
import { BscType } from './BscType';
|
|
3
2
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
|
-
import {
|
|
3
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
5
4
|
export declare class StringType extends BscType {
|
|
6
5
|
typeText?: string;
|
|
7
6
|
constructor(typeText?: string);
|
|
@@ -10,9 +9,8 @@ export declare class StringType extends BscType {
|
|
|
10
9
|
* A static instance that can be used to reduce memory and constructor costs, since there's nothing unique about this
|
|
11
10
|
*/
|
|
12
11
|
static instance: StringType;
|
|
13
|
-
isTypeCompatible(targetType: BscType):
|
|
12
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): any;
|
|
14
13
|
toString(): string;
|
|
15
14
|
toTypeString(): string;
|
|
16
15
|
isEqual(targetType: BscType): boolean;
|
|
17
|
-
getMemberType(memberName: string, options: GetTypeOptions): DynamicType;
|
|
18
16
|
}
|
package/dist/types/StringType.js
CHANGED
|
@@ -4,17 +4,19 @@ exports.StringType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
const BscType_1 = require("./BscType");
|
|
6
6
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
7
|
-
const
|
|
7
|
+
const helpers_1 = require("./helpers");
|
|
8
|
+
const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
|
|
8
9
|
class StringType extends BscType_1.BscType {
|
|
9
10
|
constructor(typeText) {
|
|
10
11
|
super();
|
|
11
12
|
this.typeText = typeText;
|
|
12
13
|
this.kind = BscTypeKind_1.BscTypeKind.StringType;
|
|
13
14
|
}
|
|
14
|
-
isTypeCompatible(targetType) {
|
|
15
|
+
isTypeCompatible(targetType, data) {
|
|
15
16
|
return ((0, reflection_1.isStringType)(targetType) ||
|
|
16
17
|
(0, reflection_1.isDynamicType)(targetType) ||
|
|
17
18
|
(0, reflection_1.isObjectType)(targetType) ||
|
|
19
|
+
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data) ||
|
|
18
20
|
//string enums are compatible with strings
|
|
19
21
|
(((0, reflection_1.isEnumType)(targetType) || (0, reflection_1.isEnumMemberType)(targetType)) && (0, reflection_1.isStringType)(targetType.underlyingType)));
|
|
20
22
|
}
|
|
@@ -28,14 +30,11 @@ class StringType extends BscType_1.BscType {
|
|
|
28
30
|
isEqual(targetType) {
|
|
29
31
|
return (0, reflection_1.isStringType)(targetType);
|
|
30
32
|
}
|
|
31
|
-
getMemberType(memberName, options) {
|
|
32
|
-
//TODO: this should really add the appropriate interface methods from roku-types
|
|
33
|
-
return DynamicType_1.DynamicType.instance;
|
|
34
|
-
}
|
|
35
33
|
}
|
|
36
34
|
exports.StringType = StringType;
|
|
37
35
|
/**
|
|
38
36
|
* A static instance that can be used to reduce memory and constructor costs, since there's nothing unique about this
|
|
39
37
|
*/
|
|
40
38
|
StringType.instance = new StringType('string');
|
|
39
|
+
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('string', StringType.instance);
|
|
41
40
|
//# sourceMappingURL=StringType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,uDAAiH;
|
|
1
|
+
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,uDAAiH;AACjH,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAGhE,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IASM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC7C,0CAA0C;YAC1C,CACI,CAAC,IAAA,uBAAU,EAAC,UAAU,CAAC,IAAI,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,cAAc,CAAC,CACtG,CACJ,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;IACpC,CAAC;;AArCL,gCAsCC;AA7BG;;GAEG;AACW,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;AA4BtD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseFunctionType } from './BaseFunctionType';
|
|
2
2
|
import type { BscType } from './BscType';
|
|
3
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
4
5
|
export declare class TypedFunctionType extends BaseFunctionType {
|
|
5
6
|
returnType: BscType;
|
|
6
7
|
constructor(returnType: BscType);
|
|
@@ -20,7 +21,7 @@ export declare class TypedFunctionType extends BaseFunctionType {
|
|
|
20
21
|
}[];
|
|
21
22
|
setName(name: string): this;
|
|
22
23
|
addParameter(name: string, type: BscType, isOptional: boolean): this;
|
|
23
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
24
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
24
25
|
toString(): string;
|
|
25
26
|
toTypeString(): string;
|
|
26
27
|
isEqual(targetType: BscType): boolean;
|
|
@@ -4,6 +4,8 @@ exports.TypedFunctionType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
const BaseFunctionType_1 = require("./BaseFunctionType");
|
|
6
6
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
7
|
+
const helpers_1 = require("./helpers");
|
|
8
|
+
const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
|
|
7
9
|
class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
8
10
|
constructor(returnType) {
|
|
9
11
|
super();
|
|
@@ -27,19 +29,21 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
27
29
|
});
|
|
28
30
|
return this;
|
|
29
31
|
}
|
|
30
|
-
isTypeCompatible(targetType) {
|
|
32
|
+
isTypeCompatible(targetType, data) {
|
|
31
33
|
if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
32
|
-
(0, reflection_1.isObjectType)(targetType)
|
|
34
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
35
|
+
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data)) {
|
|
33
36
|
return true;
|
|
34
37
|
}
|
|
35
38
|
return this.isEqual(targetType);
|
|
36
39
|
}
|
|
37
40
|
toString() {
|
|
41
|
+
var _a;
|
|
38
42
|
let paramTexts = [];
|
|
39
43
|
for (let param of this.params) {
|
|
40
44
|
paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
|
|
41
45
|
}
|
|
42
|
-
return `${this.isSub ? 'sub' : 'function'} ${this.name}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
|
|
46
|
+
return `${this.isSub ? 'sub' : 'function'} ${(_a = this.name) !== null && _a !== void 0 ? _a : ''}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
|
|
43
47
|
}
|
|
44
48
|
toTypeString() {
|
|
45
49
|
return 'Function';
|
|
@@ -66,4 +70,7 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
exports.TypedFunctionType = TypedFunctionType;
|
|
73
|
+
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.typedFunctionFactory = (returnType) => {
|
|
74
|
+
return new TypedFunctionType(returnType);
|
|
75
|
+
};
|
|
69
76
|
//# sourceMappingURL=TypedFunctionType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypedFunctionType.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAA0F;AAC1F,yDAAsD;AAEtD,+CAA4C;
|
|
1
|
+
{"version":3,"file":"TypedFunctionType.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
1
2
|
import { BscType } from './BscType';
|
|
2
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
4
|
export declare class UninitializedType extends BscType {
|
|
4
5
|
isAssignableTo(targetType: BscType): boolean;
|
|
5
6
|
readonly kind = BscTypeKind.UninitializedType;
|
|
6
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
7
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
7
8
|
toString(): string;
|
|
8
9
|
toTypeString(): string;
|
|
9
10
|
isEqual(targetType: BscType): boolean;
|
|
@@ -14,7 +14,7 @@ class UninitializedType extends BscType_1.BscType {
|
|
|
14
14
|
return (targetType instanceof UninitializedType ||
|
|
15
15
|
targetType instanceof DynamicType_1.DynamicType);
|
|
16
16
|
}
|
|
17
|
-
isTypeCompatible(targetType) {
|
|
17
|
+
isTypeCompatible(targetType, data) {
|
|
18
18
|
return ((0, reflection_1.isUninitializedType)(targetType) ||
|
|
19
19
|
(0, reflection_1.isDynamicType)(targetType));
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UninitializedType.js","sourceRoot":"","sources":["../../src/types/UninitializedType.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;
|
|
1
|
+
{"version":3,"file":"UninitializedType.js","sourceRoot":"","sources":["../../src/types/UninitializedType.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;AAE5E,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,iBAAkB,SAAQ,iBAAO;IAA9C;;QAQoB,SAAI,GAAG,yBAAW,CAAC,iBAAiB,CAAC;IAoBzD,CAAC;IA3BU,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,UAAU,YAAY,iBAAiB;YACvC,UAAU,YAAY,yBAAW,CACpC,CAAC;IACN,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,gCAAmB,EAAC,UAAU,CAAC;YAC/B,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,gCAAmB,EAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;CACJ;AA5BD,8CA4BC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import type { GetTypeOptions } from '../interfaces';
|
|
1
|
+
import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
|
|
2
2
|
import { BscType } from './BscType';
|
|
3
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
|
+
import { SymbolTable } from '../SymbolTable';
|
|
4
5
|
export declare function unionTypeFactory(types: BscType[]): UnionType;
|
|
5
6
|
export declare class UnionType extends BscType {
|
|
6
7
|
types: BscType[];
|
|
@@ -10,9 +11,10 @@ export declare class UnionType extends BscType {
|
|
|
10
11
|
isResolvable(): boolean;
|
|
11
12
|
private getMemberTypeFromInnerTypes;
|
|
12
13
|
getMemberType(name: string, options: GetTypeOptions): BscType;
|
|
13
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
14
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
14
15
|
toString(): string;
|
|
15
16
|
toTypeString(): string;
|
|
16
17
|
checkAllMemberTypes(predicate: (BscType: any) => boolean): boolean;
|
|
17
18
|
isEqual(targetType: BscType): boolean;
|
|
19
|
+
getMemberTable(): SymbolTable;
|
|
18
20
|
}
|
package/dist/types/UnionType.js
CHANGED
|
@@ -6,6 +6,7 @@ const BscType_1 = require("./BscType");
|
|
|
6
6
|
const ReferenceType_1 = require("./ReferenceType");
|
|
7
7
|
const helpers_1 = require("./helpers");
|
|
8
8
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
9
|
+
const SymbolTable_1 = require("../SymbolTable");
|
|
9
10
|
function unionTypeFactory(types) {
|
|
10
11
|
return new UnionType(types);
|
|
11
12
|
}
|
|
@@ -40,7 +41,7 @@ class UnionType extends BscType_1.BscType {
|
|
|
40
41
|
getSymbolType: (innerName, innerOptions) => {
|
|
41
42
|
return (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(this.getMemberTypeFromInnerTypes(name, options)), unionTypeFactory);
|
|
42
43
|
},
|
|
43
|
-
setCachedType: (innerName,
|
|
44
|
+
setCachedType: (innerName, innerCacheEntry, innerOptions) => {
|
|
44
45
|
// TODO: is this even cachable? This is a NO-OP for now, and it shouldn't hurt anything
|
|
45
46
|
}
|
|
46
47
|
};
|
|
@@ -48,21 +49,21 @@ class UnionType extends BscType_1.BscType {
|
|
|
48
49
|
}
|
|
49
50
|
return (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(innerTypesMemberTypes), unionTypeFactory);
|
|
50
51
|
}
|
|
51
|
-
isTypeCompatible(targetType) {
|
|
52
|
+
isTypeCompatible(targetType, data) {
|
|
52
53
|
if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
|
|
53
54
|
return true;
|
|
54
55
|
}
|
|
55
56
|
if ((0, reflection_1.isUnionType)(targetType)) {
|
|
56
57
|
// check if this set of inner types is a SUPERSET of targetTypes's inner types
|
|
57
58
|
for (const targetInnerType of targetType.types) {
|
|
58
|
-
if (!this.isTypeCompatible(targetInnerType)) {
|
|
59
|
+
if (!this.isTypeCompatible(targetInnerType, data)) {
|
|
59
60
|
return false;
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
return true;
|
|
63
64
|
}
|
|
64
65
|
for (const innerType of this.types) {
|
|
65
|
-
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType);
|
|
66
|
+
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType, data);
|
|
66
67
|
if (foundCompatibleInnerType) {
|
|
67
68
|
return true;
|
|
68
69
|
}
|
|
@@ -86,6 +87,26 @@ class UnionType extends BscType_1.BscType {
|
|
|
86
87
|
}
|
|
87
88
|
return this.isTypeCompatible(targetType) && targetType.isTypeCompatible(this);
|
|
88
89
|
}
|
|
90
|
+
getMemberTable() {
|
|
91
|
+
const unionTable = new SymbolTable_1.SymbolTable(this.__identifier + ' UnionTable');
|
|
92
|
+
const firstType = this.types[0];
|
|
93
|
+
if (!firstType) {
|
|
94
|
+
return unionTable;
|
|
95
|
+
}
|
|
96
|
+
firstType.addBuiltInInterfaces();
|
|
97
|
+
for (const symbol of firstType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime)) {
|
|
98
|
+
const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags: SymbolTable_1.SymbolTypeFlag.runtime });
|
|
99
|
+
const allResolvableTypes = foundType.reduce((acc, curType) => {
|
|
100
|
+
return acc && curType.isResolvable();
|
|
101
|
+
}, true);
|
|
102
|
+
if (!allResolvableTypes) {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
const uniqueType = (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(foundType), unionTypeFactory);
|
|
106
|
+
unionTable.addSymbol(symbol.name, {}, uniqueType, SymbolTable_1.SymbolTypeFlag.runtime);
|
|
107
|
+
}
|
|
108
|
+
return unionTable;
|
|
109
|
+
}
|
|
89
110
|
}
|
|
90
111
|
exports.UnionType = UnionType;
|
|
91
112
|
function joinTypesString(types) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":";;;AACA,uDAAkF;AAClF,uCAAoC;AACpC,mDAAgD;AAChD,uCAAyD;AACzD,+CAA4C;AAE5C,SAAgB,gBAAgB,CAAC,KAAgB;IAC7C,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAFD,4CAEC;AAED,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,KAAgB;QAEvB,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAFvB,UAAK,GAAL,KAAK,CAAW;QAKX,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAIM,OAAO,CAAC,IAAa;QACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,YAAY;QACR,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE;gBACtB,OAAO,KAAK,CAAC;aAChB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,2BAA2B,CAAC,IAAY,EAAE,OAAuB;QACrE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9E,IAAI,CAAC,qBAAqB,EAAE;YACxB,0DAA0D;YAC1D,8CAA8C;YAC9C,OAAO,IAAI,6BAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE;gBACrD,OAAO;oBACH,aAAa,EAAE,CAAC,SAAiB,EAAE,YAA4B,EAAE,EAAE;wBAC/D,OAAO,IAAA,uBAAa,EAAC,IAAA,uBAAa,EAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;oBAC3G,CAAC;oBACD,aAAa,EAAE,CAAC,SAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":"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"}
|