From 8e103fb4f4a43abd5141442bea0750601c216f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Thu, 28 Dec 2023 18:32:00 +0300 Subject: [PATCH] d --- Modules/MeetupIdX/src/MeetupId.Generated.swift | 2 +- Utilities/platform/2/generation/pipeBusSource.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Modules/MeetupIdX/src/MeetupId.Generated.swift b/Modules/MeetupIdX/src/MeetupId.Generated.swift index 9fc57e8..9575f1c 100644 --- a/Modules/MeetupIdX/src/MeetupId.Generated.swift +++ b/Modules/MeetupIdX/src/MeetupId.Generated.swift @@ -93,7 +93,7 @@ extension MeetupId { ctrl.pipe( dbg: "join", sub: nil, - Bus.events.compactMap { Bus.convertKeyValue(K.join, $0) }.map { (k: String, v: Void) in v }.map { _ in }.eraseToAnyPublisher(), + Bus.events.compactMap { Bus.convertKeyValue(K.join, $0) }.map { (k: String, v: Bool) in v }.map { _ in }.eraseToAnyPublisher(), { $0.join = true }, { $0.join = false } ) diff --git a/Utilities/platform/2/generation/pipeBusSource.py b/Utilities/platform/2/generation/pipeBusSource.py index 4c13524..af0ac0f 100644 --- a/Utilities/platform/2/generation/pipeBusSource.py +++ b/Utilities/platform/2/generation/pipeBusSource.py @@ -1,10 +1,9 @@ def pipeBusSource(name, entity, busKey, structure, fmtBusPipe, fmtBusPipeToggle): + valueType = structure.model.fields[name][0] + fmt = fmtBusPipe if "toggle" in entity.pipes[name]: - return fmtBusPipeToggle \ - .replace("%BUS_KEY%", busKey) \ - .replace("%BUS_VALUE_TYPE%", "Void") + fmt = fmtBusPipeToggle - valueType = structure.model.fields[name][0] - return fmtBusPipe \ + return fmt \ .replace("%BUS_KEY%", busKey) \ .replace("%BUS_VALUE_TYPE%", valueType)