brighterscript 0.66.0-alpha.6 → 0.66.0-alpha.7
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 +52 -10
- package/README.md +16 -0
- package/bsconfig.schema.json +15 -0
- package/dist/ActionPipeline.d.ts +10 -0
- package/dist/ActionPipeline.js +40 -0
- package/dist/ActionPipeline.js.map +1 -0
- package/dist/BsConfig.d.ts +15 -1
- package/dist/CommentFlagProcessor.d.ts +4 -3
- package/dist/CommentFlagProcessor.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +2 -0
- package/dist/DiagnosticMessages.js +25 -13
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.js.map +1 -1
- package/dist/PluginInterface.d.ts +11 -2
- package/dist/PluginInterface.js +69 -10
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +84 -37
- package/dist/Program.js +390 -267
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.d.ts +10 -4
- package/dist/ProgramBuilder.js +44 -54
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +13 -13
- package/dist/Scope.js +28 -26
- package/dist/Scope.js.map +1 -1
- package/dist/XmlScope.d.ts +5 -4
- package/dist/XmlScope.js +11 -10
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/{AstEditor.d.ts → Editor.d.ts} +6 -1
- package/dist/astUtils/{AstEditor.js → Editor.js} +9 -3
- package/dist/astUtils/Editor.js.map +1 -0
- package/dist/astUtils/{AstEditor.spec.js → Editor.spec.js} +10 -6
- package/dist/astUtils/Editor.spec.js.map +1 -0
- package/dist/astUtils/reflection.d.ts +9 -4
- package/dist/astUtils/reflection.js +23 -7
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +2 -2
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +3 -3
- package/dist/astUtils/visitors.spec.js +7 -7
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +10 -2
- package/dist/bscPlugin/BscPlugin.js +24 -4
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/FileWriter.d.ts +6 -0
- package/dist/bscPlugin/FileWriter.js +24 -0
- package/dist/bscPlugin/FileWriter.js.map +1 -0
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +8 -8
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +5 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.js +38 -15
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +65 -3
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/fileProviders/FileProvider.d.ts +9 -0
- package/dist/bscPlugin/fileProviders/FileProvider.js +51 -0
- package/dist/bscPlugin/fileProviders/FileProvider.js.map +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +1 -7
- package/dist/bscPlugin/hover/HoverProcessor.js +1 -7
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +43 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +22 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/serialize/BslibInjector.spec.js +19 -0
- package/dist/bscPlugin/serialize/BslibInjector.spec.js.map +1 -0
- package/dist/bscPlugin/serialize/BslibManager.d.ts +9 -0
- package/dist/bscPlugin/serialize/BslibManager.js +40 -0
- package/dist/bscPlugin/serialize/BslibManager.js.map +1 -0
- package/dist/bscPlugin/serialize/FileSerializer.d.ts +9 -0
- package/dist/bscPlugin/serialize/FileSerializer.js +72 -0
- package/dist/bscPlugin/serialize/FileSerializer.js.map +1 -0
- package/dist/bscPlugin/transpile/{BrsFilePreTranspileProcessor.d.ts → BrsFileTranspileProcessor.d.ts} +4 -2
- package/dist/bscPlugin/transpile/{BrsFilePreTranspileProcessor.js → BrsFileTranspileProcessor.js} +25 -4
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.js.map +1 -0
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.spec.js +41 -0
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.spec.js.map +1 -0
- package/dist/bscPlugin/transpile/XmlFilePreTranspileProcessor.d.ts +2 -2
- package/dist/bscPlugin/transpile/XmlFilePreTranspileProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +24 -15
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +326 -0
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/bscPlugin/validation/XmlFileValidator.js +2 -2
- package/dist/bscPlugin/validation/XmlFileValidator.js.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/deferred.d.ts +2 -2
- package/dist/deferred.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -0
- package/dist/diagnosticUtils.js +4 -3
- package/dist/diagnosticUtils.js.map +1 -1
- package/dist/examples/plugins/removePrint.js +1 -1
- package/dist/examples/plugins/removePrint.js.map +1 -1
- package/dist/files/AssetFile.d.ts +26 -0
- package/dist/files/AssetFile.js +26 -0
- package/dist/files/AssetFile.js.map +1 -0
- package/dist/files/BrsFile.Class.spec.js +40 -40
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +42 -15
- package/dist/files/BrsFile.js +120 -78
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +266 -167
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/Factory.d.ts +25 -0
- package/dist/files/Factory.js +22 -0
- package/dist/files/Factory.js.map +1 -0
- package/dist/files/File.d.ts +106 -0
- package/dist/files/File.js +16 -0
- package/dist/files/File.js.map +1 -0
- package/dist/files/LazyFileData.d.ts +20 -0
- package/dist/files/LazyFileData.js +54 -0
- package/dist/files/LazyFileData.js.map +1 -0
- package/dist/files/LazyFileData.spec.d.ts +1 -0
- package/dist/files/LazyFileData.spec.js +27 -0
- package/dist/files/LazyFileData.spec.js.map +1 -0
- package/dist/files/XmlFile.d.ts +55 -17
- package/dist/files/XmlFile.js +88 -47
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +64 -57
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +21 -8
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/files/tests/optionalChaning.spec.js +14 -14
- package/dist/files/tests/optionalChaning.spec.js.map +1 -1
- package/dist/globalCallables.js +1 -1
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +312 -84
- package/dist/interfaces.js.map +1 -1
- package/dist/lexer/Lexer.js +1 -1
- package/dist/lexer/TokenKind.js +0 -1
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/AstNode.d.ts +2 -2
- package/dist/parser/AstNode.js +1 -1
- package/dist/parser/AstNode.js.map +1 -1
- package/dist/parser/BrsTranspileState.d.ts +3 -2
- package/dist/parser/BrsTranspileState.js +3 -2
- package/dist/parser/BrsTranspileState.js.map +1 -1
- package/dist/parser/Expression.d.ts +1 -1
- package/dist/parser/Expression.js +3 -9
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.js +3 -0
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +15 -1
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.d.ts +2 -2
- package/dist/parser/SGParser.js +3 -3
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGParser.spec.js +2 -2
- package/dist/parser/SGParser.spec.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +1 -1
- package/dist/parser/Statement.d.ts +3 -2
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +10 -10
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js +10 -10
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js +24 -24
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +64 -36
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +34 -34
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +16 -16
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Continue.spec.js +2 -2
- package/dist/parser/tests/statement/Continue.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.js +26 -26
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -1
- package/dist/parser/tests/statement/For.spec.js +6 -6
- package/dist/parser/tests/statement/For.spec.js.map +1 -1
- package/dist/parser/tests/statement/ForEach.spec.js +4 -4
- package/dist/parser/tests/statement/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +12 -12
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +10 -10
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/preprocessor/Manifest.d.ts +1 -1
- package/dist/preprocessor/Manifest.js +2 -2
- package/dist/preprocessor/Manifest.js.map +1 -1
- package/dist/roku-types/data.json +81 -143
- package/dist/roku-types/index.d.ts +15 -11
- package/dist/types/ArrayType.d.ts +1 -1
- package/dist/types/ArrayType.js +4 -0
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +1 -1
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.d.ts +1 -1
- package/dist/types/AssociativeArrayType.js +1 -1
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BooleanType.js +2 -1
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscType.js +2 -0
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.d.ts +3 -0
- package/dist/types/BuiltInInterfaceAdder.js +32 -13
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/ComponentType.js +3 -0
- package/dist/types/ComponentType.js.map +1 -1
- package/dist/types/DoubleType.js +3 -1
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/FloatType.js +3 -1
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/IntegerType.js +3 -1
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +1 -1
- package/dist/types/InterfaceType.js +1 -8
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +23 -0
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/LongIntegerType.js +3 -1
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/ObjectType.d.ts +1 -1
- package/dist/types/StringType.js +2 -2
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +6 -1
- package/dist/types/TypedFunctionType.js +45 -15
- package/dist/types/TypedFunctionType.js.map +1 -1
- package/dist/types/TypedFunctionType.spec.js +99 -0
- package/dist/types/TypedFunctionType.spec.js.map +1 -1
- package/dist/types/UnionType.js +7 -0
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/helper.spec.js +15 -0
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/types/helpers.d.ts +3 -0
- package/dist/types/helpers.js +29 -1
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +11 -5
- package/dist/util.js +79 -40
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +1 -1
- package/dist/astUtils/AstEditor.js.map +0 -1
- package/dist/astUtils/AstEditor.spec.js.map +0 -1
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +0 -1
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.js +0 -31
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.js.map +0 -1
- /package/dist/astUtils/{AstEditor.spec.d.ts → Editor.spec.d.ts} +0 -0
- /package/dist/bscPlugin/{transpile/BrsFilePreTranspileProcessor.spec.d.ts → serialize/BslibInjector.spec.d.ts} +0 -0
|
@@ -15,6 +15,10 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
15
15
|
* Determines if this is a sub or not
|
|
16
16
|
*/
|
|
17
17
|
this.isSub = false;
|
|
18
|
+
/**
|
|
19
|
+
* Does this function accept more args than just those in this.params
|
|
20
|
+
*/
|
|
21
|
+
this.isVariadic = false;
|
|
18
22
|
this.params = [];
|
|
19
23
|
}
|
|
20
24
|
setName(name) {
|
|
@@ -35,7 +39,10 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
35
39
|
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data)) {
|
|
36
40
|
return true;
|
|
37
41
|
}
|
|
38
|
-
|
|
42
|
+
if ((0, reflection_1.isTypedFunctionType)(targetType)) {
|
|
43
|
+
return this.checkParamsAndReturnValue(targetType, true, (t1, t2) => t1.isTypeCompatible(t2));
|
|
44
|
+
}
|
|
45
|
+
return false;
|
|
39
46
|
}
|
|
40
47
|
toString() {
|
|
41
48
|
var _a;
|
|
@@ -43,30 +50,53 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
43
50
|
for (let param of this.params) {
|
|
44
51
|
paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
|
|
45
52
|
}
|
|
46
|
-
|
|
53
|
+
let variadicText = '';
|
|
54
|
+
if (this.isVariadic) {
|
|
55
|
+
if (paramTexts.length > 0) {
|
|
56
|
+
variadicText += ', ';
|
|
57
|
+
}
|
|
58
|
+
variadicText += '...';
|
|
59
|
+
}
|
|
60
|
+
return `${this.isSub ? 'sub' : 'function'} ${(_a = this.name) !== null && _a !== void 0 ? _a : ''}(${paramTexts.join(', ')}${variadicText}) as ${this.returnType.toString()}`;
|
|
47
61
|
}
|
|
48
62
|
toTypeString() {
|
|
49
63
|
return 'Function';
|
|
50
64
|
}
|
|
51
65
|
isEqual(targetType) {
|
|
52
66
|
if ((0, reflection_1.isTypedFunctionType)(targetType)) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
67
|
+
return this.checkParamsAndReturnValue(targetType, false, (t1, t2) => t1.isEqual(t2));
|
|
68
|
+
}
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
checkParamsAndReturnValue(targetType, allowOptionalParamDifferences, predicate) {
|
|
72
|
+
//compare all parameters
|
|
73
|
+
let len = Math.max(this.params.length, targetType.params.length);
|
|
74
|
+
for (let i = 0; i < len; i++) {
|
|
75
|
+
let myParam = this.params[i];
|
|
76
|
+
let targetParam = targetType.params[i];
|
|
77
|
+
if (allowOptionalParamDifferences && !myParam && targetParam.isOptional) {
|
|
78
|
+
// target func has MORE (optional) params... that's ok
|
|
79
|
+
break;
|
|
61
80
|
}
|
|
62
|
-
|
|
63
|
-
|
|
81
|
+
if (!myParam || !targetParam || !predicate(targetParam.type, myParam.type)) {
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
if (!allowOptionalParamDifferences && myParam.isOptional !== targetParam.isOptional) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
else if (!myParam.isOptional && targetParam.isOptional) {
|
|
64
88
|
return false;
|
|
65
89
|
}
|
|
66
|
-
//made it here, all params and return type are equivalent
|
|
67
|
-
return true;
|
|
68
90
|
}
|
|
69
|
-
return
|
|
91
|
+
//compare return type
|
|
92
|
+
if (!this.returnType || !targetType.returnType || !predicate(this.returnType, targetType.returnType)) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
if (this.isVariadic !== targetType.isVariadic) {
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
//made it here, all params and return type pass predicate
|
|
99
|
+
return true;
|
|
70
100
|
}
|
|
71
101
|
}
|
|
72
102
|
exports.TypedFunctionType = TypedFunctionType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypedFunctionType.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAA0F;AAC1F,yDAAsD;AAEtD,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAGhE,MAAa,iBAAkB,SAAQ,mCAAgB;IACnD,YACW,UAAmB;QAE1B,KAAK,EAAE,CAAC;QAFD,eAAU,GAAV,UAAU,CAAS;QAKd,SAAI,GAAG,yBAAW,CAAC,iBAAiB,CAAC;QAOrD;;WAEG;QACI,UAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"TypedFunctionType.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const TypedFunctionType_1 = require("./TypedFunctionType");
|
|
|
6
6
|
const IntegerType_1 = require("./IntegerType");
|
|
7
7
|
const StringType_1 = require("./StringType");
|
|
8
8
|
const VoidType_1 = require("./VoidType");
|
|
9
|
+
const FloatType_1 = require("./FloatType");
|
|
9
10
|
describe('TypedFunctionType', () => {
|
|
10
11
|
it('is equivalent to dynamic type', () => {
|
|
11
12
|
(0, chai_config_spec_1.expect)(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()).isTypeCompatible(new DynamicType_1.DynamicType())).to.be.true;
|
|
@@ -19,5 +20,103 @@ describe('TypedFunctionType', () => {
|
|
|
19
20
|
//different return type
|
|
20
21
|
(0, chai_config_spec_1.expect)(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()).isTypeCompatible(new TypedFunctionType_1.TypedFunctionType(new IntegerType_1.IntegerType()))).to.be.false;
|
|
21
22
|
});
|
|
23
|
+
it('checks equality', () => {
|
|
24
|
+
(0, chai_config_spec_1.expect)(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()).isEqual(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()))).to.be.true;
|
|
25
|
+
let func1 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
26
|
+
func1.addParameter('a', StringType_1.StringType.instance, false);
|
|
27
|
+
func1.addParameter('b', IntegerType_1.IntegerType.instance, false);
|
|
28
|
+
let func2 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
29
|
+
func2.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
30
|
+
func2.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
31
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func2)).to.be.true;
|
|
32
|
+
// different return type
|
|
33
|
+
let func3 = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
34
|
+
func3.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
35
|
+
func3.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
36
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func3)).to.be.false;
|
|
37
|
+
// different parameter type
|
|
38
|
+
let func4 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
39
|
+
func4.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
40
|
+
func4.addParameter('beta', FloatType_1.FloatType.instance, false);
|
|
41
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func4)).to.be.false;
|
|
42
|
+
// different optional param
|
|
43
|
+
let func5 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
44
|
+
func5.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
45
|
+
func5.addParameter('beta', IntegerType_1.IntegerType.instance, true);
|
|
46
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func5)).to.be.false;
|
|
47
|
+
// additional optional param
|
|
48
|
+
let func6 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
49
|
+
func6.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
50
|
+
func6.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
51
|
+
func6.addParameter('charlie', IntegerType_1.IntegerType.instance, true);
|
|
52
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func6)).to.be.false;
|
|
53
|
+
// other is variadic
|
|
54
|
+
let func7 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
55
|
+
func7.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
56
|
+
func7.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
57
|
+
func7.isVariadic = true;
|
|
58
|
+
(0, chai_config_spec_1.expect)(func1.isEqual(func7)).to.be.false;
|
|
59
|
+
// both Variadic
|
|
60
|
+
let variFunc1 = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
61
|
+
variFunc1.isVariadic = true;
|
|
62
|
+
// both Variadic
|
|
63
|
+
let variFunc2 = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
64
|
+
variFunc2.isVariadic = true;
|
|
65
|
+
(0, chai_config_spec_1.expect)(variFunc1.isEqual(variFunc2)).to.be.true;
|
|
66
|
+
});
|
|
67
|
+
it('checks compatibility', () => {
|
|
68
|
+
(0, chai_config_spec_1.expect)(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()).isTypeCompatible(new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType()))).to.be.true;
|
|
69
|
+
let func1 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
70
|
+
func1.addParameter('a', StringType_1.StringType.instance, false);
|
|
71
|
+
func1.addParameter('b', IntegerType_1.IntegerType.instance, false);
|
|
72
|
+
let func2 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
73
|
+
func2.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
74
|
+
func2.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
75
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func2)).to.be.true;
|
|
76
|
+
// different return type, but return type is compatible with target type
|
|
77
|
+
let func3 = new TypedFunctionType_1.TypedFunctionType(IntegerType_1.IntegerType.instance);
|
|
78
|
+
func3.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
79
|
+
func3.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
80
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func3)).to.be.true;
|
|
81
|
+
// different return type, but return type is NOT compatible with target type
|
|
82
|
+
func3 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
83
|
+
func3.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
84
|
+
func3.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
85
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func3)).to.be.false;
|
|
86
|
+
// different parameter type
|
|
87
|
+
let func4 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
88
|
+
func4.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
89
|
+
func4.addParameter('beta', StringType_1.StringType.instance, false);
|
|
90
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func4)).to.be.false;
|
|
91
|
+
// different parameter type but types are compatible
|
|
92
|
+
func4 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
93
|
+
func4.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
94
|
+
func4.addParameter('beta', FloatType_1.FloatType.instance, false);
|
|
95
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func4)).to.be.true;
|
|
96
|
+
// different optional param
|
|
97
|
+
let func5 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
98
|
+
func5.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
99
|
+
func5.addParameter('beta', IntegerType_1.IntegerType.instance, true);
|
|
100
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func5)).to.be.false;
|
|
101
|
+
// additional optional param
|
|
102
|
+
let func6 = new TypedFunctionType_1.TypedFunctionType(FloatType_1.FloatType.instance);
|
|
103
|
+
func6.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
104
|
+
func6.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
105
|
+
func6.addParameter('charlie', IntegerType_1.IntegerType.instance, true);
|
|
106
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func6)).to.be.true;
|
|
107
|
+
// other is variadic
|
|
108
|
+
let func7 = new TypedFunctionType_1.TypedFunctionType(StringType_1.StringType.instance);
|
|
109
|
+
func7.addParameter('alpha', StringType_1.StringType.instance, false);
|
|
110
|
+
func7.addParameter('beta', IntegerType_1.IntegerType.instance, false);
|
|
111
|
+
func7.isVariadic = true;
|
|
112
|
+
(0, chai_config_spec_1.expect)(func1.isTypeCompatible(func7)).to.be.false;
|
|
113
|
+
// both Variadic
|
|
114
|
+
let variFunc1 = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
115
|
+
variFunc1.isVariadic = true;
|
|
116
|
+
// both Variadic
|
|
117
|
+
let variFunc2 = new TypedFunctionType_1.TypedFunctionType(DynamicType_1.DynamicType.instance);
|
|
118
|
+
variFunc2.isVariadic = true;
|
|
119
|
+
(0, chai_config_spec_1.expect)(variFunc1.isTypeCompatible(variFunc2)).to.be.true;
|
|
120
|
+
});
|
|
22
121
|
});
|
|
23
122
|
//# sourceMappingURL=TypedFunctionType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypedFunctionType.spec.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAE7C,+CAA4C;AAC5C,2DAAwD;AACxD,+CAA4C;AAC5C,6CAA0C;AAC1C,yCAAsC;
|
|
1
|
+
{"version":3,"file":"TypedFunctionType.spec.js","sourceRoot":"","sources":["../../src/types/TypedFunctionType.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/UnionType.js
CHANGED
|
@@ -7,6 +7,7 @@ const ReferenceType_1 = require("./ReferenceType");
|
|
|
7
7
|
const helpers_1 = require("./helpers");
|
|
8
8
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
9
9
|
const SymbolTable_1 = require("../SymbolTable");
|
|
10
|
+
const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
|
|
10
11
|
function unionTypeFactory(types) {
|
|
11
12
|
return new UnionType(types);
|
|
12
13
|
}
|
|
@@ -53,6 +54,9 @@ class UnionType extends BscType_1.BscType {
|
|
|
53
54
|
if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
|
|
54
55
|
return true;
|
|
55
56
|
}
|
|
57
|
+
if ((0, helpers_1.isEnumTypeCompatible)(this, targetType, data)) {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
56
60
|
if ((0, reflection_1.isUnionType)(targetType)) {
|
|
57
61
|
// check if this set of inner types is a SUPERSET of targetTypes's inner types
|
|
58
62
|
for (const targetInnerType of targetType.types) {
|
|
@@ -112,4 +116,7 @@ exports.UnionType = UnionType;
|
|
|
112
116
|
function joinTypesString(types) {
|
|
113
117
|
return types.map(t => t.toString()).join(' or ');
|
|
114
118
|
}
|
|
119
|
+
BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.unionTypeFactory = (types) => {
|
|
120
|
+
return new UnionType(types);
|
|
121
|
+
};
|
|
115
122
|
//# sourceMappingURL=UnionType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":";;;AACA,uDAAkF;AAClF,uCAAoC;AACpC,mDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"UnionType.js","sourceRoot":"","sources":["../../src/types/UnionType.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const InterfaceType_1 = require("./InterfaceType");
|
|
|
14
14
|
const SymbolTable_1 = require("../SymbolTable");
|
|
15
15
|
const DoubleType_1 = require("./DoubleType");
|
|
16
16
|
const BooleanType_1 = require("./BooleanType");
|
|
17
|
+
const EnumType_1 = require("./EnumType");
|
|
17
18
|
describe('findTypeIntersection', () => {
|
|
18
19
|
it('should return the intersection if the arrays have one element', () => {
|
|
19
20
|
const intersection = (0, helpers_1.findTypeIntersection)([IntegerType_1.IntegerType.instance], [IntegerType_1.IntegerType.instance]);
|
|
@@ -127,4 +128,18 @@ describe('getUniqueType', () => {
|
|
|
127
128
|
}
|
|
128
129
|
});
|
|
129
130
|
});
|
|
131
|
+
describe('isEnumTypeCompatible', () => {
|
|
132
|
+
it('should be true when an enum that is an int is passed to a number type', () => {
|
|
133
|
+
const myEnum = new EnumType_1.EnumType('test', IntegerType_1.IntegerType.instance);
|
|
134
|
+
const myEnumMember = new EnumType_1.EnumMemberType('test', 'val1', IntegerType_1.IntegerType.instance);
|
|
135
|
+
(0, chai_1.expect)(IntegerType_1.IntegerType.instance.isTypeCompatible(myEnum)).to.be.true;
|
|
136
|
+
(0, chai_1.expect)(FloatType_1.FloatType.instance.isTypeCompatible(myEnum)).to.be.true;
|
|
137
|
+
(0, chai_1.expect)(DoubleType_1.DoubleType.instance.isTypeCompatible(myEnum)).to.be.true;
|
|
138
|
+
(0, chai_1.expect)(IntegerType_1.IntegerType.instance.isTypeCompatible(myEnumMember)).to.be.true;
|
|
139
|
+
(0, chai_1.expect)(FloatType_1.FloatType.instance.isTypeCompatible(myEnumMember)).to.be.true;
|
|
140
|
+
(0, chai_1.expect)(DoubleType_1.DoubleType.instance.isTypeCompatible(myEnumMember)).to.be.true;
|
|
141
|
+
(0, chai_1.expect)(StringType_1.StringType.instance.isTypeCompatible(myEnum)).to.be.false;
|
|
142
|
+
(0, chai_1.expect)(StringType_1.StringType.instance.isTypeCompatible(myEnumMember)).to.be.false;
|
|
143
|
+
});
|
|
144
|
+
});
|
|
130
145
|
//# sourceMappingURL=helper.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.spec.js","sourceRoot":"","sources":["../../src/types/helper.spec.ts"],"names":[],"mappings":";;AAAA,+BAAsC;AACtC,uDAAqD;AACrD,0DAAqD;AACrD,2CAAwC;AACxC,+CAA4C;AAC5C,2CAAwC;AACxC,+CAA4C;AAC5C,6CAA0C;AAC1C,2CAA0D;AAC1D,uCAAwG;AACxG,mDAAgD;AAChD,gDAAgD;AAChD,6CAA0C;AAC1C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"helper.spec.js","sourceRoot":"","sources":["../../src/types/helper.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/types/helpers.d.ts
CHANGED
|
@@ -19,3 +19,6 @@ export declare function reduceTypesToMostGeneric(types: BscType[]): BscType[];
|
|
|
19
19
|
*/
|
|
20
20
|
export declare function getUniqueType(types: BscType[], unionTypeFactory: (types: BscType[]) => BscType): BscType;
|
|
21
21
|
export declare function isUnionTypeCompatible(thisType: BscType, maybeUnionType: BscType, data?: TypeCompatibilityData): boolean;
|
|
22
|
+
export declare function isEnumTypeCompatible(thisType: BscType, maybeEnumType: BscType, data?: TypeCompatibilityData): boolean;
|
|
23
|
+
export declare function isNativeInterfaceCompatible(thisType: BscType, otherType: BscType, allowedType: string, data?: TypeCompatibilityData): boolean;
|
|
24
|
+
export declare function isNativeInterfaceCompatibleNumber(thisType: BscType, otherType: BscType, data?: TypeCompatibilityData): boolean;
|
package/dist/types/helpers.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isUnionTypeCompatible = exports.getUniqueType = exports.reduceTypesToMostGeneric = exports.getUniqueTypesFromArray = exports.findTypeUnion = exports.findTypeIntersection = void 0;
|
|
3
|
+
exports.isNativeInterfaceCompatibleNumber = exports.isNativeInterfaceCompatible = exports.isEnumTypeCompatible = exports.isUnionTypeCompatible = exports.getUniqueType = exports.reduceTypesToMostGeneric = exports.getUniqueTypesFromArray = exports.findTypeUnion = exports.findTypeIntersection = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
function findTypeIntersection(typesArr1, typesArr2) {
|
|
6
6
|
if (!typesArr1 || !typesArr2) {
|
|
@@ -143,4 +143,32 @@ function isUnionTypeCompatible(thisType, maybeUnionType, data) {
|
|
|
143
143
|
return false;
|
|
144
144
|
}
|
|
145
145
|
exports.isUnionTypeCompatible = isUnionTypeCompatible;
|
|
146
|
+
function isEnumTypeCompatible(thisType, maybeEnumType, data) {
|
|
147
|
+
if ((0, reflection_1.isEnumMemberType)(maybeEnumType) || (0, reflection_1.isEnumType)(maybeEnumType)) {
|
|
148
|
+
return thisType.isTypeCompatible(maybeEnumType.underlyingType, data);
|
|
149
|
+
}
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
exports.isEnumTypeCompatible = isEnumTypeCompatible;
|
|
153
|
+
function isNativeInterfaceCompatible(thisType, otherType, allowedType, data) {
|
|
154
|
+
if ((0, reflection_1.isInterfaceType)(otherType)) {
|
|
155
|
+
// TODO: it is not great to do type checking based on interface name
|
|
156
|
+
const lowerOtherName = otherType.name.toLowerCase();
|
|
157
|
+
return allowedType === lowerOtherName;
|
|
158
|
+
}
|
|
159
|
+
return false;
|
|
160
|
+
}
|
|
161
|
+
exports.isNativeInterfaceCompatible = isNativeInterfaceCompatible;
|
|
162
|
+
function isNativeInterfaceCompatibleNumber(thisType, otherType, data) {
|
|
163
|
+
if ((0, reflection_1.isInterfaceType)(otherType)) {
|
|
164
|
+
// TODO: it is not great to do type checking based on interface name
|
|
165
|
+
const lowerOtherName = otherType.name.toLowerCase();
|
|
166
|
+
return lowerOtherName === 'roint' ||
|
|
167
|
+
lowerOtherName === 'rofloat' ||
|
|
168
|
+
lowerOtherName === 'rodouble' ||
|
|
169
|
+
lowerOtherName === 'rolonginteger';
|
|
170
|
+
}
|
|
171
|
+
return false;
|
|
172
|
+
}
|
|
173
|
+
exports.isNativeInterfaceCompatibleNumber = isNativeInterfaceCompatibleNumber;
|
|
146
174
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/types/helpers.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/types/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Diagnostic, type Position, type Range, type Location } from 'vscode-languageserver';
|
|
2
2
|
import type { BsConfig } from './BsConfig';
|
|
3
3
|
import type { CallableContainer, BsDiagnostic, FileReference, CallableContainerMap, CompilerPlugin, ExpressionInfo, TypeChainEntry, TypeChainProcessResult } from './interfaces';
|
|
4
4
|
import { BooleanType } from './types/BooleanType';
|
|
@@ -49,6 +49,7 @@ export declare class Util {
|
|
|
49
49
|
startsWithProtocol(path: string): boolean;
|
|
50
50
|
/**
|
|
51
51
|
* Given a pkg path of any kind, transform it to a roku-specific pkg path (i.e. "pkg:/some/path.brs")
|
|
52
|
+
* @deprecated use `sanitizePkgPath instead. Will be removed in v1
|
|
52
53
|
*/
|
|
53
54
|
getRokuPkgPath(pkgPath: string): string;
|
|
54
55
|
/**
|
|
@@ -325,6 +326,7 @@ export declare class Util {
|
|
|
325
326
|
/**
|
|
326
327
|
* Get the extension for the given file path. Basically the part after the final dot, except for
|
|
327
328
|
* `d.bs` which is treated as single extension
|
|
329
|
+
* @returns the file extension (i.e. ".d.bs", ".bs", ".brs", ".xml", ".jpg", etc...)
|
|
328
330
|
*/
|
|
329
331
|
getExtension(filePath: string): string;
|
|
330
332
|
/**
|
|
@@ -346,10 +348,6 @@ export declare class Util {
|
|
|
346
348
|
* Converts a path into a standardized format (drive letter to lower, remove extra slashes, use single slash type, resolve relative parts, etc...)
|
|
347
349
|
*/
|
|
348
350
|
standardizePath(thePath: string): string;
|
|
349
|
-
/**
|
|
350
|
-
* Copy the version of bslib from local node_modules to the staging folder
|
|
351
|
-
*/
|
|
352
|
-
copyBslibToStaging(stagingDir: string): Promise<void>;
|
|
353
351
|
/**
|
|
354
352
|
* Given a Diagnostic or BsDiagnostic, return a deep clone of the diagnostic.
|
|
355
353
|
* @param diagnostic the diagnostic to clone
|
|
@@ -422,6 +420,14 @@ export declare class Util {
|
|
|
422
420
|
*/
|
|
423
421
|
findLastIndex<T>(array: T[], matcher: (T: any) => boolean): number;
|
|
424
422
|
processTypeChain(typeChain: TypeChainEntry[]): TypeChainProcessResult;
|
|
423
|
+
truncate<T>(options: {
|
|
424
|
+
leadingText: string;
|
|
425
|
+
items: T[];
|
|
426
|
+
trailingText?: string;
|
|
427
|
+
maxLength: number;
|
|
428
|
+
itemSeparator?: string;
|
|
429
|
+
partBuilder?: (item: T) => string;
|
|
430
|
+
}): string;
|
|
425
431
|
}
|
|
426
432
|
/**
|
|
427
433
|
* A tagged template literal function for standardizing the path. This has to be defined as standalone function since it's a tagged template literal function,
|