@eclipse-glsp/client 0.10.0-next.ca17587.154 → 1.1.0-RC01
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/css/decoration.css +5 -1
- package/css/glsp-sprotty.css +149 -8
- package/css/tool-palette.css +2 -2
- package/lib/base/action-dispatcher.d.ts +4 -3
- package/lib/base/action-dispatcher.d.ts.map +1 -1
- package/lib/base/action-dispatcher.js +22 -12
- package/lib/base/action-dispatcher.js.map +1 -1
- package/lib/base/actions/focus-change-action.d.ts +16 -7
- package/lib/base/actions/focus-change-action.d.ts.map +1 -1
- package/lib/base/actions/focus-change-action.js +31 -12
- package/lib/base/actions/focus-change-action.js.map +1 -1
- package/lib/base/actions/sprotty-actions.d.ts +7 -0
- package/lib/base/actions/sprotty-actions.d.ts.map +1 -0
- package/lib/{features/tool-palette/palette-item.js → base/actions/sprotty-actions.js} +4 -20
- package/lib/base/actions/sprotty-actions.js.map +1 -0
- package/lib/base/auto-complete/auto-complete-actions.d.ts +5 -3
- package/lib/base/auto-complete/auto-complete-actions.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-actions.js +24 -5
- package/lib/base/auto-complete/auto-complete-actions.js.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.d.ts +9 -2
- package/lib/base/auto-complete/auto-complete-widget.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.js +16 -9
- package/lib/base/auto-complete/auto-complete-widget.js.map +1 -1
- package/lib/base/auto-complete/validation-decorator.js +2 -2
- package/lib/base/auto-complete/validation-decorator.js.map +1 -1
- package/lib/base/command-stack.d.ts.map +1 -1
- package/lib/base/command-stack.js +6 -5
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/container-modules.d.ts.map +1 -1
- package/lib/base/container-modules.js +10 -9
- package/lib/base/container-modules.js.map +1 -1
- package/lib/base/di.config.d.ts +1 -1
- package/lib/base/di.config.d.ts.map +1 -1
- package/lib/base/di.config.js +13 -14
- package/lib/base/di.config.js.map +1 -1
- package/lib/base/drag-aware-mouse-listener.d.ts +1 -1
- package/lib/base/drag-aware-mouse-listener.d.ts.map +1 -1
- package/lib/base/drag-aware-mouse-listener.js.map +1 -1
- package/lib/base/editor-context-service.d.ts +15 -4
- package/lib/base/editor-context-service.d.ts.map +1 -1
- package/lib/base/editor-context-service.js +31 -19
- package/lib/base/editor-context-service.js.map +1 -1
- package/lib/base/focus-tracker.d.ts +1 -1
- package/lib/base/focus-tracker.d.ts.map +1 -1
- package/lib/base/focus-tracker.js +4 -4
- package/lib/base/focus-tracker.js.map +1 -1
- package/lib/base/model/model-registry.d.ts.map +1 -1
- package/lib/base/model/model-registry.js +2 -2
- package/lib/base/model/model-registry.js.map +1 -1
- package/lib/base/model/update-model-command.d.ts +15 -8
- package/lib/base/model/update-model-command.d.ts.map +1 -1
- package/lib/base/model/update-model-command.js +43 -53
- package/lib/base/model/update-model-command.js.map +1 -1
- package/lib/base/model-initialization-constraint.d.ts +4 -5
- package/lib/base/model-initialization-constraint.d.ts.map +1 -1
- package/lib/base/model-initialization-constraint.js +11 -13
- package/lib/base/model-initialization-constraint.js.map +1 -1
- package/lib/base/selection-clearing-mouse-listener.d.ts.map +1 -1
- package/lib/base/selection-clearing-mouse-listener.js +1 -1
- package/lib/base/selection-clearing-mouse-listener.js.map +1 -1
- package/lib/base/source-uri-aware.d.ts +2 -17
- package/lib/base/source-uri-aware.d.ts.map +1 -1
- package/lib/base/source-uri-aware.js +4 -6
- package/lib/base/source-uri-aware.js.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.js +10 -10
- package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
- package/lib/base/tool-manager/tool-actions.d.ts +14 -0
- package/lib/base/tool-manager/tool-actions.d.ts.map +1 -0
- package/lib/base/tool-manager/tool-actions.js +25 -0
- package/lib/base/tool-manager/tool-actions.js.map +1 -0
- package/lib/base/types.d.ts +146 -20
- package/lib/base/types.d.ts.map +1 -1
- package/lib/base/types.js +14 -26
- package/lib/base/types.js.map +1 -1
- package/lib/base/view/view-registry.d.ts.map +1 -1
- package/lib/base/view/view-registry.js +2 -2
- package/lib/base/view/view-registry.js.map +1 -1
- package/lib/features/change-bounds/model.d.ts +1 -1
- package/lib/features/change-bounds/model.d.ts.map +1 -1
- package/lib/features/change-bounds/model.js +3 -3
- package/lib/features/change-bounds/model.js.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.d.ts +37 -7
- package/lib/features/change-bounds/movement-restrictor.d.ts.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.js +55 -40
- package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
- package/lib/features/change-bounds/snap.d.ts +60 -4
- package/lib/features/change-bounds/snap.d.ts.map +1 -1
- package/lib/features/change-bounds/snap.js +96 -9
- package/lib/features/change-bounds/snap.js.map +1 -1
- package/lib/features/change-bounds/snap.spec.d.ts +17 -0
- package/lib/features/change-bounds/snap.spec.d.ts.map +1 -0
- package/lib/features/change-bounds/snap.spec.js +82 -0
- package/lib/features/change-bounds/snap.spec.js.map +1 -0
- package/lib/features/command-palette/command-palette-tool.js +3 -3
- package/lib/features/command-palette/command-palette-tool.js.map +1 -1
- package/lib/features/command-palette/di.config.d.ts +2 -2
- package/lib/features/command-palette/di.config.d.ts.map +1 -1
- package/lib/features/command-palette/di.config.js +6 -6
- package/lib/features/command-palette/di.config.js.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.d.ts +1 -1
- package/lib/features/command-palette/server-command-palette-provider.d.ts.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.js +13 -10
- package/lib/features/command-palette/server-command-palette-provider.js.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts +17 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.js +4 -4
- package/lib/features/context-menu/delete-element-context-menu.js.map +1 -1
- package/lib/features/context-menu/di.config.d.ts +1 -1
- package/lib/features/context-menu/di.config.d.ts.map +1 -1
- package/lib/features/context-menu/di.config.js +8 -7
- package/lib/features/context-menu/di.config.js.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +34 -4
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +37 -31
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.d.ts +1 -1
- package/lib/features/context-menu/server-context-menu-provider.d.ts.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.js +8 -7
- package/lib/features/context-menu/server-context-menu-provider.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts +12 -15
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.js +26 -33
- package/lib/features/copy-paste/copy-paste-context-menu.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.js +10 -11
- package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
- package/lib/features/copy-paste/di.config.d.ts +1 -1
- package/lib/features/copy-paste/di.config.d.ts.map +1 -1
- package/lib/features/copy-paste/di.config.js +5 -7
- package/lib/features/copy-paste/di.config.js.map +1 -1
- package/lib/features/decoration/decoration-placer.d.ts +1 -1
- package/lib/features/decoration/decoration-placer.d.ts.map +1 -1
- package/lib/features/decoration/decoration-placer.js +19 -3
- package/lib/features/decoration/decoration-placer.js.map +1 -1
- package/lib/features/decoration/di.config.d.ts +2 -2
- package/lib/features/decoration/di.config.d.ts.map +1 -1
- package/lib/features/decoration/di.config.js +4 -4
- package/lib/features/decoration/di.config.js.map +1 -1
- package/lib/features/edit-label/di.config.d.ts +1 -1
- package/lib/features/edit-label/di.config.d.ts.map +1 -1
- package/lib/features/edit-label/di.config.js +5 -5
- package/lib/features/edit-label/di.config.js.map +1 -1
- package/lib/features/edit-label/edit-label-tool.d.ts.map +1 -1
- package/lib/features/edit-label/edit-label-tool.js +2 -2
- package/lib/features/edit-label/edit-label-tool.js.map +1 -1
- package/lib/features/edit-label/edit-label-validator.d.ts +4 -6
- package/lib/features/edit-label/edit-label-validator.d.ts.map +1 -1
- package/lib/features/edit-label/edit-label-validator.js +11 -13
- package/lib/features/edit-label/edit-label-validator.js.map +1 -1
- package/lib/features/hints/di.config.js +4 -4
- package/lib/features/hints/di.config.js.map +1 -1
- package/lib/features/hints/type-hints.d.ts +15 -5
- package/lib/features/hints/type-hints.d.ts.map +1 -1
- package/lib/features/hints/type-hints.js +29 -26
- package/lib/features/hints/type-hints.js.map +1 -1
- package/lib/features/hover/di.config.d.ts +1 -1
- package/lib/features/hover/di.config.d.ts.map +1 -1
- package/lib/features/hover/di.config.js +14 -10
- package/lib/features/hover/di.config.js.map +1 -1
- package/lib/features/hover/hover.d.ts +16 -5
- package/lib/features/hover/hover.d.ts.map +1 -1
- package/lib/features/hover/hover.js +44 -19
- package/lib/features/hover/hover.js.map +1 -1
- package/lib/features/layout/di.config.d.ts +3 -3
- package/lib/features/layout/di.config.d.ts.map +1 -1
- package/lib/features/layout/di.config.js +12 -7
- package/lib/features/layout/di.config.js.map +1 -1
- package/lib/features/layout/freeform-layout.d.ts +17 -1
- package/lib/features/layout/freeform-layout.d.ts.map +1 -1
- package/lib/features/layout/freeform-layout.js +4 -4
- package/lib/features/layout/freeform-layout.js.map +1 -1
- package/lib/features/layout/hbox-layout.d.ts +41 -0
- package/lib/features/layout/hbox-layout.d.ts.map +1 -0
- package/lib/features/layout/hbox-layout.js +201 -0
- package/lib/features/layout/hbox-layout.js.map +1 -0
- package/lib/features/layout/layout-elements-action.d.ts +198 -0
- package/lib/features/layout/layout-elements-action.d.ts.map +1 -0
- package/lib/features/layout/layout-elements-action.js +391 -0
- package/lib/features/layout/layout-elements-action.js.map +1 -0
- package/lib/features/layout/layout-elements-action.spec.d.ts +3 -0
- package/lib/features/layout/layout-elements-action.spec.d.ts.map +1 -0
- package/lib/features/layout/{layout-commands.spec.js → layout-elements-action.spec.js} +81 -62
- package/lib/features/layout/layout-elements-action.spec.js.map +1 -0
- package/lib/features/layout/layouter.d.ts +37 -0
- package/lib/features/layout/layouter.d.ts.map +1 -0
- package/lib/features/layout/layouter.js +131 -0
- package/lib/features/layout/layouter.js.map +1 -0
- package/lib/features/layout/tests/freeform-layout.spec.d.ts +3 -0
- package/lib/features/layout/tests/freeform-layout.spec.d.ts.map +1 -0
- package/lib/features/layout/tests/freeform-layout.spec.js +201 -0
- package/lib/features/layout/tests/freeform-layout.spec.js.map +1 -0
- package/lib/features/layout/tests/hbox-layout.spec.d.ts +3 -0
- package/lib/features/layout/tests/hbox-layout.spec.d.ts.map +1 -0
- package/lib/features/layout/tests/hbox-layout.spec.js +161 -0
- package/lib/features/layout/tests/hbox-layout.spec.js.map +1 -0
- package/lib/features/layout/tests/layouter-test-util.d.ts +34 -0
- package/lib/features/layout/tests/layouter-test-util.d.ts.map +1 -0
- package/lib/features/layout/tests/layouter-test-util.js +96 -0
- package/lib/features/layout/tests/layouter-test-util.js.map +1 -0
- package/lib/features/layout/tests/vbox-layout.spec.d.ts +3 -0
- package/lib/features/layout/tests/vbox-layout.spec.d.ts.map +1 -0
- package/lib/features/layout/tests/vbox-layout.spec.js +161 -0
- package/lib/features/layout/tests/vbox-layout.spec.js.map +1 -0
- package/lib/features/layout/vbox-layout.d.ts +18 -2
- package/lib/features/layout/vbox-layout.d.ts.map +1 -1
- package/lib/features/layout/vbox-layout.js +26 -13
- package/lib/features/layout/vbox-layout.js.map +1 -1
- package/lib/features/mouse-tool/di.config.d.ts +1 -1
- package/lib/features/mouse-tool/di.config.d.ts.map +1 -1
- package/lib/features/mouse-tool/di.config.js +2 -2
- package/lib/features/mouse-tool/di.config.js.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts +9 -6
- package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.js +10 -48
- package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
- package/lib/features/navigation/di.config.js +4 -4
- package/lib/features/navigation/di.config.js.map +1 -1
- package/lib/features/navigation/navigation-action-handler.d.ts +31 -16
- package/lib/features/navigation/navigation-action-handler.d.ts.map +1 -1
- package/lib/features/navigation/navigation-action-handler.js +52 -68
- package/lib/features/navigation/navigation-action-handler.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.d.ts +3 -3
- package/lib/features/navigation/navigation-target-resolver.d.ts.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.js +8 -9
- package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.spec.js +12 -12
- package/lib/features/navigation/navigation-target-resolver.spec.js.map +1 -1
- package/lib/features/reconnect/model.d.ts +1 -1
- package/lib/features/reconnect/model.d.ts.map +1 -1
- package/lib/features/reconnect/model.js +1 -1
- package/lib/features/reconnect/model.js.map +1 -1
- package/lib/features/save/di.config.d.ts +1 -1
- package/lib/features/save/di.config.d.ts.map +1 -1
- package/lib/features/save/di.config.js +3 -3
- package/lib/features/save/di.config.js.map +1 -1
- package/lib/features/save/save-keylistener.d.ts +1 -1
- package/lib/features/save/save-keylistener.d.ts.map +1 -1
- package/lib/features/save/save-keylistener.js +3 -3
- package/lib/features/save/save-keylistener.js.map +1 -1
- package/lib/features/select/di.config.d.ts +1 -1
- package/lib/features/select/di.config.d.ts.map +1 -1
- package/lib/features/select/di.config.js +7 -8
- package/lib/features/select/di.config.js.map +1 -1
- package/lib/features/select/select-feedback-action.d.ts +26 -22
- package/lib/features/select/select-feedback-action.d.ts.map +1 -1
- package/lib/features/select/select-feedback-action.js +19 -46
- package/lib/features/select/select-feedback-action.js.map +1 -1
- package/lib/features/select/select-mouse-listener.d.ts +4 -2
- package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
- package/lib/features/select/select-mouse-listener.js +63 -1
- package/lib/features/select/select-mouse-listener.js.map +1 -1
- package/lib/features/select/selection-service.d.ts +14 -5
- package/lib/features/select/selection-service.d.ts.map +1 -1
- package/lib/features/select/selection-service.js +55 -64
- package/lib/features/select/selection-service.js.map +1 -1
- package/lib/features/select/selection-service.spec.js +28 -25
- package/lib/features/select/selection-service.spec.js.map +1 -1
- package/lib/features/source-model-watcher/di.config.d.ts +4 -0
- package/lib/features/{model-source-watcher → source-model-watcher}/di.config.d.ts.map +1 -1
- package/lib/features/{model-source-watcher → source-model-watcher}/di.config.js +4 -4
- package/lib/features/source-model-watcher/di.config.js.map +1 -0
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.d.ts → source-model-watcher/source-model-changed-action-handler.d.ts} +10 -10
- package/lib/features/source-model-watcher/source-model-changed-action-handler.d.ts.map +1 -0
- package/lib/features/{model-source-watcher/model-source-changed-action-handler.js → source-model-watcher/source-model-changed-action-handler.js} +28 -28
- package/lib/features/source-model-watcher/source-model-changed-action-handler.js.map +1 -0
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts +17 -9
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js +68 -38
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts +24 -12
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js +88 -35
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/css-feedback.d.ts +17 -10
- package/lib/features/tool-feedback/css-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/css-feedback.js +42 -38
- package/lib/features/tool-feedback/css-feedback.js.map +1 -1
- package/lib/features/tool-feedback/di.config.d.ts +1 -1
- package/lib/features/tool-feedback/di.config.d.ts.map +1 -1
- package/lib/features/tool-feedback/di.config.js +18 -18
- package/lib/features/tool-feedback/di.config.js.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +45 -22
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js +147 -114
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts +2 -2
- package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.js +4 -4
- package/lib/features/tool-feedback/feedback-action-dispatcher.js.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts +21 -10
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.js +44 -18
- package/lib/features/tool-feedback/marquee-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/model.d.ts +1 -2
- package/lib/features/tool-feedback/model.d.ts.map +1 -1
- package/lib/features/tool-feedback/model.js +1 -1
- package/lib/features/tool-feedback/model.js.map +1 -1
- package/lib/features/tool-feedback/view.d.ts +1 -1
- package/lib/features/tool-feedback/view.d.ts.map +1 -1
- package/lib/features/tool-feedback/view.js +22 -5
- package/lib/features/tool-feedback/view.js.map +1 -1
- package/lib/features/tool-palette/di.config.d.ts +1 -1
- package/lib/features/tool-palette/di.config.d.ts.map +1 -1
- package/lib/features/tool-palette/di.config.js +5 -4
- package/lib/features/tool-palette/di.config.js.map +1 -1
- package/lib/features/tool-palette/tool-palette.d.ts +10 -7
- package/lib/features/tool-palette/tool-palette.d.ts.map +1 -1
- package/lib/features/tool-palette/tool-palette.js +39 -32
- package/lib/features/tool-palette/tool-palette.js.map +1 -1
- package/lib/features/tools/base-glsp-tool.d.ts +3 -3
- package/lib/features/tools/base-glsp-tool.d.ts.map +1 -1
- package/lib/features/tools/base-glsp-tool.js +11 -11
- package/lib/features/tools/base-glsp-tool.js.map +1 -1
- package/lib/features/tools/change-bounds-tool.d.ts +7 -9
- package/lib/features/tools/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds-tool.js +48 -71
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/delete-tool.d.ts +1 -1
- package/lib/features/tools/delete-tool.d.ts.map +1 -1
- package/lib/features/tools/delete-tool.js +17 -17
- package/lib/features/tools/delete-tool.js.map +1 -1
- package/lib/features/tools/di.config.d.ts +9 -2
- package/lib/features/tools/di.config.d.ts.map +1 -1
- package/lib/features/tools/di.config.js +26 -15
- package/lib/features/tools/di.config.js.map +1 -1
- package/lib/features/tools/edge-creation-tool.d.ts +1 -1
- package/lib/features/tools/edge-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-creation-tool.js +28 -21
- package/lib/features/tools/edge-creation-tool.js.map +1 -1
- package/lib/features/tools/edge-edit-tool.d.ts +3 -2
- package/lib/features/tools/edge-edit-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-edit-tool.js +41 -36
- package/lib/features/tools/edge-edit-tool.js.map +1 -1
- package/lib/features/{tool-palette/palette-item.d.ts → tools/enable-default-tools-on-focus-loss.d.ts} +11 -11
- package/lib/features/tools/enable-default-tools-on-focus-loss.d.ts.map +1 -0
- package/lib/features/tools/enable-default-tools-on-focus-loss.js +29 -0
- package/lib/features/tools/enable-default-tools-on-focus-loss.js.map +1 -0
- package/lib/features/tools/marquee-behavior.d.ts +1 -1
- package/lib/features/tools/marquee-behavior.js +2 -2
- package/lib/features/tools/marquee-behavior.js.map +1 -1
- package/lib/features/tools/marquee-behavior.spec.js +63 -63
- package/lib/features/tools/marquee-behavior.spec.js.map +1 -1
- package/lib/features/tools/marquee-mouse-tool.d.ts +1 -1
- package/lib/features/tools/marquee-mouse-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-mouse-tool.js +20 -20
- package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
- package/lib/features/tools/marquee-tool.d.ts +1 -1
- package/lib/features/tools/marquee-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-tool.js +4 -4
- package/lib/features/tools/marquee-tool.js.map +1 -1
- package/lib/features/tools/model.d.ts +3 -2
- package/lib/features/tools/model.d.ts.map +1 -1
- package/lib/features/tools/model.js +0 -15
- package/lib/features/tools/model.js.map +1 -1
- package/lib/features/tools/node-creation-tool.d.ts +1 -1
- package/lib/features/tools/node-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/node-creation-tool.js +17 -17
- package/lib/features/tools/node-creation-tool.js.map +1 -1
- package/lib/features/tools/view.d.ts.map +1 -1
- package/lib/features/tools/view.js +2 -2
- package/lib/features/tools/view.js.map +1 -1
- package/lib/features/validation/di.config.d.ts +0 -15
- package/lib/features/validation/di.config.d.ts.map +1 -1
- package/lib/features/validation/di.config.js +9 -7
- package/lib/features/validation/di.config.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +11 -5
- package/lib/features/validation/issue-marker.d.ts.map +1 -1
- package/lib/features/validation/issue-marker.js +25 -5
- package/lib/features/validation/issue-marker.js.map +1 -1
- package/lib/features/validation/marker-navigator.d.ts +27 -25
- package/lib/features/validation/marker-navigator.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.js +64 -91
- package/lib/features/validation/marker-navigator.js.map +1 -1
- package/lib/features/validation/marker-navigator.spec.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.spec.js +23 -37
- package/lib/features/validation/marker-navigator.spec.js.map +1 -1
- package/lib/features/validation/validate.d.ts +17 -30
- package/lib/features/validation/validate.d.ts.map +1 -1
- package/lib/features/validation/validate.js +66 -91
- package/lib/features/validation/validate.js.map +1 -1
- package/lib/features/viewport/di.config.d.ts +1 -1
- package/lib/features/viewport/di.config.d.ts.map +1 -1
- package/lib/features/viewport/di.config.js +7 -7
- package/lib/features/viewport/di.config.js.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.js +3 -3
- package/lib/features/viewport/glsp-scroll-mouse-listener.js.map +1 -1
- package/lib/index.d.ts +10 -11
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +26 -22
- package/lib/index.js.map +1 -1
- package/lib/lib/model.d.ts +3 -2
- package/lib/lib/model.d.ts.map +1 -1
- package/lib/lib/model.js +3 -18
- package/lib/lib/model.js.map +1 -1
- package/lib/model-source/glsp-diagram-server.d.ts +6 -6
- package/lib/model-source/glsp-diagram-server.d.ts.map +1 -1
- package/lib/model-source/glsp-diagram-server.js +8 -7
- package/lib/model-source/glsp-diagram-server.js.map +1 -1
- package/lib/sprotty-reexport.d.ts +174 -0
- package/lib/sprotty-reexport.d.ts.map +1 -0
- package/lib/sprotty-reexport.js +301 -0
- package/lib/sprotty-reexport.js.map +1 -0
- package/lib/utils/argument-utils.js +5 -5
- package/lib/utils/argument-utils.js.map +1 -1
- package/lib/utils/layout-utils.d.ts +6 -22
- package/lib/utils/layout-utils.d.ts.map +1 -1
- package/lib/utils/layout-utils.js +1 -1
- package/lib/utils/layout-utils.js.map +1 -1
- package/lib/utils/smodel-util.d.ts +117 -11
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +142 -37
- package/lib/utils/smodel-util.js.map +1 -1
- package/lib/utils/viewpoint-util.d.ts +3 -3
- package/lib/utils/viewpoint-util.d.ts.map +1 -1
- package/lib/utils/viewpoint-util.js +19 -3
- package/lib/utils/viewpoint-util.js.map +1 -1
- package/lib/views/base-view-module.d.ts.map +1 -1
- package/lib/views/base-view-module.js +21 -19
- package/lib/views/base-view-module.js.map +1 -1
- package/lib/views/compartments.js +2 -2
- package/lib/views/compartments.js.map +1 -1
- package/lib/views/glsp-edge-view.d.ts +1 -1
- package/lib/views/glsp-edge-view.d.ts.map +1 -1
- package/lib/views/glsp-edge-view.js +1 -1
- package/lib/views/glsp-edge-view.js.map +1 -1
- package/lib/views/glsp-projection-view.d.ts +30 -0
- package/lib/views/glsp-projection-view.d.ts.map +1 -0
- package/lib/views/glsp-projection-view.js +148 -0
- package/lib/views/glsp-projection-view.js.map +1 -0
- package/lib/views/index.d.ts +1 -0
- package/lib/views/index.d.ts.map +1 -1
- package/lib/views/index.js +7 -2
- package/lib/views/index.js.map +1 -1
- package/lib/views/issue-marker-view.d.ts.map +1 -1
- package/lib/views/issue-marker-view.js +3 -3
- package/lib/views/issue-marker-view.js.map +1 -1
- package/lib/views/rounded-corner-view.d.ts.map +1 -1
- package/lib/views/rounded-corner-view.js +2 -2
- package/lib/views/rounded-corner-view.js.map +1 -1
- package/package.json +10 -19
- package/src/base/action-dispatcher.ts +26 -16
- package/src/base/actions/focus-change-action.ts +25 -8
- package/src/base/actions/sprotty-actions.ts +26 -0
- package/src/base/auto-complete/auto-complete-actions.ts +7 -5
- package/src/base/auto-complete/auto-complete-widget.ts +15 -13
- package/src/base/command-stack.ts +7 -6
- package/src/base/container-modules.ts +6 -5
- package/src/base/di.config.ts +4 -5
- package/src/base/drag-aware-mouse-listener.ts +4 -4
- package/src/base/editor-context-service.ts +32 -12
- package/src/base/focus-tracker.ts +5 -4
- package/src/base/model/model-registry.ts +2 -2
- package/src/base/model/update-model-command.ts +54 -41
- package/src/base/model-initialization-constraint.ts +9 -11
- package/src/base/selection-clearing-mouse-listener.ts +1 -1
- package/src/base/source-uri-aware.ts +5 -4
- package/src/base/tool-manager/glsp-tool-manager.ts +9 -9
- package/src/base/tool-manager/tool-actions.ts +37 -0
- package/src/base/types.ts +31 -24
- package/src/base/view/view-registry.ts +2 -2
- package/src/features/change-bounds/model.ts +5 -5
- package/src/features/change-bounds/movement-restrictor.ts +74 -44
- package/src/features/change-bounds/snap.spec.ts +89 -0
- package/src/features/change-bounds/snap.ts +99 -12
- package/src/features/command-palette/di.config.ts +5 -7
- package/src/features/command-palette/server-command-palette-provider.ts +9 -8
- package/src/features/context-menu/delete-element-context-menu.ts +6 -6
- package/src/features/context-menu/di.config.ts +3 -2
- package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +51 -29
- package/src/features/context-menu/server-context-menu-provider.ts +7 -6
- package/src/features/copy-paste/copy-paste-context-menu.ts +30 -23
- package/src/features/copy-paste/copy-paste-handler.ts +6 -6
- package/src/features/copy-paste/di.config.ts +7 -15
- package/src/features/decoration/decoration-placer.ts +4 -4
- package/src/features/decoration/di.config.ts +3 -5
- package/src/features/edit-label/di.config.ts +4 -5
- package/src/features/edit-label/edit-label-tool.ts +1 -2
- package/src/features/edit-label/edit-label-validator.ts +6 -10
- package/src/features/hints/di.config.ts +3 -3
- package/src/features/hints/type-hints.ts +33 -18
- package/src/features/hover/di.config.ts +8 -2
- package/src/features/hover/hover.ts +48 -28
- package/src/features/layout/di.config.ts +17 -7
- package/src/features/layout/freeform-layout.ts +6 -15
- package/src/features/layout/hbox-layout.ts +273 -0
- package/src/features/layout/{layout-commands.spec.ts → layout-elements-action.spec.ts} +89 -65
- package/src/features/layout/layout-elements-action.ts +486 -0
- package/src/features/layout/layouter.ts +137 -0
- package/src/features/layout/tests/freeform-layout.spec.ts +216 -0
- package/src/features/layout/tests/hbox-layout.spec.ts +171 -0
- package/src/features/layout/tests/layouter-test-util.ts +122 -0
- package/src/features/layout/tests/vbox-layout.spec.ts +171 -0
- package/src/features/layout/vbox-layout.ts +41 -24
- package/src/features/mouse-tool/di.config.ts +3 -4
- package/src/features/mouse-tool/mouse-tool.ts +18 -57
- package/src/features/navigation/navigation-action-handler.ts +76 -42
- package/src/features/navigation/navigation-target-resolver.spec.ts +3 -3
- package/src/features/navigation/navigation-target-resolver.ts +8 -13
- package/src/features/reconnect/model.ts +2 -2
- package/src/features/save/di.config.ts +2 -3
- package/src/features/save/save-keylistener.ts +3 -3
- package/src/features/select/di.config.ts +6 -8
- package/src/features/select/select-feedback-action.ts +18 -46
- package/src/features/select/select-mouse-listener.ts +82 -3
- package/src/features/select/selection-service.spec.ts +12 -9
- package/src/features/select/selection-service.ts +52 -60
- package/src/features/{model-source-watcher → source-model-watcher}/di.config.ts +5 -5
- package/src/features/{model-source-watcher/model-source-changed-action-handler.ts → source-model-watcher/source-model-changed-action-handler.ts} +17 -22
- package/src/features/tool-feedback/change-bounds-tool-feedback.ts +52 -22
- package/src/features/tool-feedback/creation-tool-feedback.ts +79 -30
- package/src/features/tool-feedback/css-feedback.ts +40 -37
- package/src/features/tool-feedback/di.config.ts +4 -5
- package/src/features/tool-feedback/edge-edit-tool-feedback.ts +140 -88
- package/src/features/tool-feedback/feedback-action-dispatcher.ts +4 -3
- package/src/features/tool-feedback/marquee-tool-feedback.ts +38 -13
- package/src/features/tool-feedback/model.ts +1 -3
- package/src/features/tool-feedback/view.tsx +3 -3
- package/src/features/tool-palette/di.config.ts +3 -2
- package/src/features/tool-palette/tool-palette.ts +35 -19
- package/src/features/tools/base-glsp-tool.ts +11 -11
- package/src/features/tools/change-bounds-tool.ts +37 -67
- package/src/features/tools/delete-tool.ts +9 -9
- package/src/features/tools/di.config.ts +23 -12
- package/src/features/tools/edge-creation-tool.ts +21 -12
- package/src/features/tools/edge-edit-tool.ts +25 -21
- package/src/features/tools/enable-default-tools-on-focus-loss.ts +33 -0
- package/src/features/tools/marquee-behavior.ts +2 -2
- package/src/features/tools/marquee-mouse-tool.ts +13 -14
- package/src/features/tools/marquee-tool.ts +3 -3
- package/src/features/tools/model.ts +4 -3
- package/src/features/tools/node-creation-tool.ts +8 -8
- package/src/features/tools/view.tsx +2 -3
- package/src/features/validation/di.config.ts +13 -11
- package/src/features/validation/issue-marker.ts +34 -12
- package/src/features/validation/marker-navigator.spec.ts +4 -2
- package/src/features/validation/marker-navigator.ts +67 -82
- package/src/features/validation/validate.ts +62 -90
- package/src/features/viewport/di.config.ts +1 -2
- package/src/features/viewport/glsp-scroll-mouse-listener.ts +5 -5
- package/src/index.ts +12 -12
- package/src/lib/model.ts +4 -4
- package/src/model-source/glsp-diagram-server.ts +15 -15
- package/src/sprotty-reexport.ts +288 -0
- package/src/utils/layout-utils.ts +9 -29
- package/src/utils/smodel-util.ts +139 -43
- package/src/utils/viewpoint-util.ts +5 -14
- package/src/views/base-view-module.ts +5 -1
- package/src/views/compartments.tsx +1 -1
- package/src/views/glsp-edge-view.tsx +4 -4
- package/src/views/glsp-projection-view.tsx +173 -0
- package/src/views/index.ts +2 -0
- package/src/views/issue-marker-view.tsx +2 -2
- package/src/views/rounded-corner-view.tsx +2 -3
- package/lib/features/layout/layout-commands.d.ts +0 -153
- package/lib/features/layout/layout-commands.d.ts.map +0 -1
- package/lib/features/layout/layout-commands.js +0 -412
- package/lib/features/layout/layout-commands.js.map +0 -1
- package/lib/features/layout/layout-commands.spec.d.ts +0 -3
- package/lib/features/layout/layout-commands.spec.d.ts.map +0 -1
- package/lib/features/layout/layout-commands.spec.js.map +0 -1
- package/lib/features/model-source-watcher/di.config.d.ts +0 -4
- package/lib/features/model-source-watcher/di.config.js.map +0 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts.map +0 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.js.map +0 -1
- package/lib/features/tool-palette/palette-item.d.ts.map +0 -1
- package/lib/features/tool-palette/palette-item.js.map +0 -1
- package/lib/protocol-reexport.d.ts +0 -45
- package/lib/protocol-reexport.d.ts.map +0 -1
- package/lib/protocol-reexport.js +0 -75
- package/lib/protocol-reexport.js.map +0 -1
- package/src/features/layout/layout-commands.ts +0 -424
- package/src/features/tool-palette/palette-item.ts +0 -38
- package/src/protocol-reexport.ts +0 -64
|
@@ -8,13 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvider = exports.
|
|
12
|
+
exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvider = exports.NavigateToMarkerActionHandler = exports.MarkerNavigator = exports.LeftToRightTopToBottomComparator = exports.SModelElementComparator = exports.NavigateToMarkerAction = void 0;
|
|
16
13
|
/********************************************************************************
|
|
17
|
-
* Copyright (c) 2020-
|
|
14
|
+
* Copyright (c) 2020-2022 EclipseSource and others.
|
|
18
15
|
*
|
|
19
16
|
* This program and the accompanying materials are made available under the
|
|
20
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -36,16 +33,18 @@ const types_1 = require("../../base/types");
|
|
|
36
33
|
const marker_1 = require("../../utils/marker");
|
|
37
34
|
const smodel_util_1 = require("../../utils/smodel-util");
|
|
38
35
|
const selection_service_1 = require("../select/selection-service");
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
36
|
+
var NavigateToMarkerAction;
|
|
37
|
+
(function (NavigateToMarkerAction) {
|
|
38
|
+
NavigateToMarkerAction.KIND = 'navigateToMarker';
|
|
39
|
+
function is(object) {
|
|
40
|
+
return protocol_1.Action.hasKind(object, NavigateToMarkerAction.KIND) && (0, protocol_1.hasStringProp)(object, 'direction') && (0, protocol_1.hasArrayProp)(object, 'severities');
|
|
41
|
+
}
|
|
42
|
+
NavigateToMarkerAction.is = is;
|
|
43
|
+
function create(options) {
|
|
44
|
+
return Object.assign({ kind: NavigateToMarkerAction.KIND, direction: 'next', severities: MarkerNavigator.ALL_SEVERITIES }, options);
|
|
45
|
+
}
|
|
46
|
+
NavigateToMarkerAction.create = create;
|
|
47
|
+
})(NavigateToMarkerAction = exports.NavigateToMarkerAction || (exports.NavigateToMarkerAction = {}));
|
|
49
48
|
class SModelElementComparator {
|
|
50
49
|
compare(_one, _other) {
|
|
51
50
|
return 0;
|
|
@@ -55,8 +54,8 @@ exports.SModelElementComparator = SModelElementComparator;
|
|
|
55
54
|
/** Specifies the order of two selectable and bounds-aware elements left-to-right and top-to-bottom. */
|
|
56
55
|
let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
|
|
57
56
|
compare(one, other) {
|
|
58
|
-
const boundsOne = sprotty_1.findParentByFeature(one, smodel_util_1.isSelectableAndBoundsAware);
|
|
59
|
-
const boundsOther = sprotty_1.findParentByFeature(other, smodel_util_1.isSelectableAndBoundsAware);
|
|
57
|
+
const boundsOne = (0, sprotty_1.findParentByFeature)(one, smodel_util_1.isSelectableAndBoundsAware);
|
|
58
|
+
const boundsOther = (0, sprotty_1.findParentByFeature)(other, smodel_util_1.isSelectableAndBoundsAware);
|
|
60
59
|
if (boundsOne && boundsOther) {
|
|
61
60
|
if (boundsOne.bounds.y !== boundsOther.bounds.y) {
|
|
62
61
|
return boundsOne.bounds.y - boundsOther.bounds.y;
|
|
@@ -69,7 +68,7 @@ let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
|
|
|
69
68
|
}
|
|
70
69
|
};
|
|
71
70
|
LeftToRightTopToBottomComparator = __decorate([
|
|
72
|
-
inversify_1.injectable()
|
|
71
|
+
(0, inversify_1.injectable)()
|
|
73
72
|
], LeftToRightTopToBottomComparator);
|
|
74
73
|
exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator;
|
|
75
74
|
/**
|
|
@@ -93,7 +92,7 @@ let MarkerNavigator = class MarkerNavigator {
|
|
|
93
92
|
return markers[this.getPreviousIndex(current, markers) % markers.length];
|
|
94
93
|
}
|
|
95
94
|
getMarkers(root, predicate) {
|
|
96
|
-
const markers = marker_1.collectIssueMarkers(root);
|
|
95
|
+
const markers = (0, marker_1.collectIssueMarkers)(root);
|
|
97
96
|
return markers.filter(predicate).sort(this.markerComparator.compare);
|
|
98
97
|
}
|
|
99
98
|
getNextIndex(current, markers) {
|
|
@@ -115,94 +114,68 @@ let MarkerNavigator = class MarkerNavigator {
|
|
|
115
114
|
};
|
|
116
115
|
MarkerNavigator.ALL_SEVERITIES = ['error', 'warning', 'info'];
|
|
117
116
|
__decorate([
|
|
118
|
-
inversify_1.inject(SModelElementComparator),
|
|
117
|
+
(0, inversify_1.inject)(SModelElementComparator),
|
|
119
118
|
__metadata("design:type", SModelElementComparator)
|
|
120
119
|
], MarkerNavigator.prototype, "markerComparator", void 0);
|
|
121
120
|
MarkerNavigator = __decorate([
|
|
122
|
-
inversify_1.injectable()
|
|
121
|
+
(0, inversify_1.injectable)()
|
|
123
122
|
], MarkerNavigator);
|
|
124
123
|
exports.MarkerNavigator = MarkerNavigator;
|
|
125
|
-
let
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
this.action
|
|
129
|
-
|
|
130
|
-
execute(context) {
|
|
131
|
-
const root = context.root;
|
|
132
|
-
const selected = this.getSelectedElements(root);
|
|
133
|
-
const target = this.getTarget(selected, root);
|
|
134
|
-
if (target === undefined) {
|
|
135
|
-
return root;
|
|
136
|
-
}
|
|
137
|
-
const selectableTarget = sprotty_1.findParentByFeature(target, sprotty_1.isSelectable);
|
|
124
|
+
let NavigateToMarkerActionHandler = class NavigateToMarkerActionHandler {
|
|
125
|
+
handle(action) {
|
|
126
|
+
const selected = this.getSelectedElements(action);
|
|
127
|
+
const target = this.getTarget(action, selected);
|
|
128
|
+
const selectableTarget = target ? (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable) : undefined;
|
|
138
129
|
if (selectableTarget) {
|
|
139
|
-
const
|
|
140
|
-
this.
|
|
141
|
-
this.
|
|
142
|
-
this.centerCommand.execute(context);
|
|
143
|
-
return this.selectCommand.execute(context);
|
|
130
|
+
const deselectedElementsIDs = selected.map(e => e.id).filter(id => id !== selectableTarget.id);
|
|
131
|
+
this.actionDispatcher.dispatch(protocol_1.SelectAction.create({ selectedElementsIDs: [selectableTarget.id], deselectedElementsIDs }));
|
|
132
|
+
this.actionDispatcher.dispatch(protocol_1.CenterAction.create([selectableTarget.id]));
|
|
144
133
|
}
|
|
145
|
-
return root;
|
|
146
134
|
}
|
|
147
|
-
getSelectedElements(
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
selectedIds = this.action.selectedElementIds;
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
selectedIds = Array.from(this.selectionService.getSelectedElementIDs());
|
|
135
|
+
getSelectedElements(action) {
|
|
136
|
+
if (action.selectedElementIds && action.selectedElementIds.length > 0) {
|
|
137
|
+
return (0, smodel_util_1.getElements)(this.selectionService.getModelRoot().index, action.selectedElementIds, sprotty_1.isSelectable);
|
|
154
138
|
}
|
|
155
|
-
return
|
|
139
|
+
return this.selectionService.getSelectedElements();
|
|
156
140
|
}
|
|
157
|
-
getTarget(
|
|
158
|
-
const
|
|
159
|
-
const
|
|
160
|
-
if (
|
|
161
|
-
return this.markerNavigator.previous(root,
|
|
141
|
+
getTarget(action, selected) {
|
|
142
|
+
const root = this.selectionService.getModelRoot();
|
|
143
|
+
const target = selected.sort(this.markerComparator.compare).find(sprotty_1.isBoundsAware);
|
|
144
|
+
if (action.direction === 'previous') {
|
|
145
|
+
return this.markerNavigator.previous(root, target, marker => this.matchesSeverities(action, marker));
|
|
162
146
|
}
|
|
163
147
|
else {
|
|
164
|
-
return this.markerNavigator.next(root,
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
matchesSeverities(marker) {
|
|
168
|
-
return marker.issues.find(issue => this.action.severities.includes(issue.severity)) !== undefined;
|
|
169
|
-
}
|
|
170
|
-
undo(context) {
|
|
171
|
-
if (this.selectCommand) {
|
|
172
|
-
context.root = this.selectCommand.undo(context);
|
|
148
|
+
return this.markerNavigator.next(root, target, marker => this.matchesSeverities(action, marker));
|
|
173
149
|
}
|
|
174
|
-
return this.centerCommand ? this.centerCommand.undo(context) : context.root;
|
|
175
150
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
context.root = this.selectCommand.redo(context);
|
|
179
|
-
}
|
|
180
|
-
return this.centerCommand ? this.centerCommand.redo(context) : context.root;
|
|
151
|
+
matchesSeverities(action, marker) {
|
|
152
|
+
return marker.issues.find(issue => action.severities.includes(issue.severity)) !== undefined;
|
|
181
153
|
}
|
|
182
154
|
};
|
|
183
|
-
NavigateToMarkerCommand.KIND = NavigateToMarkerAction.KIND;
|
|
184
155
|
__decorate([
|
|
185
|
-
inversify_1.inject(SModelElementComparator),
|
|
156
|
+
(0, inversify_1.inject)(SModelElementComparator),
|
|
186
157
|
__metadata("design:type", SModelElementComparator)
|
|
187
|
-
],
|
|
158
|
+
], NavigateToMarkerActionHandler.prototype, "markerComparator", void 0);
|
|
188
159
|
__decorate([
|
|
189
|
-
inversify_1.inject(MarkerNavigator),
|
|
160
|
+
(0, inversify_1.inject)(MarkerNavigator),
|
|
190
161
|
__metadata("design:type", MarkerNavigator)
|
|
191
|
-
],
|
|
162
|
+
], NavigateToMarkerActionHandler.prototype, "markerNavigator", void 0);
|
|
192
163
|
__decorate([
|
|
193
|
-
inversify_1.inject(types_1.
|
|
164
|
+
(0, inversify_1.inject)(types_1.TYPES.SelectionService),
|
|
194
165
|
__metadata("design:type", selection_service_1.SelectionService)
|
|
195
|
-
],
|
|
196
|
-
|
|
197
|
-
inversify_1.
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
166
|
+
], NavigateToMarkerActionHandler.prototype, "selectionService", void 0);
|
|
167
|
+
__decorate([
|
|
168
|
+
(0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
|
|
169
|
+
__metadata("design:type", sprotty_1.ActionDispatcher)
|
|
170
|
+
], NavigateToMarkerActionHandler.prototype, "actionDispatcher", void 0);
|
|
171
|
+
NavigateToMarkerActionHandler = __decorate([
|
|
172
|
+
(0, inversify_1.injectable)()
|
|
173
|
+
], NavigateToMarkerActionHandler);
|
|
174
|
+
exports.NavigateToMarkerActionHandler = NavigateToMarkerActionHandler;
|
|
202
175
|
let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
|
|
203
176
|
getItems(root, lastMousePosition) {
|
|
204
177
|
const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());
|
|
205
|
-
const hasMarkers = marker_1.collectIssueMarkers(root).length > 0;
|
|
178
|
+
const hasMarkers = (0, marker_1.collectIssueMarkers)(root).length > 0;
|
|
206
179
|
return Promise.resolve([
|
|
207
180
|
{
|
|
208
181
|
id: 'navigate',
|
|
@@ -214,14 +187,14 @@ let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuIte
|
|
|
214
187
|
id: 'next-marker',
|
|
215
188
|
label: 'Next marker',
|
|
216
189
|
group: 'marker',
|
|
217
|
-
actions: [
|
|
190
|
+
actions: [NavigateToMarkerAction.create({ direction: 'next', selectedElementIds })],
|
|
218
191
|
isEnabled: () => hasMarkers
|
|
219
192
|
},
|
|
220
193
|
{
|
|
221
194
|
id: 'previous-marker',
|
|
222
195
|
label: 'Previous marker',
|
|
223
196
|
group: 'marker',
|
|
224
|
-
actions: [
|
|
197
|
+
actions: [NavigateToMarkerAction.create({ direction: 'previous', selectedElementIds })],
|
|
225
198
|
isEnabled: () => hasMarkers
|
|
226
199
|
}
|
|
227
200
|
]
|
|
@@ -230,26 +203,26 @@ let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuIte
|
|
|
230
203
|
}
|
|
231
204
|
};
|
|
232
205
|
__decorate([
|
|
233
|
-
inversify_1.inject(types_1.
|
|
206
|
+
(0, inversify_1.inject)(types_1.TYPES.SelectionService),
|
|
234
207
|
__metadata("design:type", selection_service_1.SelectionService)
|
|
235
208
|
], MarkerNavigatorContextMenuItemProvider.prototype, "selectionService", void 0);
|
|
236
209
|
MarkerNavigatorContextMenuItemProvider = __decorate([
|
|
237
|
-
inversify_1.injectable()
|
|
210
|
+
(0, inversify_1.injectable)()
|
|
238
211
|
], MarkerNavigatorContextMenuItemProvider);
|
|
239
212
|
exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider;
|
|
240
213
|
let MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends sprotty_1.KeyListener {
|
|
241
214
|
keyDown(_element, event) {
|
|
242
|
-
if (keyboard_1.matchesKeystroke(event, 'Period', 'ctrl')) {
|
|
243
|
-
return [
|
|
215
|
+
if ((0, keyboard_1.matchesKeystroke)(event, 'Period', 'ctrl')) {
|
|
216
|
+
return [NavigateToMarkerAction.create({ direction: 'next' })];
|
|
244
217
|
}
|
|
245
|
-
else if (keyboard_1.matchesKeystroke(event, 'Comma', 'ctrl')) {
|
|
246
|
-
return [
|
|
218
|
+
else if ((0, keyboard_1.matchesKeystroke)(event, 'Comma', 'ctrl')) {
|
|
219
|
+
return [NavigateToMarkerAction.create({ direction: 'previous' })];
|
|
247
220
|
}
|
|
248
221
|
return [];
|
|
249
222
|
}
|
|
250
223
|
};
|
|
251
224
|
MarkerNavigatorKeyListener = __decorate([
|
|
252
|
-
inversify_1.injectable()
|
|
225
|
+
(0, inversify_1.injectable)()
|
|
253
226
|
], MarkerNavigatorKeyListener);
|
|
254
227
|
exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener;
|
|
255
228
|
//# sourceMappingURL=marker-navigator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-navigator.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"marker-navigator.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-navigator.spec.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"marker-navigator.spec.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"AAmBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}
|
|
@@ -1,21 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
/********************************************************************************
|
|
4
|
-
* Copyright (c) 2020-2021 EclipseSource and others.
|
|
5
|
-
*
|
|
6
|
-
* This program and the accompanying materials are made available under the
|
|
7
|
-
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
8
|
-
* http://www.eclipse.org/legal/epl-2.0.
|
|
9
|
-
*
|
|
10
|
-
* This Source Code may also be made available under the following Secondary
|
|
11
|
-
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
12
|
-
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
13
|
-
* with the GNU Classpath Exception which is available at
|
|
14
|
-
* https://www.gnu.org/software/classpath/license.html.
|
|
15
|
-
*
|
|
16
|
-
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
17
|
-
********************************************************************************/
|
|
18
|
-
/* eslint-disable import/no-deprecated,no-unused-expressions */
|
|
19
3
|
const chai_1 = require("chai");
|
|
20
4
|
const inversify_1 = require("inversify");
|
|
21
5
|
require("mocha");
|
|
@@ -28,7 +12,9 @@ const marker_navigator_1 = require("./marker-navigator");
|
|
|
28
12
|
describe('MarkerNavigator', () => {
|
|
29
13
|
const container = new inversify_1.Container();
|
|
30
14
|
container.load(di_config_1.default, sprotty_1.decorationModule, di_config_2.markerNavigatorModule);
|
|
15
|
+
// eslint-disable-next-line deprecation/deprecation
|
|
31
16
|
container.rebind(sprotty_1.TYPES.IModelFactory).to(sgraph_factory_1.SGraphFactory).inSingletonScope();
|
|
17
|
+
// eslint-disable-next-line deprecation/deprecation
|
|
32
18
|
const graphFactory = container.get(sprotty_1.TYPES.IModelFactory);
|
|
33
19
|
const markerNavigator = container.get(marker_navigator_1.MarkerNavigator);
|
|
34
20
|
const rootWithoutAnyMarkers = graphFactory.createRoot({
|
|
@@ -75,49 +61,49 @@ describe('MarkerNavigator', () => {
|
|
|
75
61
|
[elementTopLeft, elementTopRight, elementBottomLeft, elementBottomRight].forEach(clearMarker);
|
|
76
62
|
});
|
|
77
63
|
it('next(undefined) without any markers returns undefined', () => {
|
|
78
|
-
chai_1.expect(markerNavigator.next(rootWithoutAnyMarkers)).to.be.undefined;
|
|
64
|
+
(0, chai_1.expect)(markerNavigator.next(rootWithoutAnyMarkers)).to.be.undefined;
|
|
79
65
|
});
|
|
80
66
|
it('previous(undefined) without any markers returns undefined', () => {
|
|
81
|
-
chai_1.expect(markerNavigator.previous(rootWithoutAnyMarkers)).to.be.undefined;
|
|
67
|
+
(0, chai_1.expect)(markerNavigator.previous(rootWithoutAnyMarkers)).to.be.undefined;
|
|
82
68
|
});
|
|
83
69
|
it('next(undefined) with one marker returns the one marker', () => {
|
|
84
70
|
const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
85
71
|
const next = markerNavigator.next(rootWithMarkers);
|
|
86
|
-
chai_1.expect(next).to.eql(marker);
|
|
72
|
+
(0, chai_1.expect)(next).to.eql(marker);
|
|
87
73
|
});
|
|
88
74
|
it('next(firstMarker) with only one marker returns again the first marker', () => {
|
|
89
75
|
const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
90
76
|
const next = markerNavigator.next(rootWithMarkers, marker);
|
|
91
|
-
chai_1.expect(next).to.eql(marker);
|
|
77
|
+
(0, chai_1.expect)(next).to.eql(marker);
|
|
92
78
|
// and again and again
|
|
93
79
|
const nextNext = markerNavigator.next(rootWithMarkers, next);
|
|
94
|
-
chai_1.expect(nextNext).to.eql(marker);
|
|
80
|
+
(0, chai_1.expect)(nextNext).to.eql(marker);
|
|
95
81
|
});
|
|
96
82
|
it('previous(firstMarker) with only one marker returns again the first marker', () => {
|
|
97
83
|
const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
98
84
|
const previous = markerNavigator.previous(rootWithMarkers, marker);
|
|
99
|
-
chai_1.expect(previous).to.eql(marker);
|
|
85
|
+
(0, chai_1.expect)(previous).to.eql(marker);
|
|
100
86
|
// and again and again
|
|
101
87
|
const previousPrevious = markerNavigator.previous(rootWithMarkers, previous);
|
|
102
|
-
chai_1.expect(previousPrevious).to.eql(marker);
|
|
88
|
+
(0, chai_1.expect)(previousPrevious).to.eql(marker);
|
|
103
89
|
});
|
|
104
90
|
it('next(firstMarker) with two marker returns second marker then again first marker', () => {
|
|
105
91
|
const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
106
92
|
const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
|
|
107
93
|
const next = markerNavigator.next(rootWithMarkers, marker1);
|
|
108
|
-
chai_1.expect(next).to.eql(marker2);
|
|
94
|
+
(0, chai_1.expect)(next).to.eql(marker2);
|
|
109
95
|
// and again and again
|
|
110
96
|
const nextNext = markerNavigator.next(rootWithMarkers, next);
|
|
111
|
-
chai_1.expect(nextNext).to.eql(marker1);
|
|
97
|
+
(0, chai_1.expect)(nextNext).to.eql(marker1);
|
|
112
98
|
});
|
|
113
99
|
it('previous(firstMarker) with two marker returns second marker then again first marker', () => {
|
|
114
100
|
const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
115
101
|
const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
|
|
116
102
|
const next = markerNavigator.previous(rootWithMarkers, marker1);
|
|
117
|
-
chai_1.expect(next).to.eql(marker2);
|
|
103
|
+
(0, chai_1.expect)(next).to.eql(marker2);
|
|
118
104
|
// and again and again
|
|
119
105
|
const nextNext = markerNavigator.previous(rootWithMarkers, next);
|
|
120
|
-
chai_1.expect(nextNext).to.eql(marker1);
|
|
106
|
+
(0, chai_1.expect)(nextNext).to.eql(marker1);
|
|
121
107
|
});
|
|
122
108
|
it('returns markers in the order left-to-right, top-to-bottom with next()', () => {
|
|
123
109
|
const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
@@ -129,11 +115,11 @@ describe('MarkerNavigator', () => {
|
|
|
129
115
|
const found3 = markerNavigator.next(rootWithMarkers, found2);
|
|
130
116
|
const found4 = markerNavigator.next(rootWithMarkers, found3);
|
|
131
117
|
const found5 = markerNavigator.next(rootWithMarkers, found4);
|
|
132
|
-
chai_1.expect(found1).to.eql(marker1);
|
|
133
|
-
chai_1.expect(found2).to.eql(marker2);
|
|
134
|
-
chai_1.expect(found3).to.eql(marker3);
|
|
135
|
-
chai_1.expect(found4).to.eql(marker4);
|
|
136
|
-
chai_1.expect(found5).to.eql(marker1);
|
|
118
|
+
(0, chai_1.expect)(found1).to.eql(marker1);
|
|
119
|
+
(0, chai_1.expect)(found2).to.eql(marker2);
|
|
120
|
+
(0, chai_1.expect)(found3).to.eql(marker3);
|
|
121
|
+
(0, chai_1.expect)(found4).to.eql(marker4);
|
|
122
|
+
(0, chai_1.expect)(found5).to.eql(marker1);
|
|
137
123
|
});
|
|
138
124
|
it('returns markers in the order left-to-right, top-to-bottom with previous()', () => {
|
|
139
125
|
const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
|
|
@@ -145,11 +131,11 @@ describe('MarkerNavigator', () => {
|
|
|
145
131
|
const found3 = markerNavigator.previous(rootWithMarkers, found2);
|
|
146
132
|
const found4 = markerNavigator.previous(rootWithMarkers, found3);
|
|
147
133
|
const found5 = markerNavigator.previous(rootWithMarkers, found4);
|
|
148
|
-
chai_1.expect(found1).to.eql(marker1);
|
|
149
|
-
chai_1.expect(found2).to.eql(marker4);
|
|
150
|
-
chai_1.expect(found3).to.eql(marker3);
|
|
151
|
-
chai_1.expect(found4).to.eql(marker2);
|
|
152
|
-
chai_1.expect(found5).to.eql(marker1);
|
|
134
|
+
(0, chai_1.expect)(found1).to.eql(marker1);
|
|
135
|
+
(0, chai_1.expect)(found2).to.eql(marker4);
|
|
136
|
+
(0, chai_1.expect)(found3).to.eql(marker3);
|
|
137
|
+
(0, chai_1.expect)(found4).to.eql(marker2);
|
|
138
|
+
(0, chai_1.expect)(found5).to.eql(marker1);
|
|
153
139
|
});
|
|
154
140
|
});
|
|
155
141
|
function clearMarker(elem) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-navigator.spec.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"marker-navigator.spec.js","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2022 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, DeleteMarkersAction, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
|
|
17
|
-
import {
|
|
17
|
+
import { CommandExecutionContext, CommandReturn, IActionDispatcher, IActionHandler, ICommand } from 'sprotty';
|
|
18
18
|
import { EditorContextService } from '../../base/editor-context-service';
|
|
19
19
|
import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
|
|
20
20
|
import { FeedbackCommand } from '../tool-feedback/model';
|
|
@@ -31,7 +31,7 @@ export declare class ValidationFeedbackEmitter implements IFeedbackEmitter {
|
|
|
31
31
|
* Register the action that should be emitted for visualizing validation feedback.
|
|
32
32
|
* @param action the action that should be emitted when the model is updated and that will visualize the model validation feedback.
|
|
33
33
|
*/
|
|
34
|
-
registerValidationFeedbackAction(action:
|
|
34
|
+
registerValidationFeedbackAction(action: ApplyMarkersAction): void;
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Manages current markers for the outside of the GLSP.
|
|
@@ -46,55 +46,42 @@ export declare abstract class ExternalMarkerManager {
|
|
|
46
46
|
removeMarkers(markers: Marker[]): void;
|
|
47
47
|
abstract setMarkers(markers: Marker[], sourceUri?: string): void;
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
* Command for handling `SetMarkersAction`
|
|
51
|
-
*/
|
|
52
|
-
export declare class SetMarkersCommand extends Command {
|
|
53
|
-
action: SetMarkersAction;
|
|
49
|
+
export declare class SetMarkersActionHandler implements IActionHandler {
|
|
54
50
|
protected validationFeedbackEmitter: ValidationFeedbackEmitter;
|
|
55
51
|
protected externalMarkerManager?: ExternalMarkerManager;
|
|
56
52
|
protected editorContextService: EditorContextService;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
execute(context: CommandExecutionContext): Promise<SModelRoot>;
|
|
60
|
-
undo(context: CommandExecutionContext): CommandReturn;
|
|
61
|
-
redo(context: CommandExecutionContext): CommandReturn;
|
|
53
|
+
handle(action: SetMarkersAction): void | Action | ICommand;
|
|
54
|
+
setMarkers(markers: Marker[]): Promise<void>;
|
|
62
55
|
}
|
|
63
56
|
/**
|
|
64
|
-
*
|
|
57
|
+
* Action for applying makers to the graphical model.
|
|
65
58
|
*/
|
|
66
|
-
export interface
|
|
67
|
-
|
|
59
|
+
export interface ApplyMarkersAction extends Action {
|
|
60
|
+
kind: typeof ApplyMarkersAction.KIND;
|
|
61
|
+
markers: Marker[];
|
|
68
62
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
readonly markers: Marker[];
|
|
74
|
-
readonly kind: string;
|
|
75
|
-
constructor(markers: Marker[], kind?: string);
|
|
63
|
+
export declare namespace ApplyMarkersAction {
|
|
64
|
+
const KIND = "applyMarkers";
|
|
65
|
+
function is(object: any): object is ApplyMarkersAction;
|
|
66
|
+
function create(markers: Marker[]): ApplyMarkersAction;
|
|
76
67
|
}
|
|
77
68
|
/**
|
|
78
|
-
*
|
|
69
|
+
* Handles {@link ApplyMarkersAction}s by creating the corresponding {@link SIssueMarker}s and
|
|
70
|
+
* adding them to the graphical model.
|
|
79
71
|
*/
|
|
80
72
|
export declare class ApplyMarkersCommand extends FeedbackCommand {
|
|
81
73
|
protected action: ApplyMarkersAction;
|
|
82
74
|
static KIND: string;
|
|
83
|
-
readonly priority = 0;
|
|
84
75
|
constructor(action: ApplyMarkersAction);
|
|
85
76
|
execute(context: CommandExecutionContext): CommandReturn;
|
|
86
|
-
undo(context: CommandExecutionContext): CommandReturn;
|
|
87
|
-
redo(context: CommandExecutionContext): CommandReturn;
|
|
88
77
|
}
|
|
89
78
|
/**
|
|
90
79
|
* Command for handling `DeleteMarkersAction`
|
|
91
80
|
*/
|
|
92
|
-
export declare class DeleteMarkersCommand extends
|
|
81
|
+
export declare class DeleteMarkersCommand extends FeedbackCommand {
|
|
93
82
|
protected action: DeleteMarkersAction;
|
|
94
83
|
static KIND: string;
|
|
95
84
|
constructor(action: DeleteMarkersAction);
|
|
96
85
|
execute(context: CommandExecutionContext): CommandReturn;
|
|
97
|
-
undo(context: CommandExecutionContext): CommandReturn;
|
|
98
|
-
redo(context: CommandExecutionContext): CommandReturn;
|
|
99
86
|
}
|
|
100
87
|
//# sourceMappingURL=validate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAgB,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAgC,MAAM,SAAS,CAAC;AAC5I,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,qBACa,yBAA0B,YAAW,gBAAgB;IACrB,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtG,OAAO,CAAC,gBAAgB,CAAqB;IAG7C,OAAO;IAEP;;;OAGG;IACH,gCAAgC,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;CAcrE;AAED;;;;;GAKG;AACH,8BACsB,qBAAqB;IACvC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAE/C,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,GAAG,IAAI;IAIlD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMtC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;CACnE;AAED,qBACa,uBAAwB,YAAW,cAAc;IAE1D,SAAS,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAI/D,SAAS,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAGxD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAKpD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAMrD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM;IAC9C,IAAI,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,IAAI,iBAAiB,CAAC;IAEnC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAE5D;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAK5D;CACJ;AAED;;;GAGG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IAGlB,SAAS,CAAC,MAAM,EAAE,kBAAkB;IAFtE,MAAM,CAAC,IAAI,SAA2B;gBAEM,MAAM,EAAE,kBAAkB;IAItE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAe3D;AAiBD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,eAAe;IAGnB,SAAS,CAAC,MAAM,EAAE,mBAAmB;IAFvE,MAAM,CAAC,IAAI,SAA4B;gBAEK,MAAM,EAAE,mBAAmB;IAIvE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAwB3D"}
|