@movable/studio-framework 3.13.1-test-logs-canvas-key.0 → 3.14.1-canary.0

package/dist/index.es.js

@@ -1477,9 +1477,11 @@ class AsyncComputed {
 
   getProperty(...args) {
     const [grouping, path, context = {}] = parseGetPropertyArgs(args);
+    console.log(`getProperty called: ${grouping}.${path}`);
     const property = this.getPropertyInstance(grouping, path);
 
     if (!property) {
+      console.log(`⚠️ Property not found: ${grouping}.${path}`);
       return null;
     }
 
@@ -1497,7 +1499,9 @@ class AsyncComputed {
       requestEvent = createInertEvent();
     }
 
-    return property.compute(context, requestEvent);
+    const result = property.compute(context, requestEvent);
+    console.log(`getProperty result for ${grouping}.${path}:`, result);
+    return result;
   }
 
   async getPropertyTuple(...args) {
@@ -2733,6 +2737,8 @@ class StudioFramework {
   }
 
   async evaluateOperand(operand) {
+    console.log('evaluateOperand');
+
     if ('operator' in operand) {
       return this.resolveCondition(operand);
     }
@@ -2744,23 +2750,35 @@ class StudioFramework {
     } = operand;
     return this.getPropertyTuple(propertyGroupKey, propertyPath, this.resolveDynamicFieldContext(context));
   }
-  /** resolves `context` values that are Dynamic Fields */
+  /** resolves `context` values that are property references (Dynamic Fields, Custom Properties, Data Source Properties, etc.) */
 
 
   resolveDynamicFieldContext(context) {
     const resolvedContext = {};
+    console.log('===== resolveDynamicFieldContext START =====');
+    console.log('Full context object:', context);
 
     for (const [contextKey, contextValue] of Object.entries(context)) {
-      if (isDynamicProperty(contextValue) && contextValue.propertyGroupKey === 'param') {
-        const resolvedValue = this.getProperty(contextValue.propertyGroupKey, // "param"
-        contextValue.propertyPath // "params.[something]"
-        );
+      console.log(`\n--- Processing context key: "${contextKey}" ---`);
+      console.log('contextValue:', contextValue);
+      console.log('contextValue type:', typeof contextValue);
+      console.log('contextValue has propertyPath?', contextValue?.propertyPath !== undefined);
+      console.log('contextValue.propertyPath value:', contextValue?.propertyPath);
+      console.log('contextValue.propertyGroupKey value:', contextValue?.propertyGroupKey);
+
+      if (isDynamicProperty(contextValue)) {
+        console.log('✓ isDynamicProperty=true - will resolve');
+        const resolvedValue = this.getProperty(contextValue.propertyGroupKey, contextValue.propertyPath, contextValue.context || {});
+        console.log('resolvedValue:', resolvedValue);
         resolvedContext[contextKey] = resolvedValue;
       } else {
+        console.log('✗ isDynamicProperty=false - using as-is');
         resolvedContext[contextKey] = contextValue;
       }
     }
 
+    console.log('\n===== resolveDynamicFieldContext END =====');
+    console.log('Resolved context:', resolvedContext);
     return resolvedContext;
   }
 
@@ -3136,10 +3154,6 @@ class StudioFramework {
   }
 
   logCurrentCanvas(currentCanvas) {
-    console.log('Current Canvas:', currentCanvas);
-    console.log('Canvas Name:', currentCanvas?.name || 'Unnamed Canvas');
-    console.log(window.MICapture?.setCanvasKey && window.MICapture);
-
     if (window.MICapture?.setCanvasKey) {
       window.MICapture.setCanvasKey(currentCanvas.name);
     }

package/dist/index.js

@@ -1487,9 +1487,11 @@ class AsyncComputed {
 
   getProperty(...args) {
     const [grouping, path, context = {}] = parseGetPropertyArgs(args);
+    console.log(`getProperty called: ${grouping}.${path}`);
     const property = this.getPropertyInstance(grouping, path);
 
     if (!property) {
+      console.log(`⚠️ Property not found: ${grouping}.${path}`);
       return null;
     }
 
@@ -1507,7 +1509,9 @@ class AsyncComputed {
       requestEvent = createInertEvent();
     }
 
-    return property.compute(context, requestEvent);
+    const result = property.compute(context, requestEvent);
+    console.log(`getProperty result for ${grouping}.${path}:`, result);
+    return result;
   }
 
   async getPropertyTuple(...args) {
@@ -2743,6 +2747,8 @@ class StudioFramework {
   }
 
   async evaluateOperand(operand) {
+    console.log('evaluateOperand');
+
     if ('operator' in operand) {
       return this.resolveCondition(operand);
     }
@@ -2754,23 +2760,35 @@ class StudioFramework {
     } = operand;
     return this.getPropertyTuple(propertyGroupKey, propertyPath, this.resolveDynamicFieldContext(context));
   }
-  /** resolves `context` values that are Dynamic Fields */
+  /** resolves `context` values that are property references (Dynamic Fields, Custom Properties, Data Source Properties, etc.) */
 
 
   resolveDynamicFieldContext(context) {
     const resolvedContext = {};
+    console.log('===== resolveDynamicFieldContext START =====');
+    console.log('Full context object:', context);
 
     for (const [contextKey, contextValue] of Object.entries(context)) {
-      if (isDynamicProperty(contextValue) && contextValue.propertyGroupKey === 'param') {
-        const resolvedValue = this.getProperty(contextValue.propertyGroupKey, // "param"
-        contextValue.propertyPath // "params.[something]"
-        );
+      console.log(`\n--- Processing context key: "${contextKey}" ---`);
+      console.log('contextValue:', contextValue);
+      console.log('contextValue type:', typeof contextValue);
+      console.log('contextValue has propertyPath?', contextValue?.propertyPath !== undefined);
+      console.log('contextValue.propertyPath value:', contextValue?.propertyPath);
+      console.log('contextValue.propertyGroupKey value:', contextValue?.propertyGroupKey);
+
+      if (isDynamicProperty(contextValue)) {
+        console.log('✓ isDynamicProperty=true - will resolve');
+        const resolvedValue = this.getProperty(contextValue.propertyGroupKey, contextValue.propertyPath, contextValue.context || {});
+        console.log('resolvedValue:', resolvedValue);
         resolvedContext[contextKey] = resolvedValue;
       } else {
+        console.log('✗ isDynamicProperty=false - using as-is');
         resolvedContext[contextKey] = contextValue;
       }
     }
 
+    console.log('\n===== resolveDynamicFieldContext END =====');
+    console.log('Resolved context:', resolvedContext);
     return resolvedContext;
   }
 
@@ -3146,10 +3164,6 @@ class StudioFramework {
   }
 
   logCurrentCanvas(currentCanvas) {
-    console.log('Current Canvas:', currentCanvas);
-    console.log('Canvas Name:', currentCanvas?.name || 'Unnamed Canvas');
-    console.log(window.MICapture?.setCanvasKey && window.MICapture);
-
     if (window.MICapture?.setCanvasKey) {
       window.MICapture.setCanvasKey(currentCanvas.name);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework",
-  "version": "3.13.1-test-logs-canvas-key.0",
+  "version": "3.14.1-canary.0",
   "description": "A Component library for reactive Studio apps.",
   "author": "Movable Ink",
   "repository": "movableink/studio-framework",
@@ -31,8 +31,8 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.13.0",
     "@movable/eslint-config-react": "^1.0.1",
-    "@movable/framework-types": "^3.13.1-test-logs-canvas-key.0",
-    "@movable/studio-framework-test-helpers": "^3.13.1-test-logs-canvas-key.0",
+    "@movable/framework-types": "^3.14.1-canary.0",
+    "@movable/studio-framework-test-helpers": "^3.14.1-canary.0",
     "@types/qunit": "^2.11.1",
     "@types/qunit-dom": "^0.7.0",
     "@types/react": "^17.0.6",
@@ -66,5 +66,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "27a5804388e702148357418cd7c5218cac6234c0"
+  "gitHead": "51719a4a64a8cb54a2428568c0257cc3ee266719"
 }