From e16186a0a5574d3b1bcd65fa37a4e8e13b70e98b Mon Sep 17 00:00:00 2001 From: Giulio Canti Date: Fri, 22 Mar 2024 10:52:12 +0100 Subject: [PATCH] =?UTF-8?q?Replace=20custom=20`NoInfer`=20type=20with=20th?= =?UTF-8?q?e=20native=20`NoInfer`=20type=20from=20Typ=E2=80=A6=20(#2390)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/tidy-news-serve.md | 5 +++++ packages/effect/dtslint/Either.ts | 4 ++-- packages/effect/dtslint/Struct.ts | 4 ++-- packages/effect/src/Cause.ts | 2 +- packages/effect/src/Chunk.ts | 2 +- packages/effect/src/Effect.ts | 2 +- packages/effect/src/Either.ts | 2 +- packages/effect/src/Exit.ts | 1 - packages/effect/src/GroupBy.ts | 2 +- packages/effect/src/HashMap.ts | 1 - packages/effect/src/HashSet.ts | 1 - packages/effect/src/List.ts | 1 - packages/effect/src/Logger.ts | 4 ++-- packages/effect/src/Option.ts | 2 +- packages/effect/src/ReadonlyArray.ts | 1 - packages/effect/src/ReadonlyRecord.ts | 1 - packages/effect/src/RequestResolver.ts | 8 ++++---- packages/effect/src/STM.ts | 2 +- packages/effect/src/SortedSet.ts | 2 +- packages/effect/src/Stream.ts | 2 +- packages/effect/src/Trie.ts | 2 +- packages/effect/src/Types.ts | 8 -------- packages/effect/src/internal/cause.ts | 1 - packages/effect/src/internal/core-effect.ts | 2 +- packages/effect/src/internal/core.ts | 2 +- packages/effect/src/internal/dataSource.ts | 1 - packages/effect/src/internal/fiberRuntime.ts | 2 +- packages/effect/src/internal/groupBy.ts | 2 +- packages/effect/src/internal/hashMap.ts | 1 - packages/effect/src/internal/hashSet.ts | 1 - packages/effect/src/internal/schedule.ts | 11 +++++------ packages/effect/src/internal/stm/stm.ts | 2 +- packages/effect/src/internal/stream.ts | 2 +- packages/effect/src/internal/trie.ts | 1 - .../experimental/src/Machine/ProcedureList.ts | 19 +++++++++---------- .../src/Machine/SerializableProcedureList.ts | 17 ++++++++--------- packages/schema/src/Schema.ts | 4 ++-- 37 files changed, 55 insertions(+), 72 deletions(-) create mode 100644 .changeset/tidy-news-serve.md diff --git a/.changeset/tidy-news-serve.md b/.changeset/tidy-news-serve.md new file mode 100644 index 0000000000..59d1aa6bcf --- /dev/null +++ b/.changeset/tidy-news-serve.md @@ -0,0 +1,5 @@ +--- +"effect": minor +--- + +Replaced custom `NoInfer` type with the native `NoInfer` type from TypeScript 5.4 diff --git a/packages/effect/dtslint/Either.ts b/packages/effect/dtslint/Either.ts index bdd8dff664..8e26fdc9f6 100644 --- a/packages/effect/dtslint/Either.ts +++ b/packages/effect/dtslint/Either.ts @@ -120,7 +120,7 @@ declare const error$arrayOfStrings: Either.Either, Error> pipe( error$arrayOfStrings, Either.filterOrLeft(ReadonlyArray.isNonEmptyArray, ( - _s // $ExpectType string[] + _s // $ExpectType NoInfer ) => "b" as const) ) @@ -130,7 +130,7 @@ declare const error$readonlyArrayOfStrings: Either.Either, pipe( error$readonlyArrayOfStrings, Either.filterOrLeft(ReadonlyArray.isNonEmptyReadonlyArray, ( - _s // $ExpectType readonly string[] + _s // $ExpectType NoInfer ) => "b" as const) ) diff --git a/packages/effect/dtslint/Struct.ts b/packages/effect/dtslint/Struct.ts index 76dca239e8..dcafcb678d 100644 --- a/packages/effect/dtslint/Struct.ts +++ b/packages/effect/dtslint/Struct.ts @@ -122,7 +122,7 @@ pipe(symbolStruct, S.pick(asym, bsym)) // $ExpectType { [asym]?: number; [bsym]?: number; } pipe(symbolNumberRecord, S.pick(asym, bsym)) -// $ExpectType { 1: string; 2: number; } +// $ExpectType { 2: number; 1: string; } pipe(numberStruct, S.pick(1, 2)) // @ts-expect-error @@ -134,7 +134,7 @@ S.pick(4)(numberStruct) // $ExpectType { [x: number]: unknown; } S.pick(4 as number)(numberStruct) -// $ExpectType { 1?: number; 2?: number; } +// $ExpectType { 2?: number; 1?: number; } pipe(numberNumberRecord, S.pick(1, 2)) // $ExpectType { ab?: number; aa?: number; } diff --git a/packages/effect/src/Cause.ts b/packages/effect/src/Cause.ts index a495af5882..7e5b6521c5 100644 --- a/packages/effect/src/Cause.ts +++ b/packages/effect/src/Cause.ts @@ -36,7 +36,7 @@ import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" import type * as Sink from "./Sink.js" import type * as Stream from "./Stream.js" -import type { Covariant, NoInfer } from "./Types.js" +import type { Covariant } from "./Types.js" /** * @since 2.0.0 diff --git a/packages/effect/src/Chunk.ts b/packages/effect/src/Chunk.ts index 7a49b5f9e8..c523ebd266 100644 --- a/packages/effect/src/Chunk.ts +++ b/packages/effect/src/Chunk.ts @@ -17,7 +17,7 @@ import { pipeArguments } from "./Pipeable.js" import { hasProperty, type Predicate, type Refinement } from "./Predicate.js" import * as RA from "./ReadonlyArray.js" import type { NonEmptyReadonlyArray } from "./ReadonlyArray.js" -import type { Covariant, NoInfer } from "./Types.js" +import type { Covariant } from "./Types.js" const TypeId: unique symbol = Symbol.for("effect/Chunk") as TypeId diff --git a/packages/effect/src/Effect.ts b/packages/effect/src/Effect.ts index 3c6051b9db..1c6ce1619d 100644 --- a/packages/effect/src/Effect.ts +++ b/packages/effect/src/Effect.ts @@ -55,7 +55,7 @@ import * as Scheduler from "./Scheduler.js" import type * as Scope from "./Scope.js" import type * as Supervisor from "./Supervisor.js" import type * as Tracer from "./Tracer.js" -import type { Concurrency, Covariant, MergeRecord, NoInfer, NotFunction } from "./Types.js" +import type { Concurrency, Covariant, MergeRecord, NotFunction } from "./Types.js" import type * as Unify from "./Unify.js" // ------------------------------------------------------------------------------------- diff --git a/packages/effect/src/Either.ts b/packages/effect/src/Either.ts index 13974f6159..46fee59c1f 100644 --- a/packages/effect/src/Either.ts +++ b/packages/effect/src/Either.ts @@ -12,7 +12,7 @@ import type { Option } from "./Option.js" import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" import { isFunction } from "./Predicate.js" -import type { Covariant, MergeRecord, NoInfer, NotFunction } from "./Types.js" +import type { Covariant, MergeRecord, NotFunction } from "./Types.js" import type * as Unify from "./Unify.js" import * as Gen from "./Utils.js" diff --git a/packages/effect/src/Exit.ts b/packages/effect/src/Exit.ts index 119c3aff91..f8c0772308 100644 --- a/packages/effect/src/Exit.ts +++ b/packages/effect/src/Exit.ts @@ -10,7 +10,6 @@ import * as core from "./internal/core.js" import type * as Option from "./Option.js" import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" -import type { NoInfer } from "./Types.js" import type * as Unify from "./Unify.js" /** diff --git a/packages/effect/src/GroupBy.ts b/packages/effect/src/GroupBy.ts index 315f0b683c..14b5a97c7a 100644 --- a/packages/effect/src/GroupBy.ts +++ b/packages/effect/src/GroupBy.ts @@ -7,7 +7,7 @@ import type { Predicate } from "./Predicate.js" import type * as Queue from "./Queue.js" import type * as Stream from "./Stream.js" import type * as Take from "./Take.js" -import type { Covariant, NoInfer } from "./Types.js" +import type { Covariant } from "./Types.js" /** * @since 2.0.0 diff --git a/packages/effect/src/HashMap.ts b/packages/effect/src/HashMap.ts index 0d0582e114..81621f77e4 100644 --- a/packages/effect/src/HashMap.ts +++ b/packages/effect/src/HashMap.ts @@ -9,7 +9,6 @@ import * as HM from "./internal/hashMap.js" import * as _keySet from "./internal/hashMap/keySet.js" import type { Option } from "./Option.js" import type { Pipeable } from "./Pipeable.js" -import type { NoInfer } from "./Types.js" const TypeId: unique symbol = HM.HashMapTypeId as TypeId diff --git a/packages/effect/src/HashSet.ts b/packages/effect/src/HashSet.ts index fb127fccea..eaf50e25e5 100644 --- a/packages/effect/src/HashSet.ts +++ b/packages/effect/src/HashSet.ts @@ -7,7 +7,6 @@ import type { Inspectable } from "./Inspectable.js" import * as HS from "./internal/hashSet.js" import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" -import type { NoInfer } from "./Types.js" const TypeId: unique symbol = HS.HashSetTypeId as TypeId diff --git a/packages/effect/src/List.ts b/packages/effect/src/List.ts index 9bf8be2002..ad9057e24c 100644 --- a/packages/effect/src/List.ts +++ b/packages/effect/src/List.ts @@ -33,7 +33,6 @@ import type { Pipeable } from "./Pipeable.js" import { pipeArguments } from "./Pipeable.js" import { hasProperty, type Predicate, type Refinement } from "./Predicate.js" import * as ReadonlyArray from "./ReadonlyArray.js" -import type { NoInfer } from "./Types.js" /** * Represents an immutable linked list of elements of type `A`. diff --git a/packages/effect/src/Logger.ts b/packages/effect/src/Logger.ts index 3ccacd7b6b..baf44cc532 100644 --- a/packages/effect/src/Logger.ts +++ b/packages/effect/src/Logger.ts @@ -183,12 +183,12 @@ export const map: { export const batched: { ( window: DurationInput, - f: (messages: Array>) => Effect + f: (messages: Array>) => Effect ): (self: Logger) => Effect, never, R | Scope> ( self: Logger, window: DurationInput, - f: (messages: Array>) => Effect + f: (messages: Array>) => Effect ): Effect, never, Scope | R> } = fiberRuntime.batchedLogger diff --git a/packages/effect/src/Option.ts b/packages/effect/src/Option.ts index 96a28f9dd8..0361fccf08 100644 --- a/packages/effect/src/Option.ts +++ b/packages/effect/src/Option.ts @@ -14,7 +14,7 @@ import type { Order } from "./Order.js" import * as order from "./Order.js" import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" -import type { Covariant, NoInfer, NotFunction } from "./Types.js" +import type { Covariant, NotFunction } from "./Types.js" import type * as Unify from "./Unify.js" import * as Gen from "./Utils.js" diff --git a/packages/effect/src/ReadonlyArray.ts b/packages/effect/src/ReadonlyArray.ts index 65d555ab20..89a7b15f7f 100644 --- a/packages/effect/src/ReadonlyArray.ts +++ b/packages/effect/src/ReadonlyArray.ts @@ -20,7 +20,6 @@ import type { Predicate, Refinement } from "./Predicate.js" import { isBoolean } from "./Predicate.js" import * as ReadonlyRecord from "./ReadonlyRecord.js" import * as Tuple from "./Tuple.js" -import type { NoInfer } from "./Types.js" /** * @category type lambdas diff --git a/packages/effect/src/ReadonlyRecord.ts b/packages/effect/src/ReadonlyRecord.ts index 72782dbf5f..0a0e3cec47 100644 --- a/packages/effect/src/ReadonlyRecord.ts +++ b/packages/effect/src/ReadonlyRecord.ts @@ -11,7 +11,6 @@ import type { Equivalence } from "./Equivalence.js" import { dual, identity } from "./Function.js" import type { TypeLambda } from "./HKT.js" import * as Option from "./Option.js" -import type { NoInfer } from "./Types.js" /** * @category models diff --git a/packages/effect/src/RequestResolver.ts b/packages/effect/src/RequestResolver.ts index ac57f8f5ea..49dce15a04 100644 --- a/packages/effect/src/RequestResolver.ts +++ b/packages/effect/src/RequestResolver.ts @@ -187,13 +187,13 @@ export const around: { */ export const aroundRequests: { ( - before: (requests: ReadonlyArray>) => Effect.Effect, - after: (requests: ReadonlyArray>, _: A2) => Effect.Effect + before: (requests: ReadonlyArray>) => Effect.Effect, + after: (requests: ReadonlyArray>, _: A2) => Effect.Effect ): (self: RequestResolver) => RequestResolver ( self: RequestResolver, - before: (requests: ReadonlyArray>) => Effect.Effect, - after: (requests: ReadonlyArray>, _: A2) => Effect.Effect + before: (requests: ReadonlyArray>) => Effect.Effect, + after: (requests: ReadonlyArray>, _: A2) => Effect.Effect ): RequestResolver } = internal.aroundRequests diff --git a/packages/effect/src/STM.ts b/packages/effect/src/STM.ts index d80de568e3..05aca0137e 100644 --- a/packages/effect/src/STM.ts +++ b/packages/effect/src/STM.ts @@ -14,7 +14,7 @@ import * as stm from "./internal/stm/stm.js" import type * as Option from "./Option.js" import type { Pipeable } from "./Pipeable.js" import type { Predicate, Refinement } from "./Predicate.js" -import type { Covariant, MergeRecord, NoInfer } from "./Types.js" +import type { Covariant, MergeRecord } from "./Types.js" import type * as Unify from "./Unify.js" /** diff --git a/packages/effect/src/SortedSet.ts b/packages/effect/src/SortedSet.ts index 2bc50e544b..baa359f5c6 100644 --- a/packages/effect/src/SortedSet.ts +++ b/packages/effect/src/SortedSet.ts @@ -14,7 +14,7 @@ import { pipeArguments } from "./Pipeable.js" import type { Predicate } from "./Predicate.js" import { hasProperty } from "./Predicate.js" import * as RBT from "./RedBlackTree.js" -import type { Invariant, NoInfer } from "./Types.js" +import type { Invariant } from "./Types.js" const TypeId: unique symbol = Symbol.for("effect/SortedSet") diff --git a/packages/effect/src/Stream.ts b/packages/effect/src/Stream.ts index 1ccd80b98f..80204e3472 100644 --- a/packages/effect/src/Stream.ts +++ b/packages/effect/src/Stream.ts @@ -29,7 +29,7 @@ import type * as Emit from "./StreamEmit.js" import type * as HaltStrategy from "./StreamHaltStrategy.js" import type * as Take from "./Take.js" import type * as Tracer from "./Tracer.js" -import type { Covariant, MergeRecord, NoInfer } from "./Types.js" +import type { Covariant, MergeRecord } from "./Types.js" import type * as Unify from "./Unify.js" /** diff --git a/packages/effect/src/Trie.ts b/packages/effect/src/Trie.ts index c0ea6bab2c..e2cab6f554 100644 --- a/packages/effect/src/Trie.ts +++ b/packages/effect/src/Trie.ts @@ -20,7 +20,7 @@ import type { Inspectable } from "./Inspectable.js" import * as TR from "./internal/trie.js" import type { Option } from "./Option.js" import type { Pipeable } from "./Pipeable.js" -import type { Covariant, NoInfer } from "./Types.js" +import type { Covariant } from "./Types.js" const TypeId: unique symbol = TR.TrieTypeId as TypeId diff --git a/packages/effect/src/Types.ts b/packages/effect/src/Types.ts index 2b804b0bd2..23050fb3eb 100644 --- a/packages/effect/src/Types.ts +++ b/packages/effect/src/Types.ts @@ -170,14 +170,6 @@ export type Mutable = { -readonly [P in keyof T]: T[P] } -/** - * Avoid inference on a specific parameter - * - * @since 2.0.0 - * @category models - */ -export type NoInfer = [A][A extends any ? 0 : never] - /** * Invariant helper. * diff --git a/packages/effect/src/internal/cause.ts b/packages/effect/src/internal/cause.ts index e328fdef27..5334bbd48f 100644 --- a/packages/effect/src/internal/cause.ts +++ b/packages/effect/src/internal/cause.ts @@ -13,7 +13,6 @@ import { hasProperty, isFunction } from "../Predicate.js" import type { Predicate, Refinement } from "../Predicate.js" import * as ReadonlyArray from "../ReadonlyArray.js" import type { ParentSpan, Span } from "../Tracer.js" -import type { NoInfer } from "../Types.js" import { getBugErrorMessage } from "./errors.js" import * as OpCodes from "./opCodes/cause.js" diff --git a/packages/effect/src/internal/core-effect.ts b/packages/effect/src/internal/core-effect.ts index ad1e454db7..b603b37c16 100644 --- a/packages/effect/src/internal/core-effect.ts +++ b/packages/effect/src/internal/core-effect.ts @@ -25,7 +25,7 @@ import * as ReadonlyArray from "../ReadonlyArray.js" import * as Ref from "../Ref.js" import type * as runtimeFlagsPatch from "../RuntimeFlagsPatch.js" import * as Tracer from "../Tracer.js" -import type { MergeRecord, NoInfer } from "../Types.js" +import type { MergeRecord } from "../Types.js" import * as internalCause from "./cause.js" import { clockTag } from "./clock.js" import * as core from "./core.js" diff --git a/packages/effect/src/internal/core.ts b/packages/effect/src/internal/core.ts index 1b448edb52..3304f10e20 100644 --- a/packages/effect/src/internal/core.ts +++ b/packages/effect/src/internal/core.ts @@ -35,7 +35,7 @@ import type * as RuntimeFlags from "../RuntimeFlags.js" import * as RuntimeFlagsPatch from "../RuntimeFlagsPatch.js" import type * as Scope from "../Scope.js" import type * as Tracer from "../Tracer.js" -import type { NoInfer, NotFunction } from "../Types.js" +import type { NotFunction } from "../Types.js" import * as _blockedRequests from "./blockedRequests.js" import * as internalCause from "./cause.js" import * as deferred from "./deferred.js" diff --git a/packages/effect/src/internal/dataSource.ts b/packages/effect/src/internal/dataSource.ts index 616c25eb72..000aa5ce1b 100644 --- a/packages/effect/src/internal/dataSource.ts +++ b/packages/effect/src/internal/dataSource.ts @@ -7,7 +7,6 @@ import { dual, pipe } from "../Function.js" import * as RA from "../ReadonlyArray.js" import type * as Request from "../Request.js" import type * as RequestResolver from "../RequestResolver.js" -import type { NoInfer } from "../Types.js" import * as core from "./core.js" import { invokeWithInterrupt, zipWithOptions } from "./fiberRuntime.js" import { complete } from "./request.js" diff --git a/packages/effect/src/internal/fiberRuntime.ts b/packages/effect/src/internal/fiberRuntime.ts index 228c7a5422..7a1acf29d6 100644 --- a/packages/effect/src/internal/fiberRuntime.ts +++ b/packages/effect/src/internal/fiberRuntime.ts @@ -41,7 +41,7 @@ import { currentScheduler, type Scheduler } from "../Scheduler.js" import type * as Scope from "../Scope.js" import type * as Supervisor from "../Supervisor.js" import type * as Tracer from "../Tracer.js" -import type { Concurrency, NoInfer } from "../Types.js" +import type { Concurrency } from "../Types.js" import * as _RequestBlock from "./blockedRequests.js" import * as internalCause from "./cause.js" import * as clock from "./clock.js" diff --git a/packages/effect/src/internal/groupBy.ts b/packages/effect/src/internal/groupBy.ts index ab87cda189..6f82e7f527 100644 --- a/packages/effect/src/internal/groupBy.ts +++ b/packages/effect/src/internal/groupBy.ts @@ -13,7 +13,7 @@ import * as Queue from "../Queue.js" import * as Ref from "../Ref.js" import type * as Stream from "../Stream.js" import type * as Take from "../Take.js" -import type { MergeRecord, NoInfer } from "../Types.js" +import type { MergeRecord } from "../Types.js" import * as channel from "./channel.js" import * as channelExecutor from "./channel/channelExecutor.js" import * as core from "./core-stream.js" diff --git a/packages/effect/src/internal/hashMap.ts b/packages/effect/src/internal/hashMap.ts index 8785afd783..07353303ce 100644 --- a/packages/effect/src/internal/hashMap.ts +++ b/packages/effect/src/internal/hashMap.ts @@ -7,7 +7,6 @@ import { format, NodeInspectSymbol, toJSON } from "../Inspectable.js" import * as Option from "../Option.js" import { pipeArguments } from "../Pipeable.js" import { hasProperty } from "../Predicate.js" -import type { NoInfer } from "../Types.js" import { fromBitmap, hashFragment, toBitmap } from "./hashMap/bitwise.js" import { SIZE } from "./hashMap/config.js" import * as Node from "./hashMap/node.js" diff --git a/packages/effect/src/internal/hashSet.ts b/packages/effect/src/internal/hashSet.ts index a60b87d075..95b8875778 100644 --- a/packages/effect/src/internal/hashSet.ts +++ b/packages/effect/src/internal/hashSet.ts @@ -7,7 +7,6 @@ import { format, NodeInspectSymbol, toJSON } from "../Inspectable.js" import { pipeArguments } from "../Pipeable.js" import type { Predicate, Refinement } from "../Predicate.js" import { hasProperty } from "../Predicate.js" -import type { NoInfer } from "../Types.js" import * as HM from "./hashMap.js" const HashSetSymbolKey = "effect/HashSet" diff --git a/packages/effect/src/internal/schedule.ts b/packages/effect/src/internal/schedule.ts index 1c85645c6e..865e84f163 100644 --- a/packages/effect/src/internal/schedule.ts +++ b/packages/effect/src/internal/schedule.ts @@ -18,7 +18,6 @@ import type * as Schedule from "../Schedule.js" import * as ScheduleDecision from "../ScheduleDecision.js" import * as Interval from "../ScheduleInterval.js" import * as Intervals from "../ScheduleIntervals.js" -import type * as Types from "../Types.js" import * as internalCause from "./cause.js" import * as effect from "./core-effect.js" import * as core from "./core.js" @@ -1903,7 +1902,7 @@ export const retry_combined: { self: Effect.Effect ) => Effect.Retry.Return ( - policy: Schedule.Schedule, R1> + policy: Schedule.Schedule, R1> ): (self: Effect.Effect) => Effect.Effect >( self: Effect.Effect, @@ -1949,13 +1948,13 @@ export const retry_combined: { /** @internal */ export const retryOrElse_Effect = dual< ( - policy: Schedule.Schedule, R1>, - orElse: (e: Types.NoInfer, out: A1) => Effect.Effect + policy: Schedule.Schedule, R1>, + orElse: (e: NoInfer, out: A1) => Effect.Effect ) => (self: Effect.Effect) => Effect.Effect, ( self: Effect.Effect, - policy: Schedule.Schedule, R1>, - orElse: (e: Types.NoInfer, out: A1) => Effect.Effect + policy: Schedule.Schedule, R1>, + orElse: (e: NoInfer, out: A1) => Effect.Effect ) => Effect.Effect >(3, (self, policy, orElse) => core.flatMap( diff --git a/packages/effect/src/internal/stm/stm.ts b/packages/effect/src/internal/stm/stm.ts index 1c1b86c86e..495eebbe16 100644 --- a/packages/effect/src/internal/stm/stm.ts +++ b/packages/effect/src/internal/stm/stm.ts @@ -12,7 +12,7 @@ import type { Predicate, Refinement } from "../../Predicate.js" import * as predicate from "../../Predicate.js" import * as RA from "../../ReadonlyArray.js" import type * as STM from "../../STM.js" -import type { MergeRecord, NoInfer } from "../../Types.js" +import type { MergeRecord } from "../../Types.js" import * as effectCore from "../core.js" import * as SingleShotGen from "../singleShotGen.js" import * as core from "./core.js" diff --git a/packages/effect/src/internal/stream.ts b/packages/effect/src/internal/stream.ts index 2ae65838db..788fee67e9 100644 --- a/packages/effect/src/internal/stream.ts +++ b/packages/effect/src/internal/stream.ts @@ -31,7 +31,7 @@ import * as HaltStrategy from "../StreamHaltStrategy.js" import type * as Take from "../Take.js" import type * as Tracer from "../Tracer.js" import * as Tuple from "../Tuple.js" -import type { MergeRecord, NoInfer } from "../Types.js" +import type { MergeRecord } from "../Types.js" import * as channel from "./channel.js" import * as channelExecutor from "./channel/channelExecutor.js" import * as MergeStrategy from "./channel/mergeStrategy.js" diff --git a/packages/effect/src/internal/trie.ts b/packages/effect/src/internal/trie.ts index b6c3033ed6..5c73ec413d 100644 --- a/packages/effect/src/internal/trie.ts +++ b/packages/effect/src/internal/trie.ts @@ -7,7 +7,6 @@ import type * as Ordering from "../Ordering.js" import { pipeArguments } from "../Pipeable.js" import { hasProperty } from "../Predicate.js" import type * as TR from "../Trie.js" -import type { NoInfer } from "../Types.js" const TrieSymbolKey = "effect/Trie" diff --git a/packages/experimental/src/Machine/ProcedureList.ts b/packages/experimental/src/Machine/ProcedureList.ts index a476504089..9b172c0175 100644 --- a/packages/experimental/src/Machine/ProcedureList.ts +++ b/packages/experimental/src/Machine/ProcedureList.ts @@ -4,7 +4,6 @@ import * as Effect from "effect/Effect" import * as Effectable from "effect/Effectable" import { dual } from "effect/Function" -import type * as Types from "effect/Types" import * as Procedure from "./Procedure.js" /** @@ -175,7 +174,7 @@ export const add = (): { R2 >( tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ( self: ProcedureList ) => ProcedureList @@ -188,7 +187,7 @@ export const add = (): { >( self: ProcedureList, tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ProcedureList } => dual( @@ -202,7 +201,7 @@ export const add = (): { >( self: ProcedureList, tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ProcedureList => addProcedure(self, Procedure.make()()(tag, handler)) ) @@ -219,7 +218,7 @@ export const addPrivate = (): { R2 >( tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ( self: ProcedureList ) => ProcedureList @@ -232,7 +231,7 @@ export const addPrivate = (): { >( self: ProcedureList, tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ProcedureList } => dual( @@ -246,7 +245,7 @@ export const addPrivate = (): { >( self: ProcedureList, tag: Req["_tag"], - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ProcedureList => addProcedurePrivate(self, Procedure.make()()(tag, handler)) ) @@ -257,15 +256,15 @@ export const addPrivate = (): { */ export const withInitialState: { ( - initialState: Types.NoInfer + initialState: NoInfer ): ( self: ProcedureList ) => ProcedureList ( self: ProcedureList, - initialState: Types.NoInfer + initialState: NoInfer ): ProcedureList } = dual(2, ( self: ProcedureList, - initialState: Types.NoInfer + initialState: NoInfer ): ProcedureList => makeProto({ ...self, initialState })) diff --git a/packages/experimental/src/Machine/SerializableProcedureList.ts b/packages/experimental/src/Machine/SerializableProcedureList.ts index c31252be95..bdac9c7995 100644 --- a/packages/experimental/src/Machine/SerializableProcedureList.ts +++ b/packages/experimental/src/Machine/SerializableProcedureList.ts @@ -5,7 +5,6 @@ import type * as Schema from "@effect/schema/Schema" import type * as Serializable from "@effect/schema/Serializable" import type * as Effect from "effect/Effect" import { dual } from "effect/Function" -import type * as Types from "effect/Types" import * as Procedure from "./Procedure.js" import * as ProcedureList from "./ProcedureList.js" @@ -53,7 +52,7 @@ export const add: { R2 >( schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ( self: SerializableProcedureList ) => SerializableProcedureList< @@ -75,7 +74,7 @@ export const add: { >( self: SerializableProcedureList, schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): SerializableProcedureList> } = dual( 3, @@ -92,7 +91,7 @@ export const add: { >( self: SerializableProcedureList, schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): SerializableProcedureList< State, Req | Public, @@ -117,7 +116,7 @@ export const addPrivate: { R2 >( schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): ( self: SerializableProcedureList ) => SerializableProcedureList< @@ -139,7 +138,7 @@ export const addPrivate: { >( self: SerializableProcedureList, schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): SerializableProcedureList> } = dual( 3, @@ -156,7 +155,7 @@ export const addPrivate: { >( self: SerializableProcedureList, schema: Schema.Schema & { readonly fields: Fields }, - handler: Procedure.Handler, Types.NoInfer | Types.NoInfer, R2> + handler: Procedure.Handler, NoInfer | NoInfer, R2> ): SerializableProcedureList< State, Public, @@ -171,12 +170,12 @@ export const addPrivate: { */ export const withInitialState: { ( - initialState: Types.NoInfer + initialState: NoInfer ): ( self: SerializableProcedureList ) => SerializableProcedureList ( self: SerializableProcedureList, - initialState: Types.NoInfer + initialState: NoInfer ): SerializableProcedureList } = ProcedureList.withInitialState as any diff --git a/packages/schema/src/Schema.ts b/packages/schema/src/Schema.ts index 1c8e912407..3c2a7afc94 100644 --- a/packages/schema/src/Schema.ts +++ b/packages/schema/src/Schema.ts @@ -2591,8 +2591,8 @@ export function filter( annotations?: Annotations.Filter ): (self: Schema) => Schema export function filter( - predicate: Predicate.Predicate>, - annotations?: Annotations.Filter> + predicate: Predicate.Predicate>, + annotations?: Annotations.Filter> ): (self: Schema) => Schema export function filter( predicate: Predicate.Predicate | AST.Refinement["filter"],