brighterscript 0.66.0-alpha.5 → 0.66.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/DiagnosticMessages.d.ts +17 -4
- package/dist/DiagnosticMessages.js +32 -4
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/Program.d.ts +17 -0
- package/dist/Program.js +104 -9
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +14 -0
- package/dist/Scope.js +16 -0
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +5 -0
- package/dist/SymbolTable.js +15 -2
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.d.ts +2 -0
- package/dist/XmlScope.js +38 -0
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/creators.d.ts +3 -1
- package/dist/astUtils/creators.js +9 -1
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +21 -4
- package/dist/astUtils/reflection.js +47 -13
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +83 -2
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +4 -4
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +6 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +76 -45
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +86 -3
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.js +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +55 -0
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +2 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +12 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +113 -4
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +345 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/globalCallables.js +1 -5
- package/dist/globalCallables.js.map +1 -1
- package/dist/interfaces.d.ts +14 -1
- package/dist/interfaces.js +4 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/parser/Expression.js +32 -10
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.js +9 -1
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +3 -1
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/Statement.d.ts +2 -3
- package/dist/parser/Statement.js +1 -1
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +8 -0
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/roku-types/data.json +31 -7
- package/dist/roku-types/index.d.ts +12 -2
- package/dist/types/ArrayType.d.ts +2 -1
- package/dist/types/ArrayType.js +2 -2
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +10 -0
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.d.ts +11 -0
- package/dist/types/AssociativeArrayType.js +52 -0
- package/dist/types/AssociativeArrayType.js.map +1 -0
- package/dist/types/BaseFunctionType.d.ts +2 -1
- package/dist/types/BaseFunctionType.js +1 -1
- package/dist/types/BaseFunctionType.js.map +1 -1
- package/dist/types/BooleanType.d.ts +2 -1
- package/dist/types/BooleanType.js +1 -1
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscType.d.ts +3 -3
- package/dist/types/BscType.js +24 -12
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BscTypeKind.d.ts +2 -0
- package/dist/types/BscTypeKind.js +2 -0
- package/dist/types/BscTypeKind.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.d.ts +5 -0
- package/dist/types/BuiltInInterfaceAdder.js +61 -15
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/ClassType.d.ts +2 -1
- package/dist/types/ClassType.js +2 -2
- package/dist/types/ClassType.js.map +1 -1
- package/dist/types/ComponentType.d.ts +26 -0
- package/dist/types/ComponentType.js +80 -0
- package/dist/types/ComponentType.js.map +1 -0
- package/dist/types/DoubleType.d.ts +2 -1
- package/dist/types/DoubleType.js +2 -2
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/DynamicType.d.ts +2 -2
- package/dist/types/DynamicType.js +1 -1
- package/dist/types/DynamicType.js.map +1 -1
- package/dist/types/EnumType.d.ts +3 -2
- package/dist/types/EnumType.js +3 -3
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/FloatType.d.ts +2 -1
- package/dist/types/FloatType.js +2 -2
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/FunctionType.d.ts +2 -1
- package/dist/types/FunctionType.js +2 -2
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/IntegerType.d.ts +2 -1
- package/dist/types/IntegerType.js +2 -2
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +2 -1
- package/dist/types/InterfaceType.js +7 -4
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +2 -2
- package/dist/types/LongIntegerType.d.ts +2 -1
- package/dist/types/LongIntegerType.js +2 -2
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/ObjectType.d.ts +3 -3
- package/dist/types/ObjectType.js +1 -1
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +2 -0
- package/dist/types/ReferenceType.js +45 -1
- package/dist/types/ReferenceType.js.map +1 -1
- package/dist/types/StringType.d.ts +2 -1
- package/dist/types/StringType.js +2 -2
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +2 -1
- package/dist/types/TypedFunctionType.js +2 -2
- package/dist/types/TypedFunctionType.js.map +1 -1
- package/dist/types/UninitializedType.d.ts +2 -1
- package/dist/types/UninitializedType.js +1 -1
- package/dist/types/UninitializedType.js.map +1 -1
- package/dist/types/UnionType.d.ts +2 -2
- package/dist/types/UnionType.js +3 -3
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/UnionType.spec.js +3 -2
- package/dist/types/UnionType.spec.js.map +1 -1
- package/dist/types/VoidType.d.ts +2 -1
- package/dist/types/VoidType.js +2 -2
- package/dist/types/VoidType.js.map +1 -1
- package/dist/types/helpers.d.ts +2 -1
- package/dist/types/helpers.js +2 -2
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +15 -1
- package/dist/util.js +102 -12
- package/dist/util.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { GetTypeOptions } from '../interfaces';
|
|
1
|
+
import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
|
|
2
2
|
import { BscType } from './BscType';
|
|
3
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
4
|
import { SymbolTable } from '../SymbolTable';
|
|
@@ -11,7 +11,7 @@ export declare class UnionType extends BscType {
|
|
|
11
11
|
isResolvable(): boolean;
|
|
12
12
|
private getMemberTypeFromInnerTypes;
|
|
13
13
|
getMemberType(name: string, options: GetTypeOptions): BscType;
|
|
14
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
14
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
15
15
|
toString(): string;
|
|
16
16
|
toTypeString(): string;
|
|
17
17
|
checkAllMemberTypes(predicate: (BscType: any) => boolean): boolean;
|
package/dist/types/UnionType.js
CHANGED
|
@@ -49,21 +49,21 @@ class UnionType extends BscType_1.BscType {
|
|
|
49
49
|
}
|
|
50
50
|
return (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(innerTypesMemberTypes), unionTypeFactory);
|
|
51
51
|
}
|
|
52
|
-
isTypeCompatible(targetType) {
|
|
52
|
+
isTypeCompatible(targetType, data) {
|
|
53
53
|
if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
|
|
54
54
|
return true;
|
|
55
55
|
}
|
|
56
56
|
if ((0, reflection_1.isUnionType)(targetType)) {
|
|
57
57
|
// check if this set of inner types is a SUPERSET of targetTypes's inner types
|
|
58
58
|
for (const targetInnerType of targetType.types) {
|
|
59
|
-
if (!this.isTypeCompatible(targetInnerType)) {
|
|
59
|
+
if (!this.isTypeCompatible(targetInnerType, data)) {
|
|
60
60
|
return false;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
return true;
|
|
64
64
|
}
|
|
65
65
|
for (const innerType of this.types) {
|
|
66
|
-
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType);
|
|
66
|
+
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType, data);
|
|
67
67
|
if (foundCompatibleInnerType) {
|
|
68
68
|
return true;
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":";;;AACA,uDAAkF;AAClF,uCAAoC;AACpC,mDAAgD;AAChD,uCAAyD;AACzD,+CAA4C;AAE5C,gDAA6D;AAE7D,SAAgB,gBAAgB,CAAC,KAAgB;IAC7C,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAFD,4CAEC;AAED,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,KAAgB;QAEvB,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAFvB,UAAK,GAAL,KAAK,CAAW;QAKX,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAIM,OAAO,CAAC,IAAa;QACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,YAAY;QACR,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE;gBACtB,OAAO,KAAK,CAAC;aAChB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,2BAA2B,CAAC,IAAY,EAAE,OAAuB;QACrE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;QAC/C,MAAM,qBAAqB,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9E,IAAI,CAAC,qBAAqB,EAAE;YACxB,0DAA0D;YAC1D,8CAA8C;YAC9C,OAAO,IAAI,6BAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE;gBACrD,OAAO;oBACH,aAAa,EAAE,CAAC,SAAiB,EAAE,YAA4B,EAAE,EAAE;wBAC/D,OAAO,IAAA,uBAAa,EAAC,IAAA,uBAAa,EAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;oBAC3G,CAAC;oBACD,aAAa,EAAE,CAAC,SAAiB,EAAE,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;
|
|
1
|
+
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,8 @@ describe('UnionType', () => {
|
|
|
23
23
|
const myUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, iFace, StringType_1.StringType.instance]);
|
|
24
24
|
(0, chai_1.expect)(myUnion.isTypeCompatible(FloatType_1.FloatType.instance)).to.be.true;
|
|
25
25
|
(0, chai_1.expect)(myUnion.isTypeCompatible(StringType_1.StringType.instance)).to.be.true;
|
|
26
|
-
(0, chai_1.expect)(myUnion.isTypeCompatible(otheriFaceWithSameMembers)).to.be.
|
|
27
|
-
(0, chai_1.expect)(otheriFaceWithSameMembers.isTypeCompatible(myUnion)).to.be.
|
|
26
|
+
(0, chai_1.expect)(myUnion.isTypeCompatible(otheriFaceWithSameMembers)).to.be.true;
|
|
27
|
+
(0, chai_1.expect)(otheriFaceWithSameMembers.isTypeCompatible(myUnion)).to.be.false;
|
|
28
28
|
});
|
|
29
29
|
it('can assign to a more general Union', () => {
|
|
30
30
|
const myUnion = new UnionType_1.UnionType([StringType_1.StringType.instance, FloatType_1.FloatType.instance]);
|
|
@@ -42,6 +42,7 @@ describe('UnionType', () => {
|
|
|
42
42
|
const otheriFaceWithSameMembers = new InterfaceType_1.InterfaceType('OtherIface');
|
|
43
43
|
otheriFaceWithSameMembers.addMember('name', null, StringType_1.StringType.instance, SymbolTable_1.SymbolTypeFlag.runtime);
|
|
44
44
|
otheriFaceWithSameMembers.addMember('age', null, IntegerType_1.IntegerType.instance, SymbolTable_1.SymbolTypeFlag.runtime);
|
|
45
|
+
otheriFaceWithSameMembers.addMember('height', null, FloatType_1.FloatType.instance, SymbolTable_1.SymbolTypeFlag.runtime);
|
|
45
46
|
const otherUnion = new UnionType_1.UnionType([FloatType_1.FloatType.instance, otheriFaceWithSameMembers, StringType_1.StringType.instance]);
|
|
46
47
|
(0, chai_1.expect)(myUnion.isTypeCompatible(otherUnion)).to.be.true;
|
|
47
48
|
(0, chai_1.expect)(otherUnion.isTypeCompatible(myUnion)).to.be.false;
|
|
@@ -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;AAChD,gDAAgD;AAChD,+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,EAAE,4BAAc,CAAC,OAAO,CAAC,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,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;QAE3E,MAAM,yBAAyB,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;QAClE,yBAAyB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,uBAAU,CAAC,QAAQ,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,yBAAW,CAAC,QAAQ,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;QAC/F,yBAAyB,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAS,CAAC,QAAQ,EAAE,4BAAc,CAAC,OAAO,CAAC,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,
|
|
1
|
+
{"version":3,"file":"UnionType.spec.js","sourceRoot":"","sources":["../../src/types/UnionType.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/VoidType.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { BscType } from './BscType';
|
|
2
2
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
3
4
|
export declare class VoidType extends BscType {
|
|
4
5
|
typeText?: string;
|
|
5
6
|
constructor(typeText?: string);
|
|
6
7
|
readonly kind = BscTypeKind.VoidType;
|
|
7
8
|
static instance: VoidType;
|
|
8
|
-
isTypeCompatible(targetType: BscType): any;
|
|
9
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): any;
|
|
9
10
|
toString(): string;
|
|
10
11
|
toTypeString(): string;
|
|
11
12
|
isEqual(targetType: BscType): boolean;
|
package/dist/types/VoidType.js
CHANGED
|
@@ -12,11 +12,11 @@ class VoidType extends BscType_1.BscType {
|
|
|
12
12
|
this.typeText = typeText;
|
|
13
13
|
this.kind = BscTypeKind_1.BscTypeKind.VoidType;
|
|
14
14
|
}
|
|
15
|
-
isTypeCompatible(targetType) {
|
|
15
|
+
isTypeCompatible(targetType, data) {
|
|
16
16
|
return ((0, reflection_1.isVoidType)(targetType) ||
|
|
17
17
|
(0, reflection_1.isDynamicType)(targetType) ||
|
|
18
18
|
(0, reflection_1.isObjectType)(targetType) ||
|
|
19
|
-
(0, helpers_1.isUnionTypeCompatible)(this, targetType));
|
|
19
|
+
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data));
|
|
20
20
|
}
|
|
21
21
|
toString() {
|
|
22
22
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VoidType.js","sourceRoot":"","sources":["../../src/types/VoidType.ts"],"names":[],"mappings":";;;AAAA,uDAAiF;AACjF,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;
|
|
1
|
+
{"version":3,"file":"VoidType.js","sourceRoot":"","sources":["../../src/types/VoidType.ts"],"names":[],"mappings":";;;AAAA,uDAAiF;AACjF,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAGhE,MAAa,QAAS,SAAQ,iBAAO;IACjC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,QAAQ,CAAC;IAF5C,CAAC;IAMM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,uBAAU,EAAC,UAAU,CAAC;YACtB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAChD,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,MAAM,CAAC;IACnC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,uBAAU,EAAC,UAAU,CAAC,CAAC;IAClC,CAAC;;AA9BL,4BA+BC;AAtBiB,iBAAQ,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;AAwBlD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC"}
|
package/dist/types/helpers.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
1
2
|
import type { BscType } from './BscType';
|
|
2
3
|
export declare function findTypeIntersection(typesArr1: BscType[], typesArr2: BscType[]): BscType[];
|
|
3
4
|
export declare function findTypeUnion(...typesArr: BscType[][]): BscType[];
|
|
@@ -17,4 +18,4 @@ export declare function reduceTypesToMostGeneric(types: BscType[]): BscType[];
|
|
|
17
18
|
* @returns either the singular most general type, if there is one, otherwise a UnionType of the most general types
|
|
18
19
|
*/
|
|
19
20
|
export declare function getUniqueType(types: BscType[], unionTypeFactory: (types: BscType[]) => BscType): BscType;
|
|
20
|
-
export declare function isUnionTypeCompatible(thisType: BscType, maybeUnionType: BscType): boolean;
|
|
21
|
+
export declare function isUnionTypeCompatible(thisType: BscType, maybeUnionType: BscType, data?: TypeCompatibilityData): boolean;
|
package/dist/types/helpers.js
CHANGED
|
@@ -131,10 +131,10 @@ function getUniqueType(types, unionTypeFactory) {
|
|
|
131
131
|
return unionTypeFactory(generalizedTypes);
|
|
132
132
|
}
|
|
133
133
|
exports.getUniqueType = getUniqueType;
|
|
134
|
-
function isUnionTypeCompatible(thisType, maybeUnionType) {
|
|
134
|
+
function isUnionTypeCompatible(thisType, maybeUnionType, data) {
|
|
135
135
|
if ((0, reflection_1.isUnionType)(maybeUnionType)) {
|
|
136
136
|
for (const innerType of maybeUnionType.types) {
|
|
137
|
-
if (!thisType.isTypeCompatible(innerType)) {
|
|
137
|
+
if (!thisType.isTypeCompatible(innerType, data)) {
|
|
138
138
|
return false;
|
|
139
139
|
}
|
|
140
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/types/helpers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/types/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ import type { AstNode } from './parser/AstNode';
|
|
|
20
20
|
import { type Expression, type Statement } from './parser/AstNode';
|
|
21
21
|
import type { BscType } from './types/BscType';
|
|
22
22
|
import { FunctionType } from './types/FunctionType';
|
|
23
|
+
import type { SymbolTable } from './SymbolTable';
|
|
23
24
|
export declare class Util {
|
|
24
25
|
clearConsole(): void;
|
|
25
26
|
/**
|
|
@@ -156,6 +157,13 @@ export declare class Util {
|
|
|
156
157
|
* Combine all the documentation for a node - uses the AstNode's leadingTrivia property
|
|
157
158
|
*/
|
|
158
159
|
getNodeDocumentation(node: AstNode): string;
|
|
160
|
+
/**
|
|
161
|
+
* Prefixes a component name so it can be used as type in the symbol table, without polluting available symbols
|
|
162
|
+
*
|
|
163
|
+
* @param sgNodeName the Name of the component
|
|
164
|
+
* @returns the node name, prefixed with `roSGNode`
|
|
165
|
+
*/
|
|
166
|
+
getSgNodeTypeName(sgNodeName: string): string;
|
|
159
167
|
/**
|
|
160
168
|
* Parse an xml file and get back a javascript object containing its results
|
|
161
169
|
*/
|
|
@@ -298,7 +306,13 @@ export declare class Util {
|
|
|
298
306
|
* Convert a token into a BscType
|
|
299
307
|
*/
|
|
300
308
|
tokenToBscType(token: Token): DynamicType | ObjectType | StringType | IntegerType | BooleanType | FloatType | DoubleType | LongIntegerType | VoidType | FunctionType;
|
|
301
|
-
|
|
309
|
+
/**
|
|
310
|
+
* Deciphers the correct types for fields based on docs
|
|
311
|
+
* https://developer.roku.com/en-ca/docs/references/scenegraph/xml-elements/interface.md
|
|
312
|
+
* @param typeDescriptor the type descriptor from the docs
|
|
313
|
+
* @returns {BscType} the known type, or dynamic
|
|
314
|
+
*/
|
|
315
|
+
getNodeFieldType(typeDescriptor: string, lookupTable?: SymbolTable): BscType;
|
|
302
316
|
/**
|
|
303
317
|
* Return the type of the result of a binary operator
|
|
304
318
|
* Note: compound assignments (eg. +=) internally use a binary expression, so that's why TokenKind.PlusEqual, etc. are here too
|
package/dist/util.js
CHANGED
|
@@ -29,6 +29,9 @@ const AstNode_1 = require("./parser/AstNode");
|
|
|
29
29
|
const creators_1 = require("./astUtils/creators");
|
|
30
30
|
const FunctionType_1 = require("./types/FunctionType");
|
|
31
31
|
const types_1 = require("./types");
|
|
32
|
+
const SymbolTable_1 = require("./SymbolTable");
|
|
33
|
+
const AssociativeArrayType_1 = require("./types/AssociativeArrayType");
|
|
34
|
+
const ComponentType_1 = require("./types/ComponentType");
|
|
32
35
|
class Util {
|
|
33
36
|
clearConsole() {
|
|
34
37
|
// process.stdout.write('\x1Bc');
|
|
@@ -572,6 +575,15 @@ class Util {
|
|
|
572
575
|
const leadingTrivia = node.getLeadingTrivia();
|
|
573
576
|
return this.getTokenDocumentation(leadingTrivia, leadingTrivia[leadingTrivia.length - 1]);
|
|
574
577
|
}
|
|
578
|
+
/**
|
|
579
|
+
* Prefixes a component name so it can be used as type in the symbol table, without polluting available symbols
|
|
580
|
+
*
|
|
581
|
+
* @param sgNodeName the Name of the component
|
|
582
|
+
* @returns the node name, prefixed with `roSGNode`
|
|
583
|
+
*/
|
|
584
|
+
getSgNodeTypeName(sgNodeName) {
|
|
585
|
+
return 'roSGNode' + sgNodeName;
|
|
586
|
+
}
|
|
575
587
|
/**
|
|
576
588
|
* Parse an xml file and get back a javascript object containing its results
|
|
577
589
|
*/
|
|
@@ -1049,11 +1061,81 @@ class Util {
|
|
|
1049
1061
|
}
|
|
1050
1062
|
}
|
|
1051
1063
|
}
|
|
1052
|
-
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1064
|
+
/**
|
|
1065
|
+
* Deciphers the correct types for fields based on docs
|
|
1066
|
+
* https://developer.roku.com/en-ca/docs/references/scenegraph/xml-elements/interface.md
|
|
1067
|
+
* @param typeDescriptor the type descriptor from the docs
|
|
1068
|
+
* @returns {BscType} the known type, or dynamic
|
|
1069
|
+
*/
|
|
1070
|
+
getNodeFieldType(typeDescriptor, lookupTable) {
|
|
1071
|
+
const typeDescriptorLower = typeDescriptor.toLowerCase().trim();
|
|
1072
|
+
const bscType = this.tokenToBscType((0, creators_1.createToken)(TokenKind_1.TokenKind.Identifier, typeDescriptorLower));
|
|
1073
|
+
if (bscType) {
|
|
1074
|
+
return bscType;
|
|
1075
|
+
}
|
|
1076
|
+
if (typeDescriptorLower.startsWith('array of ')) {
|
|
1077
|
+
let arrayOfTypeName = typeDescriptorLower.substring(9); //cut off beginning 'array of'
|
|
1078
|
+
if (arrayOfTypeName.endsWith('s')) {
|
|
1079
|
+
// remove "s" in "floats", etc.
|
|
1080
|
+
arrayOfTypeName = arrayOfTypeName.substring(0, arrayOfTypeName.length - 1);
|
|
1081
|
+
}
|
|
1082
|
+
if (arrayOfTypeName.endsWith('\'')) {
|
|
1083
|
+
// remove "'" in "float's", etc.
|
|
1084
|
+
arrayOfTypeName = arrayOfTypeName.substring(0, arrayOfTypeName.length - 1);
|
|
1085
|
+
}
|
|
1086
|
+
let arrayType = this.getNodeFieldType(arrayOfTypeName, lookupTable);
|
|
1087
|
+
return new types_1.ArrayType(arrayType);
|
|
1088
|
+
}
|
|
1089
|
+
else if (typeDescriptorLower.startsWith('option ')) {
|
|
1090
|
+
const actualTypeName = typeDescriptorLower.substring('option '.length); //cut off beginning 'option '
|
|
1091
|
+
return this.getNodeFieldType(actualTypeName, lookupTable);
|
|
1092
|
+
}
|
|
1093
|
+
else if (typeDescriptorLower.startsWith('value ')) {
|
|
1094
|
+
const actualTypeName = typeDescriptorLower.substring('value '.length); //cut off beginning 'value '
|
|
1095
|
+
return this.getNodeFieldType(actualTypeName, lookupTable);
|
|
1096
|
+
}
|
|
1097
|
+
else if (typeDescriptorLower === 'uri') {
|
|
1098
|
+
return StringType_1.StringType.instance;
|
|
1099
|
+
}
|
|
1100
|
+
else if (typeDescriptorLower === 'vector2d' || typeDescriptorLower === 'floatarray') {
|
|
1101
|
+
return new types_1.ArrayType(FloatType_1.FloatType.instance);
|
|
1102
|
+
}
|
|
1103
|
+
else if (typeDescriptorLower === 'intarray') {
|
|
1104
|
+
return new types_1.ArrayType(IntegerType_1.IntegerType.instance);
|
|
1105
|
+
}
|
|
1106
|
+
else if (typeDescriptorLower === 'boolarray') {
|
|
1107
|
+
return new types_1.ArrayType(BooleanType_1.BooleanType.instance);
|
|
1108
|
+
}
|
|
1109
|
+
else if (typeDescriptorLower === 'stringarray' || typeDescriptorLower === 'strarray') {
|
|
1110
|
+
return new types_1.ArrayType(StringType_1.StringType.instance);
|
|
1111
|
+
}
|
|
1112
|
+
else if (typeDescriptorLower === 'int') {
|
|
1113
|
+
return IntegerType_1.IntegerType.instance;
|
|
1114
|
+
}
|
|
1115
|
+
else if (typeDescriptorLower === 'time') {
|
|
1116
|
+
return FloatType_1.FloatType.instance;
|
|
1117
|
+
}
|
|
1118
|
+
else if (typeDescriptorLower === 'str') {
|
|
1119
|
+
return StringType_1.StringType.instance;
|
|
1120
|
+
}
|
|
1121
|
+
else if (typeDescriptorLower === 'bool') {
|
|
1122
|
+
return BooleanType_1.BooleanType.instance;
|
|
1123
|
+
}
|
|
1124
|
+
else if (typeDescriptorLower === 'assocarray' || typeDescriptorLower === 'associative array') {
|
|
1125
|
+
return new AssociativeArrayType_1.AssociativeArrayType();
|
|
1126
|
+
}
|
|
1127
|
+
else if (typeDescriptorLower === 'node') {
|
|
1128
|
+
return ComponentType_1.ComponentType.instance;
|
|
1129
|
+
}
|
|
1130
|
+
else if (typeDescriptorLower === 'nodearray') {
|
|
1131
|
+
return new types_1.ArrayType(ComponentType_1.ComponentType.instance);
|
|
1132
|
+
}
|
|
1133
|
+
else if (lookupTable) {
|
|
1134
|
+
//try doing a lookup
|
|
1135
|
+
return lookupTable.getSymbolType(typeDescriptorLower, { flags: SymbolTable_1.SymbolTypeFlag.typetime });
|
|
1136
|
+
}
|
|
1137
|
+
// TODO: Handle 'rect2d', 'rect2dArray', 'color', 'colorarray', 'time'
|
|
1138
|
+
return DynamicType_1.DynamicType.instance;
|
|
1057
1139
|
}
|
|
1058
1140
|
/**
|
|
1059
1141
|
* Return the type of the result of a binary operator
|
|
@@ -1066,14 +1148,20 @@ class Util {
|
|
|
1066
1148
|
return this.binaryOperatorResultType(lhs, op, rhs);
|
|
1067
1149
|
});
|
|
1068
1150
|
}
|
|
1151
|
+
if ((0, reflection_1.isEnumMemberType)(leftType)) {
|
|
1152
|
+
leftType = leftType.underlyingType;
|
|
1153
|
+
}
|
|
1154
|
+
if ((0, reflection_1.isEnumMemberType)(rightType)) {
|
|
1155
|
+
rightType = rightType.underlyingType;
|
|
1156
|
+
}
|
|
1069
1157
|
let hasDouble = (0, reflection_1.isDoubleType)(leftType) || (0, reflection_1.isDoubleType)(rightType);
|
|
1070
1158
|
let hasFloat = (0, reflection_1.isFloatType)(leftType) || (0, reflection_1.isFloatType)(rightType);
|
|
1071
1159
|
let hasLongInteger = (0, reflection_1.isLongIntegerType)(leftType) || (0, reflection_1.isLongIntegerType)(rightType);
|
|
1072
1160
|
let hasInvalid = (0, reflection_1.isInvalidType)(leftType) || (0, reflection_1.isInvalidType)(rightType);
|
|
1073
1161
|
let hasDynamic = (0, reflection_1.isDynamicType)(leftType) || (0, reflection_1.isDynamicType)(rightType);
|
|
1074
|
-
let bothNumbers =
|
|
1162
|
+
let bothNumbers = (0, reflection_1.isNumberType)(leftType) && (0, reflection_1.isNumberType)(rightType);
|
|
1075
1163
|
let bothStrings = (0, reflection_1.isStringType)(leftType) && (0, reflection_1.isStringType)(rightType);
|
|
1076
|
-
let eitherBooleanOrNum = (
|
|
1164
|
+
let eitherBooleanOrNum = ((0, reflection_1.isNumberType)(leftType) || (0, reflection_1.isBooleanType)(leftType)) && ((0, reflection_1.isNumberType)(rightType) || (0, reflection_1.isBooleanType)(rightType));
|
|
1077
1165
|
// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
|
|
1078
1166
|
switch (operator.kind) {
|
|
1079
1167
|
// Math operators
|
|
@@ -1186,7 +1274,7 @@ class Util {
|
|
|
1186
1274
|
switch (operator.kind) {
|
|
1187
1275
|
// Math operators
|
|
1188
1276
|
case TokenKind_1.TokenKind.Minus:
|
|
1189
|
-
if (
|
|
1277
|
+
if ((0, reflection_1.isNumberType)(exprType)) {
|
|
1190
1278
|
// a negative number will be the same type, eg, double->double, int->int, etc.
|
|
1191
1279
|
return exprType;
|
|
1192
1280
|
}
|
|
@@ -1195,7 +1283,7 @@ class Util {
|
|
|
1195
1283
|
if ((0, reflection_1.isBooleanType)(exprType)) {
|
|
1196
1284
|
return BooleanType_1.BooleanType.instance;
|
|
1197
1285
|
}
|
|
1198
|
-
else if (
|
|
1286
|
+
else if ((0, reflection_1.isNumberType)(exprType)) {
|
|
1199
1287
|
//numbers can be "notted"
|
|
1200
1288
|
// by default they go to ints, except longints, which stay that way
|
|
1201
1289
|
if ((0, reflection_1.isLongIntegerType)(exprType)) {
|
|
@@ -1617,6 +1705,7 @@ class Util {
|
|
|
1617
1705
|
}
|
|
1618
1706
|
}
|
|
1619
1707
|
processTypeChain(typeChain) {
|
|
1708
|
+
var _a, _b, _c, _d;
|
|
1620
1709
|
let fullChainName = '';
|
|
1621
1710
|
let fullErrorName = '';
|
|
1622
1711
|
let itemName = '';
|
|
@@ -1626,13 +1715,14 @@ class Util {
|
|
|
1626
1715
|
let containsDynamic = false;
|
|
1627
1716
|
for (let i = 0; i < typeChain.length; i++) {
|
|
1628
1717
|
const chainItem = typeChain[i];
|
|
1718
|
+
const dotSep = (_b = (_a = chainItem.separatorToken) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : '.';
|
|
1629
1719
|
if (i > 0) {
|
|
1630
|
-
fullChainName +=
|
|
1720
|
+
fullChainName += dotSep;
|
|
1631
1721
|
}
|
|
1632
1722
|
fullChainName += chainItem.name;
|
|
1633
1723
|
parentTypeName = previousTypeName;
|
|
1634
|
-
fullErrorName = previousTypeName ? `${previousTypeName}
|
|
1635
|
-
previousTypeName = chainItem.type.toString();
|
|
1724
|
+
fullErrorName = previousTypeName ? `${previousTypeName}${dotSep}${chainItem.name}` : chainItem.name;
|
|
1725
|
+
previousTypeName = (_d = (_c = chainItem.type) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : '';
|
|
1636
1726
|
itemName = chainItem.name;
|
|
1637
1727
|
containsDynamic = containsDynamic || ((0, reflection_1.isDynamicType)(chainItem.type) && !(0, reflection_1.isAnyReferenceType)(chainItem.type));
|
|
1638
1728
|
if (!chainItem.isResolved) {
|