effect-zero 0.5.0 → 0.6.0-beta.0

package/dist/server-transaction.js

@@ -1,93 +1,45 @@
 import * as Cause from "effect/Cause";
 import * as Ctx from "effect/Context";
 import * as Data from "effect/Data";
-import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
 import * as Predicate from "effect/Predicate";
-import { MutationAlreadyProcessedError, OutOfOrderMutationError, ServerTransactionInput } from "./internal/server.js";
-import * as ServerSynchronizationContext from "./internal/server-synchronization-context.js";
+import * as ClientTransaction from "./client-transaction.js";
 import { prefixId } from "./internal/utils.js";
+export const DatabaseSymbol = Symbol.for(prefixId("Database"));
+export const ServerTransactionCallbackSymbol = Symbol.for(prefixId("ServerTransactionCallback"));
 export const make = (id, database, clientTransaction) => {
     class Context extends Ctx.Service()(`${id}/ServerTransactionContext`) {
     }
-    const use = (fn) => Effect.gen(function* () {
-        const ctx = yield* Context;
+    class ServerTransactionCallback extends Ctx.Service()(`${id}/ServerTransactionCallback`) {
+    }
+    const use = Effect.fn(function* (fn) {
+        const transaction = yield* Context;
         return yield* Effect.tryPromise({
-            try: (signal) => fn(ctx.transaction, { signal }),
-            catch: (error) => new ServerTransactionError({ cause: Cause.fail(error) }),
+            try: (signal) => fn(transaction, { signal }),
+            catch: (error) => new TransactionUseError({ cause: Cause.fail(error) }),
         });
     });
     const execute = Effect.fn(function* (effect) {
-        const ctx = yield* Effect.context();
-        const result = yield* Deferred.make();
-        const transactionInput = yield* ServerTransactionInput;
-        yield* Effect.tryPromise({
-            try: (signal) => database.transaction(async (transaction, transactionHooks) => {
-                const exit = await Effect.flatMap(checkAndIncrementLastMutationId, () => effect).pipe(Effect.provide([
-                    Layer.succeed(Context, { transaction, transactionHooks }),
-                    Layer.succeed(clientTransaction.Context, transaction),
-                ]), (effect) => Effect.runPromiseExitWith(ctx)(effect, { signal }));
-                Deferred.doneUnsafe(result, exit);
-                if (Exit.isFailure(exit)) {
-                    // This error's purpose is to differentiate between "external" errors
-                    // that originate from the user-defined mutator code and "internal" errors
-                    // that originate from our own code and the Zero API.
-                    // Both types are caught in the "catch" block below, but at this point we only need to handle
-                    // the "internal" errors wrapping them in a `ZeroDatabaseError`, because "external" errors
-                    // are already covered by passing the Exit result to the Deferred, which is why
-                    // we have the ServerTransactionUserError silenced below in the pipe.
-                    throw new ServerTransactionUserError();
-                }
-                return exit.value;
-            }, transactionInput),
-            catch: (error) => {
-                if (ServerTransactionUserError.is(error)) {
-                    return error;
-                }
-                // This is for errors that occur when calling `database.transaction` despite the provided `effect` succeeding.
-                // This can be caused by e.g. the database connection timing out or other database-related issues.
-                return new ZeroDatabaseError({ cause: Cause.fail(error) });
-            },
-        }).pipe(Effect.catchTag("ServerTransactionUserError", () => Effect.void));
-        return yield* Deferred.await(result);
-    }, ServerSynchronizationContext.guard);
-    const checkAndIncrementLastMutationId = Effect.gen(function* () {
-        const { transactionHooks } = yield* Context;
-        const { clientID, mutationID: receivedMutationID } = yield* ServerTransactionInput;
-        const { lastMutationID } = yield* Effect.tryPromise({
-            try: () => transactionHooks.updateClientMutationID(),
-            catch: (error) => new UpdateClientMutationIdError({ cause: Cause.fail(error) }),
-        });
-        if (receivedMutationID < lastMutationID) {
-            return yield* new MutationAlreadyProcessedError({
-                clientID,
-                received: receivedMutationID,
-                actual: lastMutationID,
-            });
-        }
-        if (receivedMutationID > lastMutationID) {
-            return yield* new OutOfOrderMutationError({
-                clientID,
-                receivedMutationID,
-                lastMutationID,
-            });
-        }
+        const { transact } = yield* ServerTransactionCallback;
+        return yield* transact((transaction) => effect.pipe(
+        // Provide the live transaction under both the server- and client-transaction tags.
+        Effect.provide([
+            Layer.succeed(Context, transaction),
+            Layer.succeed(clientTransaction[ClientTransaction.ContextSymbol], transaction),
+        ])));
     });
-    return { Context, use, execute };
+    return {
+        use,
+        execute,
+        [DatabaseSymbol]: database,
+        [ServerTransactionCallbackSymbol]: ServerTransactionCallback,
+    };
 };
-class ServerTransactionError extends Data.TaggedError("ServerTransactionError") {
-}
-class UpdateClientMutationIdError extends Data.TaggedError("UpdateClientMutationIdError") {
-}
-class ZeroDatabaseError extends Data.TaggedError("ZeroDatabaseError") {
-}
-const ServerTransactionUserErrorTypeId = Symbol.for(prefixId("ServerTransactionUserError"));
-class ServerTransactionUserError extends Data.TaggedError("ServerTransactionUserError") {
-    [ServerTransactionUserErrorTypeId] = ServerTransactionUserErrorTypeId;
-    static is(e) {
-        return Predicate.hasProperty(e, ServerTransactionUserErrorTypeId);
+class TransactionUseError extends Data.TaggedError("TransactionUseError") {
+    get message() {
+        const error = Cause.squash(this.cause);
+        return Predicate.isError(error) ? error.message : "Internal error";
     }
 }
 //# sourceMappingURL=server-transaction.js.map

package/dist/server-transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-transaction.js","sourceRoot":"","sources":["../src/server-transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-transaction.js","sourceRoot":"","sources":["../src/server-transaction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,iBAAiB,MAAM,yBAAyB,CAAC;AAO7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;AAC/D,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;AAKjG,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,EAAM,EACN,QAA4C,EAC5C,iBAAqD,EACrD,EAAE;IACF,MAAM,OAAQ,SAAQ,GAAG,CAAC,OAAO,EAAyD,CACxF,GAAG,EAAY,2BAAoC,CACpD;KAAG;IAEJ,MAAM,yBAA0B,SAAQ,GAAG,CAAC,OAAO,EAWhD,CAAC,GAAG,EAAY,4BAAqC,CAAC;KAAG;IAE5D,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAC7B,EAGmB;QAEnB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;QACnC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;YAC9B,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC;YAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;SACxE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAW,MAA8B;QAC1E,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,yBAAyB,CAAC;QACtD,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CACrC,MAAM,CAAC,IAAI;QACT,mFAAmF;QACnF,MAAM,CAAC,OAAO,CAAC;YACb,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC;YACnC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC;SAC/E,CAAC,CACH,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG;QACH,OAAO;QACP,CAAC,cAAc,CAAC,EAAE,QAAQ;QAC1B,CAAC,+BAA+B,CAAC,EAAE,yBAAyB;KAC7D,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAoB,SAAQ,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAEtE;IACA,IAAa,OAAO;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACrE,CAAC;CACF"}