@livestore/utils 0.4.0 → 0.5.0-dev.0

package/dist/effect/RpcClient.js

@@ -1,29 +1,33 @@
-export * from '@effect/rpc/RpcClient';
-import { Socket } from '@effect/platform';
-import { RpcClient, RpcClientError, RpcSerialization } from '@effect/rpc';
-import { Protocol } from '@effect/rpc/RpcClient';
-import { constPing } from '@effect/rpc/RpcMessage';
-import { Cause, Deferred, Effect, Layer, Option, Schedule } from 'effect';
-import { constVoid, identity } from 'effect/Function';
+export * from 'effect/unstable/rpc/RpcClient';
+import { Cause, Deferred, Effect, Function, Latch, Layer, References, Result, Schedule } from 'effect';
+import { RpcClient, RpcClientError, RpcSerialization } from 'effect/unstable/rpc';
+import { Protocol } from 'effect/unstable/rpc/RpcClient';
+import { constPing } from 'effect/unstable/rpc/RpcMessage';
+import { Socket } from 'effect/unstable/socket';
 import * as SubscriptionRef from "./SubscriptionRef.js";
 // This is based on `makeProtocolSocket` / `layerProtocolSocket` from `@effect/rpc` in order to:
 // - Add a `isConnected` subscription ref to track the connection state
 // - Add a ping schedule to the socket
 // - Add a retry schedule to the socket
-export const layerProtocolSocketWithIsConnected = (options) => Layer.scoped(Protocol, makeProtocolSocketWithIsConnected(options));
-export const makeProtocolSocketWithIsConnected = (options) => Protocol.make(Effect.fnUntraced(function* (writeResponse) {
+export const layerProtocolSocketWithIsConnected = (options) => Layer.effect(Protocol, makeProtocolSocketWithIsConnected(options));
+export const makeProtocolSocketWithIsConnected = (options) => Protocol.make(Effect.fnUntraced(function* (writeResponse, clientIds) {
     const socket = yield* Socket.Socket;
     const serialization = yield* RpcSerialization.RpcSerialization;
+    const requestClientMap = new Map();
     const write = yield* socket.writer;
-    const parser = serialization.unsafeMake();
+    let parser = serialization.makeUnsafe();
     const pinger = yield* makePinger(write(parser.encode(constPing)), options?.pingSchedule);
+    let currentError;
+    const markConnected = SubscriptionRef.set(options.isConnected, true);
+    const broadcast = (response) => Effect.forEach(clientIds, (clientId) => writeResponse(clientId, response));
     yield* Effect.suspend(() => {
         // We rely on the heartbeat watchdog while streaming arbitrarily long payloads.
         // Reset the timer as soon as _any_ frame arrives so that large batches which
         // don't contain explicit `Pong` messages don't trigger the open-timeout defect.
         // (The actual pong handler still calls `onPong()` to resolve manual pings.)
         // CHANGED: don't reset parser on every message
-        // parser = serialization.unsafeMake()
+        // parser = serialization.makeUnsafe()
+        currentError = undefined;
         pinger.reset();
         return socket
             .runRaw((message) => {
@@ -41,66 +45,82 @@ export const makeProtocolSocketWithIsConnected = (options) => Protocol.make(Effe
                         pinger.reset();
                         if (response._tag === 'Pong') {
                             pinger.onPong();
+                            return markConnected;
                         }
-                        return writeResponse(response).pipe(
-                        // CHANGED: set isConnected to true on pong
-                        Effect.tap(Effect.fn(function* () {
-                            if (options?.isConnected !== undefined) {
-                                yield* SubscriptionRef.set(options.isConnected, true);
+                        if ('requestId' in response) {
+                            const clientId = requestClientMap.get(response.requestId);
+                            if (clientId !== undefined) {
+                                if (response._tag === 'Exit') {
+                                    requestClientMap.delete(response.requestId);
+                                }
+                                return markConnected.pipe(Effect.andThen(writeResponse(clientId, response)));
                             }
-                        })));
+                        }
+                        return markConnected.pipe(Effect.andThen(broadcast(response)));
                     },
-                    step: constVoid,
+                    step: Function.constVoid,
                 });
             }
             catch (defect) {
-                return writeResponse({
+                return broadcast({
                     _tag: 'ClientProtocolError',
                     error: new RpcClientError.RpcClientError({
-                        reason: 'Protocol',
-                        message: 'Error decoding message',
-                        cause: Cause.fail(defect),
+                        reason: new RpcClientError.RpcClientDefect({
+                            message: 'Error decoding message',
+                            cause: defect,
+                        }),
                     }),
                 });
             }
         })
-            .pipe(Effect.raceFirst(Effect.zipRight(pinger.timeout, Effect.fail(new Socket.SocketGenericError({
-            reason: 'OpenTimeout',
-            cause: new Error('ping timeout'),
+            .pipe(Effect.raceFirst(Effect.flatMap(pinger.timeout, () => Effect.fail(new Socket.SocketError({
+            reason: new Socket.SocketOpenError({
+                kind: 'Timeout',
+                cause: new Error('ping timeout'),
+            }),
         })))));
-    }).pipe(Effect.zipRight(Effect.fail(new Socket.SocketCloseError({
-        reason: 'Close',
-        code: 1000,
-        closeReason: 'Closing connection',
-    }))), Effect.tapErrorCause(Effect.fn(function* (cause) {
+    }).pipe(Effect.flatMap(() => Effect.fail(new Socket.SocketError({
+        reason: new Socket.SocketCloseError({
+            code: 1000,
+            closeReason: 'Closing connection',
+        }),
+    }))), Effect.tapCause(Effect.fn(function* (cause) {
         // CHANGED: set isConnected to false on error
-        if (options?.isConnected !== undefined) {
-            yield* SubscriptionRef.set(options.isConnected, false);
-        }
-        const error = Cause.failureOption(cause);
+        yield* SubscriptionRef.set(options.isConnected, false);
+        const error = Cause.findError(cause);
         if (options?.retryTransientErrors !== undefined &&
-            Option.isSome(error) === true &&
-            (error.value.reason === 'Open' || error.value.reason === 'OpenTimeout')) {
+            Result.isSuccess(error) === true &&
+            error.success.reason._tag === 'SocketOpenError') {
             return;
         }
         // yield* Effect.logError('Error in socket', cause)
-        return yield* writeResponse({
+        currentError = new RpcClientError.RpcClientError({
+            reason: Result.isSuccess(error) === true
+                ? error.success.reason
+                : new RpcClientError.RpcClientDefect({
+                    message: 'Unknown socket error',
+                    cause: Cause.squash(cause),
+                }),
+        });
+        return yield* broadcast({
             _tag: 'ClientProtocolError',
-            error: new RpcClientError.RpcClientError({
-                reason: 'Protocol',
-                message: 'Error in socket',
-                cause: Cause.squash(cause),
-            }),
+            error: currentError,
         });
     })), 
     // CHANGED: make configurable via schedule
-    options?.retryTransientErrors !== undefined ? Effect.retry(options.retryTransientErrors) : identity, Effect.annotateLogs({
+    options?.retryTransientErrors !== undefined ? Effect.retry(options.retryTransientErrors) : Function.identity, Effect.annotateLogs({
         module: 'RpcClient',
         method: 'makeProtocolSocket',
     }), Effect.interruptible, Effect.ignore, // Errors are already handled
-    Effect.provide(Layer.setUnhandledErrorLogLevel(Option.none())), Effect.forkScoped);
+    Effect.provideService(References.UnhandledLogLevel, undefined), Effect.forkScoped);
     return {
-        send: (request) => {
+        send: (clientId, request) => {
+            if (currentError !== undefined) {
+                return Effect.fail(currentError);
+            }
+            if (request._tag === 'Request') {
+                requestClientMap.set(request.id, clientId);
+            }
             const encoded = parser.encode(request);
             if (encoded === undefined)
                 return Effect.void;
@@ -112,28 +132,28 @@ export const makeProtocolSocketWithIsConnected = (options) => Protocol.make(Effe
     };
 }));
 export const SocketPinger = Effect.map(RpcClient.Protocol, (protocol) => protocol.pinger);
-const makePinger = Effect.fnUntraced(function* (writePing, pingSchedule = Schedule.spaced(10000).pipe(Schedule.addDelay(() => 5000))) {
+const makePinger = Effect.fnUntraced(function* (writePing, pingSchedule = Schedule.spaced(10000).pipe(Schedule.addDelay(() => Effect.succeed(5000)))) {
     // CHANGED: add manual ping deferreds
     const manualPingDeferreds = new Set();
     let recievedPong = true;
-    const latch = Effect.unsafeMakeLatch();
+    const latch = Latch.makeUnsafe();
     const reset = () => {
         recievedPong = true;
-        latch.unsafeClose();
+        latch.closeUnsafe();
     };
     const onPong = () => {
         recievedPong = true;
         // CHANGED: mark all manual ping deferreds as done
         for (const deferred of manualPingDeferreds) {
-            Deferred.unsafeDone(deferred, Effect.void);
+            Deferred.doneUnsafe(deferred, Effect.void);
         }
     };
     yield* Effect.suspend(() => {
         // Starting new ping
         if (recievedPong === false)
-            return latch.open;
+            return Effect.asVoid(latch.open);
         recievedPong = false;
-        return writePing;
+        return Effect.asVoid(writePing);
     }).pipe(
     // CHANGED: make configurable via schedule
     Effect.schedule(pingSchedule), Effect.ignore, Effect.forever, Effect.interruptible, Effect.forkScoped);
@@ -141,7 +161,7 @@ const makePinger = Effect.fnUntraced(function* (writePing, pingSchedule = Schedu
     const ping = Effect.gen(function* () {
         const deferred = yield* Deferred.make();
         manualPingDeferreds.add(deferred);
-        yield* deferred;
+        yield* Deferred.await(deferred);
         manualPingDeferreds.delete(deferred);
     });
     return { timeout: latch.await, reset, onPong, ping };

package/dist/effect/RpcClient.js.map

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

package/dist/effect/Schedule.d.ts

@@ -1,4 +1,4 @@
 import { Duration, Schedule } from 'effect';
 export * from 'effect/Schedule';
-export declare const exponentialBackoff10Sec: Schedule.Schedule<Duration.DurationInput>;
+export declare const exponentialBackoff10Sec: Schedule.Schedule<Duration.Duration, unknown, never, never>;
 //# sourceMappingURL=Schedule.d.ts.map

package/dist/effect/Schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schedule.d.ts","sourceRoot":"","sources":["../../src/effect/Schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAQ,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEjD,cAAc,iBAAiB,CAAA;AAE/B,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAK7E,CAAA"}
+{"version":3,"file":"Schedule.d.ts","sourceRoot":"","sources":["../../src/effect/Schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAgB,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEzD,cAAc,iBAAiB,CAAA;AAE/B,eAAO,MAAM,uBAAuB,6DAInC,CAAA"}

package/dist/effect/Schedule.js

@@ -1,5 +1,5 @@
-import { Duration, pipe, Schedule } from 'effect';
+import { Duration, Effect, pipe, Schedule } from 'effect';
 export * from 'effect/Schedule';
 export const exponentialBackoff10Sec = pipe(Schedule.exponential(Duration.millis(10), 4), // 10ms, 40ms, 160ms, 640ms, 2560ms, ...
-Schedule.andThenEither(Schedule.spaced(Duration.seconds(1))), Schedule.compose(Schedule.elapsed), Schedule.whileOutput(Duration.lessThanOrEqualTo(Duration.seconds(10))));
+Schedule.modifyDelay(({ duration }) => Effect.succeed(Duration.min(duration, Duration.seconds(1)))), Schedule.upTo({ duration: Duration.seconds(10) }));
 //# sourceMappingURL=Schedule.js.map

package/dist/effect/Schedule.js.map

@@ -1 +1 @@
-{"version":3,"file":"Schedule.js","sourceRoot":"","sources":["../../src/effect/Schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEjD,cAAc,iBAAiB,CAAA;AAE/B,MAAM,CAAC,MAAM,uBAAuB,GAA8C,IAAI,CACpF,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,wCAAwC;AACtF,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAC5D,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAClC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CACvE,CAAA"}
+{"version":3,"file":"Schedule.js","sourceRoot":"","sources":["../../src/effect/Schedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEzD,cAAc,iBAAiB,CAAA;AAE/B,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CACzC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,wCAAwC;AACtF,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACnG,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAClD,CAAA"}

package/dist/effect/Schema/debug-diff.d.ts

@@ -8,5 +8,5 @@ export type DiffItem = {
 /**
  * Diffs two values for a given schema and traverses downwards and returns a list of differences.
  */
-export declare const debugDiff: <A, I, R>(base: Schema.Schema<A, I, R>) => (a: A, b: A) => DiffItem[];
+export declare const debugDiff: <A, I, R>(base: Schema.Top) => (a: A, b: A) => DiffItem[];
 //# sourceMappingURL=debug-diff.d.ts.map

package/dist/effect/Schema/debug-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-diff.d.ts","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAE1C,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,EAAE,GAAG,CAAA;IACN,CAAC,EAAE,GAAG,CAAA;IACN,GAAG,EAAE,SAAS,CAAC,GAAG,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GACnB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,MACrC,GAAG,CAAC,EAAE,GAAG,CAAC,KAAG,QAAQ,EAIrB,CAAA"}
+{"version":3,"file":"debug-diff.d.ts","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAE1C,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,CAAC,EAAE,GAAG,CAAA;IACN,CAAC,EAAE,GAAG,CAAA;IACN,GAAG,EAAE,SAAS,CAAC,GAAG,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GACnB,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,MAAM,CAAC,GAAG,MACzB,GAAG,CAAC,EAAE,GAAG,CAAC,KAAG,QAAQ,EAIrB,CAAA"}

package/dist/effect/Schema/debug-diff.js

@@ -8,7 +8,7 @@ export const debugDiff = (base) => (a, b) => {
     return bag;
 };
 const debugDiffImpl = (ast, a, b, path, bag) => {
-    const eq = Schema.equivalence({ ast });
+    const eq = Schema.toEquivalence({ ast });
     if (eq(a, b) === false) {
         // bag.push({ path, a, b, ast })
         if (SchemaAST.isUnion(ast) === true) {
@@ -26,9 +26,8 @@ const debugDiffImpl = (ast, a, b, path, bag) => {
                 }
             }
         }
-        else if (SchemaAST.isTypeLiteral(ast) === true) {
-            const props = SchemaAST.getPropertySignatures(ast);
-            for (const prop of props) {
+        else if (SchemaAST.isObjects(ast) === true) {
+            for (const prop of ast.propertySignatures) {
                 debugDiffImpl(prop.type, a[prop.name], b[prop.name], `${path}.${prop.name.toString()}`, bag);
             }
         }
@@ -41,10 +40,9 @@ const debugDiffImpl = (ast, a, b, path, bag) => {
 const isTaggedUnion = (ast) => {
     if (SchemaAST.isUnion(ast) === true) {
         return ast.types.every((type) => {
-            if (SchemaAST.isTypeLiteral(type) === false)
+            if (SchemaAST.isObjects(type) === false)
                 return false;
-            const props = SchemaAST.getPropertySignatures(type);
-            return props.some((prop) => prop.name.toString() === '_tag');
+            return type.propertySignatures.some((prop) => prop.name.toString() === '_tag');
         });
     }
     return false;

package/dist/effect/Schema/debug-diff.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-diff.js","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAS1C;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GACpB,CAAU,IAA4B,EAAE,EAAE,CAC1C,CAAC,CAAI,EAAE,CAAI,EAAc,EAAE;IACzB,MAAM,GAAG,GAAG,EAAgB,CAAA;IAC5B,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACtC,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAEH,MAAM,aAAa,GAAG,CAAC,GAAkB,EAAE,CAAM,EAAE,CAAM,EAAE,IAAY,EAAE,GAAe,EAAE,EAAE;IAC1F,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAS,CAAC,CAAA;IAC7C,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QACvB,gCAAgC;QAEhC,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACpC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;gBAChC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC7B,OAAM;YACR,CAAC;iBAAM,CAAC;gBACN,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBAC7B,IAAI,CAAC;wBACH,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;wBACpC,OAAM;oBACR,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACjD,MAAM,KAAK,GAAG,SAAS,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;YAClD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;YAC9F,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW;YACX,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,GAAkB,EAAW,EAAE;IACpD,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,KAAK;gBAAE,OAAO,KAAK,CAAA;YACzD,MAAM,KAAK,GAAG,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAA;YACnD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"debug-diff.js","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAS1C;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GACpB,CAAU,IAAgB,EAAE,EAAE,CAC9B,CAAC,CAAI,EAAE,CAAI,EAAc,EAAE;IACzB,MAAM,GAAG,GAAG,EAAgB,CAAA;IAC5B,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACtC,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAEH,MAAM,aAAa,GAAG,CAAC,GAAkB,EAAE,CAAM,EAAE,CAAM,EAAE,IAAY,EAAE,GAAe,EAAE,EAAE;IAC1F,MAAM,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,EAAS,CAAC,CAAA;IAC/C,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QACvB,gCAAgC;QAEhC,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YACpC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;gBAChC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC7B,OAAM;YACR,CAAC;iBAAM,CAAC;gBACN,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBAC7B,IAAI,CAAC;wBACH,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;wBACpC,OAAM;oBACR,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAC7C,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBAC1C,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;YAC9F,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW;YACX,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,GAAkB,EAAW,EAAE;IACpD,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK;gBAAE,OAAO,KAAK,CAAA;YACrD,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAA;QAChF,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/effect/Schema/debug-diff.test.js

@@ -5,7 +5,7 @@ describe('debug-diff', () => {
     test('simple object', () => {
         const schema = Schema.Struct({
             a: Schema.String,
-            b: Schema.Number,
+            b: Schema.Finite,
         });
         const a = { a: 'hello', b: 1 };
         const b = { a: 'world', b: 2 };
@@ -29,7 +29,7 @@ describe('debug-diff', () => {
         const schema = Schema.Struct({
             a: Schema.String,
             b: Schema.Struct({
-                c: Schema.Number,
+                c: Schema.Finite,
             }),
         });
         const a = { a: 'hello', b: { c: 1 } };
@@ -51,7 +51,7 @@ describe('debug-diff', () => {
     `);
     });
     test('union', () => {
-        const schema = Schema.Union(Schema.String, Schema.Number);
+        const schema = Schema.Union([Schema.String, Schema.Finite]);
         const a = 'hello';
         const b = 1;
         const diff = debugDiff(schema)(a, b);
@@ -66,7 +66,10 @@ describe('debug-diff', () => {
     `);
     });
     test('tagged union', () => {
-        const schema = Schema.Union(Schema.TaggedStruct('a', { a: Schema.String }), Schema.TaggedStruct('b', { b: Schema.Number }));
+        const schema = Schema.Union([
+            Schema.TaggedStruct('a', { a: Schema.String }),
+            Schema.TaggedStruct('b', { b: Schema.Finite }),
+        ]);
         const a = { _tag: 'a', a: 'hello' };
         const b = { _tag: 'b', b: 1 };
         const diff = debugDiff(schema)(a, b);

package/dist/effect/Schema/debug-diff.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-diff.test.js","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"debug-diff.test.js","sourceRoot":"","sources":["../../../src/effect/Schema/debug-diff.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC3B,CAAC,EAAE,MAAM,CAAC,MAAM;YAChB,CAAC,EAAE,MAAM,CAAC,MAAM;SACjB,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;QAC9B,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;QAE9B,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACpC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;KAa3C,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC3B,CAAC,EAAE,MAAM,CAAC,MAAM;YAChB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;gBACf,CAAC,EAAE,MAAM,CAAC,MAAM;aACjB,CAAC;SACH,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAA;QACrC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAA;QACrC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACpC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;KAa3C,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;QAC3D,MAAM,CAAC,GAAG,OAAO,CAAA;QACjB,MAAM,CAAC,GAAG,CAAC,CAAA;QACX,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACpC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;KAQ3C,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC;YAC1B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YAC9C,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;SAC/C,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAW,CAAA;QAC5C,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAW,CAAA;QACtC,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACpC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;KAc3C,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,SAAqB,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA"}

package/dist/effect/Schema/index.d.ts

@@ -1,23 +1,31 @@
-import { Effect, Schema } from 'effect';
-import type { ParseError } from 'effect/ParseResult';
-import type { ParseOptions } from 'effect/SchemaAST';
-import * as SchemaAST from 'effect/SchemaAST';
+import { Effect, Schema, SchemaAST } from 'effect';
 export * from 'effect/Schema';
 export * from './debug-diff.ts';
-export declare const hash: (schema: Schema.Schema<any>) => number;
-export declare const getResolvedPropertySignatures: (schema: Schema.Schema.AnyNoContext) => ReadonlyArray<SchemaAST.PropertySignature>;
-/** Objects that can be transferred between contexts (workers, etc.) */
-type TransferableObject = ArrayBuffer | MessagePort;
-export declare const encodeWithTransferables: <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions) => (a: A, overrideOptions?: ParseOptions) => Effect.Effect<[I, TransferableObject[]], ParseError, R>;
-export declare const decodeSyncDebug: <A, I>(schema: Schema.Schema<A, I>, options?: SchemaAST.ParseOptions) => (i: I, overrideOptions?: SchemaAST.ParseOptions) => A;
-export declare const encodeSyncDebug: <A, I>(schema: Schema.Schema<A, I>, options?: SchemaAST.ParseOptions) => (a: A, overrideOptions?: SchemaAST.ParseOptions) => I;
-export declare const swap: <A, I, R>(schema: Schema.Schema<A, I, R>) => Schema.Schema<I, A, R>;
-export declare const Base64FromUint8Array: Schema.Schema<string, Uint8Array>;
-export interface JsonArray extends ReadonlyArray<JsonValue> {
-}
-export interface JsonObject {
-    [key: string]: JsonValue;
-}
-export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
-export declare const JsonValue: Schema.Schema<JsonValue>;
+type PluckSchema<Fields extends Schema.Struct.Fields, K extends keyof Fields> = Schema.Codec<Fields[K]['Type'], Schema.Struct<Pick<Fields, K>>['Encoded'], Schema.Struct<Pick<Fields, K>>['DecodingServices'], Schema.Struct<Pick<Fields, K>>['EncodingServices']>;
+export declare const pluck: <const K extends PropertyKey>(key: K) => <Fields extends { readonly [P in K]: Schema.Top; }>(schema: Schema.Struct<Fields>) => PluckSchema<Fields, K & keyof Fields>;
+/**
+ * Like {@link fromJsonString}, but the ENCODED form is an *indented* JSON string
+ * (default 2-space) instead of compact — for committed/human-read JSON files
+ * (package.json, release plans, CI previews) that must stay diff-friendly while
+ * still round-tripping through the schema.
+ *
+ * Use a concrete schema for known shapes (adds validation) or `Schema.Unknown`
+ * for open-ended ones (the indented analogue of `fromJsonString(Schema.Unknown)`).
+ *
+ * TODO collapse into `fromJsonString(schema, { space })` now that Effect 4 accepts a
+ * `space` option; kept separate here to keep the Effect upgrade free of release-tooling changes.
+ */
+export declare const jsonStringIndented: <S extends Schema.Top>(schema: S, space?: number | string) => Schema.decodeTo<S, Schema.String, never, never>;
+export declare const head: <S extends Schema.Top>(array: Schema.$Array<S>) => Schema.decodeTo<Schema.Option<Schema.toType<S>>, Schema.$Array<S>>;
+type HeadOrElse<S extends Schema.Top> = Schema.decodeTo<Schema.toType<S>, Schema.$Array<S>>;
+export declare const headOrElse: {
+    <S extends Schema.Top>(array: Schema.$Array<S>, orElse?: () => S['Type']): HeadOrElse<S>;
+    (): <S extends Schema.Top>(array: Schema.$Array<S>) => HeadOrElse<S>;
+    <S extends Schema.Top>(orElse: () => S['Type']): (array: Schema.$Array<S>) => HeadOrElse<S>;
+};
+export declare const hash: (schema: Schema.Top) => number;
+export declare const getResolvedPropertySignatures: (schema: Schema.Top) => ReadonlyArray<SchemaAST.PropertySignature>;
+export declare const encodeWithTransferables: <A, I>(schema: Schema.Codec<A, I>, options?: SchemaAST.ParseOptions) => (a: A, overrideOptions?: SchemaAST.ParseOptions) => Effect.Effect<readonly [I, Transferable[]], Schema.SchemaError, never>;
+export declare const decodeSyncDebug: <A, I>(schema: Schema.Codec<A, I>, options?: SchemaAST.ParseOptions) => (i: I, overrideOptions?: SchemaAST.ParseOptions) => A;
+export declare const encodeSyncDebug: <A, I>(schema: Schema.Codec<A, I>, options?: SchemaAST.ParseOptions) => (a: A, overrideOptions?: SchemaAST.ParseOptions) => I;
 //# sourceMappingURL=index.d.ts.map

package/dist/effect/Schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/effect/Schema/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAqB,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAI7C,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAK/B,eAAO,MAAM,IAAI,GAAI,QAAQ,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,WAS9C,CAAA;AAUD,eAAO,MAAM,6BAA6B,GACxC,QAAQ,MAAM,CAAC,MAAM,CAAC,YAAY,KACjC,aAAa,CAAC,SAAS,CAAC,iBAAiB,CAG3C,CAAA;AAED,uEAAuE;AACvE,KAAK,kBAAkB,GAAG,WAAW,GAAG,WAAW,CAAA;AAEnD,eAAO,MAAM,uBAAuB,GACjC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,YAAY,MAC/D,GAAG,CAAC,EAAE,kBAAkB,YAAY,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,CAS1F,CAAA;AAEN,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,KAC7B,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,SAAS,CAAC,YAAY,KAAK,CAOxD,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAC3B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,KAC7B,CAAC,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,SAAS,CAAC,YAAY,KAAK,CAOxD,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAIhF,CAAA;AAEJ,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAqC,CAAA;AAExG,MAAM,WAAW,SAAU,SAAQ,aAAa,CAAC,SAAS,CAAC;CAAG;AAC9D,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB;AACD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,CAAA;AAEjF,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAOL,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/effect/Schema/index.ts"],"names":[],"mappings":"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"}

package/dist/effect/Schema/index.js

@@ -1,9 +1,48 @@
-import { Transferable } from '@effect/platform';
-import { Effect, Hash, ParseResult, Schema } from 'effect';
-import * as SchemaAST from 'effect/SchemaAST';
-import { shouldNeverHappen } from "../../mod.js";
+import { Array, Effect, Function, Hash, Option, Result, Schema, SchemaAST, SchemaGetter, SchemaIssue, SchemaTransformation, Struct, } from 'effect';
+import { Transferable } from 'effect/unstable/workers';
+import { shouldNeverHappen } from "../../misc.js";
 export * from 'effect/Schema';
 export * from "./debug-diff.js";
+export const pluck = (key) => (schema) => {
+    const field = schema.fields[key];
+    return schema.mapFields(Struct.pick([key])).pipe(Schema.decodeTo(Schema.toType(field), {
+        decode: SchemaGetter.transform((whole) => whole[key]),
+        encode: SchemaGetter.transform((value) => ({ [key]: value })),
+    }));
+};
+/**
+ * Like {@link fromJsonString}, but the ENCODED form is an *indented* JSON string
+ * (default 2-space) instead of compact — for committed/human-read JSON files
+ * (package.json, release plans, CI previews) that must stay diff-friendly while
+ * still round-tripping through the schema.
+ *
+ * Use a concrete schema for known shapes (adds validation) or `Schema.Unknown`
+ * for open-ended ones (the indented analogue of `fromJsonString(Schema.Unknown)`).
+ *
+ * TODO collapse into `fromJsonString(schema, { space })` now that Effect 4 accepts a
+ * `space` option; kept separate here to keep the Effect upgrade free of release-tooling changes.
+ */
+export const jsonStringIndented = (schema, space = 2) => schema.pipe(Schema.encodeTo(Schema.String, {
+    decode: SchemaGetter.parseJson(),
+    encode: SchemaGetter.stringifyJson({ space }),
+}));
+export const head = (array) => array.pipe(Schema.decodeTo(Schema.Option(Schema.toType(array.value)), SchemaTransformation.transform({
+    decode: Array.head,
+    encode: Option.match({
+        onNone: () => [],
+        onSome: Array.of,
+    }),
+})));
+export const headOrElse = Function.dual((args) => Schema.isSchema(args[0]), (array, orElse) => array.pipe(Schema.decodeTo(Schema.toType(array.value), SchemaTransformation.transformOrFail({
+    decode: (array) => Array.isReadonlyArrayNonEmpty(array) === true
+        ? Effect.succeed(Array.headNonEmpty(array))
+        : orElse === undefined
+            ? Effect.fail(new SchemaIssue.InvalidValue({
+                message: 'Unable to retrieve the first element of an empty array',
+            }))
+            : Effect.succeed(orElse()),
+    encode: (value) => Effect.succeed(Array.of(value)),
+}))));
 // NOTE this is a temporary workaround until Effect schema has a better way to hash schemas
 // https://github.com/Effect-TS/effect/issues/2719
 // TODO remove this once the issue is resolved
@@ -16,43 +55,31 @@ export const hash = (schema) => {
         return Hash.hash(schema.ast.toString());
     }
 };
-const resolveStructAst = (ast) => {
-    if (SchemaAST.isTransformation(ast) === true) {
-        return resolveStructAst(ast.from);
-    }
-    return ast;
-};
 export const getResolvedPropertySignatures = (schema) => {
-    const resolvedAst = resolveStructAst(schema.ast);
-    return SchemaAST.getPropertySignatures(resolvedAst);
+    const resolvedAst = SchemaAST.toType(schema.ast);
+    return SchemaAST.isObjects(resolvedAst) === true ? resolvedAst.propertySignatures : [];
 };
 export const encodeWithTransferables = (schema, options) => (a, overrideOptions) => Effect.gen(function* () {
     const collector = yield* Transferable.makeCollector;
-    const encoded = yield* Schema.encode(schema, options)(a, overrideOptions).pipe(Effect.provideService(Transferable.Collector, collector));
-    return [encoded, collector.unsafeRead()];
+    const encoded = yield* Schema.encodeEffect(schema, options)(a, overrideOptions).pipe(Effect.provideService(Transferable.Collector, collector));
+    return [encoded, collector.readUnsafe()];
 });
 export const decodeSyncDebug = (schema, options) => (input, overrideOptions) => {
-    const res = Schema.decodeEither(schema, options)(input, overrideOptions);
-    if (res._tag === 'Left') {
-        return shouldNeverHappen(`decodeSyncDebug failed:`, res.left);
+    const res = Schema.decodeResult(schema, options)(input, overrideOptions);
+    if (Result.isFailure(res) === true) {
+        return shouldNeverHappen(`decodeSyncDebug failed:`, res.failure);
     }
     else {
-        return res.right;
+        return res.success;
     }
 };
 export const encodeSyncDebug = (schema, options) => (input, overrideOptions) => {
-    const res = Schema.encodeEither(schema, options)(input, overrideOptions);
-    if (res._tag === 'Left') {
-        return shouldNeverHappen(`encodeSyncDebug failed:`, res.left);
+    const res = Schema.encodeResult(schema, options)(input, overrideOptions);
+    if (Result.isFailure(res) === true) {
+        return shouldNeverHappen(`encodeSyncDebug failed:`, res.failure);
     }
     else {
-        return res.right;
+        return res.success;
     }
 };
-export const swap = (schema) => Schema.transformOrFail(Schema.typeSchema(schema), Schema.encodedSchema(schema), {
-    decode: ParseResult.encode(schema),
-    encode: ParseResult.decode(schema),
-});
-export const Base64FromUint8Array = swap(Schema.Uint8ArrayFromBase64);
-export const JsonValue = Schema.Union(Schema.String, Schema.Number, Schema.Boolean, Schema.Null, Schema.Array(Schema.suspend(() => JsonValue)), Schema.Record({ key: Schema.String, value: Schema.suspend(() => JsonValue) })).annotations({ identifier: 'JsonValue' });
 //# sourceMappingURL=index.js.map

package/dist/effect/Schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/effect/Schema/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/effect/Schema/index.ts"],"names":[],"mappings":"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"}