API route now returns types alongside keys. JS sets output slot type accordingly, giving correct colored dots and type-safe connections. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
133 lines
5.3 KiB
JavaScript
133 lines
5.3 KiB
JavaScript
import { app } from "../../scripts/app.js";
|
|
import { api } from "../../scripts/api.js";
|
|
|
|
app.registerExtension({
|
|
name: "json.manager.dynamic",
|
|
|
|
async beforeRegisterNodeDef(nodeType, nodeData, app) {
|
|
if (nodeData.name !== "JSONLoaderDynamic") return;
|
|
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
origOnNodeCreated?.apply(this, arguments);
|
|
|
|
// Hide the output_keys widget (managed internally by JS)
|
|
const okWidget = this.widgets?.find(w => w.name === "output_keys");
|
|
if (okWidget) {
|
|
okWidget.type = "hidden";
|
|
okWidget.computeSize = () => [0, -4];
|
|
}
|
|
|
|
// Remove all 32 default outputs from Python RETURN_TYPES
|
|
while (this.outputs.length > 0) {
|
|
this.removeOutput(0);
|
|
}
|
|
|
|
// Add Refresh button
|
|
this.addWidget("button", "Refresh Outputs", null, () => {
|
|
this.refreshDynamicOutputs();
|
|
});
|
|
|
|
this.setSize(this.computeSize());
|
|
};
|
|
|
|
nodeType.prototype.refreshDynamicOutputs = async function () {
|
|
const pathWidget = this.widgets?.find(w => w.name === "json_path");
|
|
const seqWidget = this.widgets?.find(w => w.name === "sequence_number");
|
|
if (!pathWidget?.value) return;
|
|
|
|
try {
|
|
const resp = await api.fetchApi(
|
|
`/json_manager/get_keys?path=${encodeURIComponent(pathWidget.value)}&sequence_number=${seqWidget?.value || 1}`
|
|
);
|
|
const { keys, types } = await resp.json();
|
|
|
|
// Update output_keys widget for Python to read at execution time
|
|
const okWidget = this.widgets?.find(w => w.name === "output_keys");
|
|
if (okWidget) okWidget.value = keys.join(",");
|
|
|
|
// Build a map of current output names to slot indices
|
|
const oldSlots = {};
|
|
for (let i = 0; i < this.outputs.length; i++) {
|
|
oldSlots[this.outputs[i].name] = i;
|
|
}
|
|
|
|
// Build new outputs, reusing existing slots to preserve links
|
|
const newOutputs = [];
|
|
for (let k = 0; k < keys.length; k++) {
|
|
const key = keys[k];
|
|
const type = types[k] || "*";
|
|
if (key in oldSlots) {
|
|
// Reuse existing slot object (keeps links intact)
|
|
const slot = this.outputs[oldSlots[key]];
|
|
slot.type = type;
|
|
newOutputs.push(slot);
|
|
delete oldSlots[key];
|
|
} else {
|
|
// New key — create a fresh slot
|
|
newOutputs.push({ name: key, type: type, links: null });
|
|
}
|
|
}
|
|
|
|
// Disconnect links on slots that are being removed
|
|
for (const name in oldSlots) {
|
|
const idx = oldSlots[name];
|
|
if (this.outputs[idx]?.links?.length) {
|
|
for (const linkId of [...this.outputs[idx].links]) {
|
|
this.graph?.removeLink(linkId);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Reassign the outputs array and fix link slot indices
|
|
this.outputs = newOutputs;
|
|
// Update link origin_slot to match new positions
|
|
if (this.graph) {
|
|
for (let i = 0; i < this.outputs.length; i++) {
|
|
const links = this.outputs[i].links;
|
|
if (!links) continue;
|
|
for (const linkId of links) {
|
|
const link = this.graph.links[linkId];
|
|
if (link) link.origin_slot = i;
|
|
}
|
|
}
|
|
}
|
|
|
|
this.setSize(this.computeSize());
|
|
app.graph.setDirtyCanvas(true, true);
|
|
} catch (e) {
|
|
console.error("[JSONLoaderDynamic] Refresh failed:", e);
|
|
}
|
|
};
|
|
|
|
// Restore state on workflow load
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function (info) {
|
|
origOnConfigure?.apply(this, arguments);
|
|
|
|
const okWidget = this.widgets?.find(w => w.name === "output_keys");
|
|
if (okWidget) {
|
|
okWidget.type = "hidden";
|
|
okWidget.computeSize = () => [0, -4];
|
|
}
|
|
|
|
const keys = okWidget?.value
|
|
? okWidget.value.split(",").filter(k => k.trim())
|
|
: [];
|
|
|
|
// On load, LiteGraph already restored serialized outputs with links.
|
|
// Just rename to match keys (preserves links) and trim excess.
|
|
for (let i = 0; i < this.outputs.length && i < keys.length; i++) {
|
|
this.outputs[i].name = keys[i].trim();
|
|
}
|
|
|
|
// Remove any extra outputs beyond the key count
|
|
while (this.outputs.length > keys.length) {
|
|
this.removeOutput(this.outputs.length - 1);
|
|
}
|
|
|
|
this.setSize(this.computeSize());
|
|
};
|
|
},
|
|
});
|