effect 4.0.0-beta.6 → 4.0.0-beta.60

package/dist/TxRef.js

@@ -3,7 +3,7 @@
  *
  * 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
@@ -27,7 +27,7 @@ const TypeId = "~effect/transactions/TxRef";
  *   const name = yield* TxRef.make("Alice")
  *
  *   // Use in transactions
- *   yield* Effect.atomic(Effect.gen(function*() {
+ *   yield* Effect.tx(Effect.gen(function*() {
  *     yield* TxRef.set(counter, 42)
  *     yield* TxRef.set(name, "Bob")
  *   }))
@@ -78,16 +78,14 @@ export const makeUnsafe = initial => ({
  *   const counter = yield* TxRef.make(0)
  *
  *   // Modify and return both old and new value
- *   const result = yield* Effect.atomic(
- *     TxRef.modify(counter, (current) => [current * 2, current + 1])
- *   )
+ *   const result = yield* TxRef.modify(counter, (current) => [current * 2, current + 1])
  *
  *   console.log(result) // 0 (the return value: current * 2)
  *   console.log(yield* TxRef.get(counter)) // 1 (the new value: current + 1)
  * })
  * ```
  */
-export const modify = /*#__PURE__*/dual(2, (self, f) => Effect.atomicWith(state => Effect.sync(() => {
+export const modify = /*#__PURE__*/dual(2, (self, f) => Effect.Transaction.asEffect().pipe(Effect.flatMap(state => Effect.sync(() => {
   if (!state.journal.has(self)) {
     state.journal.set(self, {
       version: self.version,
@@ -98,7 +96,7 @@ export const modify = /*#__PURE__*/dual(2, (self, f) => Effect.atomicWith(state
   const [returnValue, next] = f(current.value);
   current.value = next;
   return returnValue;
-})));
+})), Effect.tx));
 /**
  * Updates the value of the `TxRef` using the provided function.
  *
@@ -112,7 +110,7 @@ export const modify = /*#__PURE__*/dual(2, (self, f) => Effect.atomicWith(state
  *   const counter = yield* TxRef.make(10)
  *
  *   // Update the value using a function
- *   yield* Effect.atomic(
+ *   yield* Effect.tx(
  *     TxRef.update(counter, (current) => current * 2)
  *   )
  *
@@ -134,7 +132,7 @@ export const update = /*#__PURE__*/dual(2, (self, f) => modify(self, current =>
  *   const counter = yield* TxRef.make(42)
  *
  *   // Read the value within a transaction
- *   const value = yield* Effect.atomic(
+ *   const value = yield* Effect.tx(
  *     TxRef.get(counter)
  *   )
  *
@@ -156,7 +154,7 @@ export const get = self => modify(self, current => [current, current]);
  *   const counter = yield* TxRef.make(0)
  *
  *   // Set a new value within a transaction
- *   yield* Effect.atomic(
+ *   yield* Effect.tx(
  *     TxRef.set(counter, 100)
  *   )
  *

package/dist/TxRef.js.map

@@ -1 +1 @@
-{"version":3,"file":"TxRef.js","names":["Effect","dual","pipeArguments","TypeId","make","initial","sync","makeUnsafe","pending","Map","pipe","arguments","version","value","modify","self","f","atomicWith","state","journal","has","set","current","get","returnValue","next","update"],"sources":["../src/TxRef.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;AAUA,OAAO,KAAKA,MAAM,MAAM,aAAa;AACrC,SAASC,IAAI,QAAQ,eAAe;AACpC,SAASC,aAAa,QAAQ,eAAe;AAI7C,MAAMC,MAAM,GAAG,4BAA4B;AAuC3C;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,OAAO,MAAMC,IAAI,GAAOC,OAAU,IAAKL,MAAM,CAACM,IAAI,CAAC,MAAMC,UAAU,CAACF,OAAO,CAAC,CAAC;AAE7E;;;;;;;;;;;;;;;;;;AAkBA,OAAO,MAAME,UAAU,GAAOF,OAAU,KAAgB;EACtD,CAACF,MAAM,GAAGA,MAAM;EAChBK,OAAO,EAAE,IAAIC,GAAG,EAAE;EAClBC,IAAIA,CAAA;IACF,OAAOR,aAAa,CAAC,IAAI,EAAES,SAAS,CAAC;EACvC,CAAC;EACDC,OAAO,EAAE,CAAC;EACVC,KAAK,EAAER;CACR,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;AAsBA,OAAO,MAAMS,MAAM,gBA+Cfb,IAAI,CACN,CAAC,EACD,CAAOc,IAAc,EAAEC,CAAgD,KACrEhB,MAAM,CAACiB,UAAU,CAAEC,KAAK,IACtBlB,MAAM,CAACM,IAAI,CAAC,MAAK;EACf,IAAI,CAACY,KAAK,CAACC,OAAO,CAACC,GAAG,CAACL,IAAI,CAAC,EAAE;IAC5BG,KAAK,CAACC,OAAO,CAACE,GAAG,CAACN,IAAI,EAAE;MAAEH,OAAO,EAAEG,IAAI,CAACH,OAAO;MAAEC,KAAK,EAAEE,IAAI,CAACF;IAAK,CAAE,CAAC;EACvE;EACA,MAAMS,OAAO,GAAGJ,KAAK,CAACC,OAAO,CAACI,GAAG,CAACR,IAAI,CAAE;EACxC,MAAM,CAACS,WAAW,EAAEC,IAAI,CAAC,GAAGT,CAAC,CAACM,OAAO,CAACT,KAAK,CAAC;EAC5CS,OAAO,CAACT,KAAK,GAAGY,IAAI;EACpB,OAAOD,WAAW;AACpB,CAAC,CAAC,CACH,CACJ;AAED;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAME,MAAM,gBA6CfzB,IAAI,CACN,CAAC,EACD,CAAIc,IAAc,EAAEC,CAAoB,KAA0BF,MAAM,CAACC,IAAI,EAAGO,OAAO,IAAK,CAAC,KAAK,CAAC,EAAEN,CAAC,CAACM,OAAO,CAAC,CAAC,CAAC,CAClH;AAED;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAMC,GAAG,GAAOR,IAAc,IAAuBD,MAAM,CAACC,IAAI,EAAGO,OAAO,IAAK,CAACA,OAAO,EAAEA,OAAO,CAAC,CAAC;AAEzG;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAMD,GAAG,gBA6CZpB,IAAI,CAAC,CAAC,EAAE,CAAIc,IAAc,EAAEF,KAAQ,KAA0Ba,MAAM,CAACX,IAAI,EAAE,MAAMF,KAAK,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"TxRef.js","names":["Effect","dual","pipeArguments","TypeId","make","initial","sync","makeUnsafe","pending","Map","pipe","arguments","version","value","modify","self","f","Transaction","asEffect","flatMap","state","journal","has","set","current","get","returnValue","next","tx","update"],"sources":["../src/TxRef.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;AAUA,OAAO,KAAKA,MAAM,MAAM,aAAa;AACrC,SAASC,IAAI,QAAQ,eAAe;AACpC,SAASC,aAAa,QAAQ,eAAe;AAI7C,MAAMC,MAAM,GAAG,4BAA4B;AAuC3C;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,OAAO,MAAMC,IAAI,GAAOC,OAAU,IAAKL,MAAM,CAACM,IAAI,CAAC,MAAMC,UAAU,CAACF,OAAO,CAAC,CAAC;AAE7E;;;;;;;;;;;;;;;;;;AAkBA,OAAO,MAAME,UAAU,GAAOF,OAAU,KAAgB;EACtD,CAACF,MAAM,GAAGA,MAAM;EAChBK,OAAO,EAAE,IAAIC,GAAG,EAAE;EAClBC,IAAIA,CAAA;IACF,OAAOR,aAAa,CAAC,IAAI,EAAES,SAAS,CAAC;EACvC,CAAC;EACDC,OAAO,EAAE,CAAC;EACVC,KAAK,EAAER;CACR,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;AAoBA,OAAO,MAAMS,MAAM,gBA2Cfb,IAAI,CAAC,CAAC,EAAE,CACVc,IAAc,EACdC,CAAgD,KAEhDhB,MAAM,CAACiB,WAAW,CAACC,QAAQ,EAAE,CAACR,IAAI,CAChCV,MAAM,CAACmB,OAAO,CAAEC,KAAK,IACnBpB,MAAM,CAACM,IAAI,CAAC,MAAK;EACf,IAAI,CAACc,KAAK,CAACC,OAAO,CAACC,GAAG,CAACP,IAAI,CAAC,EAAE;IAC5BK,KAAK,CAACC,OAAO,CAACE,GAAG,CAACR,IAAI,EAAE;MAAEH,OAAO,EAAEG,IAAI,CAACH,OAAO;MAAEC,KAAK,EAAEE,IAAI,CAACF;IAAK,CAAE,CAAC;EACvE;EACA,MAAMW,OAAO,GAAGJ,KAAK,CAACC,OAAO,CAACI,GAAG,CAACV,IAAI,CAAE;EACxC,MAAM,CAACW,WAAW,EAAEC,IAAI,CAAC,GAAGX,CAAC,CAACQ,OAAO,CAACX,KAAK,CAAC;EAC5CW,OAAO,CAACX,KAAK,GAAGc,IAAI;EACpB,OAAOD,WAAW;AACpB,CAAC,CAAC,CACH,EACD1B,MAAM,CAAC4B,EAAE,CACV,CAAC;AAEJ;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAMC,MAAM,gBA6Cf5B,IAAI,CAAC,CAAC,EAAE,CACVc,IAAc,EACdC,CAAoB,KACIF,MAAM,CAACC,IAAI,EAAGS,OAAO,IAAK,CAAC,KAAK,CAAC,EAAER,CAAC,CAACQ,OAAO,CAAC,CAAC,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAMC,GAAG,GAAOV,IAAc,IAAuBD,MAAM,CAACC,IAAI,EAAGS,OAAO,IAAK,CAACA,OAAO,EAAEA,OAAO,CAAC,CAAC;AAEzG;;;;;;;;;;;;;;;;;;;;;AAqBA,OAAO,MAAMD,GAAG,gBA6CZtB,IAAI,CAAC,CAAC,EAAE,CACVc,IAAc,EACdF,KAAQ,KACgBgB,MAAM,CAACd,IAAI,EAAE,MAAMF,KAAK,CAAC,CAAC","ignoreList":[]}

package/dist/TxSemaphore.d.ts

@@ -343,7 +343,86 @@ export declare const releaseN: (self: TxSemaphore, n: number) => Effect.Effect<v
  * @since 4.0.0
  * @category combinators
  */
-export declare const withPermit: <A, E, R>(self: TxSemaphore, effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+export declare const withPermit: {
+    /**
+     * Executes an effect with a single permit from the semaphore. The permit is
+     * automatically acquired before execution and released afterwards, even if the
+     * effect fails or is interrupted.
+     *
+     * **Note**: The permit acquisition and release operations use atomic semantics
+     * to ensure proper resource management with Effect's scoped operations.
+     *
+     * @example
+     * ```ts
+     * import { Console, Effect, TxSemaphore } from "effect"
+     *
+     * const program = Effect.gen(function*() {
+     *   const semaphore = yield* TxSemaphore.make(2)
+     *
+     *   // Execute database operation with automatic permit management
+     *   const result = yield* TxSemaphore.withPermit(
+     *     semaphore,
+     *     Effect.gen(function*() {
+     *       yield* Console.log("Permit acquired, accessing database...")
+     *       yield* Effect.sleep("100 millis") // Simulate database work
+     *       yield* Console.log("Database operation complete")
+     *       return "query result"
+     *     })
+     *   )
+     *
+     *   yield* Console.log(`Result: ${result}`)
+     *   // Permit is automatically released here
+     * })
+     * ```
+     *
+     * @param self - The TxSemaphore to acquire a permit from
+     * @param effect - The effect to execute with the permit
+     * @returns Effect that succeeds with the result of the provided effect
+     *
+     * @since 4.0.0
+     * @category combinators
+     */
+    (self: TxSemaphore): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+    /**
+     * Executes an effect with a single permit from the semaphore. The permit is
+     * automatically acquired before execution and released afterwards, even if the
+     * effect fails or is interrupted.
+     *
+     * **Note**: The permit acquisition and release operations use atomic semantics
+     * to ensure proper resource management with Effect's scoped operations.
+     *
+     * @example
+     * ```ts
+     * import { Console, Effect, TxSemaphore } from "effect"
+     *
+     * const program = Effect.gen(function*() {
+     *   const semaphore = yield* TxSemaphore.make(2)
+     *
+     *   // Execute database operation with automatic permit management
+     *   const result = yield* TxSemaphore.withPermit(
+     *     semaphore,
+     *     Effect.gen(function*() {
+     *       yield* Console.log("Permit acquired, accessing database...")
+     *       yield* Effect.sleep("100 millis") // Simulate database work
+     *       yield* Console.log("Database operation complete")
+     *       return "query result"
+     *     })
+     *   )
+     *
+     *   yield* Console.log(`Result: ${result}`)
+     *   // Permit is automatically released here
+     * })
+     * ```
+     *
+     * @param self - The TxSemaphore to acquire a permit from
+     * @param effect - The effect to execute with the permit
+     * @returns Effect that succeeds with the result of the provided effect
+     *
+     * @since 4.0.0
+     * @category combinators
+     */
+    <A, E, R>(self: TxSemaphore, effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R>;
+};
 /**
  * Executes an effect with the specified number of permits from the semaphore.
  * The permits are automatically acquired before execution and released afterwards,
@@ -383,7 +462,88 @@ export declare const withPermit: <A, E, R>(self: TxSemaphore, effect: Effect.Eff
  * @since 4.0.0
  * @category combinators
  */
-export declare const withPermits: <A, E, R>(self: TxSemaphore, n: number, effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+export declare const withPermits: {
+    /**
+     * Executes an effect with the specified number of permits from the semaphore.
+     * The permits are automatically acquired before execution and released afterwards,
+     * even if the effect fails or is interrupted.
+     *
+     * **Note**: The permit acquisition and release operations use atomic semantics
+     * to ensure proper resource management with Effect's scoped operations.
+     *
+     * @example
+     * ```ts
+     * import { Console, Effect, TxSemaphore } from "effect"
+     *
+     * const program = Effect.gen(function*() {
+     *   const semaphore = yield* TxSemaphore.make(5)
+     *
+     *   // Execute batch operation with 3 permits
+     *   const results = yield* TxSemaphore.withPermits(
+     *     semaphore,
+     *     3,
+     *     Effect.gen(function*() {
+     *       yield* Console.log("3 permits acquired, processing batch...")
+     *       yield* Effect.sleep("200 millis") // Simulate batch processing
+     *       return ["result1", "result2", "result3"]
+     *     })
+     *   )
+     *
+     *   yield* Console.log(`Batch results: ${results.join(", ")}`)
+     *   // All 3 permits are automatically released here
+     * })
+     * ```
+     *
+     * @param self - The TxSemaphore to acquire permits from
+     * @param n - The number of permits to acquire (must be positive)
+     * @param effect - The effect to execute with the permits
+     * @returns Effect that succeeds with the result of the provided effect
+     *
+     * @since 4.0.0
+     * @category combinators
+     */
+    (self: TxSemaphore, n: number): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+    /**
+     * Executes an effect with the specified number of permits from the semaphore.
+     * The permits are automatically acquired before execution and released afterwards,
+     * even if the effect fails or is interrupted.
+     *
+     * **Note**: The permit acquisition and release operations use atomic semantics
+     * to ensure proper resource management with Effect's scoped operations.
+     *
+     * @example
+     * ```ts
+     * import { Console, Effect, TxSemaphore } from "effect"
+     *
+     * const program = Effect.gen(function*() {
+     *   const semaphore = yield* TxSemaphore.make(5)
+     *
+     *   // Execute batch operation with 3 permits
+     *   const results = yield* TxSemaphore.withPermits(
+     *     semaphore,
+     *     3,
+     *     Effect.gen(function*() {
+     *       yield* Console.log("3 permits acquired, processing batch...")
+     *       yield* Effect.sleep("200 millis") // Simulate batch processing
+     *       return ["result1", "result2", "result3"]
+     *     })
+     *   )
+     *
+     *   yield* Console.log(`Batch results: ${results.join(", ")}`)
+     *   // All 3 permits are automatically released here
+     * })
+     * ```
+     *
+     * @param self - The TxSemaphore to acquire permits from
+     * @param n - The number of permits to acquire (must be positive)
+     * @param effect - The effect to execute with the permits
+     * @returns Effect that succeeds with the result of the provided effect
+     *
+     * @since 4.0.0
+     * @category combinators
+     */
+    <A, E, R>(self: TxSemaphore, n: number, effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R>;
+};
 /**
  * Acquires a single permit from the semaphore in a scoped manner. The permit
  * will be automatically released when the scope is closed, even if effects

package/dist/TxSemaphore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TxSemaphore.d.ts","sourceRoot":"","sources":["../src/TxSemaphore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TxSemaphore.d.ts","sourceRoot":"","sources":["../src/TxSemaphore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAG7C,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,QAAA,MAAM,MAAM,qCAAqC,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,WAAW,WAAY,SAAQ,WAAW,EAAE,QAAQ;IACxD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAC1B;AAyBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,IAAI,GAAI,SAAS,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAQ5C,CAAA;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAA+B,CAAA;AAEjG;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAkC,CAAA;AAEnG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAO1C,CAAA;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,WAAW,EAAE,GAAG,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAWzE,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAMhE,CAAA;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,WAAW,EAAE,GAAG,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAU/E,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CACwC,CAAA;AAEtG;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,eAAO,MAAM,QAAQ,GAAI,MAAM,WAAW,EAAE,GAAG,MAAM,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAQzE,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACH,CAAC,IAAI,EAAE,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACxF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAiB7E,CAAA;AAET;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,WAAW,EAAE;IACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACH,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACnG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACH,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAiBxF,CAAA;AAET;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,WAAW,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAIxF,CAAA;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,aAAa,GAAI,GAAG,OAAO,KAAG,CAAC,IAAI,WAAqC,CAAA"}

package/dist/TxSemaphore.js

@@ -4,6 +4,7 @@
 import * as Effect from "./Effect.js";
 import { NodeInspectSymbol, toJson } from "./Inspectable.js";
 import { pipeArguments } from "./Pipeable.js";
+import { hasProperty } from "./Predicate.js";
 import * as TxRef from "./TxRef.js";
 const TypeId = "~effect/transactions/TxSemaphore";
 const TxSemaphoreProto = {
@@ -63,7 +64,7 @@ export const make = permits => Effect.gen(function* () {
   }
   const permitsRef = yield* TxRef.make(permits);
   return makeTxSemaphore(permitsRef, permits);
-});
+}).pipe(Effect.tx);
 /**
  * Gets the current number of available permits in the semaphore.
  *
@@ -152,13 +153,13 @@ export const capacity = self => Effect.succeed(self.capacity);
  * @since 4.0.0
  * @category combinators
  */
-export const acquire = self => Effect.atomic(Effect.gen(function* () {
+export const acquire = self => Effect.gen(function* () {
   const permits = yield* TxRef.get(self.permitsRef);
   if (permits <= 0) {
-    return yield* Effect.retryTransaction;
+    return yield* Effect.txRetry;
   }
   yield* TxRef.set(self.permitsRef, permits - 1);
-}));
+}).pipe(Effect.tx);
 /**
  * Acquires the specified number of permits from the semaphore. If not enough
  * permits are available, the effect will block until they become available.
@@ -190,13 +191,13 @@ export const acquireN = (self, n) => {
   if (n <= 0) {
     return Effect.die(new Error("Number of permits must be positive"));
   }
-  return Effect.atomic(Effect.gen(function* () {
+  return Effect.gen(function* () {
     const permits = yield* TxRef.get(self.permitsRef);
     if (permits < n) {
-      return yield* Effect.retryTransaction;
+      return yield* Effect.txRetry;
     }
     yield* TxRef.set(self.permitsRef, permits - n);
-  }));
+  }).pipe(Effect.tx);
 };
 /**
  * Tries to acquire a single permit from the semaphore without blocking.
@@ -375,7 +376,14 @@ export const releaseN = (self, n) => {
  * @since 4.0.0
  * @category combinators
  */
-export const withPermit = (self, effect) => Effect.acquireUseRelease(acquire(self), () => effect, () => release(self));
+export const withPermit = (...args) => {
+  if (args.length === 1) {
+    const [self] = args;
+    return effect => Effect.acquireUseRelease(acquire(self), () => effect, () => release(self));
+  }
+  const [self, effect] = args;
+  return Effect.acquireUseRelease(acquire(self), () => effect, () => release(self));
+};
 /**
  * Executes an effect with the specified number of permits from the semaphore.
  * The permits are automatically acquired before execution and released afterwards,
@@ -415,7 +423,14 @@ export const withPermit = (self, effect) => Effect.acquireUseRelease(acquire(sel
  * @since 4.0.0
  * @category combinators
  */
-export const withPermits = (self, n, effect) => Effect.acquireUseRelease(acquireN(self, n), () => effect, () => releaseN(self, n));
+export const withPermits = (...args) => {
+  if (args.length === 2) {
+    const [self, n] = args;
+    return effect => Effect.acquireUseRelease(acquireN(self, n), () => effect, () => releaseN(self, n));
+  }
+  const [self, n, effect] = args;
+  return Effect.acquireUseRelease(acquireN(self, n), () => effect, () => releaseN(self, n));
+};
 /**
  * Acquires a single permit from the semaphore in a scoped manner. The permit
  * will be automatically released when the scope is closed, even if effects
@@ -481,5 +496,5 @@ export const withPermitScoped = self => Effect.acquireRelease(acquire(self), ()
  * @since 4.0.0
  * @category guards
  */
-export const isTxSemaphore = u => typeof u === "object" && u !== null && TypeId in u;
+export const isTxSemaphore = u => hasProperty(u, TypeId);
 //# sourceMappingURL=TxSemaphore.js.map

package/dist/TxSemaphore.js.map

@@ -1 +1 @@
-{"version":3,"file":"TxSemaphore.js","names":["Effect","NodeInspectSymbol","toJson","pipeArguments","TxRef","TypeId","TxSemaphoreProto","toJSON","_id","capacity","pipe","arguments","makeTxSemaphore","permitsRef","self","Object","create","make","permits","gen","die","Error","available","get","succeed","acquire","atomic","retryTransaction","set","acquireN","n","tryAcquire","modify","tryAcquireN","release","update","releaseN","newPermits","withPermit","effect","acquireUseRelease","withPermits","withPermitScoped","acquireRelease","isTxSemaphore","u"],"sources":["../src/TxSemaphore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"TxSemaphore.js","names":["Effect","NodeInspectSymbol","toJson","pipeArguments","hasProperty","TxRef","TypeId","TxSemaphoreProto","toJSON","_id","capacity","pipe","arguments","makeTxSemaphore","permitsRef","self","Object","create","make","permits","gen","die","Error","tx","available","get","succeed","acquire","txRetry","set","acquireN","n","tryAcquire","modify","tryAcquireN","release","update","releaseN","newPermits","withPermit","args","length","effect","acquireUseRelease","withPermits","withPermitScoped","acquireRelease","isTxSemaphore","u"],"sources":["../src/TxSemaphore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}