@livestore/sync-s2 0.4.0 → 0.5.0-dev.1

package/package.json

@@ -1,89 +1,70 @@
 {
+  "$genie": {
+    "source": "package.json.genie.ts",
+    "warning": "DO NOT EDIT - changes will be overwritten",
+    "workspaceClosureDirs": [
+      "packages/@livestore/sync-s2",
+      "repos/livestore/packages/@livestore/adapter-web",
+      "repos/livestore/packages/@livestore/common",
+      "repos/livestore/packages/@livestore/common-cf",
+      "repos/livestore/packages/@livestore/livestore",
+      "repos/livestore/packages/@livestore/sqlite-wasm",
+      "repos/livestore/packages/@livestore/utils",
+      "repos/livestore/packages/@livestore/utils-dev",
+      "repos/livestore/packages/@livestore/wa-sqlite",
+      "repos/livestore/packages/@livestore/webmesh"
+    ]
+  },
   "name": "@livestore/sync-s2",
-  "version": "0.4.0",
+  "version": "0.5.0-dev.1",
+  "type": "module",
+  "sideEffects": false,
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/livestorejs/livestore.git"
+    "url": "git+https://github.com/livestorejs/livestore-contrib.git"
+  },
+  "exports": {
+    ".": "./dist/mod.js",
+    "./s2-proxy-helpers": "./dist/s2-proxy-helpers.js"
   },
   "files": [
     "dist",
     "package.json",
     "src"
   ],
-  "type": "module",
-  "sideEffects": false,
-  "exports": {
-    ".": "./dist/mod.js",
-    "./s2-proxy-helpers": "./dist/s2-proxy-helpers.js"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@livestore/common": "^0.4.0",
-    "@livestore/livestore": "^0.4.0",
-    "@livestore/utils": "^0.4.0"
+    "@livestore/common": "0.5.0-dev.1",
+    "@livestore/livestore": "0.5.0-dev.1",
+    "@livestore/utils": "0.5.0-dev.1"
   },
   "devDependencies": {
-    "@effect/ai": "0.35.0",
-    "@effect/cli": "0.75.1",
-    "@effect/cluster": "0.58.2",
-    "@effect/experimental": "0.60.0",
-    "@effect/opentelemetry": "0.63.0",
-    "@effect/platform": "0.96.1",
-    "@effect/platform-browser": "0.76.0",
-    "@effect/platform-bun": "0.89.0",
-    "@effect/platform-node": "0.106.0",
-    "@effect/printer": "0.49.0",
-    "@effect/printer-ansi": "0.49.0",
-    "@effect/rpc": "0.75.1",
-    "@effect/sql": "0.51.1",
-    "@effect/typeclass": "0.40.0",
-    "@effect/vitest": "0.29.0",
+    "@effect/opentelemetry": "4.0.3",
+    "@effect/platform-browser": "4.0.3",
+    "@effect/platform-bun": "4.0.3",
+    "@effect/platform-node": "4.0.3",
+    "@effect/platform-node-shared": "4.0.3",
+    "@effect/vitest": "4.0.3",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "2.2.0",
     "@standard-schema/spec": "1.1.0",
-    "effect": "3.21.2",
-    "vitest": "3.2.4"
+    "effect": "4.0.3",
+    "vitest": "4.1.9"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.35.0",
-    "@effect/cli": "^0.75.1",
-    "@effect/cluster": "^0.58.2",
-    "@effect/experimental": "^0.60.0",
-    "@effect/opentelemetry": "^0.63.0",
-    "@effect/platform": "^0.96.1",
-    "@effect/platform-browser": "^0.76.0",
-    "@effect/platform-bun": "^0.89.0",
-    "@effect/platform-node": "^0.106.0",
-    "@effect/printer": "^0.49.0",
-    "@effect/printer-ansi": "^0.49.0",
-    "@effect/rpc": "^0.75.1",
-    "@effect/sql": "^0.51.1",
-    "@effect/typeclass": "^0.40.0",
-    "@effect/vitest": "^0.29.0",
+    "@effect/opentelemetry": "^4.0.3",
+    "@effect/platform-browser": "^4.0.3",
+    "@effect/platform-bun": "^4.0.3",
+    "@effect/platform-node": "^4.0.3",
+    "@effect/platform-node-shared": "^4.0.3",
+    "@effect/vitest": "^4.0.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
     "@standard-schema/spec": "^1.1.0",
-    "effect": "^3.21.2"
+    "effect": "^4.0.3"
   },
-  "$genie": {
-    "source": "package.json.genie.ts",
-    "warning": "DO NOT EDIT - changes will be overwritten",
-    "workspaceClosureDirs": [
-      "packages/@livestore/adapter-web",
-      "packages/@livestore/common",
-      "packages/@livestore/common-cf",
-      "packages/@livestore/devtools-web-common",
-      "packages/@livestore/livestore",
-      "packages/@livestore/sqlite-wasm",
-      "packages/@livestore/sync-s2",
-      "packages/@livestore/utils",
-      "packages/@livestore/utils-dev",
-      "packages/@livestore/wa-sqlite",
-      "packages/@livestore/webmesh"
-    ]
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "",

package/src/api-schema.test.ts

@@ -1,23 +1,27 @@
+import { Result, Schema } from '@livestore/utils/effect'
 import { describe, expect, it } from 'vitest'
 
-import { Schema } from '@livestore/utils/effect'
-
 import * as Api from './api-schema.ts'
 import { decodePullArgsFromSearchParams } from './make-s2-url.ts'
 import { s2SeqNum } from './types.ts'
 
 describe('ApiSchema', () => {
-  it('encodes and decodes PullArgs via args search param', () => {
-    const args = Api.PullArgs.make({ storeId: 'store-1', s2SeqNum: s2SeqNum(42), live: true, payload: { a: 1 } })
-    const encoded = Schema.encodeSync(Api.ArgsSchema)(args)
-    const sp = new URLSearchParams({ args: encoded })
-    const roundtrip = decodePullArgsFromSearchParams(sp)
-    expect(roundtrip).toEqual(args)
-  })
+  for (const { name, payload } of [
+    { name: 'an omitted payload', payload: undefined },
+    { name: 'an explicit payload', payload: { a: 1 } },
+  ] as const) {
+    it(`encodes and decodes PullArgs with ${name} via args search param`, () => {
+      const args = Api.PullArgs.make({ storeId: 'store-1', s2SeqNum: s2SeqNum(42), live: true, payload })
+      const encoded = Schema.encodeSync(Api.ArgsSchema)(args)
+      const sp = new URLSearchParams({ args: encoded })
+      const roundtrip = decodePullArgsFromSearchParams(sp)
+      expect(roundtrip).toEqual(args)
+    })
+  }
 
   it('decodes PushPayload with typed events', () => {
     const payload = Api.PushPayload.make({ storeId: 's', batch: [] })
-    const decoded = Schema.decodeUnknownEither(Api.PushPayload)(payload)
-    expect(decoded._tag).toBe('Right')
+    const decoded = Schema.decodeResult(Api.PushPayload)(payload)
+    expect(Result.isSuccess(decoded)).toBe(true)
   })
 })

package/src/api-schema.ts

@@ -5,9 +5,9 @@ import { S2SeqNum } from './types.ts'
 
 export const PullArgs = Schema.Struct({
   storeId: Schema.String,
-  s2SeqNum: Schema.Union(S2SeqNum, Schema.Literal('from-start')),
+  s2SeqNum: Schema.Union([S2SeqNum, Schema.Literal('from-start')]),
   live: Schema.Boolean,
-  payload: Schema.UndefinedOr(Schema.JsonValue),
+  payload: Schema.optional(Schema.Json),
 })
 
 export const PushPayload = Schema.Struct({
@@ -19,7 +19,7 @@ export type PullArgs = typeof PullArgs.Type
 export type PushPayload = typeof PushPayload.Type
 
 /** Encoded form for query parameter `args` */
-export const ArgsSchema = Schema.compose(Schema.StringFromUriComponent, Schema.parseJson(PullArgs))
+export const ArgsSchema = Schema.StringFromUriComponent.pipe(Schema.decodeTo(Schema.fromJsonString(PullArgs)))
 
 export const PushResponse = Schema.Struct({ success: Schema.Boolean })
 export type PushResponse = typeof PushResponse.Type

package/src/decode.ts

@@ -7,21 +7,21 @@ import { S2SeqNum } from './types.ts'
 const ReadBatchSchema = Schema.Struct({
   records: Schema.Array(
     Schema.Struct({
-      body: Schema.optional(Schema.parseJson(LiveStoreEvent.Global.Encoded)),
+      body: Schema.optional(Schema.NullOr(Schema.fromJsonString(LiveStoreEvent.Global.Encoded))),
       seq_num: S2SeqNum,
     }),
   ),
-}).annotations({ title: '@livestore/sync-s2:ReadBatchSchema' })
+}).annotate({ title: '@livestore/sync-s2:ReadBatchSchema' })
 
 export const decodeReadBatch = (
-  readBatch: typeof HttpClientGenerated.ReadBatch.Type,
+  readBatch: HttpClientGenerated.ReadBatch,
 ): ReadonlyArray<{
   eventEncoded: LiveStoreEvent.Global.Encoded
   metadata: Option.Option<{ s2SeqNum: S2SeqNum }>
 }> => {
   const decoded = Schema.decodeSync(ReadBatchSchema)(readBatch)
   return decoded.records
-    .filter((r): r is { body: LiveStoreEvent.Global.Encoded; seq_num: S2SeqNum } => r.body !== undefined)
+    .filter((r): r is { body: LiveStoreEvent.Global.Encoded; seq_num: S2SeqNum } => r.body != null)
     .map((r) => ({
       eventEncoded: r.body,
       metadata: Option.some({ s2SeqNum: r.seq_num }),