@m2c2kit/core 0.3.20 → 0.3.21

package/dist/index.d.ts

@@ -3666,7 +3666,8 @@ declare class Constants {
     /** Placeholder that will be populated during the build process. */
     static readonly MODULE_METADATA_PLACEHOLDER: ModuleMetadata;
     static readonly DEFAULT_ROOT_ELEMENT_ID = "m2c2kit";
-    static readonly ERUDA_URL = "https://cdn.jsdelivr.net/npm/eruda@3.2.1/eruda.js";
+    static readonly ERUDA_URL = "https://cdn.jsdelivr.net/npm/eruda@3.2.3/eruda.js";
+    static readonly ERUDA_SRI = "sha384-KlRzgy/c+nZSV+eiFqoTkkbZ5pUqToho7HsNuebTbOsYTh4m0m/PAqkGsTMLXK14";
 }
 
 /**
@@ -3842,6 +3843,25 @@ declare class M2c2KitHelpers {
      * "https://", "file://", etc.)
      */
     static urlHasScheme(url: string): boolean;
+    /**
+     * Converts a value to a JSON schema type or one of types.
+     *
+     * @remarks The value can be of the target type, or a string that can be
+     * parsed into the target type. For example, a string `"3"` can be converted
+     * to a number, and a string `'{ "color" : "red" }'` can be converted to an
+     * object. If the target type if an object or array, the value can be a
+     * string parsable into the target type: this string can be the string
+     * representation of the object or array, or the URI encoded string.
+     * Throws an error if the value cannot be converted to the type or one of the
+     * types. Converting an object, null, or array to a string is often not the
+     * desired behavior, so a warning is logged if this occurs.
+     *
+     * @param value - the value to convert
+     * @param type - A JSON Schema type or types to convert the value to, e.g.,
+     * "string" or ["string", "null"]
+     * @returns the converted value
+     */
+    static convertValueToType(value: string | number | boolean | Array<unknown> | object | null, type: JsonSchemaDataType | JsonSchemaDataType[] | undefined): unknown;
     /**
      * Load scripts from URLs.
      *

package/dist/index.js

@@ -681,7 +681,8 @@ Constants.MODULE_METADATA_PLACEHOLDER = {
   dependencies: {}
 };
 Constants.DEFAULT_ROOT_ELEMENT_ID = "m2c2kit";
-Constants.ERUDA_URL = "https://cdn.jsdelivr.net/npm/eruda@3.2.1/eruda.js";
+Constants.ERUDA_URL = "https://cdn.jsdelivr.net/npm/eruda@3.2.3/eruda.js";
+Constants.ERUDA_SRI = "sha384-KlRzgy/c+nZSV+eiFqoTkkbZ5pUqToho7HsNuebTbOsYTh4m0m/PAqkGsTMLXK14";
 
 class M2c2KitHelpers {
   /**
@@ -710,6 +711,254 @@ class M2c2KitHelpers {
   static urlHasScheme(url) {
     return /^[a-z]+:\/\//i.test(url);
   }
+  /**
+   * Converts a value to a JSON schema type or one of types.
+   *
+   * @remarks The value can be of the target type, or a string that can be
+   * parsed into the target type. For example, a string `"3"` can be converted
+   * to a number, and a string `'{ "color" : "red" }'` can be converted to an
+   * object. If the target type if an object or array, the value can be a
+   * string parsable into the target type: this string can be the string
+   * representation of the object or array, or the URI encoded string.
+   * Throws an error if the value cannot be converted to the type or one of the
+   * types. Converting an object, null, or array to a string is often not the
+   * desired behavior, so a warning is logged if this occurs.
+   *
+   * @param value - the value to convert
+   * @param type - A JSON Schema type or types to convert the value to, e.g.,
+   * "string" or ["string", "null"]
+   * @returns the converted value
+   */
+  static convertValueToType(value, type) {
+    function canBeString(value2) {
+      if (typeof value2 === "string") {
+        return true;
+      }
+      if (typeof value2 === "object") {
+        return true;
+      }
+      if (!Number.isNaN(parseFloat(value2))) {
+        return true;
+      }
+      if (typeof value2 === "boolean") {
+        return true;
+      }
+      return false;
+    }
+    function asString(value2) {
+      if (typeof value2 === "string") {
+        return value2;
+      }
+      if (typeof value2 === "object") {
+        console.warn(
+          `convertValueToType() converted an object to a string. This may not be the desired behavior. The object was: ${JSON.stringify(value2)}`
+        );
+        return JSON.stringify(value2);
+      }
+      if (!Number.isNaN(parseFloat(value2))) {
+        return value2;
+      }
+      if (typeof value2 === "boolean") {
+        return value2.toString();
+      }
+      throw new Error(`Error parsing "${value2}" as a string.`);
+    }
+    function canBeNumber(value2) {
+      if (typeof value2 === "number") {
+        return true;
+      }
+      if (typeof value2 !== "string") {
+        return false;
+      }
+      const n = parseFloat(value2);
+      if (Number.isNaN(n)) {
+        return false;
+      }
+      return true;
+    }
+    function asNumber(value2) {
+      if (typeof value2 === "number") {
+        return value2;
+      }
+      if (typeof value2 !== "string") {
+        throw new Error(`Error parsing "${value2}" as a number.`);
+      }
+      const n = parseFloat(value2);
+      if (Number.isNaN(n)) {
+        throw new Error(`Error parsing "${value2}" as a number.`);
+      }
+      return n;
+    }
+    function canBeInteger(value2) {
+      if (typeof value2 === "number") {
+        return true;
+      }
+      if (typeof value2 !== "string") {
+        return false;
+      }
+      const n = parseInt(value2);
+      if (Number.isNaN(n)) {
+        return false;
+      }
+      return true;
+    }
+    function asInteger(value2) {
+      if (typeof value2 === "number") {
+        return value2;
+      }
+      if (typeof value2 !== "string") {
+        throw new Error(`Error parsing "${value2}" as an integer.`);
+      }
+      const n = parseInt(value2);
+      if (Number.isNaN(n)) {
+        throw new Error(`Error parsing "${value2}" as an integer.`);
+      }
+      return n;
+    }
+    function canBeBoolean(value2) {
+      if (typeof value2 === "boolean") {
+        return true;
+      }
+      if (value2 !== "true" && value2 !== "false") {
+        return false;
+      }
+      return true;
+    }
+    function asBoolean(value2) {
+      if (typeof value2 === "boolean") {
+        return value2;
+      }
+      if (value2 !== "true" && value2 !== "false") {
+        throw new Error(`Error parsing "${value2}" as a boolean.`);
+      }
+      return value2 === "true";
+    }
+    function canBeArray(value2) {
+      if (Array.isArray(value2)) {
+        return true;
+      }
+      if (typeof value2 !== "string") {
+        return false;
+      }
+      try {
+        const a = JSON.parse(value2);
+        if (Array.isArray(a)) {
+          return true;
+        }
+      } catch {
+        const a = JSON.parse(decodeURIComponent(value2));
+        if (Array.isArray(a)) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function asArray(value2) {
+      if (Array.isArray(value2)) {
+        return value2;
+      }
+      if (typeof value2 !== "string") {
+        throw new Error(`Error parsing "${value2}" as an array.`);
+      }
+      try {
+        const a = JSON.parse(value2);
+        if (Array.isArray(a)) {
+          return a;
+        }
+      } catch {
+        const a = JSON.parse(decodeURIComponent(value2));
+        if (Array.isArray(a)) {
+          return a;
+        }
+      }
+      throw new Error(`Error parsing "${value2}" as an array.`);
+    }
+    function canBeObject(value2) {
+      if (typeof value2 === "object" && !Array.isArray(value2) && value2 !== null) {
+        return true;
+      }
+      if (typeof value2 !== "string") {
+        return false;
+      }
+      try {
+        const o = JSON.parse(value2);
+        if (typeof o === "object" && !Array.isArray(o) && o !== null) {
+          return true;
+        }
+      } catch {
+        const o = JSON.parse(decodeURIComponent(value2));
+        if (typeof o === "object" && !Array.isArray(o) && o !== null) {
+          return true;
+        }
+      }
+      return false;
+    }
+    function asObject(value2) {
+      if (typeof value2 === "object" && !Array.isArray(value2) && value2 !== null) {
+        return value2;
+      }
+      if (typeof value2 !== "string") {
+        throw new Error(`Error parsing "${value2}" as an object.`);
+      }
+      try {
+        const o = JSON.parse(value2);
+        if (typeof o === "object" && !Array.isArray(o) && o !== null) {
+          return o;
+        }
+      } catch {
+        const o = JSON.parse(decodeURIComponent(value2));
+        if (typeof o === "object" && !Array.isArray(o) && o !== null) {
+          return o;
+        }
+      }
+      throw new Error(`Error parsing "${value2}" as an object.`);
+    }
+    function canBeNull(value2) {
+      if (value2 === null || value2 === "null") {
+        return true;
+      }
+      return false;
+    }
+    function asNull(value2) {
+      if (value2 !== "null" && value2 !== null) {
+        throw new Error(`Error parsing "${value2}" as null.`);
+      }
+      return null;
+    }
+    const typeCheckers = {
+      string: canBeString,
+      number: canBeNumber,
+      integer: canBeInteger,
+      boolean: canBeBoolean,
+      array: canBeArray,
+      object: canBeObject,
+      null: canBeNull
+    };
+    const typeConverters = {
+      string: asString,
+      number: asNumber,
+      integer: asInteger,
+      boolean: asBoolean,
+      array: asArray,
+      object: asObject,
+      null: asNull
+    };
+    if (type === void 0) {
+      throw new Error(`Error with "${value}" as a target type.`);
+    }
+    if (!Array.isArray(type)) {
+      if (typeCheckers[type](value)) {
+        return typeConverters[type](value);
+      }
+      throw new Error(`Error parsing "${value}" as a ${type}.`);
+    }
+    for (const t of type) {
+      if (typeCheckers[t](value)) {
+        return typeConverters[t](value);
+      }
+    }
+    throw new Error(`Error parsing "${value}" as one of ${type}.`);
+  }
   /**
    * Load scripts from URLs.
    *
@@ -756,6 +1005,8 @@ class M2c2KitHelpers {
     console.log(`\u26AA added eruda script: ${Constants.ERUDA_URL}`);
     const script = document.createElement("script");
     script.src = Constants.ERUDA_URL;
+    script.integrity = Constants.ERUDA_SRI;
+    script.crossOrigin = "anonymous";
     script.async = true;
     document.head.appendChild(script);
     m2c2Globals.erudaRequested = true;
@@ -8808,7 +9059,23 @@ class Game {
           additionalParameters[key]} will be ignored`
         );
       } else if (this.options.parameters && this.options.parameters[key]) {
-        this.options.parameters[key].default = additionalParameters[key];
+        const providedValue = additionalParameters[key];
+        let value;
+        if (this.options.parameters[key].type !== void 0 && providedValue !== void 0) {
+          try {
+            value = M2c2KitHelpers.convertValueToType(
+              providedValue,
+              this.options.parameters[key].type
+            );
+          } catch (e) {
+            throw new Error(
+              "Error setting parameter " + key + ": " + e.message
+            );
+          }
+        } else {
+          value = providedValue;
+        }
+        this.options.parameters[key].default = value;
       }
       if (this.additionalParameters === void 0) {
         this.additionalParameters = {};
@@ -10618,8 +10885,8 @@ class Game {
       handled: false,
       ...M2c2KitHelpers.createTimestamps()
     };
-    this.processDomPointerDown(scene, nodeEvent, domPointerEvent);
     this.processDomPointerDown(this.freeNodesScene, nodeEvent, domPointerEvent);
+    this.processDomPointerDown(scene, nodeEvent, domPointerEvent);
   }
   htmlCanvasPointerUpHandler(domPointerEvent) {
     domPointerEvent.preventDefault();
@@ -10633,8 +10900,8 @@ class Game {
       handled: false,
       ...M2c2KitHelpers.createTimestamps()
     };
-    this.processDomPointerUp(scene, nodeEvent, domPointerEvent);
     this.processDomPointerUp(this.freeNodesScene, nodeEvent, domPointerEvent);
+    this.processDomPointerUp(scene, nodeEvent, domPointerEvent);
   }
   htmlCanvasPointerMoveHandler(domPointerEvent) {
     domPointerEvent.preventDefault();
@@ -10648,8 +10915,8 @@ class Game {
       handled: false,
       ...M2c2KitHelpers.createTimestamps()
     };
-    this.processDomPointerMove(scene, nodeEvent, domPointerEvent);
     this.processDomPointerMove(this.freeNodesScene, nodeEvent, domPointerEvent);
+    this.processDomPointerMove(scene, nodeEvent, domPointerEvent);
   }
   htmlCanvasPointerLeaveHandler(domPointerEvent) {
     if (!this.currentScene) {
@@ -10666,12 +10933,12 @@ class Game {
       handled: false,
       ...M2c2KitHelpers.createTimestamps()
     };
-    this.processDomPointerLeave(scene, nodeEvent, domPointerEvent);
     this.processDomPointerLeave(
       this.freeNodesScene,
       nodeEvent,
       domPointerEvent
     );
+    this.processDomPointerLeave(scene, nodeEvent, domPointerEvent);
   }
   /**
    * Determines if/how m2c2kit nodes respond to the DOM PointerDown event
@@ -11763,7 +12030,7 @@ class Story {
   }
 }
 
-console.log("\u26AA @m2c2kit/core version 0.3.20 (33cadc6d)");
+console.log("\u26AA @m2c2kit/core version 0.3.21 (05ed0dd2)");
 
 export { Action, ActivityType, CanvasKitHelpers, ColorfulMutablePath, Composite, Constants, ConstraintType, CustomAction, Dimensions, Easings, Equal, Equals, EventStore, EventStoreMode, FadeAlphaAction, FontManager, Game, GroupAction, I18n, ImageManager, Label, LabelHorizontalAlignmentMode, LayoutConstraint, LegacyTimer, M2EventType, M2ImageStatus, M2Node, M2NodeFactory, M2NodeType, M2SoundStatus, M2c2KitHelpers, MoveAction, MutablePath, NoneTransition, PlayAction, RandomDraws, RepeatAction, RepeatForeverAction, RotateAction, ScaleAction, Scene, SceneTransition, SequenceAction, Shape, ShapeType, SlideTransition, SoundManager, SoundPlayer, SoundRecorder, Sprite, Story, TextLine, Timer, Transition, TransitionDirection, TransitionType, Uuid, WaitAction, WebColors, WebGlInfo, handleInterfaceOptions };
 //# sourceMappingURL=index.js.map