@media-quest/engine 0.0.24 → 0.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@media-quest/engine",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "Rendering engine for media-quest schemas.",
   "main": "src/public-api.ts",
   "license": "MIT",

package/src/engine/SchemaDto.ts

@@ -1,24 +1,23 @@
-import { Rule } from "../rules/rule";
-import { Fact } from "../rules/fact";
-import { RuleActionPageQue } from "./page-que-ruleengine-action";
-import { SchemaID } from "../utils/ID";
-import { PageDto } from "../page/Page";
-
-export type PageQueRules = Rule<RuleActionPageQue, never>;
-
-export interface PageSequenceDto {
-  readonly id: string;
-  readonly rules: Array<PageQueRules>;
-  readonly pages: Array<PageDto>;
-}
-
-export interface SchemaDto {
-  readonly id: SchemaID;
-  readonly baseHeight: number;
-  readonly baseWidth: number;
-  readonly backgroundColor: string;
-  readonly pages: Array<PageDto>;
-  readonly rules: Array<PageQueRules>;
-  readonly pageSequences?: Array<PageSequenceDto>;
-  readonly predefinedFacts?: ReadonlyArray<Fact>;
-}
+import { Rule } from "../rules/rule";
+import { Fact } from "../rules/fact";
+import { RuleActionPageQue } from "./page-que-ruleengine-action";
+import { PageDto } from "../page/Page";
+
+export type PageQueRules = Rule<RuleActionPageQue, never>;
+
+export interface PageSequenceDto {
+  readonly id: string;
+  readonly rules: Array<PageQueRules>;
+  readonly pages: Array<PageDto>;
+}
+
+export interface SchemaDto {
+  readonly id: string;
+  readonly baseHeight: number;
+  readonly baseWidth: number;
+  readonly backgroundColor: string;
+  readonly pages: Array<PageDto>;
+  readonly rules: Array<PageQueRules>;
+  readonly pageSequences?: Array<PageSequenceDto>;
+  readonly predefinedFacts?: ReadonlyArray<Fact>;
+}

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

@@ -1,67 +1,67 @@
-import { HistoryQue } from "./history-que";
-import { DTimestamp } from "../common/DTimestamp";
-import { PageID } from "../utils/ID";
-import { PageDto } from "../page/Page";
-import { PageResult } from "../page/page-result";
-
-const p = (id: number): PageDto => {
-  return {
-    id: PageID.create(),
-    prefix: "prefix" + id,
-    components: [],
-    initialTasks: [],
-    staticElements: [],
-    background: "",
-    tags: [],
-  };
-};
-
-const pageResult = (id: number, value: number): PageResult => {
-  const pageEntered = DTimestamp.now();
-  const pageExited = DTimestamp.addMills(pageEntered, 1000);
-  const pageTime = DTimestamp.diff(pageEntered, pageExited);
-
-  const result: PageResult = {
-    pageId: "_dummyId" + id,
-    pagePrefix: "prefix" + id,
-    eventLog: [],
-    pageTime,
-    collectedFacts: [
-      {
-        referenceId: "" + id,
-        referenceLabel: "label-for-" + id,
-        value,
-        label: "value-label " + value,
-        kind: "numeric-fact",
-      },
-    ],
-  };
-  return result;
-};
-// const h = (page: PageDto, answeredQuestions: AnsweredQuestion[]): PageResult => ({
-//   pageId: page.id,
-//   answeredQuestions,
-// });
-const p1 = p(1);
-const p2 = p(2);
-const p3 = p(3);
-const p4 = p(4);
-const p5 = p(5);
-const p6 = p(6);
-const all = [p1, p2, p3, p4, p5, p6];
-
-let history = new HistoryQue();
-beforeEach(() => {
-  history = new HistoryQue();
-});
-
-describe("HistoryQue", () => {
-  it("should create an instance", () => {
-    expect(history).toBeTruthy();
-  });
-
-  it("Can add history, and get facts back", () => {
-    history.addToHistory(pageResult(1, 2));
-    expect(history.getFacts().length).toBe(1);
-  });
-});
+import { HistoryQue } from "./history-que";
+import { DTimestamp } from "../common/DTimestamp";
+import { PageDto } from "../page/Page";
+import { PageResult } from "../page/page-result";
+import { DUtil } from "../utils/DUtil";
+
+const p = (id: number): PageDto => {
+  return {
+    id: DUtil.randomObjectId(),
+    prefix: "prefix" + id,
+    components: [],
+    initialTasks: [],
+    staticElements: [],
+    background: "",
+    tags: [],
+  };
+};
+
+const pageResult = (id: number, value: number): PageResult => {
+  const pageEntered = DTimestamp.now();
+  const pageExited = DTimestamp.addMills(pageEntered, 1000);
+  const pageTime = DTimestamp.diff(pageEntered, pageExited);
+
+  const result: PageResult = {
+    pageId: "_dummyId" + id,
+    pagePrefix: "prefix" + id,
+    eventLog: [],
+    pageTime,
+    collectedFacts: [
+      {
+        referenceId: "" + id,
+        referenceLabel: "label-for-" + id,
+        value,
+        label: "value-label " + value,
+        kind: "numeric-fact",
+      },
+    ],
+  };
+  return result;
+};
+// const h = (page: PageDto, answeredQuestions: AnsweredQuestion[]): PageResult => ({
+//   pageId: page.id,
+//   answeredQuestions,
+// });
+const p1 = p(1);
+const p2 = p(2);
+const p3 = p(3);
+const p4 = p(4);
+const p5 = p(5);
+const p6 = p(6);
+const all = [p1, p2, p3, p4, p5, p6];
+
+let history = new HistoryQue();
+beforeEach(() => {
+  history = new HistoryQue();
+});
+
+describe("HistoryQue", () => {
+  it("should create an instance", () => {
+    expect(history).toBeTruthy();
+  });
+
+  it("Can add history, and get facts back", () => {
+    history.addToHistory(pageResult(1, 2));
+    expect(history.getFacts().length).toBe(1);
+  });
+});

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 { PageDto } from "../page/Page";
+import { DUtil } from "../utils/DUtil";
+
+const tag1 = "tag1";
+const tag2 = "tag2";
+const tag3 = "tag3";
+
+let que = new NextQue();
+const createPage = (tags: string[]): PageDto => {
+  const dto: PageDto = {
+    id: DUtil.randomObjectId(),
+    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/page-que-ruleengine-action.ts

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

package/src/public-api.ts

@@ -1,26 +1,26 @@
-export * from "./engine/SchemaResult";
-export * from "./engine/SchemaEngine";
-export * from "./engine/SchemaDto";
-export * from "./engine/page-que-ruleengine-action";
-export * from "./rules/rule";
-export * from "./rules/fact";
-export * from "./rules/rule-engine";
-export * from "./rules/condition";
-export * from "./utils/DUtil";
-export * from "./utils/ID";
-
-export * from "./events/mq-events";
-
-export * from "./page/page-component";
-
-// ELEMENTS
-export * from "./Delement/css";
-export * from "./Delement/DStyle";
-export * from "./Delement/DImg";
-export * from "./Delement/DText";
-export * from "./Delement/Ddiv";
-export * from "./Delement/button-click-action";
-export * from "./Delement/DElement";
-export * from "./Delement/DElement.dto";
-export { PageDto } from "./page/Page";
-export * from "./page/task";
+export * from "./engine/SchemaResult";
+export * from "./engine/SchemaEngine";
+export * from "./engine/SchemaDto";
+export * from "./engine/page-que-ruleengine-action";
+export * from "./rules/rule";
+export * from "./rules/fact";
+export * from "./rules/rule-engine";
+export * from "./rules/condition";
+export * from "./utils/DUtil";
+// export * from "./utils/ID";
+
+export * from "./events/mq-events";
+
+export * from "./page/page-component";
+
+// ELEMENTS
+export * from "./Delement/css";
+export * from "./Delement/DStyle";
+export * from "./Delement/DImg";
+export * from "./Delement/DText";
+export * from "./Delement/Ddiv";
+export * from "./Delement/button-click-action";
+export * from "./Delement/DElement";
+export * from "./Delement/DElement.dto";
+export { PageDto } from "./page/Page";
+export * from "./page/task";