(#53) Updated to new API

Author: s1hofmann

index.e2e.spec.ts

@@ -1,8 +1,7 @@
-import { assert, Key, keyboard, Location, mouse, movement, screen } from "./index";
+import { assert, centerOf, Key, keyboard, mouse, screen, straightTo } from "./index";
 
 const openXfceMenu = async () => {
-  const menu = await screen.find("menu.png");
-  await mouse.move(await movement.straightTo(Location.centerOf(menu)));
+  await mouse.move(straightTo(centerOf(screen.find("menu.png"))));
   await mouse.leftClick();
   await mouse.leftClick();
 };
@@ -14,22 +13,18 @@ const run = async (cmd: string) => {
 };
 
 const calculate = async () => {
-  const plus = await screen.find("plus.png");
-  await mouse.move(await movement.straightTo(Location.centerOf(plus)));
+  await mouse.move(straightTo(centerOf(screen.find("plus.png"))));
   await mouse.leftClick();
-  const one = await screen.find("one.png");
-  await mouse.move(await movement.straightTo(Location.centerOf(one)));
+  await mouse.move(straightTo(centerOf(screen.find("one.png"))));
   await mouse.leftClick();
-  const zero = await screen.find("zero.png");
-  await mouse.move(await movement.straightTo(Location.centerOf(zero)));
+  await mouse.move(straightTo(centerOf(screen.find("zero.png"))));
   await mouse.leftClick();
   await mouse.leftClick();
   await keyboard.type(Key.Enter);
 };
 
 const close = async () => {
-  const x = await screen.find("close.png");
-  await mouse.move(await movement.straightTo(Location.centerOf(x)));
+  await mouse.move(straightTo(centerOf(screen.find("close.png"))));
   await mouse.leftClick();
 };
 

index.ts

@@ -4,28 +4,40 @@ import { Assert } from "./lib/assert.class";
 import { Clipboard } from "./lib/clipboard.class";
 import { Keyboard } from "./lib/keyboard.class";
 import { Mouse } from "./lib/mouse.class";
-import { Movement } from "./lib/movement.class";
+import { createMovementApi } from "./lib/movement.function";
 import { Screen } from "./lib/screen.class";
 import { LineHelper } from "./lib/util/linehelper.class";
 
 export { jestMatchers } from "./lib/expect/jest.matcher.function";
 export { Image } from "./lib/image.class";
 export { Key } from "./lib/key.enum";
-export { Location } from "./lib/location.class";
+export { centerOf, randomPointIn } from "./lib/location.function";
 export { LocationParameters } from "./lib/locationparameters.class";
-export { Movement } from "./lib/movement.class";
-export { MovementType } from "./lib/movementtype.class";
+export { linear } from "./lib/movementtype.function";
 export { Point } from "./lib/point.class";
 export { Region } from "./lib/region.class";
 
 const screenActions = new VisionAdapter();
 const nativeActions = new NativeAdapter();
+const lineHelper = new LineHelper();
 
 const clipboard = new Clipboard(nativeActions);
 const keyboard = new Keyboard(nativeActions);
 const mouse = new Mouse(nativeActions);
-const movement = new Movement(nativeActions, new LineHelper());
 const screen = new Screen(screenActions);
 const assert = new Assert(screen);
 
-export { clipboard, keyboard, mouse, movement, screen, assert };
+const {straightTo, up, down, left, right} = createMovementApi(nativeActions, lineHelper);
+
+export {
+  clipboard,
+  keyboard,
+  mouse,
+  screen,
+  assert,
+  straightTo,
+  up,
+  down,
+  left,
+  right,
+};