@dxos/echo-atom 0.8.4-main.bc674ce → 0.8.4-main.c85a9c8dae

package/README.md

@@ -28,9 +28,9 @@ Atoms wrap Echo objects and their properties, storing metadata about the object
 
 ```typescript
 interface AtomValue<T> {
-  readonly obj: Entity.Unknown;  // The Echo object being watched
-  readonly path: KeyPath;        // Property path (empty for entire object)
-  readonly value: T;             // Current value
+  readonly obj: Entity.Unknown; // The Echo object being watched
+  readonly path: KeyPath; // Property path (empty for entire object)
+  readonly value: T; // Current value
 }
 ```
 
@@ -58,7 +58,7 @@ const registry = Registry.make();
 // Create an Echo object
 const person = Obj.make(TestSchema.Person, {
   name: 'Alice',
-  email: 'alice@example.com'
+  email: 'alice@example.com',
 });
 
 // Create an atom for the entire object
@@ -72,10 +72,14 @@ const currentPerson = registry.get(personAtom).value;
 const currentName = registry.get(nameAtom).value;
 
 // Subscribe to updates using the registry
-const unsubscribe = registry.subscribe(nameAtom, () => {
-  const newName = registry.get(nameAtom).value;
-  console.log('Name changed:', newName);
-}, { immediate: true });
+const unsubscribe = registry.subscribe(
+  nameAtom,
+  () => {
+    const newName = registry.get(nameAtom).value;
+    console.log('Name changed:', newName);
+  },
+  { immediate: true },
+);
 
 // Update the object directly - the atom will automatically update
 person.name = 'Bob';
@@ -115,11 +119,14 @@ function PersonView({ person }: { person: Person }) {
 
   return (
     <div>
-      <input
-        value={name}
-        onChange={(e) => updateName(e.target.value)}
-      />
-      <button onClick={() => updatePerson(p => { p.email = 'new@example.com'; })}>
+      <input value={name} onChange={(e) => updateName(e.target.value)} />
+      <button
+        onClick={() =>
+          updatePerson((p) => {
+            p.email = 'new@example.com';
+          })
+        }
+      >
         Update Email
       </button>
     </div>
@@ -157,11 +164,14 @@ function PersonView(props: { person: Person }) {
 
   return (
     <div>
-      <input
-        value={name()}
-        onInput={(e) => updateName(e.target.value)}
-      />
-      <button onClick={() => updatePerson(p => { p.email = 'new@example.com'; })}>
+      <input value={name()} onInput={(e) => updateName(e.target.value)} />
+      <button
+        onClick={() =>
+          updatePerson((p) => {
+            p.email = 'new@example.com';
+          })
+        }
+      >
         Update Email
       </button>
     </div>

package/dist/lib/{browser → neutral}/index.mjs

@@ -8,11 +8,15 @@ var __export = (target, all) => {
 var atom_exports = {};
 __export(atom_exports, {
   make: () => make2,
-  makeProperty: () => makeProperty
+  makeProperty: () => makeProperty,
+  makeWithReactive: () => makeWithReactive
 });
 import * as Atom from "@effect-atom/atom/Atom";
-import isEqual from "lodash.isequal";
-import { Obj, Ref } from "@dxos/echo";
+import * as Result from "@effect-atom/atom/Result";
+import * as Effect from "effect/Effect";
+import * as Function from "effect/Function";
+import * as Option from "effect/Option";
+import { Obj, Ref, Relation } from "@dxos/echo";
 import { assertArgument } from "@dxos/invariant";
 
 // src/ref-utils.ts
@@ -36,7 +40,7 @@ var objectFamily = Atom.family((obj) => {
     });
     get.addFinalizer(() => unsubscribe());
     return Obj.getSnapshot(obj);
-  });
+  }).pipe(Atom.keepAlive);
 });
 var refFamily = Atom.family((ref) => {
   return Atom.make((get) => {
@@ -48,9 +52,11 @@ var refFamily = Atom.family((ref) => {
       });
       return Obj.getSnapshot(target);
     };
-    get.addFinalizer(() => unsubscribeTarget?.());
+    get.addFinalizer(() => {
+      unsubscribeTarget?.();
+    });
     return loadRefTarget(ref, get, setupTargetSubscription);
-  });
+  }).pipe(Atom.keepAlive);
 });
 var snapshotForComparison = (value) => {
   if (Array.isArray(value)) {
@@ -70,14 +76,14 @@ var propertyFamily = Atom.family((obj) => Atom.family((key) => {
     let previousSnapshot = snapshotForComparison(obj[key]);
     const unsubscribe = Obj.subscribe(obj, () => {
       const newValue = obj[key];
-      if (!isEqual(previousSnapshot, newValue)) {
+      if (previousSnapshot !== newValue) {
         previousSnapshot = snapshotForComparison(newValue);
         get.setSelf(snapshotForComparison(newValue));
       }
     });
     get.addFinalizer(() => unsubscribe());
     return snapshotForComparison(obj[key]);
-  });
+  }).pipe(Atom.keepAlive);
 }));
 function make2(objOrRef) {
   if (objOrRef === void 0) {
@@ -87,7 +93,7 @@ function make2(objOrRef) {
     return refFamily(objOrRef);
   }
   const obj = objOrRef;
-  assertArgument(Obj.isObject(obj), "obj", "Object must be a reactive object");
+  assertArgument(Obj.isObject(obj) || Relation.isRelation(obj), "obj", "Object must be a reactive object");
   return objectFamily(obj);
 }
 function makeProperty(obj, key) {
@@ -98,6 +104,35 @@ function makeProperty(obj, key) {
   assertArgument(key in obj, "key", "Property must exist on object");
   return propertyFamily(obj)(key);
 }
+var objectWithReactiveFamily = Atom.family((obj) => {
+  return Atom.make((get) => {
+    const unsubscribe = Obj.subscribe(obj, () => {
+      get.setSelf(obj);
+    });
+    get.addFinalizer(() => unsubscribe());
+    return obj;
+  }).pipe(Atom.keepAlive);
+});
+var refWithReactiveFamily = Atom.family((ref) => {
+  const effect = (get) => Effect.gen(function* () {
+    const snapshot = get(make2(ref));
+    if (snapshot == null) return void 0;
+    const option = yield* Obj.getReactiveOption(snapshot);
+    return Option.getOrElse(option, () => void 0);
+  });
+  return Function.pipe(Atom.make(effect), Atom.map((result) => Result.getOrElse(result, () => void 0)));
+});
+function makeWithReactive(objOrRef) {
+  if (objOrRef === void 0) {
+    return Atom.make(() => void 0);
+  }
+  if (Ref.isRef(objOrRef)) {
+    return refWithReactiveFamily(objOrRef);
+  }
+  const obj = objOrRef;
+  assertArgument(Obj.isObject(obj), "obj", "Object must be a reactive object");
+  return objectWithReactiveFamily(obj);
+}
 
 // src/query-atom.ts
 var query_atom_exports = {};

package/dist/lib/neutral/index.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/atom.ts", "../../../src/ref-utils.ts", "../../../src/query-atom.ts", "../../../src/ref-atom.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Atom from '@effect-atom/atom/Atom';\nimport * as Result from '@effect-atom/atom/Result';\nimport * as Effect from 'effect/Effect';\nimport * as Function from 'effect/Function';\nimport * as Option from 'effect/Option';\n\nimport { type Entity, Obj, Ref, Relation } from '@dxos/echo';\nimport { assertArgument } from '@dxos/invariant';\n\nimport { loadRefTarget } from './ref-utils';\n\n/**\n * Atom family for ECHO objects.\n * Uses object reference as key - same object returns same atom.\n */\nconst objectFamily = Atom.family(<T extends Obj.Unknown>(obj: T): Atom.Atom<Obj.Snapshot<T>> => {\n  return Atom.make<Obj.Snapshot<T>>((get) => {\n    const unsubscribe = Obj.subscribe(obj, () => {\n      get.setSelf(Obj.getSnapshot(obj));\n    });\n\n    get.addFinalizer(() => unsubscribe());\n\n    return Obj.getSnapshot(obj);\n  }).pipe(Atom.keepAlive);\n});\n\n/**\n * Atom family for ECHO refs.\n * RefImpl implements Effect's Hash/Equal traits using DXN, so different Ref instances\n * pointing to the same object resolve to the same atom.\n */\nconst refFamily = Atom.family(<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<Obj.Snapshot<T> | undefined> => {\n  return Atom.make<Obj.Snapshot<T> | undefined>((get) => {\n    let unsubscribeTarget: (() => void) | undefined;\n\n    const setupTargetSubscription = (target: T): Obj.Snapshot<T> => {\n      unsubscribeTarget?.();\n      unsubscribeTarget = Obj.subscribe(target, () => {\n        get.setSelf(Obj.getSnapshot(target));\n      });\n      return Obj.getSnapshot(target);\n    };\n\n    get.addFinalizer(() => {\n      unsubscribeTarget?.();\n    });\n\n    return loadRefTarget(ref, get, setupTargetSubscription);\n  }).pipe(Atom.keepAlive);\n});\n\n/**\n * Snapshot a value to create a new reference for comparison and React dependency tracking.\n * Arrays and plain objects are shallow-copied so that:\n * 1. The snapshot is isolated from mutations to the original value.\n * 2. React's shallow comparison (Object.is) detects changes via new reference identity.\n */\nconst snapshotForComparison = <V>(value: V): V => {\n  if (Array.isArray(value)) {\n    return [...value] as V;\n  }\n  if (value !== null && typeof value === 'object') {\n    return { ...value } as V;\n  }\n  return value;\n};\n\n/**\n * Atom family for ECHO object properties.\n * Uses nested families: outer keyed by object, inner keyed by property key.\n * Same object+key combination returns same atom instance.\n */\nconst propertyFamily = Atom.family(<T extends Obj.Unknown>(obj: T) =>\n  Atom.family(<K extends keyof T>(key: K): Atom.Atom<T[K]> => {\n    return Atom.make<T[K]>((get) => {\n      // Snapshot the initial value for comparison (arrays/objects need copying).\n      let previousSnapshot = snapshotForComparison(obj[key]);\n\n      const unsubscribe = Obj.subscribe(obj, () => {\n        const newValue = obj[key];\n        if (previousSnapshot !== newValue) {\n          previousSnapshot = snapshotForComparison(newValue);\n          // Return a snapshot copy so React sees a new reference.\n          get.setSelf(snapshotForComparison(newValue));\n        }\n      });\n\n      get.addFinalizer(() => unsubscribe());\n\n      // Return a snapshot copy so React sees a new reference.\n      return snapshotForComparison(obj[key]);\n    }).pipe(Atom.keepAlive);\n  }),\n);\n\n/**\n * Create a read-only atom for a single reactive object or ref.\n * Returns {@link Obj.Snapshot} (immutable plain data), not the live reactive object.\n * Use this when you need one object's data for display or React dependency tracking.\n * The atom updates automatically when the object is mutated.\n * For refs, automatically handles async loading.\n * Uses Atom.family internally - same object/ref returns same atom instance.\n *\n * @param objOrRef - The reactive object or ref to create an atom for, or undefined.\n * @returns An atom that returns the object snapshot (plain data). Returns undefined only for refs (async loading) or undefined input.\n */\nexport function make<T extends Obj.Unknown>(obj: T): Atom.Atom<Obj.Snapshot<T>>;\nexport function make<T extends Relation.Unknown>(relation: T): Atom.Atom<Relation.Snapshot<T>>;\nexport function make<T extends Entity.Unknown>(entity: T): Atom.Atom<Entity.Snapshot>;\nexport function make<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<Obj.Snapshot<T> | undefined>;\nexport function make<T extends Obj.Unknown>(\n  objOrRef: T | Ref.Ref<T> | undefined,\n): Atom.Atom<Obj.Snapshot<T> | undefined>;\nexport function make<T extends Entity.Unknown>(\n  objOrRef: T | Ref.Ref<T> | undefined,\n): Atom.Atom<Entity.Snapshot | undefined> {\n  if (objOrRef === undefined) {\n    return Atom.make<Entity.Snapshot | undefined>(() => undefined);\n  }\n\n  // Handle Ref inputs.\n  if (Ref.isRef(objOrRef)) {\n    return refFamily(objOrRef as any);\n  }\n\n  // At this point, objOrRef is definitely T (not a Ref).\n  const obj = objOrRef as T;\n  assertArgument(Obj.isObject(obj) || Relation.isRelation(obj), 'obj', 'Object must be a reactive object');\n\n  // TODO(dmaretskyi): Fix echo types during review.\n  return objectFamily(obj as any);\n}\n\n/**\n * Create a read-only atom for a specific property of a reactive object.\n * Works with both Echo objects (from createObject) and plain live objects (from Obj.make).\n * The atom updates automatically when the property is mutated.\n * Only fires updates when the property value actually changes.\n * Uses Atom.family internally - same object+key combination returns same atom instance.\n *\n * @param obj - The reactive object to create an atom for, or undefined.\n * @param key - The property key to subscribe to.\n * @returns An atom that returns the property value, or undefined if obj is undefined.\n */\nexport function makeProperty<T extends Obj.Unknown, K extends keyof T>(obj: T, key: K): Atom.Atom<T[K]>;\nexport function makeProperty<T extends Obj.Unknown, K extends keyof T>(\n  obj: T | undefined,\n  key: K,\n): Atom.Atom<T[K] | undefined>;\nexport function makeProperty<T extends Obj.Unknown, K extends keyof T>(\n  obj: T | undefined,\n  key: K,\n): Atom.Atom<T[K] | undefined> {\n  if (obj === undefined) {\n    return Atom.make<T[K] | undefined>(() => undefined);\n  }\n\n  assertArgument(Obj.isObject(obj), 'obj', 'Object must be a reactive object');\n  assertArgument(key in obj, 'key', 'Property must exist on object');\n  return propertyFamily(obj)(key);\n}\n\n/**\n * Atom family for ECHO objects - returns the live object, not a snapshot.\n * Same as objectFamily but returns T instead of Obj.Snapshot<T>.\n */\nconst objectWithReactiveFamily = Atom.family(<T extends Obj.Unknown>(obj: T): Atom.Atom<T> => {\n  return Atom.make<T>((get) => {\n    const unsubscribe = Obj.subscribe(obj, () => {\n      get.setSelf(obj);\n    });\n\n    get.addFinalizer(() => unsubscribe());\n\n    return obj;\n  }).pipe(Atom.keepAlive);\n});\n\n/**\n * Atom family for ECHO refs - returns the live reactive object, not a snapshot.\n * Resolves the ref via the database; returns undefined while loading or if unresolved.\n */\nconst refWithReactiveFamily = Atom.family(<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<T | undefined> => {\n  const effect = (get: Atom.Context) =>\n    Effect.gen(function* () {\n      const snapshot = get(make(ref));\n      if (snapshot == null) return undefined;\n      const option = yield* Obj.getReactiveOption(snapshot);\n      return Option.getOrElse(option, () => undefined);\n    });\n\n  return Function.pipe(\n    Atom.make(effect),\n    Atom.map((result) => Result.getOrElse(result, () => undefined)),\n  );\n});\n\n/**\n * Like {@link make} but returns the live reactive object instead of a snapshot.\n * Same input: Obj or Ref.Ref. Same output shape: Atom that updates when the object mutates.\n * Prefer {@link make} (snapshot) unless you need the live Obj.Obj for generic mutations (e.g. Obj.change).\n *\n * @param objOrRef - The reactive object or ref.\n * @returns An atom that returns the live object. Returns undefined for refs (async loading) or undefined input.\n */\nexport function makeWithReactive<T extends Obj.Unknown>(obj: T): Atom.Atom<T>;\nexport function makeWithReactive<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<T | undefined>;\nexport function makeWithReactive<T extends Obj.Unknown>(objOrRef: T | Ref.Ref<T> | undefined): Atom.Atom<T | undefined>;\nexport function makeWithReactive<T extends Obj.Unknown>(\n  objOrRef: T | Ref.Ref<T> | undefined,\n): Atom.Atom<T | undefined> {\n  if (objOrRef === undefined) {\n    return Atom.make<T | undefined>(() => undefined);\n  }\n\n  if (Ref.isRef(objOrRef)) {\n    return refWithReactiveFamily(objOrRef as Ref.Ref<T>);\n  }\n\n  const obj = objOrRef as T;\n  assertArgument(Obj.isObject(obj), 'obj', 'Object must be a reactive object');\n  return objectWithReactiveFamily(obj);\n}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport type * as Atom from '@effect-atom/atom/Atom';\n\nimport type { Ref } from '@dxos/echo';\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 *\n * @param ref - The ref to load.\n * @param get - The atom context for setSelf.\n * @param onTargetAvailable - Callback invoked when target is available (sync or async).\n *   Should return the value to use for the atom.\n * @returns The result of onTargetAvailable if target is already loaded, undefined otherwise.\n */\nexport const loadRefTarget = <T, R>(\n  ref: Ref.Ref<T>,\n  get: Atom.Context,\n  onTargetAvailable: (target: T) => R,\n): R | undefined => {\n  const currentTarget = ref.target;\n  if (currentTarget) {\n    return onTargetAvailable(currentTarget);\n  }\n\n  // Target not loaded yet - trigger async load.\n  void ref\n    .load()\n    .then((loadedTarget) => {\n      get.setSelf(onTargetAvailable(loadedTarget));\n    })\n    .catch(() => {\n      // Loading failed, keep target as undefined.\n    });\n\n  return undefined;\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Atom } from '@effect-atom/atom';\n\nimport { DXN, Database, type Entity, type Filter, Query, type QueryResult } from '@dxos/echo';\nimport { WeakDictionary } from '@dxos/util';\n\n/**\n * Create a self-updating atom from an existing QueryResult.\n * Internally subscribes to queryResult and uses get.setSelf to update.\n * Cleanup is handled via get.addFinalizer.\n *\n * Note: This creates a new atom each time. For memoization, use `make` instead.\n *\n * @param queryResult - The QueryResult to wrap.\n * @returns An atom that automatically updates when query results change.\n */\nexport const fromQuery = <T extends Entity.Unknown>(queryResult: QueryResult.QueryResult<T>): Atom.Atom<T[]> =>\n  Atom.make((get) => {\n    // TODO(wittjosiah): Consider subscribing to individual objects here as well, and grabbing their snapshots.\n    // Subscribe to QueryResult changes.\n    const unsubscribe = queryResult.subscribe(() => {\n      get.setSelf(queryResult.results);\n    });\n\n    // Register cleanup for when atom is no longer used.\n    get.addFinalizer(unsubscribe);\n\n    return queryResult.results;\n  });\n\n// Registry: key → Queryable (WeakRef with auto-cleanup when GC'd).\nconst queryableRegistry = new WeakDictionary<string, Database.Queryable>();\n\n// Key separator that won't appear in identifiers (DXN strings use colons).\nconst KEY_SEPARATOR = '~';\n\n// Atom.family keyed by \"identifier~serializedAST\".\nconst queryFamily = Atom.family((key: string) => {\n  // Parse key outside Atom.make - runs once per key.\n  const separatorIndex = key.indexOf(KEY_SEPARATOR);\n  const identifier = key.slice(0, separatorIndex);\n  const serializedAst = key.slice(separatorIndex + 1);\n\n  // Get queryable outside Atom.make - keeps Queryable alive via closure.\n  const queryable = queryableRegistry.get(identifier);\n  if (!queryable) {\n    return Atom.make(() => [] as Entity.Unknown[]);\n  }\n\n  // Create query outside Atom.make - runs once, not on every recompute.\n  const ast = JSON.parse(serializedAst);\n  const queryResult = queryable.query(Query.fromAst(ast)) as QueryResult.QueryResult<Entity.Unknown>;\n\n  return Atom.make((get) => {\n    const unsubscribe = queryResult.subscribe(() => {\n      get.setSelf(queryResult.results);\n    });\n    get.addFinalizer(unsubscribe);\n\n    return queryResult.results;\n  });\n});\n\n/**\n * Derive a stable identifier from a Queryable.\n * Supports Database (spaceId), Queue (dxn), and objects with id.\n */\nconst getQueryableIdentifier = (queryable: Database.Queryable): string => {\n  // Database: use spaceId.\n  if (Database.isDatabase(queryable)) {\n    return queryable.spaceId;\n  }\n  // Queue or similar: use dxn if it's a DXN instance.\n  if ('dxn' in queryable && queryable.dxn instanceof DXN) {\n    return queryable.dxn.toString();\n  }\n  // Fallback: use id if it's a string.\n  if ('id' in queryable && typeof queryable.id === 'string') {\n    return queryable.id;\n  }\n  throw new Error('Unable to derive identifier from queryable.');\n};\n\n/**\n * Get a memoized query atom for any Queryable (Database, Queue, etc.).\n * Uses a single Atom.family keyed by queryable identifier + serialized query AST.\n * Same queryable + query/filter = same atom instance (proper memoization).\n *\n * @param queryable - The queryable to query (Database, Queue, etc.).\n * @param queryOrFilter - A Query or Filter to execute.\n * @returns A memoized atom that updates when query results change.\n */\nexport const make = <T extends Entity.Unknown>(\n  queryable: Database.Queryable,\n  queryOrFilter: Query.Query<T> | Filter.Filter<T>,\n): Atom.Atom<T[]> => {\n  const identifier = getQueryableIdentifier(queryable);\n  return fromQueryable(queryable, identifier, queryOrFilter);\n};\n\n/**\n * Internal: Get a memoized query atom for any Queryable with a custom identifier.\n */\nconst fromQueryable = <T extends Entity.Unknown>(\n  queryable: Database.Queryable,\n  identifier: string,\n  queryOrFilter: Query.Query<T> | Filter.Filter<T>,\n): Atom.Atom<T[]> => {\n  // Register queryable in registry (WeakDictionary handles cleanup automatically).\n  queryableRegistry.set(identifier, queryable);\n\n  // Normalize to Query.\n  const normalizedQuery: Query.Any = Query.is(queryOrFilter)\n    ? queryOrFilter\n    : Query.select(queryOrFilter as Filter.Filter<T>);\n\n  // Build key: identifier\\0serializedAST (using null char as separator to avoid DXN colon conflicts).\n  const key = `${identifier}${KEY_SEPARATOR}${JSON.stringify(normalizedQuery.ast)}`;\n\n  return queryFamily(key) as Atom.Atom<T[]>;\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Atom from '@effect-atom/atom/Atom';\n\nimport { type Ref } from '@dxos/echo';\n\nimport { loadRefTarget } from './ref-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 object changes.\n * Use AtomObj.make with a ref if you need reactive snapshots of ECHO objects.\n */\nconst refFamily = Atom.family(<T>(ref: 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/**\n * Create a read-only atom for a reference target.\n * Returns undefined if the target hasn't loaded yet.\n * Updates when the ref loads but does NOT subscribe to target object changes.\n * Use AtomObj.make with a ref if you need reactive snapshots of ECHO objects.\n * Uses Atom.family internally - same ref reference returns same atom instance.\n *\n * Supports refs to any target type including ECHO objects and Queues.\n */\nexport const make = refFamily;\n"],
+  "mappings": "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",
+  "names": ["make", "Atom", "Result", "Effect", "Function", "Option", "Obj", "Ref", "Relation", "assertArgument", "loadRefTarget", "ref", "get", "onTargetAvailable", "currentTarget", "target", "load", "then", "loadedTarget", "setSelf", "catch", "undefined", "objectFamily", "family", "obj", "make", "get", "unsubscribe", "Obj", "subscribe", "setSelf", "getSnapshot", "addFinalizer", "pipe", "keepAlive", "refFamily", "ref", "unsubscribeTarget", "setupTargetSubscription", "target", "loadRefTarget", "snapshotForComparison", "value", "Array", "isArray", "propertyFamily", "key", "previousSnapshot", "newValue", "objOrRef", "undefined", "Ref", "isRef", "assertArgument", "isObject", "Relation", "isRelation", "makeProperty", "objectWithReactiveFamily", "refWithReactiveFamily", "effect", "gen", "snapshot", "option", "getReactiveOption", "getOrElse", "map", "result", "makeWithReactive", "make", "Atom", "DXN", "Database", "Query", "WeakDictionary", "fromQuery", "queryResult", "Atom", "make", "get", "unsubscribe", "subscribe", "setSelf", "results", "addFinalizer", "queryableRegistry", "WeakDictionary", "KEY_SEPARATOR", "queryFamily", "family", "key", "separatorIndex", "indexOf", "identifier", "slice", "serializedAst", "queryable", "ast", "JSON", "parse", "query", "Query", "fromAst", "getQueryableIdentifier", "Database", "isDatabase", "spaceId", "dxn", "DXN", "toString", "id", "Error", "queryOrFilter", "fromQueryable", "set", "normalizedQuery", "is", "select", "stringify", "make", "Atom", "refFamily", "family", "ref", "make", "get", "loadRefTarget", "target"]
+}

package/dist/lib/neutral/meta.json

@@ -0,0 +1 @@
+{"inputs":{"src/ref-utils.ts":{"bytes":3291,"imports":[],"format":"esm"},"src/atom.ts":{"bytes":22275,"imports":[{"path":"@effect-atom/atom/Atom","kind":"import-statement","external":true},{"path":"@effect-atom/atom/Result","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Function","kind":"import-statement","external":true},{"path":"effect/Option","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"src/ref-utils.ts","kind":"import-statement","original":"./ref-utils"}],"format":"esm"},"src/query-atom.ts":{"bytes":13554,"imports":[{"path":"@effect-atom/atom","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"src/ref-atom.ts":{"bytes":3183,"imports":[{"path":"@effect-atom/atom/Atom","kind":"import-statement","external":true},{"path":"src/ref-utils.ts","kind":"import-statement","original":"./ref-utils"}],"format":"esm"},"src/index.ts":{"bytes":816,"imports":[{"path":"src/atom.ts","kind":"import-statement","original":"./atom"},{"path":"src/query-atom.ts","kind":"import-statement","original":"./query-atom"},{"path":"src/ref-atom.ts","kind":"import-statement","original":"./ref-atom"}],"format":"esm"}},"outputs":{"dist/lib/neutral/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":22261},"dist/lib/neutral/index.mjs":{"imports":[{"path":"@effect-atom/atom/Atom","kind":"import-statement","external":true},{"path":"@effect-atom/atom/Result","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Function","kind":"import-statement","external":true},{"path":"effect/Option","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@effect-atom/atom","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@effect-atom/atom/Atom","kind":"import-statement","external":true}],"exports":["AtomObj","AtomQuery","AtomRef"],"entryPoint":"src/index.ts","inputs":{"src/atom.ts":{"bytesInOutput":3601},"src/ref-utils.ts":{"bytesInOutput":301},"src/index.ts":{"bytesInOutput":0},"src/query-atom.ts":{"bytesInOutput":2044},"src/ref-atom.ts":{"bytesInOutput":291}},"bytes":6638}}}

package/dist/types/src/atom.d.ts

@@ -1,17 +1,19 @@
 import * as Atom from '@effect-atom/atom/Atom';
-import { Obj, Ref } from '@dxos/echo';
+import { type Entity, Obj, Ref, Relation } from '@dxos/echo';
 /**
- * Create a read-only atom for a reactive object or ref.
- * Works with Echo objects, plain reactive objects (from Obj.make), and Refs.
- * Returns immutable snapshots of the object data (branded with SnapshotKindId).
+ * Create a read-only atom for a single reactive object or ref.
+ * Returns {@link Obj.Snapshot} (immutable plain data), not the live reactive object.
+ * Use this when you need one object's data for display or React dependency tracking.
  * The atom updates automatically when the object is mutated.
  * For refs, automatically handles async loading.
- * Uses Atom.family internally - same object/ref reference returns same atom instance.
+ * Uses Atom.family internally - same object/ref returns same atom instance.
  *
  * @param objOrRef - The reactive object or ref to create an atom for, or undefined.
- * @returns An atom that returns the object snapshot. Returns undefined only for refs (async loading) or undefined input.
+ * @returns An atom that returns the object snapshot (plain data). Returns undefined only for refs (async loading) or undefined input.
  */
 export declare function make<T extends Obj.Unknown>(obj: T): Atom.Atom<Obj.Snapshot<T>>;
+export declare function make<T extends Relation.Unknown>(relation: T): Atom.Atom<Relation.Snapshot<T>>;
+export declare function make<T extends Entity.Unknown>(entity: T): Atom.Atom<Entity.Snapshot>;
 export declare function make<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<Obj.Snapshot<T> | undefined>;
 export declare function make<T extends Obj.Unknown>(objOrRef: T | Ref.Ref<T> | undefined): Atom.Atom<Obj.Snapshot<T> | undefined>;
 /**
@@ -27,4 +29,15 @@ export declare function make<T extends Obj.Unknown>(objOrRef: T | Ref.Ref<T> | u
  */
 export declare function makeProperty<T extends Obj.Unknown, K extends keyof T>(obj: T, key: K): Atom.Atom<T[K]>;
 export declare function makeProperty<T extends Obj.Unknown, K extends keyof T>(obj: T | undefined, key: K): Atom.Atom<T[K] | undefined>;
+/**
+ * Like {@link make} but returns the live reactive object instead of a snapshot.
+ * Same input: Obj or Ref.Ref. Same output shape: Atom that updates when the object mutates.
+ * Prefer {@link make} (snapshot) unless you need the live Obj.Obj for generic mutations (e.g. Obj.change).
+ *
+ * @param objOrRef - The reactive object or ref.
+ * @returns An atom that returns the live object. Returns undefined for refs (async loading) or undefined input.
+ */
+export declare function makeWithReactive<T extends Obj.Unknown>(obj: T): Atom.Atom<T>;
+export declare function makeWithReactive<T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<T | undefined>;
+export declare function makeWithReactive<T extends Obj.Unknown>(objOrRef: T | Ref.Ref<T> | undefined): Atom.Atom<T | undefined>;
 //# sourceMappingURL=atom.d.ts.map

package/dist/types/src/atom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atom.d.ts","sourceRoot":"","sources":["../../../src/atom.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAwFtC;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AACrG,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EACxC,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,GACnC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAoB1C;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxG,wBAAgB,YAAY,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,MAAM,CAAC,EACnE,GAAG,EAAE,CAAC,GAAG,SAAS,EAClB,GAAG,EAAE,CAAC,GACL,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC"}
+{"version":3,"file":"atom.d.ts","sourceRoot":"","sources":["../../../src/atom.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAM/C,OAAO,EAAE,KAAK,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AA0F7D;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,wBAAgB,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/F,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACtF,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AACrG,wBAAgB,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EACxC,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,GACnC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAqB1C;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxG,wBAAgB,YAAY,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,MAAM,CAAC,EACnE,GAAG,EAAE,CAAC,GAAG,SAAS,EAClB,GAAG,EAAE,CAAC,GACL,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAiD/B;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9E,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AACnG,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC"}