effect 4.0.0-beta.41 → 4.0.0-beta.42

package/src/TxSubscriptionRef.ts

@@ -92,7 +92,7 @@ const TxSubscriptionRefProto: Omit<TxSubscriptionRef<any>, typeof TypeId | "ref"
  * @since 4.0.0
  * @category constructors
  */
-export const make = <A>(value: A): Effect.Effect<TxSubscriptionRef<A>, never, Effect.Transaction> =>
+export const make = <A>(value: A): Effect.Effect<TxSubscriptionRef<A>> =>
   Effect.gen(function*() {
     const ref = yield* TxRef.make(value)
     const pubsub = yield* TxPubSub.unbounded<A>()
@@ -101,7 +101,7 @@ export const make = <A>(value: A): Effect.Effect<TxSubscriptionRef<A>, never, Ef
     self.ref = ref
     self.pubsub = pubsub
     return self
-  })
+  }).pipe(Effect.tx)
 
 // =============================================================================
 // Getters
@@ -124,7 +124,7 @@ export const make = <A>(value: A): Effect.Effect<TxSubscriptionRef<A>, never, Ef
  * @since 4.0.0
  * @category getters
  */
-export const get = <A>(self: TxSubscriptionRef<A>): Effect.Effect<A, never, Effect.Transaction> => TxRef.get(self.ref)
+export const get = <A>(self: TxSubscriptionRef<A>): Effect.Effect<A> => TxRef.get(self.ref)
 
 // =============================================================================
 // Mutations
@@ -173,7 +173,7 @@ export const modify: {
    * @since 4.0.0
    * @category mutations
    */
-  <A, B>(f: (current: A) => [returnValue: B, newValue: A]): (self: TxSubscriptionRef<A>) => Effect.Effect<B, never, Effect.Transaction>
+  <A, B>(f: (current: A) => [returnValue: B, newValue: A]): (self: TxSubscriptionRef<A>) => Effect.Effect<B>
   // =============================================================================
   // Mutations
   // =============================================================================
@@ -200,20 +200,20 @@ export const modify: {
   <A, B>(
     self: TxSubscriptionRef<A>,
     f: (current: A) => [returnValue: B, newValue: A]
-  ): Effect.Effect<B, never, Effect.Transaction>
+  ): Effect.Effect<B>
 } = dual(
   2,
   <A, B>(
     self: TxSubscriptionRef<A>,
     f: (current: A) => [returnValue: B, newValue: A]
-  ): Effect.Effect<B, never, Effect.Transaction> =>
+  ): Effect.Effect<B> =>
     Effect.gen(function*() {
       const current = yield* TxRef.get(self.ref)
       const [returnValue, newValue] = f(current)
       yield* TxRef.set(self.ref, newValue)
       yield* TxPubSub.publish(self.pubsub, newValue)
       return returnValue
-    })
+    }).pipe(Effect.tx)
 )
 
 /**
@@ -251,7 +251,7 @@ export const set: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(value: A): (self: TxSubscriptionRef<A>) => Effect.Effect<void, never, Effect.Transaction>
+  <A>(value: A): (self: TxSubscriptionRef<A>) => Effect.Effect<void>
   /**
    * Sets the value of the TxSubscriptionRef and publishes the new value to all subscribers.
    *
@@ -269,11 +269,10 @@ export const set: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<void, never, Effect.Transaction>
+  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<void>
 } = dual(
   2,
-  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<void, never, Effect.Transaction> =>
-    modify(self, () => [void 0, value])
+  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<void> => modify(self, () => [void 0, value])
 )
 
 /**
@@ -313,7 +312,7 @@ export const update: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<void, never, Effect.Transaction>
+  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<void>
   /**
    * Updates the value of the TxSubscriptionRef using a function and publishes the new
    * value to all subscribers.
@@ -332,10 +331,10 @@ export const update: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<void, never, Effect.Transaction>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<void>
 } = dual(
   2,
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<void, never, Effect.Transaction> =>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<void> =>
     modify(self, (current) => [void 0, f(current)])
 )
 
@@ -378,7 +377,7 @@ export const getAndSet: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(value: A): (self: TxSubscriptionRef<A>) => Effect.Effect<A, never, Effect.Transaction>
+  <A>(value: A): (self: TxSubscriptionRef<A>) => Effect.Effect<A>
   /**
    * Gets the current value and sets a new value atomically. Publishes the new value
    * to all subscribers.
@@ -398,11 +397,10 @@ export const getAndSet: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<A, never, Effect.Transaction>
+  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<A>
 } = dual(
   2,
-  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<A, never, Effect.Transaction> =>
-    modify(self, (current) => [current, value])
+  <A>(self: TxSubscriptionRef<A>, value: A): Effect.Effect<A> => modify(self, (current) => [current, value])
 )
 
 /**
@@ -444,7 +442,7 @@ export const getAndUpdate: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<A, never, Effect.Transaction>
+  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<A>
   /**
    * Gets the current value and updates it using a function atomically. Publishes
    * the new value to all subscribers.
@@ -464,10 +462,10 @@ export const getAndUpdate: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A, never, Effect.Transaction>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A>
 } = dual(
   2,
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A, never, Effect.Transaction> =>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A> =>
     modify(self, (current) => [current, f(current)])
 )
 
@@ -508,7 +506,7 @@ export const updateAndGet: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<A, never, Effect.Transaction>
+  <A>(f: (current: A) => A): (self: TxSubscriptionRef<A>) => Effect.Effect<A>
   /**
    * Updates the value using a function and returns the new value. Publishes the
    * new value to all subscribers.
@@ -527,10 +525,10 @@ export const updateAndGet: {
    * @since 4.0.0
    * @category mutations
    */
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A, never, Effect.Transaction>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A>
 } = dual(
   2,
-  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A, never, Effect.Transaction> =>
+  <A>(self: TxSubscriptionRef<A>, f: (current: A) => A): Effect.Effect<A> =>
     modify(self, (current) => {
       const newValue = f(current)
       return [newValue, newValue]
@@ -573,7 +571,7 @@ export const changes = <A>(
   self: TxSubscriptionRef<A>
 ): Effect.Effect<TxQueue.TxQueue<A>, never, Scope.Scope> =>
   Effect.acquireRelease(
-    Effect.transaction(
+    Effect.tx(
       Effect.gen(function*() {
         const sub = yield* TxPubSub.acquireSubscriber(self.pubsub)
         const current = yield* TxRef.get(self.ref)
@@ -581,7 +579,7 @@ export const changes = <A>(
         return sub
       })
     ),
-    (queue) => Effect.transaction(TxPubSub.releaseSubscriber(self.pubsub, queue))
+    (queue) => Effect.tx(TxPubSub.releaseSubscriber(self.pubsub, queue))
   )
 
 /**
@@ -611,7 +609,7 @@ export const changesStream = <A>(self: TxSubscriptionRef<A>): Stream.Stream<A, n
   Stream.unwrap(
     Effect.map(
       changes(self),
-      (sub) => Stream.fromEffectRepeat(Effect.transaction(TxQueue.take(sub)))
+      (sub) => Stream.fromEffectRepeat(Effect.tx(TxQueue.take(sub)))
     )
   )
 

package/src/index.ts

@@ -4039,7 +4039,7 @@ export * as Tuple from "./Tuple.ts"
  *
  * Accessed values are tracked by the transaction in order to detect conflicts and to track changes.
  * A transaction will retry whenever a conflict is detected or whenever the transaction explicitly
- * calls `Effect.retryTransaction` and any of the accessed TxChunk values change.
+ * calls `Effect.txRetry` and any of the accessed TxChunk values change.
  *
  * @since 4.0.0
  */
@@ -4089,7 +4089,7 @@ export * as TxPubSub from "./TxPubSub.ts"
  *
  * Accessed values are tracked by the transaction in order to detect conflicts and to track changes.
  * A transaction will retry whenever a conflict is detected or whenever the transaction explicitly
- * calls `Effect.retryTransaction` and any of the accessed TxQueue values change.
+ * calls `Effect.txRetry` and any of the accessed TxQueue values change.
  *
  * @since 4.0.0
  */
@@ -4110,7 +4110,7 @@ export * as TxReentrantLock from "./TxReentrantLock.ts"
  *
  * Accessed values are tracked by the transaction in order to detect conflicts and in order to
  * track changes, a transaction will retry whenever a conflict is detected or whenever the
- * transaction explicitely calls to `Effect.retryTransaction` and any of the accessed TxRef values
+ * transaction explicitely calls to `Effect.txRetry` and any of the accessed TxRef values
  * change.
  *
  * @since 4.0.0

package/src/unstable/ai/OpenAiStructuredOutput.ts

@@ -82,6 +82,9 @@ function rewriteOpenAI(schema: JsonSchema.JsonSchema): JsonSchema.JsonSchema {
       out[k] = v
     }
   }
+  if (out.type === "object" && out.properties === undefined && out.additionalProperties === false) {
+    out.properties = {}
+  }
   return out
 }
 

package/src/unstable/cli/internal/command.ts

@@ -8,6 +8,7 @@
 import * as Arr from "../../../Array.ts"
 import * as Effect from "../../../Effect.ts"
 import { YieldableProto } from "../../../internal/core.ts"
+import * as Option from "../../../Option.ts"
 import { pipeArguments } from "../../../Pipeable.ts"
 import * as Predicate from "../../../Predicate.ts"
 import * as ServiceMap from "../../../ServiceMap.ts"
@@ -228,11 +229,25 @@ export const toFlagDoc = (single: Param.Single<typeof Param.flagKind, unknown>):
     name: single.name,
     aliases: formattedAliases,
     type: single.typeName ?? Primitive.getTypeName(single.primitiveType),
-    description: single.description,
+    description: appendChoiceKeys(single.description, Primitive.getChoiceKeys(single.primitiveType)),
     required: single.primitiveType._tag !== "Boolean"
   }
 }
 
+const appendChoiceKeys = (
+  description: Option.Option<string>,
+  choiceKeys: ReadonlyArray<string> | undefined
+): Option.Option<string> => {
+  if (choiceKeys === undefined || choiceKeys.length === 0) {
+    return description
+  }
+  const choiceSuffix = `(choices: ${choiceKeys.join(", ")})`
+  return Option.match(description, {
+    onNone: () => Option.some(choiceSuffix),
+    onSome: (value) => Option.some(`${value} ${choiceSuffix}`)
+  })
+}
+
 /**
  * Creates a parser for a given config. Used as the default for both `parse`
  * and `parseContext`, and also by `withSharedFlags` to avoid constructing a

package/src/unstable/cluster/SqlMessageStorage.ts

@@ -596,10 +596,6 @@ export const make: (options?: {
 
     withTransaction: (effect) =>
       sql.withTransaction(effect).pipe(
-        Effect.retry({
-          while: (e) => isSqlError(e) && e.isRetryable,
-          times: 5
-        }),
         Effect.catchIf(isSqlError, Effect.die)
       )
   })

package/src/unstable/socket/Socket.ts

@@ -392,7 +392,7 @@ export const makeChannel = <IE = never>(): Channel.Channel<
 /**
  * @since 4.0.0
  */
-export const defaultCloseCodeIsError = (code: number) => code !== 1000 && code !== 1006
+export const defaultCloseCodeIsError = (_code: number) => true
 
 /**
  * @since 4.0.0