@player-ui/async-node-plugin 0.8.0-next.4 → 0.8.0-next.5

package/src/index.ts

@@ -4,6 +4,7 @@ import type {
   PlayerPlugin,
   Node,
   ParseObjectOptions,
+  ParseObjectChildOptions,
   ViewInstance,
   Parser,
   ViewPlugin,
@@ -142,39 +143,52 @@ export class AsyncNodePluginPlugin implements AsyncNodeViewPlugin {
     return node?.type === NodeType.Async;
   }
 
+  private isDeterminedAsync(obj: any) {
+    return obj && Object.prototype.hasOwnProperty.call(obj, "async");
+  }
+
   applyParser(parser: Parser) {
-    parser.hooks.determineNodeType.tap(this.name, (obj) => {
-      if (Object.prototype.hasOwnProperty.call(obj, "async")) {
-        return NodeType.Async;
-      }
-    });
     parser.hooks.parseNode.tap(
       this.name,
       (
         obj: any,
         nodeType: Node.ChildrenTypes,
         options: ParseObjectOptions,
-        determinedNodeType: null | NodeType,
+        childOptions?: ParseObjectChildOptions,
       ) => {
-        if (determinedNodeType === NodeType.Async) {
+        if (this.isDeterminedAsync(obj)) {
           const parsedAsync = parser.parseObject(
             omit(obj, "async"),
             nodeType,
             options,
           );
           const parsedNodeId = getNodeID(parsedAsync);
-          if (parsedAsync !== null && parsedNodeId) {
-            return parser.createASTNode(
-              {
-                id: parsedNodeId,
-                type: NodeType.Async,
-                value: parsedAsync,
-              },
-              obj,
-            );
+
+          if (parsedAsync === null || !parsedNodeId) {
+            return childOptions ? [] : null;
+          }
+
+          const asyncAST = parser.createASTNode(
+            {
+              id: parsedNodeId,
+              type: NodeType.Async,
+              value: parsedAsync,
+            },
+            obj,
+          );
+
+          if (childOptions) {
+            return asyncAST
+              ? [
+                  {
+                    path: [...childOptions.path, childOptions.key],
+                    value: asyncAST,
+                  },
+                ]
+              : [];
           }
 
-          return null;
+          return asyncAST;
         }
       },
     );

package/types/index.d.ts

@@ -48,6 +48,7 @@ export declare class AsyncNodePluginPlugin implements AsyncNodeViewPlugin {
      */
     applyResolver(resolver: Resolver): void;
     private isAsync;
+    private isDeterminedAsync;
     applyParser(parser: Parser): void;
     apply(view: ViewInstance): void;
     applyPlugin(asyncNodePlugin: AsyncNodePlugin): void;