@player-ui/player 0.11.1 → 0.11.2-next.0

package/dist/cjs/index.cjs

@@ -103,7 +103,6 @@ __export(src_exports, {
   severities: () => severities,
   toModel: () => toModel,
   toNodeResolveOptions: () => toNodeResolveOptions,
-  unpackAndPush: () => unpackAndPush,
   withParser: () => withParser,
   withoutContext: () => withoutContext
 });
@@ -2684,15 +2683,6 @@ function toNodeResolveOptions(resolverOptions) {
     evaluate: (exp) => resolverOptions.evaluator.evaluate(exp, resolverOptions)
   };
 }
-function unpackAndPush(item, initial) {
-  if (item.asset.values && Array.isArray(item.asset.values)) {
-    item.asset.values.forEach((i) => {
-      unpackAndPush(i, initial);
-    });
-  } else {
-    initial.push(item);
-  }
-}
 
 // ../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/core/player/src/view/resolver/index.ts
 var withContext = (model) => {
@@ -2848,6 +2838,7 @@ var Resolver = class {
     ) ?? {
       type: "empty" /* Empty */
     };
+    const isNestedMultiNodeWithAsync = resolvedAST.type === "multi-node" /* MultiNode */ && partiallyResolvedParent?.parent?.parent?.type === "multi-node" /* MultiNode */ && partiallyResolvedParent.parent.type === "value" /* Value */ && resolvedAST.parent?.type === "asset" /* Asset */ && resolvedAST.parent.value.id.includes("async");
     const isNestedMultiNode = resolvedAST.type === "multi-node" /* MultiNode */ && partiallyResolvedParent?.parent?.type === "multi-node" /* MultiNode */ && partiallyResolvedParent.type === "value" /* Value */;
     if (previousResult && shouldUseLastValue) {
       const update2 = {
@@ -2886,7 +2877,11 @@ var Resolver = class {
       repopulateASTMapFromCache(previousResult, node, rawParent);
       return update2;
     }
-    resolvedAST.parent = partiallyResolvedParent;
+    if (isNestedMultiNodeWithAsync) {
+      resolvedAST.parent = partiallyResolvedParent.parent;
+    } else {
+      resolvedAST.parent = partiallyResolvedParent;
+    }
     resolveOptions.node = resolvedAST;
     this.ASTMap.set(resolvedAST, node);
     let resolved = this.hooks.resolve.call(
@@ -2936,6 +2931,7 @@ var Resolver = class {
     } else if (resolvedAST.type === "multi-node" /* MultiNode */) {
       const childValue = [];
       const rawParentToPassIn = isNestedMultiNode ? partiallyResolvedParent?.parent : node;
+      const hasAsync = resolvedAST.values.map((value, index) => value.type === "async" /* Async */ ? index : -1).filter((index) => index !== -1);
       const newValues = resolvedAST.values.map((mValue) => {
         const mTree = this.computeTree(
           mValue,
@@ -2959,7 +2955,16 @@ var Resolver = class {
         updated = updated || mTree.updated;
         return mTree.node;
       });
-      resolvedAST.values = newValues;
+      if (hasAsync.length > 0) {
+        const copy = newValues;
+        hasAsync.forEach((index) => {
+          if (copy[index])
+            copy.splice(index, 1, ...unpackNode(copy[index]));
+        });
+        resolvedAST.values = copy;
+      } else {
+        resolvedAST.values = newValues;
+      }
       resolved = childValue;
     }
     childDependencies.forEach(
@@ -2991,6 +2996,28 @@ var Resolver = class {
     return update;
   }
 };
+function unpackAndPush(item, initial) {
+  if (item.asset.values && Array.isArray(item.asset.values)) {
+    item.asset.values.forEach((i) => {
+      unpackAndPush(i, initial);
+    });
+  } else {
+    initial.push(item);
+  }
+}
+function unpackNode(item) {
+  const unpacked = [];
+  if ("children" in item && item.children?.[0]?.value.type === "asset" /* Asset */ && (item.children?.[0]?.value).children) {
+    if ((item.children?.[0]?.value).children?.[0]?.value.type === "multi-node" /* MultiNode */) {
+      ((item.children?.[0]?.value).children?.[0]?.value).values.forEach((value) => {
+        unpacked.push(value);
+      });
+    }
+  } else {
+    unpacked.push(item);
+  }
+  return unpacked;
+}
 
 // ../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/core/player/src/view/view.ts
 var CrossfieldProvider = class {
@@ -5591,7 +5618,6 @@ var Player = _Player;
   severities,
   toModel,
   toNodeResolveOptions,
-  unpackAndPush,
   withParser,
   withoutContext,
   ...require("@player-ui/types")