From 8de27b21e028aecb5624c7f22b9fc5fa7613d9b1 Mon Sep 17 00:00:00 2001
From: Tim <hello@timsmart.co>
Date: Thu, 19 Dec 2024 10:39:29 +1300
Subject: [PATCH] rebase fixes

---
 packages/cli/src/internal/prompt/multi-select.ts |  2 +-
 packages/effect/src/internal/config.ts           | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/internal/prompt/multi-select.ts b/packages/cli/src/internal/prompt/multi-select.ts
index 0788f63bedf..99dbcf1b0c4 100644
--- a/packages/cli/src/internal/prompt/multi-select.ts
+++ b/packages/cli/src/internal/prompt/multi-select.ts
@@ -294,7 +294,7 @@ function handleProcess<A>(options: SelectOptions<A> & MultiSelectOptions) {
 
 function handleRender<A>(options: SelectOptions<A>) {
   return (state: State, action: Prompt.Prompt.Action<State, Array<A>>) => {
-    return Action.$match(action, {
+    return Action.match(action, {
       Beep: () => Effect.succeed(renderBeep),
       NextFrame: ({ state }) => renderNextFrame(state, options),
       Submit: () => renderSubmission(state, options)
diff --git a/packages/effect/src/internal/config.ts b/packages/effect/src/internal/config.ts
index 416b1c9fa2c..c8e12dede70 100644
--- a/packages/effect/src/internal/config.ts
+++ b/packages/effect/src/internal/config.ts
@@ -426,12 +426,11 @@ export const repeat = <A>(self: Config.Config<A>): Config.Config<Array<A>> => {
 }
 
 /** @internal */
-export const redacted = (name?: string): Config.Config<Redacted.Redacted> => {
-  const config = primitive(
-    "a redacted property",
-    (text) => Either.right(redacted_.make(text))
-  )
-  return name === undefined ? config : nested(config, name)
+export const redacted = <A>(
+  nameOrConfig?: string | Config.Config<A>
+): Config.Config<Redacted.Redacted<A | string>> => {
+  const config: Config.Config<A | string> = isConfig(nameOrConfig) ? nameOrConfig : string(nameOrConfig)
+  return map(config, redacted_.make)
 }
 
 /** @internal */