From 836adabe08299a3be96e05a9b2a02c37f2b98d81 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 14:38:59 +0300 Subject: [PATCH] d --- Modules/MeetupIdX/src/MeetupId.Generated.swift | 10 ++-------- Utilities/platform/2/generation/pipeSource.py | 4 ++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Modules/MeetupIdX/src/MeetupId.Generated.swift b/Modules/MeetupIdX/src/MeetupId.Generated.swift index 9663480..67d017e 100644 --- a/Modules/MeetupIdX/src/MeetupId.Generated.swift +++ b/Modules/MeetupIdX/src/MeetupId.Generated.swift @@ -87,10 +87,7 @@ extension MeetupId { ctrl.pipeValue( dbg: "textA", sub: nil, - Bus.events - .compactMap { Bus.convertKeyValue(K.meetupIdTextApp.rawValue, $0) } - .map { (k: String, v: String) -> String in v } - .eraseToAnyPublisher(), + Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextApp.rawValue, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(), { $0.textApp.value = $1 $0.textApp.isRecent = true @@ -103,10 +100,7 @@ extension MeetupId { ctrl.pipeValue( dbg: "textUI", sub: nil, - Bus.events - .compactMap { Bus.convertKeyValue(K.meetupIdTextUI.rawValue, $0) } - .map { (k: String, v: String) -> String in v } - .eraseToAnyPublisher(), + Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextUI.rawValue, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(), { $0.textUI.value = $1 $0.textUI.isRecent = true diff --git a/Utilities/platform/2/generation/pipeSource.py b/Utilities/platform/2/generation/pipeSource.py index 33374a1..a8efed3 100644 --- a/Utilities/platform/2/generation/pipeSource.py +++ b/Utilities/platform/2/generation/pipeSource.py @@ -14,6 +14,10 @@ def pipeSource(name, entity): # Прямое обращение к VM. if src.startswith("vm."): src = "core." + src + # Обращение к константе шины. + elif src.startswith("K."): + key = src + src = "Bus.events.compactMap { Bus.convertKeyValue(" + key + ".rawValue, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher()" # Значение по умолчанию. elif src == default: return default + "." + name