@m2c2kit/core 0.3.10 → 0.3.12

package/dist/index.js

@@ -749,27 +749,28 @@ class Uuid {
   }
 }
 
-var EventType = /* @__PURE__ */ ((EventType2) => {
-  EventType2["SessionInitialize"] = "SessionInitialize";
-  EventType2["SessionStart"] = "SessionStart";
-  EventType2["SessionEnd"] = "SessionEnd";
-  EventType2["ActivityStart"] = "ActivityStart";
-  EventType2["ActivityEnd"] = "ActivityEnd";
-  EventType2["ActivityCancel"] = "ActivityCancel";
-  EventType2["ActivityData"] = "ActivityData";
-  EventType2["TapDown"] = "TapDown";
-  EventType2["TapUp"] = "TapUp";
-  EventType2["TapUpAny"] = "TapUpAny";
-  EventType2["TapLeave"] = "TapLeave";
-  EventType2["PointerDown"] = "PointerDown";
-  EventType2["PointerUp"] = "PointerUp";
-  EventType2["PointerMove"] = "PointerMove";
-  EventType2["Drag"] = "Drag";
-  EventType2["DragStart"] = "DragStart";
-  EventType2["DragEnd"] = "DragEnd";
-  EventType2["CompositeCustom"] = "CompositeCustom";
-  return EventType2;
-})(EventType || {});
+const EventType = {
+  SessionInitialize: "SessionInitialize",
+  SessionStart: "SessionStart",
+  SessionEnd: "SessionEnd",
+  ActivityStart: "ActivityStart",
+  ActivityEnd: "ActivityEnd",
+  ActivityCancel: "ActivityCancel",
+  ActivityData: "ActivityData",
+  TapDown: "TapDown",
+  TapUp: "TapUp",
+  TapUpAny: "TapUpAny",
+  TapLeave: "TapLeave",
+  PointerDown: "PointerDown",
+  PointerUp: "PointerUp",
+  PointerMove: "PointerMove",
+  PointerLeave: "PointerLeave",
+  Drag: "Drag",
+  DragStart: "DragStart",
+  DragEnd: "DragEnd",
+  CompositeCustom: "CompositeCustom",
+  FrameDidSimulatePhysics: "FrameDidSimulatePhysics"
+};
 
 var __defProp$g = Object.defineProperty;
 var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -845,6 +846,7 @@ class Entity {
     /** Is the entity in a pressed state? E.g., did the user put the pointer
      * down on the entity and not yet release it? */
     __publicField$g(this, "pressed", false);
+    __publicField$g(this, "withinHitArea", false);
     /** Is the entity in a pressed state AND is the pointer within the entity's
      * hit area? For example, a user may put the pointer down on the entity, but
      * then move the pointer, while still down, beyond the entity's hit area. In
@@ -870,9 +872,9 @@ class Entity {
         type = this.compositeType;
       }
       if (this.name !== this.uuid) {
-        return `"${this.name}" (${type}, ${this.uuid})`;
+        return `${this.name} (${type}, ${this.uuid})`;
       } else {
-        return `"${type} (${this.uuid})`;
+        return `${type} (${this.uuid})`;
       }
     });
     if (options.name === void 0) {
@@ -920,32 +922,91 @@ class Entity {
     };
     return findParentScene(this).game;
   }
+  /**
+   * Determines if the entity has been added to the game object.
+   *
+   * @returns true if entity has been added
+   */
+  isPartOfGame() {
+    var _a;
+    if (this.type === EntityType.Scene && this._game === void 0) {
+      return false;
+    }
+    if (this.type === EntityType.Scene && this._game !== void 0) {
+      return true;
+    }
+    const findParentScene = (entity) => {
+      if (!entity.parent) {
+        return void 0;
+      } else if (entity.parent.type === EntityType.Scene) {
+        return entity.parent;
+      } else {
+        return findParentScene(entity.parent);
+      }
+    };
+    return ((_a = findParentScene(this)) == null ? void 0 : _a._game) !== void 0;
+  }
   /**
    * Adds a child to this parent entity. Throws exception if the child's name
-   * is not unique with respect to other children of this parent.
+   * is not unique with respect to other children of this parent, or if the
+   * child has already been added to another parent.
    *
    * @param child - The child entity to add
    */
   addChild(child) {
+    if (child === this) {
+      throw new Error(
+        `Cannot add entity ${child.toString()} as a child to itself.`
+      );
+    }
     if (child.type == EntityType.Scene) {
       throw new Error(
-        "A scene cannot be the child of an entity. A scene can only be added to a game object"
+        `Cannot add scene ${child.toString()} as a child to entity ${this.toString()}. A scene cannot be the child of an entity. A scene can only be added to a game object.`
+      );
+    }
+    if (this.children.filter((c) => c !== child).map((c) => c.name).includes(child.name)) {
+      throw new Error(
+        `Cannot add child entity ${child.toString()} to parent entity ${this.toString()}. A child with name "${child.name}" already exists on this parent.`
+      );
+    }
+    let otherParents = new Array();
+    if (this.isPartOfGame()) {
+      otherParents = this.game.entities.filter(
+        (e) => e.children.includes(child)
       );
+    } else {
+      const descendants = this.descendants;
+      if (descendants.includes(child)) {
+        otherParents = descendants.filter((d) => d.children.includes(child)).map((d) => {
+          var _a;
+          return (_a = d.parent) != null ? _a : void 0;
+        });
+      }
     }
-    child.parent = this;
-    if (this.children.map((c) => c.name).includes(child.name)) {
+    if (otherParents.length === 0) {
+      child.parent = this;
+      this.children.push(child);
+      return;
+    }
+    const firstOtherParent = otherParents.find(Boolean);
+    if (firstOtherParent === this) {
       throw new Error(
-        `Cannot add child entity ${child.toString()} to parent entity ${this.toString()}. A child with name "${child.name}" already exists on parent.`
+        `Cannot add child entity ${child.toString()} to parent entity ${this.toString()}. This child already exists on this parent. The child cannot be added again.`
       );
     }
-    this.children.push(child);
+    throw new Error(
+      `Cannot add child entity ${child.toString()} to parent entity ${this.toString()}. This child already exists on other parent entity: ${firstOtherParent == null ? void 0 : firstOtherParent.toString()}}. Remove the child from the other parent first.`
+    );
   }
   /**
    * Removes all children from the entity.
    */
   removeAllChildren() {
     while (this.children.length) {
-      this.children.pop();
+      const child = this.children.pop();
+      if (child) {
+        child.parent = void 0;
+      }
     }
   }
   /**
@@ -956,6 +1017,7 @@ class Entity {
    */
   removeChild(child) {
     if (this.children.includes(child)) {
+      child.parent = void 0;
       this.children = this.children.filter((c) => c !== child);
     } else {
       throw new Error(
@@ -976,6 +1038,7 @@ class Entity {
           `cannot remove entity ${child} from parent ${this} because the entity is not currently a child of the parent`
         );
       }
+      child.parent = void 0;
     });
     this.children = this.children.filter((child) => !children.includes(child));
   }
@@ -1068,17 +1131,13 @@ class Entity {
    * the bounds of the entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onTapDown(callback, callbackOptions) {
+  onTapDown(callback, options) {
     this.addEventListener(
       EventType.TapDown,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1090,17 +1149,13 @@ class Entity {
    * beyond the bounds of the entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}ue.
    */
-  onTapUp(callback, callbackOptions) {
+  onTapUp(callback, options) {
     this.addEventListener(
       EventType.TapUp,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1113,17 +1168,13 @@ class Entity {
    * release.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onTapUpAny(callback, callbackOptions) {
+  onTapUpAny(callback, options) {
     this.addEventListener(
       EventType.TapUpAny,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1135,17 +1186,13 @@ class Entity {
    * before the press release.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onTapLeave(callback, callbackOptions) {
+  onTapLeave(callback, options) {
     this.addEventListener(
       EventType.TapLeave,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1155,17 +1202,13 @@ class Entity {
    * the bounds of the entity. It occurs under the same conditions as TapDown.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onPointerDown(callback, callbackOptions) {
+  onPointerDown(callback, options) {
     this.addEventListener(
       EventType.PointerDown,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1177,17 +1220,13 @@ class Entity {
    * previous PointerDown on the entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onPointerUp(callback, callbackOptions) {
+  onPointerUp(callback, options) {
     this.addEventListener(
       EventType.PointerUp,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
@@ -1195,68 +1234,66 @@ class Entity {
    * within the bounds of the entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onPointerMove(callback, callbackOptions) {
+  onPointerMove(callback, options) {
     this.addEventListener(
       EventType.PointerMove,
       callback,
-      callbackOptions
+      options
+    );
+  }
+  /**
+   * Executes a callback when the user moves the pointer (mouse or touches)
+   * outside the bounds of the entity.
+   *
+   * @param callback - function to execute
+   * @param options - {@link CallbackOptions}
+   */
+  onPointerLeave(callback, options) {
+    this.addEventListener(
+      EventType.PointerLeave,
+      callback,
+      options
     );
   }
   /**
    * Executes a callback when the user begins dragging an entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onDragStart(callback, callbackOptions) {
+  onDragStart(callback, options) {
     this.addEventListener(
       EventType.DragStart,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
    * Executes a callback when the user continues dragging an entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onDrag(callback, callbackOptions) {
+  onDrag(callback, options) {
     this.addEventListener(
       EventType.Drag,
       callback,
-      callbackOptions
+      options
     );
   }
   /**
    * Executes a callback when the user stop dragging an entity.
    *
    * @param callback - function to execute
-   * @param replaceExistingCallback  - should the provided callback replace
-   * any existing callbacks of the same event type on this entity? Usually
-   * there should be only one callback defined, instead of chaining multiple
-   * ones. It is strongly recommended not to change this, unless you have a
-   * special use case. Default is true.
+   * @param options - {@link CallbackOptions}
    */
-  onDragEnd(callback, callbackOptions) {
+  onDragEnd(callback, options) {
     this.addEventListener(
       EventType.DragEnd,
       callback,
-      callbackOptions
+      options
     );
   }
   addEventListener(type, callback, callbackOptions) {
@@ -3243,7 +3280,7 @@ class Game {
     __publicField$6(this, "i18n");
     __publicField$6(this, "warmupFunctionQueue", new Array());
     __publicField$6(this, "loaderElementsRemoved", false);
-    __publicField$6(this, "_dataStore");
+    __publicField$6(this, "_dataStores");
     __publicField$6(this, "additionalParameters");
     __publicField$6(this, "staticTrialSchema", {});
     /** The scene, or its name as a string, to be presented when the game is started. If this is undefined, the game will start with the first scene that has been added */
@@ -3359,12 +3396,13 @@ class Game {
    * Saves an item to the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    * @param key - item key
    * @param value - item value
    * @param globalStore - if true, treat the item as "global" and not
@@ -3375,18 +3413,19 @@ class Game {
   storeSetItem(key, value, globalStore = false) {
     const k = globalStore ? key : this.id.concat(":", key);
     const activityId = globalStore ? "" : this.id;
-    return this.dataStore.setItem(k, value, activityId);
+    return this.dataStores[0].setItem(k, value, activityId);
   }
   /**
    * Gets an item value from the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
    * associated with a specific activity; global items can be accessed
@@ -3395,18 +3434,19 @@ class Game {
    */
   storeGetItem(key, globalStore = false) {
     const k = globalStore ? key : this.id.concat(":", key);
-    return this.dataStore.getItem(k);
+    return this.dataStores[0].getItem(k);
   }
   /**
    * Deletes an item value from the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
    * associated with a specific activity; global items can be accessed
@@ -3414,49 +3454,52 @@ class Game {
    */
   storeDeleteItem(key, globalStore = false) {
     const k = globalStore ? key : this.id.concat(":", key);
-    return this.dataStore.deleteItem(k);
+    return this.dataStores[0].deleteItem(k);
   }
   /**
    * Deletes all items from the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    */
   storeClearItems() {
-    return this.dataStore.clearItemsByActivityId(this.id);
+    return this.dataStores[0].clearItemsByActivityId(this.id);
   }
   /**
    * Returns keys of all items in the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    * @param globalStore - if true, treat the item as "global" and not
    * associated with a specific activity; global items can be accessed
    * by any activity. Default is false.
    */
   storeItemsKeys(globalStore = false) {
-    return this.dataStore.itemsKeysByActivityId(globalStore ? "" : this.id);
+    return this.dataStores[0].itemsKeysByActivityId(globalStore ? "" : this.id);
   }
   /**
    * Determines if a key exists in the activity's key-value store.
    *
    * @remarks The underlying persistence provider of the key-value store must
-   * be previously set in the activity's `Session` before use:
-   * ```
-   * const db: IDataStore = new LocalDatabase();
-   * session.dataStore = db;
-   * session.initialize();
-   * ```
+   * have been previously provided in `SessionOptions`.
+   * @example
+   * import { LocalDatabase } from "@m2c2kit/db";
+   * const session = new Session({
+   *   dataStores: [new LocalDatabase()]
+   *   ...
+   * });
    * @param key - item key
    * @param globalStore - if true, treat the item as "global" and not
    * associated with a specific activity; global items can be accessed
@@ -3465,16 +3508,16 @@ class Game {
    */
   storeItemExists(key, globalStore = false) {
     const k = globalStore ? key : this.id.concat(":", key);
-    return this.dataStore.itemExists(k);
+    return this.dataStores[0].itemExists(k);
   }
-  get dataStore() {
-    if (!this._dataStore) {
-      throw new Error("dataStore is undefined");
+  get dataStores() {
+    if (!this._dataStores) {
+      throw new Error("dataStores is undefined");
     }
-    return this._dataStore;
+    return this._dataStores;
   }
-  set dataStore(dataStore) {
-    this._dataStore = dataStore;
+  set dataStores(dataStores) {
+    this._dataStores = dataStores;
   }
   getLocalizationOptionsFromGameParameters() {
     const locale = this.getParameter("locale");
@@ -4688,9 +4731,28 @@ class Game {
     outgoingScene.addChild(spr);
     return outgoingScene;
   }
+  /**
+   * Executes a callback when the frame has finished simulating physics.
+   *
+   * @param callback - function to execute.
+   * @param options - options for the callback.
+   */
+  onFrameDidSimulatePhysics(callback, options) {
+    this.addEventListener(
+      EventType.FrameDidSimulatePhysics,
+      callback,
+      options
+    );
+  }
   update() {
     this.scenes.filter((scene) => scene._active).forEach((scene) => scene.update());
     this.freeEntitiesScene.update();
+    const frameDidSimulatePhysicsEvent = {
+      target: this,
+      type: EventType.FrameDidSimulatePhysics,
+      deltaTime: Globals.deltaTime
+    };
+    this.raiseActivityEventOnListeners(frameDidSimulatePhysicsEvent);
   }
   draw(canvas) {
     this.scenes.filter((scene) => scene._active).forEach((scene) => scene.draw(canvas));
@@ -5251,6 +5313,17 @@ class Game {
       domPointerEvent.offsetY
     )) {
       this.raiseM2PointerMoveEvent(entity, m2Event, domPointerEvent);
+      entity.withinHitArea = true;
+    }
+    if (!this.IsCanvasPointWithinEntityBounds(
+      entity,
+      domPointerEvent.offsetX,
+      domPointerEvent.offsetY
+    )) {
+      if (entity.withinHitArea) {
+        this.raiseM2PointerLeaveEvent(entity, m2Event, domPointerEvent);
+        entity.withinHitArea = false;
+      }
     }
     if (entity.children) {
       entity.children.filter((entity2) => !entity2.hidden).filter((entity2) => entity2.isDrawable).sort(
@@ -5323,6 +5396,15 @@ class Game {
       domPointerEvent
     );
   }
+  raiseM2PointerLeaveEvent(entity, m2Event, domPointerEvent) {
+    m2Event.target = entity;
+    m2Event.type = EventType.PointerLeave;
+    this.raiseEventOnListeningEntities(
+      entity,
+      m2Event,
+      domPointerEvent
+    );
+  }
   raiseM2DragStartEvent(entity, m2Event, domPointerEvent) {
     m2Event.target = entity;
     m2Event.type = EventType.DragStart;
@@ -5437,6 +5519,7 @@ class Game {
           case EventType.PointerDown:
           case EventType.PointerMove:
           case EventType.PointerUp:
+          case EventType.PointerLeave:
             m2Event.point = this.calculatePointWithinEntityFromDomPointerEvent(
               entity,
               domEvent
@@ -5495,11 +5578,14 @@ class Game {
       if (!radius) {
         throw "circleOfRadius is undefined";
       }
-      const center = { x: bb2.xMin + radius, y: bb2.yMin + radius };
+      const center = {
+        x: bb2.xMin + radius * entity.absoluteScale,
+        y: bb2.yMin + radius * entity.absoluteScale
+      };
       const distance = Math.sqrt(
         Math.pow(x - center.x, 2) + Math.pow(y - center.y, 2)
       );
-      return distance <= radius;
+      return distance <= radius * entity.absoluteScale;
     }
     if (entity.size.width === 0 || entity.size.height === 0) {
       return false;
@@ -7012,12 +7098,12 @@ class Session {
     __publicField$2(this, "imageManager");
     __publicField$2(this, "currentActivity");
     __publicField$2(this, "uuid");
-    __publicField$2(this, "dataStore");
+    __publicField$2(this, "dataStores");
     __publicField$2(this, "eventListeners", new Array());
     __publicField$2(this, "sessionDictionary", /* @__PURE__ */ new Map());
     __publicField$2(this, "canvasKit");
     __publicField$2(this, "initialized", false);
-    __publicField$2(this, "version", "0.3.10 (b15b374e)");
+    __publicField$2(this, "version", "0.3.12 (291d0cee)");
     this.options = options;
     for (const activity of this.options.activities) {
       if (this.options.activities.filter((a) => a === activity).length > 1) {
@@ -7184,6 +7270,7 @@ class Session {
    * Asynchronously initializes the m2c2kit engine and loads assets
    */
   async initialize() {
+    var _a;
     console.log(`\u26AA @m2c2kit/core version ${this.version}`);
     Timer.start("sessionInitialize");
     const sessionInitializeEvent = {
@@ -7194,9 +7281,15 @@ class Session {
     DomHelpers.addLoadingElements();
     DomHelpers.setSpinnerVisibility(true);
     DomHelpers.setCanvasOverlayVisibility(true);
+    this.dataStores = this.options.dataStores;
+    if (((_a = this.dataStores) == null ? void 0 : _a.length) === 0) {
+      throw new Error(
+        "Session.initialize(): dataStores must be undefined or a non-zero array of datastores."
+      );
+    }
     await Promise.all(
       this.options.activities.map((activity) => {
-        activity.dataStore = this.dataStore;
+        activity.dataStores = this.dataStores;
         activity.onStart(this.sessionActivityLifecycleHandler.bind(this));
         activity.onCancel(this.sessionActivityLifecycleHandler.bind(this));
         activity.onEnd(this.sessionActivityLifecycleHandler.bind(this));
@@ -7322,7 +7415,7 @@ class Session {
     this.options.activities[indexOfCurrentActivity] = this.currentActivity;
     DomHelpers.configureDomForActivity(this.currentActivity);
     this.currentActivity.session = this;
-    this.currentActivity.dataStore = this.dataStore;
+    this.currentActivity.dataStores = this.dataStores;
     if (this.currentActivity.type === ActivityType.Game && this.canvasKit) {
       this.currentActivity.canvasKit = this.canvasKit;
     }
@@ -7527,7 +7620,6 @@ class Shape extends Entity {
    * @param options - {@link ShapeOptions}
    */
   constructor(options = {}) {
-    var _a;
     super(options);
     __publicField$1(this, "type", EntityType.Shape);
     __publicField$1(this, "isDrawable", true);
@@ -7544,7 +7636,6 @@ class Shape extends Entity {
     __publicField$1(this, "ckPath", null);
     __publicField$1(this, "ckPathWidth");
     __publicField$1(this, "ckPathHeight");
-    __publicField$1(this, "pathSvgString");
     __publicField$1(this, "cornerRadius", 0);
     __publicField$1(this, "_fillColor", Constants.DEFAULT_SHAPE_FILL_COLOR);
     __publicField$1(this, "_strokeColor");
@@ -7559,15 +7650,17 @@ class Shape extends Entity {
     __publicField$1(this, "svgPathScaleForResizing", 1);
     __publicField$1(this, "svgPathWidth", 0);
     __publicField$1(this, "svgPathHeight", 0);
-    __publicField$1(this, "svgPreviousAbsoluteScale", NaN);
     __publicField$1(this, "svgPreviousAbsoluteX", NaN);
     __publicField$1(this, "svgPreviousAbsoluteY", NaN);
-    __publicField$1(this, "pathIsSvgStringPath", false);
+    __publicField$1(this, "svgFirstPathDraw", true);
     handleInterfaceOptions(this, options);
-    if (((_a = options == null ? void 0 : options.path) == null ? void 0 : _a.svgPathString) !== void 0) {
+    if (options.path !== void 0) {
+      this.path = options.path;
       this.shapeType = ShapeType.Path;
-      this.pathIsSvgStringPath = true;
-      this.pathSvgString = options.path.svgPathString;
+      if (this.path.size !== void 0) {
+        this.size.height = this.path.size.height;
+        this.size.width = this.path.size.width;
+      }
       this.svgPathRequestedWidth = options.path.width;
       this.svgPathRequestedHeight = options.path.height;
       if (this.svgPathRequestedHeight !== void 0 && this.svgPathRequestedWidth !== void 0) {
@@ -7645,28 +7738,29 @@ class Shape extends Entity {
     }
   }
   initialize() {
-    var _a, _b;
-    if (this.shapeType === ShapeType.Path && this.pathIsSvgStringPath) {
-      if (!this.pathSvgString) {
-        throw new Error("SVG Path string is null/undefined");
-      }
-      this.ckPath = this.canvasKit.Path.MakeFromSVGString(this.pathSvgString);
-      if (!this.ckPath) {
-        throw new Error("could not make CanvasKit Path from SVG string");
-      }
-      const bounds = this.ckPath.getBounds();
-      this.svgPathWidth = bounds[2] + (bounds[0] < 0 ? Math.abs(bounds[0]) : 0);
-      this.svgPathHeight = bounds[3] + (bounds[1] < 0 ? Math.abs(bounds[1]) : 0);
-      this.size.width = (_a = this.size.width) != null ? _a : this.svgPathWidth;
-      this.size.height = (_b = this.size.height) != null ? _b : this.svgPathHeight;
-      if (this.svgPathRequestedHeight !== void 0) {
-        this.svgPathScaleForResizing = this.svgPathRequestedHeight / this.svgPathHeight;
-      } else if (this.svgPathRequestedWidth !== void 0) {
-        this.svgPathScaleForResizing = this.svgPathRequestedWidth / this.svgPathWidth;
-      }
-      this.svgPreviousAbsoluteScale = 1;
-      this.svgPreviousAbsoluteX = 0;
-      this.svgPreviousAbsoluteY = 0;
+    if (this.shapeType === ShapeType.Path) {
+      if (this.shapeIsSvgStringPath()) {
+        const pathSvgString = this.path.svgPathString;
+        if (!pathSvgString) {
+          throw new Error("SVG Path string is null/undefined");
+        }
+        this.ckPath = this.canvasKit.Path.MakeFromSVGString(pathSvgString);
+        if (!this.ckPath) {
+          throw new Error("could not make CanvasKit Path from SVG string");
+        }
+        const bounds = this.ckPath.getBounds();
+        this.svgPathWidth = bounds[2] + (bounds[0] < 0 ? Math.abs(bounds[0]) : 0);
+        this.svgPathHeight = bounds[3] + (bounds[1] < 0 ? Math.abs(bounds[1]) : 0);
+        if (this.svgPathRequestedHeight !== void 0) {
+          this.svgPathScaleForResizing = this.svgPathRequestedHeight / this.svgPathHeight;
+        } else if (this.svgPathRequestedWidth !== void 0) {
+          this.svgPathScaleForResizing = this.svgPathRequestedWidth / this.svgPathWidth;
+        }
+        this.size.width = this.svgPathWidth * this.svgPathScaleForResizing;
+        this.size.height = this.svgPathHeight * this.svgPathScaleForResizing;
+        this.svgPreviousAbsoluteX = 0;
+        this.svgPreviousAbsoluteY = 0;
+      }
     }
     if (this.fillColor) {
       this.fillColorPaintAntialiased = CanvasKitHelpers.makePaint(
@@ -7696,6 +7790,7 @@ class Shape extends Entity {
         false
       );
     }
+    this.svgFirstPathDraw = true;
     this.needsInitialization = false;
   }
   dispose() {
@@ -7744,10 +7839,10 @@ class Shape extends Entity {
     canvas.save();
     const drawScale = Globals.canvasScale / this.absoluteScale;
     canvas.scale(1 / drawScale, 1 / drawScale);
-    if (this.shapeType === ShapeType.Path && !this.pathIsSvgStringPath) {
+    if (this.shapeIsM2Path()) {
       this.drawPathFromM2Path(canvas);
     }
-    if (this.shapeType === ShapeType.Path && this.pathIsSvgStringPath) {
+    if (this.shapeIsSvgStringPath()) {
       this.drawPathFromSvgString(canvas);
     }
     if (this.shapeType === ShapeType.Circle) {
@@ -7764,18 +7859,16 @@ class Shape extends Entity {
     const pathOriginX = (this.absolutePosition.x - this.anchorPoint.x * this.size.width * this.absoluteScale) * drawScale;
     const pathOriginY = (this.absolutePosition.y - this.anchorPoint.y * this.size.height * this.absoluteScale) * drawScale;
     if (this.strokeColor && this.strokeColorPaintAntialiased && this.lineWidth) {
-      this.strokeColorPaintAntialiased.setStrokeWidth(
-        this.lineWidth * drawScale
-      );
+      this.strokeColorPaintAntialiased.setStrokeWidth(this.lineWidth);
       const subpaths = this.path.subpaths;
       for (const subpath of subpaths) {
         const points = subpath.flat();
         for (let i = 0; i < points.length - 1; i++) {
           canvas.drawLine(
-            pathOriginX + points[i].x * drawScale,
-            pathOriginY + points[i].y * drawScale,
-            pathOriginX + points[i + 1].x * drawScale,
-            pathOriginY + points[i + 1].y * drawScale,
+            pathOriginX + points[i].x * Globals.canvasScale,
+            pathOriginY + points[i].y * Globals.canvasScale,
+            pathOriginX + points[i + 1].x * Globals.canvasScale,
+            pathOriginY + points[i + 1].y * Globals.canvasScale,
             this.strokeColorPaintAntialiased
           );
         }
@@ -7788,12 +7881,12 @@ class Shape extends Entity {
     }
     const x = this.calculateSvgPathX();
     const y = this.calculateSvgPathY();
-    const drawScale = Globals.canvasScale / this.absoluteScale;
-    const pathScale = drawScale * this.svgPathScaleForResizing * Globals.rootScale;
-    if (this.pathNeedsTransform(pathScale, x, y)) {
+    if (this.pathNeedsTransform(x, y)) {
+      const drawScale = Globals.canvasScale / this.absoluteScale;
+      const pathScale = drawScale * this.svgPathScaleForResizing * Globals.rootScale;
       const matrix = this.calculateTransformationMatrix(pathScale, x, y);
       this.ckPath = this.ckPath.transform(matrix);
-      this.saveSvgPathDrawParameters(pathScale, x, y);
+      this.saveSvgPathAbsolutePosition(x, y);
     }
     if (this.fillColor) {
       const paint = this.getFillPaint();
@@ -7806,25 +7899,38 @@ class Shape extends Entity {
   }
   calculateSvgPathY() {
     const drawScale = Globals.canvasScale / this.absoluteScale;
-    return (this.absolutePosition.y + (this.size.height - this.svgPathHeight * this.svgPathScaleForResizing * Globals.rootScale) / 2 - this.anchorPoint.y * this.size.height) * drawScale;
+    return (this.absolutePosition.y - this.size.height * this.absoluteScale / 2) * drawScale;
   }
   calculateSvgPathX() {
     const drawScale = Globals.canvasScale / this.absoluteScale;
-    return (this.absolutePosition.x + (this.size.width - this.svgPathWidth * this.svgPathScaleForResizing * Globals.rootScale) / 2 - this.anchorPoint.x * this.size.width) * drawScale;
+    return (this.absolutePosition.x - this.size.width * this.absoluteScale / 2) * drawScale;
   }
-  saveSvgPathDrawParameters(pathScale, x, y) {
-    this.svgPreviousAbsoluteScale = pathScale;
+  saveSvgPathAbsolutePosition(x, y) {
     this.svgPreviousAbsoluteX = x;
     this.svgPreviousAbsoluteY = y;
   }
   calculateTransformationMatrix(pathScale, x, y) {
-    const dScale = pathScale / this.svgPreviousAbsoluteScale;
+    let dScale;
+    if (this.svgFirstPathDraw) {
+      dScale = pathScale;
+      this.svgFirstPathDraw = false;
+    } else {
+      dScale = 1;
+    }
     const dX = x - this.svgPreviousAbsoluteX;
     const dY = y - this.svgPreviousAbsoluteY;
     return [dScale, 0, dX, 0, dScale, dY, 0, 0, 1];
   }
-  pathNeedsTransform(pathScale, x, y) {
-    return pathScale !== this.svgPreviousAbsoluteScale || x !== this.svgPreviousAbsoluteX || y !== this.svgPreviousAbsoluteY;
+  pathNeedsTransform(x, y) {
+    return this.svgFirstPathDraw === true || x !== this.svgPreviousAbsoluteX || y !== this.svgPreviousAbsoluteY;
+  }
+  shapeIsSvgStringPath() {
+    var _a;
+    return ((_a = this.path) == null ? void 0 : _a.svgPathString) !== void 0;
+  }
+  shapeIsM2Path() {
+    var _a;
+    return ((_a = this.path) == null ? void 0 : _a.subpaths) !== void 0;
   }
   drawCircle(canvas) {
     if (!this.circleOfRadius) {