effect 4.0.0-beta.99 → 4.0.0-rc.108

package/src/unstable/sql/SqlResolver.ts

@@ -29,7 +29,7 @@ import { ResultLengthMismatch } from "./SqlError.ts"
  * Request type used by SQL request resolvers, carrying the input payload
  * together with the resolver's result, error, and environment types.
  *
- * @category requests
+ * @category models
  * @since 4.0.0
  */
 export interface SqlRequest<In, A, E, R> extends Request.Request<A, E | Schema.SchemaError, R> {
@@ -53,7 +53,7 @@ const SqlRequestProto = {
  * Runs a payload as a `SqlRequest` through a request resolver, either directly
  * with a payload and resolver or curried by resolver.
  *
- * @category requests
+ * @category running
  * @since 4.0.0
  */
 export const request: {
@@ -61,7 +61,7 @@ export const request: {
    * Runs a payload as a `SqlRequest` through a request resolver, either directly
    * with a payload and resolver or curried by resolver.
    *
-   * @category requests
+   * @category running
    * @since 4.0.0
    */
   <In, A, E, R>(resolver: RequestResolver.RequestResolver<SqlRequest<In, A, E, R>>): (payload: In) => Effect.Effect<A, E | Schema.SchemaError, R>
@@ -69,7 +69,7 @@ export const request: {
    * Runs a payload as a `SqlRequest` through a request resolver, either directly
    * with a payload and resolver or curried by resolver.
    *
-   * @category requests
+   * @category running
    * @since 4.0.0
    */
   <In, A, E, R>(
@@ -88,7 +88,7 @@ export const request: {
  * Constructs a `SqlRequest` from a payload. Equality and hashing are based on
  * the payload so equal requests can be batched and deduplicated.
  *
- * @category requests
+ * @category constructors
  * @since 4.0.0
  */
 export const SqlRequest = <In, A, E, R>(payload: In): SqlRequest<In, A, E, R> => {
@@ -133,8 +133,9 @@ export const ordered = <Req extends Schema.Constraint, Res extends Schema.Constr
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
-      const inputs = yield* partitionRequests(entries, options.Request)
-      const results = yield* options.execute(inputs as any).pipe(
+      const [inputs, encodedEntries] = yield* partitionRequests(entries, options.Request)
+      if (!Arr.isArrayNonEmpty(inputs)) return
+      const results = yield* options.execute(inputs).pipe(
         Effect.provideContext(entries[0].context)
       )
       if (results.length !== inputs.length) {
@@ -143,8 +144,8 @@ export const ordered = <Req extends Schema.Constraint, Res extends Schema.Constr
       const decodedResults = yield* decodeArray(results).pipe(
         Effect.provideContext(entries[0].context)
       )
-      for (let i = 0; i < entries.length; i++) {
-        entries[i].completeUnsafe(Exit.succeed(decodedResults[i]))
+      for (let i = 0; i < encodedEntries.length; i++) {
+        encodedEntries[i].completeUnsafe(Exit.succeed(decodedResults[i]))
       }
     })
   })
@@ -189,9 +190,10 @@ export const grouped = <Req extends Schema.Constraint, Res extends Schema.Constr
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
-      const inputs = yield* partitionRequests(entries, options.Request)
+      const [inputs] = yield* partitionRequests(entries, options.Request)
+      if (!Arr.isArrayNonEmpty(inputs)) return
       const resultMap = MutableHashMap.empty<K, Arr.NonEmptyArray<Res["Type"]>>()
-      const results = yield* options.execute(inputs as any).pipe(
+      const results = yield* options.execute(inputs).pipe(
         Effect.provideContext(entries[0].context)
       )
       const decodedResults = yield* decodeResults(results).pipe(
@@ -258,7 +260,8 @@ export const findById = <Id extends Schema.Constraint, Res extends Schema.Constr
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
       const [inputs, idMap] = yield* partitionRequestsById(entries, options.Id)
-      const results = yield* options.execute(inputs as any).pipe(
+      if (!Arr.isArrayNonEmpty(inputs)) return
+      const results = yield* options.execute(inputs).pipe(
         Effect.provideContext(entries[0].context)
       )
       const decodedResults = yield* decodeResults(results).pipe(
@@ -310,8 +313,9 @@ const void_ = <Req extends Schema.Constraint, _, E, R>(
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
-      const inputs = yield* partitionRequests(entries, options.Request)
-      yield* options.execute(inputs as any).pipe(
+      const [inputs] = yield* partitionRequests(entries, options.Request)
+      if (!Arr.isArrayNonEmpty(inputs)) return
+      yield* options.execute(inputs).pipe(
         Effect.provideContext(entries[0].context)
       )
       for (let i = 0; i < entries.length; i++) {
@@ -338,6 +342,7 @@ const partitionRequests = function*<In, A, E, R, InE>(
 ) {
   const len = requests.length
   const inputs = Arr.empty<InE>()
+  const encodedEntries = Arr.empty<Request.Entry<SqlRequest<In, A, E, R>>>()
   let entry!: Request.Entry<SqlRequest<In, A, E, R>>
   const encode = Schema.encodeEffect(schema)
   const handle = Effect.matchCauseEager({
@@ -346,6 +351,7 @@ const partitionRequests = function*<In, A, E, R, InE>(
     },
     onSuccess(value: InE) {
       inputs.push(value)
+      encodedEntries.push(entry)
     }
   })
 
@@ -354,7 +360,7 @@ const partitionRequests = function*<In, A, E, R, InE>(
     yield (Effect.provideContext(handle(encode(entry.request.payload)), entry.context) as Effect.Effect<void>)
   }
 
-  return inputs
+  return [inputs, encodedEntries] as const
 }
 
 const partitionRequestsById = function*<In, A, E, R, InE>(
@@ -364,35 +370,39 @@ const partitionRequestsById = function*<In, A, E, R, InE>(
   const len = requests.length
   const inputs = Arr.empty<InE>()
   const byIdMap = MutableHashMap.empty<In, Request.Entry<SqlRequest<In, A, E, R>>>()
-  let entry!: Request.Entry<SqlRequest<In, A, E, R>>
-  const encode = Schema.encodeEffect(schema)
-  const handle = Effect.matchCauseEager({
-    onFailure(cause: Cause.Cause<Schema.SchemaError>) {
-      entry.completeUnsafe(Exit.failCause(cause))
-    },
-    onSuccess(value: InE) {
-      inputs.push(value)
-    }
-  })
 
   for (let i = 0; i < len; i++) {
-    entry = requests[i]
+    const entry = requests[i]
     const existing = MutableHashMap.get(byIdMap, entry.request.payload)
     if (Option.isSome(existing)) {
-      const duplicate = entry
+      const previous = existing.value
       MutableHashMap.set(byIdMap, entry.request.payload, {
-        ...existing.value,
+        ...previous,
         completeUnsafe(exit) {
-          existing.value.completeUnsafe(exit)
-          duplicate.completeUnsafe(exit)
+          previous.completeUnsafe(exit)
+          entry.completeUnsafe(exit)
         }
       })
     } else {
-      yield (Effect.provideContext(handle(encode(entry.request.payload)), entry.context) as Effect.Effect<void>)
       MutableHashMap.set(byIdMap, entry.request.payload, entry)
     }
   }
 
+  const encode = Schema.encodeEffect(schema)
+  for (const [, entry] of byIdMap) {
+    yield* Effect.provideContext(
+      Effect.matchCauseEager(encode(entry.request.payload), {
+        onFailure(cause) {
+          entry.completeUnsafe(Exit.failCause(cause))
+        },
+        onSuccess(value) {
+          inputs.push(value)
+        }
+      }),
+      entry.context
+    )
+  }
+
   return [inputs, byIdMap] as const
 }
 

package/src/unstable/sql/Statement.ts

@@ -17,6 +17,7 @@ import * as Effectable from "../../Effectable.ts"
 import type * as Fiber from "../../Fiber.ts"
 import { constUndefined } from "../../Function.ts"
 import * as internalEffect from "../../internal/effect.ts"
+import * as InternalRecord from "../../internal/record.ts"
 import { hasProperty } from "../../Predicate.ts"
 import { TracerTimingEnabled } from "../../References.ts"
 import * as Stream from "../../Stream.ts"
@@ -98,7 +99,7 @@ export type Transformer = (
  * Context reference for an optional current SQL statement transformer applied
  * before statement execution.
  *
- * @category transformer
+ * @category services
  * @since 4.0.0
  */
 export const CurrentTransformer = Context.Reference<Transformer | undefined>("effect/sql/CurrentTransformer", {
@@ -751,7 +752,7 @@ const emptyFragment = fragment([literal("")])
  * Dialect-specific compiler that converts a SQL `Fragment` into SQL text and
  * bind parameters, with a no-transform variant.
  *
- * @category compiler
+ * @category models
  * @since 4.0.0
  */
 export interface Compiler {
@@ -767,7 +768,7 @@ export interface Compiler {
  * Callbacks used by `makeCompiler` to render dialect placeholders,
  * identifiers, insert helpers, update helpers, and custom SQL segments.
  *
- * @category compiler
+ * @category models
  * @since 4.0.0
  */
 export type CompilerOptions<C extends Custom<any, any, any, any> = any> = {
@@ -802,7 +803,7 @@ export type CompilerOptions<C extends Custom<any, any, any, any> = any> = {
 /**
  * Creates a dialect-specific SQL `Compiler` from rendering callbacks.
  *
- * @category compiler
+ * @category constructors
  * @since 4.0.0
  */
 export const makeCompiler = <C extends Custom<any, any, any, any> = any>(
@@ -812,22 +813,25 @@ export const makeCompiler = <C extends Custom<any, any, any, any> = any>(
   self.options = options
   self.dialect = options.dialect
   self.disableTransforms = false
+  self.statementCache = new WeakMap<Fragment, CompiledStatement>()
+  self.statementCacheNoTransform = new WeakMap<Fragment, CompiledStatement>()
   return self
 }
 
+type CompiledStatement = readonly [sql: string, binds: ReadonlyArray<unknown>]
+
 interface CompilerImpl extends Compiler {
   readonly options: CompilerOptions
   readonly disableTransforms: boolean
+  readonly statementCache: WeakMap<Fragment, CompiledStatement>
+  readonly statementCacheNoTransform: WeakMap<Fragment, CompiledStatement>
   compile(
     statement: Fragment,
     withoutTransform?: boolean,
     placeholderOverride?: (u: unknown) => string
-  ): readonly [sql: string, binds: ReadonlyArray<unknown>]
+  ): CompiledStatement
 }
 
-const statementCacheSymbol = Symbol.for("effect/unstable/sql/Statement/statementCache")
-const statementCacheNoTransformSymbol = Symbol.for("effect/unstable/sql/Statement/statementCacheNoTransform")
-
 const CompilerProto = {
   compile(
     this: CompilerImpl,
@@ -837,9 +841,10 @@ const CompilerProto = {
   ): readonly [sql: string, binds: ReadonlyArray<unknown>] {
     const opts = this.options
     withoutTransform = withoutTransform || this.disableTransforms
-    const cacheSymbol = withoutTransform ? statementCacheNoTransformSymbol : statementCacheSymbol
-    if (cacheSymbol in statement) {
-      return (statement as any)[cacheSymbol]
+    const cache = withoutTransform ? this.statementCacheNoTransform : this.statementCache
+    const cached = cache.get(statement)
+    if (cached !== undefined) {
+      return cached
     }
 
     const segments = statement.segments
@@ -1046,7 +1051,8 @@ const CompilerProto = {
     if (placeholderOverride !== undefined) {
       return result
     }
-    return (statement as any)[cacheSymbol] = result
+    cache.set(statement, result)
+    return result
   },
 
   get withoutTransform() {
@@ -1062,7 +1068,7 @@ const CompilerProto = {
  * Creates a SQLite compiler that uses `?` placeholders and quoted identifiers,
  * optionally transforming identifier names before escaping.
  *
- * @category compiler
+ * @category constructors
  * @since 4.0.0
  */
 export const makeCompilerSqlite = (transform?: ((_: string) => string) | undefined): Compiler =>
@@ -1105,7 +1111,7 @@ export function defaultEscape(c: string) {
  * Classifies a JavaScript value as a SQL primitive kind, treating `undefined`
  * as `null` and defaulting unrecognized objects to `string`.
  *
- * @category predicates
+ * @category converting
  * @since 4.0.0
  */
 export const primitiveKind = (value: unknown): PrimitiveKind => {
@@ -1160,8 +1166,8 @@ export const defaultTransforms = (
 
   const transformObject = (obj: Record<string, any>): any => {
     const newObj: Record<string, any> = {}
-    for (const key in obj) {
-      newObj[transformer(key)] = transformValue(obj[key])
+    for (const key of Object.keys(obj)) {
+      InternalRecord.assignProperty(newObj, transformer(key), transformValue(obj[key]))
     }
     return newObj
   }
@@ -1176,8 +1182,8 @@ export const defaultTransforms = (
         newRows[i] = transformArrayNested(row) as any
       } else {
         const obj: any = {}
-        for (const key in row) {
-          obj[transformer(key)] = transformValue(row[key])
+        for (const [key, value] of Object.entries(row)) {
+          InternalRecord.assignProperty(obj, transformer(key), transformValue(value))
         }
         newRows[i] = obj
       }
@@ -1195,8 +1201,8 @@ export const defaultTransforms = (
         newRows[i] = transformArray(row) as any
       } else {
         const obj: any = {}
-        for (const key in row) {
-          obj[transformer(key)] = row[key]
+        for (const [key, value] of Object.entries(row)) {
+          InternalRecord.assignProperty(obj, transformer(key), value)
         }
         newRows[i] = obj
       }
@@ -1267,23 +1273,6 @@ const StatementProto: Omit<
   StatementImpl<any>,
   "segments" | "acquirer" | "compiler" | "spanAttributes" | "transformRows"
 > = {
-  ...Effectable.Prototype<StatementImpl<any>>({
-    label: "Statement",
-    evaluate(fiber) {
-      const span = internalEffect.makeSpanUnsafe(fiber, "sql.execute", { kind: "client" })
-      const clock = fiber.getRef(Clock)
-      const timingEnabled = fiber.getRef(TracerTimingEnabled)
-      return Effect.onExit(
-        this.withConnectionSpan(
-          "execute",
-          (connection, sql, params) => connection.execute(sql, params, this.transformRows),
-          false,
-          span
-        ),
-        (exit) => internalEffect.endSpan(span, exit, clock, timingEnabled)
-      )
-    }
-  }),
   [FragmentTypeId]: FragmentTypeId,
   withConnection<XA, E>(
     this: StatementImpl<any>,
@@ -1387,6 +1376,24 @@ const StatementProto: Omit<
     )
   },
 
+  ...Effectable.Prototype<StatementImpl<any>>({
+    label: "Statement",
+    evaluate(fiber) {
+      const span = internalEffect.makeSpanUnsafe(fiber, "sql.execute", { kind: "client" })
+      const clock = fiber.getRef(Clock)
+      const timingEnabled = fiber.getRef(TracerTimingEnabled)
+      return Effect.onExit(
+        this.withConnectionSpan(
+          "execute",
+          (connection, sql, params) => connection.execute(sql, params, this.transformRows),
+          false,
+          span
+        ),
+        (exit) => internalEffect.endSpan(span, exit, clock, timingEnabled)
+      )
+    }
+  }),
+
   compile(
     this: StatementImpl<any>,
     withoutTransform?: boolean | undefined

package/src/unstable/workers/Transferable.ts

@@ -20,7 +20,7 @@ import * as SchemaGetter from "../../SchemaGetter.ts"
  * Service for collecting `Transferable` objects while encoding worker messages
  * so they can be passed to `postMessage` transfer lists.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export class Collector extends Context.Service<Collector, {

package/src/unstable/workers/Worker.ts

@@ -23,7 +23,7 @@ import { WorkerError, WorkerSendError } from "./WorkerError.ts"
  * Service that spawns effect `Worker` instances for numeric worker ids using
  * the configured `Spawner`.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export class WorkerPlatform extends Context.Service<WorkerPlatform, {
@@ -60,7 +60,7 @@ export interface Worker<O = unknown, I = unknown> {
  * platform ready/data messages and running the optional `onSpawn` effect when
  * the worker reports readiness.
  *
- * @category models
+ * @category constructors
  * @since 4.0.0
  */
 export const makeUnsafe = (options: {
@@ -165,6 +165,17 @@ export const makePlatform = <W>() =>
         const spawn = (yield* Spawner) as SpawnerFn<W>
         let currentPort: P | undefined
         const buffer: Array<[unknown, ReadonlyArray<unknown> | undefined]> = []
+        const sendToPort = (port: P, message: unknown, transfers?: ReadonlyArray<unknown>) =>
+          Effect.try({
+            try: () => port.postMessage([0, message], transfers as any),
+            catch: (cause) =>
+              new WorkerError({
+                reason: new WorkerSendError({
+                  message: "Failed to send message to worker",
+                  cause
+                })
+              })
+          })
 
         const run = <A, E, R>(
           handler: (_: O) => Effect.Effect<A, E, R>,
@@ -209,7 +220,7 @@ export const makePlatform = <W>() =>
                 currentPort = port
                 if (buffer.length > 0) {
                   for (const [message, transfers] of buffer) {
-                    port.postMessage([0, message], transfers as any)
+                    yield* sendToPort(port, message, transfers)
                   }
                   buffer.length = 0
                 }
@@ -224,19 +235,7 @@ export const makePlatform = <W>() =>
               buffer.push([message, transfers])
               return Effect.void
             }
-            try {
-              currentPort.postMessage([0, message], transfers as any)
-              return Effect.void
-            } catch (cause) {
-              return Effect.fail(
-                new WorkerError({
-                  reason: new WorkerSendError({
-                    message: "Failed to send message to worker",
-                    cause
-                  })
-                })
-              )
-            }
+            return sendToPort(currentPort, message, transfers)
           })
 
         return { run, send }

package/src/unstable/workers/WorkerError.ts

@@ -31,10 +31,10 @@ export const isWorkerError = (u: unknown): u is WorkerError => hasProperty(u, Ty
 /**
  * Worker error reason for failures while spawning or setting up a worker.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
-export class WorkerSpawnError extends Schema.ErrorClass<WorkerSpawnError>(
+export class WorkerSpawnError extends Schema.Error<WorkerSpawnError>(
   "effect/workers/WorkerError/WorkerSpawnError"
 )({
   _tag: Schema.tag("WorkerSpawnError"),
@@ -45,10 +45,10 @@ export class WorkerSpawnError extends Schema.ErrorClass<WorkerSpawnError>(
 /**
  * Worker error reason for failures while sending a message to a worker.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
-export class WorkerSendError extends Schema.ErrorClass<WorkerSendError>(
+export class WorkerSendError extends Schema.Error<WorkerSendError>(
   "effect/workers/WorkerError/WorkerSendError"
 )({
   _tag: Schema.tag("WorkerSendError"),
@@ -60,10 +60,10 @@ export class WorkerSendError extends Schema.ErrorClass<WorkerSendError>(
  * Worker error reason for failures while receiving or handling a message from a
  * worker.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
-export class WorkerReceiveError extends Schema.ErrorClass<WorkerReceiveError>(
+export class WorkerReceiveError extends Schema.Error<WorkerReceiveError>(
   "effect/workers/WorkerError/WorkerReceiveError"
 )({
   _tag: Schema.tag("WorkerReceiveError"),
@@ -74,10 +74,10 @@ export class WorkerReceiveError extends Schema.ErrorClass<WorkerReceiveError>(
 /**
  * Worker error reason for an unclassified worker failure.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
-export class WorkerUnknownError extends Schema.ErrorClass<WorkerUnknownError>(
+export class WorkerUnknownError extends Schema.Error<WorkerUnknownError>(
   "effect/workers/WorkerError/WorkerUnknownError"
 )({
   _tag: Schema.tag("WorkerUnknownError"),
@@ -88,7 +88,7 @@ export class WorkerUnknownError extends Schema.ErrorClass<WorkerUnknownError>(
 /**
  * Union of the specific failure reasons that can be wrapped by a `WorkerError`.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
 export type WorkerErrorReason =
@@ -100,7 +100,7 @@ export type WorkerErrorReason =
 /**
  * Schema for decoding and encoding all supported worker error reason variants.
  *
- * @category models
+ * @category schemas
  * @since 4.0.0
  */
 export const WorkerErrorReason: Schema.Union<[
@@ -119,10 +119,10 @@ export const WorkerErrorReason: Schema.Union<[
  * Error raised by worker APIs, wrapping a specific `WorkerErrorReason` and
  * exposing its message and cause.
  *
- * @category models
+ * @category errors
  * @since 4.0.0
  */
-export class WorkerError extends Schema.ErrorClass<WorkerError>(TypeId)({
+export class WorkerError extends Schema.Error<WorkerError>(TypeId)({
   _tag: Schema.tag("WorkerError"),
   reason: WorkerErrorReason
 }) {

package/src/unstable/workers/WorkerRunner.ts

@@ -49,7 +49,7 @@ export type PlatformMessage<I> = readonly [request: 0, I] | readonly [close: 1]
 /**
  * Context service that starts a platform-specific `WorkerRunner`.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export class WorkerRunnerPlatform extends Context.Service<WorkerRunnerPlatform, {

package/src/unstable/workflow/Activity.ts

@@ -237,7 +237,7 @@ export const retry: {
  * Context reference containing the current activity retry attempt, defaulting
  * to `1`.
  *
- * @category Attempts
+ * @category services
  * @since 4.0.0
  */
 export const CurrentAttempt = Context.Reference<number>(
@@ -249,7 +249,7 @@ export const CurrentAttempt = Context.Reference<number>(
  * Computes a deterministic activity idempotency key from the current workflow
  * execution ID, the supplied name, and optionally the current attempt.
  *
- * @category Idempotency
+ * @category idempotency
  * @since 4.0.0
  */
 export const idempotencyKey: (

package/src/unstable/workflow/DurableClock.ts

@@ -64,7 +64,7 @@ const InstanceTag = Context.Service<
  * Waits inside a workflow, using an in-memory activity for durations at or
  * below the threshold and scheduling a durable clock for longer durations.
  *
- * @category sleeping
+ * @category delays & timeouts
  * @since 4.0.0
  */
 export const sleep: (

package/src/unstable/workflow/DurableDeferred.ts

@@ -144,6 +144,8 @@ const await_: <Success extends Schema.Constraint, Error extends Schema.Constrain
 >(self: DurableDeferred<Success, Error>) {
   const engine = yield* EngineTag
   const instance = yield* InstanceTag
+  // Register before the read so any later completion can preempt the run.
+  instance.awaitedDeferreds.add(self.name)
   const exit = yield* Workflow.wrapActivityResult(
     engine.deferredResult(self),
     Option.isNone
@@ -237,9 +239,12 @@ export const into: {
                 exit.cause.reasons,
                 Filter.fromPredicate(Cause.isInterruptReason)
               )
-              const hasInterruptsOnly = interrupts.length === exit.cause.reasons.length
-              if (hasInterruptsOnly && instance.suspended) {
-                parentInstance.suspended = true
+              if (interrupts.length === exit.cause.reasons.length) {
+                // An interrupt-only exit is never a result: the effect was
+                // suspended, preempted or interrupted, so record nothing.
+                if (instance.suspended) {
+                  parentInstance.suspended = true
+                }
                 return
               } else if (interrupts.length > 0) {
                 exit = Exit.failCause(Cause.fromReasons(reasons))
@@ -321,7 +326,7 @@ export type TokenTypeId = typeof TokenTypeId
  * Branded string token identifying a durable deferred for a workflow
  * execution.
  *
- * @category token
+ * @category models
  * @since 4.0.0
  */
 export type Token = Brand.Branded<string, TokenTypeId>
@@ -329,7 +334,7 @@ export type Token = Brand.Branded<string, TokenTypeId>
 /**
  * Schema for branded durable deferred tokens.
  *
- * @category token
+ * @category schemas
  * @since 4.0.0
  */
 export const Token: Schema.brand<Schema.String, TokenTypeId> = Schema.String.pipe(Schema.brand(TokenTypeId))
@@ -338,7 +343,7 @@ export const Token: Schema.brand<Schema.String, TokenTypeId> = Schema.String.pip
  * Schema for a decoded durable deferred token containing the workflow
  * name, execution ID, and deferred name.
  *
- * @category token
+ * @category schemas
  * @since 4.0.0
  */
 export class TokenParsed extends Schema.Class<TokenParsed>(
@@ -413,7 +418,7 @@ export class TokenParsed extends Schema.Class<TokenParsed>(
  * Creates a token for a durable deferred using the current workflow instance's
  * workflow name and execution ID.
  *
- * @category token
+ * @category constructors
  * @since 4.0.0
  */
 export const token: <Success extends Schema.Constraint, Error extends Schema.Constraint>(
@@ -431,7 +436,7 @@ export const token: <Success extends Schema.Constraint, Error extends Schema.Con
  * Creates a durable deferred token from an explicit workflow, execution ID,
  * and deferred name.
  *
- * @category token
+ * @category constructors
  * @since 4.0.0
  */
 export const tokenFromExecutionId: {
@@ -439,7 +444,7 @@ export const tokenFromExecutionId: {
    * Creates a durable deferred token from an explicit workflow, execution ID,
    * and deferred name.
    *
-   * @category token
+   * @category constructors
    * @since 4.0.0
    */
   (
@@ -454,7 +459,7 @@ export const tokenFromExecutionId: {
    * Creates a durable deferred token from an explicit workflow, execution ID,
    * and deferred name.
    *
-   * @category token
+   * @category constructors
    * @since 4.0.0
    */
   <Success extends Schema.Constraint, Error extends Schema.Constraint>(
@@ -481,7 +486,7 @@ export const tokenFromExecutionId: {
  * Creates a durable deferred token by deriving the workflow execution ID from
  * the supplied workflow payload.
  *
- * @category token
+ * @category constructors
  * @since 4.0.0
  */
 export const tokenFromPayload: {
@@ -489,7 +494,7 @@ export const tokenFromPayload: {
    * Creates a durable deferred token by deriving the workflow execution ID from
    * the supplied workflow payload.
    *
-   * @category token
+   * @category constructors
    * @since 4.0.0
    */
   <W extends Workflow.Any>(
@@ -504,7 +509,7 @@ export const tokenFromPayload: {
    * Creates a durable deferred token by deriving the workflow execution ID from
    * the supplied workflow payload.
    *
-   * @category token
+   * @category constructors
    * @since 4.0.0
    */
   <