@media-quest/engine 0.0.10 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@media-quest/engine",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Rendering engine for media-quest schemas.",
   "main": "dist/public-api.js",
   "module": "dist/public-api.mjs",

package/src/dto/DElement.dto.ts

@@ -1,50 +1,46 @@
 import { DStyle } from "../Delement/DStyle";
 import { DEventHandler, QueryChangedHandler } from "../event-handlers/DEventHandler";
 import { DCommand } from "../commands/DCommand";
-
-// export interface CanBlockMedia {
-//     readonly isMediaBlocking:
-// }
 export type DElementDto = DTextDto | DImgDto | DDivDto;
 
 interface DStateListener {
-    readonly onStateChange?: ReadonlyArray<QueryChangedHandler>;
+  readonly onStateChange?: ReadonlyArray<QueryChangedHandler>;
 }
 
 export interface DElementBaseDto extends DStateListener {
-    readonly id: string;
-    readonly style: Partial<DStyle>;
-    readonly eventHandlers?: ReadonlyArray<DEventHandler>;
-    readonly onClick?: ReadonlyArray<DCommand>;
+  readonly id: string;
+  readonly style: Partial<DStyle>;
+  readonly eventHandlers?: ReadonlyArray<DEventHandler>;
+  readonly onClick?: ReadonlyArray<DCommand>;
 }
 
 export interface DTextDto extends DElementBaseDto {
-    readonly _tag: "p";
-    readonly text: string;
+  readonly _tag: "p";
+  readonly text: string;
 }
 
 export interface DDivDto extends DElementBaseDto {
-    readonly _tag: "div";
-    readonly children: Array<DTextDto | DImgDto>;
+  readonly _tag: "div";
+  readonly children: Array<DTextDto | DImgDto>;
 }
 
 export interface DImgDto extends DElementBaseDto {
-    readonly _tag: "img";
-    readonly url: string;
+  readonly _tag: "img";
+  readonly url: string;
 }
 
 export interface DVideoDto extends DElementBaseDto {
-    readonly _tag: "video";
-    readonly url: string;
-    // readonly mode: "gif" | "autoplay" | "on-demand";
-    // readonly isMediaBlocking: boolean;
+  readonly _tag: "video";
+  readonly url: string;
+  // readonly mode: "gif" | "autoplay" | "on-demand";
+  // readonly isMediaBlocking: boolean;
 }
 
 export interface DAudioDto {
-    readonly id: string;
-    readonly _tag: "audio";
-    readonly url: string;
-    // readonly eventHandlers: ReadonlyArray<DEventHandler>;
+  readonly id: string;
+  readonly _tag: "audio";
+  readonly url: string;
+  // readonly eventHandlers: ReadonlyArray<DEventHandler>;
 
-    // readonly isMediaBlocking: boolean;
+  // readonly isMediaBlocking: boolean;
 }

package/src/services/sequence-manager.ts

@@ -1,132 +1,133 @@
 import { DTimestamp } from "../common/DTimestamp";
 
 export interface DelayTask {
-    readonly kind: "delay-task";
-    readonly duration: number;
+  readonly kind: "delay-task";
+  readonly duration: number;
 }
 
 export interface NoopTask {
-    readonly kind: "noop-task";
+  readonly kind: "noop-task";
 }
 
 export interface AudioTask {
-    readonly kind: "autoplay-audio-task";
-    readonly url: string;
-    readonly audioId: string;
+  readonly kind: "autoplay-audio-task";
+  readonly url: string;
+  readonly audioId: string;
 }
 
 export interface VideoTask {
-    readonly kind: "autoplay-video-task";
-    readonly url: string;
-    readonly videoId: string;
+  readonly kind: "autoplay-video-task";
+  readonly url: string;
+  readonly videoId: string;
 }
 
 export type AutoplayTask = VideoTask | AudioTask | DelayTask;
 type TaskHistory = {
-    readonly startedAt: DTimestamp;
-    readonly completedAt: DTimestamp;
-    readonly task: AutoplayTask;
+  readonly startedAt: DTimestamp;
+  readonly completedAt: DTimestamp;
+  readonly task: AutoplayTask;
 };
 class SequenceHistory {
-    private taskHistory: Array<TaskHistory> = [];
-    constructor(private readonly startedAt: DTimestamp) {}
+  private taskHistory: Array<TaskHistory> = [];
+  constructor(private readonly startedAt: DTimestamp) {}
 
-    add(task: TaskHistory) {
-        this.taskHistory.push(task);
-    }
+  add(task: TaskHistory) {
+    this.taskHistory.push(task);
+  }
 }
+
 export class SequenceManager {
-    private runningTask: { task: AutoplayTask; startedAt: DTimestamp } | false;
-    private taskList: Array<DelayTask | AudioTask | VideoTask>;
-    private readonly t0: DTimestamp;
-    private readonly history: SequenceHistory;
-
-    constructor(private readonly tasks: ReadonlyArray<AudioTask | DelayTask | VideoTask>) {
-        this.t0 = DTimestamp.now();
-        const [first, ...rest] = tasks;
-        if (first && first.kind === "delay-task") {
-            this.runningTask = { task: first, startedAt: this.t0 };
-            this.taskList = [...rest];
-        } else {
-            this.runningTask = false;
-            this.taskList = [...tasks];
-        }
-        this.history = new SequenceHistory(this.t0);
+  private runningTask: { task: AutoplayTask; startedAt: DTimestamp } | false;
+  private taskList: Array<DelayTask | AudioTask | VideoTask>;
+  private readonly t0: DTimestamp;
+  private readonly history: SequenceHistory;
+
+  constructor(private readonly tasks: ReadonlyArray<AudioTask | DelayTask | VideoTask>) {
+    this.t0 = DTimestamp.now();
+    const [first, ...rest] = tasks;
+    if (first && first.kind === "delay-task") {
+      this.runningTask = { task: first, startedAt: this.t0 };
+      this.taskList = [...rest];
+    } else {
+      this.runningTask = false;
+      this.taskList = [...tasks];
+    }
+    this.history = new SequenceHistory(this.t0);
+  }
+
+  audioCompleted(audio: { audioId: string; url: string }) {
+    const curr = this.runningTask;
+    if (curr && curr.task.kind === "autoplay-audio-task") {
+      const { audioId, url } = curr.task;
+      if (url === audio.url) {
+        this.runningTask = false;
+      } else {
+        // WARN ABOUT UNEXPECTED AUDIO ID && URL ??
+        console.warn("Unexpected audio completed url.");
+      }
     }
+  }
 
-    audioCompleted(audio: { audioId: string; url: string }) {
-        const curr = this.runningTask;
-        if (curr && curr.task.kind === "autoplay-audio-task") {
-            const { audioId, url } = curr.task;
-            if (url === audio.url) {
-                this.runningTask = false;
-            } else {
-                // WARN ABOUT UNEXPECTED AUDIO ID && URL ??
-                console.warn("Unexpected audio completed url.");
-            }
-        }
+  videoCompleted(video: { videoId: string; url: string }) {
+    const curr = this.runningTask;
+    if (curr && curr.task.kind === "autoplay-video-task") {
+      const { url } = curr.task;
+      if (url === video.url) {
+        this.runningTask = false;
+      } else {
+        // WARN ABOUT UNEXPECTED AUDIO ID && URL ??
+        console.warn("Unexpected video completed url.");
+      }
+    }
+  }
+
+  abort() {
+    this.taskList = [];
+    this.runningTask = false;
+  }
+  get isCompleted() {
+    return !this.isRunning;
+  }
+  get isRunning() {
+    return this.runningTask || this.taskList.length;
+  }
+
+  nextTask(now: DTimestamp): NoopTask | AudioTask | VideoTask {
+    const curr = this.runningTask;
+
+    if (curr && curr.task.kind === "delay-task") {
+      const progress = DTimestamp.diff(curr.startedAt, now);
+      // DELAY COMPLETED.
+      if (progress >= curr.task.duration) {
+        this.runningTask = false;
+      }
     }
 
-    videoCompleted(video: { videoId: string; url: string }) {
-        const curr = this.runningTask;
-        if (curr && curr.task.kind === "autoplay-video-task") {
-            const { url } = curr.task;
-            if (url === video.url) {
-                this.runningTask = false;
-            } else {
-                // WARN ABOUT UNEXPECTED AUDIO ID && URL ??
-                console.warn("Unexpected video completed url.");
-            }
-        }
+    // RETURN IF A TASK IS RUNNING.
+    if (this.runningTask) {
+      return { kind: "noop-task" };
     }
 
-    abort() {
-        this.taskList = [];
-        this.runningTask = false;
+    const first = this.taskList.shift();
+    if (!first) {
+      return { kind: "noop-task" };
     }
-    get isCompleted() {
-        return !this.isRunning;
+
+    if (first.kind === "delay-task") {
+      this.runningTask = { task: first, startedAt: now };
+      return { kind: "noop-task" };
     }
-    get isRunning() {
-        return this.runningTask || this.taskList.length;
+
+    if (first.kind === "autoplay-video-task") {
+      this.runningTask = { task: first, startedAt: now };
+      return first;
     }
 
-    nextTask(now: DTimestamp): NoopTask | AudioTask | VideoTask {
-        const curr = this.runningTask;
-
-        if (curr && curr.task.kind === "delay-task") {
-            const progress = DTimestamp.diff(curr.startedAt, now);
-            // DELAY COMPLETED.
-            if (progress >= curr.task.duration) {
-                this.runningTask = false;
-            }
-        }
-
-        // RETURN IF A TASK IS RUNNING.
-        if (this.runningTask) {
-            return { kind: "noop-task" };
-        }
-
-        const first = this.taskList.shift();
-        if (!first) {
-            return { kind: "noop-task" };
-        }
-
-        if (first.kind === "delay-task") {
-            this.runningTask = { task: first, startedAt: now };
-            return { kind: "noop-task" };
-        }
-
-        if (first.kind === "autoplay-video-task") {
-            this.runningTask = { task: first, startedAt: now };
-            return first;
-        }
-
-        if (first.kind === "autoplay-audio-task") {
-            this.runningTask = { task: first, startedAt: now };
-            return first;
-        }
-
-        return { kind: "noop-task" };
+    if (first.kind === "autoplay-audio-task") {
+      this.runningTask = { task: first, startedAt: now };
+      return first;
     }
+
+    return { kind: "noop-task" };
+  }
 }

package/src/utils/ID.ts

@@ -11,7 +11,7 @@ const isID = <const B extends string>(idName: B, id?: string): id is ID<B> => {
   return id.length >= MIN_LENGTH;
 };
 
-const createID = <const B extends string>(idName: B): ID<B> => {
+const createIDByName = <const B extends string>(idName: B): ID<B> => {
   const letters = "abcdefghijklmnopqrstuvyz";
   const all = letters + letters.toUpperCase();
   let result = "";
@@ -30,7 +30,7 @@ export const createTypedIdSingleton = <const B extends string>(idName: B) => {
   /**
    * Creates a new ID of the correct type
    */
-  const create = (): ID<B> => createID(idName);
+  const create = (): ID<B> => createIDByName(idName);
 
   /**
    * Checks if the id is of the correct type