brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.27
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 +21 -5
- package/dist/AstValidationSegmenter.d.ts +1 -1
- package/dist/AstValidationSegmenter.js +2 -3
- package/dist/AstValidationSegmenter.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +1 -3
- package/dist/DiagnosticMessages.js +5 -8
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/Program.js +24 -25
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +2 -8
- package/dist/Scope.js +20 -22
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +1 -8
- package/dist/SymbolTable.js +1 -10
- package/dist/SymbolTable.js.map +1 -1
- package/dist/SymbolTableFlag.d.ts +8 -0
- package/dist/SymbolTableFlag.js +13 -0
- package/dist/SymbolTableFlag.js.map +1 -0
- package/dist/XmlScope.d.ts +1 -1
- package/dist/XmlScope.js +6 -7
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/CachedLookups.d.ts +1 -2
- package/dist/astUtils/CachedLookups.js +0 -11
- package/dist/astUtils/CachedLookups.js.map +1 -1
- package/dist/astUtils/creators.js +45 -6
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +2 -0
- package/dist/astUtils/reflection.js +11 -3
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +1 -1
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +20 -20
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +26 -6
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +74 -2
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +2 -3
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +25 -26
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +6 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +70 -20
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +92 -10
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -1
- package/dist/files/BrsFile.Class.spec.js +4 -3
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +3 -4
- package/dist/files/BrsFile.js +19 -112
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +56 -156
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +2 -3
- package/dist/files/XmlFile.js +0 -2
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/interfaces.d.ts +77 -83
- package/dist/interfaces.js +9 -9
- package/dist/interfaces.js.map +1 -1
- package/dist/parser/Expression.d.ts +85 -91
- package/dist/parser/Expression.js +50 -28
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +15 -16
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +1 -2
- package/dist/parser/Parser.js +68 -62
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +27 -28
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.js +49 -35
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +36 -24
- package/dist/parser/SGTypes.js +26 -55
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/Statement.d.ts +138 -139
- package/dist/parser/Statement.js +50 -37
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/expression/TypeExpression.spec.js +8 -9
- package/dist/parser/tests/expression/TypeExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/TryCatch.spec.js +9 -2
- package/dist/parser/tests/statement/TryCatch.spec.js.map +1 -1
- package/dist/roku-types/data.json +70 -52
- package/dist/roku-types/index.d.ts +43 -21
- package/dist/types/ArrayType.js +1 -2
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +7 -8
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.js +2 -3
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/BscType.js +2 -3
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.js +7 -8
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.spec.js +31 -32
- package/dist/types/BuiltInInterfaceAdder.spec.js.map +1 -1
- package/dist/types/ClassType.spec.js +10 -11
- package/dist/types/ClassType.spec.js.map +1 -1
- package/dist/types/ComponentType.d.ts +2 -1
- package/dist/types/ComponentType.js.map +1 -1
- package/dist/types/EnumType.js +2 -3
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/InheritableType.js +3 -4
- package/dist/types/InheritableType.js.map +1 -1
- package/dist/types/InterfaceType.js +2 -3
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +3 -4
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/ObjectType.js +1 -2
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +1 -1
- package/dist/types/ReferenceType.spec.js +21 -22
- package/dist/types/ReferenceType.spec.js.map +1 -1
- package/dist/types/UnionType.js +3 -3
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/UnionType.spec.js +37 -38
- package/dist/types/UnionType.spec.js.map +1 -1
- package/dist/types/helper.spec.js +4 -5
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/util.d.ts +3 -3
- package/dist/util.js +20 -19
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +0 -9
- package/dist/validators/ClassValidator.js +3 -46
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InterfaceType = void 0;
|
|
4
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
5
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
6
5
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
7
6
|
const InheritableType_1 = require("./InheritableType");
|
|
@@ -18,13 +17,13 @@ class InterfaceType extends InheritableType_1.InheritableType {
|
|
|
18
17
|
return true;
|
|
19
18
|
}
|
|
20
19
|
if ((0, reflection_1.isInterfaceType)(targetType)) {
|
|
21
|
-
return this.checkCompatibilityBasedOnMembers(targetType,
|
|
20
|
+
return this.checkCompatibilityBasedOnMembers(targetType, 1 /* SymbolTypeFlag.runtime */, data);
|
|
22
21
|
}
|
|
23
22
|
const ancestorTypes = this.getAncestorTypeList();
|
|
24
23
|
if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => ancestorType.isEqual(targetType))) {
|
|
25
24
|
return true;
|
|
26
25
|
}
|
|
27
|
-
return this.checkCompatibilityBasedOnMembers(targetType,
|
|
26
|
+
return this.checkCompatibilityBasedOnMembers(targetType, 1 /* SymbolTypeFlag.runtime */, data);
|
|
28
27
|
}
|
|
29
28
|
/**
|
|
30
29
|
* Is this the exact same interface as the target?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAEA,uDAAsF;AAEtF,+CAA4C;AAC5C,uDAAoD;AACpD,uCAAkD;AAGlD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAA8C;QAE9D,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAgC;QAKlD,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YACxG,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,kCAA0B,IAAI,CAAC,CAAC;SAC1F;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,kCAA0B,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB,EAAE,IAA4B;QACrD,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;CACJ;AA9BD,sCA8BC"}
|
|
@@ -7,7 +7,6 @@ const IntegerType_1 = require("./IntegerType");
|
|
|
7
7
|
const InterfaceType_1 = require("./InterfaceType");
|
|
8
8
|
const ObjectType_1 = require("./ObjectType");
|
|
9
9
|
const StringType_1 = require("./StringType");
|
|
10
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
11
10
|
const AssociativeArrayType_1 = require("./AssociativeArrayType");
|
|
12
11
|
const ArrayType_1 = require("./ArrayType");
|
|
13
12
|
const BooleanType_1 = require("./BooleanType");
|
|
@@ -66,9 +65,9 @@ describe('InterfaceType', () => {
|
|
|
66
65
|
it('works for recursive types', () => {
|
|
67
66
|
var _a;
|
|
68
67
|
let linkListNode1 = iface({ name: StringType_1.StringType.instance }, 'LinkNode');
|
|
69
|
-
linkListNode1.addMember('next', {}, linkListNode1,
|
|
68
|
+
linkListNode1.addMember('next', {}, linkListNode1, 1 /* SymbolTypeFlag.runtime */);
|
|
70
69
|
let linkListNode2 = iface({ name: StringType_1.StringType.instance }, 'LinkNode');
|
|
71
|
-
linkListNode2.addMember('next', {}, linkListNode2,
|
|
70
|
+
linkListNode2.addMember('next', {}, linkListNode2, 1 /* SymbolTypeFlag.runtime */);
|
|
72
71
|
let compatData = {};
|
|
73
72
|
let typesAreEqual = linkListNode1.isEqual(linkListNode2, compatData);
|
|
74
73
|
(0, chai_config_spec_1.expect)(typesAreEqual).to.be.true;
|
|
@@ -197,7 +196,7 @@ function iface(members, name, parentType) {
|
|
|
197
196
|
ifaceCount++;
|
|
198
197
|
const ifaceType = new InterfaceType_1.InterfaceType(name, parentType);
|
|
199
198
|
for (const key in members) {
|
|
200
|
-
ifaceType.addMember(key, null, members[key],
|
|
199
|
+
ifaceType.addMember(key, null, members[key], 1 /* SymbolTypeFlag.runtime */);
|
|
201
200
|
}
|
|
202
201
|
return ifaceType;
|
|
203
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceType.spec.js","sourceRoot":"","sources":["../../src/types/InterfaceType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,iCAA+B;AAE/B,+CAA4C;AAC5C,+CAA4C;AAC5C,mDAAgD;AAChD,6CAA0C;AAC1C,6CAA0C;
|
|
1
|
+
{"version":3,"file":"InterfaceType.spec.js","sourceRoot":"","sources":["../../src/types/InterfaceType.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/ObjectType.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ObjectType = void 0;
|
|
4
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
5
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
6
5
|
const BscType_1 = require("./BscType");
|
|
7
6
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
@@ -31,7 +30,7 @@ class ObjectType extends BscType_1.BscType {
|
|
|
31
30
|
return (_a = super.getMemberType(name, options)) !== null && _a !== void 0 ? _a : DynamicType_1.DynamicType.instance;
|
|
32
31
|
}
|
|
33
32
|
isEqual(otherType) {
|
|
34
|
-
return (0, reflection_1.isObjectType)(otherType) && this.checkCompatibilityBasedOnMembers(otherType,
|
|
33
|
+
return (0, reflection_1.isObjectType)(otherType) && this.checkCompatibilityBasedOnMembers(otherType, 1 /* SymbolTypeFlag.runtime */);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
36
|
exports.ObjectType = ObjectType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AACA,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,mEAAgE;AAChE,+CAA4C;AAE5C,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;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,iGAAiG;QACjG,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,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;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,gEAAgE;QAChE,mHAAmH;QACnH,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,iCAAyB,CAAC;IAC/G,CAAC;CACJ;AA/BD,gCA+BC;AAGD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SymbolTypeGetterProvider } from '../SymbolTable';
|
|
2
|
-
import type { SymbolTypeFlag } from '../
|
|
2
|
+
import type { SymbolTypeFlag } from '../SymbolTableFlag';
|
|
3
3
|
import { BscType } from './BscType';
|
|
4
4
|
import { BscTypeKind } from './BscTypeKind';
|
|
5
5
|
import type { Token } from '../lexer/Token';
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const SymbolTable_1 = require("../SymbolTable");
|
|
5
|
-
const SymbolTable_2 = require("../SymbolTable");
|
|
6
5
|
const testHelpers_spec_1 = require("../testHelpers.spec");
|
|
7
6
|
const DynamicType_1 = require("./DynamicType");
|
|
8
7
|
const IntegerType_1 = require("./IntegerType");
|
|
@@ -16,7 +15,7 @@ const NamespaceType_1 = require("./NamespaceType");
|
|
|
16
15
|
const creators_1 = require("../astUtils/creators");
|
|
17
16
|
const TokenKind_1 = require("../lexer/TokenKind");
|
|
18
17
|
const util_1 = require("../util");
|
|
19
|
-
const runtimeFlag =
|
|
18
|
+
const runtimeFlag = 1 /* SymbolTypeFlag.runtime */;
|
|
20
19
|
describe('ReferenceType', () => {
|
|
21
20
|
it('can be checked with reflection', () => {
|
|
22
21
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
@@ -27,32 +26,32 @@ describe('ReferenceType', () => {
|
|
|
27
26
|
(0, testHelpers_spec_1.expectTypeToBe)(new ReferenceType_1.ReferenceType('test', 'test', runtimeFlag, () => undefined), DynamicType_1.DynamicType);
|
|
28
27
|
const table = new SymbolTable_1.SymbolTable('testTable');
|
|
29
28
|
(0, testHelpers_spec_1.expectTypeToBe)(new ReferenceType_1.ReferenceType('test', 'test', runtimeFlag, () => table), DynamicType_1.DynamicType);
|
|
30
|
-
table.addSymbol('someVar', null, StringType_1.StringType.instance,
|
|
29
|
+
table.addSymbol('someVar', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
31
30
|
(0, testHelpers_spec_1.expectTypeToBe)(new ReferenceType_1.ReferenceType('test', 'test', runtimeFlag, () => table), DynamicType_1.DynamicType);
|
|
32
31
|
});
|
|
33
32
|
it('can resolve based on a symbol table', () => {
|
|
34
33
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
35
34
|
const ref = new ReferenceType_1.ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
|
|
36
|
-
table.addSymbol('someVar', null, StringType_1.StringType.instance,
|
|
35
|
+
table.addSymbol('someVar', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
37
36
|
(0, testHelpers_spec_1.expectTypeToBe)(ref, StringType_1.StringType);
|
|
38
37
|
});
|
|
39
38
|
it('resolves before checking assigning and convertible', () => {
|
|
40
39
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
41
40
|
const ref = new ReferenceType_1.ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
|
|
42
|
-
table.addSymbol('someVar', null, IntegerType_1.IntegerType.instance,
|
|
41
|
+
table.addSymbol('someVar', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
43
42
|
(0, chai_1.expect)(ref.isTypeCompatible(FloatType_1.FloatType.instance)).to.be.true;
|
|
44
43
|
});
|
|
45
44
|
it('resolves before stringifying', () => {
|
|
46
45
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
47
46
|
const ref = new ReferenceType_1.ReferenceType('someKlass', 'someKlass', runtimeFlag, () => table);
|
|
48
|
-
table.addSymbol('someKlass', null, new ClassType_1.ClassType('SomeKlass'),
|
|
47
|
+
table.addSymbol('someKlass', null, new ClassType_1.ClassType('SomeKlass'), 1 /* SymbolTypeFlag.runtime */);
|
|
49
48
|
(0, chai_1.expect)(ref.toString()).to.eq('SomeKlass');
|
|
50
49
|
});
|
|
51
50
|
describe('circular references', () => {
|
|
52
51
|
it('catches circular references', () => {
|
|
53
52
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
54
53
|
const ref = new ReferenceType_1.ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
|
|
55
|
-
table.addSymbol('someVar', null, ref,
|
|
54
|
+
table.addSymbol('someVar', null, ref, 1 /* SymbolTypeFlag.runtime */);
|
|
56
55
|
(0, testHelpers_spec_1.expectTypeToBe)(ref, DynamicType_1.DynamicType);
|
|
57
56
|
});
|
|
58
57
|
it('catches circular references of many levels', () => {
|
|
@@ -60,11 +59,11 @@ describe('ReferenceType', () => {
|
|
|
60
59
|
const ref1 = new ReferenceType_1.ReferenceType('someVar1', 'someVar1', runtimeFlag, () => table);
|
|
61
60
|
const ref2 = new ReferenceType_1.ReferenceType('someVar2', 'someVar2', runtimeFlag, () => table);
|
|
62
61
|
const ref3 = new ReferenceType_1.ReferenceType('someVar3', 'someVar3', runtimeFlag, () => table);
|
|
63
|
-
table.addSymbol('someVar0', null, ref1,
|
|
64
|
-
table.addSymbol('someVar1', null, ref2,
|
|
65
|
-
table.addSymbol('someVar2', null, ref3,
|
|
66
|
-
table.addSymbol('someVar3', null, ref1,
|
|
67
|
-
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbol('someVar0',
|
|
62
|
+
table.addSymbol('someVar0', null, ref1, 1 /* SymbolTypeFlag.runtime */);
|
|
63
|
+
table.addSymbol('someVar1', null, ref2, 1 /* SymbolTypeFlag.runtime */);
|
|
64
|
+
table.addSymbol('someVar2', null, ref3, 1 /* SymbolTypeFlag.runtime */);
|
|
65
|
+
table.addSymbol('someVar3', null, ref1, 1 /* SymbolTypeFlag.runtime */);
|
|
66
|
+
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbol('someVar0', 1 /* SymbolTypeFlag.runtime */)[0].type, DynamicType_1.DynamicType);
|
|
68
67
|
});
|
|
69
68
|
it('catches circular references in a binary expression', () => {
|
|
70
69
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
@@ -75,8 +74,8 @@ describe('ReferenceType', () => {
|
|
|
75
74
|
const binRef2 = new ReferenceType_1.BinaryOperatorReferenceType(ref, (0, creators_1.createToken)(TokenKind_1.TokenKind.Plus), binRef, (l, o, r) => {
|
|
76
75
|
return util_1.util.binaryOperatorResultType(l, o, r);
|
|
77
76
|
});
|
|
78
|
-
table.addSymbol('notHere', null, binRef2,
|
|
79
|
-
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbolType('notHere', { flags:
|
|
77
|
+
table.addSymbol('notHere', null, binRef2, 1 /* SymbolTypeFlag.runtime */);
|
|
78
|
+
(0, testHelpers_spec_1.expectTypeToBe)(table.getSymbolType('notHere', { flags: 1 /* SymbolTypeFlag.runtime */ }), DynamicType_1.DynamicType);
|
|
80
79
|
});
|
|
81
80
|
});
|
|
82
81
|
});
|
|
@@ -98,20 +97,20 @@ describe('PropertyReferenceType', () => {
|
|
|
98
97
|
// `ref` will resolve to DynamicType, and its returnType is DynamicType.Instance
|
|
99
98
|
(0, testHelpers_spec_1.expectTypeToBe)(propRef, DynamicType_1.DynamicType);
|
|
100
99
|
// Set ref to resolve to a function
|
|
101
|
-
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(IntegerType_1.IntegerType.instance),
|
|
100
|
+
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(IntegerType_1.IntegerType.instance), 1 /* SymbolTypeFlag.runtime */);
|
|
102
101
|
(0, testHelpers_spec_1.expectTypeToBe)(propRef, IntegerType_1.IntegerType);
|
|
103
102
|
});
|
|
104
103
|
it('resolves members of a property on a ReferenceType', () => {
|
|
105
104
|
const table = new SymbolTable_1.SymbolTable('test');
|
|
106
105
|
const fnRef = new ReferenceType_1.ReferenceType('someFunc', 'someFunc', runtimeFlag, () => table);
|
|
107
106
|
const returnRef = new ReferenceType_1.TypePropertyReferenceType(fnRef, 'returnType');
|
|
108
|
-
const returnPropRef = returnRef.getMemberType('myNum', { flags:
|
|
107
|
+
const returnPropRef = returnRef.getMemberType('myNum', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
109
108
|
// `ref` will resolve to DynamicType, and its returnType is DynamicType.Instance
|
|
110
109
|
(0, testHelpers_spec_1.expectTypeToBe)(returnPropRef, DynamicType_1.DynamicType);
|
|
111
110
|
// Set fnRef to resolve to a function that returns a complex type
|
|
112
111
|
const klassType = new ClassType_1.ClassType('Klass');
|
|
113
|
-
klassType.addMember('myNum', null, IntegerType_1.IntegerType.instance,
|
|
114
|
-
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(klassType),
|
|
112
|
+
klassType.addMember('myNum', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
113
|
+
table.addSymbol('someFunc', null, new TypedFunctionType_1.TypedFunctionType(klassType), 1 /* SymbolTypeFlag.runtime */);
|
|
115
114
|
// returnPropRef = someFunc().myNum
|
|
116
115
|
(0, testHelpers_spec_1.expectTypeToBe)(fnRef, TypedFunctionType_1.TypedFunctionType);
|
|
117
116
|
(0, testHelpers_spec_1.expectTypeToBe)(returnRef, ClassType_1.ClassType);
|
|
@@ -122,13 +121,13 @@ describe('PropertyReferenceType', () => {
|
|
|
122
121
|
let nsA = new NamespaceType_1.NamespaceType('Alpha');
|
|
123
122
|
let nsAB = new NamespaceType_1.NamespaceType('Alpha.Beta');
|
|
124
123
|
let nsABC = new NamespaceType_1.NamespaceType('Alpha.Beta.Charlie');
|
|
125
|
-
nsA.addMember('Beta', null, nsAB,
|
|
126
|
-
nsAB.addMember('Charlie', null, nsABC,
|
|
127
|
-
let myRef = new ReferenceType_1.ReferenceType('MyKlass', 'Alpha.Beta.Charlie.MyKlass',
|
|
124
|
+
nsA.addMember('Beta', null, nsAB, 2 /* SymbolTypeFlag.typetime */);
|
|
125
|
+
nsAB.addMember('Charlie', null, nsABC, 2 /* SymbolTypeFlag.typetime */);
|
|
126
|
+
let myRef = new ReferenceType_1.ReferenceType('MyKlass', 'Alpha.Beta.Charlie.MyKlass', 2 /* SymbolTypeFlag.typetime */, () => nsABC.memberTable);
|
|
128
127
|
(0, chai_1.expect)(myRef.isResolvable()).to.be.false;
|
|
129
128
|
(0, chai_1.expect)(myRef.toString()).to.eq('Alpha.Beta.Charlie.MyKlass');
|
|
130
129
|
let myKlass = new ClassType_1.ClassType('Alpha.Beta.Charlie.MyKlass');
|
|
131
|
-
nsABC.addMember('MyKlass', null, myKlass,
|
|
130
|
+
nsABC.addMember('MyKlass', null, myKlass, 2 /* SymbolTypeFlag.typetime */);
|
|
132
131
|
(0, chai_1.expect)(myRef.isResolvable()).to.be.true;
|
|
133
132
|
(0, chai_1.expect)(myRef.toString()).to.eq('Alpha.Beta.Charlie.MyKlass');
|
|
134
133
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,gDAA6C;
|
|
1
|
+
{"version":3,"file":"ReferenceType.spec.js","sourceRoot":"","sources":["../../src/types/ReferenceType.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/UnionType.js
CHANGED
|
@@ -99,8 +99,8 @@ class UnionType extends BscType_1.BscType {
|
|
|
99
99
|
return unionTable;
|
|
100
100
|
}
|
|
101
101
|
firstType.addBuiltInInterfaces();
|
|
102
|
-
for (const symbol of firstType.getMemberTable().getAllSymbols(
|
|
103
|
-
const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags:
|
|
102
|
+
for (const symbol of firstType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */)) {
|
|
103
|
+
const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
104
104
|
const allResolvableTypes = foundType.reduce((acc, curType) => {
|
|
105
105
|
return acc && curType.isResolvable();
|
|
106
106
|
}, true);
|
|
@@ -108,7 +108,7 @@ class UnionType extends BscType_1.BscType {
|
|
|
108
108
|
continue;
|
|
109
109
|
}
|
|
110
110
|
const uniqueType = (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(foundType), unionTypeFactory);
|
|
111
|
-
unionTable.addSymbol(symbol.name, {}, uniqueType,
|
|
111
|
+
unionTable.addSymbol(symbol.name, {}, uniqueType, 1 /* SymbolTypeFlag.runtime */);
|
|
112
112
|
}
|
|
113
113
|
return unionTable;
|
|
114
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":";;;AACA,uDAAkF;AAClF,uCAAoC;AACpC,mDAAgD;AAChD,uCAA+E;AAC/E,+CAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,20 +6,19 @@ const IntegerType_1 = require("./IntegerType");
|
|
|
6
6
|
const UnionType_1 = require("./UnionType");
|
|
7
7
|
const FloatType_1 = require("./FloatType");
|
|
8
8
|
const InterfaceType_1 = require("./InterfaceType");
|
|
9
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
10
9
|
const BooleanType_1 = require("./BooleanType");
|
|
11
10
|
const testHelpers_spec_1 = require("../testHelpers.spec");
|
|
12
11
|
const reflection_1 = require("../astUtils/reflection");
|
|
13
12
|
describe('UnionType', () => {
|
|
14
13
|
it('can be assigned to by anything that can be assigned to an included type', () => {
|
|
15
14
|
const parentIFace = new InterfaceType_1.InterfaceType('IfaceParent');
|
|
16
|
-
parentIFace.addMember('name', null, StringType_1.StringType.instance,
|
|
15
|
+
parentIFace.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
17
16
|
const iFace = new InterfaceType_1.InterfaceType('IfaceChild', parentIFace);
|
|
18
|
-
iFace.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
17
|
+
iFace.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
19
18
|
const otheriFaceWithSameMembers = new InterfaceType_1.InterfaceType('OtherIface');
|
|
20
|
-
otheriFaceWithSameMembers.addMember('name', null, StringType_1.StringType.instance,
|
|
21
|
-
otheriFaceWithSameMembers.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
22
|
-
otheriFaceWithSameMembers.addMember('height', null, FloatType_1.FloatType.instance,
|
|
19
|
+
otheriFaceWithSameMembers.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
20
|
+
otheriFaceWithSameMembers.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
21
|
+
otheriFaceWithSameMembers.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
23
22
|
const myUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, iFace, StringType_1.StringType.instance]);
|
|
24
23
|
(0, chai_1.expect)(myUnion.isTypeCompatible(FloatType_1.FloatType.instance)).to.be.true;
|
|
25
24
|
(0, chai_1.expect)(myUnion.isTypeCompatible(StringType_1.StringType.instance)).to.be.true;
|
|
@@ -34,39 +33,39 @@ describe('UnionType', () => {
|
|
|
34
33
|
});
|
|
35
34
|
it('can assign to a more general Union with interfaces', () => {
|
|
36
35
|
const parentIFace = new InterfaceType_1.InterfaceType('IfaceParent');
|
|
37
|
-
parentIFace.addMember('name', null, StringType_1.StringType.instance,
|
|
36
|
+
parentIFace.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
38
37
|
const iFace = new InterfaceType_1.InterfaceType('IfaceChild', parentIFace);
|
|
39
|
-
iFace.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
40
|
-
iFace.addMember('height', null, FloatType_1.FloatType.instance,
|
|
38
|
+
iFace.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
39
|
+
iFace.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
41
40
|
const myUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, iFace, StringType_1.StringType.instance, BooleanType_1.BooleanType.instance]);
|
|
42
41
|
const otheriFaceWithSameMembers = new InterfaceType_1.InterfaceType('OtherIface');
|
|
43
|
-
otheriFaceWithSameMembers.addMember('name', null, StringType_1.StringType.instance,
|
|
44
|
-
otheriFaceWithSameMembers.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
45
|
-
otheriFaceWithSameMembers.addMember('height', null, FloatType_1.FloatType.instance,
|
|
42
|
+
otheriFaceWithSameMembers.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
43
|
+
otheriFaceWithSameMembers.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
44
|
+
otheriFaceWithSameMembers.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
46
45
|
const otherUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, otheriFaceWithSameMembers, StringType_1.StringType.instance]);
|
|
47
46
|
(0, chai_1.expect)(myUnion.isTypeCompatible(otherUnion)).to.be.true;
|
|
48
47
|
(0, chai_1.expect)(otherUnion.isTypeCompatible(myUnion)).to.be.false;
|
|
49
48
|
});
|
|
50
49
|
it('will get a string representation in order given', () => {
|
|
51
50
|
const iFace1 = new InterfaceType_1.InterfaceType('SomeIface');
|
|
52
|
-
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
53
|
-
iFace1.addMember('name', null, StringType_1.StringType.instance,
|
|
54
|
-
iFace1.addMember('height', null, FloatType_1.FloatType.instance,
|
|
51
|
+
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
52
|
+
iFace1.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
53
|
+
iFace1.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
55
54
|
const myUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, StringType_1.StringType.instance, BooleanType_1.BooleanType.instance, iFace1]);
|
|
56
55
|
(0, chai_1.expect)(myUnion.toString()).to.eq('float or string or boolean or SomeIface');
|
|
57
56
|
});
|
|
58
57
|
describe('getMemberType', () => {
|
|
59
58
|
it('will find the union of inner types', () => {
|
|
60
59
|
const iFace1 = new InterfaceType_1.InterfaceType('iFace1');
|
|
61
|
-
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
62
|
-
iFace1.addMember('name', null, StringType_1.StringType.instance,
|
|
63
|
-
iFace1.addMember('height', null, FloatType_1.FloatType.instance,
|
|
60
|
+
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
61
|
+
iFace1.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
62
|
+
iFace1.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
64
63
|
const iFace2 = new InterfaceType_1.InterfaceType('iFace2');
|
|
65
|
-
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
66
|
-
iFace2.addMember('name', null, StringType_1.StringType.instance,
|
|
67
|
-
iFace2.addMember('height', null, StringType_1.StringType.instance,
|
|
64
|
+
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
65
|
+
iFace2.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
66
|
+
iFace2.addMember('height', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
68
67
|
const myUnion = new UnionType_1.UnionType([iFace1, iFace2]);
|
|
69
|
-
const options = { flags:
|
|
68
|
+
const options = { flags: 1 /* SymbolTypeFlag.runtime */ };
|
|
70
69
|
const ageType = myUnion.getMemberType('age', options);
|
|
71
70
|
(0, testHelpers_spec_1.expectTypeToBe)(ageType, IntegerType_1.IntegerType);
|
|
72
71
|
const nameType = myUnion.getMemberType('name', options);
|
|
@@ -79,14 +78,14 @@ describe('UnionType', () => {
|
|
|
79
78
|
});
|
|
80
79
|
it('will return reference types if any inner type does not include the member', () => {
|
|
81
80
|
const iFace1 = new InterfaceType_1.InterfaceType('iFace1');
|
|
82
|
-
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
83
|
-
iFace1.addMember('name', null, StringType_1.StringType.instance,
|
|
84
|
-
iFace1.addMember('height', null, FloatType_1.FloatType.instance,
|
|
81
|
+
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
82
|
+
iFace1.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
83
|
+
iFace1.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
85
84
|
const iFace2 = new InterfaceType_1.InterfaceType('iFace2');
|
|
86
|
-
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
87
|
-
iFace2.addMember('name', null, StringType_1.StringType.instance,
|
|
85
|
+
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
86
|
+
iFace2.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
88
87
|
const myUnion = new UnionType_1.UnionType([iFace1, iFace2]);
|
|
89
|
-
const options = { flags:
|
|
88
|
+
const options = { flags: 1 /* SymbolTypeFlag.runtime */ };
|
|
90
89
|
const heightType1 = myUnion.getMemberType('height', options);
|
|
91
90
|
(0, testHelpers_spec_1.expectTypeToBe)(heightType1, UnionType_1.UnionType);
|
|
92
91
|
const heightTypes1 = heightType1.types;
|
|
@@ -95,7 +94,7 @@ describe('UnionType', () => {
|
|
|
95
94
|
// height does not exist in iFace2
|
|
96
95
|
(0, chai_1.expect)((0, reflection_1.isReferenceType)(heightTypes1[1])).to.be.true;
|
|
97
96
|
(0, chai_1.expect)(heightTypes1[1].isResolvable()).to.be.false;
|
|
98
|
-
iFace2.addMember('height', null, FloatType_1.FloatType.instance,
|
|
97
|
+
iFace2.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
99
98
|
const heightType2 = myUnion.getMemberType('height', options);
|
|
100
99
|
(0, testHelpers_spec_1.expectTypeToBe)(heightType2, FloatType_1.FloatType);
|
|
101
100
|
});
|
|
@@ -103,18 +102,18 @@ describe('UnionType', () => {
|
|
|
103
102
|
describe('getMemberTable', () => {
|
|
104
103
|
it('get an intersection of all member types', () => {
|
|
105
104
|
const iFace1 = new InterfaceType_1.InterfaceType('iFace1');
|
|
106
|
-
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
107
|
-
iFace1.addMember('name', null, StringType_1.StringType.instance,
|
|
108
|
-
iFace1.addMember('height', null, FloatType_1.FloatType.instance,
|
|
109
|
-
iFace1.addMember('weight', null, FloatType_1.FloatType.instance,
|
|
105
|
+
iFace1.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
106
|
+
iFace1.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
107
|
+
iFace1.addMember('height', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
108
|
+
iFace1.addMember('weight', null, FloatType_1.FloatType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
110
109
|
const iFace2 = new InterfaceType_1.InterfaceType('iFace2');
|
|
111
|
-
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
112
|
-
iFace2.addMember('name', null, StringType_1.StringType.instance,
|
|
113
|
-
iFace2.addMember('height', null, StringType_1.StringType.instance,
|
|
114
|
-
iFace2.addMember('address', null, StringType_1.StringType.instance,
|
|
110
|
+
iFace2.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
111
|
+
iFace2.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
112
|
+
iFace2.addMember('height', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
113
|
+
iFace2.addMember('address', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
115
114
|
const myUnion = new UnionType_1.UnionType([iFace1, iFace2]);
|
|
116
115
|
const unionMemberTable = myUnion.getMemberTable();
|
|
117
|
-
const options = { flags:
|
|
116
|
+
const options = { flags: 1 /* SymbolTypeFlag.runtime */ };
|
|
118
117
|
(0, testHelpers_spec_1.expectTypeToBe)(unionMemberTable.getSymbolType('age', options), IntegerType_1.IntegerType);
|
|
119
118
|
(0, testHelpers_spec_1.expectTypeToBe)(unionMemberTable.getSymbolType('name', options), StringType_1.StringType);
|
|
120
119
|
const heightType1 = unionMemberTable.getSymbolType('height', options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.spec.js","sourceRoot":"","sources":["../../src/types/UnionType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,6CAA0C;AAC1C,+CAA4C;AAC5C,2CAAwC;AACxC,2CAAwC;AACxC,mDAAgD;
|
|
1
|
+
{"version":3,"file":"UnionType.spec.js","sourceRoot":"","sources":["../../src/types/UnionType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,6CAA0C;AAC1C,+CAA4C;AAC5C,2CAAwC;AACxC,2CAAwC;AACxC,mDAAgD;AAEhD,+CAA4C;AAC5C,0DAAqD;AACrD,uDAAyD;AAGzD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QAC/E,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,aAAa,CAAC,CAAC;QACrD,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QACjF,MAAM,KAAK,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC3D,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;QAE3E,MAAM,yBAAyB,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;QAClE,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;QAEhG,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,qBAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,uBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEhF,IAAA,aAAM,EAAC,OAAO,CAAC,gBAAgB,CAAC,qBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAChE,IAAA,aAAM,EAAC,OAAO,CAAC,gBAAgB,CAAC,uBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACjE,IAAA,aAAM,EAAC,OAAO,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,aAAM,EAAC,yBAAyB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,uBAAU,CAAC,QAAQ,EAAE,qBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,CAAC,qBAAS,CAAC,QAAQ,EAAE,uBAAU,CAAC,QAAQ,EAAE,yBAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAElG,IAAA,aAAM,EAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACzD,IAAA,aAAM,EAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC1D,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,aAAa,CAAC,CAAC;QACrD,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QACjF,MAAM,KAAK,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC3D,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;QAC3E,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;QAC5E,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,qBAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,uBAAU,CAAC,QAAQ,EAAE,yBAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEtG,MAAM,yBAAyB,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;QAClE,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;QAEhG,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,CAAC,qBAAS,CAAC,QAAQ,EAAE,yBAAyB,EAAE,uBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEvG,IAAA,aAAM,EAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACxD,IAAA,aAAM,EAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;QAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;QAC7E,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,qBAAS,CAAC,QAAQ,EAAE,uBAAU,CAAC,QAAQ,EAAE,yBAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAEvG,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,yCAAyC,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC1C,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;YAE7E,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAE9E,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAEhD,MAAM,OAAO,GAAG,EAAE,KAAK,gCAAwB,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACtD,IAAA,iCAAc,EAAC,OAAO,EAAE,yBAAW,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACxD,IAAA,iCAAc,EAAC,QAAQ,EAAE,uBAAU,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC5D,IAAA,iCAAc,EAAC,UAAU,EAAE,qBAAS,CAAC,CAAC;YACtC,MAAM,WAAW,GAAI,UAAwB,CAAC,KAAK,CAAC;YACpD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAS,CAAC,QAAQ,CAAC,CAAC;YACnD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,uBAAU,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAGH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;YACjF,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;YAE7E,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAE5E,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,EAAE,KAAK,gCAAwB,EAAE,CAAC;YAClD,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAA,iCAAc,EAAC,WAAW,EAAE,qBAAS,CAAC,CAAC;YACvC,MAAM,YAAY,GAAI,WAAyB,CAAC,KAAK,CAAC;YACtD,IAAA,aAAM,EAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,iCAAc,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,qBAAS,CAAC,CAAC;YAC3C,kCAAkC;YAClC,IAAA,aAAM,EAAC,IAAA,4BAAe,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YACpD,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;YAEnD,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;YAC7E,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAA,iCAAc,EAAC,WAAW,EAAE,qBAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;YAC7E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,iCAAyB,CAAC;YAE7E,MAAM,MAAM,GAAG,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC5E,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAC9E,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAE/E,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAEhD,MAAM,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,EAAE,KAAK,gCAAwB,EAAE,CAAC;YAElD,IAAA,iCAAc,EAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,yBAAW,CAAC,CAAC;YAC5E,IAAA,iCAAc,EAAC,gBAAgB,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,uBAAU,CAAC,CAAC;YAC5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACtE,IAAA,iCAAc,EAAC,WAAW,EAAE,qBAAS,CAAC,CAAC;YACvC,MAAM,YAAY,GAAI,WAAyB,CAAC,KAAK,CAAC;YACtD,IAAA,aAAM,EAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,IAAA,iCAAc,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,qBAAS,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;YAC1E,IAAA,aAAM,EAAC,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;QAE/E,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -11,7 +11,6 @@ const StringType_1 = require("./StringType");
|
|
|
11
11
|
const UnionType_1 = require("./UnionType");
|
|
12
12
|
const helpers_1 = require("./helpers");
|
|
13
13
|
const InterfaceType_1 = require("./InterfaceType");
|
|
14
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
15
14
|
const DoubleType_1 = require("./DoubleType");
|
|
16
15
|
const BooleanType_1 = require("./BooleanType");
|
|
17
16
|
const EnumType_1 = require("./EnumType");
|
|
@@ -108,11 +107,11 @@ describe('getUniqueType', () => {
|
|
|
108
107
|
});
|
|
109
108
|
it('should return a a union type of two compatible interfaces', () => {
|
|
110
109
|
const iface1 = new InterfaceType_1.InterfaceType('iface1');
|
|
111
|
-
iface1.addMember('name', null, StringType_1.StringType.instance,
|
|
112
|
-
iface1.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
110
|
+
iface1.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
111
|
+
iface1.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
113
112
|
const iface2 = new InterfaceType_1.InterfaceType('iface2');
|
|
114
|
-
iface2.addMember('name', null, StringType_1.StringType.instance,
|
|
115
|
-
iface2.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
113
|
+
iface2.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
114
|
+
iface2.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
116
115
|
(0, chai_1.expect)(iface1.isTypeCompatible(iface2)).to.be.true;
|
|
117
116
|
(0, chai_1.expect)(iface2.isTypeCompatible(iface1)).to.be.true;
|
|
118
117
|
(0, chai_1.expect)(iface1.isEqual(iface2)).to.be.false;
|