Михаил Капелько 10 months ago
parent
commit
514e06e8fe
6 changed files with 22 additions and 14 deletions
  1. +2
    -2
      Modules/BusX/src/Bus.Processor.swift
  2. +2
    -2
      Modules/MeetupIdX/src/MeetupId.Generated.swift
  3. +6
    -5
      Modules/MeetupIdX/src/MeetupId.K.swift
  4. +7
    -0
      Modules/MeetupIdX/src/MeetupId.Shoulds.swift
  5. +4
    -4
      Modules/MeetupIdX/src/MeetupId.V.swift
  6. +1
    -1
      Utilities/platform/2/generation/pipeSource.py

+ 2
- 2
Modules/BusX/src/Bus.Processor.swift View File

@@ -5,18 +5,18 @@ public extension Bus {
var subscriptions = [AnyCancellable]()

public init(
_ handler: @escaping ((Src) -> Dst?),
_ keyIn: String,
_ keyOut: String,
_ handler: @escaping ((Src) -> Dst?),
opt: [Option] = []
) {
Bus.process([keyIn], keyOut, handler, opt: opt, sub: &subscriptions)
}

public init(
_ handler: @escaping ((Src) -> Dst?),
_ keysIn: Set<String>,
_ keyOut: String,
_ handler: @escaping ((Src) -> Dst?),
opt: [Option] = []
) {
Bus.process(keysIn, keyOut, handler, opt: opt, sub: &subscriptions)


+ 2
- 2
Modules/MeetupIdX/src/MeetupId.Generated.swift View File

@@ -90,7 +90,7 @@ extension MeetupId {
ctrl.pipeValue(
dbg: "textA",
sub: nil,
Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextApp.rawValue, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(),
Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextApp, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(),
{
$0.textApp.value = $1
$0.textApp.isRecent = true
@@ -103,7 +103,7 @@ extension MeetupId {
ctrl.pipeValue(
dbg: "textUI",
sub: nil,
Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextUI.rawValue, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(),
Bus.events.compactMap { Bus.convertKeyValue(K.meetupIdTextUI, $0) }.map { (k: String, v: String) in v }.eraseToAnyPublisher().eraseToAnyPublisher(),
{
$0.textUI.value = $1
$0.textUI.isRecent = true


+ 6
- 5
Modules/MeetupIdX/src/MeetupId.K.swift View File

@@ -1,9 +1,10 @@
public extension MeetupId {
enum K: String {
case meetupIdIsJoinAvailable
case meetupIdJoin
case meetupIdTextApp
case meetupIdTextUI
enum K {
static let isJoinAvailable = "MeetupId.isJoinAvailable"
static let join = "MeetupId.join"
static let M = "MeetupId"
static let textApp = "MeetupId.textApp"
static let textUI = "MeetupId.textUI"
}
}


+ 7
- 0
Modules/MeetupIdX/src/MeetupId.Shoulds.swift View File

@@ -0,0 +1,7 @@
import Foundation

public extension MeetupId {
static func shouldEnableJoin(_ c: MeetupIdContext) -> Bool? {
return nil
}
}

+ 4
- 4
Modules/MeetupIdX/src/MeetupId.V.swift View File

@@ -4,10 +4,10 @@ import SwiftUI

extension MeetupId {
public struct V: View {
@StateObject var isJA = Cord.Receive(K.meetupIdIsJoinAvailable.rawValue, false)
@StateObject var join = Cord.Button(K.meetupIdJoin.rawValue)
@StateObject var txtF = Cord.TextField(K.meetupIdTextApp.rawValue, K.meetupIdTextUI.rawValue)
let test = Bus.Processor(K.meetupIdTextUI.rawValue, K.meetupIdIsJoinAvailable.rawValue, onlyAllowJoin)
@StateObject var isJA = Cord.Receive(K.isJoinAvailable, false)
@StateObject var join = Cord.Button(K.join)
@StateObject var txtF = Cord.TextField(K.textApp, K.textUI)
let joinA = Bus.Processor(shouldEnableJoin, K.M, K.isJoinAvailable)
public init() { }


+ 1
- 1
Utilities/platform/2/generation/pipeSource.py View File

@@ -18,7 +18,7 @@ def pipeSource(name, entity, structure):
elif src.startswith("K."):
busKey = src
busValueType = structure.model.fields[name][0]
src = "Bus.events.compactMap { Bus.convertKeyValue(" + busKey + ".rawValue, $0) }.map { (k: String, v: " + busValueType + ") in v }.eraseToAnyPublisher()"
src = "Bus.events.compactMap { Bus.convertKeyValue(" + busKey + ", $0) }.map { (k: String, v: " + busValueType + ") in v }.eraseToAnyPublisher()"
# Значение по умолчанию.
elif src == default:
return default + "." + name


Loading…
Cancel
Save