@m2c2kit/core 0.3.34 → 0.3.35

package/dist/index.d.ts

@@ -4509,9 +4509,6 @@ interface FontData {
     isDefault: boolean;
 }
 
-declare global {
-    var m2c2Globals: GlobalVariables;
-}
 interface GlobalVariables {
     now: number;
     iso8601Now: string;
@@ -4867,6 +4864,12 @@ interface PluginEvent extends M2Event<Plugin> {
 }
 
 declare class RandomDraws {
+    /** Number of milliseconds before a warning is logged if sampling takes too long. Tuneable for tests. */
+    static samplingWarnMs: number;
+    /** Number of milliseconds before sampling times out. Tuneable for tests or legitimate edge use cases. */
+    static samplingTimeoutMs: number;
+    /** Number of loop iterations between checks. Tuneable for tests. */
+    static samplingCheckInterval: number;
     private static randomFunction;
     private static seededPRNG;
     /**

package/dist/index.js

@@ -6426,6 +6426,10 @@ class Shape extends M2Node {
     this.savePropertyChangeEvent("zPosition", zPosition);
   }
   dispose() {
+    const colorfulPathPaintsToDispose = [];
+    for (const p of this.colorfulPathPaints.values()) {
+      colorfulPathPaintsToDispose.push(p);
+    }
     CanvasKitHelpers.Dispose([
       // use backing fields, since paints may be undefined
       this._strokeColorPaintAntialiased,
@@ -6433,7 +6437,12 @@ class Shape extends M2Node {
       this._fillColorPaintAntialiased,
       this._fillColorPaintNotAntialiased,
       this.ckPath,
-      ...Array.from(this.colorfulPathPaints.values())
+      // Originally, below was `...Array.from(this.colorfulPathPaints.values())`.
+      // I changed the approach because one of our execution environments
+      // (Qualtrics) is using a library that pollutes the global namespace and
+      // adds a broken implementation of `Array.from()` that does not work with
+      // iterables.
+      ...colorfulPathPaintsToDispose
     ]);
   }
   /**
@@ -7990,7 +7999,7 @@ var hasRequiredCanvaskit;
 function requireCanvaskit () {
 	if (hasRequiredCanvaskit) return canvaskit.exports;
 	hasRequiredCanvaskit = 1;
-	(function (module, exports) {
+	(function (module, exports$1) {
 		var CanvasKitInit = (() => {
 		  var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined;
 		  if (typeof __filename !== 'undefined') _scriptDir = _scriptDir || __filename;
@@ -12872,7 +12881,7 @@ const _RandomDraws = class _RandomDraws {
         selected.add(t);
       }
     }
-    return Array.from(selected);
+    return [...selected];
   }
   /**
    * @deprecated Use `fromRangeWithoutReplacement()` instead.
@@ -12904,6 +12913,9 @@ const _RandomDraws = class _RandomDraws {
     const result = new Array();
     const maximumInclusive = rows * columns - 1;
     const draws = this.fromRangeWithoutReplacement(n, 0, maximumInclusive);
+    const start = Date.now();
+    let warned = false;
+    let loopCounter = 0;
     let i = 0;
     let replacementCell = NaN;
     while (i < n) {
@@ -12922,6 +12934,20 @@ const _RandomDraws = class _RandomDraws {
         } while (draws.includes(replacementCell));
         draws[i] = replacementCell;
       }
+      if (++loopCounter % this.samplingCheckInterval === 0) {
+        const elapsed = Date.now() - start;
+        if (!warned && elapsed > this.samplingWarnMs) {
+          console.warn(
+            `RandomDraws.fromGridWithoutReplacement(): sampling exceeded ${this.samplingWarnMs} ms; predicate may be impossible or expensive.`
+          );
+          warned = true;
+        }
+        if (elapsed > this.samplingTimeoutMs) {
+          throw new M2Error(
+            `RandomDraws.fromGridWithoutReplacement(): sampling exceeded timeout of ${this.samplingTimeoutMs} ms; predicate may be impossible or expensive.`
+          );
+        }
+      }
     }
     return result;
   }
@@ -12932,6 +12958,12 @@ const _RandomDraws = class _RandomDraws {
     return this.fromGridWithoutReplacement(n, rows, columns, predicate);
   }
 };
+/** Number of milliseconds before a warning is logged if sampling takes too long. Tuneable for tests. */
+_RandomDraws.samplingWarnMs = 1e3;
+/** Number of milliseconds before sampling times out. Tuneable for tests or legitimate edge use cases. */
+_RandomDraws.samplingTimeoutMs = 5e3;
+/** Number of loop iterations between checks. Tuneable for tests. */
+_RandomDraws.samplingCheckInterval = 4096;
 _RandomDraws.randomFunction = Math.random;
 _RandomDraws.seededPRNG = null;
 let RandomDraws = _RandomDraws;
@@ -13476,7 +13508,7 @@ class Story {
   }
 }
 
-console.log("\u26AA @m2c2kit/core version 0.3.34 (d289d12c)");
+console.log("\u26AA @m2c2kit/core version 0.3.35 (c86b5047)");
 
 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, M2Error, 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