@kyneta/yjs-schema 1.1.0 → 1.3.0

package/src/__tests__/create.test.ts

@@ -1,24 +1,30 @@
-import { change, Schema, subscribe } from "@kyneta/schema"
-import { describe, expect, it, vi } from "vitest"
+import {
+  change,
+  createDoc,
+  createRef,
+  Schema,
+  subscribe,
+  unwrap,
+} from "@kyneta/schema"
+import { describe, expect, it } from "vitest"
 import * as Y from "yjs"
-import { createYjsDoc, createYjsDocFromEntirety } from "../create.js"
+import { yjs } from "../bind-yjs.js"
+import { exportEntirety, exportSince, merge, version } from "../index.js"
 import { ensureContainers } from "../populate.js"
-import { yjsSubstrateFactory } from "../substrate.js"
-import { exportEntirety, exportSince, merge, version } from "../sync.js"
+import { createYjsSubstrate } from "../substrate.js"
 import { YjsVersion } from "../version.js"
-import { yjs } from "../yjs-escape.js"
 
 // ===========================================================================
 // Schemas used across tests
 // ===========================================================================
 
-const SimpleSchema = Schema.doc({
-  title: Schema.annotated("text"),
+const SimpleSchema = Schema.struct({
+  title: Schema.text(),
   count: Schema.number(),
   items: Schema.list(Schema.string()),
 })
 
-const StructListSchema = Schema.doc({
+const StructListSchema = Schema.struct({
   tasks: Schema.list(
     Schema.struct({
       name: Schema.string(),
@@ -27,8 +33,8 @@ const StructListSchema = Schema.doc({
   ),
 })
 
-const NestedSchema = Schema.doc({
-  title: Schema.annotated("text"),
+const NestedSchema = Schema.struct({
+  title: Schema.text(),
   meta: Schema.struct({
     author: Schema.string(),
     tags: Schema.list(Schema.string()),
@@ -36,18 +42,26 @@ const NestedSchema = Schema.doc({
   labels: Schema.record(Schema.string()),
 })
 
+// ===========================================================================
+// Helpers
+// ===========================================================================
+
+const boundSimple = yjs.bind(SimpleSchema)
+const boundStructList = yjs.bind(StructListSchema)
+const boundNested = yjs.bind(NestedSchema)
+
 // ===========================================================================
 // Tests
 // ===========================================================================
 
-describe("createYjsDoc", () => {
+describe("createDoc", () => {
   // -------------------------------------------------------------------------
   // Default values
   // -------------------------------------------------------------------------
 
   describe("with defaults", () => {
     it("creates a doc with empty containers for shared types", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       // Text annotation returns "" (empty Y.Text)
       expect(doc.title()).toBe("")
       // Plain scalars return structural zeros
@@ -57,7 +71,7 @@ describe("createYjsDoc", () => {
     })
 
     it("creates a doc with nested struct empty containers", () => {
-      const doc = createYjsDoc(NestedSchema)
+      const doc = createDoc(boundNested)
       expect(doc.title()).toBe("")
       // Plain scalar inside struct returns structural zero
       expect(doc.meta.author()).toBe("")
@@ -66,7 +80,7 @@ describe("createYjsDoc", () => {
     })
 
     it("creates a doc with struct list defaults", () => {
-      const doc = createYjsDoc(StructListSchema)
+      const doc = createDoc(boundStructList)
       expect(doc.tasks()).toEqual([])
       expect(doc.tasks.length).toBe(0)
     })
@@ -78,7 +92,7 @@ describe("createYjsDoc", () => {
 
   describe("with seeds", () => {
     it("creates a doc with scalar seed values", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       change(doc, (d: any) => {
         d.title.insert(0, "Hello")
         d.count.set(42)
@@ -94,7 +108,7 @@ describe("createYjsDoc", () => {
     })
 
     it("creates a doc with partial seed (defaults fill gaps)", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       change(doc, (d: any) => {
         d.title.insert(0, "Partial")
       })
@@ -104,7 +118,7 @@ describe("createYjsDoc", () => {
     })
 
     it("creates a doc with nested struct seed", () => {
-      const doc = createYjsDoc(NestedSchema)
+      const doc = createDoc(boundNested)
       change(doc, (d: any) => {
         d.title.insert(0, "Doc")
         d.meta.author.set("Alice")
@@ -119,7 +133,7 @@ describe("createYjsDoc", () => {
     })
 
     it("creates a doc with struct list seed items", () => {
-      const doc = createYjsDoc(StructListSchema)
+      const doc = createDoc(boundStructList)
       // Separate change() calls for list pushes to preserve order
       change(doc, (d: any) => d.tasks.push({ name: "Task 1", done: false }))
       change(doc, (d: any) => d.tasks.push({ name: "Task 2", done: true }))
@@ -146,7 +160,10 @@ describe("createYjsDoc", () => {
         ;(rootMap.get("items") as Y.Array<string>).push(["x"])
       })
 
-      const doc = createYjsDoc(SimpleSchema, yjsDoc)
+      const doc = createRef(
+        SimpleSchema,
+        createYjsSubstrate(yjsDoc, SimpleSchema),
+      )
       expect(doc.title()).toBe("External")
       expect(doc.count()).toBe(99)
       expect(doc.items()).toEqual(["x"])
@@ -156,7 +173,10 @@ describe("createYjsDoc", () => {
       const yjsDoc = new Y.Doc()
       ensureContainers(yjsDoc, SimpleSchema)
 
-      const doc = createYjsDoc(SimpleSchema, yjsDoc)
+      const doc = createRef(
+        SimpleSchema,
+        createYjsSubstrate(yjsDoc, SimpleSchema),
+      )
       change(doc, (d: any) => {
         d.title.insert(0, "Hello")
         d.count.set(42)
@@ -171,7 +191,10 @@ describe("createYjsDoc", () => {
       const yjsDoc = new Y.Doc()
       ensureContainers(yjsDoc, SimpleSchema)
 
-      const doc = createYjsDoc(SimpleSchema, yjsDoc)
+      const doc = createRef(
+        SimpleSchema,
+        createYjsSubstrate(yjsDoc, SimpleSchema),
+      )
 
       const rootMap = yjsDoc.getMap("root")
       rootMap.set("count", 77)
@@ -179,12 +202,15 @@ describe("createYjsDoc", () => {
       expect(doc.count()).toBe(77)
     })
 
-    it("yjs() escape hatch returns the same Y.Doc", () => {
+    it("unwrap() escape hatch returns the same Y.Doc", () => {
       const yjsDoc = new Y.Doc()
       ensureContainers(yjsDoc, SimpleSchema)
 
-      const doc = createYjsDoc(SimpleSchema, yjsDoc)
-      const escaped = yjs(doc)
+      const doc = createRef(
+        SimpleSchema,
+        createYjsSubstrate(yjsDoc, SimpleSchema),
+      )
+      const escaped = unwrap(doc)
 
       expect(escaped).toBe(yjsDoc)
     })
@@ -192,12 +218,12 @@ describe("createYjsDoc", () => {
 })
 
 // ===========================================================================
-// createYjsDocFromEntirety
+// createDoc with payload (fromEntirety)
 // ===========================================================================
 
-describe("createYjsDocFromEntirety", () => {
+describe("createDoc with payload", () => {
   it("reconstructs state from a snapshot", () => {
-    const doc1 = createYjsDoc(SimpleSchema)
+    const doc1 = createDoc(boundSimple)
     change(doc1, (d: any) => {
       d.title.insert(0, "Snapshot")
       d.count.set(42)
@@ -206,7 +232,7 @@ describe("createYjsDocFromEntirety", () => {
     change(doc1, (d: any) => d.items.push("b"))
 
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, payload)
+    const doc2 = createDoc(boundSimple, payload)
 
     expect(doc2.title()).toBe("Snapshot")
     expect(doc2.count()).toBe(42)
@@ -214,7 +240,7 @@ describe("createYjsDocFromEntirety", () => {
   })
 
   it("reconstructs state after mutations", () => {
-    const doc1 = createYjsDoc(SimpleSchema)
+    const doc1 = createDoc(boundSimple)
     change(doc1, (d: any) => {
       d.title.insert(0, "Start")
     })
@@ -226,7 +252,7 @@ describe("createYjsDocFromEntirety", () => {
     })
 
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, payload)
+    const doc2 = createDoc(boundSimple, payload)
 
     expect(doc2.title()).toBe("Start End")
     expect(doc2.count()).toBe(99)
@@ -234,7 +260,7 @@ describe("createYjsDocFromEntirety", () => {
   })
 
   it("reconstructs nested struct state from snapshot", () => {
-    const doc1 = createYjsDoc(NestedSchema)
+    const doc1 = createDoc(boundNested)
     change(doc1, (d: any) => {
       d.title.insert(0, "Nested")
       d.meta.author.set("Alice")
@@ -244,7 +270,7 @@ describe("createYjsDocFromEntirety", () => {
     change(doc1, (d: any) => d.meta.tags.push("v2"))
 
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(NestedSchema, payload)
+    const doc2 = createDoc(boundNested, payload)
 
     expect(doc2.title()).toBe("Nested")
     expect(doc2.meta.author()).toBe("Alice")
@@ -254,12 +280,12 @@ describe("createYjsDocFromEntirety", () => {
   })
 
   it("reconstructs struct list state from snapshot", () => {
-    const doc1 = createYjsDoc(StructListSchema)
+    const doc1 = createDoc(boundStructList)
     change(doc1, (d: any) => d.tasks.push({ name: "Task A", done: false }))
     change(doc1, (d: any) => d.tasks.push({ name: "Task B", done: true }))
 
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(StructListSchema, payload)
+    const doc2 = createDoc(boundStructList, payload)
 
     expect(doc2.tasks.length).toBe(2)
     expect((doc2.tasks.at(0) as any).name()).toBe("Task A")
@@ -267,12 +293,12 @@ describe("createYjsDocFromEntirety", () => {
   })
 
   it("is writable after reconstruction", () => {
-    const doc1 = createYjsDoc(SimpleSchema)
+    const doc1 = createDoc(boundSimple)
     change(doc1, (d: any) => {
       d.title.insert(0, "Original")
     })
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, payload)
+    const doc2 = createDoc(boundSimple, payload)
 
     change(doc2, (d: any) => {
       d.title.insert(8, " Copy")
@@ -284,12 +310,12 @@ describe("createYjsDocFromEntirety", () => {
   })
 
   it("is observable after reconstruction", () => {
-    const doc1 = createYjsDoc(SimpleSchema)
+    const doc1 = createDoc(boundSimple)
     change(doc1, (d: any) => {
       d.title.insert(0, "Original")
     })
     const payload = exportEntirety(doc1)
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, payload)
+    const doc2 = createDoc(boundSimple, payload)
 
     const received: any[] = []
     subscribe(doc2, (changeset: any) => {
@@ -311,13 +337,13 @@ describe("createYjsDocFromEntirety", () => {
 describe("sync primitives", () => {
   describe("version", () => {
     it("returns a YjsVersion", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       const v = version(doc)
       expect(v).toBeInstanceOf(YjsVersion)
     })
 
     it("advances after mutations", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       const v1 = version(doc)
 
       change(doc, (d: any) => {
@@ -329,7 +355,7 @@ describe("sync primitives", () => {
     })
 
     it("serialize/parse round-trips", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       change(doc, (d: any) => {
         d.title.insert(0, "Test")
       })
@@ -342,7 +368,7 @@ describe("sync primitives", () => {
 
   describe("exportEntirety", () => {
     it("returns a binary payload", () => {
-      const doc = createYjsDoc(SimpleSchema)
+      const doc = createDoc(boundSimple)
       change(doc, (d: any) => {
         d.title.insert(0, "Snap")
       })
@@ -355,11 +381,11 @@ describe("sync primitives", () => {
 
   describe("exportSince + merge", () => {
     it("syncs incremental changes between two docs", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
+      const doc1 = createDoc(boundSimple)
       change(doc1, (d: any) => {
         d.title.insert(0, "Start")
       })
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       const v2Before = version(doc2)
 
@@ -373,7 +399,7 @@ describe("sync primitives", () => {
       // Export delta and apply to doc2
       const delta = exportSince(doc1, v2Before)
       expect(delta).not.toBeNull()
-      expect(delta!.encoding).toBe("binary")
+      expect(delta?.encoding).toBe("binary")
 
       merge(doc2, delta!)
 
@@ -383,8 +409,8 @@ describe("sync primitives", () => {
     })
 
     it("syncs multiple incremental deltas", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc1 = createDoc(boundSimple)
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       // First round
       let vBefore = version(doc2)
@@ -412,11 +438,11 @@ describe("sync primitives", () => {
     })
 
     it("changefeed fires on merge", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
+      const doc1 = createDoc(boundSimple)
       change(doc1, (d: any) => {
         d.title.insert(0, "Source")
       })
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       const v2Before = version(doc2)
 
@@ -438,8 +464,8 @@ describe("sync primitives", () => {
     })
 
     it("merge passes origin to changefeed", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc1 = createDoc(boundSimple)
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       const v2Before = version(doc2)
       change(doc1, (d: any) => {
@@ -459,7 +485,7 @@ describe("sync primitives", () => {
 
   describe("versions equal after sync", () => {
     it("versions equal after full snapshot sync", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
+      const doc1 = createDoc(boundSimple)
       change(doc1, (d: any) => {
         d.title.insert(0, "Same")
       })
@@ -467,14 +493,14 @@ describe("sync primitives", () => {
         d.count.set(42)
       })
 
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       expect(version(doc1).compare(version(doc2))).toBe("equal")
     })
 
     it("versions equal after bidirectional delta sync", () => {
-      const doc1 = createYjsDoc(SimpleSchema)
-      const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+      const doc1 = createDoc(boundSimple)
+      const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
       const v1Before = version(doc1)
       const v2Before = version(doc2)
@@ -505,11 +531,8 @@ describe("sync primitives", () => {
 describe("full workflow", () => {
   it("create → mutate → sync → observe", () => {
     // 1. Create two docs
-    const doc1 = createYjsDoc(StructListSchema)
-    const doc2 = createYjsDocFromEntirety(
-      StructListSchema,
-      exportEntirety(doc1),
-    )
+    const doc1 = createDoc(boundStructList)
+    const doc2 = createDoc(boundStructList, exportEntirety(doc1))
 
     // 2. Set up observer on doc2
     const changes: any[] = []
@@ -560,7 +583,7 @@ describe("full workflow", () => {
 
   it("create → mutate → snapshot → reconstruct → continue", () => {
     // 1. Create and mutate
-    const doc1 = createYjsDoc(SimpleSchema)
+    const doc1 = createDoc(boundSimple)
     change(doc1, (d: any) => {
       d.title.insert(0, "Start")
     })
@@ -574,7 +597,7 @@ describe("full workflow", () => {
     const snapshot = exportEntirety(doc1)
 
     // 3. Reconstruct
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, snapshot)
+    const doc2 = createDoc(boundSimple, snapshot)
     expect(doc2.title()).toBe("Start Middle")
     expect(doc2.count()).toBe(10)
     expect(doc2.items()).toEqual(["first"])
@@ -599,8 +622,8 @@ describe("full workflow", () => {
 
   it("concurrent edits converge correctly", () => {
     // 1. Create two peers from the same initial state
-    const doc1 = createYjsDoc(SimpleSchema)
-    const doc2 = createYjsDocFromEntirety(SimpleSchema, exportEntirety(doc1))
+    const doc1 = createDoc(boundSimple)
+    const doc2 = createDoc(boundSimple, exportEntirety(doc1))
 
     const v1Before = version(doc1)
     const v2Before = version(doc2)

package/src/__tests__/reader.test.ts

@@ -1,4 +1,4 @@
-import { RawPath, Schema } from "@kyneta/schema"
+import { KIND, RawPath, Schema } from "@kyneta/schema"
 import { describe, expect, it } from "vitest"
 import * as Y from "yjs"
 import { ensureContainers } from "../populate.js"
@@ -15,10 +15,7 @@ import { yjsReader } from "../reader.js"
  * After `ensureContainers` the doc has the correct shared types but no
  * values. We populate values via raw Yjs API within a single transact.
  */
-function setup(
-  schema: ReturnType<typeof Schema.doc>,
-  seed?: Record<string, unknown>,
-) {
+function setup(schema: any, seed?: Record<string, unknown>) {
   const doc = new Y.Doc()
   ensureContainers(doc, schema)
   if (seed) {
@@ -42,11 +39,11 @@ function setup(
  */
 function populateSeed(
   ymap: Y.Map<unknown>,
-  schema: ReturnType<typeof Schema.doc>,
+  schema: any,
   seed: Record<string, unknown>,
 ) {
-  const rootProduct = unwrapToProduct(schema)
-  if (!rootProduct) return
+  if (schema[KIND] !== "product") return
+  const rootProduct = schema
 
   for (const [key, value] of Object.entries(seed)) {
     if (value === undefined) continue
@@ -63,20 +60,15 @@ function populateField(
   fieldSchema: any,
   value: unknown,
 ) {
-  const tag = fieldSchema._kind === "annotated" ? fieldSchema.tag : undefined
-
-  if (tag === "text") {
-    // Text field — the Y.Text was already created by ensureContainers
-    const text = ymap.get(key) as Y.Text
-    if (text && typeof value === "string" && value.length > 0) {
-      text.insert(0, value)
+  switch (fieldSchema[KIND]) {
+    case "text": {
+      // Text field — the Y.Text was already created by ensureContainers
+      const text = ymap.get(key) as Y.Text
+      if (text && typeof value === "string" && value.length > 0) {
+        text.insert(0, value)
+      }
+      return
     }
-    return
-  }
-
-  const structural = unwrapAnnotations(fieldSchema)
-
-  switch (structural._kind) {
     case "product": {
       // Struct — recurse into the existing Y.Map
       const childMap = ymap.get(key) as Y.Map<unknown>
@@ -84,7 +76,7 @@ function populateField(
         for (const [childKey, childValue] of Object.entries(
           value as Record<string, unknown>,
         )) {
-          const childFieldSchema = (structural.fields as Record<string, any>)[
+          const childFieldSchema = (fieldSchema.fields as Record<string, any>)[
             childKey
           ]
           if (!childFieldSchema) continue
@@ -99,11 +91,11 @@ function populateField(
       const arr = ymap.get(key) as Y.Array<unknown>
       if (arr && Array.isArray(value)) {
         for (const item of value) {
-          const itemSchema = structural.item
-          if (itemSchema && unwrapAnnotations(itemSchema)._kind === "product") {
+          const itemSchema = fieldSchema.item
+          if (itemSchema && itemSchema[KIND] === "product") {
             // Struct items: create a Y.Map for each
             const itemMap = buildStructMap(
-              unwrapAnnotations(itemSchema),
+              itemSchema,
               item as Record<string, unknown>,
             )
             arr.push([itemMap])
@@ -150,22 +142,19 @@ function buildStructMap(
     const value = seed[key]
     if (value === undefined) continue
 
-    const tag = fieldSchema._kind === "annotated" ? fieldSchema.tag : undefined
-    if (tag === "text") {
-      const text = new Y.Text()
-      if (typeof value === "string" && value.length > 0) {
-        text.insert(0, value)
+    switch (fieldSchema[KIND]) {
+      case "text": {
+        const text = new Y.Text()
+        if (typeof value === "string" && value.length > 0) {
+          text.insert(0, value)
+        }
+        map.set(key, text)
+        break
       }
-      map.set(key, text)
-      continue
-    }
-
-    const structural = unwrapAnnotations(fieldSchema)
-    switch (structural._kind) {
       case "product": {
         map.set(
           key,
-          buildStructMap(structural, value as Record<string, unknown>),
+          buildStructMap(fieldSchema, value as Record<string, unknown>),
         )
         break
       }
@@ -173,16 +162,10 @@ function buildStructMap(
         const arr = new Y.Array()
         if (Array.isArray(value)) {
           for (const item of value) {
-            const itemSchema = structural.element ?? structural.schema
-            if (
-              itemSchema &&
-              unwrapAnnotations(itemSchema)._kind === "product"
-            ) {
+            const itemSchema = fieldSchema.item
+            if (itemSchema && itemSchema[KIND] === "product") {
               arr.push([
-                buildStructMap(
-                  unwrapAnnotations(itemSchema),
-                  item as Record<string, unknown>,
-                ),
+                buildStructMap(itemSchema, item as Record<string, unknown>),
               ])
             } else {
               arr.push([item])
@@ -212,23 +195,6 @@ function buildStructMap(
   return map
 }
 
-function unwrapToProduct(schema: any): any {
-  let s = schema
-  while (s._kind === "annotated" && s.schema !== undefined) {
-    s = s.schema
-  }
-  if (s._kind === "product") return s
-  return null
-}
-
-function unwrapAnnotations(schema: any): any {
-  let s = schema
-  while (s._kind === "annotated" && s.schema !== undefined) {
-    s = s.schema
-  }
-  return s
-}
-
 /** Build a RawPath from variadic key/index segments. */
 function p(...segs: (string | number)[]): RawPath {
   let path = RawPath.empty
@@ -242,18 +208,18 @@ function p(...segs: (string | number)[]): RawPath {
 // Schemas used across tests
 // ===========================================================================
 
-const TextSchema = Schema.doc({
-  title: Schema.annotated("text"),
-  subtitle: Schema.annotated("text"),
+const TextSchema = Schema.struct({
+  title: Schema.text(),
+  subtitle: Schema.text(),
 })
 
-const ScalarSchema = Schema.doc({
+const ScalarSchema = Schema.struct({
   name: Schema.string(),
   count: Schema.number(),
   active: Schema.boolean(),
 })
 
-const NestedStructSchema = Schema.doc({
+const NestedStructSchema = Schema.struct({
   profile: Schema.struct({
     first: Schema.string(),
     last: Schema.string(),
@@ -264,7 +230,7 @@ const NestedStructSchema = Schema.doc({
   }),
 })
 
-const ListSchema = Schema.doc({
+const ListSchema = Schema.struct({
   items: Schema.list(Schema.string()),
   structs: Schema.list(
     Schema.struct({
@@ -274,12 +240,12 @@ const ListSchema = Schema.doc({
   ),
 })
 
-const MapSchema = Schema.doc({
+const MapSchema = Schema.struct({
   labels: Schema.record(Schema.string()),
 })
 
-const MixedSchema = Schema.doc({
-  title: Schema.annotated("text"),
+const MixedSchema = Schema.struct({
+  title: Schema.text(),
   count: Schema.number(),
   items: Schema.list(
     Schema.struct({