brighterscript 0.66.0-alpha.5 → 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 +64 -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 +19 -4
- package/dist/DiagnosticMessages.js +45 -5
- 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 +101 -37
- package/dist/Program.js +492 -274
- 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 +27 -13
- package/dist/Scope.js +44 -26
- 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 +7 -4
- package/dist/XmlScope.js +47 -8
- 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/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 +30 -8
- package/dist/astUtils/reflection.js +64 -14
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +85 -4
- 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 +4 -4
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +11 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +112 -58
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +151 -6
- 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 +2 -8
- 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/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/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 +137 -19
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +671 -1
- 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 +2 -6
- 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 +326 -85
- package/dist/interfaces.js +4 -1
- 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 +35 -19
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.js +12 -1
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +18 -2
- 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.js +1 -1
- package/dist/parser/Statement.js.map +1 -1
- 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 +17 -17
- 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 +18 -10
- 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 +111 -149
- package/dist/roku-types/index.d.ts +27 -13
- package/dist/types/ArrayType.d.ts +2 -1
- package/dist/types/ArrayType.js +6 -2
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +11 -1
- 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 +3 -2
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscType.d.ts +3 -3
- package/dist/types/BscType.js +26 -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 +8 -0
- package/dist/types/BuiltInInterfaceAdder.js +88 -23
- 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 +83 -0
- package/dist/types/ComponentType.js.map +1 -0
- package/dist/types/DoubleType.d.ts +2 -1
- package/dist/types/DoubleType.js +4 -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 +4 -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 +4 -2
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +2 -1
- package/dist/types/InterfaceType.js +3 -7
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +25 -2
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/LongIntegerType.d.ts +2 -1
- package/dist/types/LongIntegerType.js +4 -2
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/ObjectType.d.ts +2 -2
- 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 +4 -4
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +7 -1
- package/dist/types/TypedFunctionType.js +47 -17
- 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/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 +10 -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/helper.spec.js +15 -0
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/types/helpers.d.ts +5 -1
- package/dist/types/helpers.js +31 -3
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +26 -6
- package/dist/util.js +181 -52
- 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
|
@@ -12,14 +12,16 @@ class LongIntegerType extends BscType_1.BscType {
|
|
|
12
12
|
this.typeText = typeText;
|
|
13
13
|
this.kind = BscTypeKind_1.BscTypeKind.LongIntegerType;
|
|
14
14
|
}
|
|
15
|
-
isTypeCompatible(targetType) {
|
|
15
|
+
isTypeCompatible(targetType, data) {
|
|
16
16
|
return ((0, reflection_1.isDynamicType)(targetType) ||
|
|
17
17
|
(0, reflection_1.isObjectType)(targetType) ||
|
|
18
18
|
(0, reflection_1.isIntegerType)(targetType) ||
|
|
19
19
|
(0, reflection_1.isFloatType)(targetType) ||
|
|
20
20
|
(0, reflection_1.isDoubleType)(targetType) ||
|
|
21
21
|
(0, reflection_1.isLongIntegerType)(targetType) ||
|
|
22
|
-
(0, helpers_1.isUnionTypeCompatible)(this, targetType)
|
|
22
|
+
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data) ||
|
|
23
|
+
(0, helpers_1.isEnumTypeCompatible)(this, targetType, data) ||
|
|
24
|
+
(0, helpers_1.isNativeInterfaceCompatibleNumber)(this, targetType, data));
|
|
23
25
|
}
|
|
24
26
|
toString() {
|
|
25
27
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAA2G;AAC3G,mEAAgE;AAGhE,MAAa,eAAgB,SAAQ,iBAAO;IACxC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,eAAe,CAAC;IAFnD,CAAC;IAMM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC;YAC7B,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC7C,IAAA,8BAAoB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC5C,IAAA,2CAAiC,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAC5D,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAC1C,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;;AAnCL,0CAoCC;AA3BiB,wBAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;AA6BhE,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
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
|
export declare class ObjectType extends BscType {
|
|
5
5
|
typeText?: string;
|
|
6
6
|
constructor(typeText?: string);
|
|
7
7
|
readonly kind = BscTypeKind.ObjectType;
|
|
8
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
8
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
9
9
|
toString(): string;
|
|
10
10
|
toTypeString(): string;
|
|
11
11
|
getMemberType(name: string, options: GetTypeOptions): BscType;
|
package/dist/types/ObjectType.js
CHANGED
|
@@ -13,7 +13,7 @@ class ObjectType extends BscType_1.BscType {
|
|
|
13
13
|
this.typeText = typeText;
|
|
14
14
|
this.kind = BscTypeKind_1.BscTypeKind.ObjectType;
|
|
15
15
|
}
|
|
16
|
-
isTypeCompatible(targetType) {
|
|
16
|
+
isTypeCompatible(targetType, data) {
|
|
17
17
|
//Brightscript allows anything passed "as object", so as long as a type is provided, this is true
|
|
18
18
|
return !!targetType;
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,mEAAgE;AAChE,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;
|
|
1
|
+
{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,mEAAgE;AAChE,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,iGAAiG;QACjG,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,gEAAgE;QAChE,mHAAmH;QACnH,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;IAC/G,CAAC;CACJ;AA/BD,gCA+BC;AAGD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -30,7 +30,9 @@ export declare class ReferenceType extends BscType {
|
|
|
30
30
|
private referenceChain;
|
|
31
31
|
private propertyTypeReference;
|
|
32
32
|
private memberTypeReferences;
|
|
33
|
+
private callFuncMemberTypeReferences;
|
|
33
34
|
private futureMemberTableProvider;
|
|
35
|
+
private futureCallFuncMemberTableProvider;
|
|
34
36
|
}
|
|
35
37
|
/**
|
|
36
38
|
* Use this class for when you need to reference a property of a BscType, and that property is also a BscType,
|
|
@@ -28,6 +28,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
28
28
|
this.referenceChain = new Set();
|
|
29
29
|
this.propertyTypeReference = new Map();
|
|
30
30
|
this.memberTypeReferences = new Map();
|
|
31
|
+
this.callFuncMemberTypeReferences = new Map();
|
|
31
32
|
this.futureMemberTableProvider = () => {
|
|
32
33
|
return {
|
|
33
34
|
getSymbolType: (innerName, innerOptions) => {
|
|
@@ -44,6 +45,22 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
44
45
|
}
|
|
45
46
|
};
|
|
46
47
|
};
|
|
48
|
+
this.futureCallFuncMemberTableProvider = () => {
|
|
49
|
+
return {
|
|
50
|
+
getSymbolType: (innerName, innerOptions) => {
|
|
51
|
+
const resolvedType = this.resolve();
|
|
52
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
53
|
+
return resolvedType.getCallFuncType(innerName, innerOptions);
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
setCachedType: (innerName, innerResolvedTypeCacheEntry, options) => {
|
|
57
|
+
const resolvedType = this.resolve();
|
|
58
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
59
|
+
resolvedType.getCallFuncTable().setCachedType(innerName, innerResolvedTypeCacheEntry, options);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
};
|
|
47
64
|
// eslint-disable-next-line no-constructor-return
|
|
48
65
|
return new Proxy(this, {
|
|
49
66
|
get: (target, propName, receiver) => {
|
|
@@ -114,6 +131,24 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
114
131
|
return memberTypeReference;
|
|
115
132
|
};
|
|
116
133
|
}
|
|
134
|
+
else if (propName === 'getCallFuncType') {
|
|
135
|
+
// We're looking for a callfunc member of a reference type
|
|
136
|
+
// Since we don't know what type this is, yet, return ReferenceType
|
|
137
|
+
return (memberName, options) => {
|
|
138
|
+
const resolvedType = this.resolve();
|
|
139
|
+
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
140
|
+
return resolvedType.getCallFuncType(memberName, options);
|
|
141
|
+
}
|
|
142
|
+
const refLookUp = `${memberName.toLowerCase()}-${options.flags}-callfunc`;
|
|
143
|
+
let callFuncMemberTypeReference = this.callFuncMemberTypeReferences.get(refLookUp);
|
|
144
|
+
if (callFuncMemberTypeReference) {
|
|
145
|
+
return callFuncMemberTypeReference;
|
|
146
|
+
}
|
|
147
|
+
callFuncMemberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureCallFuncMemberTableProvider);
|
|
148
|
+
this.callFuncMemberTypeReferences.set(refLookUp, callFuncMemberTypeReference);
|
|
149
|
+
return callFuncMemberTypeReference;
|
|
150
|
+
};
|
|
151
|
+
}
|
|
117
152
|
else if (propName === 'toString') {
|
|
118
153
|
// This type was never found
|
|
119
154
|
// For diagnostics, we should return the expected name of of the type
|
|
@@ -139,6 +174,14 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
139
174
|
return this.memberTable;
|
|
140
175
|
};
|
|
141
176
|
}
|
|
177
|
+
else if (propName === 'callFuncTable') {
|
|
178
|
+
return this.callFuncMemberTable;
|
|
179
|
+
}
|
|
180
|
+
else if (propName === 'getCallFuncTable') {
|
|
181
|
+
return () => {
|
|
182
|
+
return this.callFuncMemberTable;
|
|
183
|
+
};
|
|
184
|
+
}
|
|
142
185
|
else if (propName === 'isTypeCompatible') {
|
|
143
186
|
return (targetType) => {
|
|
144
187
|
return (0, reflection_1.isDynamicType)(targetType);
|
|
@@ -248,6 +291,7 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
248
291
|
// eslint-disable-next-line no-constructor-return
|
|
249
292
|
return new Proxy(this, {
|
|
250
293
|
get: (target, propName, receiver) => {
|
|
294
|
+
var _a;
|
|
251
295
|
if (propName === '__reflection') {
|
|
252
296
|
// Cheeky way to get `isTypePropertyReferenceType` reflection to work
|
|
253
297
|
return { name: 'TypePropertyReferenceType' };
|
|
@@ -276,7 +320,7 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
276
320
|
return () => false;
|
|
277
321
|
}
|
|
278
322
|
}
|
|
279
|
-
let inner = this.outerType[this.propertyName];
|
|
323
|
+
let inner = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName];
|
|
280
324
|
if (!inner) {
|
|
281
325
|
inner = DynamicType_1.DynamicType.instance;
|
|
282
326
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ReferenceType.js","sourceRoot":"","sources":["../../src/types/ReferenceType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BscType } from './BscType';
|
|
2
2
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
3
4
|
export declare class StringType extends BscType {
|
|
4
5
|
typeText?: string;
|
|
5
6
|
constructor(typeText?: string);
|
|
@@ -8,7 +9,7 @@ export declare class StringType extends BscType {
|
|
|
8
9
|
* A static instance that can be used to reduce memory and constructor costs, since there's nothing unique about this
|
|
9
10
|
*/
|
|
10
11
|
static instance: StringType;
|
|
11
|
-
isTypeCompatible(targetType: BscType): any;
|
|
12
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): any;
|
|
12
13
|
toString(): string;
|
|
13
14
|
toTypeString(): string;
|
|
14
15
|
isEqual(targetType: BscType): boolean;
|
package/dist/types/StringType.js
CHANGED
|
@@ -12,13 +12,13 @@ class StringType extends BscType_1.BscType {
|
|
|
12
12
|
this.typeText = typeText;
|
|
13
13
|
this.kind = BscTypeKind_1.BscTypeKind.StringType;
|
|
14
14
|
}
|
|
15
|
-
isTypeCompatible(targetType) {
|
|
15
|
+
isTypeCompatible(targetType, data) {
|
|
16
16
|
return ((0, reflection_1.isStringType)(targetType) ||
|
|
17
17
|
(0, reflection_1.isDynamicType)(targetType) ||
|
|
18
18
|
(0, reflection_1.isObjectType)(targetType) ||
|
|
19
|
-
(0, helpers_1.isUnionTypeCompatible)(this, targetType) ||
|
|
20
|
-
|
|
21
|
-
(
|
|
19
|
+
(0, helpers_1.isUnionTypeCompatible)(this, targetType, data) ||
|
|
20
|
+
(0, helpers_1.isEnumTypeCompatible)(this, targetType, data) ||
|
|
21
|
+
(0, helpers_1.isNativeInterfaceCompatible)(this, targetType, 'rostring', data));
|
|
22
22
|
}
|
|
23
23
|
toString() {
|
|
24
24
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"StringType.js","sourceRoot":"","sources":["../../src/types/StringType.ts"],"names":[],"mappings":";;;AAAA,uDAAmF;AACnF,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAqG;AACrG,mEAAgE;AAGhE,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IASM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC7C,IAAA,8BAAoB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC5C,IAAA,qCAA2B,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,CAClE,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;IACpC,CAAC;;AAnCL,gCAoCC;AA3BG;;GAEG;AACW,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;AA0BtD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BaseFunctionType } from './BaseFunctionType';
|
|
2
2
|
import type { BscType } from './BscType';
|
|
3
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
4
5
|
export declare class TypedFunctionType extends BaseFunctionType {
|
|
5
6
|
returnType: BscType;
|
|
6
7
|
constructor(returnType: BscType);
|
|
@@ -13,6 +14,10 @@ export declare class TypedFunctionType extends BaseFunctionType {
|
|
|
13
14
|
* Determines if this is a sub or not
|
|
14
15
|
*/
|
|
15
16
|
isSub: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Does this function accept more args than just those in this.params
|
|
19
|
+
*/
|
|
20
|
+
isVariadic: boolean;
|
|
16
21
|
params: {
|
|
17
22
|
name: string;
|
|
18
23
|
type: BscType;
|
|
@@ -20,8 +25,9 @@ export declare class TypedFunctionType extends BaseFunctionType {
|
|
|
20
25
|
}[];
|
|
21
26
|
setName(name: string): this;
|
|
22
27
|
addParameter(name: string, type: BscType, isOptional: boolean): this;
|
|
23
|
-
isTypeCompatible(targetType: BscType):
|
|
28
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): any;
|
|
24
29
|
toString(): string;
|
|
25
30
|
toTypeString(): string;
|
|
26
31
|
isEqual(targetType: BscType): boolean;
|
|
32
|
+
private checkParamsAndReturnValue;
|
|
27
33
|
}
|
|
@@ -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) {
|
|
@@ -29,13 +33,16 @@ class TypedFunctionType extends BaseFunctionType_1.BaseFunctionType {
|
|
|
29
33
|
});
|
|
30
34
|
return this;
|
|
31
35
|
}
|
|
32
|
-
isTypeCompatible(targetType) {
|
|
36
|
+
isTypeCompatible(targetType, data) {
|
|
33
37
|
if ((0, reflection_1.isDynamicType)(targetType) ||
|
|
34
38
|
(0, reflection_1.isObjectType)(targetType) ||
|
|
35
|
-
(0, helpers_1.isUnionTypeCompatible)(this, targetType)) {
|
|
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;
|
|
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;QAErB;;WAEG;QACI,eAAU,GAAG,KAAK,CAAC;QAEnB,WAAM,GAAG,EAAiE,CAAC;IAnBlF,CAAC;IAqBM,OAAO,CAAC,IAAY;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,IAAa,EAAE,UAAmB;QAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;SACjD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAC/C;YACE,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,gCAAmB,EAAC,UAAU,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;SAChG;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ;;QACX,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC9F;QACD,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,YAAY,IAAI,IAAI,CAAC;aACxB;YACD,YAAY,IAAI,KAAK,CAAC;SACzB;QACD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC7I,CAAC;IAEM,YAAY;QACf,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,IAAI,IAAA,gCAAmB,EAAC,UAAU,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,yBAAyB,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;SACxF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,yBAAyB,CAAC,UAA6B,EAAE,6BAAsC,EAAE,SAAsD;QAC3J,wBAAwB;QACxB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,6BAA6B,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,UAAU,EAAE;gBACrE,sDAAsD;gBACtD,MAAM;aACT;YAED,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxE,OAAO,KAAK,CAAC;aAChB;YACD,IAAI,CAAC,6BAA6B,IAAI,OAAO,CAAC,UAAU,KAAK,WAAW,CAAC,UAAU,EAAE;gBACjF,OAAO,KAAK,CAAC;aAChB;iBAAM,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,EAAE;gBACtD,OAAO,KAAK,CAAC;aAChB;SACJ;QACD,qBAAqB;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE;YAClG,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,EAAE;YAC3C,OAAO,KAAK,CAAC;SAChB;QACD,0DAA0D;QAC1D,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA9GD,8CA8GC;AAED,6CAAqB,CAAC,oBAAoB,GAAG,CAAC,UAAmB,EAAE,EAAE;IACjE,OAAO,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC7C,CAAC,CAAC"}
|
|
@@ -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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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
1
2
|
import { BscType } from './BscType';
|
|
2
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
3
4
|
export declare class UninitializedType extends BscType {
|
|
4
5
|
isAssignableTo(targetType: BscType): boolean;
|
|
5
6
|
readonly kind = BscTypeKind.UninitializedType;
|
|
6
|
-
isTypeCompatible(targetType: BscType): boolean;
|
|
7
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
7
8
|
toString(): string;
|
|
8
9
|
toTypeString(): string;
|
|
9
10
|
isEqual(targetType: BscType): boolean;
|
|
@@ -14,7 +14,7 @@ class UninitializedType extends BscType_1.BscType {
|
|
|
14
14
|
return (targetType instanceof UninitializedType ||
|
|
15
15
|
targetType instanceof DynamicType_1.DynamicType);
|
|
16
16
|
}
|
|
17
|
-
isTypeCompatible(targetType) {
|
|
17
|
+
isTypeCompatible(targetType, data) {
|
|
18
18
|
return ((0, reflection_1.isUninitializedType)(targetType) ||
|
|
19
19
|
(0, reflection_1.isDynamicType)(targetType));
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UninitializedType.js","sourceRoot":"","sources":["../../src/types/UninitializedType.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;
|
|
1
|
+
{"version":3,"file":"UninitializedType.js","sourceRoot":"","sources":["../../src/types/UninitializedType.ts"],"names":[],"mappings":";;;AAAA,uDAA4E;AAE5E,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,iBAAkB,SAAQ,iBAAO;IAA9C;;QAQoB,SAAI,GAAG,yBAAW,CAAC,iBAAiB,CAAC;IAoBzD,CAAC;IA3BU,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,UAAU,YAAY,iBAAiB;YACvC,UAAU,YAAY,yBAAW,CACpC,CAAC;IACN,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,gCAAmB,EAAC,UAAU,CAAC;YAC/B,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,gCAAmB,EAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;CACJ;AA5BD,8CA4BC"}
|
|
@@ -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
|
@@ -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
|
}
|
|
@@ -49,21 +50,24 @@ class UnionType extends BscType_1.BscType {
|
|
|
49
50
|
}
|
|
50
51
|
return (0, helpers_1.getUniqueType)((0, helpers_1.findTypeUnion)(innerTypesMemberTypes), unionTypeFactory);
|
|
51
52
|
}
|
|
52
|
-
isTypeCompatible(targetType) {
|
|
53
|
+
isTypeCompatible(targetType, data) {
|
|
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) {
|
|
59
|
-
if (!this.isTypeCompatible(targetInnerType)) {
|
|
63
|
+
if (!this.isTypeCompatible(targetInnerType, data)) {
|
|
60
64
|
return false;
|
|
61
65
|
}
|
|
62
66
|
}
|
|
63
67
|
return true;
|
|
64
68
|
}
|
|
65
69
|
for (const innerType of this.types) {
|
|
66
|
-
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType);
|
|
70
|
+
const foundCompatibleInnerType = innerType.isTypeCompatible(targetType, data);
|
|
67
71
|
if (foundCompatibleInnerType) {
|
|
68
72
|
return true;
|
|
69
73
|
}
|
|
@@ -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
|