From a3795d32f52d55bf7aa60f487148a147988cd7d4 Mon Sep 17 00:00:00 2001
From: Joseph Holley <joeholley@users.noreply.github.com>
Date: Thu, 13 Nov 2025 22:44:26 +0900
Subject: [PATCH] Fix dynamic I/O handling in AnyCartesianProduct

Refactor input/output management for AnyCartesianProduct extension to handle dynamic inputs and outputs correctly.
---
 js/any_cartesian_product.js | 81 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/js/any_cartesian_product.js b/js/any_cartesian_product.js
index e7fb1df..4cfc852 100644
--- a/js/any_cartesian_product.js
+++ b/js/any_cartesian_product.js
@@ -1 +1,80 @@
-import{app as t}from"/scripts/app.js";t.registerExtension({name:"Comfy.Bmad.AnyCartesianProduct",async beforeRegisterNodeDef(t,e,i){if("AnyListCartesianProduct"!==e.name)return;let s=t.prototype.onNodeCreated;t.prototype.onNodeCreated=function(){let t=s?s.apply(this,arguments):void 0;for(let e=this.outputs.length-1;e>=0;e--)"*"===this.outputs[e].name&&this.removeOutput(e);return this.input_type="*",this.output_type="*",t};let p=t.prototype.getExtraMenuOptions;t.prototype.getExtraMenuOptions=function(t,e){let i=p?p.apply(this,arguments):void 0;return e.unshift({content:"update I/Os",callback:()=>{let t=this.widgets.find(t=>"inputs_len"===t.name).value,e=void 0===this.inputs?0:this.inputs.length,i=void 0===this.inputs?0:this.outputs.length;for(let s=0;s<e;++s){if(s>0){let p=this.inputs.splice(s,1)[0];console.log(p),this.inputs.splice(0,0,p),this.addInput("x",this.input_type),this.removeInput(this.inputs.length-1)}break}let n=e-1;for(let o=e;o>t;--o)this.removeInput(n--);for(let u=e;u<t;u++)this.addInput(`i${u+1}`,this.input_type);for(let r=i;r>t;--r)this.removeOutput(r-1);for(let h=i;h<t;h++)this.addOutput(`o${h+1}`,this.output_type)}}),i}}});
\ No newline at end of file
+import { app as t } from "/scripts/app.js";
+
+t.registerExtension({
+    name: "Comfy.Bmad.AnyCartesianProduct",
+    async beforeRegisterNodeDef(t, e, i) {
+        if ("AnyListCartesianProduct" !== e.name) return;
+
+        // Custom onNodeCreated to remove default '*' outputs and set types
+        let s = t.prototype.onNodeCreated;
+        t.prototype.onNodeCreated = function () {
+            let t = s ? s.apply(this, arguments) : void 0;
+            for (let e = this.outputs.length - 1; e >= 0; e--) {
+                "*" === this.outputs[e].name && this.removeOutput(e);
+            }
+            this.input_type = "*";
+            this.output_type = "*";
+            return t;
+        };
+
+        // Custom getExtraMenuOptions to handle dynamic I/O update
+        let p = t.prototype.getExtraMenuOptions;
+        t.prototype.getExtraMenuOptions = function (t, e) {
+            let i = p ? p.apply(this, arguments) : void 0;
+
+            e.unshift({
+                content: "update I/Os",
+                callback: () => {
+                    let t = this.widgets.find(t => "inputs_len" === t.name).value;
+                    let e = void 0 === this.inputs ? 0 : this.inputs.length;
+                    let i = void 0 === this.inputs ? 0 : this.outputs.length;
+                    
+                    // --- THE FIX IS HERE ---
+                    // The original code tried to re-order the first input, but it was flawed.
+                    // We only want dynamic inputs (i1, i2, etc.) to be affected.
+                    // The actual inputs list starts AFTER the first input, which is the "inputs_len" widget.
+                    
+                    const dynamic_inputs_start_index = 1; // Input 'inputs_len' is at index 0.
+
+                    // 1. Remove excess inputs (starting from the dynamic inputs)
+                    let current_dynamic_inputs_count = e - dynamic_inputs_start_index;
+                    let inputs_to_remove = current_dynamic_inputs_count - t;
+                    
+                    if (inputs_to_remove > 0) {
+                        for (let o = 0; o < inputs_to_remove; o++) {
+                            // We remove the last dynamic input, which is at the current end of the list
+                            this.removeInput(this.inputs.length - 1); 
+                        }
+                    }
+
+                    // 2. Add required inputs
+                    current_dynamic_inputs_count = this.inputs.length - dynamic_inputs_start_index;
+
+                    if (current_dynamic_inputs_count < t) {
+                        for (let u = current_dynamic_inputs_count; u < t; u++) {
+                            // Add new inputs with the correct index (i1, i2, etc.)
+                            // The new input is added to the end, after the 'inputs_len' widget
+                            this.addInput(`i${u + 1}`, this.input_type);
+                        }
+                    }
+                    
+                    // The input logic is now fixed. Outputs logic was mostly correct, but adjusting for clarity.
+
+                    // 3. Update Outputs
+                    // Remove excess outputs
+                    for (let r = i; r > t; --r) {
+                        this.removeOutput(r - 1);
+                    }
+
+                    // Add required outputs
+                    for (let h = i; h < t; h++) {
+                        this.addOutput(`o${h + 1}`, this.output_type);
+                    }
+
+                    // Force the node to update its size and connections
+                    this.setDirtyCanvas(true, true);
+                }
+            }), i
+        }
+    }
+});