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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArrayType.spec.js","sourceRoot":"","sources":["../../src/types/ArrayType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAE7C,2CAAwC;AACxC,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;
|
|
1
|
+
{"version":3,"file":"ArrayType.spec.js","sourceRoot":"","sources":["../../src/types/ArrayType.spec.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.AssociativeArrayType = 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");
|
|
@@ -25,7 +24,7 @@ class AssociativeArrayType extends BscType_1.BscType {
|
|
|
25
24
|
else if ((0, reflection_1.isAssociativeArrayType)(targetType)) {
|
|
26
25
|
return true;
|
|
27
26
|
}
|
|
28
|
-
else if (this.checkCompatibilityBasedOnMembers(targetType,
|
|
27
|
+
else if (this.checkCompatibilityBasedOnMembers(targetType, 1 /* SymbolTypeFlag.runtime */, data)) {
|
|
29
28
|
return true;
|
|
30
29
|
}
|
|
31
30
|
else if ((0, reflection_1.isClassType)(targetType)) {
|
|
@@ -45,7 +44,7 @@ class AssociativeArrayType extends BscType_1.BscType {
|
|
|
45
44
|
return (_a = super.getMemberType(name, options)) !== null && _a !== void 0 ? _a : DynamicType_1.DynamicType.instance;
|
|
46
45
|
}
|
|
47
46
|
isEqual(otherType) {
|
|
48
|
-
return (0, reflection_1.isAssociativeArrayType)(otherType) && this.checkCompatibilityBasedOnMembers(otherType,
|
|
47
|
+
return (0, reflection_1.isAssociativeArrayType)(otherType) && this.checkCompatibilityBasedOnMembers(otherType, 1 /* SymbolTypeFlag.runtime */);
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
exports.AssociativeArrayType = AssociativeArrayType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssociativeArrayType.js","sourceRoot":"","sources":["../../src/types/AssociativeArrayType.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AssociativeArrayType.js","sourceRoot":"","sources":["../../src/types/AssociativeArrayType.ts"],"names":[],"mappings":";;;AACA,uDAA0G;AAE1G,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAC5C,uCAAkD;AAElD,MAAa,oBAAqB,SAAQ,iBAAO;IAAjD;;QAGoB,SAAI,GAAG,yBAAW,CAAC,oBAAoB,CAAC;IAmC5D,CAAC;IAjCU,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAChD,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,mCAAsB,EAAC,UAAU,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,gCAAgC,CAAC,UAAU,kCAA0B,IAAI,CAAC,EAAE;YACxF,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ;QACX,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,2EAA2E;QAC3E,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,mCAAsB,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,iCAAyB,CAAC;IACzH,CAAC;CACJ;AAtCD,oDAsCC"}
|
package/dist/types/BscType.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { GetSymbolTypeOptions, SymbolTableProvider } from '../SymbolTable';
|
|
2
|
-
import { SymbolTypeFlag } from '../SymbolTable';
|
|
3
2
|
import { SymbolTable } from '../SymbolTable';
|
|
3
|
+
import { SymbolTypeFlag } from '../SymbolTableFlag';
|
|
4
4
|
import type { ExtraSymbolData, TypeCompatibilityData } from '../interfaces';
|
|
5
5
|
export declare abstract class BscType {
|
|
6
6
|
readonly memberTable: SymbolTable;
|
package/dist/types/BscType.js
CHANGED
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BscType = void 0;
|
|
4
4
|
const SymbolTable_1 = require("../SymbolTable");
|
|
5
|
-
const SymbolTable_2 = require("../SymbolTable");
|
|
6
5
|
const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
|
|
7
6
|
const reflection_1 = require("../astUtils/reflection");
|
|
8
7
|
class BscType {
|
|
9
8
|
constructor(name = '') {
|
|
10
9
|
this.hasAddedBuiltInInterfaces = false;
|
|
11
10
|
this.__identifier = `${this.constructor.name}${name ? ': ' + name : ''}`;
|
|
12
|
-
this.memberTable = new
|
|
11
|
+
this.memberTable = new SymbolTable_1.SymbolTable(this.__identifier);
|
|
13
12
|
}
|
|
14
13
|
pushMemberProvider(provider) {
|
|
15
14
|
this.memberTable.pushParentProvider(provider);
|
|
@@ -86,7 +85,7 @@ class BscType {
|
|
|
86
85
|
.getSymbolTypes(memberSymbol.name, { flags: flags })) === null || _b === void 0 ? void 0 : _b.map(symbol => symbol.type);
|
|
87
86
|
if (!targetTypesOfSymbol || targetTypesOfSymbol.length === 0) {
|
|
88
87
|
// eslint-disable-next-line no-bitwise
|
|
89
|
-
if (!(memberSymbol.flags &
|
|
88
|
+
if (!(memberSymbol.flags & 4 /* SymbolTypeFlag.optional */)) {
|
|
90
89
|
data.missingFields.push({ name: memberSymbol.name, expectedType: memberSymbol.type });
|
|
91
90
|
isSuperSet = false;
|
|
92
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BuiltInInterfaceAdder = void 0;
|
|
4
4
|
const roku_types_1 = require("../roku-types");
|
|
5
5
|
const Cache_1 = require("../Cache");
|
|
6
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
7
6
|
const reflection_1 = require("../astUtils/reflection");
|
|
8
7
|
const util_1 = require("../util");
|
|
9
8
|
// eslint-disable-next-line @typescript-eslint/no-extraneous-class
|
|
@@ -34,18 +33,18 @@ class BuiltInInterfaceAdder {
|
|
|
34
33
|
const ifaceData = ((_b = roku_types_1.interfaces[lowerIfaceName]) !== null && _b !== void 0 ? _b : roku_types_1.events[lowerIfaceName]);
|
|
35
34
|
if (builtInComponent.interfaces) {
|
|
36
35
|
// this type has interfaces - add them directly as members
|
|
37
|
-
const ifaceType = (_c = this.getLookupTable()) === null || _c === void 0 ? void 0 : _c.getSymbolType(iface.name, { flags:
|
|
36
|
+
const ifaceType = (_c = this.getLookupTable()) === null || _c === void 0 ? void 0 : _c.getSymbolType(iface.name, { flags: 2 /* SymbolTypeFlag.typetime */ });
|
|
38
37
|
if (ifaceType) {
|
|
39
|
-
builtInMemberTable.addSymbol(iface.name, { completionPriority: 1 }, ifaceType,
|
|
38
|
+
builtInMemberTable.addSymbol(iface.name, { completionPriority: 1 }, ifaceType, 1 /* SymbolTypeFlag.runtime */);
|
|
40
39
|
}
|
|
41
40
|
}
|
|
42
41
|
for (const method of (_d = ifaceData.methods) !== null && _d !== void 0 ? _d : []) {
|
|
43
42
|
const methodFuncType = this.buildMethodFromDocData(method, overrides, thisType);
|
|
44
|
-
builtInMemberTable.addSymbol(method.name, { description: method.description, completionPriority: 1 }, methodFuncType,
|
|
43
|
+
builtInMemberTable.addSymbol(method.name, { description: method.description, completionPriority: 1 }, methodFuncType, 1 /* SymbolTypeFlag.runtime */);
|
|
45
44
|
}
|
|
46
45
|
for (const property of (_e = ifaceData.properties) !== null && _e !== void 0 ? _e : []) {
|
|
47
46
|
const override = overrides === null || overrides === void 0 ? void 0 : overrides.get(property.name.toLowerCase());
|
|
48
|
-
builtInMemberTable.addSymbol(property.name, { description: property.description, completionPriority: 1 }, (_g = (_f = override === null || override === void 0 ? void 0 : override.type) !== null && _f !== void 0 ? _f : this.getPrimitiveType(property.type)) !== null && _g !== void 0 ? _g : this.getPrimitiveType('dynamic'),
|
|
47
|
+
builtInMemberTable.addSymbol(property.name, { description: property.description, completionPriority: 1 }, (_g = (_f = override === null || override === void 0 ? void 0 : override.type) !== null && _f !== void 0 ? _f : this.getPrimitiveType(property.type)) !== null && _g !== void 0 ? _g : this.getPrimitiveType('dynamic'), 1 /* SymbolTypeFlag.runtime */);
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
}
|
|
@@ -86,7 +85,7 @@ class BuiltInInterfaceAdder {
|
|
|
86
85
|
if (!this.getLookupTable) {
|
|
87
86
|
throw new Error(`Unable to find type instance '${typeName}'`);
|
|
88
87
|
}
|
|
89
|
-
return (_a = this.getLookupTable()) === null || _a === void 0 ? void 0 : _a.getSymbolType(typeName, { flags:
|
|
88
|
+
return (_a = this.getLookupTable()) === null || _a === void 0 ? void 0 : _a.getSymbolType(typeName, { flags: 2 /* SymbolTypeFlag.typetime */, fullName: typeName, tableProvider: this.getLookupTable });
|
|
90
89
|
}
|
|
91
90
|
return returnType;
|
|
92
91
|
}
|
|
@@ -158,11 +157,11 @@ class BuiltInInterfaceAdder {
|
|
|
158
157
|
}
|
|
159
158
|
const lookupTable = this.getLookupTable();
|
|
160
159
|
for (const field of builtInNode.fields) {
|
|
161
|
-
memberTable.addSymbol(field.name, { description: field.description, completionPriority: 1 }, util_1.default.getNodeFieldType(field.type, lookupTable),
|
|
160
|
+
memberTable.addSymbol(field.name, { description: field.description, completionPriority: 1 }, util_1.default.getNodeFieldType(field.type, lookupTable), 1 /* SymbolTypeFlag.runtime */);
|
|
162
161
|
}
|
|
163
162
|
for (const method of (_a = builtInNode.methods) !== null && _a !== void 0 ? _a : []) {
|
|
164
163
|
const methodFuncType = this.buildMethodFromDocData(method, null, thisType);
|
|
165
|
-
memberTable.addSymbol(method.name, { description: method.description, completionPriority: 1 }, methodFuncType,
|
|
164
|
+
memberTable.addSymbol(method.name, { description: method.description, completionPriority: 1 }, methodFuncType, 1 /* SymbolTypeFlag.runtime */);
|
|
166
165
|
}
|
|
167
166
|
}
|
|
168
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInInterfaceAdder.js","sourceRoot":"","sources":["../../src/types/BuiltInInterfaceAdder.ts"],"names":[],"mappings":";;;AACA,8CAAsE;AACtE,oCAAiC;
|
|
1
|
+
{"version":3,"file":"BuiltInInterfaceAdder.js","sourceRoot":"","sources":["../../src/types/BuiltInInterfaceAdder.ts"],"names":[],"mappings":";;;AACA,8CAAsE;AACtE,oCAAiC;AAKjC,uDAA0P;AAE1P,kCAA2B;AAU3B,kEAAkE;AAClE,MAAa,qBAAqB;IAS9B,MAAM,CAAC,0BAA0B,CAAC,QAAiB,EAAE,SAAiD;;QAClG,MAAM,kBAAkB,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QAC5D,IAAI,CAAC,kBAAkB,EAAE;YACrB,2BAA2B;YAC3B,uDAAuD;YACvD,iDAAiD;YACjD,OAAO;SACV;QACD,oDAAoD;QACpD,4FAA4F;QAC5F,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE;YACnB,gFAAgF;YAChF,+HAA+H;YAC/H,OAAO;SACV;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAClF;QACD,MAAM,gBAAgB,GAAG,MAAA,gBAAgB,CAAC,UAAU,mCAAI,CAAC,gBAAgB,CAAC,CAAC;QAE3E,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;YAClC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,CAAC,MAAA,uBAAU,CAAC,cAAc,CAAC,mCAAI,mBAAM,CAAC,cAAc,CAAC,CAAqB,CAAC;YAE7F,IAAI,gBAAgB,CAAC,UAAU,EAAE;gBAC7B,0DAA0D;gBAC1D,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,cAAc,EAAE,0CAAE,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,iCAAyB,EAAE,CAAC,CAAC;gBACvG,IAAI,SAAS,EAAE;oBACX,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,SAAS,iCAAyB,CAAC;iBAC1G;aACJ;YAED,KAAK,MAAM,MAAM,IAAI,MAAA,SAAS,CAAC,OAAO,mCAAI,EAAE,EAAE;gBAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAChF,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,cAAc,iCAAyB,CAAC;aACjJ;YACD,KAAK,MAAM,QAAQ,IAAI,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,EAAE;gBAC/C,MAAM,QAAQ,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC7D,kBAAkB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,mCAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,mCAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,iCAAyB,CAAC;aACjO;SACJ;IACL,CAAC;IAEO,MAAM,CAAC,sBAAsB,CAAC,MAA8B,EAAE,SAAiD,EAAE,QAAkB;;QACvI,MAAM,QAAQ,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3D,IAAI,UAAU,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,mCAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClF,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAK,MAAC,QAAgB,aAAhB,QAAQ,uBAAR,QAAQ,CAAU,IAAI,0CAAE,WAAW,EAAE,CAAA,EAAE;YAC3F,UAAU,GAAG,QAAQ,CAAC;SACzB;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC7D,cAAc,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QAClC,cAAc,CAAC,UAAU,GAAG,MAAA,MAAM,CAAC,UAAU,mCAAI,KAAK,CAAC;QACvD,4DAA4D;QAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,SAAS,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc,0CAAG,CAAC,CAAC,mCAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnF,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,MAAK,MAAC,QAAgB,aAAhB,QAAQ,uBAAR,QAAQ,CAAU,IAAI,0CAAE,WAAW,EAAE,CAAA,EAAE;gBACnF,SAAS,GAAG,QAAQ,CAAC;aACxB;YACD,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAC;YAC7D,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SACzE;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,QAAgB;;QAC5C,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;aAC1E;YACD,eAAe;YACf,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC3F;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,UAAU,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,GAAG,CAAC,CAAC;aACjE;YACD,OAAO,MAAA,IAAI,CAAC,cAAc,EAAE,0CAAE,aAAa,CAAC,QAAQ,EAAE,EAAE,KAAK,iCAAyB,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;SACrJ;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,OAAgB;QAChD,IAAI,IAAA,yBAAY,EAAC,OAAO,CAAC,EAAE;YACvB,OAAO,UAAU,CAAC;SACrB;aAAM,IAAI,IAAA,0BAAa,EAAC,OAAO,CAAC,EAAE;YAC/B,OAAO,OAAO,CAAC;SAClB;aAAM,IAAI,IAAA,0BAAa,EAAC,OAAO,CAAC,EAAE;YAC/B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAI,IAAA,wBAAW,EAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,SAAS,CAAC;SACpB;aAAM,IAAI,IAAA,yBAAY,EAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,UAAU,CAAC;SACrB;aAAM,IAAI,IAAA,8BAAiB,EAAC,OAAO,CAAC,EAAE;YACnC,OAAO,eAAe,CAAC;SAC1B;aAAM,IAAI,IAAA,0BAAa,EAAC,OAAO,CAAC,EAAE;YAC/B,OAAO,WAAW,CAAC;SACtB;aAAM,IAAI,IAAA,2BAAc,EAAC,OAAO,CAAC,EAAE;YAChC,OAAO,YAAY,CAAC;SACvB;aAAM,IAAI,IAAA,mCAAsB,EAAC,OAAO,CAAC,EAAE;YACxC,OAAO,oBAAoB,CAAC;SAC/B;aAAM,IAAI,IAAA,wBAAW,EAAC,OAAO,CAAC,EAAE;YAC7B,OAAO,SAAS,CAAC;SACpB;aAAM,IAAI,IAAA,6BAAgB,EAAC,OAAO,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SACpE;aAAM,IAAI,IAAA,4BAAe,EAAC,OAAO,CAAC,EAAE;YACjC,OAAO,OAAO,CAAC,IAAI,CAAC;SACvB;aAAM,IAAI,IAAA,4BAAe,EAAC,OAAO,CAAC,EAAE;YACjC,OAAO,UAAU,CAAC;SACrB;IACL,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,OAAgB;;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,aAAa,EAAE;YAChB,sCAAsC;YACtC,OAAO;SACV;QACD,MAAM,kBAAkB,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QACvD,OAAO,MAAA,MAAA,uBAAU,CAAC,kBAAkB,CAAC,mCAAI,uBAAU,CAAC,kBAAkB,CAAC,mCAAI,mBAAM,CAAC,kBAAkB,CAAC,CAAC;IAC1G,CAAC;IAED,MAAM,CAAC,0BAA0B,CAAC,QAAuB;;QACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC/B,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,WAAW,EAAE;YACd,2BAA2B;YAC3B,OAAO;SACV;QACD,MAAM,WAAW,GAAG,kBAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAe,CAAC;QAChE,IAAI,CAAC,WAAW,EAAE;YACd,OAAO;SACV;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAClF;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,MAAM,EAAE;YACpC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,cAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,iCAAyB,CAAC;SACxK;QACD,KAAK,MAAM,MAAM,IAAI,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,EAAE;YAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC3E,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,cAAc,iCAAyB,CAAC;SAC1I;IACL,CAAC;;AA7JL,sDA+JC;AA7JmB,gDAA0B,GAAG,IAAI,aAAK,EAAmB,CAAC"}
|
|
@@ -4,7 +4,6 @@ const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
|
|
|
4
4
|
const StringType_1 = require("./StringType");
|
|
5
5
|
const testHelpers_spec_1 = require("../testHelpers.spec");
|
|
6
6
|
const IntegerType_1 = require("./IntegerType");
|
|
7
|
-
const SymbolTable_1 = require("../SymbolTable");
|
|
8
7
|
const TypedFunctionType_1 = require("./TypedFunctionType");
|
|
9
8
|
const BooleanType_1 = require("./BooleanType");
|
|
10
9
|
const FunctionType_1 = require("./FunctionType");
|
|
@@ -18,15 +17,15 @@ describe('BuiltInInterfaceAdder', () => {
|
|
|
18
17
|
it('should add members to StringType', () => {
|
|
19
18
|
const myType = new StringType_1.StringType();
|
|
20
19
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
21
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('trim', { flags:
|
|
22
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('split', { flags:
|
|
23
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getString', { flags:
|
|
24
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('replace', { flags:
|
|
20
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('trim', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
21
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('split', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
22
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getString', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
23
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('replace', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
25
24
|
});
|
|
26
25
|
it('should have correct types for string members', () => {
|
|
27
26
|
const myType = new StringType_1.StringType();
|
|
28
27
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
29
|
-
const leftType = myType.getMemberType('left', { flags:
|
|
28
|
+
const leftType = myType.getMemberType('left', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
30
29
|
(0, testHelpers_spec_1.expectTypeToBe)(leftType, TypedFunctionType_1.TypedFunctionType);
|
|
31
30
|
const leftFuncType = leftType;
|
|
32
31
|
(0, chai_1.expect)(leftFuncType.params.length).to.equal(1);
|
|
@@ -36,80 +35,80 @@ describe('BuiltInInterfaceAdder', () => {
|
|
|
36
35
|
it('should add members to IntegerType', () => {
|
|
37
36
|
const myType = new IntegerType_1.IntegerType();
|
|
38
37
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
39
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags:
|
|
40
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getInt', { flags:
|
|
38
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
39
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getInt', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
41
40
|
});
|
|
42
41
|
it('should add members to BooleanType', () => {
|
|
43
42
|
const myType = new BooleanType_1.BooleanType();
|
|
44
43
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
45
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags:
|
|
46
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getBoolean', { flags:
|
|
44
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
45
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getBoolean', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
47
46
|
});
|
|
48
47
|
it('should add members to DoubleType', () => {
|
|
49
48
|
const myType = new DoubleType_1.DoubleType();
|
|
50
49
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
51
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags:
|
|
52
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getDouble', { flags:
|
|
50
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
51
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getDouble', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
53
52
|
});
|
|
54
53
|
it('should add members to FunctionType', () => {
|
|
55
54
|
const myType = new FunctionType_1.FunctionType();
|
|
56
55
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
57
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags:
|
|
58
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getSub', { flags:
|
|
56
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
57
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getSub', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
59
58
|
});
|
|
60
59
|
it('should add members to TypedFunctionType', () => {
|
|
61
60
|
const myType = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
62
61
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
63
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags:
|
|
64
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getSub', { flags:
|
|
62
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('toStr', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
63
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getSub', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
65
64
|
});
|
|
66
65
|
it('should add members to ArrayType', () => {
|
|
67
66
|
const myType = new ArrayType_1.ArrayType();
|
|
68
67
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
69
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('push', { flags:
|
|
70
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getEntry', { flags:
|
|
71
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('join', { flags:
|
|
68
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('push', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
69
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('getEntry', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
70
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('join', { flags: 1 /* SymbolTypeFlag.runtime */ }), TypedFunctionType_1.TypedFunctionType);
|
|
72
71
|
});
|
|
73
72
|
it('should not add members to ClassType', () => {
|
|
74
73
|
const myType = new ClassType_1.ClassType('Klass');
|
|
75
74
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
76
|
-
(0, chai_1.expect)(myType.getMemberType('clear', { flags:
|
|
77
|
-
(0, chai_1.expect)(myType.getMemberType('lookUp', { flags:
|
|
75
|
+
(0, chai_1.expect)(myType.getMemberType('clear', { flags: 1 /* SymbolTypeFlag.runtime */ }).isResolvable()).to.be.false;
|
|
76
|
+
(0, chai_1.expect)(myType.getMemberType('lookUp', { flags: 1 /* SymbolTypeFlag.runtime */ }).isResolvable()).to.be.false;
|
|
78
77
|
});
|
|
79
78
|
it('should allow classes to override AA members', () => {
|
|
80
79
|
const myType = new ClassType_1.ClassType('Klass');
|
|
81
|
-
myType.addMember('clear', null, new BooleanType_1.BooleanType(),
|
|
80
|
+
myType.addMember('clear', null, new BooleanType_1.BooleanType(), 1 /* SymbolTypeFlag.runtime */);
|
|
82
81
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
83
|
-
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('clear', { flags:
|
|
82
|
+
(0, testHelpers_spec_1.expectTypeToBe)(myType.getMemberType('clear', { flags: 1 /* SymbolTypeFlag.runtime */ }), BooleanType_1.BooleanType);
|
|
84
83
|
});
|
|
85
84
|
it('should not include members that have already been overrided', () => {
|
|
86
85
|
const myType = new ClassType_1.ClassType('Klass');
|
|
87
|
-
myType.addMember('clear', null, new BooleanType_1.BooleanType(),
|
|
86
|
+
myType.addMember('clear', null, new BooleanType_1.BooleanType(), 1 /* SymbolTypeFlag.runtime */);
|
|
88
87
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
|
|
89
|
-
const myMembers = myType.getMemberTable().getAllSymbols(
|
|
88
|
+
const myMembers = myType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
|
|
90
89
|
(0, chai_1.expect)(myMembers.filter(member => member.name.toLowerCase() === 'clear').length).to.eq(1);
|
|
91
90
|
});
|
|
92
91
|
it('should only add built ins to original ancestor', () => {
|
|
93
92
|
const sup = new ClassType_1.ClassType('SuperKlass');
|
|
94
93
|
const sub = new ClassType_1.ClassType('Klass', sup);
|
|
95
|
-
sup.addMember('clear', null, new BooleanType_1.BooleanType(),
|
|
94
|
+
sup.addMember('clear', null, new BooleanType_1.BooleanType(), 1 /* SymbolTypeFlag.runtime */);
|
|
96
95
|
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(sub);
|
|
97
|
-
(0, testHelpers_spec_1.expectTypeToBe)(sub.getMemberType('clear', { flags:
|
|
96
|
+
(0, testHelpers_spec_1.expectTypeToBe)(sub.getMemberType('clear', { flags: 1 /* SymbolTypeFlag.runtime */ }), BooleanType_1.BooleanType);
|
|
98
97
|
});
|
|
99
98
|
it('should respect overrides', () => {
|
|
100
99
|
const myArray = new ArrayType_1.ArrayType(IntegerType_1.IntegerType.instance);
|
|
101
|
-
const popType = myArray.getMemberType('pop', { flags:
|
|
100
|
+
const popType = myArray.getMemberType('pop', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
102
101
|
(0, testHelpers_spec_1.expectTypeToBe)(popType.returnType, IntegerType_1.IntegerType);
|
|
103
|
-
const pushType = myArray.getMemberType('push', { flags:
|
|
102
|
+
const pushType = myArray.getMemberType('push', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
104
103
|
(0, testHelpers_spec_1.expectTypeToBe)(pushType.params[0].type, IntegerType_1.IntegerType);
|
|
105
104
|
});
|
|
106
105
|
it('works with enums', () => {
|
|
107
106
|
const myEnum = new EnumType_1.EnumType('myEnum', StringType_1.StringType.instance);
|
|
108
107
|
const myEnumMember = new EnumType_1.EnumMemberType('myEnum', 'member', StringType_1.StringType.instance);
|
|
109
|
-
myEnum.addMember('member', {}, myEnumMember,
|
|
110
|
-
const enumTrim = myEnum.getMemberType('trim', { flags:
|
|
108
|
+
myEnum.addMember('member', {}, myEnumMember, 1 /* SymbolTypeFlag.runtime */);
|
|
109
|
+
const enumTrim = myEnum.getMemberType('trim', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
111
110
|
(0, chai_1.expect)(enumTrim).to.be.undefined;
|
|
112
|
-
const memberTrim = myEnumMember.getMemberType('trim', { flags:
|
|
111
|
+
const memberTrim = myEnumMember.getMemberType('trim', { flags: 1 /* SymbolTypeFlag.runtime */ });
|
|
113
112
|
(0, testHelpers_spec_1.expectTypeToBe)(memberTrim, TypedFunctionType_1.TypedFunctionType);
|
|
114
113
|
});
|
|
115
114
|
});
|
|
@@ -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":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { GetSymbolTypeOptions
|
|
1
|
+
import type { GetSymbolTypeOptions } from '../SymbolTable';
|
|
2
|
+
import type { SymbolTypeFlag } from '../SymbolTableFlag';
|
|
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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"}
|