@dxos/echo 0.8.4-staging.ac66bdf99f → 0.9.1-main.c7dcc2e112

package/dist/lib/neutral/chunk-4TPQZPLY.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/internal/Ref/ref.ts", "../../../src/internal/Ref/atoms.ts", "../../../src/internal/Ref/utils.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport type * as Atom from '@effect-atom/atom/Atom';\nimport * as Effect from 'effect/Effect';\nimport * as Equal from 'effect/Equal';\nimport * as Hash from 'effect/Hash';\nimport * as Option from 'effect/Option';\nimport * as ParseResult from 'effect/ParseResult';\nimport * as Pipeable from 'effect/Pipeable';\nimport * as Schema from 'effect/Schema';\nimport * as SchemaAST from 'effect/SchemaAST';\nimport type * as Types from 'effect/Types';\n\nimport { Event } from '@dxos/async';\nimport { type CustomInspectFunction, inspectCustom } from '@dxos/debug';\nimport { EncodedReference } from '@dxos/echo-protocol';\nimport { assertArgument, invariant } from '@dxos/invariant';\nimport { DXN, EID, EntityId, type URI } from '@dxos/keys';\n\nimport * as Database from '../../Database';\nimport type * as Type from '../../Type';\nimport {\n  ReferenceAnnotationId,\n  getSchemaURI,\n  getTypeAnnotation,\n  getTypeIdentifierAnnotation,\n} from '../Annotation/annotations';\nimport { type AnyEntity, type AnyProperties, type UnknownTypeSchema, getStaticTypeSchema } from '../common/types';\nimport { type JsonSchemaType } from '../JsonSchema';\nimport * as RefAtoms from './atoms';\n\n/**\n * The `$id` and `$ref` fields for an ECHO reference schema.\n */\nexport const JSON_SCHEMA_ECHO_REF_ID = '/schemas/echo/ref';\n\nexport const getSchemaReference = (property: JsonSchemaType): { typename: string } | undefined => {\n  const { $id, reference: { schema: { $ref } = {} } = {} } = property;\n  if ($id === JSON_SCHEMA_ECHO_REF_ID && $ref) {\n    const parsed = DXN.tryMake($ref);\n    const typename = parsed ? DXN.getName(parsed) : undefined;\n    return typename ? { typename } : undefined;\n  }\n};\n\nexport const createSchemaReference = (typename: string): Types.DeepMutable<JsonSchemaType> => {\n  return {\n    $id: JSON_SCHEMA_ECHO_REF_ID,\n    reference: {\n      schema: {\n        $ref: DXN.make(typename),\n      },\n    },\n  };\n};\n\n/**\n * Runtime type-info for a reference extracted from effect AST.\n */\nexport type RefereneAST = {\n  /**\n   * Typename of linked schema.\n   */\n  typename: string;\n\n  /**\n   * Version of linked schema.\n   */\n  version: string;\n};\n\nexport const getReferenceAst = (ast: SchemaAST.AST): RefereneAST | undefined => {\n  if (ast._tag !== 'Declaration' || !ast.annotations[ReferenceAnnotationId]) {\n    return undefined;\n  }\n  return {\n    typename: (ast.annotations[ReferenceAnnotationId] as any).typename,\n    version: (ast.annotations[ReferenceAnnotationId] as any).version,\n  };\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const RefTypeId: unique symbol = Symbol.for('@dxos/echo/internal/Ref') as any;\n\n/**\n * Reference Schema.\n */\nexport interface RefSchema<T extends AnyEntity> extends Schema.SchemaClass<Ref<T>, EncodedReference> {}\n\n/**\n * Type of the `Ref` function and extra methods attached to it.\n */\nexport interface RefFn {\n  // A reference target is a `Type.AnyEntity` entity (the canonical Option B\n  // input) or one of the well-known \"any object\" / \"any relation\" branded\n  // schemas (`Obj.Unknown` / `Relation.Unknown`). Arbitrary raw schemas are\n  // rejected.\n  //\n  // Referencing a type-kind entity (a meta-schema, e.g. `Type.Type`) yields a\n  // reference to a stored schema record; its loaded target is any registered\n  // entity (`Type.AnyEntity`), since a stored object/relation schema is itself a\n  // `Type.Type` record. Referencing an object/relation type yields a reference\n  // to an instance of that type.\n  <S extends Type.AnyEntity | UnknownTypeSchema<any, any> = Type.AnyEntity>(\n    schema: S,\n  ): RefSchema<\n    S extends Type.AnyType\n      ? Type.AnyEntity\n      : S extends Type.AnyObj | Type.AnyRelation\n        ? Type.InstanceType<S>\n        : S extends UnknownTypeSchema<infer A, any>\n          ? A\n          : never\n  >;\n\n  /**\n   * @returns True if the object is a reference.\n   */\n  isRef: (obj: unknown) => obj is Ref<any>;\n\n  /**\n   * @returns True if the reference points to the given object id.\n   */\n  hasEntityId: (id: EntityId) => (ref: Ref<any>) => boolean;\n\n  /**\n   * @returns True if the schema is a reference schema.\n   */\n  isRefSchema: (schema: Schema.Schema<any, any>) => schema is RefSchema<any>;\n\n  /**\n   * @returns True if the schema AST is a reference schema.\n   */\n  isRefSchemaAST: (ast: SchemaAST.AST) => boolean;\n\n  /**\n   * Constructs a reference that points to the given object.\n   */\n  // TODO(burdon): Narrow to Obj.Unknown?\n  make: <T extends AnyEntity>(object: T) => Ref<T>;\n\n  /**\n   * Constructs a reference that points to the object specified by the provided URI\n   * (either an `echo:` EID for an object reference or a `dxn:` DXN for a type reference).\n   */\n  fromURI: (uri: URI.URI) => Ref<any>;\n}\n\n/**\n * Schema builder for references.\n */\nexport const Ref: RefFn = (input: any): RefSchema<any> => {\n  // `Type.Type` entities carry their source schema on the hidden slot; the\n  // branded `Obj.Unknown` / `Relation.Unknown` schemas are used directly.\n  const schema = getStaticTypeSchema(input) ?? input;\n  assertArgument(Schema.isSchema(schema), 'schema', 'Must call with an instance of effect-schema');\n  const annotation = getTypeAnnotation(schema);\n  if (annotation == null) {\n    throw new Error('Reference target must be an ECHO schema.');\n  }\n\n  return createEchoReferenceSchema(getTypeIdentifierAnnotation(schema), annotation.typename, annotation.version);\n};\n\n/**\n * Represents materialized reference to a target.\n * This is the data type for the fields marked as ref.\n */\nexport interface Ref<T> extends Pipeable.Pipeable {\n  /**\n   * Target URI (either an `echo:` EID for an object reference or a `dxn:` DXN for a type reference).\n   */\n  get uri(): URI.URI;\n\n  /**\n   * Returns true if the reference has a target available (inlined or resolver set).\n   */\n  get isAvailable(): boolean;\n\n  /**\n   * @returns The reference target.\n   * May return `undefined` if the object is not loaded in the working set.\n   * Accessing this property, even if it returns `undefined` will trigger the object to be loaded to the working set.\n   */\n  get target(): T | undefined;\n\n  /**\n   * @returns Promise that will resolves with the target object.\n   * Will load the object from disk if it is not present in the working set.\n   * @throws If the object is not available locally.\n   */\n  load(): Promise<T>;\n\n  /**\n   * @returns Promise that will resolves with the target object or undefined if the object is not loaded locally.\n   */\n\n  tryLoad(): Promise<T | undefined>;\n\n  /**\n   * Subscribe to the ref's resolution event.\n   * The callback fires when the target object becomes available in the working set\n   * (e.g. when its document is loaded after sibling-client mutation).\n   * Note: the resolver only schedules a notification when the target is requested\n   * via {@link target} while it is not yet loaded.\n   * @returns Function that unsubscribes the callback.\n   */\n  onResolved(callback: () => void): () => void;\n\n  /**\n   * Do not inline the target object in the reference.\n   * Makes .target unavailable unless the reference is connected to a database context.\n   *\n   * When serialized with toJSON, the difference is between:\n   * `{ \"/\": \"dxn:...\" }`\n   * and\n   * `{ \"/\": \"dxn:...\", \"target\": { ... } }`\n   *\n   * Clones the reference object.\n   */\n  noInline(): Ref<T>;\n\n  /**\n   * Read-only atom for the ref target.\n   * Resolves once when the target loads; does NOT subscribe to target object mutations.\n   * Use `Obj.atom(ref)` if you need reactive snapshots that update on every object mutation.\n   */\n  get atom(): Atom.Atom<T | undefined>;\n\n  /**\n   * Serializes the reference to a JSON object.\n   * The serialization format is compatible with the IPLD-style encoded references.\n   * When a reference has a saved target (i.e. the target or object holding the reference is not in the database),\n   * the target is included in the serialized object.\n   *\n   * Examples:\n   * `{ \"/\": \"dxn:...\" }`\n   * `{ \"/\": \"dxn:...\", \"target\": { ... } }`\n   */\n  encode(): EncodedReference;\n\n  [RefTypeId]: {\n    _T: T;\n  };\n}\n\nexport declare namespace Ref {\n  /**\n   * Target of the reference.\n   */\n  export type Target<R> = R extends Ref<infer U> ? U : never;\n}\n\nRef.isRef = (obj: any): obj is Ref<any> => {\n  return obj != null && typeof obj === 'object' && RefTypeId in obj;\n};\n\nRef.hasEntityId = (id: EntityId) => (ref: Ref<any>) => {\n  const uri = EID.tryParse(ref.uri);\n  return uri !== undefined && EID.isLocal(uri) && EID.getEntityId(uri) === id;\n};\n\nRef.isRefSchema = (schema: Schema.Schema<any, any>): schema is RefSchema<any> => {\n  return Ref.isRefSchemaAST(schema.ast);\n};\n\nRef.isRefSchemaAST = (ast: SchemaAST.AST): boolean => {\n  return SchemaAST.getAnnotation(ast, ReferenceAnnotationId).pipe(Option.isSome);\n};\n\nRef.make = <T extends AnyProperties>(obj: T): Ref<T> => {\n  if (typeof obj !== 'object' || obj === null) {\n    throw new TypeError('Expected: ECHO object.');\n  }\n\n  // TODO(dmaretskyi): Extract to `getObjectEchoUri` function.\n  const id = obj.id;\n  invariant(EntityId.isValid(id), 'Invalid object ID');\n  const uri = EID.make({ entityId: id });\n  const ref = new RefImpl(uri, obj);\n  return ref;\n};\n\nRef.fromURI = (uri: URI.URI): Ref<any> => {\n  assertArgument(typeof uri === 'string', 'uri', 'Expected URI string');\n  return new RefImpl(uri);\n};\n\n/**\n * `reference` field on the schema object.\n */\nexport type JsonSchemaReferenceInfo = {\n  schema: { $ref: string };\n  schemaVersion?: string;\n};\n\n/**\n * @internal\n */\n// TODO(burdon): Move to json schema and make private?\nexport const createEchoReferenceSchema = (\n  echoUri: string | undefined,\n  typename: string | undefined,\n  version: string | undefined,\n): Schema.SchemaClass<Ref<any>, EncodedReference> => {\n  if (!echoUri && !typename) {\n    throw new TypeError('Either echoUri or typename must be provided.');\n  }\n\n  const referenceInfo: JsonSchemaReferenceInfo = {\n    schema: {\n      // TODO(dmaretskyi): Include version?\n      $ref: echoUri ?? DXN.make(typename!),\n    },\n    schemaVersion: version,\n  };\n\n  // TODO(dmaretskyi): Add name and description.\n  const refSchema = Schema.declare<Ref<any>, EncodedReference, []>(\n    [],\n    {\n      encode: () => {\n        return (value) =>\n          Effect.gen(function* () {\n            if (Ref.isRef(value)) {\n              return EncodedReference.fromURI((value as Ref<any>).uri);\n            } else if (EncodedReference.isEncodedReference(value)) {\n              return value;\n            }\n            throw new Error('Invalid reference');\n          });\n      },\n      decode: () => {\n        return (value) =>\n          Effect.gen(function* () {\n            const dbService = yield* Effect.serviceOption(Database.Service);\n\n            // TODO(dmaretskyi): This branch seems to be taken by Schema.is\n            if (Ref.isRef(value)) {\n              if (Option.isSome(dbService)) {\n                return dbService.value.db.makeRef(value.uri);\n              } else {\n                return value;\n              }\n            }\n\n            if (!EncodedReference.isEncodedReference(value)) {\n              return yield* Effect.fail(new ParseResult.Unexpected(value, 'reference'));\n            }\n            if (Option.isSome(dbService)) {\n              return dbService.value.db.makeRef(EncodedReference.toURI(value));\n            } else {\n              return Ref.fromURI(EncodedReference.toURI(value));\n            }\n          });\n      },\n    },\n    {\n      jsonSchema: {\n        // TODO(dmaretskyi): We should remove `$id` and keep `$ref` with a fully qualified name.\n        $id: JSON_SCHEMA_ECHO_REF_ID,\n        $ref: JSON_SCHEMA_ECHO_REF_ID,\n        reference: referenceInfo,\n      },\n      [ReferenceAnnotationId]: {\n        typename: typename ?? '',\n        version,\n      },\n    },\n  );\n\n  return refSchema;\n};\n\nconst getSchemaExpectedName = (ast: SchemaAST.Annotated): string | undefined => {\n  return SchemaAST.getIdentifierAnnotation(ast).pipe(\n    Option.orElse(() => SchemaAST.getTitleAnnotation(ast)),\n    Option.orElse(() => SchemaAST.getDescriptionAnnotation(ast)),\n    Option.getOrElse(() => undefined),\n  );\n};\n\n/**\n * Load-source ceiling for a resolution request. Cheaper tiers are always probed first; the\n * ceiling caps how far a request is allowed to reach:\n * - `working-set`: synchronous, in-memory only. A miss settles `unavailable` immediately.\n * - `disk`: probe the working set, then local storage; never the network.\n * - `network`: probe the working set, disk, then fetch from peers.\n *\n * `unavailable` is always relative to the requested ceiling (disk-unavailable ≠ network-unavailable).\n */\nexport type RefSource = 'working-set' | 'disk' | 'network';\n\n/**\n * A stateful, closure-aware handle to an in-flight (or settled) reference resolution.\n *\n * `ready` means the entity is FULLY USABLE: its own body and its strong-dependency closure are all\n * materialized. The body-vs-closure split is internal; `requesting` transparently covers \"a\n * dependency is still loading\".\n */\nexport interface RefResolverRequest {\n  /**\n   * `pending` is a one-way entry state (never re-entered). `requesting` means the body and/or\n   * closure is still loading. `ready` means fully usable. `unavailable` means unreachable at the\n   * requested ceiling.\n   */\n  readonly state: 'pending' | 'requesting' | 'ready' | 'unavailable';\n\n  /**\n   * Fires (deferred to a microtask) whenever {@link state} changes.\n   */\n  readonly stateChanged: Event<void>;\n\n  /**\n   * Synchronous snapshot of the resolved entity; defined iff `state === 'ready'`.\n   */\n  getResult(): AnyProperties | undefined;\n\n  /**\n   * Settles when `state ∈ {ready, unavailable}`.\n   */\n  wait(): Promise<AnyProperties | undefined>;\n\n  /**\n   * Decrements the refcount on the shared load op(s); cancels the underlying IO at zero.\n   */\n  abort(): void;\n}\n\nexport interface RefResolver {\n  /**\n   * Resolve a reference, returning a stateful handle. `source` is a required ceiling; cheaper\n   * tiers are always probed first.\n   */\n  resolve(uri: URI.URI, options: { source: RefSource }): RefResolverRequest;\n\n  /**\n   * Resolve ref synchronously from the objects in the working set.\n   *\n   * @param uri\n   * @param load If true the resolver should attempt to load the object from disk.\n   * @param onLoad Callback to call when the object is loaded.\n   * @deprecated Use {@link resolve} with `{ source: 'working-set' }`. Removed in Task 11.\n   */\n  resolveSync(uri: URI.URI, load: boolean, onLoad?: () => void): AnyProperties | undefined;\n\n  /**\n   * Resolver ref asynchronously.\n   * @deprecated Use {@link resolve} with `{ source: 'network' }`. Removed in Task 11.\n   */\n  resolveLegacy(uri: URI.URI): Promise<AnyProperties | undefined>;\n\n  /**\n   * @deprecated Use {@link resolve} + `Type.getSchema`. Removed in Task 11.\n   */\n  resolveSchema(uri: URI.URI): Promise<Schema.Schema.AnyNoContext | undefined>;\n\n  /**\n   * Resolve the source `Type.AnyEntity` entity for a type URI. Used by\n   * deserialization paths (`Obj.fromJSON`) to set the back-reference accessed\n   * via `Obj.getType` / `Entity.getType`. Optional — resolvers that only\n   * carry raw schemas may leave this unimplemented; the deserializer falls\n   * back to leaving the type entity unset.\n   * @deprecated Use {@link resolve}. Removed in Task 11.\n   */\n  resolveType?(uri: URI.URI): Promise<unknown | undefined>;\n}\n\n/**\n * A settled {@link RefResolverRequest} with a fixed `state` and `result`, used by resolvers\n * whose backends are fully synchronous (e.g. {@link StaticRefResolver}).\n */\nexport const makeSettledRequest = (\n  state: RefResolverRequest['state'],\n  result: AnyProperties | undefined,\n): RefResolverRequest => ({\n  state,\n  stateChanged: new Event<void>(),\n  getResult: () => (state === 'ready' ? result : undefined),\n  wait: async () => (state === 'ready' ? result : undefined),\n  abort: () => {},\n});\n\nexport class RefImpl<T> implements Ref<T> {\n  #uri: URI.URI;\n  #resolver?: RefResolver = undefined;\n  #resolved = new Event<void>();\n\n  /**\n   * Target is set when the reference is created from a specific object.\n   * In this case, the target might not be in the database.\n   */\n  #target: T | undefined = undefined;\n\n  /**\n   * Callback to issue a reactive notification when object is resolved.\n   */\n  #resolverCallback = () => {\n    this.#resolved.emit();\n  };\n\n  constructor(uri: URI.URI, target?: T) {\n    this.#uri = uri;\n    this.#target = target;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  get uri(): URI.URI {\n    return this.#uri;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  get isAvailable(): boolean {\n    return this.#target !== undefined || this.#resolver !== undefined;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  get target(): T | undefined {\n    if (this.#target) {\n      return this.#target;\n    }\n\n    invariant(this.#resolver, 'Resolver is not set');\n    return this.#resolver.resolveSync(this.#uri, true, this.#resolverCallback) as T | undefined;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  async load(): Promise<T> {\n    if (this.#target) {\n      return this.#target;\n    }\n    invariant(this.#resolver, 'Resolver is not set');\n    const obj = await this.#resolver.resolveLegacy(this.#uri);\n    if (obj == null) {\n      throw new Error('Object not found');\n    }\n    return obj as T;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  async tryLoad(): Promise<T | undefined> {\n    if (this.#target) {\n      return this.#target;\n    }\n    invariant(this.#resolver, 'Resolver is not set');\n    return (await this.#resolver.resolveLegacy(this.#uri)) as T | undefined;\n  }\n\n  /**\n   * @inheritdoc\n   */\n  onResolved(callback: () => void): () => void {\n    return this.#resolved.on(callback);\n  }\n\n  /**\n   * Do not inline the target object in the reference.\n   * Makes .target unavailable unless the reference is connected to a database context.\n   * Clones the reference object.\n   */\n  noInline(): RefImpl<T> {\n    const ref = new RefImpl<T>(this.#uri, undefined);\n    ref.#resolver = this.#resolver;\n    return ref;\n  }\n\n  encode(): EncodedReference {\n    return {\n      '/': this.#uri,\n      ...(this.#target ? { target: this.#target } : {}),\n    };\n  }\n\n  /**\n   * Serializes the reference to a JSON object.\n   * The serialization format is compatible with the IPLD-style encoded references.\n   * When a reference has a saved target (i.e. the target or object holding the reference is not in the database),\n   * the target is included in the serialized object.\n   */\n  toJSON(): EncodedReference {\n    return this.encode();\n  }\n\n  toString(): string {\n    if (this.#target) {\n      return `Ref(${this.#target.toString()})`;\n    }\n\n    return `Ref(${this.#uri.toString()})`;\n  }\n\n  [inspectCustom]: CustomInspectFunction = (depth, options, inspect) => {\n    return this.toString();\n  };\n\n  [RefTypeId] = refVariance;\n\n  /**\n   * Effect Hash trait. Required for MutableHashMap-based caches (e.g., Atom.family)\n   * to deduplicate Ref instances that point to the same object.\n   * ECHO proxies return new RefImpl instances on every property access,\n   * so without this, each access would create a separate cache entry.\n   */\n  [Hash.symbol](): number {\n    return Hash.hash(this.#uri.toString());\n  }\n\n  /** Effect Equal trait. See {@link Hash.symbol} for rationale. */\n  [Equal.symbol](that: Equal.Equal): boolean {\n    return that instanceof RefImpl && this.#uri === that.uri;\n  }\n\n  get atom(): Atom.Atom<T | undefined> {\n    return RefAtoms.refSimpleFamily(this);\n  }\n\n  /**\n   * Internal method to set the resolver.\n   *\n   * @internal\n   */\n  _setResolver(resolver: RefResolver): void {\n    this.#resolver = resolver;\n  }\n\n  /**\n   * @internal\n   */\n  _getSavedTarget(): T | undefined {\n    return this.#target;\n  }\n\n  pipe() {\n    // eslint-disable-next-line prefer-rest-params\n    return Pipeable.pipeArguments(this, arguments);\n  }\n}\n\n/**\n * Internal API for setting the reference resolver.\n */\nexport const setRefResolver = (ref: Ref<any>, resolver: RefResolver) => {\n  invariant(ref instanceof RefImpl, 'Ref is not an instance of RefImpl');\n  ref._setResolver(resolver);\n};\n\n/**\n * Internal API for getting the saved target on a reference.\n */\nexport const getRefSavedTarget = (ref: Ref<any>): AnyProperties | undefined => {\n  invariant(ref instanceof RefImpl, 'Ref is not an instance of RefImpl');\n  return ref._getSavedTarget();\n};\n\n// Used to validate reference target type.\nconst refVariance: Ref<any>[typeof RefTypeId] = {\n  _T: null as any,\n};\n\nexport const refFromEncodedReference = (encodedReference: EncodedReference, resolver?: RefResolver): Ref<any> => {\n  const uri = EncodedReference.toURI(encodedReference);\n  const ref = new RefImpl(uri);\n\n  // TODO(dmaretskyi): Handle inline target in the encoded reference.\n\n  if (resolver) {\n    setRefResolver(ref, resolver);\n  }\n  return ref;\n};\n\nexport class StaticRefResolver implements RefResolver {\n  public objects = new Map<EntityId, AnyProperties>();\n  public schemas = new Map<URI.URI, Schema.Schema.AnyNoContext>();\n\n  addObject(obj: AnyProperties): this {\n    this.objects.set(obj.id, obj);\n    return this;\n  }\n\n  addSchema(input: Type.AnyEntity): this {\n    const schema = getStaticTypeSchema(input);\n    invariant(schema, 'Type entity is missing its source schema');\n    const uri = getSchemaURI(schema);\n    invariant(uri, 'Schema has no URI');\n    this.schemas.set(uri, schema);\n    return this;\n  }\n\n  resolve(uri: URI.URI, _options: { source: RefSource }): RefResolverRequest {\n    const obj = this.#lookup(uri);\n    return makeSettledRequest(obj ? 'ready' : 'unavailable', obj);\n  }\n\n  resolveSync(uri: URI.URI, _load: boolean, _onLoad?: () => void): AnyProperties | undefined {\n    return this.#lookup(uri);\n  }\n\n  async resolveLegacy(uri: URI.URI): Promise<AnyProperties | undefined> {\n    return this.#lookup(uri);\n  }\n\n  async resolveSchema(uri: URI.URI): Promise<Schema.Schema.AnyNoContext | undefined> {\n    return this.schemas.get(uri);\n  }\n\n  #lookup(uri: URI.URI): AnyProperties | undefined {\n    const echoUri = EID.tryParse(uri);\n    const id = echoUri ? EID.getEntityId(echoUri) : undefined;\n    if (id == null) {\n      return undefined;\n    }\n    return this.objects.get(id);\n  }\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Atom from '@effect-atom/atom/Atom';\n\nimport type { Ref } from './ref';\nimport { loadRefTarget } from './utils';\n\n/**\n * Atom family for ECHO refs.\n * Uses ref reference as key — same ref returns same atom.\n * This atom only updates once when the ref loads — it does not subscribe to target object changes.\n * Use `Obj.atom(ref)` if you need reactive snapshots of ECHO objects via a ref.\n */\nexport const refSimpleFamily = Atom.family(<T>(ref: Ref<T>): Atom.Atom<T | undefined> => {\n  return Atom.make<T | undefined>((get) => {\n    return loadRefTarget(ref, get, (target) => target);\n  });\n});\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport type * as Atom from '@effect-atom/atom/Atom';\n\nimport type { Ref } from './ref';\n\n/**\n * Internal helper for loading ref targets in atoms.\n * Handles the common pattern of checking for loaded target and triggering async load.\n */\nexport const loadRefTarget = <T, R>(\n  ref: Ref<T>,\n  get: Atom.Context,\n  onTargetAvailable: (target: T) => R,\n): R | undefined => {\n  // Accessing `ref.target` registers a resolution callback when the target is\n  // not yet loaded, so resolution can be observed via `ref.onResolved` below.\n  const currentTarget = ref.target;\n  if (currentTarget) {\n    return onTargetAvailable(currentTarget);\n  }\n\n  // Subscribe to the ref's resolution event in case the target loads later.\n  const unsubscribe = ref.onResolved(() => {\n    const target = ref.target;\n    if (target) {\n      get.setSelf(onTargetAvailable(target));\n    }\n  });\n  get.addFinalizer(unsubscribe);\n\n  // Also try async load (e.g. for objects that need disk loading).\n  void ref\n    .load()\n    .then((loadedTarget) => {\n      get.setSelf(onTargetAvailable(loadedTarget));\n    })\n    .catch(() => {\n      // Loading failed; the resolution subscription above will pick up cross-client updates.\n    });\n\n  return undefined;\n};\n"],
+  "mappings": "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",
+  "names": ["Effect", "Equal", "Hash", "Option", "ParseResult", "Pipeable", "Schema", "SchemaAST", "Event", "inspectCustom", "EncodedReference", "assertArgument", "invariant", "DXN", "EID", "EntityId", "Atom", "loadRefTarget", "ref", "get", "onTargetAvailable", "currentTarget", "target", "unsubscribe", "onResolved", "setSelf", "addFinalizer", "load", "then", "loadedTarget", "catch", "undefined", "refSimpleFamily", "family", "ref", "make", "get", "loadRefTarget", "target", "reference", "$ref", "$id", "JSON_SCHEMA_ECHO_REF_ID", "parsed", "tryMake", "typename", "getName", "undefined", "schema", "version", "annotation", "getTypeAnnotation", "Error", "createEchoReferenceSchema", "isRef", "obj", "hasEntityId", "ref", "uri", "isRefSchema", "isRefSchemaAST", "ast", "make", "TypeError", "EID", "entityId", "id", "fromURI", "RefImpl", "referenceInfo", "schemaVersion", "Effect", "gen", "EncodedReference", "value", "Ref", "dbService", "Option", "isSome", "jsonSchema", "ReferenceAnnotationId", "getSchemaExpectedName", "stateChanged", "Event", "getResult", "wait", "state", "abort", "RefImpl", "undefined", "target", "invariant", "obj", "Error", "ref", "encode", "toString", "inspectCustom", "depth", "options", "inspect", "RefTypeId", "refVariance", "atom", "pipe", "_setResolver", "resolver", "_getSavedTarget", "uri", "schemas", "addObject", "objects", "set", "addSchema", "input", "schema", "getSchemaURI", "resolve", "makeSettledRequest", "resolveSync", "_onLoad", "resolveLegacy", "resolveSchema", "id"]
+}

package/dist/lib/neutral/{chunk-TU3GW67D.mjs → chunk-5GAIWRQB.mjs}

@@ -1,15 +1,15 @@
 import {
-  object
-} from "./chunk-ROG4RXXL.mjs";
-import {
-  getDXN,
+  getURI,
   make
-} from "./chunk-B4BASU6W.mjs";
+} from "./chunk-6CEISA3V.mjs";
+import {
+  makeObject
+} from "./chunk-HGWQR5KH.mjs";
 import {
   FormInputAnnotation,
-  IconAnnotation,
-  SystemTypeAnnotation
-} from "./chunk-2KHZ36F5.mjs";
+  HiddenAnnotation,
+  IconAnnotation
+} from "./chunk-WZ32BF53.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -17,12 +17,14 @@ import {
 // src/Feed.ts
 var Feed_exports = {};
 __export(Feed_exports, {
+  ContextFeedService: () => ContextFeedService,
   Feed: () => Feed,
   FeedService: () => FeedService,
   Service: () => Service,
   append: () => append,
   cursor: () => cursor,
-  getQueueDxn: () => getQueueDxn,
+  getQueueUri: () => getQueueUri,
+  getSyncState: () => getSyncState,
   make: () => make2,
   next: () => next,
   nextOption: () => nextOption,
@@ -31,13 +33,13 @@ __export(Feed_exports, {
   remove: () => remove,
   runQuery: () => runQuery,
   setRetention: () => setRetention,
-  unsafeFromQueueDXN: () => unsafeFromQueueDXN
+  sync: () => sync
 });
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import { DXN } from "@dxos/keys";
+import { DXN, EID } from "@dxos/keys";
 var Feed = Schema.Struct({
   /** User-facing display name. */
   name: Schema.String.pipe(Schema.optional),
@@ -50,38 +52,20 @@ var Feed = Schema.Struct({
   * - `trace`: Trace feed.
   */
   namespace: Schema.optional(Schema.Literal("data", "trace"))
-}).pipe(object({
-  typename: "org.dxos.type.feed",
-  version: "0.1.0"
-}), SystemTypeAnnotation.set(true), IconAnnotation.set({
+}).pipe(HiddenAnnotation.set(true), IconAnnotation.set({
   icon: "ph--rows--regular",
   hue: "yellow"
-}));
+}), makeObject(DXN.make("org.dxos.type.feed", "0.1.0")));
 var make2 = (props = {}) => make(Feed, props);
-var getQueueDxn = (feed) => {
-  const self = getDXN(feed).asEchoDXN();
-  if (!self || !self.spaceId) {
-    return void 0;
-  }
-  return new DXN(DXN.kind.QUEUE, [
-    feed.namespace ?? "data",
-    self.spaceId,
-    self.echoId
-  ]);
-};
-var unsafeFromQueueDXN = (queueDxn) => {
-  const parts = queueDxn.asQueueDXN();
-  if (!parts) {
-    throw new Error(`Expected a queue DXN, got: ${queueDxn.toString()}`);
-  }
-  return make(Feed, {
-    id: parts.queueId,
-    namespace: parts.subspaceTag === "trace" ? "trace" : void 0
-  });
-};
+var getQueueUri = (feed) => EID.tryParse(getURI(feed));
 var FeedService = class extends Context.Tag("@dxos/echo/Feed/FeedService")() {
 };
 var Service = FeedService;
+var ContextFeedService = class _ContextFeedService extends Context.Tag("@dxos/echo/Feed/ContextFeedService")() {
+  static layer = (feed) => Layer.succeed(_ContextFeedService, {
+    feed
+  });
+};
 var notAvailable = Layer.succeed(FeedService, {
   append: () => {
     throw new Error("Feed.FeedService not available");
@@ -91,6 +75,12 @@ var notAvailable = Layer.succeed(FeedService, {
   },
   query: () => {
     throw new Error("Feed.FeedService not available");
+  },
+  sync: () => {
+    throw new Error("Feed.FeedService not available");
+  },
+  getSyncState: () => {
+    throw new Error("Feed.FeedService not available");
   }
 });
 var append = (feed, items) => Effect.gen(function* () {
@@ -104,6 +94,14 @@ var remove = (feed, items) => Effect.gen(function* () {
 });
 var query = (feed, queryOrFilter) => FeedService.pipe(Effect.map((service) => service.query(feed, queryOrFilter)));
 var runQuery = (feed, queryOrFilter) => query(feed, queryOrFilter).pipe(Effect.flatMap((queryResult) => Effect.promise(() => queryResult.run())));
+var sync = (feed, options) => Effect.gen(function* () {
+  const service = yield* FeedService;
+  yield* Effect.promise(() => service.sync(feed, options));
+});
+var getSyncState = (feed) => Effect.gen(function* () {
+  const service = yield* FeedService;
+  return yield* Effect.promise(() => service.getSyncState(feed));
+});
 var cursor = (_feed) => Effect.succeed({
   _tag: "Cursor"
 });
@@ -114,19 +112,21 @@ var setRetention = (_feed, _options) => Effect.void;
 export {
   Feed,
   make2 as make,
-  getQueueDxn,
-  unsafeFromQueueDXN,
+  getQueueUri,
   FeedService,
   Service,
+  ContextFeedService,
   notAvailable,
   append,
   remove,
   query,
   runQuery,
+  sync,
+  getSyncState,
   cursor,
   next,
   nextOption,
   setRetention,
   Feed_exports
 };
-//# sourceMappingURL=chunk-TU3GW67D.mjs.map
+//# sourceMappingURL=chunk-5GAIWRQB.mjs.map

package/dist/lib/neutral/chunk-5GAIWRQB.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Feed.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\n// @import-as-namespace\n\nimport * as Context from 'effect/Context';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport type * as Option from 'effect/Option';\nimport * as Schema from 'effect/Schema';\n\nimport { DXN, EID } from '@dxos/keys';\n\nimport * as Annotation from './Annotation';\nimport type * as Entity from './Entity';\nimport type * as Filter from './Filter';\nimport * as internal from './internal';\nimport * as Obj from './Obj';\nimport type * as Query from './Query';\nimport type * as QueryResult from './QueryResult';\nimport * as Type from './Type';\n\n/**\n * Runtime schema for a Feed object.\n *\n * @example\n * ```ts\n * const feed = Obj.make(Feed.Feed, { name: 'notifications', kind: 'org.dxos.plugin.notifications.v1' });\n * ```\n */\nexport const Feed = Schema.Struct({\n  /** User-facing display name. */\n  name: Schema.String.pipe(Schema.optional),\n  /** Identifier for the feed's kind (e.g., plugin id). */\n  kind: Schema.String.pipe(internal.FormInputAnnotation.set(false), Schema.optional),\n\n  /**\n   * Feed namespace.\n   * Controls how feed data is stored and replicated.\n   * - `data`: Data feed (default).\n   * - `trace`: Trace feed.\n   */\n  namespace: Schema.optional(Schema.Literal('data', 'trace')),\n}).pipe(\n  internal.HiddenAnnotation.set(true),\n  Annotation.IconAnnotation.set({ icon: 'ph--rows--regular', hue: 'yellow' }),\n  Type.makeObject(DXN.make('org.dxos.type.feed', '0.1.0')),\n);\n\n/**\n * TypeScript instance type for a Feed object.\n */\nexport type Feed = Type.InstanceType<typeof Feed>;\n\n//\n// Types\n//\n\n/**\n * Opaque cursor for iterating over feed items.\n */\n// TODO(dmaretskyi): T needs to be referenced in the type structure for typescript to respect it during inference and type-checking.\nexport interface Cursor<T = Obj.Snapshot> {\n  readonly _tag: 'Cursor';\n}\n\n/**\n * Retention options for a feed.\n */\nexport interface RetentionOptions {\n  /** Retain items after this cursor position. */\n  // TODO(wittjosiah): Use FeedCursor from @dxos/feed?\n  cursor?: string;\n}\n\n/**\n * Sync options for a feed.\n */\nexport interface SyncOptions {\n  /** Push local changes to the server. Defaults to true. */\n  shouldPush?: boolean;\n  /** Pull remote changes from the server. Defaults to true. */\n  shouldPull?: boolean;\n}\n\n/**\n * Queue replication backlog for a feed namespace.\n * `0` / `0` means caught up on pull and push.\n */\nexport interface SyncState {\n  /** Blocks still to pull from remote. */\n  blocksToPull: number;\n  /** Unpositioned blocks still to push to remote. */\n  blocksToPush: number;\n  /** Total blocks stored locally for the feed namespace. */\n  totalBlocks: number;\n}\n\n//\n// Factory\n//\n\n/**\n * Creates a new feed object.\n *\n * @example\n * ```ts\n * const feed = Feed.make({ name: 'notifications', kind: 'org.dxos.plugin.notifications.v1' });\n * ```\n */\n// TODO(wittjosiah): How to control the feed namespace (data/trace)? Why do feeds have namespaces?\nexport const make = (props: Obj.MakeProps<typeof Feed> = {}): Feed => Obj.make(Feed, props);\n\n/**\n * Returns the feed object's EID when the feed is stored in a space.\n *\n * Used internally by the feed service layer.\n */\nexport const getQueueUri = (feed: Feed): EID.EID | undefined => EID.tryParse(Obj.getURI(feed));\n\n//\n// Service\n//\n\n/**\n * Effect service for feed operations.\n * Provides the bridge to the underlying storage implementation.\n * Must be provided by the application layer (e.g., echo-db).\n */\nexport class FeedService extends Context.Tag('@dxos/echo/Feed/FeedService')<\n  FeedService,\n  {\n    /**\n     * Appends items to a feed.\n     */\n    append(feed: Feed, items: Entity.Unknown[]): Promise<void>;\n\n    /**\n     * Removes items from a feed by ID.\n     */\n    remove(feed: Feed, ids: string[]): Promise<void>;\n\n    /**\n     * Queries items in a feed.\n     */\n    query: {\n      <Q extends Query.Any>(feed: Feed, query: Q): QueryResult.QueryResult<Query.Type<Q>>;\n      <F extends Filter.Any>(feed: Feed, filter: F): QueryResult.QueryResult<Filter.Type<F>>;\n    };\n\n    /**\n     * Syncs the feed with the server.\n     */\n    sync(feed: Feed, options?: SyncOptions): Promise<void>;\n\n    /**\n     * Returns queue replication backlog for the feed's namespace.\n     */\n    getSyncState(feed: Feed): Promise<SyncState>;\n  }\n>() {}\n\n/**\n * @deprecated Use `FeedService` instead.\n */\nexport type Service = FeedService;\n\n/**\n * @deprecated Use `FeedService` instead.\n */\nexport const Service = FeedService;\n\n/**\n * Effect context service that holds the current feed for a scoped operation.\n *\n * @deprecated Prefer threading a `Feed.Feed` explicitly through function signatures\n * over hiding it behind a context service.\n */\nexport class ContextFeedService extends Context.Tag('@dxos/echo/Feed/ContextFeedService')<\n  ContextFeedService,\n  {\n    readonly feed: Feed;\n  }\n>() {\n  static layer = (feed: Feed): Layer.Layer<ContextFeedService> => Layer.succeed(ContextFeedService, { feed });\n}\n\n/**\n * Layer that provides a Feed service that throws when accessed.\n * Useful as a default layer when no feed service is available.\n */\nexport const notAvailable: Layer.Layer<FeedService> = Layer.succeed(FeedService, {\n  append: () => {\n    throw new Error('Feed.FeedService not available');\n  },\n  remove: () => {\n    throw new Error('Feed.FeedService not available');\n  },\n  query: () => {\n    throw new Error('Feed.FeedService not available');\n  },\n  sync: () => {\n    throw new Error('Feed.FeedService not available');\n  },\n  getSyncState: () => {\n    throw new Error('Feed.FeedService not available');\n  },\n} as Context.Tag.Service<FeedService>);\n\n//\n// Operations\n//\n\n/**\n * Appends items to a feed.\n *\n * @example\n * ```ts\n * yield* Feed.append(feed, [Obj.make(Notification, { title: 'Hello' })]);\n * ```\n */\nexport const append = (feed: Feed, items: Entity.Unknown[]): Effect.Effect<void, never, FeedService> =>\n  Effect.gen(function* () {\n    const service = yield* FeedService;\n    yield* Effect.promise(() => service.append(feed, items));\n  });\n\n/**\n * Removes items from a feed.\n *\n * @example\n * ```ts\n * yield* Feed.remove(feed, [item]);\n * ```\n */\n// TODO(dmaretskyi): Should we allow snapshots here? - what does it mean to remove a snapshot?\nexport const remove = (feed: Feed, items: (Entity.Unknown | Obj.Snapshot)[]): Effect.Effect<void, never, FeedService> =>\n  Effect.gen(function* () {\n    const service = yield* FeedService;\n    const ids = items.map((item) => item.id);\n    yield* Effect.promise(() => service.remove(feed, ids));\n  });\n\n/**\n * Creates a reactive query over items in a feed.\n *\n * In non-Effect code, query a feed directly through the database with a feed scope:\n * `db.query(Query.select(filter).from(Scope.feed(Feed.getQueueUri(feed))))`.\n *\n * @example\n * ```ts\n * const result = yield* Feed.query(feed, Filter.type(Person));\n * ```\n */\n// TODO(dmaretskyi): Suport chained queries:\n//                   const result = yield* feed.pipe(Feed.query(Filter.type(Person))); result.subscribe(...)\n//                   const objects = yield* feed.pipe(Feed.query(Filter.type(Person))).run;\n//                   const object = yield* feed.pipe(Feed.query(Filter.type(Person))).first;\n// ... unify for Database and schema queries.\nexport const query: {\n  <Q extends Query.Any>(\n    feed: Feed,\n    query: Q,\n  ): Effect.Effect<QueryResult.QueryResult<Query.Type<Q>>, never, FeedService>;\n  <F extends Filter.Any>(\n    feed: Feed,\n    filter: F,\n  ): Effect.Effect<QueryResult.QueryResult<Filter.Type<F>>, never, FeedService>;\n} = (feed: Feed, queryOrFilter: Query.Any | Filter.Any) =>\n  FeedService.pipe(Effect.map((service) => service.query(feed, queryOrFilter as any) as QueryResult.QueryResult<any>));\n\n/**\n * Executes a feed query once and returns the results.\n *\n * @example\n * ```ts\n * const items = yield* Feed.runQuery(feed, Filter.type(Person));\n * ```\n */\nexport const runQuery: {\n  <Q extends Query.Any>(feed: Feed, query: Q): Effect.Effect<Query.Type<Q>[], never, FeedService>;\n  <F extends Filter.Any>(feed: Feed, filter: F): Effect.Effect<Filter.Type<F>[], never, FeedService>;\n} = (feed: Feed, queryOrFilter: Query.Any | Filter.Any) =>\n  query(feed, queryOrFilter as any).pipe(Effect.flatMap((queryResult) => Effect.promise(() => queryResult.run())));\n\n/**\n * Syncs the feed with the server.\n *\n * @example\n * ```ts\n * yield* Feed.sync(feed);\n * yield* Feed.sync(feed, { shouldPush: false });\n * ```\n */\nexport const sync = (feed: Feed, options?: SyncOptions): Effect.Effect<void, never, FeedService> =>\n  Effect.gen(function* () {\n    const service = yield* FeedService;\n    yield* Effect.promise(() => service.sync(feed, options));\n  });\n\n/**\n * Returns queue replication backlog for the feed's namespace.\n *\n * @example\n * ```ts\n * const { blocksToPull, blocksToPush } = yield* Feed.getSyncState(feed);\n * ```\n */\nexport const getSyncState = (feed: Feed): Effect.Effect<SyncState, never, FeedService> =>\n  Effect.gen(function* () {\n    const service = yield* FeedService;\n    return yield* Effect.promise(() => service.getSyncState(feed));\n  });\n\n/**\n * Creates a cursor for iterating over feed items.\n * Currently stubbed — cursor operations are not yet implemented.\n *\n * @example\n * ```ts\n * const cursor = yield* Feed.cursor<Person>(feed);\n * const item = yield* Feed.next(cursor);\n * ```\n */\n// TODO(wittjosiah): Implement cursor operations. Use Effect streams?\nexport const cursor = <T = Obj.Snapshot>(_feed: Feed): Effect.Effect<Cursor<T>, never, FeedService> =>\n  Effect.succeed({ _tag: 'Cursor' } as Cursor<T>);\n\n/**\n * Returns the next item from a feed cursor.\n * Currently stubbed — cursor operations are not yet implemented.\n */\nexport const next = <T = Obj.Snapshot>(_cursor: Cursor<T>): Effect.Effect<T, never, FeedService> =>\n  Effect.die('Feed.next is not yet implemented');\n\n/**\n * Returns the next item from a feed cursor as an Option.\n * Currently stubbed — cursor operations are not yet implemented.\n */\nexport const nextOption = <T = Obj.Snapshot>(_cursor: Cursor<T>): Effect.Effect<Option.Option<T>, never, FeedService> =>\n  Effect.die('Feed.nextOption is not yet implemented');\n\n/**\n * Sets the local retention policy for a feed.\n * Currently stubbed — feeds do not yet support retention.\n *\n * @example\n * ```ts\n * yield* Feed.setRetention(feed, { count: 1000 });\n * ```\n */\n// TODO(dmaretskyi): Implement when feed retention is supported.\nexport const setRetention = (_feed: Feed, _options: RetentionOptions): Effect.Effect<void, never, FeedService> =>\n  Effect.void;\n"],
+  "mappings": "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",
+  "names": ["make", "Context", "Effect", "Layer", "Schema", "DXN", "EID", "Feed", "Struct", "name", "String", "pipe", "optional", "kind", "FormInputAnnotation", "set", "namespace", "Literal", "HiddenAnnotation", "IconAnnotation", "icon", "hue", "makeObject", "DXN", "make", "props", "getQueueUri", "feed", "EID", "tryParse", "getURI", "FeedService", "Tag", "Service", "ContextFeedService", "layer", "succeed", "notAvailable", "append", "Error", "remove", "query", "sync", "getSyncState", "items", "gen", "service", "promise", "ids", "map", "item", "id", "queryOrFilter", "runQuery", "flatMap", "queryResult", "run", "options", "cursor", "_feed", "_tag", "next", "_cursor", "die", "nextOption", "setRetention", "_options", "void"]
+}

package/dist/lib/neutral/{chunk-B4BASU6W.mjs → chunk-6CEISA3V.mjs}

@@ -1,36 +1,33 @@
 import {
   isRef
-} from "./chunk-BVOFLCVF.mjs";
+} from "./chunk-TF5BSLF6.mjs";
 import {
   Kind,
   KindId,
   SnapshotKindId
-} from "./chunk-T6W2LEZU.mjs";
+} from "./chunk-Z3WMRRAZ.mjs";
+import {
+  getSchema
+} from "./chunk-HGWQR5KH.mjs";
 import {
-  EchoObjectSchema,
-  MetaId,
   VersionTypeId,
-  addTag,
   change,
   clone,
   compareVersions,
   decodeVersion,
-  deleteKeys,
   encodeVersion,
-  getDXN,
-  getDatabase,
-  getKeys,
-  getMetaChecked,
   getProxyTarget,
   getSnapshot,
-  getValue,
   isDeleted,
   isProxy,
   isVersion,
+  makeAtom,
+  makeLabelAtom,
   makeObject,
+  makeProperty,
+  makeWithReactive,
   objectFromJSON,
   objectToJSON,
-  removeTag,
   setValue,
   sort,
   sortByLabel,
@@ -38,27 +35,39 @@ import {
   subscribe,
   version,
   versionValid
-} from "./chunk-MOR5ERFM.mjs";
+} from "./chunk-VQYL2OQF.mjs";
+import {
+  addTag,
+  deleteKeys,
+  getKeys,
+  getMetaChecked,
+  removeTag
+} from "./chunk-X3NUUON4.mjs";
 import {
+  MetaId,
   ParentId,
+  TypeAnnotationId,
+  getDatabase,
   getDescription,
+  getIcon,
   getLabel,
-  getSchema,
+  getLabelProperty,
+  getType,
   getTypeAnnotation,
-  getTypeDXN,
+  getTypeURI,
   getTypename,
+  getUri,
   isInstanceOf,
   setDescription,
   setLabel
-} from "./chunk-2KHZ36F5.mjs";
+} from "./chunk-WZ32BF53.mjs";
 import {
   ANY_OBJECT_TYPENAME,
-  ANY_OBJECT_VERSION,
-  SchemaKindId
-} from "./chunk-TBKX6JQO.mjs";
+  ANY_OBJECT_VERSION
+} from "./chunk-O6BH7EPN.mjs";
 import {
   GetReactiveError
-} from "./chunk-UBEZSGXY.mjs";
+} from "./chunk-BBFJWWAV.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -72,16 +81,18 @@ __export(Obj_exports, {
   Unknown: () => Unknown2,
   VersionTypeId: () => VersionTypeId2,
   addTag: () => addTag2,
-  change: () => change2,
+  atom: () => atom,
+  atomProperty: () => atomProperty,
+  atomReactive: () => atomReactive,
   clone: () => clone2,
   compareVersions: () => compareVersions2,
   decodeVersion: () => decodeVersion2,
   deleteKeys: () => deleteKeys2,
   encodeVersion: () => encodeVersion2,
   fromJSON: () => fromJSON,
-  getDXN: () => getDXN2,
   getDatabase: () => getDatabase2,
   getDescription: () => getDescription2,
+  getIcon: () => getIcon2,
   getKeys: () => getKeys2,
   getLabel: () => getLabel2,
   getMeta: () => getMeta,
@@ -89,16 +100,19 @@ __export(Obj_exports, {
   getReactive: () => getReactive,
   getReactiveOption: () => getReactiveOption,
   getReactiveOrThrow: () => getReactiveOrThrow,
-  getSchema: () => getSchema2,
   getSnapshot: () => getSnapshot2,
-  getTypeDXN: () => getTypeDXN2,
+  getType: () => getType2,
+  getTypeURI: () => getTypeURI2,
   getTypename: () => getTypename2,
-  getValue: () => getValue2,
+  getURI: () => getURI,
+  getValue: () => getValue,
   instanceOf: () => instanceOf,
   isDeleted: () => isDeleted2,
   isObject: () => isObject,
   isSnapshot: () => isSnapshot,
   isVersion: () => isVersion2,
+  labelAtom: () => labelAtom,
+  labelProperty: () => labelProperty,
   make: () => make,
   removeTag: () => removeTag2,
   setDescription: () => setDescription2,
@@ -111,6 +125,7 @@ __export(Obj_exports, {
   sortByTypename: () => sortByTypename2,
   subscribe: () => subscribe2,
   toJSON: () => toJSON,
+  update: () => update,
   updateFrom: () => updateFrom,
   version: () => version2,
   versionValid: () => versionValid2
@@ -121,38 +136,35 @@ import * as Function from "effect/Function";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Utils from "effect/Utils";
-import { createJsonPath } from "@dxos/effect";
+import { SchemaEx } from "@dxos/effect";
 import { assertArgument, invariant } from "@dxos/invariant";
-import { ObjectId } from "@dxos/keys";
+import { EntityId } from "@dxos/keys";
 import { assumeType, deepMapValues } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
 var Unknown2 = Schema.Struct({
   id: Schema.String
-}).pipe(
-  Schema.extend(Schema.Record({
-    key: Schema.String,
-    value: Schema.Unknown
-  })),
-  // TODO(dmaretskyi): Clean this up.
-  // NOTE: The EchoObjectSchema annotation is required for Ref.Ref(Obj.Unknown) to work.
-  //   The typename/version only satisfy ECHO schema machinery for reference targets.
-  EchoObjectSchema({
+}).pipe(Schema.extend(Schema.Record({
+  key: Schema.String,
+  value: Schema.Unknown
+})), Schema.annotations({
+  [TypeAnnotationId]: {
+    kind: Kind.Object,
     typename: ANY_OBJECT_TYPENAME,
     version: ANY_OBJECT_VERSION
-  }),
-  (schema) => Object.assign(schema, {
-    [SchemaKindId]: schema[SchemaKindId]
-  })
-);
-var defaultMeta = {
-  keys: []
-};
-var make = (schema, props) => {
+  }
+}));
+var defaultMeta = () => ({
+  keys: [],
+  tags: [],
+  annotations: {}
+});
+function make(input, props) {
+  const schema = getSchema(input);
   assertArgument(getTypeAnnotation(schema)?.kind === Kind.Object, "schema", "Expected an object schema");
   let meta = void 0;
   if (props[MetaId] != null) {
     meta = {
-      ...structuredClone(defaultMeta),
+      ...defaultMeta(),
       ...props[MetaId]
     };
     delete props[MetaId];
@@ -165,10 +177,10 @@ var make = (schema, props) => {
     }
   }
   return makeObject(schema, filterUndefined, {
-    ...defaultMeta,
+    ...defaultMeta(),
     ...meta
-  });
-};
+  }, input);
+}
 var isObject = (obj) => {
   assumeType(obj);
   return typeof obj === "object" && obj !== null && obj[KindId] === Kind.Object;
@@ -201,14 +213,14 @@ var getReactive = (snapshot) => Effect.gen(function* () {
 var getReactiveOption = (snapshot) => getReactive(snapshot).pipe(Effect.map(Option.some), Effect.catchAll(() => Effect.succeed(Option.none())));
 var getReactiveOrThrow = (snapshot) => Effect.runSync(getReactive(snapshot));
 var clone2 = clone;
-var change2 = (obj, callback) => {
+var update = (obj, callback) => {
   change(obj, callback);
 };
-var getValue2 = (obj, path) => {
-  return getValue(obj, createJsonPath(path));
+var getValue = (obj, path) => {
+  return SchemaEx.getValue(obj, SchemaEx.createJsonPath(path));
 };
 var setValue2 = setValue;
-var ID = ObjectId;
+var ID = EntityId;
 var instanceOf = (...args) => {
   if (args.length === 1) {
     return (entity) => isInstanceOf(args[0], entity);
@@ -222,24 +234,16 @@ var snapshotOf = (...args) => {
   }
   return check(args[1]);
 };
-var getDXN2 = (entity) => {
+var getURI = (entity, options) => {
   assertArgument(!Schema.isSchema(entity), "obj", "Object should not be a schema.");
-  return getDXN(entity);
+  return getUri(entity, options);
 };
-var getTypeDXN2 = (obj) => {
-  const type = getTypeDXN(obj);
-  invariant(type != null, "Corrupted object: missing type.", {
-    F: __dxlog_file,
-    L: 477,
-    S: void 0,
-    A: [
-      "type != null",
-      "'Corrupted object: missing type.'"
-    ]
-  });
+var getTypeURI2 = (obj) => {
+  const type = getTypeURI(obj);
+  invariant(type != null, "Corrupted object: missing type.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 313, S: void 0, A: ["type != null", "'Corrupted object: missing type.'"] });
   return type;
 };
-var getSchema2 = getSchema;
+var getType2 = (obj) => getType(obj);
 var getTypename2 = (entity) => getTypename(entity);
 var getDatabase2 = (entity) => getDatabase(entity);
 var Meta = MetaId;
@@ -251,13 +255,14 @@ var deleteKeys2 = (entity, source) => deleteKeys(entity, source);
 var addTag2 = (entity, tag) => addTag(entity, tag);
 var removeTag2 = (entity, tag) => removeTag(entity, tag);
 var isDeleted2 = (entity) => isDeleted(entity);
-var getLabel2 = (entity) => getLabel(entity);
+var getLabel2 = (entity, options) => getLabel(entity, options);
 var setLabel2 = (entity, label) => setLabel(entity, label);
 var getDescription2 = (entity) => getDescription(entity);
+var getIcon2 = (entity) => getIcon(entity);
 var setDescription2 = (entity, description) => setDescription(entity, description);
 var Parent = ParentId;
 var getParent = (entity) => {
-  assertArgument(isObject(entity), "Expected an object");
+  assertArgument(isObject(entity) || isSnapshot(entity), "Expected an object");
   assumeType(entity);
   return entity[ParentId];
 };
@@ -267,6 +272,7 @@ var setParent = (entity, parent) => {
   assumeType(entity);
   assumeType(parent);
   entity[ParentId] = parent;
+  return entity;
 };
 var valuesEqual = (left, right) => {
   if (left === right) {
@@ -279,7 +285,7 @@ var valuesEqual = (left, right) => {
     return Utils.structuralRegion(() => Equal.equals(left, right));
   }
   if (isRef(left) && isRef(right)) {
-    return left.dxn.toString() === right.dxn.toString();
+    return left.uri === right.uri;
   }
   if (isRef(left) || isRef(right)) {
     return false;
@@ -373,6 +379,11 @@ var compareVersions2 = compareVersions;
 var encodeVersion2 = encodeVersion;
 var decodeVersion2 = decodeVersion;
 var version2 = (entity) => version(entity);
+var atom = makeAtom;
+var atomReactive = makeWithReactive;
+var atomProperty = makeProperty;
+var labelAtom = makeLabelAtom;
+var labelProperty = getLabelProperty;
 
 export {
   Unknown2 as Unknown,
@@ -385,15 +396,15 @@ export {
   getReactiveOption,
   getReactiveOrThrow,
   clone2 as clone,
-  change2 as change,
-  getValue2 as getValue,
+  update,
+  getValue,
   setValue2 as setValue,
   ID,
   instanceOf,
   snapshotOf,
-  getDXN2 as getDXN,
-  getTypeDXN2 as getTypeDXN,
-  getSchema2 as getSchema,
+  getURI,
+  getTypeURI2 as getTypeURI,
+  getType2 as getType,
   getTypename2 as getTypename,
   getDatabase2 as getDatabase,
   Meta,
@@ -406,6 +417,7 @@ export {
   getLabel2 as getLabel,
   setLabel2 as setLabel,
   getDescription2 as getDescription,
+  getIcon2 as getIcon,
   setDescription2 as setDescription,
   Parent,
   getParent,
@@ -423,6 +435,11 @@ export {
   encodeVersion2 as encodeVersion,
   decodeVersion2 as decodeVersion,
   version2 as version,
+  atom,
+  atomReactive,
+  atomProperty,
+  labelAtom,
+  labelProperty,
   Obj_exports
 };
-//# sourceMappingURL=chunk-B4BASU6W.mjs.map
+//# sourceMappingURL=chunk-6CEISA3V.mjs.map