From c226c7deac7df5edb761166d104f0a5d06635f56 Mon Sep 17 00:00:00 2001 From: rgthree Date: Sun, 4 Aug 2024 11:11:03 -0400 Subject: [PATCH] Move standalone services to services dir. --- src_web/comfyui/comfy_ui_bar.ts | 2 +- src_web/comfyui/config.ts | 2 +- src_web/comfyui/fast_groups_muter.ts | 2 +- src_web/comfyui/feature_group_fast_toggle.ts | 2 +- src_web/comfyui/feature_import_individual_nodes.ts | 2 +- src_web/comfyui/menu_auto_nest.ts | 2 +- src_web/comfyui/menu_queue_node.ts | 2 +- src_web/comfyui/rgthree.ts | 2 +- src_web/comfyui/{ => services}/config_service.ts | 5 ++--- src_web/comfyui/{ => services}/fast_groups_service.ts | 2 +- web/comfyui/comfy_ui_bar.js | 2 +- web/comfyui/config.js | 2 +- web/comfyui/fast_groups_muter.js | 2 +- web/comfyui/feature_group_fast_toggle.js | 2 +- web/comfyui/feature_import_individual_nodes.js | 2 +- web/comfyui/menu_auto_nest.js | 2 +- web/comfyui/menu_queue_node.js | 2 +- web/comfyui/rgthree.js | 2 +- web/comfyui/{ => services}/config_service.js | 6 +++--- web/comfyui/{ => services}/fast_groups_service.js | 2 +- 20 files changed, 23 insertions(+), 24 deletions(-) rename src_web/comfyui/{ => services}/config_service.ts (90%) rename src_web/comfyui/{ => services}/fast_groups_service.ts (95%) rename web/comfyui/{ => services}/config_service.js (80%) rename web/comfyui/{ => services}/fast_groups_service.js (99%) diff --git a/src_web/comfyui/comfy_ui_bar.ts b/src_web/comfyui/comfy_ui_bar.ts index b0ce5f6..92d37b3 100644 --- a/src_web/comfyui/comfy_ui_bar.ts +++ b/src_web/comfyui/comfy_ui_bar.ts @@ -4,7 +4,7 @@ import { ComfyButton } from "scripts/ui/components/button.js"; import { iconGear, iconStarFilled, logoRgthree } from "rgthree/common/media/svgs.js"; import { createElement, empty, queryOne } from "rgthree/common/utils_dom.js"; import { SERVICE as BOOKMARKS_SERVICE } from "./services/bookmarks_services.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; import { ComfyPopup } from "scripts/ui/components/popup.js"; import { RgthreeConfigDialog } from "./config.js"; diff --git a/src_web/comfyui/config.ts b/src_web/comfyui/config.ts index cf2dd39..f274e90 100644 --- a/src_web/comfyui/config.ts +++ b/src_web/comfyui/config.ts @@ -3,7 +3,7 @@ import { RgthreeDialog, RgthreeDialogOptions } from "rgthree/common/dialog.js"; import { createElement as $el, query as $$ } from "rgthree/common/utils_dom.js"; import { checkmark, logoRgthree } from "rgthree/common/media/svgs.js"; import { LogLevel, rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; /** Types of config used as a hint for the form handling. */ enum ConfigType { diff --git a/src_web/comfyui/fast_groups_muter.ts b/src_web/comfyui/fast_groups_muter.ts index 64cc8e7..0201ad0 100644 --- a/src_web/comfyui/fast_groups_muter.ts +++ b/src_web/comfyui/fast_groups_muter.ts @@ -9,7 +9,7 @@ import { SerializedLGraphNode, IWidget, } from "typings/litegraph.js"; -import { SERVICE as FAST_GROUPS_SERVICE } from "./fast_groups_service.js"; +import { SERVICE as FAST_GROUPS_SERVICE } from "./services/fast_groups_service.js"; import { drawNodeWidget, fitString } from "./utils_canvas.js"; import { RgthreeBaseVirtualNodeConstructor } from "typings/rgthree.js"; diff --git a/src_web/comfyui/feature_group_fast_toggle.ts b/src_web/comfyui/feature_group_fast_toggle.ts index 0a886ba..5f2ee30 100644 --- a/src_web/comfyui/feature_group_fast_toggle.ts +++ b/src_web/comfyui/feature_group_fast_toggle.ts @@ -9,7 +9,7 @@ import type { AdjustedMouseCustomEvent } from "typings/rgthree.js"; import { app } from "scripts/app.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; const BTN_SIZE = 20; const BTN_MARGIN: Vector2 = [6, 4]; diff --git a/src_web/comfyui/feature_import_individual_nodes.ts b/src_web/comfyui/feature_import_individual_nodes.ts index 6a768ae..170581d 100644 --- a/src_web/comfyui/feature_import_individual_nodes.ts +++ b/src_web/comfyui/feature_import_individual_nodes.ts @@ -1,7 +1,7 @@ import { tryToGetWorkflowDataFromEvent } from "rgthree/common/utils_workflow.js"; import { app } from "scripts/app.js"; import type { ComfyNode, ComfyNodeConstructor, ComfyObjectInfo } from "typings/comfy.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; /** * Registers the GroupHeaderToggles which places a mute and/or bypass icons in groups headers for diff --git a/src_web/comfyui/menu_auto_nest.ts b/src_web/comfyui/menu_auto_nest.ts index 9dabb0a..c9c1f7e 100644 --- a/src_web/comfyui/menu_auto_nest.ts +++ b/src_web/comfyui/menu_auto_nest.ts @@ -6,7 +6,7 @@ import type { IContextMenuOptions, } from "typings/litegraph.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; const SPECIAL_ENTRIES = [/^(CHOOSE|NONE|DISABLE|OPEN)(\s|$)/i, /^\p{Extended_Pictographic}/gu]; diff --git a/src_web/comfyui/menu_queue_node.ts b/src_web/comfyui/menu_queue_node.ts index bbd430f..87f94d5 100644 --- a/src_web/comfyui/menu_queue_node.ts +++ b/src_web/comfyui/menu_queue_node.ts @@ -6,7 +6,7 @@ import type { } from "typings/litegraph.js"; import type { ComfyNodeConstructor, ComfyObjectInfo } from "typings/comfy.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; function getOutputNodesFromSelected(canvas: TLGraphCanvas) { return ( diff --git a/src_web/comfyui/rgthree.ts b/src_web/comfyui/rgthree.ts index c836142..1f57bc0 100644 --- a/src_web/comfyui/rgthree.ts +++ b/src_web/comfyui/rgthree.ts @@ -11,7 +11,7 @@ import type { import type { ComfyApiFormat, ComfyApiPrompt, ComfyApp } from "typings/comfy.js"; import { app } from "scripts/app.js"; import { api } from "scripts/api.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; import { fixBadLinks } from "rgthree/common/link_fixer.js"; import { injectCss, wait } from "rgthree/common/shared_utils.js"; import { replaceNode, waitForCanvas, waitForGraph } from "./utils.js"; diff --git a/src_web/comfyui/config_service.ts b/src_web/comfyui/services/config_service.ts similarity index 90% rename from src_web/comfyui/config_service.ts rename to src_web/comfyui/services/config_service.ts index cceab59..0b409c6 100644 --- a/src_web/comfyui/config_service.ts +++ b/src_web/comfyui/services/config_service.ts @@ -1,4 +1,3 @@ - // @ts-ignore import { rgthreeConfig } from "rgthree/config.js"; import { getObjectValue, setObjectValue } from "rgthree/common/shared_utils.js"; @@ -13,7 +12,7 @@ class ConfigService extends EventTarget { } getFeatureValue(key: string, def?: any) { - key = 'features.' + key.replace(/^features\./, ''); + key = "features." + key.replace(/^features\./, ""); return getObjectValue(rgthreeConfig, key, def); } @@ -38,4 +37,4 @@ class ConfigService extends EventTarget { } /** The ConfigService singleton. */ -export const SERVICE = new ConfigService(); \ No newline at end of file +export const SERVICE = new ConfigService(); diff --git a/src_web/comfyui/fast_groups_service.ts b/src_web/comfyui/services/fast_groups_service.ts similarity index 95% rename from src_web/comfyui/fast_groups_service.ts rename to src_web/comfyui/services/fast_groups_service.ts index 6e37e86..57892cd 100644 --- a/src_web/comfyui/fast_groups_service.ts +++ b/src_web/comfyui/services/fast_groups_service.ts @@ -1,5 +1,5 @@ import { app } from "scripts/app.js"; -import type { BaseFastGroupsModeChanger } from "./fast_groups_muter.js"; +import type { BaseFastGroupsModeChanger } from "../fast_groups_muter.js"; import { type LGraph as TLGraph, type LGraphCanvas as TLGraphCanvas, diff --git a/web/comfyui/comfy_ui_bar.js b/web/comfyui/comfy_ui_bar.js index 7b65c53..1bcfa76 100644 --- a/web/comfyui/comfy_ui_bar.js +++ b/web/comfyui/comfy_ui_bar.js @@ -4,7 +4,7 @@ import { ComfyButton } from "../../scripts/ui/components/button.js"; import { iconGear, iconStarFilled, logoRgthree } from "../../rgthree/common/media/svgs.js"; import { createElement, empty } from "../../rgthree/common/utils_dom.js"; import { SERVICE as BOOKMARKS_SERVICE } from "./services/bookmarks_services.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; import { ComfyPopup } from "../../scripts/ui/components/popup.js"; import { RgthreeConfigDialog } from "./config.js"; let rgthreeButtonGroup = null; diff --git a/web/comfyui/config.js b/web/comfyui/config.js index b6876e5..fe76719 100644 --- a/web/comfyui/config.js +++ b/web/comfyui/config.js @@ -3,7 +3,7 @@ import { RgthreeDialog } from "../../rgthree/common/dialog.js"; import { createElement as $el, query as $$ } from "../../rgthree/common/utils_dom.js"; import { checkmark, logoRgthree } from "../../rgthree/common/media/svgs.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; var ConfigType; (function (ConfigType) { ConfigType[ConfigType["UNKNOWN"] = 0] = "UNKNOWN"; diff --git a/web/comfyui/fast_groups_muter.js b/web/comfyui/fast_groups_muter.js index 7724480..a000001 100644 --- a/web/comfyui/fast_groups_muter.js +++ b/web/comfyui/fast_groups_muter.js @@ -1,7 +1,7 @@ import { app } from "../../scripts/app.js"; import { RgthreeBaseVirtualNode } from "./base_node.js"; import { NodeTypesString } from "./constants.js"; -import { SERVICE as FAST_GROUPS_SERVICE } from "./fast_groups_service.js"; +import { SERVICE as FAST_GROUPS_SERVICE } from "./services/fast_groups_service.js"; import { drawNodeWidget, fitString } from "./utils_canvas.js"; const PROPERTY_SORT = "sort"; const PROPERTY_SORT_CUSTOM_ALPHA = "customSortAlphabet"; diff --git a/web/comfyui/feature_group_fast_toggle.js b/web/comfyui/feature_group_fast_toggle.js index 5cd358a..aee1fdb 100644 --- a/web/comfyui/feature_group_fast_toggle.js +++ b/web/comfyui/feature_group_fast_toggle.js @@ -1,6 +1,6 @@ import { app } from "../../scripts/app.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; const BTN_SIZE = 20; const BTN_MARGIN = [6, 4]; const BTN_SPACING = 8; diff --git a/web/comfyui/feature_import_individual_nodes.js b/web/comfyui/feature_import_individual_nodes.js index c4c88c5..4e0468e 100644 --- a/web/comfyui/feature_import_individual_nodes.js +++ b/web/comfyui/feature_import_individual_nodes.js @@ -1,6 +1,6 @@ import { tryToGetWorkflowDataFromEvent } from "../../rgthree/common/utils_workflow.js"; import { app } from "../../scripts/app.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; app.registerExtension({ name: "rgthree.ImportIndividualNodes", async beforeRegisterNodeDef(nodeType, nodeData) { diff --git a/web/comfyui/menu_auto_nest.js b/web/comfyui/menu_auto_nest.js index f901f99..e56d44a 100644 --- a/web/comfyui/menu_auto_nest.js +++ b/web/comfyui/menu_auto_nest.js @@ -1,6 +1,6 @@ import { app } from "../../scripts/app.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; const SPECIAL_ENTRIES = [/^(CHOOSE|NONE|DISABLE|OPEN)(\s|$)/i, /^\p{Extended_Pictographic}/gu]; app.registerExtension({ name: "rgthree.ContextMenuAutoNest", diff --git a/web/comfyui/menu_queue_node.js b/web/comfyui/menu_queue_node.js index b0e2359..2eabf4a 100644 --- a/web/comfyui/menu_queue_node.js +++ b/web/comfyui/menu_queue_node.js @@ -1,6 +1,6 @@ import { app } from "../../scripts/app.js"; import { rgthree } from "./rgthree.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; function getOutputNodesFromSelected(canvas) { return ((canvas.selected_nodes && Object.values(canvas.selected_nodes).filter((n) => { diff --git a/web/comfyui/rgthree.js b/web/comfyui/rgthree.js index 149c86f..5420688 100644 --- a/web/comfyui/rgthree.js +++ b/web/comfyui/rgthree.js @@ -1,6 +1,6 @@ import { app } from "../../scripts/app.js"; import { api } from "../../scripts/api.js"; -import { SERVICE as CONFIG_SERVICE } from "./config_service.js"; +import { SERVICE as CONFIG_SERVICE } from "./services/config_service.js"; import { fixBadLinks } from "../../rgthree/common/link_fixer.js"; import { injectCss, wait } from "../../rgthree/common/shared_utils.js"; import { replaceNode, waitForCanvas, waitForGraph } from "./utils.js"; diff --git a/web/comfyui/config_service.js b/web/comfyui/services/config_service.js similarity index 80% rename from web/comfyui/config_service.js rename to web/comfyui/services/config_service.js index e27216f..14f2ee0 100644 --- a/web/comfyui/config_service.js +++ b/web/comfyui/services/config_service.js @@ -1,6 +1,6 @@ -import { rgthreeConfig } from "../../rgthree/config.js"; -import { getObjectValue, setObjectValue } from "../../rgthree/common/shared_utils.js"; -import { rgthreeApi } from "../../rgthree/common/rgthree_api.js"; +import { rgthreeConfig } from "../../../rgthree/config.js"; +import { getObjectValue, setObjectValue } from "../../../rgthree/common/shared_utils.js"; +import { rgthreeApi } from "../../../rgthree/common/rgthree_api.js"; class ConfigService extends EventTarget { getConfigValue(key, def) { return getObjectValue(rgthreeConfig, key, def); diff --git a/web/comfyui/fast_groups_service.js b/web/comfyui/services/fast_groups_service.js similarity index 99% rename from web/comfyui/fast_groups_service.js rename to web/comfyui/services/fast_groups_service.js index 89e64de..acc8eb1 100644 --- a/web/comfyui/fast_groups_service.js +++ b/web/comfyui/services/fast_groups_service.js @@ -1,4 +1,4 @@ -import { app } from "../../scripts/app.js"; +import { app } from "../../../scripts/app.js"; class FastGroupsService { constructor() { this.msThreshold = 400;