brighterscript 0.66.0-alpha.6 → 0.66.0-alpha.8
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 +88 -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/AstValidationSegmenter.d.ts +25 -0
- package/dist/AstValidationSegmenter.js +150 -0
- package/dist/AstValidationSegmenter.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 +8 -1
- package/dist/DiagnosticMessages.js +30 -13
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.js +7 -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 +107 -38
- package/dist/Program.js +502 -270
- 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 +26 -38
- package/dist/Scope.js +153 -174
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +4 -1
- package/dist/SymbolTable.js +19 -7
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.d.ts +5 -4
- package/dist/XmlScope.js +16 -14
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/{AstEditor.d.ts → Editor.d.ts} +6 -1
- package/dist/astUtils/{AstEditor.js → Editor.js} +9 -3
- package/dist/astUtils/Editor.js.map +1 -0
- package/dist/astUtils/{AstEditor.spec.js → Editor.spec.js} +10 -6
- package/dist/astUtils/Editor.spec.js.map +1 -0
- package/dist/astUtils/reflection.d.ts +9 -4
- package/dist/astUtils/reflection.js +23 -7
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +2 -2
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +14 -3
- package/dist/astUtils/visitors.js +22 -2
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +58 -7
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +10 -2
- package/dist/bscPlugin/BscPlugin.js +24 -4
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/FileWriter.d.ts +6 -0
- package/dist/bscPlugin/FileWriter.js +24 -0
- package/dist/bscPlugin/FileWriter.js.map +1 -0
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +8 -8
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +7 -2
- package/dist/bscPlugin/completions/CompletionsProcessor.js +112 -44
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +212 -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 +10 -8
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +43 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +22 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/serialize/BslibInjector.spec.js +19 -0
- package/dist/bscPlugin/serialize/BslibInjector.spec.js.map +1 -0
- package/dist/bscPlugin/serialize/BslibManager.d.ts +9 -0
- package/dist/bscPlugin/serialize/BslibManager.js +40 -0
- package/dist/bscPlugin/serialize/BslibManager.js.map +1 -0
- package/dist/bscPlugin/serialize/FileSerializer.d.ts +9 -0
- package/dist/bscPlugin/serialize/FileSerializer.js +72 -0
- package/dist/bscPlugin/serialize/FileSerializer.js.map +1 -0
- package/dist/bscPlugin/transpile/{BrsFilePreTranspileProcessor.d.ts → BrsFileTranspileProcessor.d.ts} +4 -2
- package/dist/bscPlugin/transpile/{BrsFilePreTranspileProcessor.js → BrsFileTranspileProcessor.js} +29 -5
- 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 +8 -3
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.spec.js +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.spec.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +5 -9
- package/dist/bscPlugin/validation/ScopeValidator.js +214 -222
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +669 -0
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/bscPlugin/validation/XmlFileValidator.js +2 -2
- package/dist/bscPlugin/validation/XmlFileValidator.js.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/deferred.d.ts +2 -2
- package/dist/deferred.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -0
- package/dist/diagnosticUtils.js +4 -3
- package/dist/diagnosticUtils.js.map +1 -1
- package/dist/examples/plugins/removePrint.js +1 -1
- package/dist/examples/plugins/removePrint.js.map +1 -1
- package/dist/files/AssetFile.d.ts +26 -0
- package/dist/files/AssetFile.js +26 -0
- package/dist/files/AssetFile.js.map +1 -0
- package/dist/files/BrsFile.Class.spec.js +241 -40
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +66 -16
- package/dist/files/BrsFile.js +330 -80
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +1134 -167
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/Factory.d.ts +25 -0
- package/dist/files/Factory.js +22 -0
- package/dist/files/Factory.js.map +1 -0
- package/dist/files/File.d.ts +106 -0
- package/dist/files/File.js +16 -0
- package/dist/files/File.js.map +1 -0
- package/dist/files/LazyFileData.d.ts +20 -0
- package/dist/files/LazyFileData.js +54 -0
- package/dist/files/LazyFileData.js.map +1 -0
- package/dist/files/LazyFileData.spec.d.ts +1 -0
- package/dist/files/LazyFileData.spec.js +27 -0
- package/dist/files/LazyFileData.spec.js.map +1 -0
- package/dist/files/XmlFile.d.ts +55 -17
- package/dist/files/XmlFile.js +88 -47
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +64 -57
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +21 -8
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/files/tests/optionalChaning.spec.js +14 -14
- package/dist/files/tests/optionalChaning.spec.js.map +1 -1
- package/dist/globalCallables.js +1 -1
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +357 -89
- package/dist/interfaces.js +10 -2
- package/dist/interfaces.js.map +1 -1
- package/dist/lexer/Lexer.js +1 -1
- package/dist/lexer/TokenKind.d.ts +1 -0
- package/dist/lexer/TokenKind.js +4 -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 +2 -2
- package/dist/parser/Expression.js +23 -19
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +103 -0
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.js +61 -13
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +227 -1
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.d.ts +2 -2
- package/dist/parser/SGParser.js +3 -3
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGParser.spec.js +2 -2
- package/dist/parser/SGParser.spec.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +1 -1
- package/dist/parser/Statement.d.ts +12 -5
- package/dist/parser/Statement.js +56 -26
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +16 -16
- 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/expression/UnaryExpression.spec.d.ts +1 -0
- package/dist/parser/tests/expression/UnaryExpression.spec.js +52 -0
- package/dist/parser/tests/expression/UnaryExpression.spec.js.map +1 -0
- package/dist/parser/tests/statement/ConstStatement.spec.js +90 -16
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Continue.spec.js +2 -2
- package/dist/parser/tests/statement/Continue.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.js +35 -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 +20 -12
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +10 -10
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/preprocessor/Manifest.d.ts +1 -1
- package/dist/preprocessor/Manifest.js +2 -2
- package/dist/preprocessor/Manifest.js.map +1 -1
- package/dist/roku-types/data.json +98 -193
- package/dist/roku-types/index.d.ts +15 -11
- package/dist/types/ArrayType.d.ts +1 -1
- package/dist/types/ArrayType.js +4 -0
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +1 -1
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.d.ts +1 -1
- package/dist/types/AssociativeArrayType.js +1 -1
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BooleanType.d.ts +1 -1
- package/dist/types/BooleanType.js +2 -1
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BscType.d.ts +2 -2
- package/dist/types/BscType.js +30 -9
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.d.ts +3 -0
- package/dist/types/BuiltInInterfaceAdder.js +37 -16
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.spec.js +7 -0
- package/dist/types/BuiltInInterfaceAdder.spec.js.map +1 -1
- package/dist/types/ClassType.d.ts +4 -3
- package/dist/types/ClassType.js +6 -3
- package/dist/types/ClassType.js.map +1 -1
- package/dist/types/ClassType.spec.js +5 -3
- package/dist/types/ClassType.spec.js.map +1 -1
- package/dist/types/ComponentType.d.ts +1 -1
- package/dist/types/ComponentType.js +3 -0
- package/dist/types/ComponentType.js.map +1 -1
- package/dist/types/DoubleType.js +3 -1
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/EnumType.d.ts +1 -1
- package/dist/types/EnumType.js +7 -2
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/FloatType.js +3 -1
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/InheritableType.d.ts +7 -4
- package/dist/types/InheritableType.js +67 -3
- package/dist/types/InheritableType.js.map +1 -1
- package/dist/types/IntegerType.js +3 -1
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +5 -4
- package/dist/types/InterfaceType.js +5 -12
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +23 -0
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/LongIntegerType.js +3 -1
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/NamespaceType.d.ts +2 -1
- package/dist/types/NamespaceType.js +3 -0
- package/dist/types/NamespaceType.js.map +1 -1
- package/dist/types/ObjectType.d.ts +1 -1
- package/dist/types/ReferenceType.js +40 -6
- package/dist/types/ReferenceType.js.map +1 -1
- package/dist/types/StringType.js +2 -2
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +6 -1
- package/dist/types/TypedFunctionType.js +46 -16
- package/dist/types/TypedFunctionType.js.map +1 -1
- package/dist/types/TypedFunctionType.spec.js +99 -0
- package/dist/types/TypedFunctionType.spec.js.map +1 -1
- package/dist/types/UnionType.js +8 -0
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/helper.spec.js +15 -0
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/types/helpers.d.ts +3 -0
- package/dist/types/helpers.js +33 -1
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +25 -9
- package/dist/util.js +165 -72
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +2 -2
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentType.js","sourceRoot":"","sources":["../../src/types/ComponentType.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAC7C,uDAAsF;AAItF,+CAA4C;AAC5C,mEAAgE;AAChE,uDAAoD;AACpD,uCAAkD;AAClD,kCAA2B;AAE3B,MAAa,aAAc,SAAQ,iCAAe;IAE9C,YAAmB,IAAY,EAAE,cAA8B;QAC3D,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QADb,SAAI,GAAJ,IAAI,CAAQ;QAKf,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;QAsDzC,0BAAqB,GAAG,KAAK,CAAC;QAzDlC,IAAI,CAAC,mBAAmB,GAAG,IAAI,yBAAW,CAAC,GAAG,IAAI,CAAC,IAAI,YAAY,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,mBAAmB,CAAA,EAAA,CAAC,CAAC;IAC1H,CAAC;IAID,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,UAA2B,CAAC;IAC5C,CAAC;IAEM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC;YAChC,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YAC/C,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAID,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpG,CAAC;IAEM,QAAQ;QACX,OAAO,cAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAID,qBAAqB;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC;aAClC;YACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAW,CAAC,GAAG,IAAI,CAAC,YAAY,mBAAmB,CAAC,CAAC;YACnF,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC,kBAAkB,CAAC;SAClC;IACL,CAAC;IAGD,oBAAoB;QAChB,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE;YACjC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;aAC1C;YACD,6CAAqB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;QACtC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAID,gBAAgB;QACZ,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,6CAAqB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACtC,CAAC;IAID,iBAAiB,CAAC,IAAY,EAAE,IAAqB,EAAE,IAAsB,EAAE,KAAqB;QAChG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,eAAe,CAAC,IAAY,EAAE,OAA6B;QACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;;
|
|
1
|
+
{"version":3,"file":"ComponentType.js","sourceRoot":"","sources":["../../src/types/ComponentType.ts"],"names":[],"mappings":"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"}
|
package/dist/types/DoubleType.js
CHANGED
|
@@ -19,7 +19,9 @@ class DoubleType extends BscType_1.BscType {
|
|
|
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, data)
|
|
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":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAA2G;AAE3G,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;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;IACM,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;;AAlCL,gCAoCC;AA3BiB,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;AA6BtD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC"}
|
package/dist/types/EnumType.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare class EnumType extends BscType {
|
|
|
16
16
|
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
17
17
|
toString(): string;
|
|
18
18
|
toTypeString(): string;
|
|
19
|
-
isEqual(targetType: BscType): boolean;
|
|
19
|
+
isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
20
20
|
get defaultMemberType(): EnumMemberType;
|
|
21
21
|
}
|
|
22
22
|
export declare class EnumMemberType extends BscType {
|
package/dist/types/EnumType.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnumMemberType = exports.EnumType = void 0;
|
|
4
|
+
const SymbolTable_1 = require("../SymbolTable");
|
|
4
5
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
6
|
const BscType_1 = require("./BscType");
|
|
6
7
|
const BscTypeKind_1 = require("./BscTypeKind");
|
|
@@ -30,8 +31,12 @@ class EnumType extends BscType_1.BscType {
|
|
|
30
31
|
toTypeString() {
|
|
31
32
|
return 'dynamic';
|
|
32
33
|
}
|
|
33
|
-
isEqual(targetType) {
|
|
34
|
-
return (0, reflection_1.isEnumType)(targetType) &&
|
|
34
|
+
isEqual(targetType, data) {
|
|
35
|
+
return (0, reflection_1.isEnumType)(targetType) &&
|
|
36
|
+
(targetType === null || targetType === void 0 ? void 0 : targetType.name.toLowerCase()) === this.name.toLowerCase() &&
|
|
37
|
+
this.underlyingType.isEqual(targetType.underlyingType, data) &&
|
|
38
|
+
this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data) &&
|
|
39
|
+
targetType.checkCompatibilityBasedOnMembers(this, SymbolTable_1.SymbolTypeFlag.runtime, data);
|
|
35
40
|
}
|
|
36
41
|
get defaultMemberType() {
|
|
37
42
|
return new EnumMemberType(this.name, 'default', this.underlyingType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;AAAA,uDAAmG;AAEnG,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAC5C,uCAAkD;AAElD,MAAa,QAAS,SAAQ,iBAAO;IACjC,YACW,IAAY;IACnB;;OAEG;IACI,iBAA0B,yBAAW,CAAC,QAAQ;QAErD,KAAK,CAAC,IAAI,CAAC,CAAC;QANL,SAAI,GAAJ,IAAI,CAAQ;QAIZ,mBAAc,GAAd,cAAc,CAAgC;QAKzC,SAAI,GAAG,yBAAW,CAAC,QAAQ,CAAC;IAF5C,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,CAAC,IAAA,6BAAgB,EAAC,UAAU,CAAC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAChG,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAChD,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,OAAO,CAAC,UAAmB;
|
|
1
|
+
{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":"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"}
|
package/dist/types/FloatType.js
CHANGED
|
@@ -19,7 +19,9 @@ class FloatType extends BscType_1.BscType {
|
|
|
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, data)
|
|
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":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAA2G;AAC3G,mEAAgE;AAGhE,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,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;IAEN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACpC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;;AApCL,8BAqCC;AA5BiB,kBAAQ,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AA8BpD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import type { GetTypeOptions } from '../interfaces';
|
|
1
|
+
import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
|
|
2
2
|
import { BscType } from './BscType';
|
|
3
|
+
import type { ReferenceType } from './ReferenceType';
|
|
3
4
|
export declare abstract class InheritableType extends BscType {
|
|
4
5
|
name: string;
|
|
5
|
-
readonly parentType?:
|
|
6
|
-
constructor(name: string, parentType?:
|
|
6
|
+
readonly parentType?: InheritableType | ReferenceType;
|
|
7
|
+
constructor(name: string, parentType?: InheritableType | ReferenceType);
|
|
7
8
|
getMemberType(memberName: string, options: GetTypeOptions): BscType;
|
|
8
9
|
toString(): string;
|
|
9
10
|
toTypeString(): string;
|
|
10
|
-
isResolvable(): boolean;
|
|
11
11
|
protected getAncestorTypeList(): InheritableType[];
|
|
12
12
|
/**
|
|
13
13
|
* Checks if other type is an ancestor of this
|
|
@@ -22,4 +22,7 @@ export declare abstract class InheritableType extends BscType {
|
|
|
22
22
|
* Useful for debugging
|
|
23
23
|
*/
|
|
24
24
|
private toJSString;
|
|
25
|
+
isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
26
|
+
protected isParentTypeEqual(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
27
|
+
protected isAncestorUnresolvedReferenceType(): boolean;
|
|
25
28
|
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InheritableType = void 0;
|
|
4
4
|
const reflection_1 = require("../astUtils/reflection");
|
|
5
|
+
const SymbolTable_1 = require("../SymbolTable");
|
|
5
6
|
const BscType_1 = require("./BscType");
|
|
6
7
|
class InheritableType extends BscType_1.BscType {
|
|
7
8
|
constructor(name, parentType) {
|
|
@@ -21,9 +22,6 @@ class InheritableType extends BscType_1.BscType {
|
|
|
21
22
|
toTypeString() {
|
|
22
23
|
return 'dynamic';
|
|
23
24
|
}
|
|
24
|
-
isResolvable() {
|
|
25
|
-
return this.parentType ? this.parentType.isResolvable() : true;
|
|
26
|
-
}
|
|
27
25
|
getAncestorTypeList() {
|
|
28
26
|
const ancestors = [];
|
|
29
27
|
let currentParentType = this.parentType;
|
|
@@ -83,6 +81,72 @@ class InheritableType extends BscType_1.BscType {
|
|
|
83
81
|
}
|
|
84
82
|
return result + '}';
|
|
85
83
|
}
|
|
84
|
+
isEqual(targetType, data = {}) {
|
|
85
|
+
var _a, _b, _c;
|
|
86
|
+
if (this === targetType) {
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
if ((0, reflection_1.isReferenceType)(targetType)) {
|
|
90
|
+
const lowerTargetName = ((_a = targetType.memberKey) !== null && _a !== void 0 ? _a : targetType.fullName).toLowerCase();
|
|
91
|
+
const myLowerName = this.name.toLowerCase();
|
|
92
|
+
if (myLowerName === lowerTargetName) {
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
95
|
+
//check non-namespaced version
|
|
96
|
+
if (myLowerName.split('.').reverse()[0] === lowerTargetName) {
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
if (!(0, reflection_1.isInheritableType)(targetType)) {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
if (!targetType) {
|
|
104
|
+
return false;
|
|
105
|
+
}
|
|
106
|
+
if (this === targetType) {
|
|
107
|
+
return true;
|
|
108
|
+
}
|
|
109
|
+
if (this.isAncestorUnresolvedReferenceType() || targetType.isAncestorUnresolvedReferenceType()) {
|
|
110
|
+
return this.name.toLowerCase() === ((_b = targetType.name) === null || _b === void 0 ? void 0 : _b.toLowerCase()) &&
|
|
111
|
+
this.isParentTypeEqual(targetType, data);
|
|
112
|
+
}
|
|
113
|
+
return this.name.toLowerCase() === ((_c = targetType.name) === null || _c === void 0 ? void 0 : _c.toLowerCase()) &&
|
|
114
|
+
this.isParentTypeEqual(targetType, data) &&
|
|
115
|
+
this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data) &&
|
|
116
|
+
targetType.checkCompatibilityBasedOnMembers(this, SymbolTable_1.SymbolTypeFlag.runtime, data);
|
|
117
|
+
}
|
|
118
|
+
isParentTypeEqual(targetType, data) {
|
|
119
|
+
var _a, _b;
|
|
120
|
+
if ((0, reflection_1.isInheritableType)(targetType)) {
|
|
121
|
+
const targetParent = targetType.parentType;
|
|
122
|
+
if (this.parentType && !targetParent) {
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
else if (!this.parentType && !targetParent) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
else if (!this.parentType && targetParent) {
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
if ((0, reflection_1.isReferenceType)(targetParent) || (0, reflection_1.isReferenceType)(this.parentType)) {
|
|
132
|
+
let thisParentName = (0, reflection_1.isReferenceType)(this.parentType) ? (_a = this.parentType.memberKey) !== null && _a !== void 0 ? _a : this.parentType.fullName : this.parentType.name;
|
|
133
|
+
let targetParentName = (0, reflection_1.isReferenceType)(targetParent) ? (_b = targetParent.memberKey) !== null && _b !== void 0 ? _b : targetParent.fullName : targetParent.name;
|
|
134
|
+
return thisParentName.toLowerCase() === targetParentName.toLowerCase();
|
|
135
|
+
}
|
|
136
|
+
return this.parentType.isEqual(targetParent, data);
|
|
137
|
+
}
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
isAncestorUnresolvedReferenceType() {
|
|
141
|
+
let p = this;
|
|
142
|
+
while (p) {
|
|
143
|
+
if ((0, reflection_1.isReferenceType)(p) && !p.isResolvable()) {
|
|
144
|
+
return true;
|
|
145
|
+
}
|
|
146
|
+
p = p.parentType;
|
|
147
|
+
}
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
86
150
|
}
|
|
87
151
|
exports.InheritableType = InheritableType;
|
|
88
152
|
//# sourceMappingURL=InheritableType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InheritableType.js","sourceRoot":"","sources":["../../src/types/InheritableType.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"InheritableType.js","sourceRoot":"","sources":["../../src/types/InheritableType.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,9 @@ class IntegerType extends BscType_1.BscType {
|
|
|
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, data)
|
|
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":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAA2G;AAC3G,mEAAgE;AAGhE,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,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,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC;;AAnCL,kCAoCC;AA3BiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AA6BxD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import type { TypeCompatibilityData } from '
|
|
1
|
+
import type { TypeCompatibilityData } from '../interfaces';
|
|
2
2
|
import type { BscType } from './BscType';
|
|
3
3
|
import { BscTypeKind } from './BscTypeKind';
|
|
4
4
|
import { InheritableType } from './InheritableType';
|
|
5
|
+
import type { ReferenceType } from './ReferenceType';
|
|
5
6
|
export declare class InterfaceType extends InheritableType {
|
|
6
7
|
name: string;
|
|
7
|
-
readonly superInterface?:
|
|
8
|
-
constructor(name: string, superInterface?:
|
|
8
|
+
readonly superInterface?: InterfaceType | ReferenceType;
|
|
9
|
+
constructor(name: string, superInterface?: InterfaceType | ReferenceType);
|
|
9
10
|
readonly kind = BscTypeKind.InterfaceType;
|
|
10
11
|
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
11
12
|
/**
|
|
12
13
|
* Is this the exact same interface as the target?
|
|
13
14
|
*/
|
|
14
|
-
isEqual(targetType: BscType): boolean;
|
|
15
|
+
isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
15
16
|
}
|
|
@@ -17,27 +17,20 @@ class InterfaceType extends InheritableType_1.InheritableType {
|
|
|
17
17
|
if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType) || (0, helpers_1.isUnionTypeCompatible)(this, targetType, data)) {
|
|
18
18
|
return true;
|
|
19
19
|
}
|
|
20
|
-
if ((0, reflection_1.
|
|
21
|
-
return
|
|
22
|
-
}
|
|
23
|
-
//TODO: We need to make sure that things don't get assigned to built-in types
|
|
24
|
-
if (this.isEqual(targetType)) {
|
|
25
|
-
return true;
|
|
20
|
+
if ((0, reflection_1.isInterfaceType)(targetType)) {
|
|
21
|
+
return this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data);
|
|
26
22
|
}
|
|
27
23
|
const ancestorTypes = this.getAncestorTypeList();
|
|
28
24
|
if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => ancestorType.isEqual(targetType))) {
|
|
29
25
|
return true;
|
|
30
26
|
}
|
|
31
|
-
|
|
32
|
-
return this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data);
|
|
33
|
-
}
|
|
34
|
-
return false;
|
|
27
|
+
return this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data);
|
|
35
28
|
}
|
|
36
29
|
/**
|
|
37
30
|
* Is this the exact same interface as the target?
|
|
38
31
|
*/
|
|
39
|
-
isEqual(targetType) {
|
|
40
|
-
return (0, reflection_1.isInterfaceType)(targetType) &&
|
|
32
|
+
isEqual(targetType, data) {
|
|
33
|
+
return (0, reflection_1.isInterfaceType)(targetType) && super.isEqual(targetType, data);
|
|
41
34
|
}
|
|
42
35
|
}
|
|
43
36
|
exports.InterfaceType = InterfaceType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,uDAAsF;AAEtF,+CAA4C;AAC5C,uDAAoD;AACpD,uCAAkD;AAGlD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAA8C;QAE9D,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAgC;QAKlD,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YACxG,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAC1F;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB,EAAE,IAA4B;QACrD,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;CACJ;AA9BD,sCA8BC"}
|
|
@@ -8,6 +8,10 @@ const InterfaceType_1 = require("./InterfaceType");
|
|
|
8
8
|
const ObjectType_1 = require("./ObjectType");
|
|
9
9
|
const StringType_1 = require("./StringType");
|
|
10
10
|
const SymbolTable_1 = require("../SymbolTable");
|
|
11
|
+
const AssociativeArrayType_1 = require("./AssociativeArrayType");
|
|
12
|
+
const ArrayType_1 = require("./ArrayType");
|
|
13
|
+
const BooleanType_1 = require("./BooleanType");
|
|
14
|
+
const DiagnosticMessages_1 = require("../DiagnosticMessages");
|
|
11
15
|
describe('InterfaceType', () => {
|
|
12
16
|
describe('toJSString', () => {
|
|
13
17
|
it('returns empty curly braces when no members', () => {
|
|
@@ -33,6 +37,15 @@ describe('InterfaceType', () => {
|
|
|
33
37
|
name: new StringType_1.StringType()
|
|
34
38
|
});
|
|
35
39
|
});
|
|
40
|
+
it('roku component types are compatible with BscTypes', () => {
|
|
41
|
+
// TODO: Fix String type compatibility - reason is because of overloaded members (Mid(), StartsWith(), etc)
|
|
42
|
+
// SEE: https://github.com/rokucommunity/brighterscript/issues/926
|
|
43
|
+
// expectTypeCrossCompatible(new StringType(), new InterfaceType('roString'));
|
|
44
|
+
expectTypeCrossCompatible(new ArrayType_1.ArrayType(), new InterfaceType_1.InterfaceType('roArray'));
|
|
45
|
+
expectTypeCrossCompatible(new AssociativeArrayType_1.AssociativeArrayType(), new InterfaceType_1.InterfaceType('roAssociativeArray'));
|
|
46
|
+
expectTypeCrossCompatible(new BooleanType_1.BooleanType(), new InterfaceType_1.InterfaceType('roBoolean'));
|
|
47
|
+
expectTypeCrossCompatible(new IntegerType_1.IntegerType(), new InterfaceType_1.InterfaceType('roInt'));
|
|
48
|
+
});
|
|
36
49
|
});
|
|
37
50
|
describe('equals', () => {
|
|
38
51
|
it('matches same objects', () => {
|
|
@@ -186,4 +199,14 @@ function expectNotCompatible(sourceMembers, targetMembers) {
|
|
|
186
199
|
sinon_1.assert.fail(`expected type ${targetIface.toJSString()} to not be assignable to type ${sourceIface.toJSString()}`);
|
|
187
200
|
}
|
|
188
201
|
}
|
|
202
|
+
function expectTypeCrossCompatible(source, target) {
|
|
203
|
+
let data = {};
|
|
204
|
+
if (!source.isTypeCompatible(target, data)) {
|
|
205
|
+
sinon_1.assert.fail((0, DiagnosticMessages_1.typeCompatibilityMessage)(target.toString(), source.toString(), data));
|
|
206
|
+
}
|
|
207
|
+
data = {};
|
|
208
|
+
if (!target.isTypeCompatible(source, data)) {
|
|
209
|
+
sinon_1.assert.fail((0, DiagnosticMessages_1.typeCompatibilityMessage)(source.toString(), target.toString(), data));
|
|
210
|
+
}
|
|
211
|
+
}
|
|
189
212
|
//# sourceMappingURL=InterfaceType.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceType.spec.js","sourceRoot":"","sources":["../../src/types/InterfaceType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,iCAA+B;AAE/B,+CAA4C;AAC5C,+CAA4C;AAC5C,mDAAgD;AAChD,6CAA0C;AAC1C,6CAA0C;AAE1C,gDAAgD;
|
|
1
|
+
{"version":3,"file":"InterfaceType.spec.js","sourceRoot":"","sources":["../../src/types/InterfaceType.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,9 @@ class LongIntegerType extends BscType_1.BscType {
|
|
|
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, data)
|
|
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,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
|
export declare class NamespaceType extends BscType {
|
|
@@ -6,6 +6,7 @@ export declare class NamespaceType extends BscType {
|
|
|
6
6
|
constructor(name: string);
|
|
7
7
|
readonly kind = BscTypeKind.NamespaceType;
|
|
8
8
|
toString(): string;
|
|
9
|
+
isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
|
|
9
10
|
getMemberType(name: string, options: GetTypeOptions): BscType;
|
|
10
11
|
isEqual(targetType: BscType): boolean;
|
|
11
12
|
}
|
|
@@ -13,6 +13,9 @@ class NamespaceType extends BscType_1.BscType {
|
|
|
13
13
|
toString() {
|
|
14
14
|
return this.name;
|
|
15
15
|
}
|
|
16
|
+
isTypeCompatible(targetType, data) {
|
|
17
|
+
return this.isEqual(targetType);
|
|
18
|
+
}
|
|
16
19
|
getMemberType(name, options) {
|
|
17
20
|
const fullName = this.toString() + '.' + name;
|
|
18
21
|
return super.getMemberType(name, Object.assign(Object.assign({}, options), { fullName: fullName, tableProvider: () => this.memberTable }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamespaceType.js","sourceRoot":"","sources":["../../src/types/NamespaceType.ts"],"names":[],"mappings":";;;AAAA,uDAAyD;AAEzD,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,aAAc,SAAQ,iBAAO;IAEtC,YAAmB,IAAY;QAC3B,KAAK,CAAC,IAAI,CAAC,CAAC;QADG,SAAI,GAAJ,IAAI,CAAQ;QAIf,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;
|
|
1
|
+
{"version":3,"file":"NamespaceType.js","sourceRoot":"","sources":["../../src/types/NamespaceType.ts"],"names":[],"mappings":";;;AAAA,uDAAyD;AAEzD,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,aAAc,SAAQ,iBAAO;IAEtC,YAAmB,IAAY;QAC3B,KAAK,CAAC,IAAI,CAAC,CAAC;QADG,SAAI,GAAJ,IAAI,CAAQ;QAIf,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAGD,aAAa,CAAC,IAAY,EAAE,OAAuB;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC;QAC9C,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,IAAG,CAAC;IAChH,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;IACxE,CAAC;CAEJ;AA1BD,sCA0BC"}
|
|
@@ -31,6 +31,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
31
31
|
this.callFuncMemberTypeReferences = new Map();
|
|
32
32
|
this.futureMemberTableProvider = () => {
|
|
33
33
|
return {
|
|
34
|
+
name: `FutureMemberTableProvider: '${this.__identifier}'`,
|
|
34
35
|
getSymbolType: (innerName, innerOptions) => {
|
|
35
36
|
const resolvedType = this.resolve();
|
|
36
37
|
if (resolvedType) {
|
|
@@ -47,6 +48,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
47
48
|
};
|
|
48
49
|
this.futureCallFuncMemberTableProvider = () => {
|
|
49
50
|
return {
|
|
51
|
+
name: `FutureCallFuncMemberTableProvider: '${this.__identifier}'`,
|
|
50
52
|
getSymbolType: (innerName, innerOptions) => {
|
|
51
53
|
const resolvedType = this.resolve();
|
|
52
54
|
if ((0, reflection_1.isComponentType)(resolvedType)) {
|
|
@@ -77,9 +79,10 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
77
79
|
}
|
|
78
80
|
if (propName === 'isResolvable') {
|
|
79
81
|
return () => {
|
|
82
|
+
var _a, _b;
|
|
80
83
|
let resultSoFar = this.resolve();
|
|
81
84
|
while (resultSoFar && (0, reflection_1.isReferenceType)(resultSoFar)) {
|
|
82
|
-
resultSoFar = resultSoFar.getTarget();
|
|
85
|
+
resultSoFar = (_b = (_a = resultSoFar).getTarget) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
83
86
|
}
|
|
84
87
|
return !!resultSoFar;
|
|
85
88
|
};
|
|
@@ -95,16 +98,45 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
95
98
|
if (propName === 'isEqual') {
|
|
96
99
|
//Need to be able to check equality without resolution, because resolution need to check equality
|
|
97
100
|
//To see if you need to make a UnionType
|
|
98
|
-
return (targetType) => {
|
|
101
|
+
return (targetType, data) => {
|
|
102
|
+
if (!targetType) {
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
|
+
const resolvedType = this.resolve();
|
|
106
|
+
let equal = false;
|
|
107
|
+
if (resolvedType && !(0, reflection_1.isReferenceType)(resolvedType)) {
|
|
108
|
+
equal = resolvedType.isEqual(targetType, data);
|
|
109
|
+
}
|
|
110
|
+
else if ((0, reflection_1.isReferenceType)(targetType)) {
|
|
111
|
+
equal = this.fullName.toLowerCase() === targetType.fullName.toLowerCase() &&
|
|
112
|
+
(this.tableProvider === targetType.tableProvider ||
|
|
113
|
+
this.tableProvider().name === targetType.tableProvider().name);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
equal = targetType.isEqual(this, data);
|
|
117
|
+
}
|
|
118
|
+
return equal;
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
if (propName === 'isTypeCompatible') {
|
|
122
|
+
//Need to be able to check equality without resolution, because resolution need to check equality
|
|
123
|
+
//To see if you need to make a UnionType
|
|
124
|
+
return (targetType, data) => {
|
|
125
|
+
if (!targetType) {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
if ((0, reflection_1.isDynamicType)(targetType)) {
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
99
131
|
const resolvedType = this.resolve();
|
|
100
132
|
if (resolvedType && !(0, reflection_1.isReferenceType)(resolvedType)) {
|
|
101
|
-
return resolvedType.
|
|
133
|
+
return resolvedType.isTypeCompatible(targetType, data);
|
|
102
134
|
}
|
|
103
135
|
else if ((0, reflection_1.isReferenceType)(targetType)) {
|
|
104
136
|
return this.fullName.toLowerCase() === targetType.fullName.toLowerCase() &&
|
|
105
137
|
this.tableProvider === targetType.tableProvider;
|
|
106
138
|
}
|
|
107
|
-
return targetType.
|
|
139
|
+
return targetType.isTypeCompatible(this, data);
|
|
108
140
|
};
|
|
109
141
|
}
|
|
110
142
|
//There may be some need to specifically get members on ReferenceType in the future
|
|
@@ -231,12 +263,13 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
231
263
|
* Resolves the type based on the original name and the table provider
|
|
232
264
|
*/
|
|
233
265
|
resolve() {
|
|
266
|
+
var _a, _b;
|
|
234
267
|
const symbolTable = this.tableProvider();
|
|
235
268
|
if (!symbolTable) {
|
|
236
269
|
return;
|
|
237
270
|
}
|
|
238
271
|
// Look for circular references
|
|
239
|
-
let resolvedType = symbolTable.getSymbolType(this.memberKey, { flags: this.flags });
|
|
272
|
+
let resolvedType = symbolTable.getSymbolType(this.memberKey, { flags: this.flags, onlyCacheResolvedTypes: true });
|
|
240
273
|
if (!resolvedType) {
|
|
241
274
|
// could not find this member
|
|
242
275
|
return;
|
|
@@ -254,7 +287,7 @@ class ReferenceType extends BscType_1.BscType {
|
|
|
254
287
|
return;
|
|
255
288
|
}
|
|
256
289
|
this.referenceChain.add(resolvedType);
|
|
257
|
-
resolvedType = resolvedType.getTarget();
|
|
290
|
+
resolvedType = (_b = (_a = resolvedType).getTarget) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
258
291
|
}
|
|
259
292
|
this.tableProvider().setCachedType(this.memberKey, { type: resolvedType }, { flags: this.flags });
|
|
260
293
|
}
|
|
@@ -304,6 +337,7 @@ class TypePropertyReferenceType extends BscType_1.BscType {
|
|
|
304
337
|
const fullMemberName = this.outerType.toString() + '.' + memberName;
|
|
305
338
|
return new ReferenceType(memberName, fullMemberName, options.flags, () => {
|
|
306
339
|
return {
|
|
340
|
+
name: `TypePropertyReferenceType : '${fullMemberName}'`,
|
|
307
341
|
getSymbolType: (innerName, innerOptions) => {
|
|
308
342
|
var _a, _b;
|
|
309
343
|
return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.getMemberType(innerName, innerOptions);
|