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

package/dist/lib/neutral/{chunk-4OIBYSXE.mjs → chunk-3JXQUMUI.mjs}

@@ -1,42 +1,90 @@
 import {
   select
-} from "./chunk-EAMSSLZC.mjs";
+} from "./chunk-AFANXSGV.mjs";
 import {
   Feed
-} from "./chunk-TU3GW67D.mjs";
-import {
-  object
-} from "./chunk-ROG4RXXL.mjs";
+} from "./chunk-5GAIWRQB.mjs";
 import {
   nothing
-} from "./chunk-V36VO5SS.mjs";
+} from "./chunk-NOL7O3BL.mjs";
 import {
   Unknown,
   instanceOf,
   make
-} from "./chunk-B4BASU6W.mjs";
+} from "./chunk-6CEISA3V.mjs";
 import {
   Ref
-} from "./chunk-BVOFLCVF.mjs";
+} from "./chunk-TF5BSLF6.mjs";
+import {
+  getSchema,
+  makeObject
+} from "./chunk-HGWQR5KH.mjs";
 import {
   JsonSchemaType
-} from "./chunk-JUXPFOEI.mjs";
+} from "./chunk-K3S7D5PR.mjs";
 import {
   FormInputAnnotation,
-  IconAnnotation,
-  SystemTypeAnnotation
-} from "./chunk-2KHZ36F5.mjs";
+  HiddenAnnotation,
+  IconAnnotation
+} from "./chunk-WZ32BF53.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
 
 // src/index.ts
 import { QueryAST as QueryAST2 } from "@dxos/echo-protocol";
-import { DXN } from "@dxos/keys";
+import { DXN as DXN3, EID as EID2, URI } from "@dxos/keys";
 
 // src/Hypergraph.ts
 var Hypergraph_exports = {};
 
+// src/Json.ts
+var Json_exports = {};
+__export(Json_exports, {
+  createRefReplacer: () => createRefReplacer
+});
+import { EID } from "@dxos/keys";
+var isEncodedRef = (value) => typeof value === "object" && value !== null && Object.keys(value).length === 1 && typeof value["/"] === "string";
+var toJson = (obj) => typeof obj.toJSON === "function" ? obj.toJSON() : obj;
+var createRefReplacer = ({ db, depth = 1 }) => {
+  const hops = /* @__PURE__ */ new WeakMap();
+  return function(key, value) {
+    const parentHops = this && typeof this === "object" ? hops.get(this) ?? 0 : 0;
+    if (isEncodedRef(value)) {
+      if (parentHops >= depth) {
+        return value;
+      }
+      const dxnString = value["/"];
+      if (!dxnString.startsWith("dxn:") && !dxnString.startsWith("echo:")) {
+        return value;
+      }
+      let echoUri;
+      try {
+        const parsed = EID.tryParse(dxnString);
+        echoUri = parsed ? EID.getEntityId(parsed) : void 0;
+      } catch {
+        return value;
+      }
+      if (!echoUri) {
+        return value;
+      }
+      const target = db.getObjectById(echoUri);
+      if (!target) {
+        return value;
+      }
+      const encoded = toJson(target);
+      if (encoded != null && typeof encoded === "object") {
+        hops.set(encoded, parentHops + 1);
+      }
+      return encoded;
+    }
+    if (value != null && typeof value === "object") {
+      hops.set(value, parentHops);
+    }
+    return value;
+  };
+};
+
 // src/Collection.ts
 var Collection_exports = {};
 __export(Collection_exports, {
@@ -45,16 +93,14 @@ __export(Collection_exports, {
   make: () => make2
 });
 import * as Schema from "effect/Schema";
+import { DXN } from "@dxos/keys";
 var Collection = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
   objects: Schema.Array(Ref(Unknown)).pipe(FormInputAnnotation.set(false))
-}).pipe(object({
-  typename: "org.dxos.type.collection",
-  version: "0.1.0"
-}), IconAnnotation.set({
+}).pipe(IconAnnotation.set({
   icon: "ph--folder--regular",
-  hue: "neutral"
-}));
+  hue: "amber"
+}), makeObject(DXN.make("org.dxos.type.collection", "0.1.0")));
 var make2 = (props = {}) => make(Collection, {
   objects: [],
   ...props
@@ -73,14 +119,14 @@ __export(View_exports, {
 });
 import * as Schema2 from "effect/Schema";
 import { QueryAST } from "@dxos/echo-protocol";
-import { JsonPath } from "@dxos/effect";
-import { PublicKey } from "@dxos/keys";
+import { SchemaEx } from "@dxos/effect";
+import { DXN as DXN2, PublicKey } from "@dxos/keys";
 var FieldSchema = Schema2.Struct({
   id: Schema2.String,
-  path: JsonPath,
+  path: SchemaEx.JsonPath,
   visible: Schema2.optional(Schema2.Boolean),
   // TODO(wittjosiah): Presentation-specific?
-  referencePath: Schema2.optional(JsonPath)
+  referencePath: Schema2.optional(SchemaEx.JsonPath)
 });
 var KeyValueProps = Schema2.Record({
   key: Schema2.String,
@@ -95,7 +141,7 @@ var Projection = Schema2.Struct({
   /**
   * UX metadata associated with displayed fields (in table, form, etc.)
   */
-  // TODO(wittjosiah): Should this just be an array of JsonPath?
+  // TODO(wittjosiah): Should this just be an array of SchemaEx.JsonPath?
   fields: Schema2.Array(FieldSchema),
   /**
   * The id for the field used to pivot the view.
@@ -116,13 +162,10 @@ var ViewSchema = Schema2.Struct({
   * Projection of the data returned from the query.
   */
   projection: Projection
-}).pipe(object({
-  typename: "org.dxos.type.view",
-  version: "0.1.0"
-}), SystemTypeAnnotation.set(true), IconAnnotation.set({
+}).pipe(HiddenAnnotation.set(true), IconAnnotation.set({
   icon: "ph--funnel--regular",
   hue: "green"
-}));
+}), makeObject(DXN2.make("org.dxos.type.view", "0.1.0")));
 var View = ViewSchema;
 var make3 = (props) => {
   return make(View, {
@@ -145,15 +188,18 @@ __export(Dataset_exports, {
 import { pipe } from "effect/Function";
 import * as Predicate from "effect/Predicate";
 import * as Schema3 from "effect/Schema";
-var Dataset = Schema3.Union(Feed, Collection, View);
+var Dataset = Schema3.Union(getSchema(Feed), getSchema(Collection), getSchema(View));
 var isDataset = pipe(instanceOf(Feed), Predicate.or(instanceOf(Collection)), Predicate.or(instanceOf(View)));
 
 export {
   Hypergraph_exports,
+  Json_exports,
   Collection_exports,
   View_exports,
   Dataset_exports,
   QueryAST2 as QueryAST,
-  DXN
+  DXN3 as DXN,
+  EID2 as EID,
+  URI
 };
-//# sourceMappingURL=chunk-4OIBYSXE.mjs.map
+//# sourceMappingURL=chunk-3JXQUMUI.mjs.map

package/dist/lib/neutral/chunk-3JXQUMUI.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/index.ts", "../../../src/Hypergraph.ts", "../../../src/Json.ts", "../../../src/Collection.ts", "../../../src/View.ts", "../../../src/Dataset.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nexport { QueryAST } from '@dxos/echo-protocol';\nexport { DXN, EID, URI } from '@dxos/keys';\n\nexport * as Annotation from './Annotation';\nexport * as Database from './Database';\nexport * as Entity from './Entity';\n// TODO(burdon): Rename to Error (less problematic than Obj/Object).\nexport * as Err from './Err';\nexport * as Feed from './Feed';\nexport * as Filter from './Filter';\nexport * as Format from './Format';\nexport * as Hypergraph from './Hypergraph';\nexport * as Json from './Json';\nexport * as JsonSchema from './JsonSchema';\nexport * as Key from './Key';\nexport * as Migration from './Migration';\nexport * as Obj from './Obj';\nexport * as Order from './Order';\nexport * as Query from './Query';\nexport * as QueryResult from './QueryResult';\nexport * as Ref from './Ref';\nexport * as Registry from './Registry';\nexport * as Relation from './Relation';\nexport * as Scope from './Scope';\nexport * as Tag from './Tag';\nexport * as Type from './Type';\nexport * as Collection from './Collection';\nexport * as View from './View';\nexport * as Dataset from './Dataset';\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type URI } from '@dxos/keys';\n\nimport type * as Database from './Database';\nimport type * as Entity from './Entity';\nimport type * as internal from './internal';\nimport type * as Key from './Key';\nimport type * as Ref from './Ref';\nimport type * as Registry from './Registry';\n\n/**\n * Resolution context.\n * Affects how non-absolute DXNs are resolved.\n */\nexport interface RefResolutionContext {\n  /**\n   * Space that the resolution is happening from.\n   */\n  space?: Key.SpaceId;\n\n  /**\n   * Feed that the resolution is happening from.\n   * This feed will be searched first, and then the space it belongs to.\n   */\n  feed?: URI.URI;\n}\n\nexport interface RefResolverOptions {\n  /**\n   * Resolution context.\n   * Affects how non-absolute DXNs are resolved.\n   */\n  context?: RefResolutionContext;\n\n  /**\n   * Middleware to change the resolved object before returning it.\n   * @deprecated On track to be removed.\n   */\n  middleware?: (obj: internal.AnyProperties) => internal.AnyProperties;\n}\n\n/**\n * Manages cross-space database interactions.\n */\nexport interface Hypergraph extends Database.Queryable {\n  /**\n   * In-process registry of keyed objects and static schema types.\n   * Populated at startup via `registry.add(objects)` / `registry.add(schemas)`.\n   * Queries that include no explicit from() clause will fan out to this registry automatically.\n   */\n  get registry(): Registry.Registry;\n\n  /**\n   * Query objects.\n   */\n  query: Database.QueryFn;\n\n  /**\n   * Creates a reference to an existing object in the database.\n   *\n   * NOTE: The reference may be dangling if the object is not present in the database.\n   * NOTE: Difference from `Ref.fromURI`\n   * `Ref.fromURI(dxn)` returns an unhydrated reference. The `.load` and `.target` APIs will not work.\n   * `db.makeRef(dxn)` is preferable in cases with access to the database.\n   */\n  makeRef<T extends Entity.Unknown = Entity.Unknown>(uri: URI.URI): Ref.Ref<T>;\n\n  /**\n   * @param hostDb Host database for reference resolution.\n   * @param middleware Called with the loaded object. The caller may change the object.\n   * @returns Result of `onLoad`.\n   */\n  // TODO(dmaretskyi): Restructure API: Remove middleware.\n  createRefResolver(options: RefResolverOptions): Ref.Resolver;\n\n  /**\n   * Get a database by space ID.\n   * @returns The database for the given space ID, or undefined if not found.\n   */\n  getDatabase(spaceId: Key.SpaceId): Database.Database | undefined;\n}\n", "//\n// Copyright 2026 DXOS.org\n//\n\nimport { EID } from '@dxos/keys';\n\nimport * as Database from './Database';\nimport * as Obj from './Obj';\n\n/**\n * `JSON.stringify` replacer signature.\n *\n * Defined here (rather than re-imported from a UI package) so other ECHO-aware utilities can\n * share a stable signature without creating a dependency edge into the UI tree.\n */\nexport type JsonReplacer = (key: string, value: any) => any;\n\nexport type CreateRefReplacerOptions = {\n  db: Database.Database;\n  /** How many ref hops to follow. `0` leaves all refs as-is. Default: `1`. */\n  depth?: number;\n};\n\nconst isEncodedRef = (value: unknown): value is { '/': string } =>\n  typeof value === 'object' &&\n  value !== null &&\n  Object.keys(value as object).length === 1 &&\n  typeof (value as { '/': unknown })['/'] === 'string';\n\nconst toJson = (obj: Obj.Any): unknown => (typeof (obj as any).toJSON === 'function' ? (obj as any).toJSON() : obj);\n\n/**\n * Returns a {@link JsonReplacer} that inlines ECHO ref objects (`{ \"/\": \"echo:...\" }`) up to\n * `depth` ref hops. Beyond that depth refs are left in their encoded form.\n *\n * Implemented as a per-call `JSON.stringify` replacer (not a one-shot tree walk at root) so it\n * composes with wrappers like `safeStringify` that intercept the root call. JSON.stringify\n * already drives the recursion; we only need to (a) detect a ref at the current callback,\n * (b) resolve and return the target if hop budget remains, and (c) tag the returned object\n * with its hop count so children know how far in they are.\n *\n * The hop count is tracked per-object via a `WeakMap`: a ref-resolved target's children inherit\n * `parentHops + 1`; a regular intermediate object's children inherit `parentHops`. This makes the\n * budget count *ref hops*, not tree depth — a ref deep in a tree still resolves once when\n * `depth >= 1`.\n *\n * Note: ECHO objects' `toJSON` runs before the replacer is invoked, so by the time we see a\n * value refs are already encoded as `{ \"/\": \"dxn:...\" }`.\n */\nexport const createRefReplacer = ({ db, depth = 1 }: CreateRefReplacerOptions): JsonReplacer => {\n  // Per-object hop count. Set when we return an object (via ref resolution or pass-through) so\n  // the child callbacks (which carry that object as `this`) can read it.\n  const hops = new WeakMap<object, number>();\n\n  return function (this: any, key: string, value: any) {\n    // Hop count for this call: hops at the parent, or 0 for the root.\n    const parentHops = this && typeof this === 'object' ? (hops.get(this) ?? 0) : 0;\n    if (isEncodedRef(value)) {\n      if (parentHops >= depth) {\n        return value;\n      }\n\n      // The `{ '/': string }` shape is shared with non-DXN IPLD-style refs (e.g. CIDs);\n      // an unparseable string would otherwise crash the whole `JSON.stringify`.\n      // Treat any parse miss as \"leave as-is\" rather than propagating.\n      const dxnString = value['/'];\n      if (!dxnString.startsWith('dxn:') && !dxnString.startsWith('echo:')) {\n        return value;\n      }\n\n      let echoUri: string | undefined;\n      try {\n        const parsed = EID.tryParse(dxnString);\n        echoUri = parsed ? EID.getEntityId(parsed) : undefined;\n      } catch {\n        return value;\n      }\n\n      if (!echoUri) {\n        return value;\n      }\n      const target = db.getObjectById(echoUri);\n      if (!target) {\n        return value;\n      }\n\n      const encoded = toJson(target);\n      if (encoded != null && typeof encoded === 'object') {\n        // Children of the resolved target are one hop deeper.\n        hops.set(encoded as object, parentHops + 1);\n      }\n      return encoded;\n    }\n\n    // Pass-through object: children inherit the parent's hop count (this branch doesn't burn\n    // budget).\n    if (value != null && typeof value === 'object') {\n      hops.set(value, parentHops);\n    }\n\n    return value;\n  };\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\n// @import-as-namespace\n\nimport * as Schema from 'effect/Schema';\n\nimport { DXN } from '@dxos/keys';\n\nimport * as Annotation from './Annotation';\nimport * as internal from './internal';\nimport * as Obj from './Obj';\nimport * as Ref from './Ref';\nimport * as Type from './Type';\n\n/**\n * A an ordered set of objects.\n */\nexport const Collection = Schema.Struct({\n  name: Schema.String.pipe(Schema.optional),\n  objects: Schema.Array(Ref.Ref(Obj.Unknown)).pipe(internal.FormInputAnnotation.set(false)),\n}).pipe(\n  Annotation.IconAnnotation.set({ icon: 'ph--folder--regular', hue: 'amber' }),\n  Type.makeObject(DXN.make('org.dxos.type.collection', '0.1.0')),\n);\n\nexport type Collection = Type.InstanceType<typeof Collection>;\n\nexport const make = (props: Partial<Obj.MakeProps<typeof Collection>> = {}): Collection =>\n  Obj.make(Collection, { objects: [], ...props });\n\nexport const isCollection: (value: unknown) => value is Collection = Obj.instanceOf(Collection);\n", "//\n// Copyright 2025 DXOS.org\n//\n\n// @import-as-namespace\n\nimport * as Schema from 'effect/Schema';\n\nimport { QueryAST } from '@dxos/echo-protocol';\nimport { SchemaEx } from '@dxos/effect';\nimport { DXN, PublicKey } from '@dxos/keys';\n\nimport * as Annotation from './Annotation';\nimport * as Filter from './Filter';\nimport * as internal from './internal';\nimport * as Obj from './Obj';\nimport * as Query from './Query';\nimport * as Type from './Type';\n\n/**\n * Stored field metadata (e.g., for UX).\n */\nexport const FieldSchema = Schema.Struct({\n  id: Schema.String,\n  path: SchemaEx.JsonPath,\n  visible: Schema.optional(Schema.Boolean),\n\n  // TODO(wittjosiah): Presentation-specific?\n  referencePath: Schema.optional(SchemaEx.JsonPath),\n});\n\nexport type FieldType = Schema.Schema.Type<typeof FieldSchema>;\n\nexport const KeyValueProps = Schema.Record({ key: Schema.String, value: Schema.Any });\n\nexport const createFieldId = () => PublicKey.random().truncate();\n\nexport const Projection = Schema.Struct({\n  /**\n   * Optional schema override used to customize the underlying schema.\n   */\n  schema: internal.JsonSchemaType.pipe(Schema.optional),\n\n  /**\n   * UX metadata associated with displayed fields (in table, form, etc.)\n   */\n  // TODO(wittjosiah): Should this just be an array of SchemaEx.JsonPath?\n  fields: Schema.Array(FieldSchema),\n\n  /**\n   * The id for the field used to pivot the view.\n   * E.g., the field to use for kanban columns or the field to use for map coordinates.\n   */\n  pivotFieldId: Schema.String.pipe(Schema.optional),\n});\n\nexport type Projection = Schema.Schema.Type<typeof Projection>;\n\n/**\n * Views are generated or user-defined projections of a schema's properties.\n * They are used to configure the visual representation of the data.\n */\nconst ViewSchema = Schema.Struct({\n  /**\n   * Query used to retrieve data.\n   * Can be a user-provided query grammar string or a query AST.\n   */\n  query: Schema.Struct({\n    raw: Schema.optional(Schema.String),\n    ast: QueryAST.Query,\n  }),\n\n  /**\n   * Projection of the data returned from the query.\n   */\n  projection: Projection,\n}).pipe(\n  internal.HiddenAnnotation.set(true),\n  Annotation.IconAnnotation.set({ icon: 'ph--funnel--regular', hue: 'green' }),\n  Type.makeObject(DXN.make('org.dxos.type.view', '0.1.0')),\n);\n\n// NOTE: Declared as a named interface and the `View` const is annotated `Type.Obj<View>` so\n//   downstream consumers see a named `View` type instead of the inlined `QueryAST.Query` union.\n//   Without the named interface, embedding `Type.getSchema(View.View)` in a downstream\n//   `Schema.Struct` triggers TS2742 portability errors (e.g. plugin-kanban, plugin-table).\n// TODO(wittjosiah): Find a better solution that doesn't require manually keeping the interface in sync.\nexport interface View extends Type.InstanceType<typeof ViewSchema> {}\n\nexport const View: Type.Obj<View> = ViewSchema as any;\n\nexport const make = (props: Partial<Obj.MakeProps<typeof View>>): View => {\n  return Obj.make(View, {\n    query: { ast: Query.select(Filter.nothing()).ast },\n    projection: { fields: [] },\n    ...props,\n  });\n};\n", "//\n// Copyright 2026 DXOS.org\n//\n\n// @import-as-namespace\n\nimport { pipe } from 'effect/Function';\nimport * as Predicate from 'effect/Predicate';\nimport * as Schema from 'effect/Schema';\n\nimport * as Collection from './Collection';\nimport * as Feed from './Feed';\nimport * as Obj from './Obj';\nimport * as Type from './Type';\nimport * as View from './View';\n\n/**\n * Abstract set of objects, represented by a view, feed, or collection.\n * Schema-level union of the underlying type entities (rebuilt via\n * `Type.getSchema`) so this can still be consumed by Schema-side APIs such\n * as `Filter.type(...)` on a union.\n */\nexport type Dataset = Feed.Feed | Collection.Collection | View.View;\nexport const Dataset = Schema.Union(\n  Type.getSchema(Feed.Feed),\n  Type.getSchema(Collection.Collection),\n  Type.getSchema(View.View),\n);\n\nexport const isDataset: (value: unknown) => value is Dataset = pipe(\n  Obj.instanceOf(Feed.Feed),\n  Predicate.or(Obj.instanceOf(Collection.Collection)),\n  Predicate.or(Obj.instanceOf(View.View)),\n);\n"],
+  "mappings": "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",
+  "names": ["QueryAST", "DXN", "EID", "URI", "EID", "isEncodedRef", "value", "Object", "keys", "length", "toJson", "obj", "toJSON", "createRefReplacer", "db", "depth", "hops", "WeakMap", "key", "parentHops", "get", "dxnString", "startsWith", "echoUri", "parsed", "tryParse", "getEntityId", "undefined", "target", "getObjectById", "encoded", "set", "make", "Schema", "DXN", "Collection", "Struct", "name", "String", "pipe", "optional", "objects", "Array", "Ref", "Unknown", "FormInputAnnotation", "set", "IconAnnotation", "icon", "hue", "makeObject", "DXN", "make", "props", "isCollection", "instanceOf", "make", "Schema", "QueryAST", "SchemaEx", "DXN", "PublicKey", "FieldSchema", "Struct", "id", "String", "path", "SchemaEx", "JsonPath", "visible", "optional", "Boolean", "referencePath", "KeyValueProps", "Record", "key", "value", "Any", "createFieldId", "PublicKey", "random", "truncate", "Projection", "schema", "JsonSchemaType", "pipe", "fields", "Array", "pivotFieldId", "ViewSchema", "query", "raw", "ast", "QueryAST", "Query", "projection", "HiddenAnnotation", "set", "IconAnnotation", "icon", "hue", "makeObject", "DXN", "make", "View", "props", "select", "nothing", "pipe", "Predicate", "Schema", "Dataset", "Union", "getSchema", "Feed", "Collection", "View", "isDataset", "pipe", "instanceOf", "or"]
+}

package/dist/lib/neutral/{chunk-G3IQMKF7.mjs → chunk-4TPQZPLY.mjs}

@@ -1,12 +1,13 @@
-import {
-  Service
-} from "./chunk-PHU22NLC.mjs";
 import {
   ReferenceAnnotationId,
-  getSchemaDXN,
+  Service,
+  getSchemaURI,
   getTypeAnnotation,
   getTypeIdentifierAnnotation
-} from "./chunk-2KHZ36F5.mjs";
+} from "./chunk-WZ32BF53.mjs";
+import {
+  getStaticTypeSchema
+} from "./chunk-O6BH7EPN.mjs";
 
 // src/internal/Ref/ref.ts
 import * as Effect from "effect/Effect";
@@ -21,15 +22,49 @@ import { Event } from "@dxos/async";
 import { inspectCustom } from "@dxos/debug";
 import { EncodedReference } from "@dxos/echo-protocol";
 import { assertArgument, invariant } from "@dxos/invariant";
-import { DXN, ObjectId } from "@dxos/keys";
+import { DXN, EID, EntityId } from "@dxos/keys";
+
+// src/internal/Ref/atoms.ts
+import * as Atom from "@effect-atom/atom/Atom";
+
+// src/internal/Ref/utils.ts
+var loadRefTarget = (ref, get, onTargetAvailable) => {
+  const currentTarget = ref.target;
+  if (currentTarget) {
+    return onTargetAvailable(currentTarget);
+  }
+  const unsubscribe = ref.onResolved(() => {
+    const target = ref.target;
+    if (target) {
+      get.setSelf(onTargetAvailable(target));
+    }
+  });
+  get.addFinalizer(unsubscribe);
+  void ref.load().then((loadedTarget) => {
+    get.setSelf(onTargetAvailable(loadedTarget));
+  }).catch(() => {
+  });
+  return void 0;
+};
+
+// src/internal/Ref/atoms.ts
+var refSimpleFamily = Atom.family((ref) => {
+  return Atom.make((get) => {
+    return loadRefTarget(ref, get, (target) => target);
+  });
+});
+
+// src/internal/Ref/ref.ts
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Ref/ref.ts";
 var JSON_SCHEMA_ECHO_REF_ID = "/schemas/echo/ref";
 var getSchemaReference = (property) => {
   const { $id, reference: { schema: { $ref } = {} } = {} } = property;
   if ($id === JSON_SCHEMA_ECHO_REF_ID && $ref) {
-    return {
-      typename: DXN.parse($ref).typename
-    };
+    const parsed = DXN.tryMake($ref);
+    const typename = parsed ? DXN.getName(parsed) : void 0;
+    return typename ? {
+      typename
+    } : void 0;
   }
 };
 var createSchemaReference = (typename) => {
@@ -37,7 +72,7 @@ var createSchemaReference = (typename) => {
     $id: JSON_SCHEMA_ECHO_REF_ID,
     reference: {
       schema: {
-        $ref: DXN.fromTypename(typename).toString()
+        $ref: DXN.make(typename)
       }
     }
   };
@@ -51,8 +86,9 @@ var getReferenceAst = (ast) => {
     version: ast.annotations[ReferenceAnnotationId].version
   };
 };
-var RefTypeId = /* @__PURE__ */ Symbol("@dxos/echo/internal/Ref");
-var Ref = (schema) => {
+var RefTypeId = /* @__PURE__ */ Symbol.for("@dxos/echo/internal/Ref");
+var Ref = (input) => {
+  const schema = getStaticTypeSchema(input) ?? input;
   assertArgument(Schema.isSchema(schema), "schema", "Must call with an instance of effect-schema");
   const annotation = getTypeAnnotation(schema);
   if (annotation == null) {
@@ -61,9 +97,12 @@ var Ref = (schema) => {
   return createEchoReferenceSchema(getTypeIdentifierAnnotation(schema), annotation.typename, annotation.version);
 };
 Ref.isRef = (obj) => {
-  return obj && typeof obj === "object" && RefTypeId in obj;
+  return obj != null && typeof obj === "object" && RefTypeId in obj;
+};
+Ref.hasEntityId = (id) => (ref) => {
+  const uri = EID.tryParse(ref.uri);
+  return uri !== void 0 && EID.isLocal(uri) && EID.getEntityId(uri) === id;
 };
-Ref.hasObjectId = (id) => (ref) => ref.dxn.isLocalObjectId() && ref.dxn.parts[1] === id;
 Ref.isRefSchema = (schema) => {
   return Ref.isRefSchemaAST(schema.ast);
 };
@@ -75,30 +114,25 @@ Ref.make = (obj) => {
     throw new TypeError("Expected: ECHO object.");
   }
   const id = obj.id;
-  invariant(ObjectId.isValid(id), "Invalid object ID", {
-    F: __dxlog_file,
-    L: 225,
-    S: void 0,
-    A: [
-      "ObjectId.isValid(id)",
-      "'Invalid object ID'"
-    ]
+  invariant(EntityId.isValid(id), "Invalid object ID", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 87, S: void 0, A: ["EntityId.isValid(id)", "'Invalid object ID'"] });
+  const uri = EID.make({
+    entityId: id
   });
-  const dxn = DXN.fromLocalObjectId(id);
-  return new RefImpl(dxn, obj);
+  const ref = new RefImpl(uri, obj);
+  return ref;
 };
-Ref.fromDXN = (dxn) => {
-  assertArgument(dxn instanceof DXN, "dxn", "Expected DXN");
-  return new RefImpl(dxn);
+Ref.fromURI = (uri) => {
+  assertArgument(typeof uri === "string", "uri", "Expected URI string");
+  return new RefImpl(uri);
 };
-var createEchoReferenceSchema = (echoId, typename, version) => {
-  if (!echoId && !typename) {
-    throw new TypeError("Either echoId or typename must be provided.");
+var createEchoReferenceSchema = (echoUri, typename, version) => {
+  if (!echoUri && !typename) {
+    throw new TypeError("Either echoUri or typename must be provided.");
   }
   const referenceInfo = {
     schema: {
       // TODO(dmaretskyi): Include version?
-      $ref: echoId ?? DXN.fromTypename(typename).toString()
+      $ref: echoUri ?? DXN.make(typename)
     },
     schemaVersion: version
   };
@@ -106,7 +140,7 @@ var createEchoReferenceSchema = (echoId, typename, version) => {
     encode: () => {
       return (value) => Effect.gen(function* () {
         if (Ref.isRef(value)) {
-          return EncodedReference.fromDXN(value.dxn);
+          return EncodedReference.fromURI(value.uri);
         } else if (EncodedReference.isEncodedReference(value)) {
           return value;
         }
@@ -118,7 +152,7 @@ var createEchoReferenceSchema = (echoId, typename, version) => {
         const dbService = yield* Effect.serviceOption(Service);
         if (Ref.isRef(value)) {
           if (Option.isSome(dbService)) {
-            return dbService.value.db.makeRef(value.dxn);
+            return dbService.value.db.makeRef(value.uri);
           } else {
             return value;
           }
@@ -127,9 +161,9 @@ var createEchoReferenceSchema = (echoId, typename, version) => {
           return yield* Effect.fail(new ParseResult.Unexpected(value, "reference"));
         }
         if (Option.isSome(dbService)) {
-          return dbService.value.db.makeRef(EncodedReference.toDXN(value));
+          return dbService.value.db.makeRef(EncodedReference.toURI(value));
         } else {
-          return Ref.fromDXN(EncodedReference.toDXN(value));
+          return Ref.fromURI(EncodedReference.toURI(value));
         }
       });
     }
@@ -147,8 +181,16 @@ var createEchoReferenceSchema = (echoId, typename, version) => {
   });
   return refSchema;
 };
+var makeSettledRequest = (state, result) => ({
+  state,
+  stateChanged: new Event(),
+  getResult: () => state === "ready" ? result : void 0,
+  wait: async () => state === "ready" ? result : void 0,
+  abort: () => {
+  }
+});
 var RefImpl = class _RefImpl {
-  #dxn;
+  #uri;
   #resolver = void 0;
   #resolved = new Event();
   /**
@@ -162,15 +204,15 @@ var RefImpl = class _RefImpl {
   #resolverCallback = () => {
     this.#resolved.emit();
   };
-  constructor(dxn, target) {
-    this.#dxn = dxn;
+  constructor(uri, target) {
+    this.#uri = uri;
     this.#target = target;
   }
   /**
   * @inheritdoc
   */
-  get dxn() {
-    return this.#dxn;
+  get uri() {
+    return this.#uri;
   }
   /**
   * @inheritdoc
@@ -185,16 +227,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file,
-      L: 393,
-      S: this,
-      A: [
-        "this.#resolver",
-        "'Resolver is not set'"
-      ]
-    });
-    return this.#resolver.resolveSync(this.#dxn, true, this.#resolverCallback);
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 205, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    return this.#resolver.resolveSync(this.#uri, true, this.#resolverCallback);
   }
   /**
   * @inheritdoc
@@ -203,16 +237,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file,
-      L: 404,
-      S: this,
-      A: [
-        "this.#resolver",
-        "'Resolver is not set'"
-      ]
-    });
-    const obj = await this.#resolver.resolve(this.#dxn);
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 214, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    const obj = await this.#resolver.resolveLegacy(this.#uri);
     if (obj == null) {
       throw new Error("Object not found");
     }
@@ -225,16 +251,14 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file,
-      L: 419,
-      S: this,
-      A: [
-        "this.#resolver",
-        "'Resolver is not set'"
-      ]
-    });
-    return await this.#resolver.resolve(this.#dxn);
+    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 227, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    return await this.#resolver.resolveLegacy(this.#uri);
+  }
+  /**
+  * @inheritdoc
+  */
+  onResolved(callback) {
+    return this.#resolved.on(callback);
   }
   /**
   * Do not inline the target object in the reference.
@@ -242,13 +266,13 @@ var RefImpl = class _RefImpl {
   * Clones the reference object.
   */
   noInline() {
-    const ref = new _RefImpl(this.#dxn, void 0);
+    const ref = new _RefImpl(this.#uri, void 0);
     ref.#resolver = this.#resolver;
     return ref;
   }
   encode() {
     return {
-      "/": this.#dxn.toString(),
+      "/": this.#uri,
       ...this.#target ? {
         target: this.#target
       } : {}
@@ -267,7 +291,7 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return `Ref(${this.#target.toString()})`;
     }
-    return `Ref(${this.#dxn.toString()})`;
+    return `Ref(${this.#uri.toString()})`;
   }
   [inspectCustom] = (depth, options, inspect) => {
     return this.toString();
@@ -280,11 +304,14 @@ var RefImpl = class _RefImpl {
   * so without this, each access would create a separate cache entry.
   */
   [Hash.symbol]() {
-    return Hash.hash(this.#dxn.toString());
+    return Hash.hash(this.#uri.toString());
   }
   /** Effect Equal trait. See {@link Hash.symbol} for rationale. */
   [Equal.symbol](that) {
-    return that instanceof _RefImpl && this.#dxn.toString() === that.dxn.toString();
+    return that instanceof _RefImpl && this.#uri === that.uri;
+  }
+  get atom() {
+    return refSimpleFamily(this);
   }
   /**
   * Internal method to set the resolver.
@@ -305,35 +332,19 @@ var RefImpl = class _RefImpl {
   }
 };
 var setRefResolver = (ref, resolver) => {
-  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
-    F: __dxlog_file,
-    L: 506,
-    S: void 0,
-    A: [
-      "ref instanceof RefImpl",
-      "'Ref is not an instance of RefImpl'"
-    ]
-  });
+  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 304, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
   ref._setResolver(resolver);
 };
 var getRefSavedTarget = (ref) => {
-  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
-    F: __dxlog_file,
-    L: 514,
-    S: void 0,
-    A: [
-      "ref instanceof RefImpl",
-      "'Ref is not an instance of RefImpl'"
-    ]
-  });
+  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 310, S: void 0, A: ["ref instanceof RefImpl", "'Ref is not an instance of RefImpl'"] });
   return ref._getSavedTarget();
 };
 var refVariance = {
   _T: null
 };
 var refFromEncodedReference = (encodedReference, resolver) => {
-  const dxn = DXN.parse(encodedReference["/"]);
-  const ref = new RefImpl(dxn);
+  const uri = EncodedReference.toURI(encodedReference);
+  const ref = new RefImpl(uri);
   if (resolver) {
     setRefResolver(ref, resolver);
   }
@@ -346,40 +357,39 @@ var StaticRefResolver = class {
     this.objects.set(obj.id, obj);
     return this;
   }
-  addSchema(schema) {
-    const dxn = getSchemaDXN(schema);
-    invariant(dxn, "Schema has no DXN", {
-      F: __dxlog_file,
-      L: 546,
-      S: this,
-      A: [
-        "dxn",
-        "'Schema has no DXN'"
-      ]
-    });
-    this.schemas.set(dxn.toString(), schema);
+  addSchema(input) {
+    const schema = getStaticTypeSchema(input);
+    invariant(schema, "Type entity is missing its source schema", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 335, S: this, A: ["schema", "'Type entity is missing its source schema'"] });
+    const uri = getSchemaURI(schema);
+    invariant(uri, "Schema has no URI", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 337, S: this, A: ["uri", "'Schema has no URI'"] });
+    this.schemas.set(uri, schema);
     return this;
   }
-  resolveSync(dxn, _load, _onLoad) {
-    const id = dxn?.asEchoDXN()?.echoId;
-    if (id == null) {
-      return void 0;
-    }
-    return this.objects.get(id);
+  resolve(uri, _options) {
+    const obj = this.#lookup(uri);
+    return makeSettledRequest(obj ? "ready" : "unavailable", obj);
   }
-  async resolve(dxn) {
-    const id = dxn?.asEchoDXN()?.echoId;
+  resolveSync(uri, _load, _onLoad) {
+    return this.#lookup(uri);
+  }
+  async resolveLegacy(uri) {
+    return this.#lookup(uri);
+  }
+  async resolveSchema(uri) {
+    return this.schemas.get(uri);
+  }
+  #lookup(uri) {
+    const echoUri = EID.tryParse(uri);
+    const id = echoUri ? EID.getEntityId(echoUri) : void 0;
     if (id == null) {
       return void 0;
     }
     return this.objects.get(id);
   }
-  async resolveSchema(dxn) {
-    return this.schemas.get(dxn.toString());
-  }
 };
 
 export {
+  loadRefTarget,
   JSON_SCHEMA_ECHO_REF_ID,
   getSchemaReference,
   createSchemaReference,
@@ -387,10 +397,11 @@ export {
   RefTypeId,
   Ref,
   createEchoReferenceSchema,
+  makeSettledRequest,
   RefImpl,
   setRefResolver,
   getRefSavedTarget,
   refFromEncodedReference,
   StaticRefResolver
 };
-//# sourceMappingURL=chunk-G3IQMKF7.mjs.map
+//# sourceMappingURL=chunk-4TPQZPLY.mjs.map