@dxos/echo 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/dist/lib/neutral/{chunk-BMB7IHGB.mjs → chunk-7OAFN3OX.mjs}

@@ -1,12 +1,13 @@
-import {
-  Service
-} from "./chunk-I2DARWPX.mjs";
 import {
   ReferenceAnnotationId,
-  getSchemaDXN,
+  Service,
+  getSchemaURI,
   getTypeAnnotation,
   getTypeIdentifierAnnotation
-} from "./chunk-TNBK56IN.mjs";
+} from "./chunk-H26LSXVJ.mjs";
+import {
+  getStaticTypeSchema
+} from "./chunk-O6BH7EPN.mjs";
 
 // src/internal/Ref/ref.ts
 import * as Effect from "effect/Effect";
@@ -21,15 +22,17 @@ 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";
 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 +40,7 @@ var createSchemaReference = (typename) => {
     $id: JSON_SCHEMA_ECHO_REF_ID,
     reference: {
       schema: {
-        $ref: DXN.fromTypename(typename).toString()
+        $ref: DXN.make(typename)
       }
     }
   };
@@ -52,7 +55,8 @@ var getReferenceAst = (ast) => {
   };
 };
 var RefTypeId = /* @__PURE__ */ Symbol("@dxos/echo/internal/Ref");
-var Ref = (schema) => {
+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) {
@@ -63,7 +67,10 @@ var Ref = (schema) => {
 Ref.isRef = (obj) => {
   return obj && typeof obj === "object" && RefTypeId in obj;
 };
-Ref.hasObjectId = (id) => (ref) => ref.dxn.isLocalObjectId() && ref.dxn.parts[1] === id;
+Ref.hasEntityId = (id) => (ref) => {
+  const uri = EID.tryParse(ref.uri);
+  return uri !== void 0 && EID.isLocal(uri) && EID.getEntityId(uri) === id;
+};
 Ref.isRefSchema = (schema) => {
   return Ref.isRefSchemaAST(schema.ast);
 };
@@ -75,22 +82,24 @@ Ref.make = (obj) => {
     throw new TypeError("Expected: ECHO object.");
   }
   const id = obj.id;
-  invariant(ObjectId.isValid(id), "Invalid object ID", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 76, S: void 0, A: ["ObjectId.isValid(id)", "'Invalid object ID'"] });
-  const dxn = DXN.fromLocalObjectId(id);
-  return new RefImpl(dxn, obj);
+  invariant(EntityId.isValid(id), "Invalid object ID", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 85, S: void 0, A: ["EntityId.isValid(id)", "'Invalid object ID'"] });
+  const uri = EID.make({
+    entityId: id
+  });
+  return new RefImpl(uri, obj);
 };
-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
   };
@@ -98,7 +107,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;
         }
@@ -110,7 +119,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;
           }
@@ -119,9 +128,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));
         }
       });
     }
@@ -140,7 +149,7 @@ var createEchoReferenceSchema = (echoId, typename, version) => {
   return refSchema;
 };
 var RefImpl = class _RefImpl {
-  #dxn;
+  #uri;
   #resolver = void 0;
   #resolved = new Event();
   /**
@@ -154,15 +163,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
@@ -177,8 +186,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 181, 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: 192, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    return this.#resolver.resolveSync(this.#uri, true, this.#resolverCallback);
   }
   /**
   * @inheritdoc
@@ -187,8 +196,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 190, 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: 201, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    const obj = await this.#resolver.resolve(this.#uri);
     if (obj == null) {
       throw new Error("Object not found");
     }
@@ -201,8 +210,8 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant(this.#resolver, "Resolver is not set", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 203, 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: 214, S: this, A: ["this.#resolver", "'Resolver is not set'"] });
+    return await this.#resolver.resolve(this.#uri);
   }
   /**
   * @inheritdoc
@@ -216,13 +225,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
       } : {}
@@ -241,7 +250,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();
@@ -254,11 +263,11 @@ 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;
   }
   /**
   * Internal method to set the resolver.
@@ -279,19 +288,19 @@ var RefImpl = class _RefImpl {
   }
 };
 var setRefResolver = (ref, resolver) => {
-  invariant(ref instanceof RefImpl, "Ref is not an instance of RefImpl", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 277, 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: 288, 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", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 283, 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: 294, 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);
   }
@@ -304,28 +313,32 @@ var StaticRefResolver = class {
     this.objects.set(obj.id, obj);
     return this;
   }
-  addSchema(schema) {
-    const dxn = getSchemaDXN(schema);
-    invariant(dxn, "Schema has no DXN", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 308, 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: 319, 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: 321, S: this, A: ["uri", "'Schema has no URI'"] });
+    this.schemas.set(uri, schema);
     return this;
   }
-  resolveSync(dxn, _load, _onLoad) {
-    const id = dxn?.asEchoDXN()?.echoId;
+  resolveSync(uri, _load, _onLoad) {
+    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 resolve(dxn) {
-    const id = dxn?.asEchoDXN()?.echoId;
+  async resolve(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());
+  async resolveSchema(uri) {
+    return this.schemas.get(uri);
   }
 };
 
@@ -343,4 +356,4 @@ export {
   refFromEncodedReference,
   StaticRefResolver
 };
-//# sourceMappingURL=chunk-BMB7IHGB.mjs.map
+//# sourceMappingURL=chunk-7OAFN3OX.mjs.map

package/dist/lib/neutral/chunk-7OAFN3OX.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/internal/Ref/ref.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\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';\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\nexport const RefTypeId: unique symbol = Symbol('@dxos/echo/internal/Ref');\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   * 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 && 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  return new RefImpl(uri, obj);\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\nexport interface RefResolver {\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   */\n  resolveSync(uri: URI.URI, load: boolean, onLoad?: () => void): AnyProperties | undefined;\n\n  /**\n   * Resolver ref asynchronously.\n   */\n  resolve(uri: URI.URI): Promise<AnyProperties | undefined>;\n\n  // TODO(dmaretskyi): Combine with `resolve`.\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   */\n  resolveType?(uri: URI.URI): Promise<unknown | undefined>;\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.resolve(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.resolve(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  /**\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  resolveSync(uri: URI.URI, _load: boolean, _onLoad?: () => void): 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\n    return this.objects.get(id);\n  }\n\n  async resolve(uri: URI.URI): Promise<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\n    return this.objects.get(id);\n  }\n\n  async resolveSchema(uri: URI.URI): Promise<Schema.Schema.AnyNoContext | undefined> {\n    return this.schemas.get(uri);\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["Effect", "Equal", "Hash", "Option", "ParseResult", "Pipeable", "Schema", "SchemaAST", "Event", "inspectCustom", "EncodedReference", "assertArgument", "invariant", "DXN", "EID", "EntityId", "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", "RefImpl", "fromURI", "referenceInfo", "schemaVersion", "Effect", "gen", "EncodedReference", "value", "Ref", "dbService", "Option", "isSome", "jsonSchema", "ReferenceAnnotationId", "getSchemaExpectedName", "undefined", "target", "invariant", "obj", "Error", "ref", "encode", "toString", "inspectCustom", "depth", "options", "inspect", "RefTypeId", "refVariance", "pipe", "_setResolver", "resolver", "_getSavedTarget", "uri", "schemas", "addObject", "objects", "set", "addSchema", "input", "schema", "getSchemaURI", "resolveSync", "id", "echoUri", "getEntityId", "resolve", "resolveSchema"]
+}

package/dist/lib/neutral/{chunk-MLS7U7AT.mjs → chunk-7PRCIDHH.mjs}

@@ -3,24 +3,25 @@ import {
   FormatAnnotation,
   FormatAnnotationId,
   TypeFormat
-} from "./chunk-TRPZU2HV.mjs";
+} from "./chunk-TFEWTY5A.mjs";
 import {
   createEchoReferenceSchema
-} from "./chunk-BMB7IHGB.mjs";
+} from "./chunk-7OAFN3OX.mjs";
 import {
   GeneratorAnnotationId,
   LabelAnnotationId,
   PropertyMetaAnnotationId,
   TypeAnnotationId,
   TypeIdentifierAnnotationId
-} from "./chunk-TNBK56IN.mjs";
+} from "./chunk-H26LSXVJ.mjs";
 import {
   ANY_OBJECT_TYPENAME,
   ANY_OBJECT_VERSION,
   EntityKind,
   EntityKindSchema,
+  getStaticTypeSchema,
   makeTypeJsonSchemaAnnotation
-} from "./chunk-N4B7FHQT.mjs";
+} from "./chunk-O6BH7EPN.mjs";
 
 // src/internal/JsonSchema/annotations.ts
 import * as SchemaAST from "effect/SchemaAST";
@@ -319,7 +320,7 @@ import * as SchemaAST2 from "effect/SchemaAST";
 import { raise } from "@dxos/debug";
 import { mapAst } from "@dxos/effect";
 import { assertArgument, invariant } from "@dxos/invariant";
-import { DXN, ObjectId } from "@dxos/keys";
+import { DXN, EID, EntityId } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { clearUndefined, orderKeys, removeProperties } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/JsonSchema/json-schema.ts";
@@ -354,6 +355,15 @@ var toPropType = (type) => {
 };
 var JSON_SCHEMA_URL = "http://json-schema.org/draft-07/schema#";
 var toJsonSchema = (schema, options = {}) => {
+  const slot = getStaticTypeSchema(schema);
+  if (slot != null) {
+    schema = slot;
+  } else if (!Schema2.isSchema(schema)) {
+    const entityJsonSchema = schema.jsonSchema;
+    if (entityJsonSchema != null) {
+      return entityJsonSchema;
+    }
+  }
   assertArgument(Schema2.isSchema(schema), "schema");
   let jsonSchema = _toJsonSchemaAST(schema.ast);
   if (options.strict) {
@@ -465,7 +475,7 @@ var toEffectSchema = (root, _defs) => {
     if (root.allOf.length === 1) {
       result = toEffectSchema(root.allOf[0], defs);
     } else {
-      log.warn("allOf with multiple schemas is not supported", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 185, S: void 0 });
+      log.warn("allOf with multiple schemas is not supported", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 197, S: void 0 });
       result = Schema2.Unknown;
     }
   } else if ("type" in root) {
@@ -494,7 +504,7 @@ var toEffectSchema = (root, _defs) => {
           const [required, optional3] = Function.pipe(root.items, Array2.map((v) => toEffectSchema(v, defs)), Array2.splitAt(root.minItems ?? root.items.length));
           result = Schema2.Tuple(...required, ...optional3.map(Schema2.optionalElement));
         } else {
-          invariant(root.items, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 219, S: void 0, A: ["root.items", ""] });
+          invariant(root.items, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 231, S: void 0, A: ["root.items", ""] });
           const items = root.items;
           result = Array2.isArray(items) ? Schema2.Tuple(...items.map((v) => toEffectSchema(v, defs))) : Schema2.Array(toEffectSchema(items, defs));
         }
@@ -508,7 +518,7 @@ var toEffectSchema = (root, _defs) => {
   } else if ("$ref" in root) {
     const refSegments = root.$ref.split("/");
     const jsonSchema = defs[refSegments[refSegments.length - 1]];
-    invariant(jsonSchema, `missing definition for ${root.$ref}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 234, S: void 0, A: ["jsonSchema", "`missing definition for ${root.$ref}`"] });
+    invariant(jsonSchema, `missing definition for ${root.$ref}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 246, S: void 0, A: ["jsonSchema", "`missing definition for ${root.$ref}`"] });
     result = toEffectSchema(jsonSchema, defs).pipe(Schema2.annotations({
       identifier: refSegments[refSegments.length - 1]
     }));
@@ -518,7 +528,7 @@ var toEffectSchema = (root, _defs) => {
   return result;
 };
 var objectToEffectSchema = (root, defs) => {
-  invariant("type" in root && root.type === "object", `not an object: ${root}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 245, S: void 0, A: ["'type' in root && root.type === 'object'", "`not an object: ${root}`"] });
+  invariant("type" in root && root.type === "object", `not an object: ${root}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 257, S: void 0, A: ["'type' in root && root.type === 'object'", "`not an object: ${root}`"] });
   const echoRefinement = root[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];
   const isEchoObject = echoRefinement != null || "$id" in root && typeof root.$id === "string" && root.$id.startsWith("dxn:");
   let fields = {};
@@ -536,8 +546,8 @@ var objectToEffectSchema = (root, defs) => {
   }
   let schema;
   if (root.patternProperties) {
-    invariant(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 264, S: void 0, A: ["propertyList.length === 0", "'pattern properties mixed with regular properties are not supported'"] });
-    invariant(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 265, S: void 0, A: ["Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''", "'only one pattern property is supported'"] });
+    invariant(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 276, S: void 0, A: ["propertyList.length === 0", "'pattern properties mixed with regular properties are not supported'"] });
+    invariant(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 277, S: void 0, A: ["Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''", "'only one pattern property is supported'"] });
     schema = Schema2.Record({
       key: Schema2.String,
       value: toEffectSchema(root.patternProperties[""], defs)
@@ -569,8 +579,8 @@ var objectToEffectSchema = (root, defs) => {
 var anyToEffectSchema = (root) => {
   const echoRefinement = root[ECHO_ANNOTATIONS_NS_DEPRECATED_KEY];
   if (echoRefinement?.reference != null) {
-    const echoId = root.$id.startsWith("dxn:echo:") ? root.$id : void 0;
-    return createEchoReferenceSchema(echoId, echoRefinement.reference.typename, echoRefinement.reference.version);
+    const echoUri = root.$id.startsWith("echo:") || root.$id.startsWith("dxn:echo:") ? root.$id : void 0;
+    return createEchoReferenceSchema(echoUri, echoRefinement.reference.typename, echoRefinement.reference.version);
   }
   return Schema2.Any;
 };
@@ -582,9 +592,10 @@ var refToEffectSchema = (root) => {
   if (typeof reference !== "object") {
     throw new Error("Invalid reference field in ref schema");
   }
-  const targetSchemaDXN = DXN.parse(reference.schema.$ref);
-  invariant(targetSchemaDXN.kind === DXN.kind.TYPE, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 314, S: void 0, A: ["targetSchemaDXN.kind === DXN.kind.TYPE", ""] });
-  return createEchoReferenceSchema(targetSchemaDXN.toString(), targetSchemaDXN.kind === DXN.kind.TYPE ? targetSchemaDXN.parts[0] : void 0, reference.schemaVersion);
+  const ref = reference.schema.$ref;
+  const targetSchemaDXN = DXN.tryMake(ref);
+  invariant(targetSchemaDXN, `Expected a type DXN, got: ${ref}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 327, S: void 0, A: ["targetSchemaDXN", "`Expected a type DXN, got: ${ref}`"] });
+  return createEchoReferenceSchema(ref, DXN.getName(targetSchemaDXN), reference.schemaVersion);
 };
 var annotations_toJsonSchemaFields = (annotations2) => {
   const schemaFields = {};
@@ -599,8 +610,7 @@ var annotations_toJsonSchemaFields = (annotations2) => {
   }
   const echoIdentifier = annotations2[TypeIdentifierAnnotationId];
   if (echoIdentifier) {
-    schemaFields[ECHO_ANNOTATIONS_NS_KEY] ??= {};
-    schemaFields[ECHO_ANNOTATIONS_NS_KEY].schemaId = echoIdentifier;
+    schemaFields.$id = echoIdentifier;
   }
   for (const [key, annotationId] of Object.entries(CustomAnnotations)) {
     const value = annotations2[annotationId];
@@ -611,13 +621,14 @@ var annotations_toJsonSchemaFields = (annotations2) => {
   return schemaFields;
 };
 var decodeTypeIdentifierAnnotation = (schema) => {
-  if (schema.$id && schema.$id.startsWith("dxn:echo:")) {
+  if (schema.$id && (schema.$id.startsWith("echo:") || schema.$id.startsWith("dxn:echo:"))) {
     return schema.$id;
-  } else if (schema.$id && schema.$id.startsWith("dxn:type:") && schema?.echo?.type?.schemaId) {
-    const id = schema?.echo?.type?.schemaId;
-    if (ObjectId.isValid(id)) {
-      return DXN.fromLocalObjectId(id).toString();
-    }
+  }
+  const legacySchemaId = schema.echo?.type?.schemaId;
+  if (legacySchemaId) {
+    return EntityId.isValid(legacySchemaId) ? EID.make({
+      entityId: legacySchemaId
+    }) : legacySchemaId;
   }
   return void 0;
 };
@@ -632,8 +643,8 @@ var decodeTypeAnnotation = (schema) => {
     if (annotation.kind === EntityKind.Relation) {
       const source = schema.relationSource?.$ref ?? raise(new Error("Relation source not set"));
       const target = schema.relationTarget?.$ref ?? raise(new Error("Relation target not set"));
-      annotation.sourceSchema = DXN.parse(source).toString();
-      annotation.targetSchema = DXN.parse(target).toString();
+      annotation.sourceSchema = DXN.tryMake(source) ?? raise(new Error(`Invalid relation source: ${source}`));
+      annotation.targetSchema = DXN.tryMake(target) ?? raise(new Error(`Invalid relation target: ${target}`));
     }
     return annotation;
   }
@@ -662,7 +673,9 @@ var jsonSchemaFieldsToAnnotations = (schema) => {
   if (typeAnnotation) {
     annotations2[TypeAnnotationId] = typeAnnotation;
     annotations2[SchemaAST2.JSONSchemaAnnotationId] = makeTypeJsonSchemaAnnotation({
-      identifier: typeIdentifier,
+      // $id is the typename DXN — the schema's type identity. The storage EID (if any)
+      // is preserved separately on TypeIdentifierAnnotation / echo.schemaId.
+      identifier: DXN.make(typeAnnotation.typename, typeAnnotation.version),
       kind: typeAnnotation.kind,
       typename: typeAnnotation.typename,
       version: typeAnnotation.version,
@@ -731,4 +744,4 @@ export {
   toJsonSchema,
   toEffectSchema
 };
-//# sourceMappingURL=chunk-MLS7U7AT.mjs.map
+//# sourceMappingURL=chunk-7PRCIDHH.mjs.map