@lcap/nasl 3.2.0-beta.3 → 3.3.0-alpha
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/out/automate/engine/utils.js +4 -0
- package/out/automate/engine/utils.js.map +1 -1
- package/out/automate/upgrader/2.20.js +1 -1
- package/out/automate/upgrader/2.20.js.map +1 -1
- package/out/bak/translator.js +11 -15
- package/out/bak/translator.js.map +1 -1
- package/out/breakpoint/generator/AfterStartNode.js +3 -1
- package/out/breakpoint/generator/AfterStartNode.js.map +1 -1
- package/out/breakpoint/generator/BeforeEndNode.js.map +1 -1
- package/out/breakpoint/generator/BreakpointNode.d.ts +1 -0
- package/out/breakpoint/generator/BreakpointNode.js +48 -15
- package/out/breakpoint/generator/BreakpointNode.js.map +1 -1
- package/out/breakpoint/generator/CallbackNode.d.ts +4 -0
- package/out/breakpoint/generator/CallbackNode.js +22 -0
- package/out/breakpoint/generator/CallbackNode.js.map +1 -0
- package/out/breakpoint/generator/FragmentNode.d.ts +4 -0
- package/out/breakpoint/generator/FragmentNode.js +18 -0
- package/out/breakpoint/generator/FragmentNode.js.map +1 -0
- package/out/breakpoint/generator/index.js +25 -4
- package/out/breakpoint/generator/index.js.map +1 -1
- package/out/breakpoint/shared/constants.d.ts +3 -0
- package/out/breakpoint/shared/constants.js +6 -1
- package/out/breakpoint/shared/constants.js.map +1 -1
- package/out/breakpoint/shared/operations.js.map +1 -1
- package/out/breakpoint/shared/socket.d.ts +1 -1
- package/out/breakpoint/shared/socket.js +36 -7
- package/out/breakpoint/shared/socket.js.map +1 -1
- package/out/breakpoint/shared/utils.d.ts +2 -0
- package/out/breakpoint/shared/utils.js +15 -2
- package/out/breakpoint/shared/utils.js.map +1 -1
- package/out/breakpoint/store/core.d.ts +48 -2
- package/out/breakpoint/store/core.js +58 -32
- package/out/breakpoint/store/core.js.map +1 -1
- package/out/breakpoint/store/dock.js +1 -1
- package/out/breakpoint/store/dock.js.map +1 -1
- package/out/common/BaseNode.d.ts +2 -2
- package/out/common/BaseNode.js +110 -53
- package/out/common/BaseNode.js.map +1 -1
- package/out/common/Command.d.ts +13 -2
- package/out/common/Command.js +37 -9
- package/out/common/Command.js.map +1 -1
- package/out/common/EventEmitter.js.map +1 -1
- package/out/common/Messager.d.ts +3 -3
- package/out/common/Messager.js +6 -7
- package/out/common/Messager.js.map +1 -1
- package/out/common/asyncFuncMap.js.map +1 -1
- package/out/concepts/Abort__.js +6 -5
- package/out/concepts/Abort__.js.map +1 -1
- package/out/concepts/Anchor__.d.ts +4 -3
- package/out/concepts/Anchor__.js +24 -7
- package/out/concepts/Anchor__.js.map +1 -1
- package/out/concepts/AnonymousFunction__.d.ts +22 -21
- package/out/concepts/AnonymousFunction__.js +48 -22
- package/out/concepts/AnonymousFunction__.js.map +1 -1
- package/out/concepts/App__.d.ts +421 -247
- package/out/concepts/App__.js +288 -54
- package/out/concepts/App__.js.map +1 -1
- package/out/concepts/Argument__.d.ts +4 -3
- package/out/concepts/Argument__.js +42 -11
- package/out/concepts/Argument__.js.map +1 -1
- package/out/concepts/Assignee__.d.ts +45 -45
- package/out/concepts/Assignee__.js +15 -15
- package/out/concepts/Assignee__.js.map +1 -1
- package/out/concepts/AssignmentLine__.js +6 -5
- package/out/concepts/AssignmentLine__.js.map +1 -1
- package/out/concepts/Assignment__.d.ts +7 -6
- package/out/concepts/Assignment__.js +41 -23
- package/out/concepts/Assignment__.js.map +1 -1
- package/out/concepts/Attribute__.d.ts +3 -3
- package/out/concepts/Attribute__.js +8 -7
- package/out/concepts/Attribute__.js.map +1 -1
- package/out/concepts/AuthInterface__.js +4 -3
- package/out/concepts/AuthInterface__.js.map +1 -1
- package/out/concepts/AuthLogicForCallInterface__.d.ts +15 -15
- package/out/concepts/AuthLogicForCallInterface__.js +46 -27
- package/out/concepts/AuthLogicForCallInterface__.js.map +1 -1
- package/out/concepts/AuthLogic__.js +27 -13
- package/out/concepts/AuthLogic__.js.map +1 -1
- package/out/concepts/BackendVariable__.d.ts +5 -5
- package/out/concepts/BackendVariable__.js +23 -26
- package/out/concepts/BackendVariable__.js.map +1 -1
- package/out/concepts/Backend__.d.ts +18 -18
- package/out/concepts/Backend__.js +13 -13
- package/out/concepts/Backend__.js.map +1 -1
- package/out/concepts/BatchAssignment__.d.ts +34 -33
- package/out/concepts/BatchAssignment__.js +83 -43
- package/out/concepts/BatchAssignment__.js.map +1 -1
- package/out/concepts/BinaryExpression__.d.ts +7 -6
- package/out/concepts/BinaryExpression__.js +60 -24
- package/out/concepts/BinaryExpression__.js.map +1 -1
- package/out/concepts/BindAttribute__.d.ts +37 -37
- package/out/concepts/BindAttribute__.js +102 -58
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/BindDirective__.d.ts +13 -13
- package/out/concepts/BindDirective__.js +23 -21
- package/out/concepts/BindDirective__.js.map +1 -1
- package/out/concepts/BindEvent__.d.ts +28 -28
- package/out/concepts/BindEvent__.js +150 -57
- package/out/concepts/BindEvent__.js.map +1 -1
- package/out/concepts/BindStyle__.d.ts +14 -15
- package/out/concepts/BindStyle__.js +16 -16
- package/out/concepts/BindStyle__.js.map +1 -1
- package/out/concepts/BooleanLiteral__.d.ts +1 -0
- package/out/concepts/BooleanLiteral__.js +12 -5
- package/out/concepts/BooleanLiteral__.js.map +1 -1
- package/out/concepts/CallAuthInterface__.d.ts +15 -15
- package/out/concepts/CallAuthInterface__.js +23 -22
- package/out/concepts/CallAuthInterface__.js.map +1 -1
- package/out/concepts/CallConnector__.d.ts +11 -9
- package/out/concepts/CallConnector__.js +79 -36
- package/out/concepts/CallConnector__.js.map +1 -1
- package/out/concepts/CallFunction__.d.ts +17 -16
- package/out/concepts/CallFunction__.js +95 -63
- package/out/concepts/CallFunction__.js.map +1 -1
- package/out/concepts/CallInterface__.d.ts +9 -8
- package/out/concepts/CallInterface__.js +109 -80
- package/out/concepts/CallInterface__.js.map +1 -1
- package/out/concepts/CallLogic__.d.ts +24 -20
- package/out/concepts/CallLogic__.js +209 -162
- package/out/concepts/CallLogic__.js.map +1 -1
- package/out/concepts/CallQueryComponent__.d.ts +51 -51
- package/out/concepts/CallQueryComponent__.js +66 -63
- package/out/concepts/CallQueryComponent__.js.map +1 -1
- package/out/concepts/Comment__.d.ts +1 -0
- package/out/concepts/Comment__.js +13 -6
- package/out/concepts/Comment__.js.map +1 -1
- package/out/concepts/CompletionProperty__.d.ts +3 -3
- package/out/concepts/CompletionProperty__.js +16 -8
- package/out/concepts/CompletionProperty__.js.map +1 -1
- package/out/concepts/ConfigGroup__.d.ts +15 -15
- package/out/concepts/ConfigGroup__.js +9 -9
- package/out/concepts/ConfigGroup__.js.map +1 -1
- package/out/concepts/ConfigPropertyValue__.js +4 -3
- package/out/concepts/ConfigPropertyValue__.js.map +1 -1
- package/out/concepts/ConfigProperty__.d.ts +15 -15
- package/out/concepts/ConfigProperty__.js +10 -10
- package/out/concepts/ConfigProperty__.js.map +1 -1
- package/out/concepts/Configuration__.d.ts +15 -15
- package/out/concepts/Configuration__.js +9 -9
- package/out/concepts/Configuration__.js.map +1 -1
- package/out/concepts/Connection__.d.ts +166 -0
- package/out/concepts/Connection__.js +332 -0
- package/out/concepts/Connection__.js.map +1 -0
- package/out/concepts/ConnectorTrigger__.js +4 -3
- package/out/concepts/ConnectorTrigger__.js.map +1 -1
- package/out/concepts/Connector__.d.ts +66 -66
- package/out/concepts/Connector__.js +16 -15
- package/out/concepts/Connector__.js.map +1 -1
- package/out/concepts/Constant__.d.ts +3 -3
- package/out/concepts/Constant__.js +8 -7
- package/out/concepts/Constant__.js.map +1 -1
- package/out/concepts/DataElement__.d.ts +3 -3
- package/out/concepts/DataElement__.js +6 -5
- package/out/concepts/DataElement__.js.map +1 -1
- package/out/concepts/DataSource__.d.ts +15 -15
- package/out/concepts/DataSource__.js +55 -39
- package/out/concepts/DataSource__.js.map +1 -1
- package/out/concepts/DatabaseTypeAnnotation__.js +4 -3
- package/out/concepts/DatabaseTypeAnnotation__.js.map +1 -1
- package/out/concepts/Destination__.d.ts +12 -11
- package/out/concepts/Destination__.js +93 -36
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/End__.js +15 -13
- package/out/concepts/End__.js.map +1 -1
- package/out/concepts/EntityIndex__.d.ts +1 -1
- package/out/concepts/EntityIndex__.js +6 -5
- package/out/concepts/EntityIndex__.js.map +1 -1
- package/out/concepts/EntityProperty__.d.ts +8 -7
- package/out/concepts/EntityProperty__.js +39 -24
- package/out/concepts/EntityProperty__.js.map +1 -1
- package/out/concepts/Entity__.d.ts +31 -30
- package/out/concepts/Entity__.js +40 -16
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/EnumItem__.d.ts +1 -0
- package/out/concepts/EnumItem__.js +12 -5
- package/out/concepts/EnumItem__.js.map +1 -1
- package/out/concepts/Enum__.d.ts +9 -8
- package/out/concepts/Enum__.js +24 -11
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/Event__.d.ts +15 -15
- package/out/concepts/Event__.js +6 -5
- package/out/concepts/Event__.js.map +1 -1
- package/out/concepts/ExternalDestination__.d.ts +6 -6
- package/out/concepts/ExternalDestination__.js +12 -11
- package/out/concepts/ExternalDestination__.js.map +1 -1
- package/out/concepts/ForEachStatement__.d.ts +25 -24
- package/out/concepts/ForEachStatement__.js +101 -36
- package/out/concepts/ForEachStatement__.js.map +1 -1
- package/out/concepts/FrontendLibrary__.d.ts +30 -30
- package/out/concepts/FrontendLibrary__.js +12 -13
- package/out/concepts/FrontendLibrary__.js.map +1 -1
- package/out/concepts/FrontendVariable__.js +4 -3
- package/out/concepts/FrontendVariable__.js.map +1 -1
- package/out/concepts/Frontend__.d.ts +64 -65
- package/out/concepts/Frontend__.js +23 -27
- package/out/concepts/Frontend__.js.map +1 -1
- package/out/concepts/Function__.d.ts +64 -63
- package/out/concepts/Function__.js +49 -21
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/Identifier__.js +37 -31
- package/out/concepts/Identifier__.js.map +1 -1
- package/out/concepts/IfStatement__.d.ts +20 -19
- package/out/concepts/IfStatement__.js +64 -34
- package/out/concepts/IfStatement__.js.map +1 -1
- package/out/concepts/Integration__.d.ts +3 -3
- package/out/concepts/Integration__.js +8 -7
- package/out/concepts/Integration__.js.map +1 -1
- package/out/concepts/InterfaceParam__.d.ts +3 -3
- package/out/concepts/InterfaceParam__.js +7 -6
- package/out/concepts/InterfaceParam__.js.map +1 -1
- package/out/concepts/Interface__.d.ts +33 -33
- package/out/concepts/Interface__.js +19 -20
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/JSBlock__.d.ts +1 -0
- package/out/concepts/JSBlock__.js +12 -5
- package/out/concepts/JSBlock__.js.map +1 -1
- package/out/concepts/JavaLogic__.js +10 -9
- package/out/concepts/JavaLogic__.js.map +1 -1
- package/out/concepts/LogicItem__.d.ts +6 -0
- package/out/concepts/LogicItem__.js +14 -5
- package/out/concepts/LogicItem__.js.map +1 -1
- package/out/concepts/Logic__.d.ts +80 -79
- package/out/concepts/Logic__.js +204 -58
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/MatchCase__.d.ts +39 -38
- package/out/concepts/MatchCase__.js +122 -37
- package/out/concepts/MatchCase__.js.map +1 -1
- package/out/concepts/Match__.d.ts +13 -11
- package/out/concepts/Match__.js +128 -60
- package/out/concepts/Match__.js.map +1 -1
- package/out/concepts/MemberExpression__.d.ts +7 -6
- package/out/concepts/MemberExpression__.js +52 -22
- package/out/concepts/MemberExpression__.js.map +1 -1
- package/out/concepts/MicroApp__.js +4 -3
- package/out/concepts/MicroApp__.js.map +1 -1
- package/out/concepts/Module__.d.ts +242 -154
- package/out/concepts/Module__.js +139 -33
- package/out/concepts/Module__.js.map +1 -1
- package/out/concepts/MsgTriggerEvent__.d.ts +15 -15
- package/out/concepts/MsgTriggerEvent__.js +6 -5
- package/out/concepts/MsgTriggerEvent__.js.map +1 -1
- package/out/concepts/MsgTriggerLauncher__.d.ts +23 -15
- package/out/concepts/MsgTriggerLauncher__.js +24 -5
- package/out/concepts/MsgTriggerLauncher__.js.map +1 -1
- package/out/concepts/Namespace__.d.ts +180 -180
- package/out/concepts/Namespace__.js +33 -34
- package/out/concepts/Namespace__.js.map +1 -1
- package/out/concepts/NewComposite__.d.ts +49 -48
- package/out/concepts/NewComposite__.js +164 -49
- package/out/concepts/NewComposite__.js.map +1 -1
- package/out/concepts/NewList__.d.ts +19 -18
- package/out/concepts/NewList__.js +29 -12
- package/out/concepts/NewList__.js.map +1 -1
- package/out/concepts/NewMap__.d.ts +34 -33
- package/out/concepts/NewMap__.js +81 -72
- package/out/concepts/NewMap__.js.map +1 -1
- package/out/concepts/New__.js +6 -5
- package/out/concepts/New__.js.map +1 -1
- package/out/concepts/NullLiteral__.js +6 -5
- package/out/concepts/NullLiteral__.js.map +1 -1
- package/out/concepts/NumericLiteral__.d.ts +4 -3
- package/out/concepts/NumericLiteral__.js +15 -8
- package/out/concepts/NumericLiteral__.js.map +1 -1
- package/out/concepts/OqlQueryComponent__.d.ts +4 -3
- package/out/concepts/OqlQueryComponent__.js +25 -16
- package/out/concepts/OqlQueryComponent__.js.map +1 -1
- package/out/concepts/OverriddenLogic__.d.ts +79 -79
- package/out/concepts/OverriddenLogic__.js +79 -58
- package/out/concepts/OverriddenLogic__.js.map +1 -1
- package/out/concepts/Param__.d.ts +6 -5
- package/out/concepts/Param__.js +66 -29
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/Point__.js +4 -3
- package/out/concepts/Point__.js.map +1 -1
- package/out/concepts/ProcessComponent__.d.ts +30 -30
- package/out/concepts/ProcessComponent__.js +8 -7
- package/out/concepts/ProcessComponent__.js.map +1 -1
- package/out/concepts/ProcessElement__.d.ts +96 -96
- package/out/concepts/ProcessElement__.js +34 -34
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/ProcessOutcome__.js +6 -5
- package/out/concepts/ProcessOutcome__.js.map +1 -1
- package/out/concepts/ProcessOutcomes__.js +6 -5
- package/out/concepts/ProcessOutcomes__.js.map +1 -1
- package/out/concepts/Process__.d.ts +75 -75
- package/out/concepts/Process__.js +33 -30
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/QueryAggregateExpression__.d.ts +3 -3
- package/out/concepts/QueryAggregateExpression__.js +8 -7
- package/out/concepts/QueryAggregateExpression__.js.map +1 -1
- package/out/concepts/QueryFieldExpression__.js +7 -6
- package/out/concepts/QueryFieldExpression__.js.map +1 -1
- package/out/concepts/QueryFromExpression__.d.ts +8 -8
- package/out/concepts/QueryFromExpression__.js +8 -7
- package/out/concepts/QueryFromExpression__.js.map +1 -1
- package/out/concepts/QueryGroupByExpression__.d.ts +3 -3
- package/out/concepts/QueryGroupByExpression__.js +9 -10
- package/out/concepts/QueryGroupByExpression__.js.map +1 -1
- package/out/concepts/QueryJoinExpression__.d.ts +23 -23
- package/out/concepts/QueryJoinExpression__.js +11 -10
- package/out/concepts/QueryJoinExpression__.js.map +1 -1
- package/out/concepts/QueryLimitExpression__.d.ts +6 -6
- package/out/concepts/QueryLimitExpression__.js +9 -8
- package/out/concepts/QueryLimitExpression__.js.map +1 -1
- package/out/concepts/QueryOrderByExpression__.d.ts +6 -6
- package/out/concepts/QueryOrderByExpression__.js +9 -8
- package/out/concepts/QueryOrderByExpression__.js.map +1 -1
- package/out/concepts/QuerySelectExpression__.d.ts +30 -30
- package/out/concepts/QuerySelectExpression__.js +9 -8
- package/out/concepts/QuerySelectExpression__.js.map +1 -1
- package/out/concepts/Rect__.js +4 -3
- package/out/concepts/Rect__.js.map +1 -1
- package/out/concepts/Return__.d.ts +4 -3
- package/out/concepts/Return__.js +37 -18
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.js +9 -9
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/SelectMembers__.d.ts +18 -18
- package/out/concepts/SelectMembers__.js +10 -9
- package/out/concepts/SelectMembers__.js.map +1 -1
- package/out/concepts/Slot__.d.ts +3 -3
- package/out/concepts/Slot__.js +6 -5
- package/out/concepts/Slot__.js.map +1 -1
- package/out/concepts/SqlQueryComponent__.d.ts +4 -3
- package/out/concepts/SqlQueryComponent__.js +21 -12
- package/out/concepts/SqlQueryComponent__.js.map +1 -1
- package/out/concepts/Start__.js +6 -5
- package/out/concepts/Start__.js.map +1 -1
- package/out/concepts/StringInterpolation__.d.ts +16 -15
- package/out/concepts/StringInterpolation__.js +37 -14
- package/out/concepts/StringInterpolation__.js.map +1 -1
- package/out/concepts/StringLiteral__.d.ts +1 -0
- package/out/concepts/StringLiteral__.js +13 -8
- package/out/concepts/StringLiteral__.js.map +1 -1
- package/out/concepts/StructureProperty__.d.ts +4 -3
- package/out/concepts/StructureProperty__.js +22 -9
- package/out/concepts/StructureProperty__.js.map +1 -1
- package/out/concepts/Structure__.d.ts +31 -30
- package/out/concepts/Structure__.js +27 -15
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/SwitchCase__.d.ts +12 -11
- package/out/concepts/SwitchCase__.js +69 -31
- package/out/concepts/SwitchCase__.js.map +1 -1
- package/out/concepts/SwitchStatement__.d.ts +9 -8
- package/out/concepts/SwitchStatement__.js +27 -7
- package/out/concepts/SwitchStatement__.js.map +1 -1
- package/out/concepts/Theme__.js +4 -3
- package/out/concepts/Theme__.js.map +1 -1
- package/out/concepts/Transactional__.js +4 -3
- package/out/concepts/Transactional__.js.map +1 -1
- package/out/concepts/TriggerEvent__.d.ts +15 -15
- package/out/concepts/TriggerEvent__.js +6 -5
- package/out/concepts/TriggerEvent__.js.map +1 -1
- package/out/concepts/TriggerLauncher__.d.ts +15 -10
- package/out/concepts/TriggerLauncher__.js +54 -32
- package/out/concepts/TriggerLauncher__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.d.ts +28 -27
- package/out/concepts/TypeAnnotation__.js +144 -124
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/TypeParam__.d.ts +1 -0
- package/out/concepts/TypeParam__.js +12 -5
- package/out/concepts/TypeParam__.js.map +1 -1
- package/out/concepts/UnaryExpression__.d.ts +4 -3
- package/out/concepts/UnaryExpression__.js +31 -20
- package/out/concepts/UnaryExpression__.js.map +1 -1
- package/out/concepts/Unparsed__.d.ts +1 -0
- package/out/concepts/Unparsed__.js +12 -5
- package/out/concepts/Unparsed__.js.map +1 -1
- package/out/concepts/UseComponent__.js +4 -3
- package/out/concepts/UseComponent__.js.map +1 -1
- package/out/concepts/ValidationRule__.d.ts +14 -14
- package/out/concepts/ValidationRule__.js +19 -17
- package/out/concepts/ValidationRule__.js.map +1 -1
- package/out/concepts/Variable__.d.ts +4 -3
- package/out/concepts/Variable__.js +39 -23
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewBlock__.js +4 -3
- package/out/concepts/ViewBlock__.js.map +1 -1
- package/out/concepts/ViewComponent__.d.ts +90 -90
- package/out/concepts/ViewComponent__.js +16 -15
- package/out/concepts/ViewComponent__.js.map +1 -1
- package/out/concepts/ViewElement__.d.ts +92 -86
- package/out/concepts/ViewElement__.js +258 -200
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.d.ts +92 -92
- package/out/concepts/View__.js +173 -63
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/WhileStatement__.d.ts +12 -11
- package/out/concepts/WhileStatement__.js +46 -23
- package/out/concepts/WhileStatement__.js.map +1 -1
- package/out/concepts/basics/stdlib/index.js +17 -1
- package/out/concepts/basics/stdlib/index.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.browser.js +36 -0
- package/out/concepts/basics/stdlib/nasl.browser.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.event.d.ts +3 -0
- package/out/concepts/basics/stdlib/nasl.event.js +23 -0
- package/out/concepts/basics/stdlib/nasl.event.js.map +1 -0
- package/out/concepts/basics/stdlib/nasl.ui.js +45 -0
- package/out/concepts/basics/stdlib/nasl.ui.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +6 -22
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/index__.d.ts +2 -1
- package/out/concepts/index__.js +2 -1
- package/out/concepts/index__.js.map +1 -1
- package/out/concepts/types__.d.ts +2 -1
- package/out/decorators/index.d.ts +1 -1
- package/out/decorators/index.js +20 -7
- package/out/decorators/index.js.map +1 -1
- package/out/decorators/promise.d.ts +7 -0
- package/out/decorators/promise.js +28 -0
- package/out/decorators/promise.js.map +1 -0
- package/out/enums/KEYWORDS.js.map +1 -1
- package/out/enums/LEVEL_NAME_MAP.js.map +1 -1
- package/out/generator/compileComponent.js.map +1 -1
- package/out/generator/genBundleFiles.d.ts +4 -1
- package/out/generator/genBundleFiles.js +15 -11
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/genHash.js.map +1 -1
- package/out/generator/genMetaData.js +12 -8
- package/out/generator/genMetaData.js.map +1 -1
- package/out/generator/genReleaseBody.js +33 -35
- package/out/generator/genReleaseBody.js.map +1 -1
- package/out/generator/microApp.js +2 -1
- package/out/generator/microApp.js.map +1 -1
- package/out/generator/permission.js +31 -30
- package/out/generator/permission.js.map +1 -1
- package/out/generator/styleReplacer.js +4 -7
- package/out/generator/styleReplacer.js.map +1 -1
- package/out/index.d.ts +0 -2
- package/out/index.js +0 -3
- package/out/index.js.map +1 -1
- package/out/manager/diagnostic.d.ts +1 -1
- package/out/manager/diagnostic.js.map +1 -1
- package/out/manager/stepRecorder.js +13 -9
- package/out/manager/stepRecorder.js.map +1 -1
- package/out/natural/RequirementAnalyzer.d.ts +22 -0
- package/out/natural/RequirementAnalyzer.js +196 -0
- package/out/natural/RequirementAnalyzer.js.map +1 -0
- package/out/natural/RequirementExecutor.d.ts +51 -0
- package/out/natural/RequirementExecutor.js +692 -0
- package/out/natural/RequirementExecutor.js.map +1 -0
- package/out/natural/componentData.d.ts +31 -0
- package/out/natural/componentData.js +85 -0
- package/out/natural/componentData.js.map +1 -0
- package/out/natural/genNaturalTS.d.ts +3 -0
- package/out/natural/genNaturalTS.js +76 -0
- package/out/natural/genNaturalTS.js.map +1 -0
- package/out/natural/index.d.ts +4 -0
- package/out/natural/index.js +21 -0
- package/out/natural/index.js.map +1 -0
- package/out/natural/knowledgeMap.d.ts +4 -0
- package/out/natural/knowledgeMap.js +40 -0
- package/out/natural/knowledgeMap.js.map +1 -0
- package/out/natural/naslStdlibMap.d.ts +2 -0
- package/out/natural/naslStdlibMap.js +26 -0
- package/out/natural/naslStdlibMap.js.map +1 -0
- package/out/natural/transformTSCode.d.ts +7 -0
- package/out/natural/transformTSCode.js +760 -0
- package/out/natural/transformTSCode.js.map +1 -0
- package/out/sentry/index.d.ts +2 -1
- package/out/sentry/index.js.map +1 -1
- package/out/server/createUiTs.js +28 -16
- package/out/server/createUiTs.js.map +1 -1
- package/out/server/entity2LogicNamespace.js +24 -22
- package/out/server/entity2LogicNamespace.js.map +1 -1
- package/out/server/event.d.ts +12 -0
- package/out/server/event.js +52 -28
- package/out/server/event.js.map +1 -1
- package/out/server/extendBaseNode.js +55 -70
- package/out/server/extendBaseNode.js.map +1 -1
- package/out/server/formatTsUtils.js +46 -50
- package/out/server/formatTsUtils.js.map +1 -1
- package/out/server/getConnector.d.ts +3 -3
- package/out/server/getConnector.js +7 -8
- package/out/server/getConnector.js.map +1 -1
- package/out/server/getExtensionModules.js +2 -2
- package/out/server/getExtensionModules.js.map +1 -1
- package/out/server/getFunctions.js.map +1 -1
- package/out/server/getInterfaces.js.map +1 -1
- package/out/server/getLogging.js.map +1 -1
- package/out/server/getLogics.d.ts +1 -1
- package/out/server/getLogics.js +55 -8
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.js +13 -10
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcessComponents.js.map +1 -1
- package/out/server/getProcesses.js +21 -29
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/getScope.js.map +1 -1
- package/out/server/getValidates.js.map +1 -1
- package/out/server/index.js +0 -1
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +99 -94
- package/out/server/naslServer.js +490 -469
- package/out/server/naslServer.js.map +1 -1
- package/out/server/naslStdlibMap.js +6 -2
- package/out/server/naslStdlibMap.js.map +1 -1
- package/out/server/process2LogicNamespace.js.map +1 -1
- package/out/server/translator.d.ts +1 -1
- package/out/server/translator.js +52 -47
- package/out/server/translator.js.map +1 -1
- package/out/service/storage/init.d.ts +15 -1
- package/out/service/storage/init.js +65 -56
- package/out/service/storage/init.js.map +1 -1
- package/out/templator/genCallComponentLogic.js +1 -2
- package/out/templator/genCallComponentLogic.js.map +1 -1
- package/out/templator/genCreateBlock.js +14 -9
- package/out/templator/genCreateBlock.js.map +1 -1
- package/out/templator/genCurdEditMultipleKeyBlock.js +23 -14
- package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +26 -30
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.d.ts +1 -1
- package/out/templator/genEditTableBlock.js +14 -19
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genEnumSelectBlock.js +1 -1
- package/out/templator/genEnumSelectBlock.js.map +1 -1
- package/out/templator/genGetBlock.js +2 -2
- package/out/templator/genGetBlock.js.map +1 -1
- package/out/templator/genGridViewBlock.d.ts +2 -2
- package/out/templator/genGridViewBlock.js +18 -28
- package/out/templator/genGridViewBlock.js.map +1 -1
- package/out/templator/genListViewBlock.d.ts +2 -2
- package/out/templator/genListViewBlock.js +9 -16
- package/out/templator/genListViewBlock.js.map +1 -1
- package/out/templator/genQueryComponent.js +22 -15
- package/out/templator/genQueryComponent.js.map +1 -1
- package/out/templator/genSelectBlock.d.ts +2 -2
- package/out/templator/genSelectBlock.js +21 -48
- package/out/templator/genSelectBlock.js.map +1 -1
- package/out/templator/genTableBlock.d.ts +1 -1
- package/out/templator/genTableBlock.js +11 -17
- package/out/templator/genTableBlock.js.map +1 -1
- package/out/templator/genUpdateBlock.js +13 -8
- package/out/templator/genUpdateBlock.js.map +1 -1
- package/out/templator/index.d.ts +4 -2
- package/out/templator/index.js +2 -2
- package/out/templator/index.js.map +1 -1
- package/out/templator/utils.d.ts +9 -2
- package/out/templator/utils.js +22 -22
- package/out/templator/utils.js.map +1 -1
- package/out/translator/index.js +27 -28
- package/out/translator/index.js.map +1 -1
- package/out/utils/index.d.ts +2 -1
- package/out/utils/index.js +8 -14
- package/out/utils/index.js.map +1 -1
- package/out/utils/logger.js.map +1 -1
- package/out/utils/sortTsString.js +3 -1
- package/out/utils/sortTsString.js.map +1 -1
- package/out/utils/string.js +8 -11
- package/out/utils/string.js.map +1 -1
- package/out/utils/time-slicing.d.ts +41 -0
- package/out/utils/time-slicing.js +81 -0
- package/out/utils/time-slicing.js.map +1 -0
- package/out/utils/traverse.js +4 -6
- package/out/utils/traverse.js.map +1 -1
- package/package.json +22 -20
- package/sandbox/stdlib/nasl.auth.ts +49 -46
- package/sandbox/stdlib/nasl.browser.ts +1 -0
- package/sandbox/stdlib/nasl.event.ts +4 -0
- package/sandbox/stdlib/nasl.http.ts +29 -31
- package/sandbox/stdlib/nasl.ui.definition.ts +13 -1
- package/sandbox/stdlib/nasl.ui.ts +11 -0
- package/sandbox-natural/stdlib/nasl.core.ts +36 -0
- package/sandbox-natural/stdlib/nasl.oql.ts +8 -0
- package/sandbox-natural/stdlib/nasl.ui.ts +56 -0
- package/sandbox-natural/stdlib/nasl.util.ts +26 -0
- package/sandbox-natural/tsconfig.json +12 -0
- package/src/automate/engine/utils.js +3 -0
- package/src/automate/upgrader/2.20.js +1 -1
- package/src/bak/translator.js +92 -99
- package/src/breakpoint/generator/AfterStartNode.ts +19 -17
- package/src/breakpoint/generator/BeforeEndNode.ts +17 -17
- package/src/breakpoint/generator/BreakpointNode.ts +243 -195
- package/src/breakpoint/generator/CallbackNode.ts +20 -0
- package/src/breakpoint/generator/FragmentNode.ts +14 -0
- package/src/breakpoint/generator/index.ts +107 -80
- package/src/breakpoint/shared/constants.ts +59 -53
- package/src/breakpoint/shared/operations.ts +6 -6
- package/src/breakpoint/shared/socket.ts +277 -223
- package/src/breakpoint/shared/utils.ts +166 -146
- package/src/breakpoint/store/core.ts +326 -297
- package/src/breakpoint/store/dock.ts +103 -103
- package/src/breakpoint/types/index.d.ts +11 -11
- package/src/common/BaseNode.ts +1103 -1020
- package/src/common/Command.ts +46 -16
- package/src/common/ComponentAPI.ts +72 -72
- package/src/common/EventEmitter.ts +80 -76
- package/src/common/Messager.ts +223 -224
- package/src/common/asyncFuncMap.ts +12 -12
- package/src/concepts/Abort__.ts +53 -60
- package/src/concepts/Anchor__.ts +158 -149
- package/src/concepts/AnonymousFunction__.ts +584 -551
- package/src/concepts/App__.ts +4278 -3669
- package/src/concepts/Argument__.ts +234 -210
- package/src/concepts/Assignee__.ts +680 -656
- package/src/concepts/AssignmentLine__.ts +80 -84
- package/src/concepts/Assignment__.ts +276 -264
- package/src/concepts/Attribute__.ts +183 -184
- package/src/concepts/AuthInterface__.ts +61 -63
- package/src/concepts/AuthLogicForCallInterface__.ts +540 -511
- package/src/concepts/AuthLogic__.ts +210 -194
- package/src/concepts/BackendVariable__.ts +414 -415
- package/src/concepts/Backend__.ts +317 -303
- package/src/concepts/BatchAssignment__.ts +987 -939
- package/src/concepts/BinaryExpression__.ts +370 -341
- package/src/concepts/BindAttribute__.ts +1056 -1011
- package/src/concepts/BindDirective__.ts +540 -542
- package/src/concepts/BindEvent__.ts +992 -866
- package/src/concepts/BindStyle__.ts +442 -451
- package/src/concepts/BooleanLiteral__.ts +89 -90
- package/src/concepts/CallAuthInterface__.ts +458 -433
- package/src/concepts/CallConnector__.ts +209 -164
- package/src/concepts/CallFunction__.ts +600 -600
- package/src/concepts/CallInterface__.ts +752 -725
- package/src/concepts/CallLogic__.ts +1328 -1236
- package/src/concepts/CallQueryComponent__.ts +1580 -1501
- package/src/concepts/Comment__.ts +69 -68
- package/src/concepts/CompletionProperty__.ts +250 -250
- package/src/concepts/ConfigGroup__.ts +312 -296
- package/src/concepts/ConfigPropertyValue__.ts +81 -82
- package/src/concepts/ConfigProperty__.ts +374 -357
- package/src/concepts/Configuration__.ts +288 -276
- package/src/concepts/Connection__.ts +426 -0
- package/src/concepts/ConnectorTrigger__.ts +146 -142
- package/src/concepts/Connector__.ts +1090 -1048
- package/src/concepts/Constant__.ts +226 -219
- package/src/concepts/DataElement__.ts +108 -115
- package/src/concepts/DataSource__.ts +508 -472
- package/src/concepts/DatabaseTypeAnnotation__.ts +53 -59
- package/src/concepts/Destination__.ts +808 -746
- package/src/concepts/End__.ts +85 -89
- package/src/concepts/EntityIndex__.ts +206 -202
- package/src/concepts/EntityProperty__.ts +825 -791
- package/src/concepts/Entity__.ts +921 -864
- package/src/concepts/EnumItem__.ts +133 -125
- package/src/concepts/Enum__.ts +347 -337
- package/src/concepts/Event__.ts +305 -292
- package/src/concepts/ExternalDestination__.ts +269 -280
- package/src/concepts/ForEachStatement__.ts +583 -531
- package/src/concepts/FrontendLibrary__.ts +507 -485
- package/src/concepts/FrontendVariable__.ts +44 -49
- package/src/concepts/Frontend__.ts +1239 -1187
- package/src/concepts/Function__.ts +1110 -1045
- package/src/concepts/Identifier__.ts +276 -272
- package/src/concepts/IfStatement__.ts +467 -436
- package/src/concepts/Integration__.ts +136 -137
- package/src/concepts/InterfaceParam__.ts +239 -238
- package/src/concepts/Interface__.ts +969 -948
- package/src/concepts/JSBlock__.ts +83 -83
- package/src/concepts/JavaLogic__.ts +101 -106
- package/src/concepts/LogicItem__.ts +307 -237
- package/src/concepts/Logic__.ts +2301 -2088
- package/src/concepts/MatchCase__.ts +886 -779
- package/src/concepts/Match__.ts +728 -659
- package/src/concepts/MemberExpression__.ts +330 -311
- package/src/concepts/MicroApp__.ts +91 -97
- package/src/concepts/Module__.ts +2590 -2275
- package/src/concepts/MsgTriggerEvent__.ts +297 -281
- package/src/concepts/MsgTriggerLauncher__.ts +286 -256
- package/src/concepts/Namespace__.ts +2579 -2466
- package/src/concepts/NewComposite__.ts +1487 -1350
- package/src/concepts/NewList__.ts +464 -450
- package/src/concepts/NewMap__.ts +691 -674
- package/src/concepts/New__.ts +42 -49
- package/src/concepts/NullLiteral__.ts +66 -72
- package/src/concepts/NumericLiteral__.ts +169 -169
- package/src/concepts/OqlQueryComponent__.ts +282 -279
- package/src/concepts/OverriddenLogic__.ts +2142 -2097
- package/src/concepts/Param__.ts +500 -442
- package/src/concepts/Point__.ts +53 -59
- package/src/concepts/ProcessComponent__.ts +497 -475
- package/src/concepts/ProcessElement__.ts +1852 -1780
- package/src/concepts/ProcessOutcome__.ts +59 -64
- package/src/concepts/ProcessOutcomes__.ts +59 -64
- package/src/concepts/Process__.ts +1491 -1428
- package/src/concepts/QueryAggregateExpression__.ts +135 -142
- package/src/concepts/QueryFieldExpression__.ts +138 -142
- package/src/concepts/QueryFromExpression__.ts +246 -254
- package/src/concepts/QueryGroupByExpression__.ts +130 -136
- package/src/concepts/QueryJoinExpression__.ts +441 -438
- package/src/concepts/QueryLimitExpression__.ts +159 -166
- package/src/concepts/QueryOrderByExpression__.ts +173 -180
- package/src/concepts/QuerySelectExpression__.ts +464 -439
- package/src/concepts/Rect__.ts +73 -79
- package/src/concepts/Return__.ts +366 -345
- package/src/concepts/Role__.ts +146 -147
- package/src/concepts/SelectMembers__.ts +358 -350
- package/src/concepts/Slot__.ts +152 -153
- package/src/concepts/SqlQueryComponent__.ts +230 -228
- package/src/concepts/Start__.ts +45 -52
- package/src/concepts/StringInterpolation__.ts +323 -296
- package/src/concepts/StringLiteral__.ts +113 -115
- package/src/concepts/StructureProperty__.ts +306 -295
- package/src/concepts/Structure__.ts +615 -578
- package/src/concepts/SwitchCase__.ts +326 -290
- package/src/concepts/SwitchStatement__.ts +236 -229
- package/src/concepts/Theme__.ts +64 -68
- package/src/concepts/Transactional__.ts +159 -153
- package/src/concepts/TriggerEvent__.ts +285 -274
- package/src/concepts/TriggerLauncher__.ts +232 -196
- package/src/concepts/TypeAnnotation__.ts +1049 -1011
- package/src/concepts/TypeParam__.ts +48 -50
- package/src/concepts/UnaryExpression__.ts +163 -153
- package/src/concepts/Unparsed__.ts +81 -82
- package/src/concepts/UseComponent__.ts +53 -59
- package/src/concepts/ValidationRule__.ts +524 -544
- package/src/concepts/Variable__.ts +419 -397
- package/src/concepts/ViewBlock__.ts +58 -64
- package/src/concepts/ViewComponent__.ts +1323 -1261
- package/src/concepts/ViewElement__.ts +2537 -2351
- package/src/concepts/View__.ts +2461 -2245
- package/src/concepts/WhileStatement__.ts +293 -272
- package/src/concepts/basics/stdlib/index.ts +17 -1
- package/src/concepts/basics/stdlib/nasl.browser.ts +36 -0
- package/src/concepts/basics/stdlib/nasl.event.ts +18 -0
- package/src/concepts/basics/stdlib/nasl.ui.ts +45 -0
- package/src/concepts/basics/stdlib/nasl.util.ts +6 -22
- package/src/concepts/index__.ts +2 -1
- package/src/concepts/types__.ts +123 -121
- package/src/decorators/index.ts +75 -77
- package/src/decorators/promise.ts +28 -0
- package/src/enums/KEYWORDS.ts +1228 -1228
- package/src/enums/LEVEL_NAME_MAP.ts +24 -24
- package/src/generator/compileComponent.ts +10 -10
- package/src/generator/genBundleFiles.ts +300 -291
- package/src/generator/genHash.ts +2 -2
- package/src/generator/genMetaData.ts +280 -261
- package/src/generator/genReleaseBody.ts +312 -291
- package/src/generator/icestark.ts +1 -1
- package/src/generator/microApp.ts +17 -20
- package/src/generator/permission.ts +241 -232
- package/src/generator/qiankun.ts +1 -1
- package/src/generator/styleReplacer.ts +28 -31
- package/src/index.ts +0 -3
- package/src/manager/diagnostic.ts +84 -82
- package/src/manager/stepRecorder.ts +106 -94
- package/src/natural/RequirementAnalyzer.ts +208 -0
- package/src/natural/RequirementExecutor.ts +685 -0
- package/src/natural/componentData.ts +81 -0
- package/src/natural/genNaturalTS.ts +77 -0
- package/src/natural/index.ts +4 -0
- package/src/natural/knowledgeMap.ts +39 -0
- package/src/natural/naslStdlibMap.ts +24 -0
- package/src/natural/transformTSCode.ts +692 -0
- package/src/sentry/index.ts +109 -104
- package/src/server/createUiTs.ts +190 -184
- package/src/server/entity2LogicNamespace.ts +379 -359
- package/src/server/event.js +145 -121
- package/src/server/extendBaseNode.ts +461 -456
- package/src/server/formatTsUtils.ts +712 -713
- package/src/server/getConnector.ts +33 -33
- package/src/server/getExtensionModules.ts +23 -22
- package/src/server/getFunctions.ts +6 -6
- package/src/server/getInterfaces.ts +38 -37
- package/src/server/getLogging.ts +1 -1
- package/src/server/getLogics.ts +391 -312
- package/src/server/getMemberIdentifier.ts +286 -281
- package/src/server/getProcessComponents.ts +2 -2
- package/src/server/getProcesses.ts +548 -534
- package/src/server/getScope.ts +51 -51
- package/src/server/getValidates.ts +3 -3
- package/src/server/index.ts +29 -30
- package/src/server/naslServer.ts +4303 -4222
- package/src/server/naslStdlibMap.ts +43 -39
- package/src/server/process2LogicNamespace.ts +97 -97
- package/src/server/translator.ts +740 -746
- package/src/service/storage/init.ts +761 -728
- package/src/templator/genCallComponentLogic.ts +14 -15
- package/src/templator/genCreateBlock.ts +257 -229
- package/src/templator/genCurdEditMultipleKeyBlock.ts +333 -317
- package/src/templator/genCurdMultipleKeyBlock.ts +503 -475
- package/src/templator/genEditTableBlock.ts +194 -187
- package/src/templator/genEnumSelectBlock.ts +13 -7
- package/src/templator/genGetBlock.ts +57 -55
- package/src/templator/genGridViewBlock.ts +195 -211
- package/src/templator/genListViewBlock.ts +62 -72
- package/src/templator/genQueryComponent.ts +337 -287
- package/src/templator/genSelectBlock.ts +283 -297
- package/src/templator/genTableBlock.ts +160 -166
- package/src/templator/genUpdateBlock.ts +269 -255
- package/src/templator/index.ts +4 -4
- package/src/templator/utils.ts +491 -463
- package/src/translator/index.ts +84 -84
- package/src/translator/lsp.ts +22 -22
- package/src/translator/tsp.ts +6 -6
- package/src/utils/index.ts +115 -117
- package/src/utils/logger.ts +3 -4
- package/src/utils/sortTsString.ts +34 -32
- package/src/utils/string.ts +47 -48
- package/src/utils/time-slicing.ts +109 -0
- package/src/utils/traverse.ts +114 -126
- package/test/concepts/call-interface/__snapshots__/toEmbeddedTS.spec.ts.snap +71 -0
- package/test/concepts/call-interface/__snapshots__/toJS.spec.ts.snap +140 -0
- package/test/concepts/call-interface/constant.ts +5 -0
- package/test/concepts/call-interface/fixtures/only-interface.json +158 -0
- package/test/concepts/call-interface/fixtures/with-body-complex-argument.json +455 -0
- package/test/concepts/call-interface/fixtures/with-body-no-argument.json +187 -0
- package/test/concepts/call-interface/fixtures/with-body-simple-argument.json +225 -0
- package/test/concepts/call-interface/fixtures/with-headers-no-argument.json +213 -0
- package/test/concepts/call-interface/fixtures/with-headers.json +192 -0
- package/test/concepts/call-interface/fixtures/with-query-no-argument.json +213 -0
- package/test/concepts/call-interface/fixtures/with-query.json +192 -0
- package/test/concepts/call-interface/toEmbeddedTS.spec.ts +14 -0
- package/test/concepts/call-interface/toJS.spec.ts +14 -0
- package/test/concepts/call-logic/__snapshots__/toEmbeddedTS.spec.ts.snap +74 -0
- package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap +141 -0
- package/test/concepts/call-logic/constant.ts +5 -0
- package/test/concepts/call-logic/fixtures/entries-get-with-arguments.json +223 -0
- package/test/concepts/call-logic/fixtures/entries-update-with-arguments.json +359 -0
- package/test/concepts/call-logic/fixtures/global-logic-argument-no-expression.json +209 -0
- package/test/concepts/call-logic/fixtures/global-logic-argument-some-expression.json +311 -0
- package/test/concepts/call-logic/fixtures/only-call-logic.json +10 -0
- package/test/concepts/call-logic/fixtures/view-buildin-logic-with-argument.json +128 -0
- package/test/concepts/call-logic/fixtures/view-component-logic-no-argument.json +126 -0
- package/test/concepts/call-logic/fixtures/view-component-with-validation.json +244 -0
- package/test/concepts/call-logic/toEmbeddedTS.spec.ts +14 -0
- package/test/concepts/call-logic/toJS.spec.ts +14 -0
- package/test/concepts/match/__snapshots__/toEmbeddedTS.spec.ts.snap +66 -0
- package/test/concepts/match/__snapshots__/toJS.spec.ts.snap +40 -0
- package/test/concepts/match/constant.ts +5 -0
- package/test/concepts/match/fixtures/isExpression.json +259 -0
- package/test/concepts/match/fixtures/lastBodyIf.json +268 -0
- package/test/concepts/match/fixtures/noExpression.json +176 -0
- package/test/concepts/match/toEmbeddedTS.spec.ts +14 -0
- package/test/concepts/match/toJS.spec.ts +14 -0
- package/test/concepts/utils.ts +76 -3
- package/test/concepts/validation-rule/__snapshots__/toEmbeddedTS.spec.ts.snap +3 -3
- package/test/concepts/validation-rule/__snapshots__/toJS.spec.ts.snap +16 -0
- package/test/concepts/validation-rule/constant.ts +5 -0
- package/test/concepts/validation-rule/toEmbeddedTS.spec.ts +10 -17
- package/test/concepts/validation-rule/toJS.spec.ts +14 -0
- package/test/concepts/view-element/__snapshots__/toEmbeddedTS.spec.ts.snap +68 -0
- package/test/concepts/view-element/__snapshots__/toVue.spec.ts.snap +44 -0
- package/test/concepts/view-element/constant.ts +5 -0
- package/test/concepts/view-element/fixtures/default-not-found.json +322 -0
- package/test/concepts/view-element/toEmbeddedTS.spec.ts +14 -0
- package/test/concepts/view-element/toVue.spec.ts +14 -0
- package/test/setup.ts +7 -0
- package/ts-worker/src/index.js +0 -2
- package/tsconfig.json +21 -21
- package/bin/naslc +0 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function genEnumSelectBlock(enumeration, vModel, size, placeholder, hiddenAll) {
|
|
|
15
15
|
const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
|
|
16
16
|
if (config_1.config.scope === 'h5')
|
|
17
17
|
return `<van-pickerson type="list" :show-toolbar="true" ${vModel ? ` v-model="${vModel}"` : ''}${placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''}
|
|
18
|
-
:data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :notitleblock="${hiddenAll}"><template #title>${!hiddenAll ?
|
|
18
|
+
:data-source="$utils.EnumToList('${enumTypeAnnotationStr}')" :notitleblock="${hiddenAll}"><template #title>${!hiddenAll ? placeholder || '' : ''}</template></van-pickerson>`;
|
|
19
19
|
return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${placeholder ? ` placeholder="${placeholder}"` : ''}
|
|
20
20
|
:data-source="$utils.EnumToList('${enumTypeAnnotationStr}')">
|
|
21
21
|
${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genEnumSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genEnumSelectBlock.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAGnC;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,WAAiB,EAAE,MAAe,EAAE,IAAa,EAAE,WAAoB,EAAE,SAAmB;
|
|
1
|
+
{"version":3,"file":"genEnumSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genEnumSelectBlock.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAGnC;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,WAAiB,EAAE,MAAe,EAAE,IAAa,EAAE,WAAoB,EAAE,SAAmB;IAC7H,MAAM,SAAS,GAAG,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IACpD,MAAM,IAAI,GAAG,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;IACrC,MAAM,qBAAqB,GAAG,wBAAwB,SAAS,IAAI,IAAI,EAAE,CAAC;IAC1E,IAAI,eAAM,CAAC,KAAK,KAAK,IAAI;QACvB,OAAO,mDAAmD,MAAM,CAAC,CAAC,CAAC,aAAa,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,GAC5F,WAAW,CAAC,CAAC,CAAC,WAAW,WAAW,kBAAkB,WAAW,GAAG,CAAC,CAAC,CAAC,EACzE;2CACuC,qBAAqB,sBAAsB,SAAS,sBACrF,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC,EACnC,6BAA6B,CAAC;IAEpC,OAAO,sBAAsB,MAAM,CAAC,CAAC,CAAC,aAAa,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,GAC/F,WAAW,CAAC,CAAC,CAAC,iBAAiB,WAAW,GAAG,CAAC,CAAC,CAAC,EAClD;+CAC6C,qBAAqB;kBAClD,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,2CAA2C;wBACtD,CAAC;AACzB,CAAC;AAlBD,gDAkBC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -87,8 +87,8 @@ function genH5GetTemplate(entity, nameGroup) {
|
|
|
87
87
|
}
|
|
88
88
|
exports.genH5GetTemplate = genH5GetTemplate;
|
|
89
89
|
function genGetBlock(entity, oldNode) {
|
|
90
|
-
const view = oldNode
|
|
91
|
-
const ns = entity
|
|
90
|
+
const { view } = oldNode;
|
|
91
|
+
const { ns } = entity;
|
|
92
92
|
const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
|
|
93
93
|
const nameGroup = {};
|
|
94
94
|
nameGroup.viewParamId = view.getParamUniqueName('id');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,mCAA8F;AAC9F,wBAA6D;AAE7D,SAAgB,cAAc,CAAC,MAAc,EAAE,SAAoB;
|
|
1
|
+
{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ export declare function genH5GridViewCardTemplate(property: EntityProperty, name
|
|
|
11
11
|
* @param entity 实体
|
|
12
12
|
* @param nameGroup 命名组
|
|
13
13
|
*/
|
|
14
|
-
export declare function genGridViewTemplate(entity: Entity, nameGroup: NameGroup,
|
|
15
|
-
export declare function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup
|
|
14
|
+
export declare function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean): string;
|
|
15
|
+
export declare function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup): string;
|
|
16
16
|
/**
|
|
17
17
|
* 生成表格 load 逻辑
|
|
18
18
|
* @param entity 实体
|
|
@@ -33,7 +33,7 @@ const utils_1 = require("./utils");
|
|
|
33
33
|
* @param property 实体属性
|
|
34
34
|
*/
|
|
35
35
|
function genGridViewCardTemplate(property, nameGroup) {
|
|
36
|
-
const entity = property
|
|
36
|
+
const { entity } = property;
|
|
37
37
|
const dataSource = entity.parentNode;
|
|
38
38
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
39
39
|
const currentName = nameGroup.currentName || 'current';
|
|
@@ -65,9 +65,7 @@ function genGridViewCardTemplate(property, nameGroup) {
|
|
|
65
65
|
<u-text v-if="!${valueExpression}" text="否"></u-text>
|
|
66
66
|
`;
|
|
67
67
|
}
|
|
68
|
-
|
|
69
|
-
return `<u-text :text="${valueExpression}"></u-text>`;
|
|
70
|
-
}
|
|
68
|
+
return `<u-text :text="${valueExpression}"></u-text>`;
|
|
71
69
|
};
|
|
72
70
|
return `<u-linear-layout gap="small">
|
|
73
71
|
<u-text text="${title}:"></u-text>${getText(property)}
|
|
@@ -75,7 +73,7 @@ function genGridViewCardTemplate(property, nameGroup) {
|
|
|
75
73
|
}
|
|
76
74
|
exports.genGridViewCardTemplate = genGridViewCardTemplate;
|
|
77
75
|
function genH5GridViewCardTemplate(property, nameGroup) {
|
|
78
|
-
const entity = property
|
|
76
|
+
const { entity } = property;
|
|
79
77
|
const dataSource = entity.parentNode;
|
|
80
78
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
81
79
|
const currentName = nameGroup.currentName || 'current';
|
|
@@ -106,9 +104,7 @@ function genH5GridViewCardTemplate(property, nameGroup) {
|
|
|
106
104
|
<van-text v-if="!${valueExpression}" text="否" display="block"></van-text>
|
|
107
105
|
`;
|
|
108
106
|
}
|
|
109
|
-
|
|
110
|
-
return `<van-text :text="${valueExpression}" display="block"></van-text>`;
|
|
111
|
-
}
|
|
107
|
+
return `<van-text :text="${valueExpression}" display="block"></van-text>`;
|
|
112
108
|
};
|
|
113
109
|
return `${getText(property)}`;
|
|
114
110
|
}
|
|
@@ -118,13 +114,10 @@ exports.genH5GridViewCardTemplate = genH5GridViewCardTemplate;
|
|
|
118
114
|
* @param entity 实体
|
|
119
115
|
* @param nameGroup 命名组
|
|
120
116
|
*/
|
|
121
|
-
function genGridViewTemplate(entity, nameGroup,
|
|
117
|
+
function genGridViewTemplate(entity, nameGroup, modifyable) {
|
|
118
|
+
const currentName = nameGroup.currentName || 'current';
|
|
122
119
|
const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
|
|
123
|
-
|
|
124
|
-
if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
|
|
125
|
-
dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order,filter)`;
|
|
126
|
-
}
|
|
127
|
-
return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
|
|
120
|
+
return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
128
121
|
value-field="${nameGroup.viewVariableEntity}.id"
|
|
129
122
|
:page-size="20"
|
|
130
123
|
:pageable="true"
|
|
@@ -138,7 +131,7 @@ function genGridViewTemplate(entity, nameGroup, newLogic, modifyable, entryFromC
|
|
|
138
131
|
<template #item="current">
|
|
139
132
|
<u-card title="">
|
|
140
133
|
<u-linear-layout direction="vertical" gap="small">
|
|
141
|
-
${properties.map((property) => genGridViewCardTemplate(property, nameGroup)
|
|
134
|
+
${properties.map((property) => `${genGridViewCardTemplate(property, nameGroup)}\n`).join('')}
|
|
142
135
|
<u-linear-layout gap="small">
|
|
143
136
|
<u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
|
|
144
137
|
<u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
|
|
@@ -150,20 +143,17 @@ function genGridViewTemplate(entity, nameGroup, newLogic, modifyable, entryFromC
|
|
|
150
143
|
`;
|
|
151
144
|
}
|
|
152
145
|
exports.genGridViewTemplate = genGridViewTemplate;
|
|
153
|
-
function genH5GridViewTemplate(entity, nameGroup
|
|
146
|
+
function genH5GridViewTemplate(entity, nameGroup) {
|
|
147
|
+
const currentName = nameGroup.currentName || 'current';
|
|
154
148
|
const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
|
|
155
|
-
|
|
156
|
-
if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
|
|
157
|
-
dataSourceValue = `(params) => ${newLogic.name}(params.page, params.size,params.sort,params.order,filter)`;
|
|
158
|
-
}
|
|
159
|
-
return `<van-grid-view ref="gridView" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
|
|
149
|
+
return `<van-grid-view ref="gridView" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
160
150
|
pageable="auto-more"
|
|
161
151
|
:remote-paging="true"
|
|
162
152
|
:col="2"
|
|
163
153
|
:iffall="false">
|
|
164
154
|
<template #item="current">
|
|
165
155
|
<van-cardu no-title>
|
|
166
|
-
${properties.map((property) => genH5GridViewCardTemplate(property, nameGroup)
|
|
156
|
+
${properties.map((property) => `${genH5GridViewCardTemplate(property, nameGroup)}\n`).join('')}
|
|
167
157
|
</van-cardu>
|
|
168
158
|
</template>
|
|
169
159
|
</van-grid-view>
|
|
@@ -223,7 +213,7 @@ exports.genGridViewLoadLogic = genGridViewLoadLogic;
|
|
|
223
213
|
*/
|
|
224
214
|
function genGridViewRemoveLogic(entity, nameGroup) {
|
|
225
215
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
226
|
-
const ns = entity
|
|
216
|
+
const { ns } = entity;
|
|
227
217
|
const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
|
|
228
218
|
const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
|
|
229
219
|
const currentName = nameGroup.currentName || 'current';
|
|
@@ -263,7 +253,7 @@ exports.genGridViewRemoveLogic = genGridViewRemoveLogic;
|
|
|
263
253
|
*/
|
|
264
254
|
// 数据网格(简)
|
|
265
255
|
function genGridViewBlock(entity, oldNode) {
|
|
266
|
-
const view = oldNode
|
|
256
|
+
const { view } = oldNode;
|
|
267
257
|
const dataSource = entity.parentNode;
|
|
268
258
|
const module = dataSource.app;
|
|
269
259
|
const viewElementMainView = view.getViewElementUniqueName('gridView');
|
|
@@ -293,7 +283,7 @@ function genGridViewBlock(entity, oldNode) {
|
|
|
293
283
|
newLogics.push(entityLogic);
|
|
294
284
|
return `
|
|
295
285
|
<template>
|
|
296
|
-
${config_1.config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup
|
|
286
|
+
${config_1.config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
|
|
297
287
|
</template>
|
|
298
288
|
<definition>
|
|
299
289
|
{
|
|
@@ -309,8 +299,8 @@ function genGridViewBlock(entity, oldNode) {
|
|
|
309
299
|
}
|
|
310
300
|
exports.genGridViewBlock = genGridViewBlock;
|
|
311
301
|
function genGridViewCardBlock(property, oldNode) {
|
|
312
|
-
const view = oldNode
|
|
313
|
-
const entity = property
|
|
302
|
+
const { view } = oldNode;
|
|
303
|
+
const { entity } = property;
|
|
314
304
|
const dataSource = entity.parentNode;
|
|
315
305
|
const module = dataSource.app;
|
|
316
306
|
const viewElementMainView = view.getViewElementUniqueName('gridView');
|
|
@@ -338,7 +328,7 @@ function genGridViewCardBlock(property, oldNode) {
|
|
|
338
328
|
newLogics.push(entityLogic);
|
|
339
329
|
return `
|
|
340
330
|
<template>
|
|
341
|
-
${genGridViewTemplate(entity, nameGroup
|
|
331
|
+
${genGridViewTemplate(entity, nameGroup)}
|
|
342
332
|
</template>
|
|
343
333
|
<definition>
|
|
344
334
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBASW;AACX,mCAAwE;AAExE;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,QAAwB,EAAE,SAAoB;
|
|
1
|
+
{"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Entity, EntityProperty, ViewElement } from '../concepts';
|
|
2
2
|
import { NameGroup } from './utils';
|
|
3
|
-
export declare function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup
|
|
4
|
-
export declare function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup
|
|
3
|
+
export declare function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup): string;
|
|
4
|
+
export declare function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup): string;
|
|
5
5
|
export declare function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newLogics: Array<any>): {
|
|
6
6
|
concept: string;
|
|
7
7
|
name: string;
|
|
@@ -28,13 +28,12 @@ const config_1 = require("../config");
|
|
|
28
28
|
const utils = __importStar(require("../utils"));
|
|
29
29
|
const _1 = require(".");
|
|
30
30
|
const utils_1 = require("./utils");
|
|
31
|
-
function genListViewTemplate(property, nameGroup
|
|
32
|
-
const entity = property
|
|
31
|
+
function genListViewTemplate(property, nameGroup) {
|
|
32
|
+
const { entity } = property;
|
|
33
33
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
34
34
|
const currentName = nameGroup.currentName || 'current';
|
|
35
35
|
const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
|
|
36
|
-
|
|
37
|
-
return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
|
|
36
|
+
return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
38
37
|
text-field="${nameGroup.viewVariableEntity}.${property.name}"
|
|
39
38
|
value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
|
|
40
39
|
<template #item="current">
|
|
@@ -45,13 +44,12 @@ function genListViewTemplate(property, nameGroup, newLogic) {
|
|
|
45
44
|
</u-list-view>`;
|
|
46
45
|
}
|
|
47
46
|
exports.genListViewTemplate = genListViewTemplate;
|
|
48
|
-
function genH5ListViewTemplate(property, nameGroup
|
|
49
|
-
const entity = property
|
|
47
|
+
function genH5ListViewTemplate(property, nameGroup) {
|
|
48
|
+
const { entity } = property;
|
|
50
49
|
const lowerEntityName = utils.firstLowerCase(entity.name);
|
|
51
50
|
const currentName = nameGroup.currentName || 'current';
|
|
52
51
|
const valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
|
|
53
|
-
|
|
54
|
-
return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
|
|
52
|
+
return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
|
|
55
53
|
text-field="${nameGroup.viewVariableEntity}.${property.name}"
|
|
56
54
|
value-field="${nameGroup.viewVariableEntity}.id" pageable="auto-more" :remote-paging="true">
|
|
57
55
|
<template #item="current">
|
|
@@ -99,10 +97,7 @@ function genLoadListViewLogic(entity, nameGroup, newLogics) {
|
|
|
99
97
|
right: utils_1.NaslLogicItem.CallLogic({
|
|
100
98
|
calleeNamespace: `${moduleNamespace}.logics`,
|
|
101
99
|
calleeName: entityLogic.name,
|
|
102
|
-
arguments: [
|
|
103
|
-
(0, _1.genLogicParam)(`${entityLogic.params[0].name}`, 'params.page'),
|
|
104
|
-
(0, _1.genLogicParam)(`${entityLogic.params[1].name}`, 'params.size'),
|
|
105
|
-
],
|
|
100
|
+
arguments: [(0, _1.genLogicParam)(`${entityLogic.params[0].name}`, 'params.page'), (0, _1.genLogicParam)(`${entityLogic.params[1].name}`, 'params.size')],
|
|
106
101
|
}),
|
|
107
102
|
}),
|
|
108
103
|
utils_1.NaslLogicItem.End,
|
|
@@ -114,7 +109,7 @@ exports.genLoadListViewLogic = genLoadListViewLogic;
|
|
|
114
109
|
* 生成实体选择框区块
|
|
115
110
|
*/
|
|
116
111
|
function genListViewBlock(entity, oldNode, property) {
|
|
117
|
-
const view = oldNode
|
|
112
|
+
const { view } = oldNode;
|
|
118
113
|
const dataSource = entity.parentNode;
|
|
119
114
|
const module = dataSource.app;
|
|
120
115
|
const viewElementMainView = view.getViewElementUniqueName('listView');
|
|
@@ -125,10 +120,8 @@ function genListViewBlock(entity, oldNode, property) {
|
|
|
125
120
|
nameGroup.currentName = oldNode.getCurrentName();
|
|
126
121
|
const displayedProperty = property || (0, _1.getFirstDisplayedProperty)(entity);
|
|
127
122
|
const newLogics = [];
|
|
128
|
-
const parentNode = entity.parentNode;
|
|
129
|
-
const entityLogic = (0, _1.genQueryLogic)([entity], nameGroup, false, false, parentNode);
|
|
130
123
|
return `<template>
|
|
131
|
-
${config_1.config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup
|
|
124
|
+
${config_1.config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup) : genListViewTemplate(displayedProperty, nameGroup)}
|
|
132
125
|
</template>
|
|
133
126
|
|
|
134
127
|
<definition>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAAqG;AACrG,
|
|
1
|
+
{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,7 +93,9 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
93
93
|
entityNamespace: entity.getNamespace(),
|
|
94
94
|
entityName: entity.name,
|
|
95
95
|
joinParts: allEntities.map((relationEntity) => {
|
|
96
|
-
const onExpressions = entity.properties
|
|
96
|
+
const onExpressions = entity.properties
|
|
97
|
+
?.filter((property) => property.relationEntity === relationEntity.name)
|
|
98
|
+
.map((leftProperty) => utils_1.NaslLogicItem.BinaryExpression({
|
|
97
99
|
operator: '==',
|
|
98
100
|
left: utils_1.NaslQueryExpression.QueryFieldExpression({
|
|
99
101
|
label: '查询组件实体属性',
|
|
@@ -135,19 +137,22 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
135
137
|
selectElements,
|
|
136
138
|
});
|
|
137
139
|
const where = supportFilter ? genWhereExpression(entity) : undefined;
|
|
138
|
-
const aStructureProperties = [
|
|
140
|
+
const aStructureProperties = [
|
|
141
|
+
utils_1.NaslNode.StructureProperty({
|
|
139
142
|
name: utils.firstLowerCase(entity.name),
|
|
140
143
|
typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
|
|
141
144
|
typeNamespace: entity.getNamespace(),
|
|
142
145
|
typeName: entity.name,
|
|
143
146
|
}),
|
|
144
|
-
}),
|
|
147
|
+
}),
|
|
148
|
+
...allEntities.map((relationEntity) => utils_1.NaslNode.StructureProperty({
|
|
145
149
|
name: utils.firstLowerCase(relationEntity.name),
|
|
146
150
|
typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
|
|
147
151
|
typeNamespace: relationEntity.getNamespace(),
|
|
148
152
|
typeName: relationEntity.name,
|
|
149
153
|
}),
|
|
150
|
-
}))
|
|
154
|
+
})),
|
|
155
|
+
];
|
|
151
156
|
return utils_1.NaslLogicItem.Assignment({
|
|
152
157
|
left: utils_1.NaslLogicItem.Identifier({
|
|
153
158
|
name: 'result',
|
|
@@ -163,17 +168,19 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
|
|
|
163
168
|
where,
|
|
164
169
|
groupBy: [],
|
|
165
170
|
having: null,
|
|
166
|
-
orderBy: supportSort
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
+
orderBy: supportSort
|
|
172
|
+
? [
|
|
173
|
+
utils_1.NaslQueryExpression.QueryOrderByExpression({
|
|
174
|
+
label: '查询组件OrderBy元素',
|
|
175
|
+
order: utils_1.NaslLogicItem.Identifier({
|
|
176
|
+
name: 'order',
|
|
177
|
+
}),
|
|
178
|
+
orderElement: utils_1.NaslLogicItem.Identifier({
|
|
179
|
+
name: 'sort',
|
|
180
|
+
}),
|
|
171
181
|
}),
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}),
|
|
175
|
-
}),
|
|
176
|
-
] : [],
|
|
182
|
+
]
|
|
183
|
+
: [],
|
|
177
184
|
logicName: nameGroup.logic,
|
|
178
185
|
structureName: nameGroup.structure,
|
|
179
186
|
limit: utils_1.NaslQueryExpression.QueryLimitExpression({
|
|
@@ -239,7 +246,7 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
|
|
|
239
246
|
exports.genQueryLogic = genQueryLogic;
|
|
240
247
|
async function joinEntity(callQueryComponent, entity, recordStructure) {
|
|
241
248
|
const dataSource = entity.parentNode;
|
|
242
|
-
const from = callQueryComponent
|
|
249
|
+
const { from } = callQueryComponent;
|
|
243
250
|
let joinInfo;
|
|
244
251
|
// 无法判断用户行为,优先加有关系的
|
|
245
252
|
const lastEntity = dataSource.findEntityByName(from.entityName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,14 @@ import { NameGroup } from '.';
|
|
|
6
6
|
* @param nameGroup
|
|
7
7
|
* @returns
|
|
8
8
|
*/
|
|
9
|
-
export declare function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
|
|
9
|
+
export declare function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup): string;
|
|
10
10
|
/**
|
|
11
11
|
* 生成select的模板(h5)
|
|
12
12
|
* @param property
|
|
13
13
|
* @param nameGroup
|
|
14
14
|
* @returns
|
|
15
15
|
*/
|
|
16
|
-
export declare function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup
|
|
16
|
+
export declare function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup): string;
|
|
17
17
|
export declare function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogic: any): {
|
|
18
18
|
concept: string;
|
|
19
19
|
name: string;
|