brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.28
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 +82 -5
- package/README.md +1 -1
- package/dist/AstValidationSegmenter.d.ts +1 -1
- package/dist/AstValidationSegmenter.js +4 -5
- package/dist/AstValidationSegmenter.js.map +1 -1
- package/dist/DiagnosticFilterer.d.ts +7 -4
- package/dist/DiagnosticFilterer.js +67 -37
- package/dist/DiagnosticFilterer.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +1 -3
- package/dist/DiagnosticMessages.js +5 -8
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/PluginInterface.js +1 -1
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +1 -1
- package/dist/Program.js +34 -31
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +7 -34
- package/dist/Scope.js +45 -305
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +1 -8
- package/dist/SymbolTable.js +1 -10
- package/dist/SymbolTable.js.map +1 -1
- package/dist/SymbolTypeFlag.d.ts +8 -0
- package/dist/SymbolTypeFlag.js +13 -0
- package/dist/SymbolTypeFlag.js.map +1 -0
- package/dist/XmlScope.d.ts +0 -8
- package/dist/XmlScope.js +6 -84
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/CachedLookups.d.ts +1 -2
- package/dist/astUtils/CachedLookups.js +4 -19
- package/dist/astUtils/CachedLookups.js.map +1 -1
- package/dist/astUtils/creators.d.ts +1 -0
- package/dist/astUtils/creators.js +48 -8
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/creators.spec.js +0 -10
- package/dist/astUtils/creators.spec.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +3 -2
- package/dist/astUtils/reflection.js +11 -7
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +11 -16
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +1 -2
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +1 -5
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +2 -1
- package/dist/bscPlugin/BscPlugin.js +4 -0
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/SignatureHelpUtil.js +4 -3
- package/dist/bscPlugin/SignatureHelpUtil.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +1 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.js +46 -29
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js +39 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +30 -10
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +125 -7
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/references/ReferencesProvider.d.ts +12 -0
- package/dist/bscPlugin/references/ReferencesProvider.js +56 -0
- package/dist/bscPlugin/references/ReferencesProvider.js.map +1 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.d.ts +1 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.js +51 -0
- package/dist/bscPlugin/references/ReferencesProvider.spec.js.map +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +2 -3
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +25 -31
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +34 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +435 -27
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +178 -10
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -1
- package/dist/files/BrsFile.Class.spec.js +15 -7
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +14 -5
- package/dist/files/BrsFile.js +83 -150
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +429 -162
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +2 -3
- package/dist/files/XmlFile.js +1 -3
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +117 -85
- package/dist/interfaces.js +9 -9
- package/dist/interfaces.js.map +1 -1
- package/dist/lexer/Lexer.d.ts +9 -3
- package/dist/lexer/Lexer.js +36 -15
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +76 -38
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/Token.js +1 -1
- package/dist/lexer/Token.js.map +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 +1 -2
- package/dist/parser/AstNode.js +0 -1
- package/dist/parser/AstNode.js.map +1 -1
- package/dist/parser/BrsTranspileState.d.ts +1 -1
- package/dist/parser/Expression.d.ts +153 -135
- package/dist/parser/Expression.js +204 -114
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +15 -16
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +8 -4
- package/dist/parser/Parser.js +108 -149
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +48 -72
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.js +49 -35
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +36 -24
- package/dist/parser/SGTypes.js +31 -60
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/Statement.d.ts +214 -207
- package/dist/parser/Statement.js +248 -169
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/Statement.spec.js +0 -13
- package/dist/parser/Statement.spec.js.map +1 -1
- package/dist/parser/TranspileState.d.ts +17 -8
- package/dist/parser/TranspileState.js +64 -6
- package/dist/parser/TranspileState.js.map +1 -1
- package/dist/parser/tests/Parser.spec.d.ts +1 -1
- package/dist/parser/tests/Parser.spec.js +1 -2
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +1 -3
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +44 -0
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +6 -6
- package/dist/parser/tests/expression/TernaryExpression.spec.js +47 -0
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TypeExpression.spec.js +8 -9
- package/dist/parser/tests/expression/TypeExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +2 -2
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +8 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +25 -5
- package/dist/parser/tests/statement/Misc.spec.js.map +1 -1
- package/dist/parser/tests/statement/TryCatch.spec.js +9 -2
- package/dist/parser/tests/statement/TryCatch.spec.js.map +1 -1
- package/dist/preprocessor/Chunk.js +1 -2
- package/dist/preprocessor/Chunk.js.map +1 -1
- package/dist/preprocessor/PreprocessorParser.js +2 -1
- package/dist/preprocessor/PreprocessorParser.js.map +1 -1
- package/dist/roku-types/data.json +70 -52
- package/dist/roku-types/index.d.ts +43 -21
- package/dist/types/ArrayType.js +1 -2
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +7 -8
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.d.ts +3 -0
- package/dist/types/AssociativeArrayType.js +10 -2
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/BscType.js +3 -3
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.js +7 -8
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.spec.js +31 -32
- package/dist/types/BuiltInInterfaceAdder.spec.js.map +1 -1
- package/dist/types/ClassType.spec.js +10 -11
- package/dist/types/ClassType.spec.js.map +1 -1
- package/dist/types/ComponentType.d.ts +2 -1
- package/dist/types/ComponentType.js.map +1 -1
- package/dist/types/EnumType.js +2 -3
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/InheritableType.js +3 -4
- package/dist/types/InheritableType.js.map +1 -1
- package/dist/types/InterfaceType.js +2 -3
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +3 -4
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/ObjectType.js +1 -2
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +1 -1
- package/dist/types/ReferenceType.spec.js +21 -22
- package/dist/types/ReferenceType.spec.js.map +1 -1
- package/dist/types/UnionType.js +3 -3
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/UnionType.spec.js +37 -38
- package/dist/types/UnionType.spec.js.map +1 -1
- package/dist/types/helper.spec.js +4 -5
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/util.d.ts +21 -11
- package/dist/util.js +116 -37
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +0 -9
- package/dist/validators/ClassValidator.js +3 -46
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +6 -3
package/dist/SymbolTable.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SymbolTable.js","sourceRoot":"","sources":["../src/SymbolTable.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAGhD,6CAAgD;AAChD,sDAA4E;
|
|
1
|
+
{"version":3,"file":"SymbolTable.js","sourceRoot":"","sources":["../src/SymbolTable.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAGhD,6CAAgD;AAChD,sDAA4E;AAG5E;;;GAGG;AACH,MAAa,WAAW;IACpB,YACW,IAAY,EACnB,cAAoC;QAD7B,SAAI,GAAJ,IAAI,CAAQ;QASvB;;;WAGG;QACK,cAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;QAE3C,oBAAe,GAAG,EAA2B,CAAC;QAyC9C,aAAQ,GAAG,IAAI,GAAG,EAAe,CAAC;QArDtC,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,cAAc,EAAE;YAChB,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;SAC3C;IACL,CAAC;IAyBD;;OAEG;IACI,kBAAkB,CAAC,QAA6B;QACnD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7B,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACI,iBAAiB;QACpB,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAW,MAAM;;QACb,OAAO,MAAA,MAAA,IAAI,CAAC,eAAe,EAAC,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,kDAAI,CAAC;IACrE,CAAC;IAID;;OAEG;IACI,UAAU,CAAC,OAAoB;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,GAAG,EAAE;YACR,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,OAAoB;QACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAGM,YAAY;QACf,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,IAAY,EAAE,QAAwB;QAC5C,IAAI,YAAY,GAAgB,IAAI,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAE,CAAC;QAChC,IAAI,MAAmB,CAAC;QACxB,GAAG;YACC,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC5C,sCAAsC;gBACtC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,EAAE;oBAChD,OAAO,IAAI,CAAC;iBACf;aACJ;YAED,oCAAoC;YACpC,KAAK,IAAI,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE;gBACvC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;oBACvC,sCAAsC;oBACtC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,EAAE;wBAChD,OAAO,IAAI,CAAC;qBACf;iBACJ;aACJ;YACD,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;SACtC,QAAQ,YAAY,EAAE;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,IAAY,EAAE,QAAwB;QAC5C,IAAI,YAAY,GAAgB,IAAI,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAE,CAAC;QAChC,IAAI,MAAmB,CAAC;QACxB,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,MAAM,eAAe,GAAG,CAAC,MAAiB,EAAE,EAAE,CAAC,iCAAM,MAAM,KAAE,IAAI,kCAAO,MAAM,CAAC,IAAI,KAAE,gBAAgB,EAAE,gBAAgB,OAAK,CAAC;QAC7H,GAAG;YACC,wBAAwB;YACxB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC5C,sCAAsC;gBACtC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;gBAC1D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnB,OAAO,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;iBACtC;aACJ;YACD,oCAAoC;YACpC,KAAK,IAAI,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE;gBACvC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBAC1C,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,EAAE;oBACpB,OAAO,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;iBACtC;aACJ;YACD,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,gBAAgB,GAAG,IAAI,CAAC;SAC3B,QAAQ,YAAY,EAAE;IAC3B,CAAC;IAED;;OAEG;IACH,SAAS,CAAC,IAAY,EAAE,IAAqB,EAAE,IAAa,EAAE,QAAwB;;QAClF,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;SAC/B;QACD,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,IAAI,CAAC;YAC1B,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,QAAQ;SAClB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,IAAY;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,OAA6B;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACvG,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAA6B;;QACrD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnG,IAAI,YAAY,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC;QACpC,IAAI,UAAU,GAAG,CAAC,YAAY,CAAC;QAC/B,MAAM,uBAAuB,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,CAAC;QACjE,IAAI,IAAI,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,KAAI,EAAqB,CAAC;QACrD,IAAI,UAAU,GAAmB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC;QACnD,IAAI,CAAC,YAAY,IAAI,uBAAuB,EAAE;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACvD,IAAI,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;YAC9B,UAAU,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,CAAC,EAAE,KAAK,CAAC;YACpC,YAAY,GAAG,IAAA,uBAAa,EAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;SACvG;QACD,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE;YAC5D,YAAY,GAAG,WAAW,CAAC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;SACjH;QACD,MAAM,uBAAuB,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,CAAC;QACjE,MAAM,mBAAmB,GAAG,uBAAuB,IAAI,CAAC,IAAA,+BAAkB,EAAC,YAAY,CAAC,CAAC;QACzF,UAAU,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9F,IAAI,UAAU,IAAI,mBAAmB,EAAE;YACnC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;SAC5F;QACD,MAAA,OAAO,CAAC,IAAI,oCAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;QACpB,IAAI,OAAO,CAAC,IAAI,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAC;YAC/C,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,OAAO,CAAC,KAAK,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB,CAAC;SAC1D;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,WAAwB;QACrC,KAAK,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,WAAW,CAAC,SAAS,EAAE;YACzC,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE;gBACxB,IAAI,CAAC,SAAS,CACV,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,KAAK,CACf,CAAC;aACL;SACJ;IACL,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,QAAwB;QACzC,IAAI,OAAO,GAAgB,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,sCAAsC;QACtC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;QAC5D,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,QAAwB;QACzC,IAAI,OAAO,GAAgB,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACjE,oCAAoC;QACpC,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC/B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC7D;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;SACjE;QACD,sCAAsC;QACtC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;QAE5D,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;QAChD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAClD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;gBAClC,UAAU,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;aAC3C;SACJ;QACD,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACpC,CAAC;IAEO,cAAc;;QAClB,IAAI,CAAC,SAAS,GAAG;YACb,SAAS;YACT,IAAI,GAAG,EAA0B;YACjC,IAAI,GAAG,EAA0B;YACjC,IAAI,GAAG,EAA0B,CAAC,qDAAqD;SAC1F,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,MAAA,WAAW,CAAC,aAAa,0CAAE,QAAQ,EAAE,CAAC;IAC5D,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,IAAI,WAAW,CAAC,aAAa,EAAE;YAC3B,IAAI,CAAC,CAAA,MAAA,WAAW,CAAC,aAAa,0CAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA,EAAE;gBACzD,sBAAsB;gBACtB,IAAI,CAAC,cAAc,EAAE,CAAC;gBACtB,OAAO;aACV;SACJ;aAAM;YACH,oBAAoB;YACpB,OAAO;SACV;QACD,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,0CAAE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,UAA0B,EAAE,OAAuB;;QAC3E,IAAI,CAAC,UAAU,EAAE;YACb,OAAO;SACV;QACD,IAAI,WAAW,CAAC,aAAa,EAAE;YAC3B,IAAI,CAAC,CAAA,MAAA,WAAW,CAAC,aAAa,0CAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA,EAAE;gBACzD,gDAAgD;gBAChD,IAAI,CAAC,cAAc,EAAE,CAAC;aACzB;SACJ;aAAM;YACH,oBAAoB;YACpB,OAAO;SACV;QACD,IAAI,mBAAmB,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,0CAAE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACjF,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,4BAAe,EAAC,mBAAmB,CAAC,EAAE;YAC3E,gEAAgE;YAChE,OAAO;SACV;QACD,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,0CAAE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IAED;;OAEG;IACK,MAAM;;QACV,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7D,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,EAAE;YAC7B,OAAO,EAAE;gBACL,GAAG,IAAI,GAAG,CACN,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE;oBACjD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;;wBACnB,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,MAAC,CAAC,CAAC,IAAY,0CAAE,YAAY,EAAE,CAAC;oBACjE,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CACnB;aACJ;SACJ,CAAC;IACN,CAAC;;AA/UL,kCAgVC;AAzTG;;;;;GAKG;AACI,yBAAa,GAAG,IAAI,6BAAa,EAAE,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SymbolTypeFlag = void 0;
|
|
4
|
+
var SymbolTypeFlag;
|
|
5
|
+
(function (SymbolTypeFlag) {
|
|
6
|
+
SymbolTypeFlag[SymbolTypeFlag["runtime"] = 1] = "runtime";
|
|
7
|
+
SymbolTypeFlag[SymbolTypeFlag["typetime"] = 2] = "typetime";
|
|
8
|
+
SymbolTypeFlag[SymbolTypeFlag["optional"] = 4] = "optional";
|
|
9
|
+
SymbolTypeFlag[SymbolTypeFlag["private"] = 8] = "private";
|
|
10
|
+
SymbolTypeFlag[SymbolTypeFlag["protected"] = 16] = "protected";
|
|
11
|
+
SymbolTypeFlag[SymbolTypeFlag["postTranspile"] = 32] = "postTranspile";
|
|
12
|
+
})(SymbolTypeFlag = exports.SymbolTypeFlag || (exports.SymbolTypeFlag = {}));
|
|
13
|
+
//# sourceMappingURL=SymbolTypeFlag.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SymbolTypeFlag.js","sourceRoot":"","sources":["../src/SymbolTypeFlag.ts"],"names":[],"mappings":";;;AACA,IAAkB,cAOjB;AAPD,WAAkB,cAAc;IAC5B,yDAAW,CAAA;IACX,2DAAY,CAAA;IACZ,2DAAY,CAAA;IACZ,yDAAW,CAAA;IACX,8DAAc,CAAA;IACd,sEAAkB,CAAA;AACtB,CAAC,EAPiB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAO/B"}
|
package/dist/XmlScope.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Scope } from './Scope';
|
|
2
2
|
import type { XmlFile } from './files/XmlFile';
|
|
3
|
-
import { type CallableContainerMap } from './interfaces';
|
|
4
3
|
import type { Program } from './Program';
|
|
5
4
|
import type { BscFile } from './files/BscFile';
|
|
6
5
|
import { ComponentType } from './types/ComponentType';
|
|
@@ -15,13 +14,6 @@ export declare class XmlScope extends Scope {
|
|
|
15
14
|
*/
|
|
16
15
|
getParentScope(): Scope;
|
|
17
16
|
getComponentType(): ComponentType;
|
|
18
|
-
protected _validate(callableContainerMap: CallableContainerMap): void;
|
|
19
|
-
private diagnosticValidateInterface;
|
|
20
|
-
private diagnosticMissingAttribute;
|
|
21
|
-
/**
|
|
22
|
-
* Detect when a child has imported a script that an ancestor also imported
|
|
23
|
-
*/
|
|
24
|
-
private diagnosticDetectDuplicateAncestorScriptImports;
|
|
25
17
|
getAllFiles(): BscFile[];
|
|
26
18
|
/**
|
|
27
19
|
* Get the list of files referenced by this scope that are actually loaded in the program.
|
package/dist/XmlScope.js
CHANGED
|
@@ -2,12 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.XmlScope = void 0;
|
|
4
4
|
const Scope_1 = require("./Scope");
|
|
5
|
-
const DiagnosticMessages_1 = require("./DiagnosticMessages");
|
|
6
|
-
const interfaces_1 = require("./interfaces");
|
|
7
|
-
const SGTypes_1 = require("./parser/SGTypes");
|
|
8
5
|
const util_1 = require("./util");
|
|
9
|
-
const
|
|
10
|
-
const types_1 = require("./types");
|
|
6
|
+
const DynamicType_1 = require("./types/DynamicType");
|
|
11
7
|
const ComponentType_1 = require("./types/ComponentType");
|
|
12
8
|
class XmlScope extends Scope_1.Scope {
|
|
13
9
|
constructor(xmlFile, program) {
|
|
@@ -45,7 +41,7 @@ class XmlScope extends Scope_1.Scope {
|
|
|
45
41
|
return;
|
|
46
42
|
}
|
|
47
43
|
const parentComponentType = (componentElement === null || componentElement === void 0 ? void 0 : componentElement.extends)
|
|
48
|
-
? this.symbolTable.getSymbolType(util_1.default.getSgNodeTypeName(componentElement === null || componentElement === void 0 ? void 0 : componentElement.extends), { flags:
|
|
44
|
+
? this.symbolTable.getSymbolType(util_1.default.getSgNodeTypeName(componentElement === null || componentElement === void 0 ? void 0 : componentElement.extends), { flags: 2 /* SymbolTypeFlag.typetime */, fullName: componentElement === null || componentElement === void 0 ? void 0 : componentElement.extends, tableProvider: () => this.symbolTable })
|
|
49
45
|
: undefined;
|
|
50
46
|
const result = new ComponentType_1.ComponentType(componentElement.name, parentComponentType);
|
|
51
47
|
result.addBuiltInInterfaces();
|
|
@@ -56,98 +52,24 @@ class XmlScope extends Scope_1.Scope {
|
|
|
56
52
|
//add functions
|
|
57
53
|
for (const func of (_a = iface.functions) !== null && _a !== void 0 ? _a : []) {
|
|
58
54
|
if (func.name) {
|
|
59
|
-
const componentFuncType = this.symbolTable.getSymbolType(func.name, { flags:
|
|
55
|
+
const componentFuncType = this.symbolTable.getSymbolType(func.name, { flags: 1 /* SymbolTypeFlag.runtime */, fullName: func.name, tableProvider: () => this.symbolTable });
|
|
60
56
|
// TODO: Get correct function type, and fully resolve all param and return types of function
|
|
61
57
|
// eg.:
|
|
62
58
|
// callFuncType = new CallFuncType(componentFuncType) // does something to fully resolve & store all associated types
|
|
63
59
|
//TODO: add documentation - need to get previous comment from XML
|
|
64
|
-
result.addCallFuncMember(func.name, {}, componentFuncType,
|
|
60
|
+
result.addCallFuncMember(func.name, {}, componentFuncType, 1 /* SymbolTypeFlag.runtime */);
|
|
65
61
|
}
|
|
66
62
|
}
|
|
67
63
|
//add fields
|
|
68
64
|
for (const field of (_b = iface.fields) !== null && _b !== void 0 ? _b : []) {
|
|
69
65
|
if (field.id) {
|
|
70
|
-
const actualFieldType = field.type ? util_1.default.getNodeFieldType(field.type, this.symbolTable) :
|
|
66
|
+
const actualFieldType = field.type ? util_1.default.getNodeFieldType(field.type, this.symbolTable) : DynamicType_1.DynamicType.instance;
|
|
71
67
|
//TODO: add documentation - need to get previous comment from XML
|
|
72
|
-
result.addMember(field.id, {}, actualFieldType,
|
|
68
|
+
result.addMember(field.id, {}, actualFieldType, 1 /* SymbolTypeFlag.runtime */);
|
|
73
69
|
}
|
|
74
70
|
}
|
|
75
71
|
return result;
|
|
76
72
|
}
|
|
77
|
-
_validate(callableContainerMap) {
|
|
78
|
-
//validate brs files
|
|
79
|
-
super._validate(callableContainerMap);
|
|
80
|
-
//detect when the child imports a script that its ancestor also imports
|
|
81
|
-
this.diagnosticDetectDuplicateAncestorScriptImports();
|
|
82
|
-
//validate component interface
|
|
83
|
-
this.diagnosticValidateInterface(callableContainerMap);
|
|
84
|
-
}
|
|
85
|
-
diagnosticValidateInterface(callableContainerMap) {
|
|
86
|
-
var _a, _b, _c, _d, _e;
|
|
87
|
-
if (!((_b = (_a = this.xmlFile.parser.ast) === null || _a === void 0 ? void 0 : _a.componentElement) === null || _b === void 0 ? void 0 : _b.interfaceElement)) {
|
|
88
|
-
return;
|
|
89
|
-
}
|
|
90
|
-
const iface = this.xmlFile.parser.ast.componentElement.interfaceElement;
|
|
91
|
-
//validate functions
|
|
92
|
-
for (const func of iface.functions) {
|
|
93
|
-
const name = func.name;
|
|
94
|
-
if (!name) {
|
|
95
|
-
this.diagnosticMissingAttribute(func, 'name');
|
|
96
|
-
}
|
|
97
|
-
else if (!callableContainerMap.has(name.toLowerCase())) {
|
|
98
|
-
this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(name)), { range: (_c = func.getAttribute('name')) === null || _c === void 0 ? void 0 : _c.tokens.value.range, file: this.xmlFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
//validate fields
|
|
102
|
-
for (const field of iface.fields) {
|
|
103
|
-
const { id, type, onChange } = field;
|
|
104
|
-
if (!id) {
|
|
105
|
-
this.diagnosticMissingAttribute(field, 'id');
|
|
106
|
-
}
|
|
107
|
-
if (!type) {
|
|
108
|
-
if (!field.alias) {
|
|
109
|
-
this.diagnosticMissingAttribute(field, 'type');
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
else if (!SGTypes_1.SGFieldTypes.includes(type.toLowerCase())) {
|
|
113
|
-
this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlInvalidFieldType(type)), { range: (_d = field.getAttribute('type')) === null || _d === void 0 ? void 0 : _d.tokens.value.range, file: this.xmlFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
|
|
114
|
-
}
|
|
115
|
-
if (onChange) {
|
|
116
|
-
if (!callableContainerMap.has(onChange.toLowerCase())) {
|
|
117
|
-
this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlFunctionNotFound(onChange)), { range: (_e = field.getAttribute('onchange')) === null || _e === void 0 ? void 0 : _e.tokens.value.range, file: this.xmlFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
diagnosticMissingAttribute(tag, name) {
|
|
123
|
-
this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.xmlTagMissingAttribute(tag.tokens.startTagName.text, name)), { range: tag.tokens.startTagName.range, file: this.xmlFile, origin: interfaces_1.DiagnosticOrigin.Scope }));
|
|
124
|
-
}
|
|
125
|
-
/**
|
|
126
|
-
* Detect when a child has imported a script that an ancestor also imported
|
|
127
|
-
*/
|
|
128
|
-
diagnosticDetectDuplicateAncestorScriptImports() {
|
|
129
|
-
var _a, _b;
|
|
130
|
-
if (this.xmlFile.parentComponent) {
|
|
131
|
-
//build a lookup of pkg paths -> FileReference so we can more easily look up collisions
|
|
132
|
-
let parentScriptImports = this.xmlFile.getAncestorScriptTagImports();
|
|
133
|
-
let lookup = {};
|
|
134
|
-
for (let parentScriptImport of parentScriptImports) {
|
|
135
|
-
//keep the first occurance of a pkgPath. Parent imports are first in the array
|
|
136
|
-
if (!lookup[parentScriptImport.destPath]) {
|
|
137
|
-
lookup[parentScriptImport.destPath] = parentScriptImport;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
//add warning for every script tag that this file shares with an ancestor
|
|
141
|
-
for (let scriptImport of this.xmlFile.scriptTagImports) {
|
|
142
|
-
let ancestorScriptImport = lookup[scriptImport.destPath];
|
|
143
|
-
if (ancestorScriptImport) {
|
|
144
|
-
let ancestorComponent = ancestorScriptImport.sourceFile;
|
|
145
|
-
let ancestorComponentName = (_b = (_a = ancestorComponent.componentName) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : ancestorComponent.destPath;
|
|
146
|
-
this.diagnostics.push(Object.assign(Object.assign({ file: this.xmlFile, range: scriptImport.filePathRange }, DiagnosticMessages_1.DiagnosticMessages.unnecessaryScriptImportInChildFromParent(ancestorComponentName)), { origin: interfaces_1.DiagnosticOrigin.Scope }));
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
73
|
getAllFiles() {
|
|
152
74
|
return this.cache.getOrAdd('getAllFiles-xmlScope', () => {
|
|
153
75
|
const allFiles = super.getAllFiles();
|
package/dist/XmlScope.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XmlScope.js","sourceRoot":"","sources":["../src/XmlScope.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;
|
|
1
|
+
{"version":3,"file":"XmlScope.js","sourceRoot":"","sources":["../src/XmlScope.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { FunctionExpression
|
|
1
|
+
import type { FunctionExpression } from '../parser/Expression';
|
|
2
2
|
import type { AssignmentStatement, ClassStatement, ConstStatement, EnumStatement, FunctionStatement, ImportStatement, InterfaceStatement, LibraryStatement, NamespaceStatement } from '../parser/Statement';
|
|
3
3
|
import type { Expression } from '../parser/AstNode';
|
|
4
4
|
import type { Parser } from '../parser/Parser';
|
|
@@ -31,7 +31,6 @@ export declare class CachedLookups {
|
|
|
31
31
|
* `value = SomeEnum.value > 2 or SomeEnum.otherValue < 10` will result in 4 entries. `SomeEnum.value`, `2`, `SomeEnum.otherValue`, `10`
|
|
32
32
|
*/
|
|
33
33
|
get expressions(): Set<Expression>;
|
|
34
|
-
get newExpressions(): NewExpression[];
|
|
35
34
|
get classStatements(): ClassStatement[];
|
|
36
35
|
get classStatementMap(): Map<string, ClassStatement>;
|
|
37
36
|
get assignmentStatements(): AssignmentStatement[];
|
|
@@ -52,9 +52,6 @@ class CachedLookups {
|
|
|
52
52
|
get expressions() {
|
|
53
53
|
return this.getFromCache('expressions');
|
|
54
54
|
}
|
|
55
|
-
get newExpressions() {
|
|
56
|
-
return this.getFromCache('newExpressions');
|
|
57
|
-
}
|
|
58
55
|
get classStatements() {
|
|
59
56
|
return this.getFromCache('classStatements');
|
|
60
57
|
}
|
|
@@ -134,7 +131,6 @@ class CachedLookups {
|
|
|
134
131
|
const importStatements = [];
|
|
135
132
|
const functionStatements = [];
|
|
136
133
|
const functionExpressions = [];
|
|
137
|
-
const newExpressions = [];
|
|
138
134
|
const propertyHints = {};
|
|
139
135
|
const addPropertyHints = (item) => {
|
|
140
136
|
if ((0, Token_1.isToken)(item)) {
|
|
@@ -143,11 +139,9 @@ class CachedLookups {
|
|
|
143
139
|
}
|
|
144
140
|
else {
|
|
145
141
|
for (const member of item.elements) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
propertyHints[name.toLowerCase()] = name;
|
|
150
|
-
}
|
|
142
|
+
const name = member.tokens.key.text;
|
|
143
|
+
if (!name.startsWith('"')) {
|
|
144
|
+
propertyHints[name.toLowerCase()] = name;
|
|
151
145
|
}
|
|
152
146
|
}
|
|
153
147
|
}
|
|
@@ -233,12 +227,6 @@ class CachedLookups {
|
|
|
233
227
|
functionExpressions.push(expression);
|
|
234
228
|
}
|
|
235
229
|
},
|
|
236
|
-
NewExpression: e => {
|
|
237
|
-
newExpressions.push(e);
|
|
238
|
-
for (const p of e.call.args) {
|
|
239
|
-
expressions.add(p);
|
|
240
|
-
}
|
|
241
|
-
},
|
|
242
230
|
ExpressionStatement: s => {
|
|
243
231
|
expressions.add(s.expression);
|
|
244
232
|
},
|
|
@@ -273,9 +261,7 @@ class CachedLookups {
|
|
|
273
261
|
ArrayLiteralExpression: e => {
|
|
274
262
|
for (const element of e.elements) {
|
|
275
263
|
//keep everything except comments
|
|
276
|
-
|
|
277
|
-
expressions.add(element);
|
|
278
|
-
}
|
|
264
|
+
expressions.add(element);
|
|
279
265
|
}
|
|
280
266
|
},
|
|
281
267
|
DottedGetExpression: e => {
|
|
@@ -315,7 +301,6 @@ class CachedLookups {
|
|
|
315
301
|
this.cache.set('importStatements', importStatements);
|
|
316
302
|
this.cache.set('functionStatements', functionStatements);
|
|
317
303
|
this.cache.set('functionExpressions', functionExpressions);
|
|
318
|
-
this.cache.set('newExpressions', newExpressions);
|
|
319
304
|
this.cache.set('propertyHints', propertyHints);
|
|
320
305
|
}
|
|
321
306
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedLookups.js","sourceRoot":"","sources":["../../src/astUtils/CachedLookups.ts"],"names":[],"mappings":";;;AAEA,oCAAiC;AACjC,yCAAqD;AAErD,
|
|
1
|
+
{"version":3,"file":"CachedLookups.js","sourceRoot":"","sources":["../../src/astUtils/CachedLookups.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { MethodStatement } from '../parser/Statement';
|
|
|
9
9
|
/**
|
|
10
10
|
* A range that points to the beginning of the file. Used to give non-null ranges to programmatically-added source code.
|
|
11
11
|
* (Hardcoded range to prevent circular dependency issue in `../util.ts`)
|
|
12
|
+
* @deprecated don't use this, it screws up sourcemaps. Just set range to null
|
|
12
13
|
*/
|
|
13
14
|
export declare const interpolatedRange: Range;
|
|
14
15
|
export declare function createToken<T extends TokenKind>(kind: T, text?: string, range?: Range): Token & {
|
|
@@ -8,6 +8,7 @@ const Statement_1 = require("../parser/Statement");
|
|
|
8
8
|
/**
|
|
9
9
|
* A range that points to the beginning of the file. Used to give non-null ranges to programmatically-added source code.
|
|
10
10
|
* (Hardcoded range to prevent circular dependency issue in `../util.ts`)
|
|
11
|
+
* @deprecated don't use this, it screws up sourcemaps. Just set range to null
|
|
11
12
|
*/
|
|
12
13
|
exports.interpolatedRange = {
|
|
13
14
|
start: {
|
|
@@ -80,7 +81,7 @@ const tokenDefaults = {
|
|
|
80
81
|
[TokenKind_1.TokenKind.TemplateStringExpressionEnd]: '}',
|
|
81
82
|
[TokenKind_1.TokenKind.Whitespace]: ' '
|
|
82
83
|
};
|
|
83
|
-
function createToken(kind, text, range
|
|
84
|
+
function createToken(kind, text, range) {
|
|
84
85
|
var _a;
|
|
85
86
|
return {
|
|
86
87
|
kind: kind,
|
|
@@ -157,7 +158,7 @@ exports.createBooleanLiteral = createBooleanLiteral;
|
|
|
157
158
|
function createFunctionExpression(kind) {
|
|
158
159
|
return new Expression_1.FunctionExpression({
|
|
159
160
|
parameters: [],
|
|
160
|
-
body: new Statement_1.Block({ statements: []
|
|
161
|
+
body: new Statement_1.Block({ statements: [] }),
|
|
161
162
|
functionType: createToken(kind),
|
|
162
163
|
endFunctionType: kind === TokenKind_1.TokenKind.Sub ? createToken(TokenKind_1.TokenKind.EndSub) : createToken(TokenKind_1.TokenKind.EndFunction),
|
|
163
164
|
leftParen: createToken(TokenKind_1.TokenKind.LeftParen),
|
|
@@ -193,7 +194,13 @@ exports.createSGToken = createSGToken;
|
|
|
193
194
|
* Create an SGAttribute without any ranges
|
|
194
195
|
*/
|
|
195
196
|
function createSGAttribute(keyName, value) {
|
|
196
|
-
return new SGTypes_1.SGAttribute({
|
|
197
|
+
return new SGTypes_1.SGAttribute({
|
|
198
|
+
key: { text: keyName },
|
|
199
|
+
equals: { text: '=' },
|
|
200
|
+
openingQuote: { text: '"' },
|
|
201
|
+
value: { text: value },
|
|
202
|
+
closingQuote: { text: '"' }
|
|
203
|
+
});
|
|
197
204
|
}
|
|
198
205
|
exports.createSGAttribute = createSGAttribute;
|
|
199
206
|
function createSGInterfaceField(id, attributes = {}) {
|
|
@@ -203,7 +210,12 @@ function createSGInterfaceField(id, attributes = {}) {
|
|
|
203
210
|
for (let key in attributes) {
|
|
204
211
|
attrs.push(createSGAttribute(key, attributes[key]));
|
|
205
212
|
}
|
|
206
|
-
return new SGTypes_1.SGInterfaceField({
|
|
213
|
+
return new SGTypes_1.SGInterfaceField({
|
|
214
|
+
startTagOpen: { text: '<' },
|
|
215
|
+
startTagName: { text: 'field' },
|
|
216
|
+
attributes: attrs,
|
|
217
|
+
startTagClose: { text: '/>' }
|
|
218
|
+
});
|
|
207
219
|
}
|
|
208
220
|
exports.createSGInterfaceField = createSGInterfaceField;
|
|
209
221
|
function createSGComponent(name, parentName) {
|
|
@@ -213,15 +225,38 @@ function createSGComponent(name, parentName) {
|
|
|
213
225
|
if (parentName) {
|
|
214
226
|
attributes.push(createSGAttribute('extends', parentName));
|
|
215
227
|
}
|
|
216
|
-
return new SGTypes_1.SGComponent({
|
|
228
|
+
return new SGTypes_1.SGComponent({
|
|
229
|
+
startTagOpen: { text: '<' },
|
|
230
|
+
startTagName: { text: 'component' },
|
|
231
|
+
attributes: attributes,
|
|
232
|
+
startTagClose: { text: '>' },
|
|
233
|
+
elements: [],
|
|
234
|
+
endTagOpen: { text: '</' },
|
|
235
|
+
endTagName: { text: 'component' },
|
|
236
|
+
endTagClose: { text: '>' }
|
|
237
|
+
});
|
|
217
238
|
}
|
|
218
239
|
exports.createSGComponent = createSGComponent;
|
|
219
240
|
function createSGInterfaceFunction(functionName) {
|
|
220
|
-
return new SGTypes_1.SGInterfaceFunction({
|
|
241
|
+
return new SGTypes_1.SGInterfaceFunction({
|
|
242
|
+
startTagOpen: { text: '<' },
|
|
243
|
+
startTagName: { text: 'function' },
|
|
244
|
+
attributes: [createSGAttribute('name', functionName)],
|
|
245
|
+
startTagClose: { text: '/>' }
|
|
246
|
+
});
|
|
221
247
|
}
|
|
222
248
|
exports.createSGInterfaceFunction = createSGInterfaceFunction;
|
|
223
249
|
function createSGInterface() {
|
|
224
|
-
return new SGTypes_1.SGInterface({
|
|
250
|
+
return new SGTypes_1.SGInterface({
|
|
251
|
+
startTagOpen: { text: '<' },
|
|
252
|
+
startTagName: { text: 'interface' },
|
|
253
|
+
attributes: [],
|
|
254
|
+
startTagClose: { text: '>' },
|
|
255
|
+
elements: [],
|
|
256
|
+
endTagOpen: { text: '</' },
|
|
257
|
+
endTagName: { text: 'interface' },
|
|
258
|
+
endTagClose: { text: '>' }
|
|
259
|
+
});
|
|
225
260
|
}
|
|
226
261
|
exports.createSGInterface = createSGInterface;
|
|
227
262
|
function createSGScript(attributes) {
|
|
@@ -229,7 +264,12 @@ function createSGScript(attributes) {
|
|
|
229
264
|
for (let key in attributes) {
|
|
230
265
|
attrs.push(createSGAttribute(key, attributes[key]));
|
|
231
266
|
}
|
|
232
|
-
return new SGTypes_1.SGScript({
|
|
267
|
+
return new SGTypes_1.SGScript({
|
|
268
|
+
startTagOpen: { text: '<' },
|
|
269
|
+
startTagName: { text: 'script' },
|
|
270
|
+
attributes: attrs,
|
|
271
|
+
startTagClose: { text: '/>' }
|
|
272
|
+
});
|
|
233
273
|
}
|
|
234
274
|
exports.createSGScript = createSGScript;
|
|
235
275
|
//# sourceMappingURL=creators.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../src/astUtils/creators.ts"],"names":[],"mappings":";;;AAGA,+CAA2H;AAC3H,kDAA+C;AAE/C,qDAAsI;AACtI,mDAA6D;AAE7D
|
|
1
|
+
{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../src/astUtils/creators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_config_spec_1 = require("../chai-config.spec");
|
|
4
|
-
const __1 = require("..");
|
|
5
|
-
const TranspileState_1 = require("../parser/TranspileState");
|
|
6
4
|
const creators_1 = require("./creators");
|
|
7
5
|
describe('creators', () => {
|
|
8
6
|
describe('createStringLiteral', () => {
|
|
@@ -19,13 +17,5 @@ describe('creators', () => {
|
|
|
19
17
|
(0, chai_config_spec_1.expect)((0, creators_1.createStringLiteral)('hello world"').tokens.value.text).to.equal('hello world"');
|
|
20
18
|
});
|
|
21
19
|
});
|
|
22
|
-
describe('interpolatedRange', () => {
|
|
23
|
-
it('can be used in sourcemaps', () => {
|
|
24
|
-
const state = new TranspileState_1.TranspileState('source/main.brs', {});
|
|
25
|
-
const node = state.sourceNode({ range: __1.interpolatedRange }, 'code');
|
|
26
|
-
//should not crash
|
|
27
|
-
node.toStringWithSourceMap();
|
|
28
|
-
});
|
|
29
|
-
});
|
|
30
20
|
});
|
|
31
21
|
//# sourceMappingURL=creators.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creators.spec.js","sourceRoot":"","sources":["../../src/astUtils/creators.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"creators.spec.js","sourceRoot":"","sources":["../../src/astUtils/creators.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,yCAAiD;AAEjD,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IAEtB,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,IAAA,yBAAM,EAAC,IAAA,8BAAmB,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3F,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC1D,IAAA,yBAAM,EAAC,IAAA,8BAAmB,EAAC,eAAe,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC7D,SAAS;YACT,IAAA,yBAAM,EAAC,IAAA,8BAAmB,EAAC,cAAc,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YACvF,UAAU;YACV,IAAA,yBAAM,EAAC,IAAA,8BAAmB,EAAC,cAAc,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC3F,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Body, AssignmentStatement, Block, ExpressionStatement,
|
|
1
|
+
import type { Body, AssignmentStatement, Block, ExpressionStatement, ExitForStatement, ExitWhileStatement, FunctionStatement, IfStatement, IncrementStatement, PrintStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, InterfaceFieldStatement, InterfaceMethodStatement, InterfaceStatement, EnumStatement, EnumMemberStatement, TryCatchStatement, CatchStatement, ThrowStatement, MethodStatement, FieldStatement, ConstStatement, ContinueStatement } from '../parser/Statement';
|
|
2
2
|
import type { LiteralExpression, BinaryExpression, CallExpression, FunctionExpression, DottedGetExpression, XmlAttributeGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression, FunctionParameterExpression, AAMemberExpression, TypeCastExpression, TypeExpression, TypedArrayExpression } from '../parser/Expression';
|
|
3
3
|
import type { BrsFile } from '../files/BrsFile';
|
|
4
4
|
import type { XmlFile } from '../files/XmlFile';
|
|
@@ -47,7 +47,6 @@ export declare function isBody(element: AstNode | undefined): element is Body;
|
|
|
47
47
|
export declare function isAssignmentStatement(element: AstNode | undefined): element is AssignmentStatement;
|
|
48
48
|
export declare function isBlock(element: AstNode | undefined): element is Block;
|
|
49
49
|
export declare function isExpressionStatement(element: AstNode | undefined): element is ExpressionStatement;
|
|
50
|
-
export declare function isCommentStatement(element: AstNode | undefined): element is CommentStatement;
|
|
51
50
|
export declare function isExitForStatement(element: AstNode | undefined): element is ExitForStatement;
|
|
52
51
|
export declare function isExitWhileStatement(element: AstNode | undefined): element is ExitWhileStatement;
|
|
53
52
|
export declare function isFunctionStatement(element: AstNode | undefined): element is FunctionStatement;
|
|
@@ -73,6 +72,8 @@ export declare function isFieldStatement(element: AstNode | undefined): element
|
|
|
73
72
|
export declare function isInterfaceStatement(element: AstNode | undefined): element is InterfaceStatement;
|
|
74
73
|
export declare function isInterfaceMethodStatement(element: AstNode | undefined): element is InterfaceMethodStatement;
|
|
75
74
|
export declare function isInterfaceFieldStatement(element: AstNode | undefined): element is InterfaceFieldStatement;
|
|
75
|
+
export declare function isMemberField(element: AstNode | undefined): element is InterfaceFieldStatement | FieldStatement;
|
|
76
|
+
export declare function isMemberMethod(element: AstNode | undefined): element is InterfaceMethodStatement | MethodStatement;
|
|
76
77
|
export declare function isEnumStatement(element: AstNode | undefined): element is EnumStatement;
|
|
77
78
|
export declare function isEnumMemberStatement(element: AstNode | undefined): element is EnumMemberStatement;
|
|
78
79
|
export declare function isConstStatement(element: AstNode | undefined): element is ConstStatement;
|