brighterscript 1.0.0-alpha.10 → 1.0.0-alpha.14
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 +247 -267
- package/README.md +2 -2
- package/dist/Cache.d.ts +3 -3
- package/dist/Cache.js +10 -6
- package/dist/Cache.js.map +1 -1
- package/dist/CodeActionUtil.js.map +1 -1
- package/dist/CommentFlagProcessor.d.ts +4 -4
- package/dist/CommentFlagProcessor.js +5 -3
- package/dist/CommentFlagProcessor.js.map +1 -1
- package/dist/DependencyGraph.js.map +1 -1
- package/dist/DiagnosticFilterer.js +1 -1
- package/dist/DiagnosticFilterer.js.map +1 -1
- package/dist/LanguageServer.d.ts +1 -6
- package/dist/LanguageServer.js +5 -14
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Logger.js.map +1 -1
- package/dist/PluginInterface.d.ts +3 -3
- package/dist/PluginInterface.js +3 -0
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +35 -20
- package/dist/Program.js +132 -67
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +4 -4
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +22 -13
- package/dist/Scope.js +85 -70
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +1 -1
- package/dist/SymbolTable.js +2 -2
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.d.ts +2 -2
- package/dist/XmlScope.js +5 -5
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/AstEditor.d.ts +27 -0
- package/dist/astUtils/AstEditor.js +97 -0
- package/dist/astUtils/AstEditor.js.map +1 -0
- package/dist/{bscPlugin/semanticTokens/SemanticTokensProcessor.spec.d.ts → astUtils/AstEditor.spec.d.ts} +0 -0
- package/dist/astUtils/AstEditor.spec.js +133 -0
- package/dist/astUtils/AstEditor.spec.js.map +1 -0
- package/dist/astUtils/creators.spec.js +4 -4
- package/dist/astUtils/creators.spec.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +4 -2
- package/dist/astUtils/reflection.js +10 -1
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +116 -116
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/stackedVisitor.js.map +1 -1
- package/dist/astUtils/stackedVisitor.spec.js +13 -13
- package/dist/astUtils/stackedVisitor.spec.js.map +1 -1
- package/dist/astUtils/visitors.js +1 -1
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +26 -26
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/astUtils/xml.d.ts +1 -0
- package/dist/astUtils/xml.js +6 -1
- package/dist/astUtils/xml.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.js +5 -2
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +3 -3
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +17 -17
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +8 -0
- package/dist/bscPlugin/semanticTokens/{SemanticTokensProcessor.js → BrsFileSemanticTokensProcessor.js} +13 -15
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/{SemanticTokensProcessor.spec.js → BrsFileSemanticTokensProcessor.spec.js} +5 -5
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -0
- package/dist/diagnosticUtils.d.ts +1 -0
- package/dist/diagnosticUtils.js +14 -7
- package/dist/diagnosticUtils.js.map +1 -1
- package/dist/examples/plugins/removePrint.js +2 -2
- package/dist/examples/plugins/removePrint.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +444 -269
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +17 -11
- package/dist/files/BrsFile.js +220 -153
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +620 -272
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +6 -5
- package/dist/files/XmlFile.js +14 -9
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +238 -191
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +29 -27
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/globalCallables.d.ts +3 -1
- package/dist/globalCallables.js +198 -99
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +12 -3
- package/dist/index.js +22 -4
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +71 -10
- package/dist/lexer/Lexer.d.ts +5 -1
- package/dist/lexer/Lexer.js +52 -35
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +564 -534
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/TokenKind.d.ts +4 -0
- package/dist/lexer/TokenKind.js +44 -1
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/Expression.d.ts +1 -1
- package/dist/parser/Expression.js +66 -66
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +107 -106
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +17 -5
- package/dist/parser/Parser.js +431 -315
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +418 -296
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.js +2 -2
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGParser.spec.js +22 -22
- package/dist/parser/SGParser.spec.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +3 -0
- package/dist/parser/SGTypes.js +12 -7
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/SGTypes.spec.js +84 -84
- package/dist/parser/SGTypes.spec.js.map +1 -1
- package/dist/parser/Statement.d.ts +3 -3
- package/dist/parser/Statement.js +61 -61
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/Statement.spec.js +10 -10
- package/dist/parser/Statement.spec.js.map +1 -1
- package/dist/parser/tests/Parser.spec.d.ts +3 -3
- package/dist/parser/tests/Parser.spec.js +4 -4
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js +58 -58
- package/dist/parser/tests/controlFlow/For.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/ForEach.spec.js +40 -39
- package/dist/parser/tests/controlFlow/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js +201 -200
- package/dist/parser/tests/controlFlow/If.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/While.spec.js +37 -37
- package/dist/parser/tests/controlFlow/While.spec.js.map +1 -1
- package/dist/parser/tests/expression/Additive.spec.js +30 -30
- package/dist/parser/tests/expression/Additive.spec.js.map +1 -1
- package/dist/parser/tests/expression/ArrayLiterals.spec.js +119 -119
- package/dist/parser/tests/expression/ArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +141 -141
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/Boolean.spec.js +24 -24
- package/dist/parser/tests/expression/Boolean.spec.js.map +1 -1
- package/dist/parser/tests/expression/Call.spec.js +41 -40
- package/dist/parser/tests/expression/Call.spec.js.map +1 -1
- package/dist/parser/tests/expression/Exponential.spec.js +17 -17
- package/dist/parser/tests/expression/Exponential.spec.js.map +1 -1
- package/dist/parser/tests/expression/Function.spec.js +256 -256
- package/dist/parser/tests/expression/Function.spec.js.map +1 -1
- package/dist/parser/tests/expression/Indexing.spec.js +87 -87
- package/dist/parser/tests/expression/Indexing.spec.js.map +1 -1
- package/dist/parser/tests/expression/Multiplicative.spec.js +37 -37
- package/dist/parser/tests/expression/Multiplicative.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +74 -62
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/PrefixUnary.spec.js +41 -41
- package/dist/parser/tests/expression/PrefixUnary.spec.js.map +1 -1
- package/dist/parser/tests/expression/Primary.spec.js +41 -41
- package/dist/parser/tests/expression/Primary.spec.js.map +1 -1
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js +110 -2
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/Relational.spec.js +43 -43
- package/dist/parser/tests/expression/Relational.spec.js.map +1 -1
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js +6 -6
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +18 -18
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +100 -100
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/AssignmentOperators.spec.js +36 -36
- package/dist/parser/tests/statement/AssignmentOperators.spec.js.map +1 -1
- package/dist/parser/tests/statement/Declaration.spec.js +44 -44
- package/dist/parser/tests/statement/Declaration.spec.js.map +1 -1
- package/dist/parser/tests/statement/Dim.spec.js +21 -21
- package/dist/parser/tests/statement/Dim.spec.js.map +1 -1
- package/dist/parser/tests/statement/Function.spec.js +198 -197
- package/dist/parser/tests/statement/Function.spec.js.map +1 -1
- package/dist/parser/tests/statement/Goto.spec.js +15 -14
- package/dist/parser/tests/statement/Goto.spec.js.map +1 -1
- package/dist/parser/tests/statement/Increment.spec.js +50 -50
- package/dist/parser/tests/statement/Increment.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +14 -2
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/LibraryStatement.spec.js +17 -17
- package/dist/parser/tests/statement/LibraryStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +91 -90
- package/dist/parser/tests/statement/Misc.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +34 -34
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/ReturnStatement.spec.js +46 -46
- package/dist/parser/tests/statement/ReturnStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Set.spec.js +83 -83
- package/dist/parser/tests/statement/Set.spec.js.map +1 -1
- package/dist/parser/tests/statement/Stop.spec.js +12 -11
- package/dist/parser/tests/statement/Stop.spec.js.map +1 -1
- package/dist/parser/tests/statement/Throw.spec.js +5 -5
- package/dist/parser/tests/statement/Throw.spec.js.map +1 -1
- package/dist/parser/tests/statement/TryCatch.spec.js +13 -13
- package/dist/parser/tests/statement/TryCatch.spec.js.map +1 -1
- package/dist/preprocessor/Chunk.d.ts +1 -1
- package/dist/preprocessor/Chunk.js.map +1 -1
- package/dist/preprocessor/Manifest.d.ts +1 -1
- package/dist/preprocessor/Preprocessor.d.ts +1 -1
- package/dist/preprocessor/Preprocessor.js +8 -8
- package/dist/preprocessor/Preprocessor.js.map +1 -1
- package/dist/preprocessor/Preprocessor.spec.js +49 -49
- package/dist/preprocessor/Preprocessor.spec.js.map +1 -1
- package/dist/preprocessor/PreprocessorParser.spec.js +72 -72
- package/dist/preprocessor/PreprocessorParser.spec.js.map +1 -1
- package/dist/types/ArrayType.d.ts +8 -5
- package/dist/types/ArrayType.js +48 -12
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +69 -10
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/BooleanType.js +3 -3
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BooleanType.spec.js +2 -2
- package/dist/types/BooleanType.spec.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/BscType.js +1 -1
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/CustomType.d.ts +1 -1
- package/dist/types/CustomType.js +6 -4
- package/dist/types/CustomType.js.map +1 -1
- package/dist/types/DoubleType.js +7 -7
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/DoubleType.spec.js +2 -2
- package/dist/types/DoubleType.spec.js.map +1 -1
- package/dist/types/DynamicType.js +1 -1
- package/dist/types/DynamicType.js.map +1 -1
- package/dist/types/DynamicType.spec.js +2 -2
- package/dist/types/DynamicType.spec.js.map +1 -1
- package/dist/types/FloatType.js +7 -7
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/FloatType.spec.js +2 -2
- package/dist/types/FloatType.spec.js.map +1 -1
- package/dist/types/FunctionType.d.ts +5 -5
- package/dist/types/FunctionType.js +13 -13
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/FunctionType.spec.js +7 -7
- package/dist/types/FunctionType.spec.js.map +1 -1
- package/dist/types/IntegerType.js +7 -7
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/IntegerType.spec.js +2 -2
- package/dist/types/IntegerType.spec.js.map +1 -1
- package/dist/types/InterfaceType.js +3 -3
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +7 -7
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/InvalidType.js +4 -4
- package/dist/types/InvalidType.js.map +1 -1
- package/dist/types/InvalidType.spec.js +2 -2
- package/dist/types/InvalidType.spec.js.map +1 -1
- package/dist/types/LazyType.d.ts +1 -2
- package/dist/types/LazyType.js +1 -5
- package/dist/types/LazyType.js.map +1 -1
- package/dist/types/LongIntegerType.js +8 -8
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/LongIntegerType.spec.js +2 -2
- package/dist/types/LongIntegerType.spec.js.map +1 -1
- package/dist/types/ObjectType.js +3 -3
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ObjectType.spec.js +2 -2
- package/dist/types/ObjectType.spec.js.map +1 -1
- package/dist/types/StringType.js +3 -3
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/StringType.spec.js +2 -2
- package/dist/types/StringType.spec.js.map +1 -1
- package/dist/types/UninitializedType.js +3 -3
- package/dist/types/UninitializedType.js.map +1 -1
- package/dist/types/VoidType.js +3 -3
- package/dist/types/VoidType.js.map +1 -1
- package/dist/types/VoidType.spec.js +2 -2
- package/dist/types/VoidType.spec.js.map +1 -1
- package/dist/types/helpers.js +6 -6
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +15 -9
- package/dist/util.js +104 -57
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.js +40 -40
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +10 -9
- package/dist/astUtils/index.d.ts +0 -7
- package/dist/astUtils/index.js +0 -26
- package/dist/astUtils/index.js.map +0 -1
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.d.ts +0 -7
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.js.map +0 -1
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.spec.js.map +0 -1
- package/dist/lexer/index.d.ts +0 -3
- package/dist/lexer/index.js +0 -17
- package/dist/lexer/index.js.map +0 -1
- package/dist/parser/index.d.ts +0 -3
- package/dist/parser/index.js +0 -16
- package/dist/parser/index.js.map +0 -1
- package/dist/preprocessor/index.d.ts +0 -3
- package/dist/preprocessor/index.js +0 -16
- package/dist/preprocessor/index.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreprocessorParser.spec.js","sourceRoot":"","sources":["../../src/preprocessor/PreprocessorParser.spec.ts"],"names":[],"mappings":";;AAAA,6DAA0D;AAC1D,6DAAgE;AAChE,kDAA+C;AAC/C,+BAA8B;AAG9B,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,IAAI,MAA0B,CAAC;IAE/B,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,GAAG,IAAI,uCAAkB,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;YACvC,wBAAU,
|
|
1
|
+
{"version":3,"file":"PreprocessorParser.spec.js","sourceRoot":"","sources":["../../src/preprocessor/PreprocessorParser.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import type { BscType } from './BscType';
|
|
1
|
+
import type { BscType, TypeContext } from './BscType';
|
|
2
2
|
export declare class ArrayType implements BscType {
|
|
3
3
|
constructor(...innerTypes: BscType[]);
|
|
4
4
|
innerTypes: BscType[];
|
|
5
|
-
isAssignableTo(targetType: BscType): boolean;
|
|
6
|
-
isConvertibleTo(targetType: BscType): boolean;
|
|
7
|
-
toString(): string;
|
|
5
|
+
isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
|
|
6
|
+
isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
|
|
7
|
+
toString(context?: TypeContext): string;
|
|
8
|
+
toJsString(context?: TypeContext): string;
|
|
8
9
|
toTypeString(): string;
|
|
9
|
-
|
|
10
|
+
getDefaultType(context?: TypeContext): BscType;
|
|
11
|
+
equals(targetType: BscType, context?: TypeContext): boolean;
|
|
12
|
+
private getUniqueTypesByAssignability;
|
|
10
13
|
}
|
package/dist/types/ArrayType.js
CHANGED
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ArrayType = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
|
+
const DynamicType_1 = require("./DynamicType");
|
|
5
6
|
class ArrayType {
|
|
6
7
|
constructor(...innerTypes) {
|
|
7
8
|
this.innerTypes = [];
|
|
8
|
-
this.innerTypes = innerTypes;
|
|
9
|
+
this.innerTypes = this.getUniqueTypesByAssignability(innerTypes);
|
|
9
10
|
}
|
|
10
|
-
isAssignableTo(targetType) {
|
|
11
|
-
if (reflection_1.isArrayType(targetType)) {
|
|
11
|
+
isAssignableTo(targetType, context) {
|
|
12
|
+
if ((0, reflection_1.isArrayType)(targetType)) {
|
|
12
13
|
//this array type is assignable to the target IF
|
|
13
14
|
//1. all of the types in this array are present in the target
|
|
14
15
|
outer: for (let innerType of this.innerTypes) {
|
|
@@ -16,7 +17,7 @@ class ArrayType {
|
|
|
16
17
|
// eslint-disable-next-line no-unreachable-loop
|
|
17
18
|
for (let targetInnerType of targetType.innerTypes) {
|
|
18
19
|
//TODO TYPES is this loop correct? It ends after 1 iteration but we might need to do more iterations
|
|
19
|
-
if (innerType.isAssignableTo(targetInnerType)) {
|
|
20
|
+
if (innerType.isAssignableTo(targetInnerType, context)) {
|
|
20
21
|
continue outer;
|
|
21
22
|
}
|
|
22
23
|
//our array contains a type that the target array does not...so these arrays are different
|
|
@@ -25,23 +26,58 @@ class ArrayType {
|
|
|
25
26
|
}
|
|
26
27
|
return true;
|
|
27
28
|
}
|
|
28
|
-
else if (reflection_1.isDynamicType(targetType) ||
|
|
29
|
-
reflection_1.isObjectType(targetType)) {
|
|
29
|
+
else if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
30
|
+
(0, reflection_1.isObjectType)(targetType)) {
|
|
30
31
|
return true;
|
|
31
32
|
}
|
|
32
33
|
return false;
|
|
33
34
|
}
|
|
34
|
-
isConvertibleTo(targetType) {
|
|
35
|
-
return this.isAssignableTo(targetType);
|
|
35
|
+
isConvertibleTo(targetType, context) {
|
|
36
|
+
return this.isAssignableTo(targetType, context);
|
|
36
37
|
}
|
|
37
|
-
toString() {
|
|
38
|
-
|
|
38
|
+
toString(context) {
|
|
39
|
+
// TODO TYPES: When we support union types, the output should be more like:
|
|
40
|
+
// `Array<${this.innerTypes.map((x) => x.toString(context)).join(' | ')}>`;
|
|
41
|
+
return `${this.getDefaultType(context).toString(context)}[]`;
|
|
42
|
+
}
|
|
43
|
+
toJsString(context) {
|
|
44
|
+
const uniqueInnerTypes = this.getUniqueTypesByAssignability(this.innerTypes);
|
|
45
|
+
return `Array<${uniqueInnerTypes.map((x) => x.toString(context)).join(' | ')}>`;
|
|
39
46
|
}
|
|
40
47
|
toTypeString() {
|
|
41
48
|
return 'object';
|
|
42
49
|
}
|
|
43
|
-
|
|
44
|
-
|
|
50
|
+
getDefaultType(context) {
|
|
51
|
+
const uniqueInnerTypes = this.getUniqueTypesByAssignability(this.innerTypes, context);
|
|
52
|
+
return (uniqueInnerTypes === null || uniqueInnerTypes === void 0 ? void 0 : uniqueInnerTypes.length) === 1 ? uniqueInnerTypes[0] : new DynamicType_1.DynamicType();
|
|
53
|
+
}
|
|
54
|
+
equals(targetType, context) {
|
|
55
|
+
return (0, reflection_1.isArrayType)(targetType) && this.isAssignableTo(targetType, context);
|
|
56
|
+
}
|
|
57
|
+
getUniqueTypesByAssignability(innerTypes, context) {
|
|
58
|
+
const uniqueTypes = [];
|
|
59
|
+
for (const innerType of innerTypes) {
|
|
60
|
+
let shouldAddType = true;
|
|
61
|
+
for (let i = 0; i < uniqueTypes.length; i++) {
|
|
62
|
+
const uniqueType = uniqueTypes[i];
|
|
63
|
+
if (innerType.isAssignableTo(uniqueType, context)) {
|
|
64
|
+
// this type is already assignable to the existing type
|
|
65
|
+
shouldAddType = false;
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
else if (uniqueType.isAssignableTo(innerType, context)) {
|
|
69
|
+
// an existing type is assignable to this type. replace the existing type with this
|
|
70
|
+
// as this is more general
|
|
71
|
+
shouldAddType = false;
|
|
72
|
+
uniqueTypes[i] = innerType;
|
|
73
|
+
break;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (shouldAddType) {
|
|
77
|
+
uniqueTypes.push(innerType);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return uniqueTypes;
|
|
45
81
|
}
|
|
46
82
|
}
|
|
47
83
|
exports.ArrayType = ArrayType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArrayType.js","sourceRoot":"","sources":["../../src/types/ArrayType.ts"],"names":[],"mappings":";;;AAAA,uDAAkF;
|
|
1
|
+
{"version":3,"file":"ArrayType.js","sourceRoot":"","sources":["../../src/types/ArrayType.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,25 +5,84 @@ const ArrayType_1 = require("./ArrayType");
|
|
|
5
5
|
const DynamicType_1 = require("./DynamicType");
|
|
6
6
|
const BooleanType_1 = require("./BooleanType");
|
|
7
7
|
const StringType_1 = require("./StringType");
|
|
8
|
+
const CustomType_1 = require("./CustomType");
|
|
9
|
+
const IntegerType_1 = require("./IntegerType");
|
|
10
|
+
const FloatType_1 = require("./FloatType");
|
|
11
|
+
const Program_1 = require("../Program");
|
|
12
|
+
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
|
8
13
|
describe('ArrayType', () => {
|
|
9
14
|
it('is equivalent to array types', () => {
|
|
10
|
-
chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new ArrayType_1.ArrayType())).to.be.true;
|
|
11
|
-
chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
15
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new ArrayType_1.ArrayType())).to.be.true;
|
|
16
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
12
17
|
});
|
|
13
18
|
it('catches arrays containing different inner types', () => {
|
|
14
|
-
chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()))).to.be.true;
|
|
15
|
-
chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new StringType_1.StringType()))).to.be.false;
|
|
19
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()))).to.be.true;
|
|
20
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).isAssignableTo(new ArrayType_1.ArrayType(new StringType_1.StringType()))).to.be.false;
|
|
21
|
+
});
|
|
22
|
+
it('sets the innerTypes to unique types', () => {
|
|
23
|
+
const boolArray = new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new BooleanType_1.BooleanType());
|
|
24
|
+
(0, chai_1.expect)(boolArray.innerTypes.length).to.eql(1);
|
|
25
|
+
(0, chai_1.expect)(boolArray.innerTypes[0].equals(new BooleanType_1.BooleanType())).to.be.true;
|
|
26
|
+
(0, chai_1.expect)(boolArray.toJsString()).to.eql('Array<boolean>');
|
|
27
|
+
const multiTypeArray = new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new StringType_1.StringType(), new BooleanType_1.BooleanType());
|
|
28
|
+
(0, chai_1.expect)(multiTypeArray.innerTypes.length).to.eql(2);
|
|
29
|
+
(0, chai_1.expect)(multiTypeArray.innerTypes[0].equals(new BooleanType_1.BooleanType())).to.be.true;
|
|
30
|
+
(0, chai_1.expect)(multiTypeArray.innerTypes[1].equals(new StringType_1.StringType())).to.be.true;
|
|
31
|
+
(0, chai_1.expect)(multiTypeArray.toJsString()).to.eql('Array<boolean | string>');
|
|
32
|
+
});
|
|
33
|
+
it('sets the innerTypes to custom types', () => {
|
|
34
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new CustomType_1.CustomType('MyKlass')).toString()).to.eql('MyKlass[]');
|
|
16
35
|
});
|
|
17
36
|
it('is not equivalent to other types', () => {
|
|
18
|
-
chai_1.expect(new ArrayType_1.ArrayType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.false;
|
|
37
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.false;
|
|
19
38
|
});
|
|
20
|
-
describe('
|
|
21
|
-
chai_1.expect(new ArrayType_1.ArrayType().isConvertibleTo(new BooleanType_1.BooleanType())).to.be.false;
|
|
22
|
-
chai_1.expect(new ArrayType_1.ArrayType().isConvertibleTo(new ArrayType_1.ArrayType())).to.be.true;
|
|
39
|
+
describe('isConvertibleTo', () => {
|
|
40
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType().isConvertibleTo(new BooleanType_1.BooleanType())).to.be.false;
|
|
41
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType().isConvertibleTo(new ArrayType_1.ArrayType())).to.be.true;
|
|
23
42
|
});
|
|
24
43
|
describe('toString', () => {
|
|
25
|
-
it('
|
|
26
|
-
chai_1.expect(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()
|
|
44
|
+
it('returns the default type', () => {
|
|
45
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType()).toString()).to.eql('boolean[]');
|
|
46
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new StringType_1.StringType()).toString()).to.eql('string[]');
|
|
47
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new CustomType_1.CustomType('MyKlass')).toString()).to.eql('MyKlass[]');
|
|
48
|
+
});
|
|
49
|
+
it('returns dynamic if more than one type is assigned', () => {
|
|
50
|
+
(0, chai_1.expect)(new ArrayType_1.ArrayType(new BooleanType_1.BooleanType(), new StringType_1.StringType()).toString()).to.eql('dynamic[]');
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
describe('unique types by assignability', () => {
|
|
54
|
+
it('follows the isAssignable method on the type', () => {
|
|
55
|
+
const numbersArray = new ArrayType_1.ArrayType(new IntegerType_1.IntegerType(), new FloatType_1.FloatType(), new IntegerType_1.IntegerType(), new FloatType_1.FloatType());
|
|
56
|
+
// integers ARE NOT assignable to float, and vice versa
|
|
57
|
+
(0, chai_1.expect)(numbersArray.innerTypes.length).to.eql(2);
|
|
58
|
+
(0, chai_1.expect)(numbersArray.innerTypes[0].equals(new IntegerType_1.IntegerType())).to.be.true;
|
|
59
|
+
(0, chai_1.expect)(numbersArray.innerTypes[1].equals(new FloatType_1.FloatType())).to.be.true;
|
|
60
|
+
});
|
|
61
|
+
it('sets the default type to Dynamic if types are not assignable', () => {
|
|
62
|
+
const numbersArray = new ArrayType_1.ArrayType(new IntegerType_1.IntegerType(), new FloatType_1.FloatType(), new IntegerType_1.IntegerType(), new FloatType_1.FloatType());
|
|
63
|
+
// integers ARE NOT assignable to float, and vice versa
|
|
64
|
+
(0, chai_1.expect)(numbersArray.getDefaultType().equals(new DynamicType_1.DynamicType())).to.be.true;
|
|
65
|
+
});
|
|
66
|
+
it('sets the default type to the most general of the types provided', () => {
|
|
67
|
+
const program = new Program_1.Program({
|
|
68
|
+
rootDir: process.cwd()
|
|
69
|
+
});
|
|
70
|
+
program.createSourceScope();
|
|
71
|
+
const file = program.setFile('source/main.bs', `
|
|
72
|
+
class Parent
|
|
73
|
+
end class
|
|
74
|
+
|
|
75
|
+
class Child extends Parent
|
|
76
|
+
end class
|
|
77
|
+
|
|
78
|
+
sub main()
|
|
79
|
+
' inside main
|
|
80
|
+
end sub
|
|
81
|
+
`);
|
|
82
|
+
const klassesArray = new ArrayType_1.ArrayType(new CustomType_1.CustomType('Child'), new CustomType_1.CustomType('Parent'), new CustomType_1.CustomType('Child'));
|
|
83
|
+
const context = { scope: program.getScopesForFile(file)[0], file: file, position: vscode_languageserver_protocol_1.Position.create(8, 23) };
|
|
84
|
+
(0, chai_1.expect)(klassesArray.innerTypes.length).to.eql(2);
|
|
85
|
+
(0, chai_1.expect)(klassesArray.getDefaultType(context).equals(new CustomType_1.CustomType('Parent'))).to.be.true;
|
|
27
86
|
});
|
|
28
87
|
});
|
|
29
88
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArrayType.spec.js","sourceRoot":"","sources":["../../src/types/ArrayType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,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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"}
|
|
@@ -4,8 +4,8 @@ exports.BooleanType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
class BooleanType {
|
|
6
6
|
isAssignableTo(targetType) {
|
|
7
|
-
return (reflection_1.isBooleanType(targetType) ||
|
|
8
|
-
reflection_1.isDynamicType(targetType));
|
|
7
|
+
return ((0, reflection_1.isBooleanType)(targetType) ||
|
|
8
|
+
(0, reflection_1.isDynamicType)(targetType));
|
|
9
9
|
}
|
|
10
10
|
isConvertibleTo(targetType) {
|
|
11
11
|
return this.isAssignableTo(targetType);
|
|
@@ -17,7 +17,7 @@ class BooleanType {
|
|
|
17
17
|
return this.toString();
|
|
18
18
|
}
|
|
19
19
|
equals(targetType) {
|
|
20
|
-
return reflection_1.isBooleanType(targetType);
|
|
20
|
+
return (0, reflection_1.isBooleanType)(targetType);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.BooleanType = BooleanType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanType.js","sourceRoot":"","sources":["../../src/types/BooleanType.ts"],"names":[],"mappings":";;;AAAA,uDAAsE;AAGtE,MAAa,WAAW;IACb,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,0BAAa,
|
|
1
|
+
{"version":3,"file":"BooleanType.js","sourceRoot":"","sources":["../../src/types/BooleanType.ts"],"names":[],"mappings":";;;AAAA,uDAAsE;AAGtE,MAAa,WAAW;IACb,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AAvBD,kCAuBC"}
|
|
@@ -5,8 +5,8 @@ const BooleanType_1 = require("./BooleanType");
|
|
|
5
5
|
const DynamicType_1 = require("./DynamicType");
|
|
6
6
|
describe('BooleanType', () => {
|
|
7
7
|
it('is equivalent to boolean types', () => {
|
|
8
|
-
chai_1.expect(new BooleanType_1.BooleanType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.true;
|
|
9
|
-
chai_1.expect(new BooleanType_1.BooleanType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
8
|
+
(0, chai_1.expect)(new BooleanType_1.BooleanType().isAssignableTo(new BooleanType_1.BooleanType())).to.be.true;
|
|
9
|
+
(0, chai_1.expect)(new BooleanType_1.BooleanType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
10
10
|
});
|
|
11
11
|
});
|
|
12
12
|
//# sourceMappingURL=BooleanType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanType.spec.js","sourceRoot":"","sources":["../../src/types/BooleanType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,aAAM,
|
|
1
|
+
{"version":3,"file":"BooleanType.spec.js","sourceRoot":"","sources":["../../src/types/BooleanType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/dist/types/BscType.d.ts
CHANGED
package/dist/types/BscType.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTypeFromContext = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
function getTypeFromContext(type, context) {
|
|
6
|
-
if (reflection_1.isLazyType(type)) {
|
|
6
|
+
if ((0, reflection_1.isLazyType)(type)) {
|
|
7
7
|
return type.getTypeFromContext(context);
|
|
8
8
|
}
|
|
9
9
|
return type;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAyBpD,SAAgB,kBAAkB,CAAC,IAAa,EAAE,OAAqB;IACnE,IAAI,uBAAU,
|
|
1
|
+
{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAyBpD,SAAgB,kBAAkB,CAAC,IAAa,EAAE,OAAqB;IACnE,IAAI,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAClB,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;KAC3C;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,gDAKC"}
|
|
@@ -6,7 +6,7 @@ export declare class CustomType implements BscType, SymbolContainer {
|
|
|
6
6
|
constructor(name: string, memberTable?: SymbolTable);
|
|
7
7
|
toString(): string;
|
|
8
8
|
toTypeString(): string;
|
|
9
|
-
isAssignableTo(targetType: BscType, context?: TypeContext
|
|
9
|
+
isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
|
|
10
10
|
isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
|
|
11
11
|
equals(targetType: BscType, context?: TypeContext): boolean;
|
|
12
12
|
}
|
package/dist/types/CustomType.js
CHANGED
|
@@ -13,19 +13,21 @@ class CustomType {
|
|
|
13
13
|
toTypeString() {
|
|
14
14
|
return 'object';
|
|
15
15
|
}
|
|
16
|
-
isAssignableTo(targetType, context
|
|
16
|
+
isAssignableTo(targetType, context) {
|
|
17
|
+
var _a;
|
|
18
|
+
const ancestorTypes = (_a = context === null || context === void 0 ? void 0 : context.scope) === null || _a === void 0 ? void 0 : _a.getAncestorTypeListByContext(this, context);
|
|
17
19
|
if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => targetType.equals(ancestorType, context))) {
|
|
18
20
|
return true;
|
|
19
21
|
}
|
|
20
22
|
return (this.equals(targetType, context) ||
|
|
21
|
-
reflection_1.isObjectType(targetType) ||
|
|
22
|
-
reflection_1.isDynamicType(targetType));
|
|
23
|
+
(0, reflection_1.isObjectType)(targetType) ||
|
|
24
|
+
(0, reflection_1.isDynamicType)(targetType));
|
|
23
25
|
}
|
|
24
26
|
isConvertibleTo(targetType, context) {
|
|
25
27
|
return this.isAssignableTo(targetType, context);
|
|
26
28
|
}
|
|
27
29
|
equals(targetType, context) {
|
|
28
|
-
return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString(
|
|
30
|
+
return (0, reflection_1.isCustomType)(targetType) && this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
|
|
29
31
|
}
|
|
30
32
|
}
|
|
31
33
|
exports.CustomType = CustomType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AAAA,uDAAmF;AAInF,MAAa,UAAU;IAEnB,YAAmB,IAAY,EAAS,cAA2B,IAAI;QAApD,SAAI,GAAJ,IAAI,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAoB;IACvE,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,cAAc,CAAC,UAAmB,EAAE,OAAqB;;QAC5D,MAAM,aAAa,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClF,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EAAE;YAC/E,OAAO,IAAI,CAAC;SACf;QACD,OAAO,CACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;YAChC,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB,EAAE,OAAqB;QAC7D,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,UAAmB,EAAE,OAAqB;QACpD,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IAClF,CAAC;CACJ;AAhCD,gCAgCC"}
|
package/dist/types/DoubleType.js
CHANGED
|
@@ -4,15 +4,15 @@ exports.DoubleType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
class DoubleType {
|
|
6
6
|
isAssignableTo(targetType) {
|
|
7
|
-
return (reflection_1.isDoubleType(targetType) ||
|
|
8
|
-
reflection_1.isDynamicType(targetType));
|
|
7
|
+
return ((0, reflection_1.isDoubleType)(targetType) ||
|
|
8
|
+
(0, reflection_1.isDynamicType)(targetType));
|
|
9
9
|
}
|
|
10
10
|
isConvertibleTo(targetType) {
|
|
11
|
-
if (reflection_1.isDynamicType(targetType) ||
|
|
12
|
-
reflection_1.isIntegerType(targetType) ||
|
|
13
|
-
reflection_1.isFloatType(targetType) ||
|
|
14
|
-
reflection_1.isDoubleType(targetType) ||
|
|
15
|
-
reflection_1.isLongIntegerType(targetType)) {
|
|
11
|
+
if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
12
|
+
(0, reflection_1.isIntegerType)(targetType) ||
|
|
13
|
+
(0, reflection_1.isFloatType)(targetType) ||
|
|
14
|
+
(0, reflection_1.isDoubleType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isLongIntegerType)(targetType)) {
|
|
16
16
|
return true;
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,UAAU;IACZ,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,yBAAY,
|
|
1
|
+
{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,UAAU;IACZ,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACM,QAAQ;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAhCD,gCAgCC"}
|
|
@@ -5,8 +5,8 @@ const DoubleType_1 = require("./DoubleType");
|
|
|
5
5
|
const DynamicType_1 = require("./DynamicType");
|
|
6
6
|
describe('DoubleType', () => {
|
|
7
7
|
it('is equivalent to double types', () => {
|
|
8
|
-
chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
|
|
9
|
-
chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
8
|
+
(0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
|
|
9
|
+
(0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
10
10
|
});
|
|
11
11
|
});
|
|
12
12
|
//# sourceMappingURL=DoubleType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,
|
|
1
|
+
{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IAEb,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,0BAAa,
|
|
1
|
+
{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IAEb,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA3BD,kCA2BC"}
|
|
@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
|
|
|
5
5
|
const StringType_1 = require("./StringType");
|
|
6
6
|
describe('DynamicType', () => {
|
|
7
7
|
it('is equivalent to dynamic types', () => {
|
|
8
|
-
chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
|
|
9
|
-
chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
8
|
+
(0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
|
|
9
|
+
(0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
10
10
|
});
|
|
11
11
|
});
|
|
12
12
|
//# sourceMappingURL=DynamicType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,aAAM,
|
|
1
|
+
{"version":3,"file":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/dist/types/FloatType.js
CHANGED
|
@@ -4,15 +4,15 @@ exports.FloatType = void 0;
|
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
5
|
class FloatType {
|
|
6
6
|
isAssignableTo(targetType) {
|
|
7
|
-
return (reflection_1.isFloatType(targetType) ||
|
|
8
|
-
reflection_1.isDynamicType(targetType));
|
|
7
|
+
return ((0, reflection_1.isFloatType)(targetType) ||
|
|
8
|
+
(0, reflection_1.isDynamicType)(targetType));
|
|
9
9
|
}
|
|
10
10
|
isConvertibleTo(targetType) {
|
|
11
|
-
if (reflection_1.isDynamicType(targetType) ||
|
|
12
|
-
reflection_1.isIntegerType(targetType) ||
|
|
13
|
-
reflection_1.isFloatType(targetType) ||
|
|
14
|
-
reflection_1.isDoubleType(targetType) ||
|
|
15
|
-
reflection_1.isLongIntegerType(targetType)) {
|
|
11
|
+
if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
12
|
+
(0, reflection_1.isIntegerType)(targetType) ||
|
|
13
|
+
(0, reflection_1.isFloatType)(targetType) ||
|
|
14
|
+
(0, reflection_1.isDoubleType)(targetType) ||
|
|
15
|
+
(0, reflection_1.isLongIntegerType)(targetType)) {
|
|
16
16
|
return true;
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,SAAS;IACX,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,wBAAW,
|
|
1
|
+
{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,SAAS;IACX,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAE5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,QAAQ;QACX,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAlCD,8BAkCC"}
|
|
@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
|
|
|
5
5
|
const FloatType_1 = require("./FloatType");
|
|
6
6
|
describe('FloatType', () => {
|
|
7
7
|
it('is equivalent to double types', () => {
|
|
8
|
-
chai_1.expect(new FloatType_1.FloatType().isAssignableTo(new FloatType_1.FloatType())).to.be.true;
|
|
9
|
-
chai_1.expect(new FloatType_1.FloatType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
8
|
+
(0, chai_1.expect)(new FloatType_1.FloatType().isAssignableTo(new FloatType_1.FloatType())).to.be.true;
|
|
9
|
+
(0, chai_1.expect)(new FloatType_1.FloatType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
|
|
10
10
|
});
|
|
11
11
|
});
|
|
12
12
|
//# sourceMappingURL=FloatType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AAExC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,
|
|
1
|
+
{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AAExC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CallableParam } from '../interfaces';
|
|
2
|
-
import type { BscType } from './BscType';
|
|
2
|
+
import type { BscType, TypeContext } from './BscType';
|
|
3
3
|
export declare class FunctionType implements BscType {
|
|
4
4
|
returnType: BscType;
|
|
5
5
|
/**
|
|
@@ -19,9 +19,9 @@ export declare class FunctionType implements BscType {
|
|
|
19
19
|
name: string;
|
|
20
20
|
setName(name: string): this;
|
|
21
21
|
addParameter(paramOrName: CallableParam | string, type?: BscType, isOptional?: boolean): this;
|
|
22
|
-
isAssignableTo(targetType: BscType): boolean;
|
|
23
|
-
isConvertibleTo(targetType: BscType): boolean;
|
|
24
|
-
toString(): string;
|
|
22
|
+
isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
|
|
23
|
+
isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
|
|
24
|
+
toString(context?: TypeContext): string;
|
|
25
25
|
toTypeString(): string;
|
|
26
|
-
equals(targetType: BscType): boolean;
|
|
26
|
+
equals(targetType: BscType, context?: TypeContext): boolean;
|
|
27
27
|
}
|