jspsych-tangram 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -16,6 +16,12 @@ declare const info$1: {
             default: never[];
             description: string;
         };
+        /** Array of primitive names in the order they should be displayed */
+        primitive_order: {
+            type: ParameterType;
+            default: string[];
+            description: string;
+        };
         /** Whether to place pieces in workspace or directly on silhouette */
         target: {
             type: ParameterType;
@@ -118,6 +124,12 @@ declare class TangramConstructPlugin implements JsPsychPlugin<Info$1> {
                 default: never[];
                 description: string;
             };
+            /** Array of primitive names in the order they should be displayed */
+            primitive_order: {
+                type: ParameterType;
+                default: string[];
+                description: string;
+            };
             /** Whether to place pieces in workspace or directly on silhouette */
             target: {
                 type: ParameterType;
@@ -241,6 +253,12 @@ declare const info: {
             default: never[];
             description: string;
         };
+        /** Array of primitive names in the order they should be displayed */
+        primitive_order: {
+            type: ParameterType;
+            default: string[];
+            description: string;
+        };
         /** Callback fired after each interaction (optional analytics hook) */
         onInteraction: {
             type: ParameterType;
@@ -310,6 +328,12 @@ declare class TangramPrepPlugin implements JsPsychPlugin<Info> {
                 default: never[];
                 description: string;
             };
+            /** Array of primitive names in the order they should be displayed */
+            primitive_order: {
+                type: ParameterType;
+                default: string[];
+                description: string;
+            };
             /** Callback fired after each interaction (optional analytics hook) */
             onInteraction: {
                 type: ParameterType;

package/dist/index.js

@@ -185,7 +185,6 @@ class BaseGameController {
     const allDone = Object.values(this.state.sectors).every((s) => !!s.completedAt);
     if (allDone && !this.state.endedAt) {
       this.state.endedAt = NOW();
-      console.log("[BaseGameController] all sectors complete");
     }
   }
   // ===== Piece Operations =====
@@ -3153,7 +3152,9 @@ function GameBoard(props) {
       if (allSectorsComplete && !gameCompleted) {
         setGameCompleted(true);
         if (tracker) {
-          tracker.finalizeTrial("auto_complete");
+          setTimeout(() => {
+            tracker.finalizeTrial("auto_complete");
+          }, 0);
         }
       }
     };
@@ -3546,33 +3547,18 @@ function startConstructionTrial(display_element, params, _jsPsych) {
     "medtriangle",
     "largetriangle"
   ]);
-  console.log("[ConstructionApp] Starting tangram conversion...");
-  console.log("[ConstructionApp] Received tangrams:", params.tangrams);
-  console.log("[ConstructionApp] Number of tangrams:", params.tangrams.length);
+  const PRIMITIVE_BLUEPRINTS_ORDERED = [...PRIMITIVE_BLUEPRINTS].sort((a, b) => params.primitiveOrder.indexOf(a.kind) - params.primitiveOrder.indexOf(b.kind));
   const sectors = params.tangrams.map((tangramSpec, index) => {
-    console.log(`
-[ConstructionApp] Processing tangram ${index}:`, tangramSpec);
-    console.log(`[ConstructionApp] tangramID: ${tangramSpec.tangramID}`);
-    console.log(`[ConstructionApp] setLabel: ${tangramSpec.setLabel}`);
-    console.log(`[ConstructionApp] solutionTans count: ${tangramSpec.solutionTans?.length}`);
-    console.log(`[ConstructionApp] solutionTans:`, tangramSpec.solutionTans);
     const filteredTans = tangramSpec.solutionTans.filter((tan) => {
       const tanName = tan.name ?? tan.kind;
       const isCanonical = CANON.has(tanName);
-      console.log(`[ConstructionApp]   Tan "${tanName}": canonical=${isCanonical}, vertices count=${tan.vertices?.length}`);
       return isCanonical;
     });
-    console.log(`[ConstructionApp] Filtered to ${filteredTans.length} canonical pieces`);
     const mask = filteredTans.map((tan, tanIndex) => {
-      const tanName = tan.name ?? tan.kind;
       const polygon = tan.vertices.map(([x, y]) => ({ x: x ?? 0, y: -(y ?? 0) }));
-      console.log(`[ConstructionApp]   Polygon ${tanIndex} (${tanName}): ${tan.vertices.length} vertices -> ${polygon.length} points`);
-      console.log(`[ConstructionApp]     First vertex: [${tan.vertices[0]?.[0]}, ${tan.vertices[0]?.[1]}] -> {x: ${polygon[0]?.x}, y: ${polygon[0]?.y}}`);
       return polygon;
     });
     const sectorId = `sector${index}`;
-    console.log(`[ConstructionApp] Assigned sector ID: ${sectorId}`);
-    console.log(`[ConstructionApp] Final mask has ${mask.length} polygons`);
     const sector = {
       id: sectorId,
       tangramId: tangramSpec.tangramID,
@@ -3581,61 +3567,37 @@ function startConstructionTrial(display_element, params, _jsPsych) {
         mask
       }
     };
-    console.log(`[ConstructionApp] Created sector:`, sector);
     return sector;
   });
-  console.log("\n[ConstructionApp] Final sectors array:", sectors);
-  console.log(`[ConstructionApp] Total sectors created: ${sectors.length}`);
-  console.log("\n[ConstructionApp] Processing quickstash macros...");
-  console.log("[ConstructionApp] quickstash_macros:", params.quickstash_macros);
-  console.log("[ConstructionApp] quickstash_macros count:", params.quickstash_macros?.length ?? 0);
   let quickstash = [];
   if (params.quickstash_macros && params.quickstash_macros.length > 0) {
     const firstMacro = params.quickstash_macros[0];
-    console.log("[ConstructionApp] First macro:", firstMacro);
     if (firstMacro && "parts" in firstMacro && firstMacro.parts && firstMacro.parts[0] && "anchorOffset" in firstMacro.parts[0]) {
-      console.log("[ConstructionApp] Detected anchor-based composites, converting to pixels...");
       const primsByKind = /* @__PURE__ */ new Map();
-      PRIMITIVE_BLUEPRINTS.forEach((p) => primsByKind.set(p.kind, p));
+      PRIMITIVE_BLUEPRINTS_ORDERED.forEach((p) => primsByKind.set(p.kind, p));
       quickstash = params.quickstash_macros.map(
         (anchorComposite) => convertAnchorCompositeToPixels(anchorComposite, primsByKind, CONFIG.layout.grid.stepPx)
         // Use current CONFIG grid step
       );
-      console.log("[ConstructionApp] Converted to pixel-based blueprints:", quickstash);
     } else {
-      console.log("[ConstructionApp] Already pixel-based blueprints");
       quickstash = params.quickstash_macros;
     }
-  } else {
-    console.log("[ConstructionApp] No quickstash macros provided");
   }
   const gameBoardProps = {
     sectors,
     quickstash,
-    primitives: PRIMITIVE_BLUEPRINTS,
-    layout: params.layout || "semicircle",
-    target: params.target || "silhouette",
-    input: params.input || "drag",
-    timeLimitMs: params.time_limit_ms || 0,
+    primitives: PRIMITIVE_BLUEPRINTS_ORDERED,
+    layout: params.layout,
+    target: params.target,
+    input: params.input,
+    timeLimitMs: params.time_limit_ms,
     maxQuickstashSlots: CONFIG.layout.defaults.maxQuickstashSlots,
     mode: "construction",
-    // Explicit construction mode
     ...params.onInteraction && { onInteraction: params.onInteraction },
     ...params.onTrialEnd && { onTrialEnd: params.onTrialEnd }
   };
-  console.log("\n[ConstructionApp] Final GameBoard props:");
-  console.log("[ConstructionApp]   sectors count:", gameBoardProps.sectors.length);
-  console.log("[ConstructionApp]   quickstash count:", gameBoardProps.quickstash.length);
-  console.log("[ConstructionApp]   primitives count:", gameBoardProps.primitives.length);
-  console.log("[ConstructionApp]   layout:", gameBoardProps.layout);
-  console.log("[ConstructionApp]   target:", gameBoardProps.target);
-  console.log("[ConstructionApp]   input:", gameBoardProps.input);
-  console.log("[ConstructionApp]   timeLimitMs:", gameBoardProps.timeLimitMs);
-  console.log("[ConstructionApp]   mode:", gameBoardProps.mode);
-  console.log("[ConstructionApp] Full props:", gameBoardProps);
   const root = createRoot(display_element);
   root.render(React.createElement(GameBoard, gameBoardProps));
-  console.log("[ConstructionApp] GameBoard rendered successfully");
   return { root, display_element, jsPsych: _jsPsych };
 }
 
@@ -3655,6 +3617,12 @@ const info$1 = {
       default: [],
       description: "Array of MacroSpec objects created in prep trial"
     },
+    /** Array of primitive names in the order they should be displayed */
+    primitive_order: {
+      type: ParameterType.OBJECT,
+      default: ["square", "smalltriangle", "parallelogram", "medtriangle", "largetriangle"],
+      description: "Array of primitive names in the order they should be displayed"
+    },
     /** Whether to place pieces in workspace or directly on silhouette */
     target: {
       type: ParameterType.SELECT,
@@ -3756,10 +3724,11 @@ class TangramConstructPlugin {
     const params = {
       tangrams: trial.tangrams,
       quickstash_macros: trial.quickstash_macros,
+      primitiveOrder: trial.primitive_order,
       target: trial.target,
       input: trial.input,
       layout: trial.layout,
-      time_limit_ms: trial.time_limit_ms || 0,
+      time_limit_ms: trial.time_limit_ms,
       onInteraction: trial.onInteraction,
       onTrialEnd: wrappedOnTrialEnd
     };
@@ -3777,9 +3746,11 @@ function startPrepTrial(display_element, params, jsPsych) {
     layoutMode,
     requireAllSlots,
     quickstashMacros,
+    primitiveOrder,
     onInteraction,
     onTrialEnd
   } = params;
+  const PRIMITIVE_BLUEPRINTS_ORDERED = [...PRIMITIVE_BLUEPRINTS].sort((a, b) => primitiveOrder.indexOf(a.kind) - primitiveOrder.indexOf(b.kind));
   const prepSectors = Array.from({ length: numQuickstashSlots }, (_, i) => ({
     id: `prep-sector-${i}`,
     tangramId: `prep-sector-${i}`,
@@ -3793,7 +3764,7 @@ function startPrepTrial(display_element, params, jsPsych) {
   const handleControllerReady = (controller, layout, force) => {
     if (quickstashMacros && quickstashMacros.length > 0 && layout) {
       const primsByKind = /* @__PURE__ */ new Map();
-      PRIMITIVE_BLUEPRINTS.forEach((p) => primsByKind.set(p.kind, p));
+      PRIMITIVE_BLUEPRINTS_ORDERED.forEach((p) => primsByKind.set(p.kind, p));
       quickstashMacros.forEach((anchorComposite, macroIndex) => {
         const sectorId = `prep-sector-${macroIndex}`;
         const compositeBlueprint = convertAnchorCompositeToPixels(
@@ -3850,7 +3821,7 @@ function startPrepTrial(display_element, params, jsPsych) {
     sectors: prepSectors,
     quickstash: [],
     // No pre-made macros
-    primitives: PRIMITIVE_BLUEPRINTS,
+    primitives: PRIMITIVE_BLUEPRINTS_ORDERED,
     layout: layoutMode,
     target: "workspace",
     // Pieces go in sectors
@@ -3911,6 +3882,12 @@ const info = {
       default: [],
       description: "Array of AnchorComposite objects to edit as primitive pieces"
     },
+    /** Array of primitive names in the order they should be displayed */
+    primitive_order: {
+      type: ParameterType.OBJECT,
+      default: ["square", "smalltriangle", "parallelogram", "medtriangle", "largetriangle"],
+      description: "Array of primitive names in the order they should be displayed"
+    },
     /** Callback fired after each interaction (optional analytics hook) */
     onInteraction: {
       type: ParameterType.FUNCTION,
@@ -3954,13 +3931,14 @@ class TangramPrepPlugin {
       this.jsPsych.finishTrial(data);
     };
     const params = {
-      numQuickstashSlots: trial.num_quickstash_slots || 4,
+      numQuickstashSlots: trial.num_quickstash_slots,
       maxPiecesPerMacro: trial.max_pieces_per_macro,
       minPiecesPerMacro: trial.min_pieces_per_macro,
       inputMode: trial.input,
       layoutMode: trial.layout,
       requireAllSlots: trial.require_all_slots,
       quickstashMacros: trial.quickstash_macros,
+      primitiveOrder: trial.primitive_order,
       onInteraction: trial.onInteraction,
       onTrialEnd: wrappedOnTrialEnd
     };