jspsych-tangram 0.0.3 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspsych-tangram",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Tangram tasks for jsPsych: prep and construct.",
   "type": "module",
   "main": "dist/index.cjs",

package/src/core/components/board/GameBoard.tsx

@@ -357,8 +357,11 @@ export default function GameBoard(props: GameBoardProps) {
         setGameCompleted(true);
 
         // Finalize trial data tracking (which calls onTrialEnd)
+        // Defer to avoid unmounting React while still in commit phase
         if (tracker) {
-          tracker.finalizeTrial('auto_complete');
+          setTimeout(() => {
+            tracker.finalizeTrial('auto_complete');
+          }, 0);
         }
       }
     };

package/src/core/domain/primitives.ts

@@ -77,15 +77,14 @@ function constructFromSpec(
 // ===== default first edges in UNIT coords ( +y is UP here ) =================
 // Copied from your `default_pilot_rotations`. We invert y above for canvas.
 const FIRST_EDGES_UNITS: Record<TanKind, [Vec, Vec]> = {
-  "small-triangle":   [P(0, 0), P(0.5, 0.5)],
+  "smalltriangle":   [P(0, 0), P(0.5, 0.5)],
   "parallelogram":    [P(0, 0), P(0.5, 0)],
-  "large-triangle":   [P(0, 0), P(0.5, -0.5)],
-  "med-triangle":     [P(0, 0), P(0.5, 0)],
+  "largetriangle":   [P(0, 0), P(0.5, -0.5)],
+  "medtriangle":     [P(0, 0), P(0.5, 0)],
   "square":           [P(0, 0), P(0.5, 0)],
 };
 
 // ===== canonical half-edge primitives ===================
-// TODO: Sean we need to talk about aligning this with your Python implementation
 // Unchanging primitive tangram pieces - these are constants, not configurable
 const PRIMITIVE_BLUEPRINTS_CACHE = (() => {
   // Sequences copied verbatim from your Python tanprimitives_halfedges()
@@ -104,8 +103,8 @@ const PRIMITIVE_BLUEPRINTS_CACHE = (() => {
       color: "#f43f5e",
     },
     {
-      id: "prim:small",
-      kind: "small-triangle",
+      id: "prim:smalltriangle",
+      kind: "smalltriangle",
       sideLens: [HALFDIAGONAL, HALFDIAGONAL, HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT],
       angles:   [180,          45,           180,      90,       180,      45],
       color: "#f59e0b",
@@ -118,15 +117,15 @@ const PRIMITIVE_BLUEPRINTS_CACHE = (() => {
       color: "#10b981",
     },
     {
-      id: "prim:med",
-      kind: "med-triangle",
+      id: "prim:medtriangle",
+      kind: "medtriangle",
       sideLens: [HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT, HALFDIAGONAL, HALFDIAGONAL, HALFDIAGONAL, HALFDIAGONAL],
       angles:   [180,      180,      180,      45,       180,          90,            180,          45],
       color: "#3b82f6",
     },
     {
-      id: "prim:large",
-      kind: "large-triangle",
+      id: "prim:largetriangle",
+      kind: "largetriangle",
       sideLens: [
         HALFDIAGONAL, HALFDIAGONAL, HALFDIAGONAL, HALFDIAGONAL,
         HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT, HALFUNIT

package/src/core/domain/types.ts

@@ -5,10 +5,10 @@ export type Poly = Vec[];
 // Canonical tans
 export type TanKind =
   | "square"
-  | "small-triangle"
+  | "smalltriangle"
   | "parallelogram"
-  | "med-triangle"
-  | "large-triangle";
+  | "medtriangle"
+  | "largetriangle";
 
 // 2×2 interaction axes
 export type PlacementTarget = "workspace" | "silhouette";
@@ -55,6 +55,7 @@ export type SilhouetteSpec = {
 
 export type Sector = {
   id: string;
+  tangramId: string;
   silhouette: SilhouetteSpec;
 };
 

package/src/core/engine/state/BaseGameController.ts

@@ -196,7 +196,6 @@ export class BaseGameController {
     const allDone = Object.values(this.state.sectors).every((s: SectorState) => !!s.completedAt);
     if (allDone && !this.state.endedAt) {
       this.state.endedAt = NOW();
-      console.log("[BaseGameController] all sectors complete");
     }
   }
 

package/src/core/io/InteractionTracker.ts

@@ -571,7 +571,7 @@ export class InteractionTracker {
     // Build sector-tangram map
     const sectorTangramMap = this.controller.state.cfg.sectors.map(s => ({
       sectorId: s.id,
-      tangramId: s.id // In our system, sector ID == tangram ID
+      tangramId: s.tangramId
     }));
 
     // Build blueprint order

package/src/core/io/quickstash.ts

@@ -3,32 +3,6 @@ import { CONFIG } from "@/core/config/config";
 import type { Blueprint, CompositeBlueprint, PrimitiveBlueprint, TanKind, Vec } from "@/core/domain/types";
 import { primitiveBlueprintsHalfEdge } from "@/core/domain/primitives";
 
-/**
- * Convert anchor coordinates to pixel coordinates
- * @param anchorX - X coordinate in anchor units (integer)
- * @param anchorY - Y coordinate in anchor units (integer)
- * @returns Pixel coordinates
- */
-export function anchorToPixels(anchorX: number, anchorY: number): Vec {
-  return { 
-    x: anchorX * CONFIG.layout.grid.stepPx, 
-    y: anchorY * CONFIG.layout.grid.stepPx 
-  };
-}
-
-/**
- * Convert pixel coordinates to anchor coordinates
- * @param pixelX - X coordinate in pixels
- * @param pixelY - Y coordinate in pixels
- * @returns Anchor coordinates (rounded to nearest grid point)
- */
-export function pixelsToAnchor(pixelX: number, pixelY: number): Vec {
-  return {
-    x: Math.round(pixelX / CONFIG.layout.grid.stepPx),
-    y: Math.round(pixelY / CONFIG.layout.grid.stepPx)
-  };
-}
-
 /**
  * Convert anchor-based composite definition to pixel-based composite with custom grid step
  * @param anchorComposite - Composite defined with anchor coordinates
@@ -84,10 +58,10 @@ const ANCHOR_COMPOSITES = [
     label: "Parallelogram+Parallelogram"
   },
   {
-    id: "comp:small-triangle+med-triangle",
+    id: "comp:smalltriangle+medtriangle",
     parts: [
-      { kind: "small-triangle" as TanKind, anchorOffset: { x: -2, y: -2 } },
-      { kind: "med-triangle" as TanKind, anchorOffset: { x: 0, y: 0 } },
+      { kind: "smalltriangle" as TanKind, anchorOffset: { x: -2, y: -2 } },
+      { kind: "medtriangle" as TanKind, anchorOffset: { x: 0, y: 0 } },
     ],
     label: "SmallTriangle+MedTriangle"
   },

package/src/core/types/plugin-interfaces.ts

@@ -40,7 +40,7 @@ export interface TangramSpec {
   tangramID: string;
   setLabel: string;
   solutionTans: Array<{
-    name: string;                     // TanKind as string (e.g., "small-triangle")
+    name: string;                     // TanKind as string (e.g., "smalltriangle")
     vertices: number[][];             // Array of [x, y] coordinate pairs
   }>;
 }

package/src/plugins/tangram-construct/ConstructionApp.tsx

@@ -51,80 +51,51 @@ export function startConstructionTrial(
   // Canonical piece names we accept
   const CANON = new Set([
     "square",
-    "small-triangle",
+    "smalltriangle",
     "parallelogram",
-    "med-triangle",
-    "large-triangle",
+    "medtriangle",
+    "largetriangle",
   ]);
 
-  // Sector IDs in alphabetical order
-  const SECTOR_IDS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'];
-
   // Convert JSON plugin parameters to internal Sector[] format
-  console.log('[ConstructionApp] Starting tangram conversion...');
-  console.log('[ConstructionApp] Received tangrams:', params.tangrams);
-  console.log('[ConstructionApp] Number of tangrams:', params.tangrams.length);
-
-  const sectors: Sector[] = params.tangrams.map((tangramSpec, index) => {
-    console.log(`\n[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 sectors: Sector[] = params.tangrams.map((tangramSpec, index) => {
+  
     // Filter to canonical pieces only and convert vertices to polygon format
     const filteredTans = tangramSpec.solutionTans.filter((tan: any) => {
       // Support both "name" and "kind" fields (different JSON formats)
       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: any, tanIndex: number) => {
-      const tanName = tan.name ?? tan.kind;
       const polygon = tan.vertices.map(([x, y]: number[]) => ({ 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;
     });
 
     // Assign sector ID from alphabetical sequence
-    const sectorId = SECTOR_IDS[index] ?? `S${index}`;
-    console.log(`[ConstructionApp] Assigned sector ID: ${sectorId}`);
-    console.log(`[ConstructionApp] Final mask has ${mask.length} polygons`);
-
+    const sectorId = `sector${index}`;
+    
     const sector = {
       id: sectorId,
+      tangramId: tangramSpec.tangramID,
       silhouette: {
         id: sectorId,
         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}`);
-
   // Convert quickstash_macros to Blueprint[] format
   // Handle both anchor-based composites and pre-converted blueprints
-  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: Blueprint[] = [];
 
   if (params.quickstash_macros && params.quickstash_macros.length > 0) {
     // Check if the first item has anchorOffset (anchor-based) or offset (pixel-based)
     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...');
 
       // Create primitive map for conversion
       const primsByKind = new Map<TanKind, PrimitiveBlueprint>();
@@ -134,14 +105,11 @@ export function startConstructionTrial(
       quickstash = (params.quickstash_macros as AnchorComposite[]).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');
       // Already pixel-based blueprints
       quickstash = params.quickstash_macros as Blueprint[];
     }
   } else {
-    console.log('[ConstructionApp] No quickstash macros provided');
   }
 
   // Create React root and render GameBoard
@@ -149,31 +117,18 @@ export function startConstructionTrial(
     sectors,
     quickstash,
     primitives: PRIMITIVE_BLUEPRINTS,
-    layout: (params.layout || "semicircle") as LayoutMode,
-    target: (params.target || "silhouette") as PlacementTarget,
-    input: (params.input || "drag") as InputMode,
-    timeLimitMs: params.time_limit_ms || 0,
+    layout: params.layout as LayoutMode,
+    target: params.target as PlacementTarget,
+    input: params.input as InputMode,
+    timeLimitMs: params.time_limit_ms,
     maxQuickstashSlots: CONFIG.layout.defaults.maxQuickstashSlots,
-    mode: 'construction' as const, // Explicit construction mode
+    mode: 'construction' as const,
     ...(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 };
 }

package/src/plugins/tangram-construct/index.ts

@@ -140,7 +140,7 @@ class TangramConstructPlugin implements JsPsychPlugin<Info> {
       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
     };

package/src/plugins/tangram-prep/PrepApp.tsx

@@ -60,6 +60,7 @@ export function startPrepTrial(
   // Create blank prep sectors (no silhouettes)
   const prepSectors: Sector[] = Array.from({ length: numQuickstashSlots }, (_, i) => ({
     id: `prep-sector-${i}`,
+    tangramId: `prep-sector-${i}`, // dummy value since prep mode doesn't have tangrams
     silhouette: {
       id: `prep-silhouette-${i}`,
       mask: []

package/src/plugins/tangram-prep/index.ts

@@ -101,7 +101,7 @@ class TangramPrepPlugin implements JsPsychPlugin<Info> {
     };
 
     const params: StartPrepTrialParams = {
-      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 as "click" | "drag",