effect 4.0.0-beta.34 → 4.0.0-beta.36

package/dist/unstable/httpapi/HttpApiMiddleware.d.ts

@@ -22,24 +22,26 @@ declare const SecurityTypeId = "~effect/httpapi/HttpApiMiddleware/Security";
  * @category guards
  */
 export declare const isSecurity: (u: AnyService) => u is AnyServiceSecurity;
+type ErrorConstraint = Schema.Top | ReadonlyArray<Schema.Top>;
+type ErrorSchemaFromConstraint<E> = E extends ReadonlyArray<Schema.Top> ? E[number] : E extends Schema.Top ? E : never;
 /**
  * @since 4.0.0
  * @category models
  */
-export type HttpApiMiddleware<Provides, E extends Schema.Top, Requires> = (httpEffect: Effect.Effect<HttpServerResponse, unhandled, Provides>, options: {
+export type HttpApiMiddleware<Provides, E extends ErrorConstraint, Requires> = (httpEffect: Effect.Effect<HttpServerResponse, unhandled, Provides>, options: {
     readonly endpoint: HttpApiEndpoint.AnyWithProps;
     readonly group: HttpApiGroup.AnyWithProps;
-}) => Effect.Effect<HttpServerResponse, unhandled | E["Type"], Requires | HttpRouter.Provided>;
+}) => Effect.Effect<HttpServerResponse, unhandled | ErrorSchemaFromConstraint<E>["Type"], Requires | HttpRouter.Provided>;
 /**
  * @since 4.0.0
  * @category models
  */
-export type HttpApiMiddlewareSecurity<Security extends Record<string, HttpApiSecurity.HttpApiSecurity>, Provides, E extends Schema.Top, Requires> = {
+export type HttpApiMiddlewareSecurity<Security extends Record<string, HttpApiSecurity.HttpApiSecurity>, Provides, E extends ErrorConstraint, Requires> = {
     readonly [K in keyof Security]: (httpEffect: Effect.Effect<HttpServerResponse, unhandled, Provides>, options: {
         readonly credential: HttpApiSecurity.HttpApiSecurity.Type<Security[K]>;
         readonly endpoint: HttpApiEndpoint.AnyWithProps;
         readonly group: HttpApiGroup.AnyWithProps;
-    }) => Effect.Effect<HttpServerResponse, unhandled | E["Type"], Requires | HttpRouter.Provided>;
+    }) => Effect.Effect<HttpServerResponse, unhandled | ErrorSchemaFromConstraint<E>["Type"], Requires | HttpRouter.Provided>;
 };
 /**
  * @since 4.0.0
@@ -68,7 +70,7 @@ export interface ForClient<Id> {
 export interface AnyService extends ServiceMap.Key<any, any> {
     readonly [TypeId]: typeof TypeId;
     readonly provides: any;
-    readonly error: Schema.Top;
+    readonly error: ReadonlySet<Schema.Top>;
     readonly requiredForClient: boolean;
     readonly "~ClientError": any;
 }
@@ -88,7 +90,7 @@ export interface AnyId {
     readonly [TypeId]: {
         readonly provides: any;
         readonly requires: any;
-        readonly error: Schema.Top;
+        readonly error: ErrorConstraint;
         readonly clientError: any;
         readonly requiredForClient: boolean;
     };
@@ -124,7 +126,7 @@ export type ErrorSchema<A> = A extends {
     readonly [TypeId]: {
         readonly error: infer E;
     };
-} ? E extends Schema.Top ? E : never : never;
+} ? ErrorSchemaFromConstraint<E> : never;
 /**
  * @since 4.0.0
  * @category models
@@ -166,7 +168,7 @@ export type ErrorServicesDecode<A> = ErrorSchema<A>["DecodingServices"];
 export type ServiceClass<Self, Id extends string, Config extends {
     requires: any;
     provides: any;
-    error: Schema.Top;
+    error: ErrorConstraint;
     clientError: any;
     requiredForClient: boolean;
     security: Record<string, HttpApiSecurity.HttpApiSecurity>;
@@ -181,7 +183,7 @@ export type ServiceClass<Self, Id extends string, Config extends {
         };
     };
     readonly [TypeId]: typeof TypeId;
-    readonly error: Config["error"];
+    readonly error: ReadonlySet<Schema.Top>;
     readonly requiredForClient: Config["requiredForClient"];
     readonly "~ClientError": Config["clientError"];
 } & ([keyof Config["security"]] extends [never] ? {} : {
@@ -200,7 +202,7 @@ export declare const Service: <Self, Config extends {
     requires: never;
     provides: never;
     clientError: never;
-}>() => <const Id extends string, Error extends Schema.Top = never, const Security extends Record<string, HttpApiSecurity.HttpApiSecurity> = never, RequiredForClient extends boolean = false>(id: Id, options?: {
+}>() => <const Id extends string, const Error extends ErrorConstraint = never, const Security extends Record<string, HttpApiSecurity.HttpApiSecurity> = never, RequiredForClient extends boolean = false>(id: Id, options?: {
     readonly error?: Error | undefined;
     readonly security?: Security | undefined;
     readonly requiredForClient?: RequiredForClient | undefined;
@@ -237,14 +239,14 @@ export declare const Service: <Self, Config extends {
  * @since 4.0.0
  * @category SchemaError transform
  */
-export declare const layerSchemaErrorTransform: <Id, E extends Schema.Top, Requires>(service: ServiceMap.Service<Id, HttpApiMiddleware<never, E, Requires>>, transform: (error: Schema.SchemaError, context: {
+export declare const layerSchemaErrorTransform: <Id, E extends ErrorConstraint, Requires>(service: ServiceMap.Service<Id, HttpApiMiddleware<never, E, Requires>>, transform: (error: Schema.SchemaError, context: {
     readonly endpoint: HttpApiEndpoint.AnyWithProps;
     readonly group: HttpApiGroup.AnyWithProps;
-}) => Effect.Effect<HttpServerResponse, E["Type"] | Schema.SchemaError, Requires | HttpRouter.Provided>) => Layer.Layer<Id>;
+}) => Effect.Effect<HttpServerResponse, ErrorSchemaFromConstraint<E>["Type"] | Schema.SchemaError, Requires | HttpRouter.Provided>) => Layer.Layer<Id>;
 /**
  * @since 4.0.0
  * @category client
  */
-export declare const layerClient: <Id extends AnyId, S, R, EX = never, RX = never>(tag: ServiceMap.Key<Id, S>, service: HttpApiMiddlewareClient<Id[typeof TypeId]["error"]["Type"], Id[typeof TypeId]["clientError"], R> | Effect.Effect<HttpApiMiddlewareClient<Id[typeof TypeId]["error"]["Type"], Id[typeof TypeId]["clientError"], R>, EX, RX>) => Layer.Layer<ForClient<Id>, EX, R | Exclude<RX, Scope>>;
+export declare const layerClient: <Id extends AnyId, S, R, EX = never, RX = never>(tag: ServiceMap.Key<Id, S>, service: HttpApiMiddlewareClient<Error<Id>, Id[typeof TypeId]["clientError"], R> | Effect.Effect<HttpApiMiddlewareClient<Error<Id>, Id[typeof TypeId]["clientError"], R>, EX, RX>) => Layer.Layer<ForClient<Id>, EX, R | Exclude<RX, Scope>>;
 export {};
 //# sourceMappingURL=HttpApiMiddleware.d.ts.map

package/dist/unstable/httpapi/HttpApiMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpApiMiddleware.d.ts","sourceRoot":"","sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpApiMiddleware.d.ts","sourceRoot":"","sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/unstable/httpapi/HttpApiMiddleware.js

@@ -32,10 +32,8 @@ export const Service = () => (id, options) => {
     }
   });
   self[TypeId] = TypeId;
+  self.error = getError(options?.error);
   self.requiredForClient = options?.requiredForClient ?? false;
-  if (options?.error !== undefined) {
-    self.error = options.error;
-  }
   if (options?.security !== undefined) {
     if (Object.keys(options.security).length === 0) {
       throw new Error("HttpApiMiddleware.Service: security object must not be empty");
@@ -45,6 +43,10 @@ export const Service = () => (id, options) => {
   }
   return self;
 };
+function getError(error) {
+  if (error === undefined) return new Set();
+  return new Set(Array.isArray(error) ? error : [error]);
+}
 /**
  * Implement a middleware Layer that transforms `SchemaError`'s.
  *

package/dist/unstable/httpapi/HttpApiMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpApiMiddleware.js","names":["Effect","Layer","hasProperty","Schema","Scope","ServiceMap","TypeId","SecurityTypeId","isSecurity","u","Service","id","options","Err","globalThis","Error","limit","stackTraceLimit","creationError","self","Object","defineProperty","get","stack","requiredForClient","error","undefined","security","keys","length","layerSchemaErrorTransform","service","transform","succeed","httpEffect","catch","e","isSchemaError","fail","layerClient","tag","effectServices","gen","services","pipe","omit","middleware","isEffect","makeUnsafe","Map","key","updateServices","requestContext","merge"],"sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,SAASC,WAAW,QAAQ,oBAAoB;AAChD,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,SAASC,KAAK,QAAQ,gBAAgB;AACtC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAWjD,MAAMC,MAAM,GAAG,mCAAmC;AAElD,MAAMC,cAAc,GAAG,4CAA4C;AAEnE;;;;AAIA,OAAO,MAAMC,UAAU,GAAIC,CAAa,IAA8BP,WAAW,CAACO,CAAC,EAAEF,cAAc,CAAC;AAwMpG;;;;AAIA,OAAO,MAAMG,OAAO,GAAGA,CAAA,KA2BvB,CACEC,EAAU,EACVC,OAIa,KACX;EACF,MAAMC,GAAG,GAAGC,UAAU,CAACC,KAAY;EACnC,MAAMC,KAAK,GAAGH,GAAG,CAACI,eAAe;EACjCJ,GAAG,CAACI,eAAe,GAAG,CAAC;EACvB,MAAMC,aAAa,GAAG,IAAIL,GAAG,EAAE;EAC/BA,GAAG,CAACI,eAAe,GAAGD,KAAK;EAE3B,MAAMN,OAAQ,SAAQL,UAAU,CAACK,OAAO,EAAa,CAACC,EAAE,CAAC;EACzD,MAAMQ,IAAI,GAAGT,OAAc;EAC3BU,MAAM,CAACC,cAAc,CAACX,OAAO,EAAE,OAAO,EAAE;IACtCY,GAAGA,CAAA;MACD,OAAOJ,aAAa,CAACK,KAAK;IAC5B;GACD,CAAC;EACFJ,IAAI,CAACb,MAAM,CAAC,GAAGA,MAAM;EACrBa,IAAI,CAACK,iBAAiB,GAAGZ,OAAO,EAAEY,iBAAiB,IAAI,KAAK;EAC5D,IAAIZ,OAAO,EAAEa,KAAK,KAAKC,SAAS,EAAE;IAChCP,IAAI,CAACM,KAAK,GAAGb,OAAO,CAACa,KAAK;EAC5B;EACA,IAAIb,OAAO,EAAEe,QAAQ,KAAKD,SAAS,EAAE;IACnC,IAAIN,MAAM,CAACQ,IAAI,CAAChB,OAAO,CAACe,QAAQ,CAAC,CAACE,MAAM,KAAK,CAAC,EAAE;MAC9C,MAAM,IAAId,KAAK,CAAC,8DAA8D,CAAC;IACjF;IACAI,IAAI,CAACZ,cAAc,CAAC,GAAGA,cAAc;IACrCY,IAAI,CAACQ,QAAQ,GAAGf,OAAO,CAACe,QAAQ;EAClC;EACA,OAAOR,IAAI;AACb,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,OAAO,MAAMW,yBAAyB,GAAGA,CACvCC,OAAsE,EACtEC,SAGsG,KAEtG/B,KAAK,CAACgC,OAAO,CACXF,OAAO,EACP,CAACG,UAAU,EAAEtB,OAAO,KAClBZ,MAAM,CAACmC,KAAK,CACVD,UAAU,EACTE,CAAC,IAIGjC,MAAM,CAACkC,aAAa,CAACD,CAAC,CAAC,GAAGJ,SAAS,CAACI,CAAC,EAAExB,OAAO,CAAC,GAAGZ,MAAM,CAACsC,IAAI,CAACF,CAAC,CAAC,CACtE,CACJ;AAEH;;;;AAIA,OAAO,MAAMG,WAAW,GAAGA,CACzBC,GAA0B,EAC1BT,OAMG,KAEH9B,KAAK,CAACwC,cAAc,CAACzC,MAAM,CAAC0C,GAAG,CAAC,aAAS;EACvC,MAAMC,QAAQ,GAAG,CAAC,OAAO3C,MAAM,CAAC2C,QAAQ,EAAa,EAAEC,IAAI,CACzDvC,UAAU,CAACwC,IAAI,CAACzC,KAAK,CAAC,CACK;EAC7B,MAAM0C,UAAU,GAAG9C,MAAM,CAAC+C,QAAQ,CAAChB,OAAO,CAAC,GAAG,OAAOA,OAAO,GAAGA,OAAO;EACtE,OAAO1B,UAAU,CAAC2C,UAAU,CAC1B,IAAIC,GAAG,CAAC,CAAC,CACP,GAAGT,GAAG,CAACU,GAAG,SAAS,EAClBtC,OAAY,IACXZ,MAAM,CAACmD,cAAc,CACnBL,UAAU,CAAClC,OAAO,CAAC,EAClBwC,cAAc,IAAK/C,UAAU,CAACgD,KAAK,CAACV,QAAQ,EAAES,cAAc,CAAC,CAC/D,CACJ,CAAC,CAAC,CACJ;AACH,CAAC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"HttpApiMiddleware.js","names":["Effect","Layer","hasProperty","Schema","Scope","ServiceMap","TypeId","SecurityTypeId","isSecurity","u","Service","id","options","Err","globalThis","Error","limit","stackTraceLimit","creationError","self","Object","defineProperty","get","stack","error","getError","requiredForClient","security","undefined","keys","length","Set","Array","isArray","layerSchemaErrorTransform","service","transform","succeed","httpEffect","catch","e","isSchemaError","fail","layerClient","tag","effectServices","gen","services","pipe","omit","middleware","isEffect","makeUnsafe","Map","key","updateServices","requestContext","merge"],"sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,SAASC,WAAW,QAAQ,oBAAoB;AAChD,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,SAASC,KAAK,QAAQ,gBAAgB;AACtC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAWjD,MAAMC,MAAM,GAAG,mCAAmC;AAElD,MAAMC,cAAc,GAAG,4CAA4C;AAEnE;;;;AAIA,OAAO,MAAMC,UAAU,GAAIC,CAAa,IAA8BP,WAAW,CAACO,CAAC,EAAEF,cAAc,CAAC;AAiNpG;;;;AAIA,OAAO,MAAMG,OAAO,GAAGA,CAAA,KA2BvB,CACEC,EAAU,EACVC,OAIa,KACX;EACF,MAAMC,GAAG,GAAGC,UAAU,CAACC,KAAY;EACnC,MAAMC,KAAK,GAAGH,GAAG,CAACI,eAAe;EACjCJ,GAAG,CAACI,eAAe,GAAG,CAAC;EACvB,MAAMC,aAAa,GAAG,IAAIL,GAAG,EAAE;EAC/BA,GAAG,CAACI,eAAe,GAAGD,KAAK;EAE3B,MAAMN,OAAQ,SAAQL,UAAU,CAACK,OAAO,EAAa,CAACC,EAAE,CAAC;EACzD,MAAMQ,IAAI,GAAGT,OAAc;EAC3BU,MAAM,CAACC,cAAc,CAACX,OAAO,EAAE,OAAO,EAAE;IACtCY,GAAGA,CAAA;MACD,OAAOJ,aAAa,CAACK,KAAK;IAC5B;GACD,CAAC;EACFJ,IAAI,CAACb,MAAM,CAAC,GAAGA,MAAM;EACrBa,IAAI,CAACK,KAAK,GAAGC,QAAQ,CAACb,OAAO,EAAEY,KAAK,CAAC;EACrCL,IAAI,CAACO,iBAAiB,GAAGd,OAAO,EAAEc,iBAAiB,IAAI,KAAK;EAC5D,IAAId,OAAO,EAAEe,QAAQ,KAAKC,SAAS,EAAE;IACnC,IAAIR,MAAM,CAACS,IAAI,CAACjB,OAAO,CAACe,QAAQ,CAAC,CAACG,MAAM,KAAK,CAAC,EAAE;MAC9C,MAAM,IAAIf,KAAK,CAAC,8DAA8D,CAAC;IACjF;IACAI,IAAI,CAACZ,cAAc,CAAC,GAAGA,cAAc;IACrCY,IAAI,CAACQ,QAAQ,GAAGf,OAAO,CAACe,QAAQ;EAClC;EACA,OAAOR,IAAI;AACb,CAAC;AAED,SAASM,QAAQA,CAACD,KAAkC;EAClD,IAAIA,KAAK,KAAKI,SAAS,EAAE,OAAO,IAAIG,GAAG,EAAE;EACzC,OAAO,IAAIA,GAAG,CAACC,KAAK,CAACC,OAAO,CAACT,KAAK,CAAC,GAAGA,KAAK,GAAG,CAACA,KAAK,CAAC,CAAC;AACxD;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,OAAO,MAAMU,yBAAyB,GAAGA,CACvCC,OAAsE,EACtEC,SAOC,KAEDnC,KAAK,CAACoC,OAAO,CACXF,OAAO,EACP,CAACG,UAAU,EAAE1B,OAAO,KAClBZ,MAAM,CAACuC,KAAK,CACVD,UAAU,EACTE,CAAC,IAIGrC,MAAM,CAACsC,aAAa,CAACD,CAAC,CAAC,GAAGJ,SAAS,CAACI,CAAC,EAAE5B,OAAO,CAAC,GAAGZ,MAAM,CAAC0C,IAAI,CAACF,CAAC,CAAC,CACtE,CACJ;AAEH;;;;AAIA,OAAO,MAAMG,WAAW,GAAGA,CACzBC,GAA0B,EAC1BT,OAMG,KAEHlC,KAAK,CAAC4C,cAAc,CAAC7C,MAAM,CAAC8C,GAAG,CAAC,aAAS;EACvC,MAAMC,QAAQ,GAAG,CAAC,OAAO/C,MAAM,CAAC+C,QAAQ,EAAa,EAAEC,IAAI,CACzD3C,UAAU,CAAC4C,IAAI,CAAC7C,KAAK,CAAC,CACK;EAC7B,MAAM8C,UAAU,GAAGlD,MAAM,CAACmD,QAAQ,CAAChB,OAAO,CAAC,GAAG,OAAOA,OAAO,GAAGA,OAAO;EACtE,OAAO9B,UAAU,CAAC+C,UAAU,CAC1B,IAAIC,GAAG,CAAC,CAAC,CACP,GAAGT,GAAG,CAACU,GAAG,SAAS,EAClB1C,OAAY,IACXZ,MAAM,CAACuD,cAAc,CACnBL,UAAU,CAACtC,OAAO,CAAC,EAClB4C,cAAc,IAAKnD,UAAU,CAACoD,KAAK,CAACV,QAAQ,EAAES,cAAc,CAAC,CAC/D,CACJ,CAAC,CAAC,CACJ;AACH,CAAC,CAAC,CAAC","ignoreList":[]}

package/dist/unstable/rpc/RpcSerialization.js

@@ -135,7 +135,7 @@ function decodeJsonRpcRaw(decoded, batches) {
     }
     return messages;
   }
-  return Array.isArray(decoded) ? decoded.map(decodeJsonRpcMessage) : [decodeJsonRpcMessage(decoded)];
+  return [decodeJsonRpcMessage(decoded)];
 }
 function decodeJsonRpcMessage(decoded) {
   if ("method" in decoded) {

package/dist/unstable/rpc/RpcSerialization.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcSerialization.js","names":["Msgpackr","Layer","Predicate","hasProperty","ServiceMap","RpcSerialization","Service","json","of","contentType","includesFraming","makeUnsafe","decoder","TextDecoder","decode","bytes","decoded","JSON","parse","Array","isArray","encode","response","stringify","ndjson","buffer","position","nlIndex","indexOf","items","item","slice","push","length","undefined","data","i","jsonRpc","options","batches","Map","decodeJsonRpcRaw","encoded","encodeJsonRpcResponse","ndJsonRpc","parser","frames","messages","frame","batch","size","responses","message","decodeJsonRpcMessage","_tag","set","id","map","method","startsWith","tag","requestId","params","String","payload","headers","spanId","traceId","sampled","error","defect","chunk","values","result","exit","cause","value","encodeJsonRpcRaw","encodeJsonRpcMessage","get","delete","from","current","jsonrpc","Number","find","failure","code","jsonRpcInternalError","msgPack","unpackr","Unpackr","useRecords","packr","Packr","encoder","TextEncoder","incomplete","buf","prev","Uint8Array","unpackMultiple","error_","subarray","lastPosition","pack","layerJson","succeed","layerNdjson","layerJsonRpc","layerNdJsonRpc","layerMsgPack"],"sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"RpcSerialization.js","names":["Msgpackr","Layer","Predicate","hasProperty","ServiceMap","RpcSerialization","Service","json","of","contentType","includesFraming","makeUnsafe","decoder","TextDecoder","decode","bytes","decoded","JSON","parse","Array","isArray","encode","response","stringify","ndjson","buffer","position","nlIndex","indexOf","items","item","slice","push","length","undefined","data","i","jsonRpc","options","batches","Map","decodeJsonRpcRaw","encoded","encodeJsonRpcResponse","ndJsonRpc","parser","frames","messages","frame","batch","size","responses","message","decodeJsonRpcMessage","_tag","set","id","method","startsWith","tag","requestId","params","String","payload","headers","spanId","traceId","sampled","error","defect","chunk","values","result","exit","cause","value","encodeJsonRpcRaw","encodeJsonRpcMessage","get","delete","from","current","jsonrpc","Number","find","failure","code","jsonRpcInternalError","msgPack","unpackr","Unpackr","useRecords","packr","Packr","encoder","TextEncoder","incomplete","buf","prev","Uint8Array","unpackMultiple","error_","subarray","lastPosition","pack","layerJson","succeed","layerNdjson","layerJsonRpc","layerNdJsonRpc","layerMsgPack"],"sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-beta.34",
+  "version": "4.0.0-beta.36",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",

package/src/Channel.ts

@@ -92,7 +92,17 @@ import { ParentSpan, type SpanOptions } from "./Tracer.ts"
 import type * as Types from "./Types.ts"
 import type * as Unify from "./Unify.ts"
 
-const TypeId = "~effect/Channel"
+/**
+ * @since 4.0.0
+ * @category Type Identifiers
+ */
+export type TypeId = "~effect/Channel"
+
+/**
+ * @since 4.0.0
+ * @category Type Identifiers
+ */
+export const TypeId: TypeId = "~effect/Channel"
 
 /**
  * Tests if a value is a `Channel`.
@@ -4580,17 +4590,19 @@ export const scanEffect: {
     Effect.map(toTransform(self)(upstream, scope), (pull) => {
       let state = initial
       let isFirst = true
-      if (isFirst) {
-        isFirst = false
-        return Effect.succeed(state)
-      }
-      return Effect.map(
-        Effect.flatMap(pull, (a) => f(state, a)),
-        (newState) => {
-          state = newState
-          return state
+      return Effect.suspend(() => {
+        if (isFirst) {
+          isFirst = false
+          return Effect.succeed(state)
         }
-      )
+        return Effect.map(
+          Effect.flatMap(pull, (a) => f(state, a)),
+          (newState) => {
+            state = newState
+            return state
+          }
+        )
+      })
     })
   ))
 

package/src/Config.ts

@@ -680,6 +680,11 @@ export const withDefault: {
 export const option = <A>(self: Config<A>): Config<Option.Option<A>> =>
   self.pipe(map(Option.some), withDefault(Option.none()))
 
+/**
+ * @since 3.0.0
+ */
+export type Success<T> = [T] extends [Config<infer A>] ? A : never
+
 /**
  * Utility type that recursively replaces primitives with `Config` in a nested
  * structure.

package/src/Cron.ts

@@ -100,6 +100,15 @@ export interface Cron extends Pipeable, Equal.Equal, Inspectable {
     readonly weekday: number
   }
   /** @internal */
+  readonly last: {
+    readonly second: number
+    readonly minute: number
+    readonly hour: number
+    readonly day: number
+    readonly month: number
+    readonly weekday: number
+  }
+  /** @internal */
   readonly next: {
     readonly second: ReadonlyArray<number | undefined>
     readonly minute: ReadonlyArray<number | undefined>
@@ -108,6 +117,15 @@ export interface Cron extends Pipeable, Equal.Equal, Inspectable {
     readonly month: ReadonlyArray<number | undefined>
     readonly weekday: ReadonlyArray<number | undefined>
   }
+  /** @internal */
+  readonly prev: {
+    readonly second: ReadonlyArray<number | undefined>
+    readonly minute: ReadonlyArray<number | undefined>
+    readonly hour: ReadonlyArray<number | undefined>
+    readonly day: ReadonlyArray<number | undefined>
+    readonly month: ReadonlyArray<number | undefined>
+    readonly weekday: ReadonlyArray<number | undefined>
+  }
 }
 
 function toPojo(cron: Cron): Record<string, unknown> {
@@ -325,31 +343,64 @@ export const make = (values: {
     weekday: weekdays[0] ?? 0
   }
 
+  o.last = {
+    second: seconds[seconds.length - 1] ?? 59,
+    minute: minutes[minutes.length - 1] ?? 59,
+    hour: hours[hours.length - 1] ?? 23,
+    day: days[days.length - 1] ?? 31,
+    month: (months[months.length - 1] ?? 12) - 1,
+    weekday: weekdays[weekdays.length - 1] ?? 6
+  }
+
   o.next = {
-    second: nextLookupTable(seconds, 60),
-    minute: nextLookupTable(minutes, 60),
-    hour: nextLookupTable(hours, 24),
-    day: nextLookupTable(days, 32),
-    month: nextLookupTable(months, 13),
-    weekday: nextLookupTable(weekdays, 7)
+    second: lookupTable(seconds, 60, "next"),
+    minute: lookupTable(minutes, 60, "next"),
+    hour: lookupTable(hours, 24, "next"),
+    day: lookupTable(days, 32, "next"),
+    month: lookupTable(months, 13, "next"),
+    weekday: lookupTable(weekdays, 7, "next")
+  }
+
+  o.prev = {
+    second: lookupTable(seconds, 60, "prev"),
+    minute: lookupTable(minutes, 60, "prev"),
+    hour: lookupTable(hours, 24, "prev"),
+    day: lookupTable(days, 32, "prev"),
+    month: lookupTable(months, 13, "prev"),
+    weekday: lookupTable(weekdays, 7, "prev")
   }
 
   return o
 }
 
-const nextLookupTable = (values: ReadonlyArray<number>, size: number): Array<number | undefined> => {
+const lookupTable = (
+  values: ReadonlyArray<number>,
+  size: number,
+  dir: "next" | "prev"
+): Array<number | undefined> => {
   const result = new Array(size).fill(undefined)
   if (values.length === 0) {
     return result
   }
 
   let current: number | undefined = undefined
-  let index = values.length - 1
-  for (let i = size - 1; i >= 0; i--) {
-    while (index >= 0 && values[index] >= i) {
-      current = values[index--]
+
+  if (dir === "next") {
+    let index = values.length - 1
+    for (let i = size - 1; i >= 0; i--) {
+      while (index >= 0 && values[index] >= i) {
+        current = values[index--]
+      }
+      result[i] = current
+    }
+  } else {
+    let index = 0
+    for (let i = 0; i < size; i++) {
+      while (index < values.length && values[index] <= i) {
+        current = values[index++]
+      }
+      result[i] = current
     }
-    result[i] = current
   }
 
   return result
@@ -587,38 +638,61 @@ const daysInMonth = (date: Date): number =>
  * @category utils
  */
 export const next = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
+  return stepCron(cron, now, "next")
+}
+
+/**
+ * Returns the previous scheduled date/time for the given Cron instance.
+ *
+ * @since 4.0.0
+ * @category utils
+ */
+export const prev = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
+  return stepCron(cron, now, "prev")
+}
+
+const stepCron = (cron: Cron, now: DateTime.DateTime.Input | undefined, direction: "next" | "prev"): Date => {
   const tz = Option.getOrUndefined(cron.tz)
   const zoned = dateTime.makeZonedUnsafe(now ?? new Date(), {
     timeZone: tz
   })
 
+  const reverse = direction === "prev"
+  const tick = reverse ? -1 : 1
+  const table = cron[direction]
+  const boundary = reverse ? cron.last : cron.first
+
+  const needsStep = reverse ?
+    (next: number, current: number) => next < current :
+    (next: number, current: number) => next > current
+
   const utc = tz !== undefined && dateTime.isTimeZoneNamed(tz) && tz.id === "UTC"
   const adjustDst = utc ? constVoid : (current: Date) => {
     const adjusted = dateTime.makeZonedUnsafe(current, {
       timeZone: zoned.zone,
-      adjustForTimeZone: true
+      adjustForTimeZone: true,
+      disambiguation: reverse ? "later" : undefined
     }).pipe(dateTime.toDate)
 
-    // TODO: This implementation currently only skips forward when transitioning into daylight savings time.
     const drift = current.getTime() - adjusted.getTime()
-    if (drift > 0) {
-      current.setTime(current.getTime() + drift)
+    if (reverse ? drift !== 0 : drift > 0) {
+      current.setTime(reverse ? adjusted.getTime() : current.getTime() + drift)
     }
   }
 
   const result = dateTime.mutate(zoned, (current) => {
-    current.setUTCSeconds(current.getUTCSeconds() + 1, 0)
+    current.setUTCSeconds(current.getUTCSeconds() + tick, 0)
 
     for (let i = 0; i < 10_000; i++) {
       if (cron.seconds.size !== 0) {
         const currentSecond = current.getUTCSeconds()
-        const nextSecond = cron.next.second[currentSecond]
+        const nextSecond = table.second[currentSecond]
         if (nextSecond === undefined) {
-          current.setUTCMinutes(current.getUTCMinutes() + 1, cron.first.second)
+          current.setUTCMinutes(current.getUTCMinutes() + tick, boundary.second)
           adjustDst(current)
           continue
         }
-        if (nextSecond > currentSecond) {
+        if (needsStep(nextSecond, currentSecond)) {
           current.setUTCSeconds(nextSecond)
           adjustDst(current)
           continue
@@ -627,14 +701,14 @@ export const next = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
 
       if (cron.minutes.size !== 0) {
         const currentMinute = current.getUTCMinutes()
-        const nextMinute = cron.next.minute[currentMinute]
+        const nextMinute = table.minute[currentMinute]
         if (nextMinute === undefined) {
-          current.setUTCHours(current.getUTCHours() + 1, cron.first.minute, cron.first.second)
+          current.setUTCHours(current.getUTCHours() + tick, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
-        if (nextMinute > currentMinute) {
-          current.setUTCMinutes(nextMinute, cron.first.second)
+        if (needsStep(nextMinute, currentMinute)) {
+          current.setUTCMinutes(nextMinute, boundary.second)
           adjustDst(current)
           continue
         }
@@ -642,40 +716,55 @@ export const next = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
 
       if (cron.hours.size !== 0) {
         const currentHour = current.getUTCHours()
-        const nextHour = cron.next.hour[currentHour]
+        const nextHour = table.hour[currentHour]
         if (nextHour === undefined) {
-          current.setUTCDate(current.getUTCDate() + 1)
-          current.setUTCHours(cron.first.hour, cron.first.minute, cron.first.second)
+          current.setUTCDate(current.getUTCDate() + tick)
+          current.setUTCHours(boundary.hour, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
-        if (nextHour > currentHour) {
-          current.setUTCHours(nextHour, cron.first.minute, cron.first.second)
+        if (needsStep(nextHour, currentHour)) {
+          current.setUTCHours(nextHour, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
       }
 
       if (cron.weekdays.size !== 0 || cron.days.size !== 0) {
-        let a: number = Infinity
-        let b: number = Infinity
+        let a: number = reverse ? -Infinity : Infinity
+        let b: number = reverse ? -Infinity : Infinity
 
         if (cron.weekdays.size !== 0) {
           const currentWeekday = current.getUTCDay()
-          const nextWeekday = cron.next.weekday[currentWeekday]
-          a = nextWeekday === undefined ? 7 - currentWeekday + cron.first.weekday : nextWeekday - currentWeekday
+          const nextWeekday = table.weekday[currentWeekday]
+          if (nextWeekday === undefined) {
+            a = reverse ?
+              currentWeekday - 7 + boundary.weekday :
+              7 - currentWeekday + boundary.weekday
+          } else {
+            a = nextWeekday - currentWeekday
+          }
         }
 
         if (cron.days.size !== 0 && a !== 0) {
           const currentDay = current.getUTCDate()
-          const nextDay = cron.next.day[currentDay]
-          b = nextDay === undefined ? daysInMonth(current) - currentDay + cron.first.day : nextDay - currentDay
+          const nextDay = table.day[currentDay]
+          if (nextDay === undefined) {
+            if (reverse) {
+              const prevMonthDays = daysInMonth(new Date(Date.UTC(current.getUTCFullYear(), current.getUTCMonth(), 0)))
+              b = -(currentDay + (prevMonthDays - boundary.day))
+            } else {
+              b = daysInMonth(current) - currentDay + boundary.day
+            }
+          } else {
+            b = nextDay - currentDay
+          }
         }
 
-        const addDays = Math.min(a, b)
+        const addDays = reverse ? Math.max(a, b) : Math.min(a, b)
         if (addDays !== 0) {
           current.setUTCDate(current.getUTCDate() + addDays)
-          current.setUTCHours(cron.first.hour, cron.first.minute, cron.first.second)
+          current.setUTCHours(boundary.hour, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
@@ -683,17 +772,25 @@ export const next = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
 
       if (cron.months.size !== 0) {
         const currentMonth = current.getUTCMonth() + 1
-        const nextMonth = cron.next.month[currentMonth]
+        const nextMonth = table.month[currentMonth]
+        const clampBoundaryDay = (targetMonthIndex: number): number => {
+          if (cron.days.size !== 0) {
+            return boundary.day
+          }
+          const maxDayInMonth = daysInMonth(new Date(Date.UTC(current.getUTCFullYear(), targetMonthIndex + 1, 0)))
+          return Math.min(boundary.day, maxDayInMonth)
+        }
         if (nextMonth === undefined) {
-          current.setUTCFullYear(current.getUTCFullYear() + 1)
-          current.setUTCMonth(cron.first.month, cron.first.day)
-          current.setUTCHours(cron.first.hour, cron.first.minute, cron.first.second)
+          current.setUTCFullYear(current.getUTCFullYear() + tick)
+          current.setUTCMonth(boundary.month, clampBoundaryDay(boundary.month))
+          current.setUTCHours(boundary.hour, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
-        if (nextMonth > currentMonth) {
-          current.setUTCMonth(nextMonth - 1, cron.first.day)
-          current.setUTCHours(cron.first.hour, cron.first.minute, cron.first.second)
+        if (needsStep(nextMonth, currentMonth)) {
+          const targetMonthIndex = nextMonth - 1
+          current.setUTCMonth(targetMonthIndex, clampBoundaryDay(targetMonthIndex))
+          current.setUTCHours(boundary.hour, boundary.minute, boundary.second)
           adjustDst(current)
           continue
         }
@@ -702,7 +799,7 @@ export const next = (cron: Cron, now?: DateTime.DateTime.Input): Date => {
       return
     }
 
-    throw new Error("Unable to find next cron date")
+    throw new Error("Unable to find " + direction + " cron date")
   })
 
   return dateTime.toDateUtc(result)