Layer: rename zipWithPar to zipWith (standard) (#1707)

Effect-TS · Nov 27, 2023 · fb1a98f · fb1a98f
1 parent 9698427
commit fb1a98f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/.changeset/wet-cooks-approve.md b/.changeset/wet-cooks-approve.md
@@ -0,0 +1,5 @@
+---
+"effect": minor
+---
+
+Layer: rename `zipWithPar` to `zipWith` (standard)
diff --git a/docs/modules/Layer.ts.md b/docs/modules/Layer.ts.md
@@ -126,7 +126,7 @@ Added in v2.0.0
   - [unwrapScoped](#unwrapscoped)
 - [zipping](#zipping)
   - [mergeAll](#mergeall)
-  - [zipWithPar](#zipwithpar)
+  - [zipWith](#zipwith)
 
 ---
 
@@ -1353,7 +1353,7 @@ export declare const mergeAll: <Layers extends [Layer<any, any, never>, ...Layer
 
 Added in v2.0.0
 
-## zipWithPar
+## zipWith
 
 Combines this layer the specified layer, producing a new layer that has the
 inputs of both, and the outputs of both combined using the specified
@@ -1362,7 +1362,7 @@ function.
 **Signature**
 
 ```ts
-export declare const zipWithPar: {
+export declare const zipWith: {
   <R2, E2, B, A, C>(
     that: Layer<R2, E2, B>,
     f: (a: Context.Context<A>, b: Context.Context<B>) => Context.Context<C>

diff --git a/src/Layer.ts b/src/Layer.ts
@@ -788,7 +788,7 @@ export const provideMerge: {
  * @since 2.0.0
  * @category zipping
  */
-export const zipWithPar: {
+export const zipWith: {
   <R2, E2, B, A, C>(
     that: Layer<R2, E2, B>,
     f: (a: Context.Context<A>, b: Context.Context<B>) => Context.Context<C>
@@ -798,7 +798,7 @@ export const zipWithPar: {
     that: Layer<R2, E2, B>,
     f: (a: Context.Context<A>, b: Context.Context<B>) => Context.Context<C>
   ): Layer<R | R2, E | E2, C>
-} = internal.zipWithPar
+} = internal.zipWith
 
 /**
  * @since 2.0.0

diff --git a/src/internal/layer.ts b/src/internal/layer.ts
@@ -127,15 +127,15 @@ export interface Locally extends
 
 /** @internal */
 export interface ProvideTo extends
-  Op<OpCodes.OP_PROVIDE_TO, {
+  Op<OpCodes.OP_PROVIDE, {
     readonly first: Layer.Layer<never, never, unknown>
     readonly second: Layer.Layer<never, never, unknown>
   }>
 {}
 
 /** @internal */
 export interface ZipWith extends
-  Op<OpCodes.OP_ZIP_WITH, {
+  Op<OpCodes.OP_PROVIDE_MERGE, {
     readonly first: Layer.Layer<never, never, unknown>
     readonly second: Layer.Layer<never, never, unknown>
     zipK(left: Context.Context<unknown>, right: Context.Context<unknown>): Context.Context<unknown>
@@ -144,7 +144,7 @@ export interface ZipWith extends
 
 /** @internal */
 export interface ZipWithPar extends
-  Op<OpCodes.OP_ZIP_WITH_PAR, {
+  Op<OpCodes.OP_ZIP_WITH, {
     readonly first: Layer.Layer<never, never, unknown>
     readonly second: Layer.Layer<never, never, unknown>
     zipK(left: Context.Context<unknown>, right: Context.Context<unknown>): Context.Context<unknown>
@@ -353,7 +353,7 @@ const withScope = <RIn, E, ROut>(
     case "FromEffect": {
       return core.sync(() => (_: MemoMap) => op.effect as Effect.Effect<RIn, E, Context.Context<ROut>>)
     }
-    case "ProvideTo": {
+    case "Provide": {
       return core.sync(() => (memoMap: MemoMap) =>
         pipe(
           memoMap.getOrElseMemoize(op.first, scope),
@@ -382,7 +382,7 @@ const withScope = <RIn, E, ROut>(
         )
       )
     }
-    case "ZipWith": {
+    case "ProvideMerge": {
       return core.sync(() => (memoMap: MemoMap) =>
         pipe(
           memoMap.getOrElseMemoize(op.first, scope),
@@ -393,7 +393,7 @@ const withScope = <RIn, E, ROut>(
         )
       )
     }
-    case "ZipWithPar": {
+    case "ZipWith": {
       return core.sync(() => (memoMap: MemoMap) =>
         pipe(
           memoMap.getOrElseMemoize(op.first, scope),
@@ -688,7 +688,7 @@ export const merge = dual<
     E | E2,
     ROut | ROut2
   >
->(2, (self, that) => zipWithPar(self, that, (a, b) => pipe(a, Context.merge(b))))
+>(2, (self, that) => zipWith(self, that, (a, b) => pipe(a, Context.merge(b))))
 
 /** @internal */
 export const mergeAll = <Layers extends [Layer.Layer<any, any, never>, ...Array<Layer.Layer<any, any, never>>]>(
@@ -991,9 +991,9 @@ export const provide = dual<
 ) =>
   suspend(() => {
     const provideTo = Object.create(proto)
-    provideTo._tag = OpCodes.OP_PROVIDE_TO
+    provideTo._tag = OpCodes.OP_PROVIDE
     provideTo.first = Object.create(proto, {
-      _tag: { value: OpCodes.OP_ZIP_WITH, enumerable: true },
+      _tag: { value: OpCodes.OP_PROVIDE_MERGE, enumerable: true },
       first: { value: context<Exclude<RIn2, ROut>>(), enumerable: true },
       second: { value: self },
       zipK: { value: (a: Context.Context<ROut>, b: Context.Context<ROut2>) => pipe(a, Context.merge(b)) }
@@ -1015,7 +1015,7 @@ export const provideMerge = dual<
   ) => Layer.Layer<RIn | Exclude<RIn2, ROut>, E2 | E, ROut | ROut2>
 >(2, <RIn2, E2, ROut2, RIn, E, ROut>(that: Layer.Layer<RIn2, E2, ROut2>, self: Layer.Layer<RIn, E, ROut>) => {
   const zipWith = Object.create(proto)
-  zipWith._tag = OpCodes.OP_ZIP_WITH
+  zipWith._tag = OpCodes.OP_PROVIDE_MERGE
   zipWith.first = self
   zipWith.second = provide(that, self)
   zipWith.zipK = (a: Context.Context<ROut>, b: Context.Context<ROut2>): Context.Context<ROut | ROut2> => {
@@ -1025,7 +1025,7 @@ export const provideMerge = dual<
 })
 
 /** @internal */
-export const zipWithPar = dual<
+export const zipWith = dual<
   <R2, E2, B, A, C>(
     that: Layer.Layer<R2, E2, B>,
     f: (a: Context.Context<A>, b: Context.Context<B>) => Context.Context<C>
@@ -1037,12 +1037,12 @@ export const zipWithPar = dual<
   ) => Layer.Layer<R | R2, E | E2, C>
 >(3, (self, that, f) =>
   suspend(() => {
-    const zipWithPar = Object.create(proto)
-    zipWithPar._tag = OpCodes.OP_ZIP_WITH_PAR
-    zipWithPar.first = self
-    zipWithPar.second = that
-    zipWithPar.zipK = f
-    return zipWithPar
+    const zipWith = Object.create(proto)
+    zipWith._tag = OpCodes.OP_ZIP_WITH
+    zipWith.first = self
+    zipWith.second = that
+    zipWith.zipK = f
+    return zipWith
   }))
 
 /** @internal */

diff --git a/src/internal/opCodes/layer.ts b/src/internal/opCodes/layer.ts
@@ -35,19 +35,19 @@ export const OP_SUSPEND = "Suspend" as const
 export type OP_SUSPEND = typeof OP_SUSPEND
 
 /** @internal */
-export const OP_PROVIDE_TO = "ProvideTo" as const
+export const OP_PROVIDE = "Provide" as const
 
 /** @internal */
-export type OP_PROVIDE_TO = typeof OP_PROVIDE_TO
+export type OP_PROVIDE = typeof OP_PROVIDE
 
 /** @internal */
-export const OP_ZIP_WITH = "ZipWith" as const
+export const OP_PROVIDE_MERGE = "ProvideMerge" as const
 
 /** @internal */
-export type OP_ZIP_WITH = typeof OP_ZIP_WITH
+export type OP_PROVIDE_MERGE = typeof OP_PROVIDE_MERGE
 
 /** @internal */
-export const OP_ZIP_WITH_PAR = "ZipWithPar" as const
+export const OP_ZIP_WITH = "ZipWith" as const
 
 /** @internal */
-export type OP_ZIP_WITH_PAR = typeof OP_ZIP_WITH_PAR
+export type OP_ZIP_WITH = typeof OP_ZIP_WITH