refactor: ♻️ move RectDelta to rect.ts

src/driver/surface.ts

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT
 
 import Config from "../config";
-import Rect from "../util/rect";
+import { Rect } from "../util/rect";
 
 export interface DriverSurface {
   readonly id: string;

src/driver/window.ts

@@ -5,7 +5,7 @@
 
 import { DriverSurface, DriverSurfaceImpl } from "./surface";
 
-import Rect from "../util/rect";
+import { Rect } from "../util/rect";
 import { clip, matchWords } from "../util/func";
 import Config from "../config";
 import { Log } from "../util/log";

src/engine/index.test.ts

@@ -12,7 +12,7 @@ import { Controller } from "../controller";
 import { DriverSurface } from "../driver/surface";
 
 import { Log } from "../util/log";
-import Rect from "../util/rect";
+import { Rect } from "../util/rect";
 import TileLayout from "./layout/tile_layout";
 import LayoutStore from "./layout_store";
 import { EngineWindow, WindowState } from "./window";

src/engine/index.ts

@@ -13,8 +13,7 @@ import { Controller } from "../controller";
 
 import { DriverSurface } from "../driver/surface";
 
-import Rect from "../util/rect";
-import RectDelta from "../util/rectdelta";
+import { Rect, RectDelta } from "../util/rect";
 import { overlap, wrapIndex } from "../util/func";
 import Config from "../config";
 import { Log } from "../util/log";

src/engine/layout/cascade_layout.ts

@@ -15,7 +15,7 @@ import {
 } from "../../controller/action";
 import { Controller } from "../../controller";
 
-import Rect from "../../util/rect";
+import { Rect } from "../../util/rect";
 
 export enum CascadeDirection {
   NorthWest = 0,

src/engine/layout/floating_layout.ts

@@ -7,7 +7,7 @@ import { WindowsLayout } from ".";
 
 import { WindowState, EngineWindow } from "../window";
 
-import Rect from "../../util/rect";
+import { Rect } from "../../util/rect";
 import { Controller } from "../../controller";
 
 export default class FloatingLayout implements WindowsLayout {

src/engine/layout/index.ts

@@ -9,8 +9,7 @@ import { Engine } from "..";
 import { Controller } from "../../controller";
 import { Action } from "../../controller/action";
 
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 import Config from "../../config";
 
 export interface WindowsLayoutClass {

src/engine/layout/layout_part.ts

@@ -8,8 +8,7 @@ import LayoutUtils from "./layout_utils";
 import { EngineWindow } from "../window";
 
 import Config from "../../config";
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 
 export interface ILayoutPart {
   adjust(

src/engine/layout/layout_utils.ts

@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: MIT
 
 import { clip } from "../../util/func";
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 
 export default class LayoutUtils {
   /**

src/engine/layout/monocle_layout.ts

@@ -17,7 +17,7 @@ import {
   FocusUpperWindow,
 } from "../../controller/action";
 
-import Rect from "../../util/rect";
+import { Rect } from "../../util/rect";
 import Config from "../../config";
 import { Controller } from "../../controller";
 import { Engine } from "..";

src/engine/layout/quarter_layout.ts

@@ -8,8 +8,7 @@ import { WindowsLayout } from ".";
 import { WindowState, EngineWindow } from "../window";
 
 import { clip } from "../../util/func";
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 import Config from "../../config";
 import { Controller } from "../../controller";
 

src/engine/layout/spiral_layout.ts

@@ -9,8 +9,7 @@ import { WindowsLayout } from ".";
 
 import { WindowState, EngineWindow } from "../window";
 
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 import Config from "../../config";
 import { Controller } from "../../controller";
 

src/engine/layout/spread_layout.ts

@@ -13,7 +13,7 @@ import {
   IncreaseMasterAreaWindowCount,
 } from "../../controller/action";
 
-import Rect from "../../util/rect";
+import { Rect } from "../../util/rect";
 import { Controller } from "../../controller";
 import { Engine } from "..";
 

src/engine/layout/stair_layout.ts

@@ -13,7 +13,7 @@ import {
   IncreaseMasterAreaWindowCount,
 } from "../../controller/action";
 
-import Rect from "../../util/rect";
+import { Rect } from "../../util/rect";
 import { Controller } from "../../controller";
 import { Engine } from "..";
 

src/engine/layout/three_column_layout.ts

@@ -17,8 +17,7 @@ import {
 } from "../../controller/action";
 
 import { partitionArrayBySizes, clip, slide } from "../../util/func";
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 import Config from "../../config";
 import { Controller } from "../../controller";
 import { Engine } from "..";

src/engine/layout/tile_layout.ts

@@ -23,8 +23,7 @@ import {
 } from "../../controller/action";
 
 import { clip, slide } from "../../util/func";
-import Rect from "../../util/rect";
-import RectDelta from "../../util/rectdelta";
+import { Rect, RectDelta } from "../../util/rect";
 import Config from "../../config";
 import { Controller } from "../../controller";
 import { Engine } from "..";

src/engine/window.ts

@@ -8,8 +8,7 @@ import { DriverSurface } from "../driver/surface";
 
 import Config from "../config";
 import { Log } from "../util/log";
-import Rect from "../util/rect";
-import RectDelta from "../util/rectdelta";
+import { Rect, RectDelta } from "../util/rect";
 
 export enum WindowState {
   /**

src/util/rect.ts

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-export default class Rect {
+export class Rect {
   constructor(
     public x: number,
     public y: number,
@@ -94,3 +94,31 @@ export default class Rect {
     return "Rect(" + [this.x, this.y, this.width, this.height].join(", ") + ")";
   }
 }
+
+/**
+ * Describes geometric changes of a rectangle, in terms of changes per edge.
+ * Outward changes are in positive, and inward changes are in negative.
+ */
+export class RectDelta {
+  /** Generate a delta that transforms basis to target. */
+  public static fromRects(basis: Rect, target: Rect): RectDelta {
+    const diff = target.subtract(basis);
+    return new RectDelta(
+      diff.width + diff.x,
+      -diff.x,
+      diff.height + diff.y,
+      -diff.y
+    );
+  }
+
+  constructor(
+    public readonly east: number,
+    public readonly west: number,
+    public readonly south: number,
+    public readonly north: number
+  ) {}
+
+  public toString(): string {
+    return `WindowResizeDelta(east=${this.east} west=${this.west} north=${this.north} south=${this.south}}`;
+  }
+}

src/util/rectdelta.ts

@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2018-2019 Eon S. Jeon <esjeon@hyunmu.am>
-// SPDX-FileCopyrightText: 2021 Mikhail Zolotukhin <mail@genda.life>
-//
-// SPDX-License-Identifier: MIT
-
-import Rect from "./rect";
-
-/**
- * Describes geometric changes of a rectangle, in terms of changes per edge.
- * Outward changes are in positive, and inward changes are in negative.
- */
-export default class RectDelta {
-  /** Generate a delta that transforms basis to target. */
-  public static fromRects(basis: Rect, target: Rect): RectDelta {
-    const diff = target.subtract(basis);
-    return new RectDelta(
-      diff.width + diff.x,
-      -diff.x,
-      diff.height + diff.y,
-      -diff.y
-    );
-  }
-
-  constructor(
-    public readonly east: number,
-    public readonly west: number,
-    public readonly south: number,
-    public readonly north: number
-  ) {}
-
-  public toString(): string {
-    return `WindowResizeDelta(east=${this.east} west=${this.west} north=${this.north} south=${this.south}}`;
-  }
-}