@player-ui/async-node-plugin 0.13.0 → 0.14.0-next.1

package/dist/index.legacy-esm.js

@@ -1,12 +1,11 @@
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/index.ts
-import { NodeType, getNodeID } from "@player-ui/player";
+import { NodeType as NodeType5, getNodeID } from "@player-ui/player";
 import { AsyncParallelBailHook, SyncBailHook } from "tapable-ts";
 import queueMicrotask from "queue-microtask";
-import { omit } from "timm";
 
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/transform.ts
 import { Builder } from "@player-ui/player";
-var asyncTransform = (assetId, wrapperAssetType, asset, flatten) => {
+var asyncTransform = (assetId, wrapperAssetType, asset, flatten, path = ["values"]) => {
   const id = "async-" + assetId;
   const asyncNode = Builder.asyncNode(id, flatten);
   let multiNode;
@@ -21,10 +20,161 @@ var asyncTransform = (assetId, wrapperAssetType, asset, flatten) => {
     id: wrapperAssetType + "-" + id,
     type: wrapperAssetType
   });
-  Builder.addChild(wrapperAsset, ["values"], multiNode);
+  Builder.addChild(wrapperAsset, path, multiNode);
   return wrapperAsset;
 };
 
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/createAsyncTransform.ts
+import {
+  Builder as Builder2,
+  NodeType as NodeType4
+} from "@player-ui/player";
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/extractNodeFromPath.ts
+var getMatchValue = (pathA, pathB) => {
+  if (pathA.length > pathB.length) {
+    return 0;
+  }
+  let matchCount = 0;
+  for (let i = 0; i < pathA.length; i++) {
+    if (pathA[i] === pathB[i]) {
+      matchCount++;
+    } else {
+      return 0;
+    }
+  }
+  return matchCount;
+};
+var extractNodeFromPath = (node, path) => {
+  if (path === void 0 || path.length === 0) {
+    return node;
+  }
+  if (!("children" in node && node.children)) {
+    return void 0;
+  }
+  let matchResult = 0;
+  let bestMatch;
+  for (const child of node.children) {
+    const matchValue = getMatchValue(child.path, path);
+    if (matchValue > matchResult) {
+      matchResult = matchValue;
+      bestMatch = child;
+    }
+  }
+  if (!bestMatch) {
+    return void 0;
+  }
+  if (matchResult >= path.length) {
+    return bestMatch.value;
+  }
+  return extractNodeFromPath(bestMatch.value, path.slice(matchResult));
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/traverseAndReplace.ts
+import { NodeType } from "@player-ui/player";
+var traverseAndReplace = (node, replaceFn) => {
+  if (node.type === NodeType.MultiNode) {
+    let index = 0;
+    while (index < node.values.length) {
+      const child = node.values[index];
+      if (!child) {
+        index++;
+        continue;
+      }
+      const result = replaceFn(child);
+      if (result.type === NodeType.MultiNode) {
+        node.values = [
+          ...node.values.slice(0, index),
+          ...result.values,
+          ...node.values.slice(index + 1)
+        ];
+      } else {
+        node.values[index] = result;
+        index++;
+      }
+    }
+    return node;
+  }
+  return replaceFn(node);
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/unwrapAsset.ts
+import { NodeType as NodeType2 } from "@player-ui/player";
+var unwrapAsset = (node) => {
+  if (node.type !== NodeType2.Value) {
+    return node;
+  }
+  const child = node.children?.find(
+    (x) => x.path.length === 1 && x.path[0] === "asset"
+  );
+  if (!child) {
+    return node;
+  }
+  return child.value;
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/requiresAssetWrapper.ts
+import { NodeType as NodeType3 } from "@player-ui/player";
+var requiresAssetWrapper = (node) => {
+  if (node.type === NodeType3.Asset) {
+    return true;
+  }
+  if (node.type !== NodeType3.Applicability) {
+    return false;
+  }
+  return node.value.type === NodeType3.Asset;
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/createAsyncTransform.ts
+var defaultGetNodeId = (node) => {
+  return `async-${node.value.id}`;
+};
+var createAsyncTransform = (options) => {
+  const {
+    transformAssetType,
+    wrapperAssetType,
+    getNestedAsset,
+    getAsyncNodeId = defaultGetNodeId,
+    path = ["values"],
+    flatten = true
+  } = options;
+  const replaceNode = (node) => {
+    const unwrapped = unwrapAsset(node);
+    if (unwrapped.type !== NodeType4.Asset || unwrapped.value.type !== transformAssetType) {
+      return node;
+    }
+    const transformed = asyncTransform2(unwrapped);
+    return extractNodeFromPath(transformed, path) ?? node;
+  };
+  const replacer = (node) => traverseAndReplace(node, replaceNode);
+  const asyncTransform2 = (node) => {
+    const id = getAsyncNodeId(node);
+    const asset = getNestedAsset?.(node);
+    const replaceFunction = flatten ? replacer : void 0;
+    const asyncNode = Builder2.asyncNode(id, flatten, replaceFunction);
+    let multiNode;
+    if (asset) {
+      if (requiresAssetWrapper(asset)) {
+        const assetWrappedNode = Builder2.assetWrapper(asset);
+        multiNode = Builder2.multiNode(assetWrappedNode, asyncNode);
+      } else if (asset.type === NodeType4.MultiNode) {
+        multiNode = Builder2.multiNode(...asset.values, asyncNode);
+      } else {
+        multiNode = Builder2.multiNode(asset, asyncNode);
+      }
+    } else {
+      multiNode = Builder2.multiNode(asyncNode);
+    }
+    const wrapperAsset = Builder2.asset({
+      id: wrapperAssetType + "-" + id,
+      type: wrapperAssetType
+    });
+    Builder2.addChild(wrapperAsset, path, multiNode);
+    return wrapperAsset;
+  };
+  return asyncTransform2;
+};
+
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/index.ts
 var AsyncNodePluginSymbol = Symbol.for("AsyncNodePlugin");
 var _AsyncNodePlugin = class _AsyncNodePlugin {
@@ -79,7 +229,10 @@ var AsyncNodePluginPlugin = class {
    * @param view The view instance where the node resides. This can be undefined if the view is not currently active.
    */
   parseNodeAndUpdate(node, context, result, options) {
-    const parsedNode = options.parseNode && result ? options.parseNode(result) : void 0;
+    let parsedNode = options.parseNode && result ? options.parseNode(result) : void 0;
+    if (parsedNode && node.onValueReceived) {
+      parsedNode = node.onValueReceived(parsedNode);
+    }
     this.handleAsyncUpdate(node, context, parsedNode);
   }
   /**
@@ -95,9 +248,13 @@ var AsyncNodePluginPlugin = class {
     const { nodeResolveCache, view } = context;
     if (nodeResolveCache.get(node.id) !== newNode) {
       nodeResolveCache.set(node.id, newNode ? newNode : node);
-      view.updateAsync();
+      view.updateAsync(node.id);
     }
   }
+  hasValidMapping(node, context) {
+    const { nodeResolveCache } = context;
+    return nodeResolveCache.has(node.id) && nodeResolveCache.get(node.id) !== node;
+  }
   /**
    * Handles the asynchronous API integration for resolving nodes.
    * This method sets up a hook on the resolver's `beforeResolve` event to process async nodes.
@@ -107,11 +264,11 @@ var AsyncNodePluginPlugin = class {
   applyResolver(resolver, context) {
     resolver.hooks.beforeResolve.tap(this.name, (node, options) => {
       if (!this.isAsync(node)) {
-        return node;
+        return node === null ? node : this.resolveAsyncChildren(node, context);
       }
       const resolvedNode = context.nodeResolveCache.get(node.id);
       if (resolvedNode !== void 0) {
-        return resolvedNode;
+        return this.resolveAsyncChildren(resolvedNode, context);
       }
       if (context.inProgressNodes.has(node.id)) {
         return node;
@@ -123,6 +280,49 @@ var AsyncNodePluginPlugin = class {
       return node;
     });
   }
+  /**
+   * Replaces child async nodes with their resolved content and flattens when necessary. Resolving the children directly helps manage the `parent` reference without needing as much work within the resolver itself.
+   * Handles async node chains as well to make sure all applicable nodes can get flattened.
+   * @param node - The node whose children need to be resolved.
+   * @param context - the async plugin context needed to reach into the cache
+   * @returns The same node but with async node children mapped to their resolved AST.
+   */
+  resolveAsyncChildren(node, context) {
+    const asyncNodesResolved = node.asyncNodesResolved ?? [];
+    node.asyncNodesResolved = asyncNodesResolved;
+    if (node.type === NodeType5.MultiNode) {
+      let index = 0;
+      while (index < node.values.length) {
+        const childNode = node.values[index];
+        if (childNode?.type !== NodeType5.Async || !this.hasValidMapping(childNode, context)) {
+          index++;
+          continue;
+        }
+        const mappedNode = context.nodeResolveCache.get(childNode.id);
+        asyncNodesResolved.push(childNode.id);
+        if (mappedNode.type === NodeType5.MultiNode && childNode.flatten) {
+          mappedNode.values.forEach((v) => v.parent = node);
+          node.values = [
+            ...node.values.slice(0, index),
+            ...mappedNode.values,
+            ...node.values.slice(index + 1)
+          ];
+        } else {
+          node.values[index] = mappedNode;
+          mappedNode.parent = node;
+        }
+      }
+    } else if ("children" in node) {
+      node.children?.forEach((c) => {
+        while (c.value.type === NodeType5.Async && this.hasValidMapping(c.value, context)) {
+          asyncNodesResolved.push(c.value.id);
+          c.value = context.nodeResolveCache.get(c.value.id);
+          c.value.parent = node;
+        }
+      });
+    }
+    return node;
+  }
   async runAsyncNode(node, context, options) {
     try {
       const result = await this.basePlugin?.hooks.onAsyncNode.call(
@@ -152,21 +352,18 @@ var AsyncNodePluginPlugin = class {
     }
   }
   isAsync(node) {
-    return node?.type === NodeType.Async;
+    return node?.type === NodeType5.Async;
   }
   isDeterminedAsync(obj) {
-    return obj && Object.prototype.hasOwnProperty.call(obj, "async");
+    return typeof obj === "object" && obj !== null && Object.prototype.hasOwnProperty.call(obj, "async");
   }
   applyParser(parser) {
     parser.hooks.parseNode.tap(
       this.name,
       (obj, nodeType, options, childOptions) => {
         if (this.isDeterminedAsync(obj)) {
-          const parsedAsync = parser.parseObject(
-            omit(obj, "async"),
-            nodeType,
-            options
-          );
+          const { async, flatten, ...rest } = obj;
+          const parsedAsync = parser.parseObject(rest, nodeType, options);
           const parsedNodeId = getNodeID(parsedAsync);
           if (parsedAsync === null || !parsedNodeId) {
             return childOptions ? [] : null;
@@ -174,8 +371,9 @@ var AsyncNodePluginPlugin = class {
           const asyncAST = parser.createASTNode(
             {
               id: parsedNodeId,
-              type: NodeType.Async,
-              value: parsedAsync
+              type: NodeType5.Async,
+              value: parsedAsync,
+              flatten
             },
             obj
           );
@@ -211,6 +409,7 @@ export {
   AsyncNodePlugin,
   AsyncNodePluginPlugin,
   AsyncNodePluginSymbol,
-  asyncTransform
+  asyncTransform,
+  createAsyncTransform
 };
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs

@@ -1,12 +1,11 @@
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/index.ts
-import { NodeType, getNodeID } from "@player-ui/player";
+import { NodeType as NodeType5, getNodeID } from "@player-ui/player";
 import { AsyncParallelBailHook, SyncBailHook } from "tapable-ts";
 import queueMicrotask from "queue-microtask";
-import { omit } from "timm";
 
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/transform.ts
 import { Builder } from "@player-ui/player";
-var asyncTransform = (assetId, wrapperAssetType, asset, flatten) => {
+var asyncTransform = (assetId, wrapperAssetType, asset, flatten, path = ["values"]) => {
   const id = "async-" + assetId;
   const asyncNode = Builder.asyncNode(id, flatten);
   let multiNode;
@@ -21,10 +20,161 @@ var asyncTransform = (assetId, wrapperAssetType, asset, flatten) => {
     id: wrapperAssetType + "-" + id,
     type: wrapperAssetType
   });
-  Builder.addChild(wrapperAsset, ["values"], multiNode);
+  Builder.addChild(wrapperAsset, path, multiNode);
   return wrapperAsset;
 };
 
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/createAsyncTransform.ts
+import {
+  Builder as Builder2,
+  NodeType as NodeType4
+} from "@player-ui/player";
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/extractNodeFromPath.ts
+var getMatchValue = (pathA, pathB) => {
+  if (pathA.length > pathB.length) {
+    return 0;
+  }
+  let matchCount = 0;
+  for (let i = 0; i < pathA.length; i++) {
+    if (pathA[i] === pathB[i]) {
+      matchCount++;
+    } else {
+      return 0;
+    }
+  }
+  return matchCount;
+};
+var extractNodeFromPath = (node, path) => {
+  if (path === void 0 || path.length === 0) {
+    return node;
+  }
+  if (!("children" in node && node.children)) {
+    return void 0;
+  }
+  let matchResult = 0;
+  let bestMatch;
+  for (const child of node.children) {
+    const matchValue = getMatchValue(child.path, path);
+    if (matchValue > matchResult) {
+      matchResult = matchValue;
+      bestMatch = child;
+    }
+  }
+  if (!bestMatch) {
+    return void 0;
+  }
+  if (matchResult >= path.length) {
+    return bestMatch.value;
+  }
+  return extractNodeFromPath(bestMatch.value, path.slice(matchResult));
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/traverseAndReplace.ts
+import { NodeType } from "@player-ui/player";
+var traverseAndReplace = (node, replaceFn) => {
+  if (node.type === NodeType.MultiNode) {
+    let index = 0;
+    while (index < node.values.length) {
+      const child = node.values[index];
+      if (!child) {
+        index++;
+        continue;
+      }
+      const result = replaceFn(child);
+      if (result.type === NodeType.MultiNode) {
+        node.values = [
+          ...node.values.slice(0, index),
+          ...result.values,
+          ...node.values.slice(index + 1)
+        ];
+      } else {
+        node.values[index] = result;
+        index++;
+      }
+    }
+    return node;
+  }
+  return replaceFn(node);
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/unwrapAsset.ts
+import { NodeType as NodeType2 } from "@player-ui/player";
+var unwrapAsset = (node) => {
+  if (node.type !== NodeType2.Value) {
+    return node;
+  }
+  const child = node.children?.find(
+    (x) => x.path.length === 1 && x.path[0] === "asset"
+  );
+  if (!child) {
+    return node;
+  }
+  return child.value;
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/utils/requiresAssetWrapper.ts
+import { NodeType as NodeType3 } from "@player-ui/player";
+var requiresAssetWrapper = (node) => {
+  if (node.type === NodeType3.Asset) {
+    return true;
+  }
+  if (node.type !== NodeType3.Applicability) {
+    return false;
+  }
+  return node.value.type === NodeType3.Asset;
+};
+
+// ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/createAsyncTransform.ts
+var defaultGetNodeId = (node) => {
+  return `async-${node.value.id}`;
+};
+var createAsyncTransform = (options) => {
+  const {
+    transformAssetType,
+    wrapperAssetType,
+    getNestedAsset,
+    getAsyncNodeId = defaultGetNodeId,
+    path = ["values"],
+    flatten = true
+  } = options;
+  const replaceNode = (node) => {
+    const unwrapped = unwrapAsset(node);
+    if (unwrapped.type !== NodeType4.Asset || unwrapped.value.type !== transformAssetType) {
+      return node;
+    }
+    const transformed = asyncTransform2(unwrapped);
+    return extractNodeFromPath(transformed, path) ?? node;
+  };
+  const replacer = (node) => traverseAndReplace(node, replaceNode);
+  const asyncTransform2 = (node) => {
+    const id = getAsyncNodeId(node);
+    const asset = getNestedAsset?.(node);
+    const replaceFunction = flatten ? replacer : void 0;
+    const asyncNode = Builder2.asyncNode(id, flatten, replaceFunction);
+    let multiNode;
+    if (asset) {
+      if (requiresAssetWrapper(asset)) {
+        const assetWrappedNode = Builder2.assetWrapper(asset);
+        multiNode = Builder2.multiNode(assetWrappedNode, asyncNode);
+      } else if (asset.type === NodeType4.MultiNode) {
+        multiNode = Builder2.multiNode(...asset.values, asyncNode);
+      } else {
+        multiNode = Builder2.multiNode(asset, asyncNode);
+      }
+    } else {
+      multiNode = Builder2.multiNode(asyncNode);
+    }
+    const wrapperAsset = Builder2.asset({
+      id: wrapperAssetType + "-" + id,
+      type: wrapperAssetType
+    });
+    Builder2.addChild(wrapperAsset, path, multiNode);
+    return wrapperAsset;
+  };
+  return asyncTransform2;
+};
+
 // ../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/plugins/async-node/core/src/index.ts
 var AsyncNodePluginSymbol = Symbol.for("AsyncNodePlugin");
 var _AsyncNodePlugin = class _AsyncNodePlugin {
@@ -79,7 +229,10 @@ var AsyncNodePluginPlugin = class {
    * @param view The view instance where the node resides. This can be undefined if the view is not currently active.
    */
   parseNodeAndUpdate(node, context, result, options) {
-    const parsedNode = options.parseNode && result ? options.parseNode(result) : void 0;
+    let parsedNode = options.parseNode && result ? options.parseNode(result) : void 0;
+    if (parsedNode && node.onValueReceived) {
+      parsedNode = node.onValueReceived(parsedNode);
+    }
     this.handleAsyncUpdate(node, context, parsedNode);
   }
   /**
@@ -95,9 +248,13 @@ var AsyncNodePluginPlugin = class {
     const { nodeResolveCache, view } = context;
     if (nodeResolveCache.get(node.id) !== newNode) {
       nodeResolveCache.set(node.id, newNode ? newNode : node);
-      view.updateAsync();
+      view.updateAsync(node.id);
     }
   }
+  hasValidMapping(node, context) {
+    const { nodeResolveCache } = context;
+    return nodeResolveCache.has(node.id) && nodeResolveCache.get(node.id) !== node;
+  }
   /**
    * Handles the asynchronous API integration for resolving nodes.
    * This method sets up a hook on the resolver's `beforeResolve` event to process async nodes.
@@ -107,11 +264,11 @@ var AsyncNodePluginPlugin = class {
   applyResolver(resolver, context) {
     resolver.hooks.beforeResolve.tap(this.name, (node, options) => {
       if (!this.isAsync(node)) {
-        return node;
+        return node === null ? node : this.resolveAsyncChildren(node, context);
       }
       const resolvedNode = context.nodeResolveCache.get(node.id);
       if (resolvedNode !== void 0) {
-        return resolvedNode;
+        return this.resolveAsyncChildren(resolvedNode, context);
       }
       if (context.inProgressNodes.has(node.id)) {
         return node;
@@ -123,6 +280,49 @@ var AsyncNodePluginPlugin = class {
       return node;
     });
   }
+  /**
+   * Replaces child async nodes with their resolved content and flattens when necessary. Resolving the children directly helps manage the `parent` reference without needing as much work within the resolver itself.
+   * Handles async node chains as well to make sure all applicable nodes can get flattened.
+   * @param node - The node whose children need to be resolved.
+   * @param context - the async plugin context needed to reach into the cache
+   * @returns The same node but with async node children mapped to their resolved AST.
+   */
+  resolveAsyncChildren(node, context) {
+    const asyncNodesResolved = node.asyncNodesResolved ?? [];
+    node.asyncNodesResolved = asyncNodesResolved;
+    if (node.type === NodeType5.MultiNode) {
+      let index = 0;
+      while (index < node.values.length) {
+        const childNode = node.values[index];
+        if (childNode?.type !== NodeType5.Async || !this.hasValidMapping(childNode, context)) {
+          index++;
+          continue;
+        }
+        const mappedNode = context.nodeResolveCache.get(childNode.id);
+        asyncNodesResolved.push(childNode.id);
+        if (mappedNode.type === NodeType5.MultiNode && childNode.flatten) {
+          mappedNode.values.forEach((v) => v.parent = node);
+          node.values = [
+            ...node.values.slice(0, index),
+            ...mappedNode.values,
+            ...node.values.slice(index + 1)
+          ];
+        } else {
+          node.values[index] = mappedNode;
+          mappedNode.parent = node;
+        }
+      }
+    } else if ("children" in node) {
+      node.children?.forEach((c) => {
+        while (c.value.type === NodeType5.Async && this.hasValidMapping(c.value, context)) {
+          asyncNodesResolved.push(c.value.id);
+          c.value = context.nodeResolveCache.get(c.value.id);
+          c.value.parent = node;
+        }
+      });
+    }
+    return node;
+  }
   async runAsyncNode(node, context, options) {
     try {
       const result = await this.basePlugin?.hooks.onAsyncNode.call(
@@ -152,21 +352,18 @@ var AsyncNodePluginPlugin = class {
     }
   }
   isAsync(node) {
-    return node?.type === NodeType.Async;
+    return node?.type === NodeType5.Async;
   }
   isDeterminedAsync(obj) {
-    return obj && Object.prototype.hasOwnProperty.call(obj, "async");
+    return typeof obj === "object" && obj !== null && Object.prototype.hasOwnProperty.call(obj, "async");
   }
   applyParser(parser) {
     parser.hooks.parseNode.tap(
       this.name,
       (obj, nodeType, options, childOptions) => {
         if (this.isDeterminedAsync(obj)) {
-          const parsedAsync = parser.parseObject(
-            omit(obj, "async"),
-            nodeType,
-            options
-          );
+          const { async, flatten, ...rest } = obj;
+          const parsedAsync = parser.parseObject(rest, nodeType, options);
           const parsedNodeId = getNodeID(parsedAsync);
           if (parsedAsync === null || !parsedNodeId) {
             return childOptions ? [] : null;
@@ -174,8 +371,9 @@ var AsyncNodePluginPlugin = class {
           const asyncAST = parser.createASTNode(
             {
               id: parsedNodeId,
-              type: NodeType.Async,
-              value: parsedAsync
+              type: NodeType5.Async,
+              value: parsedAsync,
+              flatten
             },
             obj
           );
@@ -211,6 +409,7 @@ export {
   AsyncNodePlugin,
   AsyncNodePluginPlugin,
   AsyncNodePluginSymbol,
-  asyncTransform
+  asyncTransform,
+  createAsyncTransform
 };
 //# sourceMappingURL=index.mjs.map