brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.28
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 +82 -5
- package/README.md +1 -1
- package/dist/AstValidationSegmenter.d.ts +1 -1
- package/dist/AstValidationSegmenter.js +4 -5
- package/dist/AstValidationSegmenter.js.map +1 -1
- package/dist/DiagnosticFilterer.d.ts +7 -4
- package/dist/DiagnosticFilterer.js +67 -37
- package/dist/DiagnosticFilterer.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/PluginInterface.js +1 -1
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +1 -1
- package/dist/Program.js +34 -31
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +7 -34
- package/dist/Scope.js +45 -305
- 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/SymbolTypeFlag.d.ts +8 -0
- package/dist/SymbolTypeFlag.js +13 -0
- package/dist/SymbolTypeFlag.js.map +1 -0
- package/dist/XmlScope.d.ts +0 -8
- package/dist/XmlScope.js +6 -84
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/CachedLookups.d.ts +1 -2
- package/dist/astUtils/CachedLookups.js +4 -19
- package/dist/astUtils/CachedLookups.js.map +1 -1
- package/dist/astUtils/creators.d.ts +1 -0
- package/dist/astUtils/creators.js +48 -8
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/creators.spec.js +0 -10
- package/dist/astUtils/creators.spec.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +3 -2
- package/dist/astUtils/reflection.js +11 -7
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +11 -16
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +1 -2
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +1 -5
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +2 -1
- package/dist/bscPlugin/BscPlugin.js +4 -0
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/SignatureHelpUtil.js +4 -3
- package/dist/bscPlugin/SignatureHelpUtil.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +1 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.js +46 -29
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +39 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +30 -10
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +125 -7
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/references/ReferencesProvider.d.ts +12 -0
- package/dist/bscPlugin/references/ReferencesProvider.js +56 -0
- package/dist/bscPlugin/references/ReferencesProvider.js.map +1 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.d.ts +1 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.js +51 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.js.map +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +2 -3
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +25 -31
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +34 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +435 -27
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +178 -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 +15 -7
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +14 -5
- package/dist/files/BrsFile.js +83 -150
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +429 -162
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +2 -3
- package/dist/files/XmlFile.js +1 -3
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +117 -85
- package/dist/interfaces.js +9 -9
- package/dist/interfaces.js.map +1 -1
- package/dist/lexer/Lexer.d.ts +9 -3
- package/dist/lexer/Lexer.js +36 -15
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +76 -38
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/Token.js +1 -1
- package/dist/lexer/Token.js.map +1 -1
- package/dist/lexer/TokenKind.d.ts +1 -0
- package/dist/lexer/TokenKind.js +4 -1
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/AstNode.d.ts +1 -2
- package/dist/parser/AstNode.js +0 -1
- package/dist/parser/AstNode.js.map +1 -1
- package/dist/parser/BrsTranspileState.d.ts +1 -1
- package/dist/parser/Expression.d.ts +153 -135
- package/dist/parser/Expression.js +204 -114
- 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 +8 -4
- package/dist/parser/Parser.js +108 -149
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +48 -72
- 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 +31 -60
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/Statement.d.ts +214 -207
- package/dist/parser/Statement.js +248 -169
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/Statement.spec.js +0 -13
- package/dist/parser/Statement.spec.js.map +1 -1
- package/dist/parser/TranspileState.d.ts +17 -8
- package/dist/parser/TranspileState.js +64 -6
- package/dist/parser/TranspileState.js.map +1 -1
- package/dist/parser/tests/Parser.spec.d.ts +1 -1
- package/dist/parser/tests/Parser.spec.js +1 -2
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +1 -3
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +44 -0
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +6 -6
- package/dist/parser/tests/expression/TernaryExpression.spec.js +47 -0
- package/dist/parser/tests/expression/TernaryExpression.spec.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/ConstStatement.spec.js +2 -2
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +8 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +25 -5
- package/dist/parser/tests/statement/Misc.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/preprocessor/Chunk.js +1 -2
- package/dist/preprocessor/Chunk.js.map +1 -1
- package/dist/preprocessor/PreprocessorParser.js +2 -1
- package/dist/preprocessor/PreprocessorParser.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.d.ts +3 -0
- package/dist/types/AssociativeArrayType.js +10 -2
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/BscType.js +3 -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 +21 -11
- package/dist/util.js +116 -37
- 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 +6 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInInterfaceAdder.spec.js","sourceRoot":"","sources":["../../src/types/BuiltInInterfaceAdder.spec.ts"],"names":[],"mappings":";;AAAA,mEAAgE;AAChE,6CAA0C;AAC1C,0DAAqD;AACrD,+CAA4C;
|
|
1
|
+
{"version":3,"file":"BuiltInInterfaceAdder.spec.js","sourceRoot":"","sources":["../../src/types/BuiltInInterfaceAdder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const testHelpers_spec_1 = require("../testHelpers.spec");
|
|
|
8
8
|
const ReferenceType_1 = require("./ReferenceType");
|
|
9
9
|
const reflection_1 = require("../astUtils/reflection");
|
|
10
10
|
const IntegerType_1 = require("./IntegerType");
|
|
11
|
-
const SymbolTable_2 = require("../SymbolTable");
|
|
12
11
|
describe('ClassType', () => {
|
|
13
12
|
it('can have a super class', () => {
|
|
14
13
|
const superKlass = new ClassType_1.ClassType('SuperKlass');
|
|
@@ -33,33 +32,33 @@ describe('ClassType', () => {
|
|
|
33
32
|
});
|
|
34
33
|
it('will look in super classes for members', () => {
|
|
35
34
|
const superKlass = new ClassType_1.ClassType('SuperKlass');
|
|
36
|
-
superKlass.addMember('title', null, StringType_1.StringType.instance,
|
|
35
|
+
superKlass.addMember('title', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
37
36
|
const subKlass = new ClassType_1.ClassType('SubKlass', superKlass);
|
|
38
|
-
(0, testHelpers_spec_1.expectTypeToBe)(subKlass.getMemberType('title', { flags:
|
|
37
|
+
(0, testHelpers_spec_1.expectTypeToBe)(subKlass.getMemberType('title', { flags: 1 /* SymbolTypeFlag.runtime */ }), StringType_1.StringType);
|
|
39
38
|
});
|
|
40
39
|
it('allow ReferenceTypes as super classes', () => {
|
|
41
40
|
var _a;
|
|
42
41
|
const myTable = new SymbolTable_1.SymbolTable('test');
|
|
43
|
-
const futureSuperKlass = new ReferenceType_1.ReferenceType('SuperKlass', 'SuperKlass',
|
|
42
|
+
const futureSuperKlass = new ReferenceType_1.ReferenceType('SuperKlass', 'SuperKlass', 2 /* SymbolTypeFlag.typetime */, () => myTable);
|
|
44
43
|
const subKlass = new ClassType_1.ClassType('SubKlass', futureSuperKlass);
|
|
45
44
|
(0, chai_1.expect)(subKlass.isResolvable()).to.be.true;
|
|
46
45
|
(0, chai_1.expect)((_a = subKlass.parentType) === null || _a === void 0 ? void 0 : _a.isResolvable()).to.be.false;
|
|
47
46
|
const superKlass = new ClassType_1.ClassType('SuperKlass');
|
|
48
|
-
myTable.addSymbol('SuperKlass', null, superKlass,
|
|
47
|
+
myTable.addSymbol('SuperKlass', null, superKlass, 2 /* SymbolTypeFlag.typetime */);
|
|
49
48
|
(0, chai_1.expect)(subKlass.parentType.isResolvable()).to.be.true;
|
|
50
49
|
});
|
|
51
50
|
it('allows members of future super classes to be resolved', () => {
|
|
52
51
|
const myTable = new SymbolTable_1.SymbolTable('test');
|
|
53
|
-
const futureSuperKlass = new ReferenceType_1.ReferenceType('SuperKlass', 'SuperKlass',
|
|
52
|
+
const futureSuperKlass = new ReferenceType_1.ReferenceType('SuperKlass', 'SuperKlass', 2 /* SymbolTypeFlag.typetime */, () => myTable);
|
|
54
53
|
const subKlass = new ClassType_1.ClassType('SubKlass', futureSuperKlass);
|
|
55
54
|
(0, chai_1.expect)(subKlass.parentType.isResolvable()).to.be.false;
|
|
56
|
-
const futureTitleType = subKlass.getMemberType('title', { flags:
|
|
55
|
+
const futureTitleType = subKlass.getMemberType('title', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
57
56
|
(0, chai_1.expect)((0, reflection_1.isReferenceType)(futureTitleType)).to.be.true;
|
|
58
57
|
(0, chai_1.expect)(futureTitleType.isResolvable()).to.be.false;
|
|
59
58
|
const superKlass = new ClassType_1.ClassType('SuperKlass');
|
|
60
|
-
superKlass.addMember('title', null, StringType_1.StringType.instance,
|
|
59
|
+
superKlass.addMember('title', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
61
60
|
// eslint-disable-next-line no-bitwise
|
|
62
|
-
myTable.addSymbol('SuperKlass', null, superKlass,
|
|
61
|
+
myTable.addSymbol('SuperKlass', null, superKlass, 2 /* SymbolTypeFlag.typetime */ | 1 /* SymbolTypeFlag.runtime */);
|
|
63
62
|
(0, chai_1.expect)(futureTitleType.isResolvable()).to.be.true;
|
|
64
63
|
(0, testHelpers_spec_1.expectTypeToBe)(futureTitleType, StringType_1.StringType);
|
|
65
64
|
});
|
|
@@ -67,8 +66,8 @@ describe('ClassType', () => {
|
|
|
67
66
|
it('includes superclass members', () => {
|
|
68
67
|
const superKlass = new ClassType_1.ClassType('SuperKlass');
|
|
69
68
|
const subKlass = new ClassType_1.ClassType('SubKlass', superKlass);
|
|
70
|
-
superKlass.addMember('name', null, StringType_1.StringType.instance,
|
|
71
|
-
superKlass.addMember('age', null, IntegerType_1.IntegerType.instance,
|
|
69
|
+
superKlass.addMember('name', null, StringType_1.StringType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
70
|
+
superKlass.addMember('age', null, IntegerType_1.IntegerType.instance, 1 /* SymbolTypeFlag.runtime */);
|
|
72
71
|
(0, chai_1.expect)(subKlass.toJSString).to.exist;
|
|
73
72
|
(0, chai_1.expect)(subKlass.toJSString()).to.equal('{ age: integer; name: string; }');
|
|
74
73
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClassType.spec.js","sourceRoot":"","sources":["../../src/types/ClassType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,2CAAwC;AACxC,6CAA0C;AAC1C,gDAA6C;AAC7C,0DAAqD;AACrD,mDAAgD;AAChD,uDAAyD;AACzD,+CAA4C;
|
|
1
|
+
{"version":3,"file":"ClassType.spec.js","sourceRoot":"","sources":["../../src/types/ClassType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,2CAAwC;AACxC,6CAA0C;AAC1C,gDAA6C;AAC7C,0DAAqD;AACrD,mDAAgD;AAChD,uDAAyD;AACzD,+CAA4C;AAG5C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IAEvB,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAC9B,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEvD,IAAA,aAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;QACrC,IAAA,aAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,MAAM,eAAe,GAAG,IAAI,qBAAS,CAAC,iBAAiB,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEvD,IAAA,aAAM,EAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvD,IAAA,aAAM,EAAC,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACzD,IAAA,aAAM,EAAC,eAAe,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACnE,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAEvD,IAAA,aAAM,EAAC,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACzD,IAAA,aAAM,EAAC,UAAU,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QACjF,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACvD,IAAA,iCAAc,EAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,KAAK,gCAAwB,EAAE,CAAC,EAAE,uBAAU,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;;QAC7C,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,YAAY,mCAA2B,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAC/G,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAC7D,IAAA,aAAM,EAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC3C,IAAA,aAAM,EAAC,MAAA,QAAQ,CAAC,UAAU,0CAAE,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACxD,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,kCAA0B,CAAC;QAC3E,IAAA,aAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,MAAM,OAAO,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,6BAAa,CAAC,YAAY,EAAE,YAAY,mCAA2B,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAC/G,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAC7D,IAAA,aAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACvD,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,KAAK,gCAAwB,EAAE,CAAC,CAAC;QAC3F,IAAA,aAAM,EAAC,IAAA,4BAAe,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACpD,IAAA,aAAM,EAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACnD,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;QACjF,sCAAsC;QACtC,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,gEAAgD,CAAC,CAAC;QACpG,IAAA,aAAM,EAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAClD,IAAA,iCAAc,EAAC,eAAe,EAAE,uBAAU,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACvD,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,iCAAyB,CAAC;YAChF,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,iCAAyB,CAAC;YAEhF,IAAA,aAAM,EAAE,QAAgB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;YAC9C,IAAA,aAAM,EAAE,QAAgB,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { GetSymbolTypeOptions
|
|
1
|
+
import type { GetSymbolTypeOptions } from '../SymbolTable';
|
|
2
|
+
import type { SymbolTypeFlag } from '../SymbolTypeFlag';
|
|
2
3
|
import { SymbolTable } from '../SymbolTable';
|
|
3
4
|
import type { ExtraSymbolData, TypeCompatibilityData } from '../interfaces';
|
|
4
5
|
import type { BaseFunctionType } from './BaseFunctionType';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentType.js","sourceRoot":"","sources":["../../src/types/ComponentType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ComponentType.js","sourceRoot":"","sources":["../../src/types/ComponentType.ts"],"names":[],"mappings":"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"}
|
package/dist/types/EnumType.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnumMemberType = exports.EnumType = 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");
|
|
@@ -35,8 +34,8 @@ class EnumType extends BscType_1.BscType {
|
|
|
35
34
|
return (0, reflection_1.isEnumType)(targetType) &&
|
|
36
35
|
(targetType === null || targetType === void 0 ? void 0 : targetType.name.toLowerCase()) === this.name.toLowerCase() &&
|
|
37
36
|
this.underlyingType.isEqual(targetType.underlyingType, data) &&
|
|
38
|
-
this.checkCompatibilityBasedOnMembers(targetType,
|
|
39
|
-
targetType.checkCompatibilityBasedOnMembers(this,
|
|
37
|
+
this.checkCompatibilityBasedOnMembers(targetType, 1 /* SymbolTypeFlag.runtime */, data) &&
|
|
38
|
+
targetType.checkCompatibilityBasedOnMembers(this, 1 /* SymbolTypeFlag.runtime */, data);
|
|
40
39
|
}
|
|
41
40
|
get defaultMemberType() {
|
|
42
41
|
return new EnumMemberType(this.name, 'default', this.underlyingType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InheritableType = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
6
5
|
const BscType_1 = require("./BscType");
|
|
7
6
|
class InheritableType extends BscType_1.BscType {
|
|
8
7
|
constructor(name, parentType) {
|
|
@@ -93,7 +92,7 @@ class InheritableType extends BscType_1.BscType {
|
|
|
93
92
|
return true;
|
|
94
93
|
}
|
|
95
94
|
//check non-namespaced version
|
|
96
|
-
if (myLowerName.split('.').
|
|
95
|
+
if (myLowerName.split('.').pop() === lowerTargetName) {
|
|
97
96
|
return true;
|
|
98
97
|
}
|
|
99
98
|
}
|
|
@@ -112,8 +111,8 @@ class InheritableType extends BscType_1.BscType {
|
|
|
112
111
|
}
|
|
113
112
|
return this.name.toLowerCase() === ((_c = targetType.name) === null || _c === void 0 ? void 0 : _c.toLowerCase()) &&
|
|
114
113
|
this.isParentTypeEqual(targetType, data) &&
|
|
115
|
-
this.checkCompatibilityBasedOnMembers(targetType,
|
|
116
|
-
targetType.checkCompatibilityBasedOnMembers(this,
|
|
114
|
+
this.checkCompatibilityBasedOnMembers(targetType, 1 /* SymbolTypeFlag.runtime */, data) &&
|
|
115
|
+
targetType.checkCompatibilityBasedOnMembers(this, 1 /* SymbolTypeFlag.runtime */, data);
|
|
117
116
|
}
|
|
118
117
|
isParentTypeEqual(targetType, data) {
|
|
119
118
|
var _a, _b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InheritableType.js","sourceRoot":"","sources":["../../src/types/InheritableType.ts"],"names":[],"mappings":";;;AACA,uDAA4E;
|
|
1
|
+
{"version":3,"file":"InheritableType.js","sourceRoot":"","sources":["../../src/types/InheritableType.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 '../SymbolTypeFlag';
|
|
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":";;;AACA,uDAAkF;AAClF,uCAAoC;AACpC,mDAAgD;AAChD,uCAA+E;AAC/E,+CAA4C;AAE5C,gDAA6C;AAE7C,mEAAgE;AAEhE,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,IAAI,EAAE,2BAA2B,IAAI,CAAC,YAAY,GAAG;oBACrD,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,eAA+B,EAAE,YAA4B,EAAE,EAAE;wBAChG,uFAAuF;oBAC3F,CAAC;iBACJ,CAAC;YACN,CAAC,CAAC,CAAC;SACN;QACD,OAAO,IAAA,uBAAa,EAAC,IAAA,uBAAa,EAAC,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACjF,CAAC;IAED,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QAC9D,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YACvD,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,8BAAoB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YACzB,8EAA8E;YAC9E,KAAK,MAAM,eAAe,IAAI,UAAU,CAAC,KAAK,EAAE;gBAC5C,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE;oBAC/C,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,OAAO,IAAI,CAAC;SACf;QACD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE;YAChC,MAAM,wBAAwB,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC9E,IAAI,wBAAwB,EAAE;gBAC1B,OAAO,IAAI,CAAC;aACf;SACJ;QAGD,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,QAAQ;QACJ,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IACD,YAAY;QACR,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,mBAAmB,CAAC,SAA+B;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACnC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,IAAI,CAAC,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClF,CAAC;IAED,cAAc;QACV,MAAM,UAAU,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,UAAU,CAAC;SACrB;QACD,SAAS,CAAC,oBAAoB,EAAE,CAAC;QACjC,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC,aAAa,gCAAwB,EAAE;YACnF,MAAM,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,gCAAwB,EAAE,CAAC,CAAC;YACnG,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACzD,OAAO,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzC,CAAC,EAAE,IAAI,CAAC,CAAC;YAET,IAAI,CAAC,kBAAkB,EAAE;gBACrB,SAAS;aACZ;YACD,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,IAAA,uBAAa,EAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC7E,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,iCAAyB,CAAC;SAC7E;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AAjHD,8BAiHC;AAGD,SAAS,eAAe,CAAC,KAAgB;IACrC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrD,CAAC;AAED,6CAAqB,CAAC,gBAAgB,GAAG,CAAC,KAAgB,EAAE,EAAE;IAC1D,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC"}
|