@livestore/common 0.4.0 → 0.5.0-dev.0

package/dist/make-client-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,4NAiBlC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAC,8BAA8B,CAAA;IAC3E,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChE,0FAA0F;IAC1F,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAyFY,CAAA"}
+{"version":3,"file":"make-client-session.d.ts","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,eAAe,EAAE,MAAM,EAAiB,MAAM,yBAAyB,CAAA;AACjG,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAE7C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAG7C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,kBAAkB,EAAE,GAAG,CAAA;CAC5B;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,4NAiBlC,WAAW,GAAG;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACvD,YAAY,EAAE,8BAA8B,CAAC,8BAA8B,CAAA;IAC3E,QAAQ,EAAE,QAAQ,CAAA;IAClB,kBAAkB,EAAE,CAAC,IAAI,EAAE;QACzB,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAA;QAC7B,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAA;KAC9C,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IACxD,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC/B,oBAAoB,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChE,0FAA0F;IAC1F,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAC3B,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CA0FY,CAAA"}

package/dist/make-client-session.js

@@ -1,10 +1,10 @@
-import { Effect, Stream } from '@livestore/utils/effect';
+import { Effect, Latch, Stream } from '@livestore/utils/effect';
 import * as Webmesh from '@livestore/webmesh';
 import * as Devtools from "./devtools/mod.js";
 import { liveStoreVersion } from "./version.js";
 export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devtoolsEnabled, connectDevtoolsToStore, lockStatus, leaderThread, schema, sqliteDb, shutdown, connectWebmeshNode, webmeshMode, registerBeforeUnload, debugInstanceId, origin, }) => Effect.gen(function* () {
     const devtools = devtoolsEnabled === true
-        ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
+        ? { enabled: true, pullLatch: yield* Latch.make(true), pushLatch: yield* Latch.make(true) }
         : { enabled: false };
     if (devtoolsEnabled === true) {
         yield* Effect.gen(function* () {
@@ -43,7 +43,7 @@ export const makeClientSession = ({ storeId, clientId, sessionId, isLeader, devt
                 // Disconnect on before unload
                 yield* Effect.acquireRelease(Effect.sync(() => registerBeforeUnload(() => sendDisconnect.pipe(Effect.runFork))), (unsub) => Effect.sync(() => unsub()));
                 yield* connectDevtoolsToStore(clientSessionDevtoolsChannel);
-            }, Effect.tapCauseLogPretty, Effect.forkScoped)), Stream.runDrain);
+            }, Effect.tapCauseLogPretty, Effect.forkScoped())), Stream.runDrain);
         }).pipe(Effect.withSpan('@livestore/common:make-client-session:devtools'), Effect.tapCauseLogPretty, Effect.forkScoped);
     }
     return {

package/dist/make-client-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-client-session.js","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAU7C,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAM/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAI,EACnC,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EACpB,eAAe,EACf,MAAM,GAgBP,EAAwD,EAAE,CACzD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAA8B,eAAe,KAAK,IAAI;QAClE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QACvG,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAEtB,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC7B,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACzB,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,YAAY,CAC7C,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CACvE,CAAA;YAED,UAAU,CAAC,kBAAkB,GAAG,WAAW,CAAA;YAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAA;YACzC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;gBACxD,OAAO;gBACP,QAAQ;gBACR,SAAS;gBACT,WAAW;gBACX,QAAQ;gBACR,MAAM;aACP,CAAC,CAAA;YAEF,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;YAEvD,MAAM,2BAA2B,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,+BAA+B,CAAC,WAAW,EAAE;gBAC/F,MAAM;aACP,CAAC,CAAA;YAEF,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC;gBAC7C,UAAU,EAAE,2BAA2B;gBACvC,WAAW;aACZ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;YAEpD,KAAK,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CACtC,MAAM,CAAC,MAAM,CACX,CAAC,GAAG,EAAE,EAAE,CACN,QAAQ,CAAC,aAAa,CAAC,qBAAqB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;gBAC/F,GAAG,CAAC,IAAI,KAAK,WAAW,CAC3B,EACD,MAAM,CAAC,GAAG,CACR,MAAM,CAAC,UAAU,CACf,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE;gBAChC,MAAM,4BAA4B,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;oBAClE,MAAM,EAAE,MAAM;oBACd,WAAW;oBACX,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,aAAa,CAAC,cAAc,EAAE;oBACpG,IAAI,EAAE,WAAW;iBAClB,CAAC,CAAA;gBAEF,MAAM,cAAc,GAAG,4BAA4B;qBAChD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC;qBACvF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAErB,sDAAsD;gBACtD,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,CAAA;gBAEhD,8BAA8B;gBAC9B,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAClF,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CACtC,CAAA;gBAED,KAAK,CAAC,CAAC,sBAAsB,CAAC,4BAA4B,CAAC,CAAA;YAC7D,CAAC,EACD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CACF,EACD,MAAM,CAAC,QAAQ,CAChB,CAAA;QACH,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,gDAAgD,CAAC,EACjE,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CAAA;IACH,CAAC;IAED,OAAO;QACL,QAAQ;QACR,YAAY;QACZ,QAAQ;QACR,UAAU;QACV,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,eAAe;KACQ,CAAA;AAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"make-client-session.js","sourceRoot":"","sources":["../src/make-client-session.ts"],"names":[],"mappings":"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"}

package/dist/materializer-helper.d.ts

@@ -30,5 +30,4 @@ export declare const hashMaterializerResults: (materializerResults: ReadonlyArra
     bindValues: PreparedBindValues;
     writeTables: ReadonlySet<string> | undefined;
 }>) => number;
-export declare const replaceSessionIdSymbol: (bindValues: Record<string, unknown> | ReadonlyArray<unknown>, sessionId: string) => void;
 //# sourceMappingURL=materializer-helper.d.ts.map

package/dist/materializer-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materializer-helper.d.ts","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,0BAA0B,CAAA;AACpH,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAKzD,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,iCAAiC,GAAI,6CAK/C;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,QAAQ,CAAA;IACjB,2GAA2G;IAC3G,KAAK,EACD;QAAE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,GAC9D;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAA;KAAE,CAAA;CACnE,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAmDA,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC9B,qBAAqB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,MACnE,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAwB3D,CAAA;AAEH,eAAO,MAAM,uBAAuB,GAClC,qBAAqB,aAAa,CAAC;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAAC,WACiD,CAAA;AA8BrD,eAAO,MAAM,sBAAsB,GACjC,YAAY,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAC5D,WAAW,MAAM,SAGlB,CAAA"}
+{"version":3,"file":"materializer-helper.d.ts","sourceRoot":"","sources":["../src/materializer-helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,MAAM,EAAoC,MAAM,yBAAyB,CAAA;AAExF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAgD,MAAM,0BAA0B,CAAA;AACpH,OAAO,KAAK,KAAK,cAAc,MAAM,gCAAgC,CAAA;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAKzD,OAAO,KAAK,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAGjE,eAAO,MAAM,iCAAiC,GAAI,6CAK/C;IACD,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAA;IAC/B,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,QAAQ,CAAA;IACjB,2GAA2G;IAC3G,KAAK,EACD;QAAE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;QAAC,OAAO,EAAE,SAAS,CAAA;KAAE,GAC9D;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAA;KAAE,CAAA;CACnE,KAAG,aAAa,CAAC;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAoDA,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC9B,qBAAqB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,MACnE,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAwB3D,CAAA;AAEH,eAAO,MAAM,uBAAuB,GAClC,qBAAqB,aAAa,CAAC;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,kBAAkB,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CAC7C,CAAC,WACiD,CAAA"}

package/dist/materializer-helper.js

@@ -1,6 +1,5 @@
-import { isDevEnv, isNil, isReadonlyArray } from '@livestore/utils';
-import { Hash, Option, Schema } from '@livestore/utils/effect';
-import { SessionIdSymbol } from "./adapter-types.js";
+import { isDevEnv } from '@livestore/utils';
+import { Hash, Option, Predicate, ReadonlyArray, Schema } from '@livestore/utils/effect';
 import { isQueryBuilder } from "./schema/state/sqlite/query-builder/api.js";
 import { getResultSchema } from "./schema/state/sqlite/query-builder/impl.js";
 import { prepareBindValues } from "./util.js";
@@ -11,15 +10,15 @@ export const getExecStatementsFromMaterializer = ({ eventDef, materializer, dbSt
             args: Schema.decodeUnknownSync(eventDef.schema)(event.encoded.args),
         }
         : event.decoded;
-    const eventArgsEncoded = isNil(event.decoded?.args) === true
-        ? undefined
-        : Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args);
+    const eventArgsEncoded = Predicate.isNotUndefined(event.decoded) === true && Predicate.isNotNullish(event.decoded.args) === true
+        ? Schema.encodeUnknownSync(eventDef.schema)(event.decoded.args)
+        : undefined;
     const query = (rawQueryOrQueryBuilder) => {
         if (isQueryBuilder(rawQueryOrQueryBuilder) === true) {
             const { query, bindValues } = rawQueryOrQueryBuilder.asSql();
             const rawResults = dbState.select(query, prepareBindValues(bindValues, query));
             const resultSchema = getResultSchema(rawQueryOrQueryBuilder);
-            return Schema.decodeSync(resultSchema)(rawResults);
+            return Schema.decodeUnknownSync(resultSchema)(rawResults);
         }
         else {
             const { query, bindValues } = rawQueryOrQueryBuilder;
@@ -66,7 +65,7 @@ export const makeMaterializerHash = ({ schema, dbState }) => (event) => {
 };
 export const hashMaterializerResults = (materializerResults) => Hash.string(JSON.stringify(materializerResults));
 const fromMaterializerResult = (materializerResult) => {
-    if (isReadonlyArray(materializerResult) === true) {
+    if (ReadonlyArray.isArray(materializerResult) === true) {
         return materializerResult.flatMap(fromMaterializerResult);
     }
     if (isQueryBuilder(materializerResult) === true) {
@@ -86,31 +85,4 @@ const fromMaterializerResult = (materializerResult) => {
         ];
     }
 };
-// NOTE we should explore whether there is a more elegant solution
-// e.g. by leveraging the schema to replace the sessionIdSymbol
-export const replaceSessionIdSymbol = (bindValues, sessionId) => {
-    deepReplaceValue(bindValues, SessionIdSymbol, sessionId);
-};
-const deepReplaceValue = (input, searchValue, replaceValue) => {
-    if (Array.isArray(input) === true) {
-        for (const i in input) {
-            if (input[i] === searchValue) {
-                input[i] = replaceValue;
-            }
-            else {
-                deepReplaceValue(input[i], searchValue, replaceValue);
-            }
-        }
-    }
-    else if (typeof input === 'object' && input !== null) {
-        for (const key in input) {
-            if (input[key] === searchValue) {
-                input[key] = replaceValue;
-            }
-            else {
-                deepReplaceValue(input[key], searchValue, replaceValue);
-            }
-        }
-    }
-};
 //# sourceMappingURL=materializer-helper.js.map

package/dist/materializer-helper.js.map

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

package/dist/otel.d.ts

@@ -1,10 +1,9 @@
 import * as otel from '@opentelemetry/api';
+import type { Tracer } from '@livestore/utils/effect';
 import { Effect, Layer, OtelTracer } from '@livestore/utils/effect';
 export declare const OtelLiveDummy: Layer.Layer<OtelTracer.OtelTracer>;
 export declare const provideOtel: ({ otelTracer, parentSpanContext }: {
     otelTracer?: otel.Tracer;
     parentSpanContext?: otel.Context;
-}) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, OtelTracer.OtelTracer>>;
-export declare const getDurationMsFromSpan: (span: otel.Span) => number;
-export declare const getStartTimeHighResFromSpan: (span: otel.Span) => DOMHighResTimeStamp;
+}) => <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, OtelTracer.OtelTracer | Tracer.Tracer>>;
 //# sourceMappingURL=otel.d.ts.map

package/dist/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAQ3D,CAAA;AAEF,eAAO,MAAM,WAAW,GACrB,mCAAmC;IAAE,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CAAE,MACjG,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,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,CAa/F,CAAA;AAEH,eAAO,MAAM,qBAAqB,GAAI,MAAM,IAAI,CAAC,IAAI,KAAG,MAGvD,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,MAAM,IAAI,CAAC,IAAI,KAAG,mBACF,CAAA"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAM3D,CAAA;AAEF,eAAO,MAAM,WAAW,GACrB,mCAAmC;IAAE,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CAAE,MACjG,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,OAAO,CAAC,CAAC,EAAE,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAa/G,CAAA"}

package/dist/otel.js

@@ -3,19 +3,14 @@ import { makeNoopTracer } from '@livestore/utils';
 import { Effect, identity, Layer, OtelTracer } from '@livestore/utils/effect';
 export const OtelLiveDummy = Layer.suspend(() => {
     const OtelTracerLive = Layer.succeed(OtelTracer.OtelTracer, makeNoopTracer());
-    const TracingLive = Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(OtelTracerLive));
+    const TracingLive = OtelTracer.layerWithoutOtelTracer.pipe(Layer.provideMerge(OtelTracerLive));
     return TracingLive;
 });
 export const provideOtel = ({ otelTracer, parentSpanContext }) => (effect) => {
     const OtelTracerLive = Layer.succeed(OtelTracer.OtelTracer, otelTracer ?? makeNoopTracer());
-    const TracingLive = Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(OtelTracerLive));
+    const TracingLive = OtelTracer.layerWithoutOtelTracer.pipe(Layer.provideMerge(OtelTracerLive));
     return effect.pipe(parentSpanContext !== undefined
         ? Effect.withParentSpan(OtelTracer.makeExternalSpan(otel.trace.getSpanContext(parentSpanContext)))
         : identity, Effect.provide(TracingLive));
 };
-export const getDurationMsFromSpan = (span) => {
-    const durationHr = span._duration;
-    return durationHr[0] * 1000 + durationHr[1] / 1_000_000;
-};
-export const getStartTimeHighResFromSpan = (span) => span._performanceStartTime;
 //# sourceMappingURL=otel.js.map

package/dist/otel.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACnC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAkE,EAAE,EAAE,CACtG,CAAU,MAA8B,EAA0D,EAAE;IAClG,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,IAAI,cAAc,EAAE,CAAC,CAAA;IAE3F,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACU,CAAA;IAE9C,OAAO,MAAM,CAAC,IAAI,CAChB,iBAAiB,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAE,CAAC,CAAC;QACnG,CAAC,CAAC,QAAQ,EACZ,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;AACH,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAe,EAAU,EAAE;IAC/D,MAAM,UAAU,GAAsC,IAAY,CAAC,SAAS,CAAA;IAC5E,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,IAAe,EAAuB,EAAE,CACjF,IAAY,CAAC,qBAA4C,CAAA"}
+{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE7E,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAA;IAE9F,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAkE,EAAE,EAAE,CACtG,CAAU,MAA8B,EAA0E,EAAE;IAClH,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,IAAI,cAAc,EAAE,CAAC,CAAA;IAE3F,MAAM,WAAW,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CACxD,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAC0B,CAAA;IAE9D,OAAO,MAAM,CAAC,IAAI,CAChB,iBAAiB,KAAK,SAAS;QAC7B,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB,CAAE,CAAC,CAAC;QACnG,CAAC,CAAC,QAAQ,EACZ,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC5B,CAAA;AACH,CAAC,CAAA"}

package/dist/rematerialize-from-eventlog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rematerialize-from-eventlog.d.ts","sourceRoot":"","sources":["../src/rematerialize-from-eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAE/E,OAAO,EAAE,KAAK,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAQhE,eAAO,MAAM,yBAAyB;gBAQxB,QAAQ;YAEZ,eAAe;gBACX,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;sBACrD,gBAAgB;uFA6G4C,CAAA"}
+{"version":3,"file":"rematerialize-from-eventlog.d.ts","sourceRoot":"","sources":["../src/rematerialize-from-eventlog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAwD,MAAM,yBAAyB,CAAA;AAEtG,OAAO,EAAE,KAAK,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAQhE,eAAO,MAAM,yBAAyB;gBAQxB,QAAQ;YAEZ,eAAe;gBACX,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;sBACrD,gBAAgB;uFAgH4C,CAAA"}

package/dist/rematerialize-from-eventlog.js

@@ -1,10 +1,10 @@
 import { memoizeByRef } from '@livestore/utils';
-import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
+import { Effect, Option, ReadonlyArray as EffectArray, Schema, Stream } from '@livestore/utils/effect';
 import { UnknownError } from "./adapter-types.js";
-import { EventSequenceNumber, LiveStoreEvent, resolveEventDef, SystemTables } from "./schema/mod.js";
+import { EventSequenceNumber, LiveStoreEvent, SystemTables } from "./schema/mod.js";
 import { sql } from "./util.js";
 /** Parse JSON string to unknown value */
-const jsonParse = Schema.decodeUnknownSync(Schema.parseJson());
+const jsonParse = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
 export const rematerializeFromEventlog = Effect.fn('@livestore/common:rematerializeFromEventlog')(function* ({ dbEventlog, 
 // TODO re-use this db when bringing back the boot in-memory db implementation
 // db,
@@ -29,21 +29,19 @@ schema, onProgress, materializeEvent, }) {
             clientId: row.clientId,
             sessionId: row.sessionId,
         });
-        const resolution = yield* resolveEventDef(schema, {
-            operation: '@livestore/common:rematerializeFromEventlog:processEvent',
-            event: eventEncoded,
-        }).pipe(UnknownError.mapToUnknownError);
-        if (resolution._tag === 'unknown') {
-            // Old snapshots can contain newer events. Skip until the runtime has
-            // been updated; the event stays in the log for future replays.
+        const eventDef = schema.eventsDefsMap.get(row.name);
+        const materializer = schema.state.materializers.get(row.name);
+        if (eventDef === undefined || materializer === undefined) {
+            // Route unknown events through the normal materialization boundary so
+            // they advance the state snapshot head as no-ops.
+            yield* materializeEvent(eventEncoded, { skipEventlog: true });
             return;
         }
-        const { eventDef } = resolution;
         if (hashEventDef(eventDef) !== row.schemaHash) {
             yield* Effect.logWarning(`Schema hash mismatch for event definition ${row.name}. Trying to materialize event anyway.`);
         }
         // Checking whether the schema has changed in an incompatible way
-        yield* Schema.decodeUnknown(eventDef.schema)(args).pipe(Effect.mapError((cause) => UnknownError.make({
+        yield* Schema.decodeUnknownEffect(eventDef.schema)(args).pipe(Effect.mapError((cause) => UnknownError.make({
             cause,
             note: `\
 There was an error during rematerializing from the eventlog while decoding
@@ -61,20 +59,24 @@ ORDER BY seqNumGlobal ASC, seqNumClient ASC
 LIMIT ${CHUNK_SIZE}
 `);
     let processedEvents = 0;
-    yield* Stream.unfoldChunk({ _tag: 'Initial' }, (item) => {
-        // End stream if no more rows
-        if (Chunk.isChunk(item) === true && item.length === 0)
-            return Option.none();
-        const lastId = Chunk.isChunk(item) === true
-            ? Chunk.last(item).pipe(Option.map((_) => ({ global: _.seqNumGlobal, client: _.seqNumClient })), Option.getOrElse(() => EventSequenceNumber.Client.ROOT))
-            : EventSequenceNumber.Client.ROOT;
-        const nextItem = Chunk.fromIterable(stmt.select({
-            $seqNumGlobal: lastId?.global,
-            $seqNumClient: lastId?.client,
-        }));
-        const prevItem = Chunk.isChunk(item) === true ? item : Chunk.empty();
-        return Option.some([prevItem, nextItem]);
-    }).pipe(Stream.bufferChunks({ capacity: 2 }), Stream.tap((row) => Effect.gen(function* () {
+    yield* Stream.paginate(EventSequenceNumber.Client.ROOT, (lastId) => Effect.sync(() => {
+        const rows = stmt.select({
+            $seqNumGlobal: lastId.global,
+            $seqNumClient: lastId.client,
+        });
+        if (EffectArray.isReadonlyArrayNonEmpty(rows) === false) {
+            const done = [rows, Option.none()];
+            return done;
+        }
+        const lastRow = EffectArray.lastNonEmpty(rows);
+        const nextCursor = EventSequenceNumber.Client.Composite.make({
+            global: lastRow.seqNumGlobal,
+            client: lastRow.seqNumClient,
+            rebaseGeneration: lastRow.seqNumRebaseGeneration,
+        });
+        const next = [rows, Option.some(nextCursor)];
+        return next;
+    })).pipe(Stream.bufferArray({ capacity: 2 }), Stream.tap((row) => Effect.gen(function* () {
         yield* processEvent(row);
         processedEvents++;
         yield* onProgress({ done: processedEvents, total: eventsCount });

package/dist/rematerialize-from-eventlog.js.map

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

package/dist/schema/EventDef/define.d.ts

@@ -93,7 +93,7 @@ export type DefineEventOptions<TTo, TDerived extends boolean = false> = {
  */
 export declare const defineEvent: <TName extends string, TType, TEncoded = TType, TDerived extends boolean = false>(args: {
     name: TName;
-    schema: Schema.Schema<TType, TEncoded>;
+    schema: Schema.Codec<TType, TEncoded>;
 } & DefineEventOptions<TType, TDerived>) => EventDef<TName, TType, TEncoded, TDerived>;
 /**
  * Creates a synced event definition.
@@ -125,7 +125,7 @@ export declare const defineEvent: <TName extends string, TType, TEncoded = TType
  */
 export declare const synced: <TName extends string, TType, TEncoded = TType>(args: {
     name: TName;
-    schema: Schema.Schema<TType, TEncoded>;
+    schema: Schema.Codec<TType, TEncoded>;
 } & Omit<DefineEventOptions<TType>, "derived" | "clientOnly">) => EventDef<TName, TType, TEncoded>;
 /**
  * Creates a client-only event definition.
@@ -146,7 +146,7 @@ export declare const synced: <TName extends string, TType, TEncoded = TType>(arg
  *   name: 'UiStateSet',
  *   schema: Schema.Struct({
  *     selectedTodoId: Schema.NullOr(Schema.String),
- *     filterMode: Schema.Literal('all', 'active', 'completed'),
+ *     filterMode: Schema.Literals(['all', 'active', 'completed']),
  *   }),
  * })
  *
@@ -156,6 +156,6 @@ export declare const synced: <TName extends string, TType, TEncoded = TType>(arg
  */
 export declare const clientOnly: <TName extends string, TType, TEncoded = TType>(args: {
     name: TName;
-    schema: Schema.Schema<TType, TEncoded>;
+    schema: Schema.Codec<TType, TEncoded>;
 } & Omit<DefineEventOptions<TType>, "derived" | "clientOnly">) => EventDef<TName, TType, TEncoded>;
 //# sourceMappingURL=define.d.ts.map

package/dist/schema/EventDef/define.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/schema/EventDef/define.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAElE,qCAAqC;AACrC,MAAM,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI;IACtE;;;OAGG;IACH,KAAK,CAAC,EAAE,CACN,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,aAAa,KACxB;QACH,MAAM,CAAC,EAAE;YACP,uCAAuC;YACvC,GAAG,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;YACjC,+BAA+B;YAC/B,KAAK,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;SACpC,CAAA;QACD;;;WAGG;QACH,OAAO,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;KACtC,CAAA;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,WAAW,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,EACzG,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACvC,GAAG,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,KACtC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAsC3C,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,MAAM,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAClE,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACvC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,KAC5D,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAgD,CAAA;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,UAAU,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EACtE,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACvC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,KAC5D,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAA+C,CAAA"}
+{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/schema/EventDef/define.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAGH,OAAO,EAAU,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAElE,qCAAqC;AACrC,MAAM,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI;IACtE;;;OAGG;IACH,KAAK,CAAC,EAAE,CACN,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,aAAa,KACxB;QACH,MAAM,CAAC,EAAE;YACP,uCAAuC;YACvC,GAAG,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;YACjC,+BAA+B;YAC/B,KAAK,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;SACpC,CAAA;QACD;;;WAGG;QACH,OAAO,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA;KACtC,CAAA;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,WAAW,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,EACzG,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACtC,GAAG,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,KACtC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAuC3C,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,MAAM,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EAClE,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACtC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,KAC5D,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAgD,CAAA;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,UAAU,GAAI,KAAK,SAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,EACtE,MAAM;IACJ,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;CACtC,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,KAC5D,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAA+C,CAAA"}

package/dist/schema/EventDef/define.js

@@ -28,7 +28,7 @@
  * @module
  */
 import { shouldNeverHappen } from '@livestore/utils';
-import { Schema } from '@livestore/utils/effect';
+import { Result, Schema } from '@livestore/utils/effect';
 /**
  * Creates an event definition with full control over all options.
  *
@@ -48,9 +48,9 @@ import { Schema } from '@livestore/utils/effect';
 export const defineEvent = (args) => {
     const { name, schema, ...options } = args;
     const makePartialEvent = (args) => {
-        const res = Schema.validateEither(schema)(args);
-        if (res._tag === 'Left') {
-            shouldNeverHappen(`Invalid event args for event '${name}':`, res.left.message, '\n');
+        const res = Schema.decodeResult(Schema.toType(schema))(args);
+        if (Result.isFailure(res) === true) {
+            shouldNeverHappen(`Invalid event args for event '${name}':`, res.failure.message, '\n');
         }
         return { name: name, args };
     };
@@ -128,7 +128,7 @@ export const synced = (args) => defineEvent({ ...args, clientOnly: false });
  *   name: 'UiStateSet',
  *   schema: Schema.Struct({
  *     selectedTodoId: Schema.NullOr(Schema.String),
- *     filterMode: Schema.Literal('all', 'active', 'completed'),
+ *     filterMode: Schema.Literals(['all', 'active', 'completed']),
  *   }),
  * })
  *

package/dist/schema/EventDef/define.js.map

@@ -1 +1 @@
-{"version":3,"file":"define.js","sourceRoot":"","sources":["../../../src/schema/EventDef/define.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAyDhD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAGuC,EACK,EAAE;IAC9C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAA;IAEzC,MAAM,gBAAgB,GAAG,CAAC,IAAW,EAAE,EAAE;QACvC,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxB,iBAAiB,CAAC,iCAAiC,IAAI,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACtF,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAC7B,CAAC,CAAA;IAED,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAChE,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IACpE,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE;QACjD,KAAK,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;KAClD,CAAC,CAAA;IAEF,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE;QACjD,KAAK,EAAE;YACL,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,KAAK;YACxC,KAAK,EAAE,OAAO,EAAE,KAAK,KAAK,SAAS;gBACjC,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE;oBACrB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;oBAC9C,OAAO;wBACL,MAAM,EAAE;4BACN,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE;4BACxE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE;yBAC/E;wBACD,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE;qBACtE,CAAA;gBACH,CAAC;gBACH,CAAC,CAAC,SAAS;YACb,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK;YAClC,UAAU,EAAE,OAAO,EAAE,UAAU;SACE;KACpC,CAAC,CAAA;IAEF,OAAO,gBAA8D,CAAA;AACvE,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,IAG6D,EAC3B,EAAE,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;AAElF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,IAG6D,EAC3B,EAAE,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA"}
+{"version":3,"file":"define.js","sourceRoot":"","sources":["../../../src/schema/EventDef/define.ts"],"names":[],"mappings":"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"}

package/dist/schema/EventDef/define.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=define.test.d.ts.map

package/dist/schema/EventDef/define.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define.test.d.ts","sourceRoot":"","sources":["../../../src/schema/EventDef/define.test.ts"],"names":[],"mappings":""}

package/dist/schema/EventDef/define.test.js

@@ -0,0 +1,23 @@
+import { describe, expect, test } from 'vitest';
+import { Schema } from '@livestore/utils/effect';
+import { synced } from "./define.js";
+describe('synced event wire schema', () => {
+    const occurredAt = new Date('2026-07-17T10:15:30.000Z');
+    const event = synced({
+        name: 'v1.Occurred',
+        schema: Schema.Struct({
+            occurredAt: Schema.DateFromString,
+        }),
+    });
+    const jsonSchema = Schema.fromJsonString(event.schema);
+    test('roundtrips a valid date through JSON', () => {
+        const encoded = Schema.encodeSync(jsonSchema)({ occurredAt });
+        expect(encoded).toBe('{"occurredAt":"2026-07-17T10:15:30.000Z"}');
+        expect(Schema.decodeSync(jsonSchema)(encoded)).toEqual({ occurredAt });
+    });
+    test('rejects invalid dates on encode and decode', () => {
+        expect(() => Schema.encodeSync(jsonSchema)({ occurredAt: new Date(Number.NaN) })).toThrow();
+        expect(() => Schema.decodeSync(jsonSchema)('{"occurredAt":"not-a-date"}')).toThrow();
+    });
+});
+//# sourceMappingURL=define.test.js.map

package/dist/schema/EventDef/define.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"define.test.js","sourceRoot":"","sources":["../../../src/schema/EventDef/define.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAA;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC;QACnB,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;YACpB,UAAU,EAAE,MAAM,CAAC,cAAc;SAClC,CAAC;KACH,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAEtD,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;QAE7D,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;QACjE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACtD,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QAC3F,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;IACtF,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/schema/EventDef/deprecated.d.ts

@@ -29,17 +29,16 @@
  * ```
  * @module
  */
-import type { Schema } from '@livestore/utils/effect';
-import { Effect, Option } from '@livestore/utils/effect';
+import { type Schema, Effect, Option } from '@livestore/utils/effect';
 import type { EventDef } from './event-def.ts';
-/** Symbol used to mark schemas as deprecated. */
-export declare const DeprecatedId: unique symbol;
+/** Annotation key used to mark schemas as deprecated. */
+export declare const DeprecatedId = "livestore/schema/annotations/deprecated";
 /**
  * Marks a schema field as deprecated with a reason message.
  * When an event is committed with a deprecated field that has a value,
  * a warning will be logged.
  *
- * Works with both Schema types and PropertySignatures (from Schema.optional).
+ * Works with Schema fields, including optional fields from Schema.optional.
  *
  * @param reason - Explanation of why this field is deprecated and what to use instead
  * @returns A function that adds the deprecation annotation to the schema
@@ -52,25 +51,21 @@ export declare const DeprecatedId: unique symbol;
  * })
  * ```
  */
-export declare const deprecated: (reason: string) => <T extends {
-    annotations: (annotations: {
-        readonly [DeprecatedId]?: string;
-    }) => T;
-}>(schema: T) => T;
+export declare const deprecated: (reason: string) => <T extends Schema.Top>(schema: T) => T["Rebuild"];
 /**
  * Checks if a schema has a deprecation annotation.
  *
  * @param schema - The schema to check
  * @returns The deprecation reason if deprecated, None otherwise
  */
-export declare const getDeprecatedReason: <A, I, R>(schema: Schema.Schema<A, I, R>) => Option.Option<string>;
+export declare const getDeprecatedReason: (schema: Schema.Top) => Option.Option<string>;
 /**
  * Checks if a schema is deprecated.
  *
  * @param schema - The schema to check
  * @returns true if the schema is deprecated
  */
-export declare const isDeprecated: <A, I, R>(schema: Schema.Schema<A, I, R>) => boolean;
+export declare const isDeprecated: (schema: Schema.Top) => boolean;
 /**
  * Finds deprecated fields with values in the given event arguments.
  * This walks through a Struct schema and checks each property for deprecation.
@@ -79,7 +74,7 @@ export declare const isDeprecated: <A, I, R>(schema: Schema.Schema<A, I, R>) =>
  * @param args - The event arguments
  * @returns Array of objects containing field name and deprecation reason
  */
-export declare const findDeprecatedFieldsWithValues: (schema: Schema.Schema.All, args: Record<string, unknown>) => Array<{
+export declare const findDeprecatedFieldsWithValues: (schema: Schema.Top, args: Record<string, unknown>) => Array<{
     field: string;
     reason: string;
 }>;

package/dist/schema/EventDef/deprecated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deprecated.d.ts","sourceRoot":"","sources":["../../../src/schema/EventDef/deprecated.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAa,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,iDAAiD;AACjD,eAAO,MAAM,YAAY,eAAwD,CAAA;AAEjF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,GACpB,QAAQ,MAAM,MACd,CAAC,SAAS;IAAE,WAAW,EAAE,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,CAAC,CAAA;CAAE,EAAE,QAAQ,CAAC,KAAG,CAClD,CAAA;AAElD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CACvC,CAAA;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,OAC3B,CAAA;AAE5C;;;;;;;GAOG;AACH,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,CAAC,MAAM,CAAC,GAAG,EACzB,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA4BzC,CAAA;AAQD;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,QAAQ,CAAC,YAAY,EAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,CA2BjB,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,wBAAwB,QAAO,IAG3C,CAAA"}
+{"version":3,"file":"deprecated.d.ts","sourceRoot":"","sources":["../../../src/schema/EventDef/deprecated.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,EAAa,MAAM,yBAAyB,CAAA;AAEhF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,yDAAyD;AACzD,eAAO,MAAM,YAAY,4CAA4C,CAAA;AAErE;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU,GACpB,QAAQ,MAAM,MACd,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAG,CAAC,CAAC,SAAS,CACD,CAAA;AAE/C;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,CAAC,GAAG,KAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CACE,CAAA;AAE/E;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,CAAC,GAAG,KAAG,OAAqD,CAAA;AAEvG;;;;;;;GAOG;AACH,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,CAAC,GAAG,EAClB,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA2BzC,CAAA;AAQD;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GACjC,UAAU,QAAQ,CAAC,YAAY,EAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,CA2BjB,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,wBAAwB,QAAO,IAG3C,CAAA"}

package/dist/schema/EventDef/deprecated.js

@@ -30,14 +30,14 @@
  * @module
  */
 import { Effect, Option, SchemaAST } from '@livestore/utils/effect';
-/** Symbol used to mark schemas as deprecated. */
-export const DeprecatedId = Symbol.for('livestore/schema/annotations/deprecated');
+/** Annotation key used to mark schemas as deprecated. */
+export const DeprecatedId = 'livestore/schema/annotations/deprecated';
 /**
  * Marks a schema field as deprecated with a reason message.
  * When an event is committed with a deprecated field that has a value,
  * a warning will be logged.
  *
- * Works with both Schema types and PropertySignatures (from Schema.optional).
+ * Works with Schema fields, including optional fields from Schema.optional.
  *
  * @param reason - Explanation of why this field is deprecated and what to use instead
  * @returns A function that adds the deprecation annotation to the schema
@@ -50,14 +50,14 @@ export const DeprecatedId = Symbol.for('livestore/schema/annotations/deprecated'
  * })
  * ```
  */
-export const deprecated = (reason) => (schema) => schema.annotations({ [DeprecatedId]: reason });
+export const deprecated = (reason) => (schema) => schema.annotate({ [DeprecatedId]: reason });
 /**
  * Checks if a schema has a deprecation annotation.
  *
  * @param schema - The schema to check
  * @returns The deprecation reason if deprecated, None otherwise
  */
-export const getDeprecatedReason = (schema) => SchemaAST.getAnnotation(DeprecatedId)(schema.ast);
+export const getDeprecatedReason = (schema) => Option.fromUndefinedOr(SchemaAST.resolveAt(DeprecatedId)(schema.ast));
 /**
  * Checks if a schema is deprecated.
  *
@@ -75,20 +75,19 @@ export const isDeprecated = (schema) => Option.isSome(getDeprecatedReason(schema
  */
 export const findDeprecatedFieldsWithValues = (schema, args) => {
     const result = [];
-    const ast = schema.ast;
-    // Handle TypeLiteral (Struct) schemas
-    if (ast._tag === 'TypeLiteral') {
+    const ast = SchemaAST.toType(schema.ast);
+    // Handle Objects (Struct) schemas
+    if (SchemaAST.isObjects(ast) === true) {
         for (const prop of ast.propertySignatures) {
             const fieldName = String(prop.name);
             const fieldValue = args[fieldName];
             // Only check fields that have a value (not undefined)
             if (fieldValue !== undefined) {
-                // Check deprecation on the property signature itself (for Schema.optional(...).pipe(deprecated(...)))
-                const propAnnotations = prop.annotations;
-                const deprecationReason = propAnnotations?.[DeprecatedId];
+                // Check deprecation on the property key itself (for Schema.optional(...).pipe(deprecated(...)))
+                const deprecationReason = prop.type.context?.annotations?.[DeprecatedId];
                 // Also check deprecation on the type (for direct field deprecation)
-                const typeDeprecation = SchemaAST.getAnnotation(DeprecatedId)(prop.type);
-                const reason = deprecationReason ?? (Option.isSome(typeDeprecation) === true ? typeDeprecation.value : undefined);
+                const typeDeprecation = SchemaAST.resolveAt(DeprecatedId)(prop.type);
+                const reason = deprecationReason ?? typeDeprecation;
                 if (reason !== undefined) {
                     result.push({ field: fieldName, reason });
                 }