@movable/studio-framework 3.14.2-canary.0 → 3.15.0

package/dist/index.es.js

@@ -1477,11 +1477,9 @@ 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;
     }
 
@@ -1499,22 +1497,7 @@ class AsyncComputed {
       requestEvent = createInertEvent();
     }
 
-    const result = property.compute(context, requestEvent);
-    console.log(`getProperty result for ${grouping}.${path}:`, result);
-    console.log(`  - typeof result:`, typeof result);
-    console.log(`  - is Promise?`, result instanceof Promise);
-    console.log(`  - is Array?`, Array.isArray(result));
-
-    if (result && typeof result === 'object') {
-      console.log(`  - Object.keys():`, Object.keys(result));
-      console.log(`  - constructor name:`, result.constructor?.name); // Try to see if it's a primitive wrapper or has a valueOf
-
-      if (typeof result.valueOf === 'function') {
-        console.log(`  - valueOf():`, result.valueOf());
-      }
-    }
-
-    return result;
+    return property.compute(context, requestEvent);
   }
 
   async getPropertyTuple(...args) {
@@ -2750,8 +2733,6 @@ class StudioFramework {
   }
 
   async evaluateOperand(operand) {
-    console.log('evaluateOperand');
-
     if ('operator' in operand) {
       return this.resolveCondition(operand);
     }
@@ -2761,44 +2742,30 @@ class StudioFramework {
       propertyPath = '',
       context = {}
     } = operand;
-    return this.getPropertyTuple(propertyGroupKey, propertyPath, this.resolveDynamicFieldContext(context));
+    const resolvedContext = await this.resolveDynamicFieldContext(context);
+    return this.getPropertyTuple(propertyGroupKey, propertyPath, resolvedContext);
   }
   /** resolves `context` values that are property references (Dynamic Fields, Custom Properties, Data Source Properties, etc.) */
 
 
-  resolveDynamicFieldContext(context) {
+  async resolveDynamicFieldContext(context) {
     const resolvedContext = {};
-    console.log('===== resolveDynamicFieldContext START =====');
-    console.log('Full context object:', context);
 
     for (const [contextKey, contextValue] of Object.entries(context)) {
-      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'); // Debug: check what raw data is available
+        const [resolvedValue, error] = await this.getPropertyTuple(contextValue.propertyGroupKey, contextValue.propertyPath, contextValue.context || {});
 
-        if (contextValue.propertyPath?.includes('product_current_price')) {
-          console.log('DEBUG: Checking raw data.product_current_price');
-          const rawData = this.getProperty('data', 'product_current_price', {});
-          console.log('  raw data.product_current_price:', rawData);
+        if (error) {
+          console.warn(`Failed to resolve ${contextValue.propertyPath}:`, error);
+          resolvedContext[contextKey] = null;
+        } else {
+          resolvedContext[contextKey] = resolvedValue;
         }
-
-        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;
   }
 
@@ -3187,6 +3154,12 @@ class StudioFramework {
       CD.pause();
       currentCanvas = await this.getCurrentCanvas();
       this.logCurrentCanvas(currentCanvas);
+      const canvasRedirect = currentCanvas?.canvasRedirect;
+
+      if (canvasRedirect) {
+        CD.setImageRedirect(canvasRedirect);
+      }
+
       const clickthroughURL = await this.handleClickthrough(currentCanvas);
       const canvasTags = currentCanvas?.tags || [];
       const tags = await this.getCurrentTags(canvasTags, currentCanvas);

package/dist/index.js

@@ -1487,11 +1487,9 @@ 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;
     }
 
@@ -1509,22 +1507,7 @@ class AsyncComputed {
       requestEvent = createInertEvent();
     }
 
-    const result = property.compute(context, requestEvent);
-    console.log(`getProperty result for ${grouping}.${path}:`, result);
-    console.log(`  - typeof result:`, typeof result);
-    console.log(`  - is Promise?`, result instanceof Promise);
-    console.log(`  - is Array?`, Array.isArray(result));
-
-    if (result && typeof result === 'object') {
-      console.log(`  - Object.keys():`, Object.keys(result));
-      console.log(`  - constructor name:`, result.constructor?.name); // Try to see if it's a primitive wrapper or has a valueOf
-
-      if (typeof result.valueOf === 'function') {
-        console.log(`  - valueOf():`, result.valueOf());
-      }
-    }
-
-    return result;
+    return property.compute(context, requestEvent);
   }
 
   async getPropertyTuple(...args) {
@@ -2760,8 +2743,6 @@ class StudioFramework {
   }
 
   async evaluateOperand(operand) {
-    console.log('evaluateOperand');
-
     if ('operator' in operand) {
       return this.resolveCondition(operand);
     }
@@ -2771,44 +2752,30 @@ class StudioFramework {
       propertyPath = '',
       context = {}
     } = operand;
-    return this.getPropertyTuple(propertyGroupKey, propertyPath, this.resolveDynamicFieldContext(context));
+    const resolvedContext = await this.resolveDynamicFieldContext(context);
+    return this.getPropertyTuple(propertyGroupKey, propertyPath, resolvedContext);
   }
   /** resolves `context` values that are property references (Dynamic Fields, Custom Properties, Data Source Properties, etc.) */
 
 
-  resolveDynamicFieldContext(context) {
+  async resolveDynamicFieldContext(context) {
     const resolvedContext = {};
-    console.log('===== resolveDynamicFieldContext START =====');
-    console.log('Full context object:', context);
 
     for (const [contextKey, contextValue] of Object.entries(context)) {
-      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'); // Debug: check what raw data is available
+        const [resolvedValue, error] = await this.getPropertyTuple(contextValue.propertyGroupKey, contextValue.propertyPath, contextValue.context || {});
 
-        if (contextValue.propertyPath?.includes('product_current_price')) {
-          console.log('DEBUG: Checking raw data.product_current_price');
-          const rawData = this.getProperty('data', 'product_current_price', {});
-          console.log('  raw data.product_current_price:', rawData);
+        if (error) {
+          console.warn(`Failed to resolve ${contextValue.propertyPath}:`, error);
+          resolvedContext[contextKey] = null;
+        } else {
+          resolvedContext[contextKey] = resolvedValue;
         }
-
-        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;
   }
 
@@ -3197,6 +3164,12 @@ class StudioFramework {
       CD__default['default'].pause();
       currentCanvas = await this.getCurrentCanvas();
       this.logCurrentCanvas(currentCanvas);
+      const canvasRedirect = currentCanvas?.canvasRedirect;
+
+      if (canvasRedirect) {
+        CD__default['default'].setImageRedirect(canvasRedirect);
+      }
+
       const clickthroughURL = await this.handleClickthrough(currentCanvas);
       const canvasTags = currentCanvas?.tags || [];
       const tags = await this.getCurrentTags(canvasTags, currentCanvas);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework",
-  "version": "3.14.2-canary.0",
+  "version": "3.15.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.14.2-canary.0",
-    "@movable/studio-framework-test-helpers": "^3.14.2-canary.0",
+    "@movable/framework-types": "^3.15.0",
+    "@movable/studio-framework-test-helpers": "^3.15.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": "51719a4a64a8cb54a2428568c0257cc3ee266719"
+  "gitHead": "b4a816a2ca3ccce5c241c99d88a5eda5020eeb0d"
 }