@media-quest/engine 0.0.39 → 0.0.41

package/dist/public-api.d.ts

@@ -40,53 +40,39 @@ type MqEventEngineStart = _MqEvent<"engine-start", {
 }>;
 interface MqEventPageEnter extends _MqEvent<"page-enter", {
     readonly pageId: string;
-    readonly pageNumber: number;
     readonly pagePrefix: string;
 }> {
 }
 interface MqEventPageLeave extends _MqEvent<"page-leave", {
     readonly pageId: string;
-    readonly pageNumber: number;
     readonly pagePrefix: string;
 }> {
 }
 type MqEventUserClicked = _MqEvent<"user-clicked", {
     readonly pageId: string;
-    readonly pagePrefix: string;
-    readonly pageNumber: number;
+    pagePrefix: string;
     action: string;
     descriptions: string;
 }>;
 type MqEvent = MqEventPageEnter | MqEventPageLeave | MqEventEngineStart | MqEventUserClicked;
 declare const MqEvent: {
     readonly engineStart: (schemaId: string, schemaPrefix: string) => MqEventEngineStart;
-    readonly pageEnter: (pageId: string, pagePrefix: string, pageNumber: number) => MqEventPageEnter;
-    readonly pageLeave: (pageId: string, pagePrefix: string, pageNumber: number) => MqEventPageLeave;
+    readonly pageEnter: (pageId: string, pagePrefix: string) => MqEventPageEnter;
+    readonly pageLeave: (pageId: string, pagePrefix: string) => MqEventPageLeave;
     readonly userClicked: (data: {
         pageId: string;
         pagePrefix: string;
-        pageNumber: number;
         action: string;
         descriptions: string;
     }) => MqEventUserClicked;
 };
 
-interface PageResult {
-    readonly pageId: string;
-    readonly pagePrefix: string;
-    readonly pageNumber: number;
-    readonly eventLog: ReadonlyArray<MqEvent>;
-    readonly pageTime: DTimestamp.Diff;
-    readonly collectedFacts: Fact[];
-}
-
 interface SchemaResult {
     readonly schemaId: string;
     readonly pagesLeft: number;
     readonly predefinedFacts: ReadonlyArray<Fact>;
     readonly eventLog: ReadonlyArray<MqEvent>;
     readonly answers: ReadonlyArray<Fact>;
-    readonly pageResults?: ReadonlyArray<PageResult>;
 }
 
 type Condition = Condition.String | Condition.Numeric | Condition.Complex;
@@ -194,6 +180,8 @@ declare namespace DCss {
         readonly value: number;
     }
     type LengthString = `${number}px` | `${number}%`;
+    const isPx: (unit?: LengthUnit | false | undefined | null) => unit is Px;
+    const isPercent: (unit?: LengthUnit | false | undefined | null) => unit is Percent;
     interface Percent {
         readonly _unit: "percent";
         readonly value: number;
@@ -261,6 +249,7 @@ interface DStyle {
 declare namespace DStyle {
     const normalize: <T extends HTMLElement>(el: T) => T;
     const applyStyles: <T extends HTMLElement>(el: T, style: Partial<DStyle>, scale: number) => T;
+    const clone: <T extends Partial<DStyle>>(style: T) => T;
 }
 
 declare class ScaleService {
@@ -384,6 +373,7 @@ declare abstract class DElement<T extends HTMLElement> {
     updateState(state: TaskStateDiff): void;
     setState(state: TaskState): void;
     private handleStateChanges;
+    getComputedStyle(): CSSStyleDeclaration;
     abstract registerClickHandler(clickHandler: (action: ButtonClickAction) => void): void;
     protected updateStyles(style: Partial<DStyle>): void;
 }
@@ -452,10 +442,6 @@ interface VideoPlayerDto {
 interface PageDto {
     readonly id: string;
     readonly prefix: string;
-    /**
-     * Page number in the sequence (starts at 1)
-     */
-    readonly pageNumber: number;
     readonly tags: string[];
     background: string;
     elements: Array<DElementDto>;
@@ -521,6 +507,7 @@ declare class SchemaEngine implements ISchemaEngine {
         message: string;
     }) => void): void;
     setLogger(logger: EngineLogger): void;
+    getComputedStylesOfCurrentPage(): false | CSSStyleDeclaration[];
 }
 
 interface SolveResult<S, F> {

package/dist/public-api.js

@@ -46,9 +46,6 @@ var HistoryQue = class {
     const answers = this.history.map((h) => h.collectedFacts).flat(1);
     return answers;
   }
-  getPageResults() {
-    return [...this.history];
-  }
   addToHistory(result) {
     this.history.push(result);
   }
@@ -103,9 +100,6 @@ var DUtil;
     if (typeof obj !== "object") {
       return false;
     }
-    if (obj === null) {
-      return false;
-    }
     return true;
   };
   DUtil2.isBool = (obj) => typeof obj === "boolean";
@@ -435,9 +429,9 @@ var DPlayer = class {
   saveEvent(event) {
     this.eventLog.push(event);
   }
-  saveHistory(pageResult) {
-    this.history.addToHistory(pageResult);
-    this.eventLog.push(...pageResult.eventLog);
+  saveHistory(pageHistory) {
+    this.history.addToHistory(pageHistory);
+    this.eventLog.push(...pageHistory.eventLog);
     const userGeneratedFact = this.history.getFacts();
     const predefinedFacts = this.predefinedFacts;
     const facts = [...userGeneratedFact, ...predefinedFacts];
@@ -466,8 +460,7 @@ var DPlayer = class {
     const answerFacts = this.history.getFacts();
     const predefinedFacts = this.predefinedFacts;
     const eventLog = [...this.eventLog];
-    const pageResults = this.history.getPageResults();
-    return { answerFacts, predefinedFacts, eventLog, pagesLeft, pageResults };
+    return { answerFacts, predefinedFacts, eventLog, pagesLeft };
   }
   insertSequence(sequenceId) {
     this.insertSequenceById(sequenceId);
@@ -562,6 +555,20 @@ var Scale;
 // src/Delement/css.ts
 var DCss;
 ((DCss2) => {
+  DCss2.isPx = (unit) => {
+    if (typeof unit === "number")
+      return false;
+    if (!unit)
+      return false;
+    return unit._unit === "px";
+  };
+  DCss2.isPercent = (unit) => {
+    if (typeof unit === "number")
+      return false;
+    if (!unit)
+      return false;
+    return unit._unit === "percent";
+  };
   DCss2.toString = (unit, scale) => {
     const _mapped = typeof unit === "number" ? { _unit: "percent", value: unit } : unit;
     return _toString(_mapped, scale);
@@ -611,6 +618,7 @@ var DStyle;
     s.right = "";
     s.flex = "none";
     s.boxShadow = "";
+    s.fontFamily = "'Inter', sans-serif";
     s.fontSize = "12px";
     s.lineHeight = "1";
     s.textAlign = "center";
@@ -687,9 +695,6 @@ var DStyle;
     if (isNumber(zIndex)) {
       el.style.zIndex = "" + zIndex;
     }
-    if (isString(translate)) {
-      el.style.transform = translate;
-    }
     if (isString(flex)) {
       el.style.flex = flex;
     }
@@ -827,6 +832,9 @@ var DStyle;
     }
     return el;
   };
+  DStyle2.clone = (style) => {
+    return JSON.parse(JSON.stringify(style));
+  };
 })(DStyle || (DStyle = {}));
 
 // src/common/DTimestamp.ts
@@ -997,6 +1005,17 @@ var DElement = class {
       this.setStyle(whenVideoEndedAndMuted);
     }
   }
+  // private normalize() {
+  // this.el.style.padding = "0";
+  // this.el.style.margin = "0";
+  // this.el.style.position = "absolute";
+  // this.el.style.boxSizing = "border-box";
+  // }
+  getComputedStyle() {
+    const el = this.el;
+    const isConnected = this.el.isConnected;
+    return window.getComputedStyle(this.el);
+  }
   updateStyles(style) {
     this.currStyle = Object.assign(this.currStyle, style);
     DStyle.applyStyles(this.el, this.currStyle, this.scale.scale);
@@ -1185,26 +1204,26 @@ var MqEvent = {
       payload: { schemaId, schemaPrefix }
     };
   },
-  pageEnter(pageId, pagePrefix, pageNumber) {
+  pageEnter(pageId, pagePrefix) {
     return {
       kind: "page-enter",
       timestamp: DTimestamp.now(),
-      payload: { pageId, pagePrefix, pageNumber }
+      payload: { pageId, pagePrefix }
     };
   },
-  pageLeave(pageId, pagePrefix, pageNumber) {
+  pageLeave(pageId, pagePrefix) {
     return {
       kind: "page-leave",
       timestamp: DTimestamp.now(),
-      payload: { pageId, pagePrefix, pageNumber }
+      payload: { pageId, pagePrefix }
     };
   },
   userClicked(data) {
-    const { pageId, pageNumber, pagePrefix, action, descriptions } = data;
+    const { pageId, pagePrefix, action, descriptions } = data;
     return {
       kind: "user-clicked",
       timestamp: DTimestamp.now(),
-      payload: { pageId, pagePrefix, action, descriptions, pageNumber }
+      payload: { pageId, pagePrefix, action, descriptions }
     };
   }
 };
@@ -1214,7 +1233,6 @@ var PageDto = {
   createDummy: (id) => {
     return {
       id: "id" + id,
-      pageNumber: id,
       prefix: "prefix" + id,
       tags: [],
       background: "white",
@@ -1236,7 +1254,6 @@ var Page = class {
     this.taskManager = taskManager;
     this.scaleService = scaleService;
     this.onCompleted = onCompleted;
-    this.pageNumber = dto.pageNumber;
     dto.elements.forEach((el) => {
       const element = createDElement(el, scaleService);
       element.registerClickHandler((action) => {
@@ -1256,20 +1273,20 @@ var Page = class {
   }
   TAG = "[ DPage ]: ";
   elements = [];
-  pageNumber;
+  // private elements: PageComponent[] = [];
+  // private layoutComponents: PageLayoutComponent[] = [];
   pageEntered = DTimestamp.now();
   previousState = false;
   eventLog = new Array();
   createPageResult(facts) {
     const pageExited = DTimestamp.now();
     const pageTime = DTimestamp.diff(this.pageEntered, pageExited);
-    const pageExit = MqEvent.pageLeave(this.dto.id, this.dto.prefix, this.pageNumber);
+    const pageExit = MqEvent.pageLeave(this.dto.id, this.dto.prefix);
     this.eventLog.push(pageExit);
     const eventLog = [...this.eventLog];
     return {
       pagePrefix: this.dto.prefix,
       pageId: this.dto.id,
-      pageNumber: this.pageNumber,
       eventLog,
       pageTime,
       collectedFacts: facts
@@ -1279,13 +1296,13 @@ var Page = class {
     const event = MqEvent.userClicked({
       pageId: this.dto.id,
       pagePrefix: this.dto.prefix,
-      pageNumber: this.pageNumber,
       action: a.kind,
       descriptions: ButtonClickAction.describe(a)
     });
     this.eventLog.push(event);
+    navigator.vibrate(200);
     const { vibrateMs } = a;
-    if (typeof vibrateMs === "number" && navigator.vibrate) {
+    if (vibrateMs) {
       navigator.vibrate(vibrateMs);
     }
     switch (a.kind) {
@@ -1325,7 +1342,7 @@ var Page = class {
     }
   }
   appendYourself(parent) {
-    const pageEnterEvent = MqEvent.pageEnter(this.dto.id, this.dto.prefix, this.pageNumber);
+    const pageEnterEvent = MqEvent.pageEnter(this.dto.id, this.dto.prefix);
     this.pageEntered = DTimestamp.now();
     this.eventLog.push(pageEnterEvent);
     this.elements.forEach((el) => {
@@ -1343,6 +1360,11 @@ var Page = class {
       element.updateState(diff);
     });
   }
+  getComputedStyles() {
+    return this.elements.map((e) => {
+      return e.getComputedStyle();
+    });
+  }
 };
 
 // src/page/task.ts
@@ -1661,7 +1683,6 @@ var SchemaEngine = class {
     const currentResults = this.player.getResults();
     const a = {
       schemaId: this.schema.id,
-      pageResults: currentResults.pageResults,
       pagesLeft: currentResults.pagesLeft,
       predefinedFacts: currentResults.predefinedFacts,
       eventLog: currentResults.eventLog,
@@ -1715,9 +1736,6 @@ var SchemaEngine = class {
       this.currentPage.destroy();
       this.uiLayer.innerHTML = "";
     }
-    if (this.tickerRef) {
-      window.clearInterval(this.tickerRef);
-    }
   }
   _onProgress = false;
   onProgress(handler) {
@@ -1730,6 +1748,9 @@ var SchemaEngine = class {
   setLogger(logger) {
     this.logger = logger;
   }
+  getComputedStylesOfCurrentPage() {
+    return this.currentPage ? this.currentPage.getComputedStyles() : false;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {