From 00a9a259972bc21b0ec7b3971283fbac1fce3c7b 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: Mon, 8 Jan 2024 17:56:57 +0300 Subject: [PATCH] d --- Modules/MeetupIdX/src/MeetupId.Generated.swift | 2 +- Utilities/platform/2/generation/isNotKeyword.py | 1 + Utilities/platform/2/generation/pipeBusSource.py | 4 +--- Utilities/platform/2/generation/sectionGeneratedPipes.py | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/MeetupIdX/src/MeetupId.Generated.swift b/Modules/MeetupIdX/src/MeetupId.Generated.swift index 7b70f28..4fa7f03 100644 --- a/Modules/MeetupIdX/src/MeetupId.Generated.swift +++ b/Modules/MeetupIdX/src/MeetupId.Generated.swift @@ -148,7 +148,7 @@ extension MeetupId { ctrl.pipeValue( dbg: "testTUI", sub: nil, - many.eraseToAnyPublisher(), + Bus.events.compactMap { Bus.convertKeyValue(K.testTextUI, $0) }.map { (k: String, v: MPAK.Many) in v }.eraseToAnyPublisher(), { $0.testTextUI = $1 }, diff --git a/Utilities/platform/2/generation/isNotKeyword.py b/Utilities/platform/2/generation/isNotKeyword.py index 5812858..32d8ee0 100644 --- a/Utilities/platform/2/generation/isNotKeyword.py +++ b/Utilities/platform/2/generation/isNotKeyword.py @@ -1,6 +1,7 @@ def isNotKeyword(str): keywords = [ "ex", + "many", "recent", "set", "toggle", diff --git a/Utilities/platform/2/generation/pipeBusSource.py b/Utilities/platform/2/generation/pipeBusSource.py index d5358a6..ed9484f 100644 --- a/Utilities/platform/2/generation/pipeBusSource.py +++ b/Utilities/platform/2/generation/pipeBusSource.py @@ -4,9 +4,7 @@ def pipeBusSource(name, entity, busKey, structure, fmt): valueType = structure.model.fields[name][0] print(f"pipeBS-1 name: '{name}'") if isPipeMany(name, entity): - itemType = structure.model.fields[key][0] - valueType = f"MPAK.Many<{itemType}>" - print(f"pipeBS-2 name: '{name}'") + valueType = f"MPAK.Many<{valueType}>" return fmt \ .replace("%BUS_KEY%", busKey) \ diff --git a/Utilities/platform/2/generation/sectionGeneratedPipes.py b/Utilities/platform/2/generation/sectionGeneratedPipes.py index c1c1c20..ec9c031 100644 --- a/Utilities/platform/2/generation/sectionGeneratedPipes.py +++ b/Utilities/platform/2/generation/sectionGeneratedPipes.py @@ -15,6 +15,7 @@ def sectionGeneratedPipes(entity, sub, c): for key in entity.pipes: values = entity.pipes[key] + print(f"sectionGP-1 key/values: '{key}'/'{values}'") # EX_NAME. firstLetter = key[:1].capitalize() @@ -30,8 +31,10 @@ def sectionGeneratedPipes(entity, sub, c): # SRC. src = pipeSource(key, entity) + print(f"sectionGP-2 key/src: '{key}'/'{src}'") # Bus. if src.startswith("K."): + print(f"sectionGP-3 key: '{key}' bus") src = pipeBusSource(key, entity, src, c.structure, fmtBusPipe) fmtPipe = pipeFormat(fmtExRecent, fmtMany, fmtRecent, fmtSet, fmtToggle, fmtToggleNil, key, entity)