refactor(test): use the barrel

arnobl · arnobl · commit 0ba7c010c36f · 2024-10-10T22:28:18.000+02:00
diff --git a/test/binder/Accumulator.test.ts b/test/binder/Accumulator.test.ts
@@ -12,13 +12,11 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {UndoHistoryBase} from "../../src/interacto";
+import type {UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let button1: HTMLButtonElement;
 let cmd: StubCmd;
diff --git a/test/binder/BaseBinderBuilder.test.ts b/test/binder/BaseBinderBuilder.test.ts
@@ -12,7 +12,7 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {isEltRef} from "../../src/api/binder/BaseBinderBuilder";
+import {isEltRef} from "../../src/interacto";
 import {describe, expect, test} from "@jest/globals";
 
 describe("using a base binder builder", () => {
diff --git a/test/binder/BlockEventBinder.test.ts b/test/binder/BlockEventBinder.test.ts
@@ -16,8 +16,7 @@ import {StubCmd} from "../command/StubCmd";
 import {createKeyEvent, createMouseEvent} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, test} from "@jest/globals";
 import {mock} from "jest-mock-extended";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, UndoHistoryBase, Logger} from "../../src/interacto";
+import type {Binding, Bindings, UndoHistoryBase, Logger} from "../../src/interacto";
 import type {Subscription} from "rxjs";
 
 let canvas1: HTMLElement;
diff --git a/test/binder/ButtonBinder.test.ts b/test/binder/ButtonBinder.test.ts
@@ -12,12 +12,10 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, EltRef, Interaction, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, EltRef, Interaction, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let button1: HTMLButtonElement;
 let button2: HTMLButtonElement;
diff --git a/test/binder/CheckboxBinder.test.ts b/test/binder/CheckboxBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General Public License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let widget1: HTMLInputElement;
 let widget2: HTMLInputElement;
diff --git a/test/binder/ColorPickerBinder.test.ts b/test/binder/ColorPickerBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General export function License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, WidgetData, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, WidgetData, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let widget1: HTMLInputElement;
 let widget2: HTMLInputElement;
diff --git a/test/binder/ComboboxBinder.test.ts b/test/binder/ComboboxBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General export function License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, WidgetData, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, WidgetData, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let widget1: HTMLSelectElement;
 let widget2: HTMLSelectElement;
diff --git a/test/binder/DateBinder.test.ts b/test/binder/DateBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General export function License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, WidgetData, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, WidgetData, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let widget1: HTMLInputElement;
 let widget2: HTMLInputElement;
diff --git a/test/binder/KeysBinder.test.ts b/test/binder/KeysBinder.test.ts
@@ -12,29 +12,24 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {KeysBinder} from "../../src/impl/binder/KeysBinder";
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl} from "../../src/impl/binding/BindingsImpl";
-import {KeyDown} from "../../src/impl/interaction/library/KeyDown";
-import {MouseDown} from "../../src/impl/interaction/library/MouseDown";
-import {UndoHistoryImpl} from "../../src/impl/undo/UndoHistoryImpl";
+import {
+    BindingsContext,
+    BindingsImpl,
+    KeysBinder,
+    UndoHistoryImpl, KeyDown, MouseDown
+} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {createKeyEvent} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
 import {mock} from "jest-mock-extended";
-import type {EltRef} from "../../src/api/binder/BaseBinderBuilder";
-import type {KeyInteractionCmdBinder} from "../../src/api/binder/KeyInteractionCmdBinder";
-import type {Binding} from "../../src/api/binding/Binding";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {BindingsObserver} from "../../src/api/binding/BindingsObserver";
-import type {Command} from "../../src/api/command/Command";
-import type {Interaction} from "../../src/api/interaction/Interaction";
-import type {KeyData} from "../../src/api/interaction/KeyData";
-import type {KeysData} from "../../src/api/interaction/KeysData";
-import type {Logger} from "../../src/api/logging/Logger";
-import type {UndoHistory} from "../../src/api/undo/UndoHistory";
-import type {UndoHistoryBase} from "../../src/api/undo/UndoHistoryBase";
+import type {
+    Binding,
+    Bindings, BindingsObserver,
+    Command,
+    Interaction,
+    UndoHistoryBase, Logger, KeysData, EltRef, UndoHistory, KeyInteractionCmdBinder, KeyData
+} from "../../src/interacto";
 
 let elt: HTMLElement;
 let binding: Binding<Command, Interaction<object>, unknown> | undefined;
diff --git a/test/binder/LongTouchBinder.test.ts b/test/binder/LongTouchBinder.test.ts
@@ -11,14 +11,11 @@
  * You should have received a copy of the GNU General Public License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {createTouchEvent} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Flushable} from "../../src/impl/interaction/Flushable";
-import type {Binding, Interaction, InteractionBase, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, InteractionBase, UndoHistoryBase, Bindings, Flushable} from "../../src/interacto";
 
 let binding: Binding<StubCmd, Interaction<object>, unknown> | undefined;
 let cmd: StubCmd;
diff --git a/test/binder/PanBinder.test.ts b/test/binder/PanBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General Public License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let binding: Binding<StubCmd, Interaction<object>, unknown> | undefined;
 let c1: HTMLElement;
diff --git a/test/binder/PinchBinder.test.ts b/test/binder/PinchBinder.test.ts
@@ -11,13 +11,11 @@
  * You should have received a copy of the GNU General Public License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {robot} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let binding: Binding<StubCmd, Interaction<object>, unknown> | undefined;
 let c1: HTMLElement;
diff --git a/test/binder/SpinnerBinder.test.ts b/test/binder/SpinnerBinder.test.ts
@@ -11,13 +11,12 @@
  * You should have received a copy of the GNU General export function License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, SpinnerChangedFSM, UndoHistoryImpl} from "../../src/interacto";
+
+import {BindingsContext, BindingsImpl, SpinnerChangedFSM, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {robot} from "interacto-nono";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, WidgetData, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, WidgetData, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let widget1: HTMLInputElement;
 let widget2: HTMLInputElement;
diff --git a/test/binder/TapBinder.test.ts b/test/binder/TapBinder.test.ts
@@ -11,14 +11,11 @@
  * You should have received a copy of the GNU General Public License
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {robot} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Flushable} from "../../src/impl/interaction/Flushable";
-import type {Binding, Interaction, InteractionBase, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, InteractionBase, UndoHistoryBase, Bindings, Flushable} from "../../src/interacto";
 
 let binding: Binding<StubCmd, Interaction<object>, unknown> | undefined;
 let cmd: StubCmd;
diff --git a/test/binder/TextInputBinder.test.ts b/test/binder/TextInputBinder.test.ts
@@ -12,12 +12,10 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
+import {BindingsContext, BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Binding, Interaction, UndoHistoryBase} from "../../src/interacto";
+import type {Binding, Interaction, UndoHistoryBase, Bindings} from "../../src/interacto";
 
 let txt1: HTMLInputElement | HTMLTextAreaElement;
 let binding: Binding<StubCmd, Interaction<object>, unknown> | undefined;
diff --git a/test/binder/UpdateBinder.test.ts b/test/binder/UpdateBinder.test.ts
@@ -12,16 +12,10 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {UpdateBinder} from "../../src/impl/binder/UpdateBinder";
-import {MouseDown} from "../../src/impl/interaction/library/MouseDown";
-import {UndoHistoryImpl} from "../../src/impl/undo/UndoHistoryImpl";
+import {UndoHistoryImpl, UpdateBinder, MouseDown} from "../../src/interacto";
 import {afterEach, beforeEach, describe, expect, test, jest} from "@jest/globals";
 import {mock} from "jest-mock-extended";
-import type {BindingsObserver} from "../../src/api/binding/BindingsObserver";
-import type {Command} from "../../src/api/command/Command";
-import type {Interaction} from "../../src/api/interaction/Interaction";
-import type {Logger} from "../../src/api/logging/Logger";
-import type {UndoHistory} from "../../src/api/undo/UndoHistory";
+import type {Command, Interaction, UndoHistory, Logger, BindingsObserver} from "../../src/interacto";
 
 describe("using an update binder", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/test/binding/Binding.test.ts b/test/binding/Binding.test.ts
@@ -17,8 +17,7 @@ import {StubCmd, StubUndoableCmd} from "../command/StubCmd";
 import {InteractionStub} from "../interaction/InteractionStub";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {mock} from "jest-mock-extended";
-import type {Logger} from "../../src/api/logging/Logger";
-import type {Undoable, UndoHistory, VisitorBinding} from "../../src/interacto";
+import type {Undoable, UndoHistory, VisitorBinding, Logger} from "../../src/interacto";
 
 class BindingStub extends BindingImpl<StubCmd, InteractionStub, unknown> {
     public whenStartOK: boolean;
diff --git a/test/binding/BindingsLostEvents.test.ts b/test/binding/BindingsLostEvents.test.ts
@@ -12,13 +12,11 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BindingsImpl} from "../../src/impl/binding/BindingsImpl";
-import {UndoHistoryImpl} from "../../src/impl/undo/UndoHistoryImpl";
+import {BindingsImpl, UndoHistoryImpl} from "../../src/interacto";
 import {StubCmd} from "../command/StubCmd";
 import {robot} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {UndoHistoryBase} from "../../src/api/undo/UndoHistoryBase";
+import type {Bindings, UndoHistoryBase} from "../../src/interacto";
 
 let elt: HTMLElement;
 let bindings: Bindings<UndoHistoryBase>;
diff --git a/test/binding/UndoRedoBindings.test.ts b/test/binding/UndoRedoBindings.test.ts
@@ -1,14 +1,22 @@
-import {BindingsContext} from "../../src/impl/binding/BindingsContext";
-import {BindingsImpl} from "../../src/impl/binding/BindingsImpl";
-import {Redo} from "../../src/impl/command/library/Redo";
-import {Undo} from "../../src/impl/command/library/Undo";
-import {UndoHistoryImpl} from "../../src/impl/undo/UndoHistoryImpl";
+/*
+ * This file is part of Interacto.
+ * Interacto is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General export function License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * Interacto is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General export function License for more details.
+ * You should have received a copy of the GNU General export function License
+ * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {BindingsContext, BindingsImpl, Redo, Undo, UndoHistoryImpl} from "../../src/interacto";
 import {robot} from "../interaction/StubEvents";
 import {afterEach, beforeEach, describe, expect, jest, test} from "@jest/globals";
 import {mock} from "jest-mock-extended";
-import type {Bindings} from "../../src/api/binding/Bindings";
-import type {Undoable} from "../../src/api/undo/Undoable";
-import type {UndoHistoryBase} from "../../src/api/undo/UndoHistoryBase";
+import type {Bindings, Undoable, UndoHistoryBase} from "../../src/interacto";
 import type {MockProxy} from "jest-mock-extended";
 
 let bundo: HTMLButtonElement;
diff --git a/test/binding/When.test.ts b/test/binding/When.test.ts
@@ -12,7 +12,7 @@
  * along with Interacto.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {isWhenAtEnd, isWhenAtStart, isWhenAtThen, isWhenStrict} from "../../src/api/binder/When";
+import {isWhenAtEnd, isWhenAtStart, isWhenAtThen, isWhenStrict} from "../../src/interacto";
 import {describe, expect, test} from "@jest/globals";
 
 describe("test WhenType", () => {
