@m2c2kit/core 0.3.30 → 0.3.31

package/dist/index.d.ts

@@ -1605,6 +1605,22 @@ declare class Game implements Activity {
      */
     constructor(options: GameOptions);
     private createFreeNodesScene;
+    /**
+     * Returns the base URL of an imported module.
+     *
+     * @remarks Previously, a regex was used:
+     * `const regex = new RegExp(`^.*${packageName}[^\\/]*`);`
+     * but this triggered irrelevant warnings for ReDoS in some overly
+     * sensitive package scanners, so now we use URL and pathname parsing.
+     * Also: trailing slashes are removed from the returned base URL.
+     *
+     * @param packageName - the name of the imported package module, like
+     * `@m2c2kit/assessment-symbol-search`
+     * @param moduleUrl - the full URL of the module's entrypoint, possibly
+     * including a version suffix, like `https://cdn.com/@m2c2kit/assessment-symbol-search@0.8.13/dist/index.js`
+     * @returns - the base URL of the imported module, without the entrypoint,
+     * like `https://cdn.com/@m2c2kit/assessment-symbol-search@0.8.13`
+     */
     private getImportedModuleBaseUrl;
     private addLocalizationParametersToGameParameters;
     init(): Promise<void>;

package/dist/index.js

@@ -7670,7 +7670,11 @@ function getAugmentedNamespace(n) {
   var f = n.default;
 	if (typeof f == "function") {
 		var a = function a () {
-			if (this instanceof a) {
+			var isInstance = false;
+      try {
+        isInstance = this instanceof a;
+      } catch {}
+			if (isInstance) {
         return Reflect.construct(f, arguments, this.constructor);
 			}
 			return f.apply(this, arguments);
@@ -9150,15 +9154,51 @@ class Game {
     };
     this.eventStore.addEvent(freeNodesSceneNewEvent);
   }
+  /**
+   * Returns the base URL of an imported module.
+   *
+   * @remarks Previously, a regex was used:
+   * `const regex = new RegExp(`^.*${packageName}[^\\/]*`);`
+   * but this triggered irrelevant warnings for ReDoS in some overly
+   * sensitive package scanners, so now we use URL and pathname parsing.
+   * Also: trailing slashes are removed from the returned base URL.
+   *
+   * @param packageName - the name of the imported package module, like
+   * `@m2c2kit/assessment-symbol-search`
+   * @param moduleUrl - the full URL of the module's entrypoint, possibly
+   * including a version suffix, like `https://cdn.com/@m2c2kit/assessment-symbol-search@0.8.13/dist/index.js`
+   * @returns - the base URL of the imported module, without the entrypoint,
+   * like `https://cdn.com/@m2c2kit/assessment-symbol-search@0.8.13`
+   */
   getImportedModuleBaseUrl(packageName, moduleUrl) {
-    const regex = new RegExp(`^.*${packageName}[^\\/]*`);
-    const matches = moduleUrl.match(regex);
-    if (!matches || matches.length === 0) {
-      throw new M2Error(
-        `Could not calculate imported assessment package base URL. Package name: ${packageName}, module URL: ${moduleUrl}`
+    const url = new URL(moduleUrl);
+    const segments = url.pathname.split("/").filter(Boolean);
+    let lastMatchIndex = -1;
+    for (let i = 0; i < segments.length - 1; i++) {
+      if (packageName.startsWith("@")) {
+        const nameParts = packageName.split("/");
+        if (nameParts.length === 2) {
+          const scopePart = nameParts[0];
+          const namePart = nameParts[1];
+          for (let i2 = 0; i2 < segments.length - 1; i2++) {
+            if (segments[i2] === scopePart && (segments[i2 + 1] === namePart || segments[i2 + 1].startsWith(`${namePart}@`))) {
+              lastMatchIndex = i2 + 1;
+            }
+          }
+        }
+      } else {
+        if (segments[i] === packageName || segments[i].startsWith(`${packageName}@`)) {
+          lastMatchIndex = i;
+        }
+      }
+    }
+    if (lastMatchIndex === -1) {
+      throw new Error(
+        `Could not locate base URL for package "${packageName}" in "${moduleUrl}"`
       );
     }
-    return matches[0];
+    const basePath = segments.slice(0, lastMatchIndex + 1).join("/");
+    return `${url.origin}/${basePath}`.replace(/\/*$/, "");
   }
   addLocalizationParametersToGameParameters() {
     this.options.parameters = {
@@ -11289,11 +11329,11 @@ class Game {
     if (!this.surface) {
       throw new M2Error("no canvaskit surface. unable to take screenshot.");
     }
-    const missingParametersCount = [sx, sy, sw, sh].map((x) => x ? 0 : 1).reduce((a, b) => a + b);
+    const missingParametersCount = [sx, sy, sw, sh].map((x) => x === void 0 ? 1 : 0).reduce((a, b) => a + b);
     return new Promise((resolve, reject) => {
       switch (missingParametersCount) {
         case 0: {
-          if (!sx || !sy || !sw || !sh) {
+          if (sx === void 0 || sy === void 0 || sw === void 0 || sh === void 0) {
             reject("missing values in arguments for takeScreenshot()");
             return;
           }
@@ -12934,7 +12974,7 @@ class Story {
   }
 }
 
-console.log("\u26AA @m2c2kit/core version 0.3.30 (9f27c146)");
+console.log("\u26AA @m2c2kit/core version 0.3.31 (62ccf312)");
 
 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