Fix bug not registering nodes from callfunc

rokucommunity · Oct 17, 2024 · 9dae288 · 9dae288
1 parent 5a05184
commit 9dae288
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/lib/components/Reftracker.bs b/lib/components/Reftracker.bs
@@ -38,7 +38,7 @@ function discover(_ = invalid)
 end function
 
 function printNodes()
-    print FormatJson(m.keypathsByNodeReftrackerId)
+    print m.nodesByKeypath
 end function
 
 'Register a reference to a node so we can process it later. This
@@ -84,13 +84,15 @@ function processNodes()
 
     'if this node supports reftracker functionality, process the node's internal `m`
     return promises.chain(promises.resolve(true), queueItem).then(function(result, queueItem as NodeQueueItem)
-        if (queueItem.node as dynamic).reftrackerEnabled then
-            reftracker.internal.writeLog("processing node's internal m properties", queueItem.keypath, queueItem.node.subtype())
-            return queueItem.node@.reftracker_internal_execute({
-                command: "discover",
-                reftracker: m.top,
-                keypath: queueItem.keypath
-            })
+        reftracker.internal.writeLog("processing node's internal m properties", queueItem.keypath, queueItem.node.subtype())
+        promise = queueItem.node@.reftracker_internal_execute({
+            command: "discover",
+            reftracker: m.top,
+            keypath: queueItem.keypath
+        })
+
+        if promise <> invalid then
+            return promise
         else
             reftracker.internal.writeLog("node does not support reftracker intraspection", queueItem.keypath, queueItem.node.subtype())
         end if
@@ -101,7 +103,7 @@ function processNodes()
         children = queueItem.node.getChildren(-1, 0) as roSGNode[]
         reftracker.internal.writeLog(`registering ${children.count()} children of node`, queueItem.keypath, queueItem.node.subtype())
         for i = 0 to children.Count() - 1
-            registerNodeRef(queueItem.keypath, i.ToStr(), children[i])
+            registerNodeRef(queueItem.keypath, `getChild(${i})`, children[i])
         end for
 
         'register work items for each field on the node

diff --git a/lib/source/reftrackerLib.bs b/lib/source/reftrackerLib.bs
@@ -82,7 +82,7 @@ namespace reftracker.internal
                 'if this is a node, push register it with the reftracker to be processed later
                 if itemType = "roSGNode"
                     writeLog("item is a node. pushing to node queue", itemKeypath, itemType)
-                    options.reftracker@.registerNodeRef(item)
+                    options.reftracker@.registerNodeRef(options.keypath, workItem.key, item)
                 else if itemType = "roArray"
                     if isProcessed(item)
                         writeLog("item is an array and already processed. Skipping", itemKeypath, itemType)
@@ -248,6 +248,7 @@ namespace reftracker.internal
 
     interface WorkQueueItem
         keypath as string
+        key as string
         item as dynamic
     end interface
 

diff --git a/src/Plugin.ts b/src/Plugin.ts
@@ -65,18 +65,6 @@ export class Plugin implements CompilerPlugin {
 				]
 			)
 		);
-		//add a new interface field indicating this function is available
-		editor.arrayPush(
-			file.ast.component!.api.fields,
-			new SGField(
-				{ text: 'field', range: util.createRange(0, 0, 0, 99) },
-				[
-					createSGAttribute('id', 'reftrackerEnabled'),
-					createSGAttribute('type', 'boolean'),
-					createSGAttribute('value', 'true')
-				]
-			)
-		);
 
 		//inject the script
 		editor.arrayPush(

diff --git a/test-app/components/MainScene.bs b/test-app/components/MainScene.bs
@@ -6,6 +6,10 @@ sub init()
     'make the text really big
     m.mainLabel.font.size = 100
 
+    m.arr = [
+        m.mainLabel
+    ]
+
     promises.chain(reftracker.findNodeById("bob")).then(function(result, node)
         print "found node"
     end function)