@media-quest/engine 0.0.21 → 0.0.23

package/src/engine/next-que.spec.ts

@@ -1,121 +1,121 @@
-import { NextQue } from "./next-que";
-import { PageID } from "../utils/ID";
-import { PageDto } from "../page/Page";
-
-const tag1 = "tag1";
-const tag2 = "tag2";
-const tag3 = "tag3";
-
-let que = new NextQue();
-const createPage = (tags: string[]): PageDto => {
-  const dto: PageDto = {
-    id: PageID.create(),
-    prefix: "prefix",
-    staticElements: [],
-    background: "white",
-    components: [],
-    initialTasks: [],
-    tags,
-  };
-  return dto;
-};
-
-const p1 = createPage([tag1]);
-const p2 = createPage([]);
-const p3 = createPage([tag2]);
-const p4 = createPage([]);
-const p5 = createPage([tag3, tag2]);
-const p6 = createPage([tag3]);
-const all = [p1, p2, p3, p4, p5, p6];
-
-beforeEach(() => {
-  que = new NextQue();
-});
-
-describe("NextQue testing", () => {
-  it("Can pop", () => {
-    que.resetQue(all);
-    expect(que.pop()).toBe(p1);
-    expect(que.pop()).toBe(p2);
-    expect(que.size).toBe(all.length - 2);
-  });
-
-  it("Can remove by tag", () => {
-    que.resetQue(all);
-    expect(que.size).toBe(6);
-    que.removeByTag(tag3);
-    expect(que.size).toBe(4);
-    expect(que.peek()).toBe(p1);
-    que.pop();
-    expect(que.peek()).toBe(p2);
-    expect(que.size).toBe(3);
-  });
-
-  it("Can remove by tags[]", () => {
-    que.resetQue(all);
-    que.removeByTag([tag3, tag2, tag1]);
-    expect(que.size).toBe(2);
-  });
-
-  it("Can remove by pageIds[]", () => {
-    que.resetQue(all);
-    que.removeByPageId([p1.id, p2.id, p3.id]);
-    expect(que.pop()).toBe(p4);
-    expect(que.size).toBe(2);
-  });
-
-  it("Can remove by pageId", () => {
-    que.resetQue(all);
-    que.removeByPageId(p1.id);
-    expect(que.peek()).toBe(p2);
-    que.pop();
-    expect(que.peek()).toBe(p3);
-    expect(que.size).toBe(4);
-    que.removeByPageId(p3.id);
-    expect(que.size).toBe(3);
-  });
-
-  it("Can set pages in constuctor", () => {
-    que = new NextQue(all);
-    expect(que.size).toBe(all.length);
-  });
-
-  it("Can set pages in constuctor", () => {
-    que = new NextQue(all);
-    expect(que.size).toBe(all.length);
-  });
-
-  it("Can reset que to start over.", () => {
-    que = new NextQue(all);
-    expect(que.size).toBe(all.length);
-  });
-
-  it("Can insert new pages in the middle of the test.", () => {
-    que = new NextQue(all);
-    que.pop();
-    que.pop();
-    que.pop();
-    expect(que.peek()).toBe(p4);
-    que.insertAsNextByForce([p1, p2]);
-    expect(que.peek()).toBe(p1);
-    expect(que.size).toBe(5);
-    expect(que.pop()).toBe(p1);
-    expect(que.pop()).toBe(p2);
-    expect(que.pop()).toBe(p4);
-  });
-
-  it("Can jump to page by id", () => {
-    que = new NextQue(all);
-    que.pop();
-    que.jumpToPageById(p5.id);
-    // expect(que.size).toBe(5);
-    expect(que.peek()).toBe(p5);
-    que.jumpToPageById("noncence");
-    expect(que.peek()).toBe(p5);
-    // CAn not jump back
-    que.jumpToPageById(p2.id);
-    expect(que.peek()).toBe(p5);
-    que.jumpToPageById(p6.id);
-    expect(que.peek()).toBe(p6);
-  });
-});
+import { NextQue } from "./next-que";
+import { PageID } from "../utils/ID";
+import { PageDto } from "../page/Page";
+
+const tag1 = "tag1";
+const tag2 = "tag2";
+const tag3 = "tag3";
+
+let que = new NextQue();
+const createPage = (tags: string[]): PageDto => {
+  const dto: PageDto = {
+    id: PageID.create(),
+    prefix: "prefix",
+    staticElements: [],
+    background: "white",
+    components: [],
+    initialTasks: [],
+    tags,
+  };
+  return dto;
+};
+
+const p1 = createPage([tag1]);
+const p2 = createPage([]);
+const p3 = createPage([tag2]);
+const p4 = createPage([]);
+const p5 = createPage([tag3, tag2]);
+const p6 = createPage([tag3]);
+const all = [p1, p2, p3, p4, p5, p6];
+
+beforeEach(() => {
+  que = new NextQue();
+});
+
+describe("NextQue testing", () => {
+  it("Can pop", () => {
+    que.resetQue(all);
+    expect(que.pop()).toBe(p1);
+    expect(que.pop()).toBe(p2);
+    expect(que.size).toBe(all.length - 2);
+  });
+
+  it("Can remove by tag", () => {
+    que.resetQue(all);
+    expect(que.size).toBe(6);
+    que.removeByTag(tag3);
+    expect(que.size).toBe(4);
+    expect(que.peek()).toBe(p1);
+    que.pop();
+    expect(que.peek()).toBe(p2);
+    expect(que.size).toBe(3);
+  });
+
+  it("Can remove by tags[]", () => {
+    que.resetQue(all);
+    que.removeByTag([tag3, tag2, tag1]);
+    expect(que.size).toBe(2);
+  });
+
+  it("Can remove by pageIds[]", () => {
+    que.resetQue(all);
+    que.removeByPageId([p1.id, p2.id, p3.id]);
+    expect(que.pop()).toBe(p4);
+    expect(que.size).toBe(2);
+  });
+
+  it("Can remove by pageId", () => {
+    que.resetQue(all);
+    que.removeByPageId(p1.id);
+    expect(que.peek()).toBe(p2);
+    que.pop();
+    expect(que.peek()).toBe(p3);
+    expect(que.size).toBe(4);
+    que.removeByPageId(p3.id);
+    expect(que.size).toBe(3);
+  });
+
+  it("Can set pages in constuctor", () => {
+    que = new NextQue(all);
+    expect(que.size).toBe(all.length);
+  });
+
+  it("Can set pages in constuctor", () => {
+    que = new NextQue(all);
+    expect(que.size).toBe(all.length);
+  });
+
+  it("Can reset que to start over.", () => {
+    que = new NextQue(all);
+    expect(que.size).toBe(all.length);
+  });
+
+  it("Can insert new pages in the middle of the test.", () => {
+    que = new NextQue(all);
+    que.pop();
+    que.pop();
+    que.pop();
+    expect(que.peek()).toBe(p4);
+    que.insertAsNextByForce([p1, p2]);
+    expect(que.peek()).toBe(p1);
+    expect(que.size).toBe(5);
+    expect(que.pop()).toBe(p1);
+    expect(que.pop()).toBe(p2);
+    expect(que.pop()).toBe(p4);
+  });
+
+  it("Can jump to page by id", () => {
+    que = new NextQue(all);
+    que.pop();
+    que.jumpToPageById(p5.id);
+    // expect(que.size).toBe(5);
+    expect(que.peek()).toBe(p5);
+    que.jumpToPageById("noncence");
+    expect(que.peek()).toBe(p5);
+    // CAn not jump back
+    que.jumpToPageById(p2.id);
+    expect(que.peek()).toBe(p5);
+    que.jumpToPageById(p6.id);
+    expect(que.peek()).toBe(p6);
+  });
+});

package/src/engine/next-que.ts

@@ -1,101 +1,101 @@
-import { PageDto } from "../page/Page";
-
-export class NextQue {
-  private originalOrder: ReadonlyArray<string> = [];
-  private allPages: PageDto[] = [];
-  private excludedTags = new Set<string>();
-  private excludedByPageId = new Set<string>();
-  private remaining: PageDto[] = [];
-  constructor(pages: PageDto[] = []) {
-    this.resetQue(pages);
-  }
-
-  /**
-   * Will reset que with the new pages.
-   * @param pages
-   */
-  resetQue(pages: PageDto[]) {
-    this.allPages = [...pages];
-    this.remaining = [...pages];
-    this.excludedTags = new Set();
-    this.excludedByPageId = new Set();
-    this.originalOrder = this.allPages.map((p) => p.id);
-  }
-
-  pop(): PageDto | false {
-    const next = this.remaining.shift();
-    // TODO CLONE??
-    return next ?? false;
-  }
-
-  peek(): PageDto | false {
-    const next = this.remaining[0];
-    return next ?? false;
-  }
-
-  jumpToPageById(pageId: string): boolean {
-    const index = this.remaining.findIndex((p) => p.id === pageId);
-    if (index < 0) {
-      return false;
-    }
-    this.remaining = this.remaining.slice(index);
-    return true;
-  }
-
-  removeByTag(tag: string | string[]) {
-    if (Array.isArray(tag)) {
-      tag.forEach((tag) => {
-        this.excludedTags.add(tag);
-      });
-    } else {
-      this.excludedTags.add(tag);
-    }
-    this.filterRemaining();
-  }
-
-  /**
-   * Will not be included
-   * @param pages
-   */
-  insertAsNextByForce(pages: PageDto[]) {
-    this.remaining.unshift(...pages);
-  }
-
-  removeByPageId(pageId: string | string[]) {
-    if (Array.isArray(pageId)) {
-      pageId.forEach((id) => {
-        this.excludedByPageId.add(id);
-      });
-    } else {
-      this.excludedByPageId.add(pageId);
-    }
-    this.filterRemaining();
-    // this.excludedByPageId.add(pageId);
-  }
-
-  private filterRemaining() {
-    this.remaining = this.remaining.filter((p) => {
-      const tags = p.tags ?? [];
-      const isIncluededByTag = !tags.some((tag) => this.excludedTags.has(tag));
-      const isIncludedByPageId = !this.excludedByPageId.has(p.id);
-      return isIncludedByPageId && isIncluededByTag;
-    });
-  }
-  get isEmpty(): boolean {
-    return this.remaining.length === 0;
-  }
-
-  /**
-   * Total number of pages left in que
-   */
-  get size(): number {
-    return this.remaining.length;
-  }
-
-  /**
-   * Total number of pages in test
-   */
-  get pageCount(): number {
-    return this.originalOrder.length;
-  }
-}
+import { PageDto } from "../page/Page";
+
+export class NextQue {
+  private originalOrder: ReadonlyArray<string> = [];
+  private allPages: PageDto[] = [];
+  private excludedTags = new Set<string>();
+  private excludedByPageId = new Set<string>();
+  private remaining: PageDto[] = [];
+  constructor(pages: PageDto[] = []) {
+    this.resetQue(pages);
+  }
+
+  /**
+   * Will reset que with the new pages.
+   * @param pages
+   */
+  resetQue(pages: PageDto[]) {
+    this.allPages = [...pages];
+    this.remaining = [...pages];
+    this.excludedTags = new Set();
+    this.excludedByPageId = new Set();
+    this.originalOrder = this.allPages.map((p) => p.id);
+  }
+
+  pop(): PageDto | false {
+    const next = this.remaining.shift();
+    // TODO CLONE??
+    return next ?? false;
+  }
+
+  peek(): PageDto | false {
+    const next = this.remaining[0];
+    return next ?? false;
+  }
+
+  jumpToPageById(pageId: string): boolean {
+    const index = this.remaining.findIndex((p) => p.id === pageId);
+    if (index < 0) {
+      return false;
+    }
+    this.remaining = this.remaining.slice(index);
+    return true;
+  }
+
+  removeByTag(tag: string | string[]) {
+    if (Array.isArray(tag)) {
+      tag.forEach((tag) => {
+        this.excludedTags.add(tag);
+      });
+    } else {
+      this.excludedTags.add(tag);
+    }
+    this.filterRemaining();
+  }
+
+  /**
+   * Will not be included
+   * @param pages
+   */
+  insertAsNextByForce(pages: PageDto[]) {
+    this.remaining.unshift(...pages);
+  }
+
+  removeByPageId(pageId: string | string[]) {
+    if (Array.isArray(pageId)) {
+      pageId.forEach((id) => {
+        this.excludedByPageId.add(id);
+      });
+    } else {
+      this.excludedByPageId.add(pageId);
+    }
+    this.filterRemaining();
+    // this.excludedByPageId.add(pageId);
+  }
+
+  private filterRemaining() {
+    this.remaining = this.remaining.filter((p) => {
+      const tags = p.tags ?? [];
+      const isIncluededByTag = !tags.some((tag) => this.excludedTags.has(tag));
+      const isIncludedByPageId = !this.excludedByPageId.has(p.id);
+      return isIncludedByPageId && isIncluededByTag;
+    });
+  }
+  get isEmpty(): boolean {
+    return this.remaining.length === 0;
+  }
+
+  /**
+   * Total number of pages left in que
+   */
+  get size(): number {
+    return this.remaining.length;
+  }
+
+  /**
+   * Total number of pages in test
+   */
+  get pageCount(): number {
+    return this.originalOrder.length;
+  }
+}

package/src/engine/page-que-ruleengine-action.ts

@@ -1,6 +1,6 @@
-import { PageID } from "../utils/ID";
-
-export type RuleActionPageQue =
-  | { kind: "excludeByTag"; tagIds: string[] }
-  | { kind: "excludeByPageId"; pageIds: Array<PageID> }
-  | { kind: "jumpToPage"; pageId: PageID };
+import { PageID } from "../utils/ID";
+
+export type RuleActionPageQue =
+  | { kind: "excludeByTag"; tagIds: string[] }
+  | { kind: "excludeByPageId"; pageIds: Array<PageID> }
+  | { kind: "jumpToPage"; pageId: PageID };

package/src/engine/scale.spec.ts

@@ -1,38 +1,38 @@
-import { Scale, ScaleService } from "./scale";
-
-describe("Scale works", () => {
-    test("scaleService", () => {
-        const scaleService = new ScaleService({
-            baseHeight: 1300,
-            baseWidth: 1024,
-            containerWidth: 600,
-            containerHeight: 650,
-        });
-        expect(scaleService.scale).toBe(0.5);
-        const unsub = scaleService.onChange((scale) => {
-            expect(scale).toBe(0.5);
-        }, "ScaleService test-function");
-        unsub();
-
-        scaleService.setContainerBounds({ height: 1170, width: 1000 });
-
-        expect(scaleService.scale).toBe(0.9);
-    });
-    test("scaleFn", () => {
-        const scaleFunction = Scale.calc(1200, 1200);
-        expect(scaleFunction({ height: 600, width: 600 })).toBe(0.5);
-        expect(scaleFunction({ height: 900, width: 600 })).toBe(0.5);
-        expect(scaleFunction({ height: 400, width: 600 })).toBe(4 / 12);
-        expect(scaleFunction({ height: 900, width: 300 })).toBe(0.25);
-        expect(scaleFunction({ height: 300, width: 400 })).toBe(0.25);
-        expect(scaleFunction({ height: 0, width: 0 })).toBe(0);
-        const scaleFunction2 = Scale.calc(1200, 1024);
-        expect(scaleFunction2({ height: 600, width: 6000 })).toBe(0.5);
-        expect(scaleFunction2({ height: 400, width: 800 })).toBe(4 / 12);
-        expect(scaleFunction2({ height: 800, width: 512 })).toBe(0.5);
-        const scale = Scale.scaleFunctionCreator(0.5);
-
-        expect(scale(500)).toBe(250);
-        expect(scale(200)).toBe(100);
-    });
-});
+import { Scale, ScaleService } from "./scale";
+
+describe("Scale works", () => {
+    test("scaleService", () => {
+        const scaleService = new ScaleService({
+            baseHeight: 1300,
+            baseWidth: 1024,
+            containerWidth: 600,
+            containerHeight: 650,
+        });
+        expect(scaleService.scale).toBe(0.5);
+        const unsub = scaleService.onChange((scale) => {
+            expect(scale).toBe(0.5);
+        }, "ScaleService test-function");
+        unsub();
+
+        scaleService.setContainerBounds({ height: 1170, width: 1000 });
+
+        expect(scaleService.scale).toBe(0.9);
+    });
+    test("scaleFn", () => {
+        const scaleFunction = Scale.calc(1200, 1200);
+        expect(scaleFunction({ height: 600, width: 600 })).toBe(0.5);
+        expect(scaleFunction({ height: 900, width: 600 })).toBe(0.5);
+        expect(scaleFunction({ height: 400, width: 600 })).toBe(4 / 12);
+        expect(scaleFunction({ height: 900, width: 300 })).toBe(0.25);
+        expect(scaleFunction({ height: 300, width: 400 })).toBe(0.25);
+        expect(scaleFunction({ height: 0, width: 0 })).toBe(0);
+        const scaleFunction2 = Scale.calc(1200, 1024);
+        expect(scaleFunction2({ height: 600, width: 6000 })).toBe(0.5);
+        expect(scaleFunction2({ height: 400, width: 800 })).toBe(4 / 12);
+        expect(scaleFunction2({ height: 800, width: 512 })).toBe(0.5);
+        const scale = Scale.scaleFunctionCreator(0.5);
+
+        expect(scale(500)).toBe(250);
+        expect(scale(200)).toBe(100);
+    });
+});

package/src/engine/scale.ts

@@ -1,70 +1,70 @@
-export class ScaleService {
-  private readonly baseHeight;
-  private readonly baseWidth;
-  private containerHeight = 1300;
-  private containerWidth = 1300;
-
-  get scale() {
-    return this._scale;
-  }
-
-  get pageHeight() {
-    return this.baseHeight * this.scale;
-  }
-  get pageWidth() {
-    return this.baseWidth * this._scale;
-  }
-
-  private _scale = 1;
-
-  private readonly subscribers = new Set<(scale: number) => void>();
-
-  constructor(config: { baseHeight: number; baseWidth: number; containerHeight: number; containerWidth: number }) {
-    this.baseHeight = config.baseHeight;
-    this.baseWidth = config.baseWidth;
-    this.containerHeight = config.containerHeight;
-    this.containerWidth = config.containerWidth;
-    this.updateScale();
-  }
-
-  setContainerBounds(bounds: { height: number; width: number }) {
-    this.containerWidth = bounds.width;
-    this.containerHeight = bounds.height;
-    this.updateScale();
-  }
-  private updateScale() {
-    const scaleFn = Scale.calc(this.baseHeight, this.baseWidth);
-    const scale = scaleFn({ height: this.containerHeight, width: this.containerWidth });
-    const hasChanged = this.scale !== scale;
-    this._scale = scale;
-    if (hasChanged) {
-      this.subscribers.forEach((fn) => {
-        fn(this._scale);
-      });
-    }
-  }
-
-  onChange(scaleChangeHandler: (scale: number) => void, subscriberId: string) {
-    // console.log(subscriberId);
-    this.subscribers.add(scaleChangeHandler);
-    scaleChangeHandler(this._scale);
-    return () => {
-      this.subscribers.delete(scaleChangeHandler);
-    };
-  }
-}
-export namespace Scale {
-  export const calc = (baseHeight: number, baseWidth: number) => {
-    return (container: { height: number; width: number }) => {
-      const heightRatio = container.height / baseHeight;
-      const widthRatio = container.width / baseWidth;
-      return Math.min(heightRatio, widthRatio);
-    };
-  };
-
-  type ScalePosInput = { x: number; y: number; h: number; w: number };
-
-  export const scaleFunctionCreator = (scale: number) => {
-    return (value: number) => value * scale;
-  };
-}
+export class ScaleService {
+  private readonly baseHeight;
+  private readonly baseWidth;
+  private containerHeight = 1300;
+  private containerWidth = 1300;
+
+  get scale() {
+    return this._scale;
+  }
+
+  get pageHeight() {
+    return this.baseHeight * this.scale;
+  }
+  get pageWidth() {
+    return this.baseWidth * this._scale;
+  }
+
+  private _scale = 1;
+
+  private readonly subscribers = new Set<(scale: number) => void>();
+
+  constructor(config: { baseHeight: number; baseWidth: number; containerHeight: number; containerWidth: number }) {
+    this.baseHeight = config.baseHeight;
+    this.baseWidth = config.baseWidth;
+    this.containerHeight = config.containerHeight;
+    this.containerWidth = config.containerWidth;
+    this.updateScale();
+  }
+
+  setContainerBounds(bounds: { height: number; width: number }) {
+    this.containerWidth = bounds.width;
+    this.containerHeight = bounds.height;
+    this.updateScale();
+  }
+  private updateScale() {
+    const scaleFn = Scale.calc(this.baseHeight, this.baseWidth);
+    const scale = scaleFn({ height: this.containerHeight, width: this.containerWidth });
+    const hasChanged = this.scale !== scale;
+    this._scale = scale;
+    if (hasChanged) {
+      this.subscribers.forEach((fn) => {
+        fn(this._scale);
+      });
+    }
+  }
+
+  onChange(scaleChangeHandler: (scale: number) => void, subscriberId: string) {
+    // console.log(subscriberId);
+    this.subscribers.add(scaleChangeHandler);
+    scaleChangeHandler(this._scale);
+    return () => {
+      this.subscribers.delete(scaleChangeHandler);
+    };
+  }
+}
+export namespace Scale {
+  export const calc = (baseHeight: number, baseWidth: number) => {
+    return (container: { height: number; width: number }) => {
+      const heightRatio = container.height / baseHeight;
+      const widthRatio = container.width / baseWidth;
+      return Math.min(heightRatio, widthRatio);
+    };
+  };
+
+  type ScalePosInput = { x: number; y: number; h: number; w: number };
+
+  export const scaleFunctionCreator = (scale: number) => {
+    return (value: number) => value * scale;
+  };
+}