diff --git a/__dev__.py b/__dev__.py index ee45c00..9ed1af1 100644 --- a/__dev__.py +++ b/__dev__.py @@ -8,7 +8,7 @@ DIR_WEB_JS=os.path.abspath(f'{THIS_DIR}/../../web/extensions/rgthree') shutil.rmtree(DIR_DEV_JS) -subprocess.run(["tsc"]) +subprocess.run(["./node_modules/typescript/bin/tsc"]) shutil.rmtree(DIR_WEB_JS) diff --git a/js/constants.js b/js/constants.js index 969c30b..841e544 100644 --- a/js/constants.js +++ b/js/constants.js @@ -9,4 +9,5 @@ export const NodeTypesString = { NODE_MODE_REPEATER: addRgthree('Mute / Bypass Repeater'), FAST_MUTER: addRgthree('Fast Muter'), FAST_BYPASSER: addRgthree('Fast Bypasser'), + NODE_COLLECTOR: addRgthree('Node Collector'), }; diff --git a/js/node_collector.js b/js/node_collector.js index f46d031..291c6b2 100644 --- a/js/node_collector.js +++ b/js/node_collector.js @@ -2,10 +2,11 @@ import { app } from "../../scripts/app.js"; import { addConnectionLayoutSupport, wait } from "./utils.js"; import { ComfyWidgets } from "../../scripts/widgets.js"; import { BaseCollectorNode } from './base_node_collector.js'; +import { NodeTypesString } from "./constants.js"; class CollectorNode extends BaseCollectorNode { } -CollectorNode.type = "Node Collector (rgthree)"; -CollectorNode.title = "Node Collector (rgthree)"; +CollectorNode.type = NodeTypesString.NODE_COLLECTOR; +CollectorNode.title = NodeTypesString.NODE_COLLECTOR; CollectorNode.legacyType = "Node Combiner (rgthree)"; class CombinerNode extends CollectorNode { constructor(title = CombinerNode.title) { diff --git a/package-lock.json b/package-lock.json index 8204c26..d741702 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "devDependencies": { - "typescript": "^5.1.6" + "typescript": "^5.2.2" } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 3f60d28..04263dc 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "devDependencies": { - "typescript": "^5.1.6" + "typescript": "^5.2.2" } } diff --git a/ts/constants.ts b/ts/constants.ts index adfa401..3944dfd 100644 --- a/ts/constants.ts +++ b/ts/constants.ts @@ -12,4 +12,6 @@ export const NodeTypesString = { NODE_MODE_REPEATER: addRgthree('Mute / Bypass Repeater'), FAST_MUTER: addRgthree('Fast Muter'), FAST_BYPASSER: addRgthree('Fast Bypasser'), + FAST_BUTTON_ACTION: addRgthree('Fast Button Action'), + NODE_COLLECTOR: addRgthree('Node Collector'), } \ No newline at end of file diff --git a/ts/node_collector.ts b/ts/node_collector.ts index 80f4f82..2253ab9 100644 --- a/ts/node_collector.ts +++ b/ts/node_collector.ts @@ -7,6 +7,7 @@ import { addConnectionLayoutSupport, wait } from "./utils.js"; import { ComfyWidgets } from "../../scripts/widgets.js"; // @ts-ignore import { BaseCollectorNode } from './base_node_collector.js'; +import { NodeTypesString } from "./constants.js"; declare const LiteGraph: typeof TLiteGraph; @@ -14,8 +15,8 @@ declare const LiteGraph: typeof TLiteGraph; /** Legacy "Combiner" */ class CollectorNode extends BaseCollectorNode { - static override type = "Node Collector (rgthree)"; - static override title = "Node Collector (rgthree)"; + static override type = NodeTypesString.NODE_COLLECTOR; + static override title = NodeTypesString.NODE_COLLECTOR; static legacyType = "Node Combiner (rgthree)"; diff --git a/tsconfig.json b/tsconfig.json index 5204a57..da33f25 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,8 +16,8 @@ "noImplicitThis": true, "useUnknownInCatchVariables": true, "alwaysStrict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, "exactOptionalPropertyTypes": false, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true,