@dxos/echo 0.8.4-main.c85a9c8dae → 0.8.4-main.d05673bc65

package/src/Ref.ts

@@ -2,12 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import type * as Entity from './Entity';
-import * as internal from './internal';
+import * as refInternal from './internal/Ref';
 import type * as JsonSchema from './JsonSchema';
 import type * as Obj from './Obj';
 
@@ -29,8 +31,8 @@ import type * as Obj from './Obj';
  * database.makeRef(dxn); // Create a ref from a DXN.
  * ```
  */
-export type Ref<T> = internal.Ref<T>;
-export type Unknown = internal.Ref<Obj.Unknown>;
+export type Ref<T> = refInternal.Ref<T>;
+export type Unknown = refInternal.Ref<Obj.Unknown>;
 
 /**
  * Factory function to create a Ref schema for the given target schema.
@@ -43,9 +45,9 @@ export type Unknown = internal.Ref<Obj.Unknown>;
  * }).pipe(Type.object({ typename: 'Task', version: '0.1.0' }));
  * ```
  */
-export const Ref: <S extends Schema.Schema.Any>(schema: S) => RefSchema<Schema.Schema.Type<S>> = internal.Ref;
+export const Ref: <S extends Schema.Schema.Any>(schema: S) => RefSchema<Schema.Schema.Type<S>> = refInternal.Ref;
 
-export const Array = internal.RefArray;
+export const Array = refInternal.RefArray;
 
 /**
  * TypeScript type for a Ref schema.
@@ -64,31 +66,31 @@ export const Array = internal.RefArray;
 // TODO(dmaretskyi): Investigate if we can remove this type.
 //                   Post DX-836 it will become just `Schema.Schema<Ref.Ref<T>>`.
 //                   NOTE: This could be Type.Ref<T> instead, but since it going to be removed, it's better to keep it here, self-contained.
-export interface RefSchema<T extends Entity.Unknown> extends internal.RefSchema<T> {}
+export interface RefSchema<T extends Entity.Unknown> extends refInternal.RefSchema<T> {}
 
 /**
  * Extract reference target.
  */
-export type Target<R extends Unknown> = R extends internal.Ref<infer T> ? T : never;
+export type Target<R extends Unknown> = R extends refInternal.Ref<infer T> ? T : never;
 
 /**
  * Reference resolver.
  */
-export type Resolver = internal.RefResolver;
+export type Resolver = refInternal.RefResolver;
 
-export const isRef: (value: unknown) => value is Unknown = internal.Ref.isRef;
+export const isRef: (value: unknown) => value is Unknown = refInternal.Ref.isRef;
 
-export const make = internal.Ref.make;
+export const make = refInternal.Ref.make;
 
 // TODO(dmaretskyi): Consider just allowing `make` to accept DXN.
-export const fromDXN = internal.Ref.fromDXN;
+export const fromDXN = refInternal.Ref.fromDXN;
 
 // TODO(wittjosiah): Factor out?
 export const isRefType = (ast: SchemaAST.AST): boolean => {
   return SchemaAST.getAnnotation<JsonSchema.JsonSchema>(ast, SchemaAST.JSONSchemaAnnotationId).pipe(
     Option.flatMap((jsonSchema) => ('$id' in jsonSchema ? Option.some(jsonSchema) : Option.none())),
     Option.flatMap((jsonSchema) => {
-      const { typename } = internal.getSchemaReference(jsonSchema) ?? {};
+      const { typename } = refInternal.getSchemaReference(jsonSchema) ?? {};
       return typename ? Option.some(true) : Option.some(false);
     }),
     Option.getOrElse(() => false),

package/src/Relation.test.ts

@@ -65,8 +65,8 @@ describe('Relation', () => {
       expect(Relation.getDXN(snapshot)).toBeDefined();
 
       // getTypename - works with both.
-      expect(Relation.getTypename(rel)).toBe('example.com/type/HasManager');
-      expect(Relation.getTypename(snapshot)).toBe('example.com/type/HasManager');
+      expect(Relation.getTypename(rel)).toBe('com.example.type.has-manager');
+      expect(Relation.getTypename(snapshot)).toBe('com.example.type.has-manager');
 
       // getMeta - works with both.
       expect(Relation.getMeta(rel)).toBeDefined();

package/src/Relation.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Schema from 'effect/Schema';
 
 import { raise } from '@dxos/debug';
@@ -13,6 +15,7 @@ import { assumeType } from '@dxos/util';
 
 import type * as Database from './Database';
 import * as Entity from './Entity';
+import * as entityInternal from './internal/Entity';
 import * as internal from './internal';
 import * as Obj from './Obj';
 import type * as Type from './Type';
@@ -64,7 +67,7 @@ export const Unknown: Type.Relation<Unknown, Obj.Any, Obj.Any> = Schema.Struct({
   // NOTE: The EchoRelationSchema annotation is required for Ref.Ref(Relation.Unknown) to work.
   //   The typename/version/source/target only satisfy ECHO schema machinery for reference targets.
   internal.EchoRelationSchema({
-    typename: 'dxos.org/schema/AnyRelation',
+    typename: 'org.dxos.schema.any-relation',
     version: '0.0.0',
     source: Obj.Unknown,
     target: Obj.Unknown,
@@ -107,10 +110,10 @@ export interface BaseRelationJson {
 export type Snapshot<T extends Unknown = Unknown> = Omit<T, Entity.KindId> &
   BaseRelationSnapshot<Obj.Unknown, Obj.Unknown>;
 
-export const Source: unique symbol = internal.RelationSourceId as any;
+export const Source: unique symbol = entityInternal.RelationSourceId as any;
 export type Source = typeof Source;
 
-export const Target: unique symbol = internal.RelationTargetId as any;
+export const Target: unique symbol = entityInternal.RelationTargetId as any;
 export type Target = typeof Target;
 
 /**

package/src/SchemaRegistry.ts

@@ -47,7 +47,7 @@ export type Query = {
    * @default false
    *
    * The system schema include but are not limited to:
-   *  - dxos.org/type/Schema
+   *  - org.dxos.type.schema
    */
   includeSystem?: boolean;
 };

package/src/Tag.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Schema from 'effect/Schema';
 
 import * as internal from './internal';
@@ -13,7 +15,7 @@ export const Tag = Schema.Struct({
   hue: Schema.optional(Schema.String), // TODO(burdon): Color name?
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/Tag',
+    typename: 'org.dxos.type.tag',
     version: '0.1.0',
   }),
   internal.LabelAnnotation.set(['label']),

package/src/Type.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import type * as Schema from 'effect/Schema';
 
 import { type EncodedReference } from '@dxos/echo-protocol';
@@ -9,7 +11,8 @@ import { invariant } from '@dxos/invariant';
 import { type DXN } from '@dxos/keys';
 import { type ToMutable } from '@dxos/util';
 
-import type * as EntityModule from './Entity';
+import type * as Entity from './Entity';
+import * as typeInternal from './internal/Type';
 import * as internal from './internal';
 import type * as ObjModule from './Obj';
 import type * as RelationModule from './Relation';
@@ -17,12 +20,12 @@ import type * as RelationModule from './Relation';
 /**
  * Dynamic type that can be constructed, mutated, and persisted in the ECHO database.
  */
-export const RuntimeType = internal.EchoSchema;
+export const RuntimeType = typeInternal.EchoSchema;
 
 /**
  * Dynamic type that can be constructed, mutated, and persisted in the ECHO database.
  */
-export type RuntimeType = internal.EchoSchema;
+export type RuntimeType = typeInternal.EchoSchema;
 
 //
 // Internal types (not exported)
@@ -61,7 +64,7 @@ export interface Obj<T, Fields extends Schema.Struct.Fields = Schema.Struct.Fiel
     EchoSchemaKind<internal.EntityKind.Object>,
     Schema.AnnotableClass<
       Obj<T, Fields>,
-      EntityModule.OfKind<typeof EntityModule.Kind.Object> & T,
+      Entity.OfKind<typeof Entity.Kind.Object> & T,
       Schema.Simplify<ObjModule.BaseObjJson & ToMutable<T>>,
       never
     > {
@@ -97,7 +100,7 @@ export type AnyObj = ObjectSchemaBase;
  * ```ts
  * const Person = Schema.Struct({
  *   name: Schema.String,
- * }).pipe(Type.object({ typename: 'example.com/type/Person', version: '0.1.0' }));
+ * }).pipe(Type.object({ typename: 'com.example.type.person', version: '0.1.0' }));
  * ```
  */
 export const object: {
@@ -108,7 +111,7 @@ export const object: {
 // PersistentType (Schema stored in database)
 //
 
-export const PersistentType: Obj<internal.PersistentSchema> = internal.PersistentSchema as any;
+export const PersistentType: Obj<typeInternal.PersistentSchema> = typeInternal.PersistentSchema as any;
 
 export interface PersistentType extends Schema.Schema.Type<typeof PersistentType> {}
 
@@ -124,7 +127,7 @@ export interface Relation<T, Source, Target, Fields extends Schema.Struct.Fields
     EchoSchemaKind<internal.EntityKind.Relation>,
     Schema.AnnotableClass<
       Relation<T, Source, Target, Fields>,
-      EntityModule.OfKind<typeof EntityModule.Kind.Relation> & RelationModule.Endpoints<Source, Target> & T,
+      Entity.OfKind<typeof Entity.Kind.Relation> & RelationModule.Endpoints<Source, Target> & T,
       Schema.Simplify<RelationModule.BaseRelationJson & ToMutable<T>>,
       never
     > {
@@ -161,7 +164,7 @@ export type AnyRelation = RelationSchemaBase;
  * const WorksFor = Schema.Struct({
  *   role: Schema.String,
  * }).pipe(Type.relation({
- *   typename: 'example.com/type/WorksFor',
+ *   typename: 'com.example.type.works-for',
  *   version: '0.1.0',
  *   source: Person,
  *   target: Company,
@@ -211,7 +214,7 @@ export type AnyRef = Schema.Schema<internal.Ref<any>, EncodedReference>;
 /**
  * Gets the full DXN of the schema.
  * Will include the version if it's a `type` DXN.
- * @example "dxn:example.com/type/Person:0.1.0"
+ * @example "dxn:com.example.type.person:0.1.0"
  * @example "dxn:echo:SSSSSSSSSS:XXXXXXXXXXXXX"
  */
 export const getDXN = (schema: AnyEntity): DXN | undefined => {
@@ -220,7 +223,7 @@ export const getDXN = (schema: AnyEntity): DXN | undefined => {
 
 /**
  * @param schema - Schema to get the typename from.
- * @returns The typename of the schema. Example: `example.com/type/Person`.
+ * @returns The typename of the schema. Example: `com.example.type.person`.
  */
 export const getTypename = (schema: AnyEntity): string => {
   const typename = internal.getSchemaTypename(schema);
@@ -241,7 +244,7 @@ export const getVersion = (schema: AnyEntity): string => {
 /**
  * @returns True if the schema is mutable.
  */
-export const isMutable = internal.isMutable;
+export const isMutable = typeInternal.isMutable;
 
 /**
  * ECHO type metadata.

package/src/View.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Schema from 'effect/Schema';
 
 import { QueryAST } from '@dxos/echo-protocol';
@@ -73,8 +75,8 @@ const ViewSchema = Schema.Struct({
   projection: Projection,
 }).pipe(
   Type.object({
-    typename: 'dxos.org/type/View',
-    version: '0.5.0',
+    typename: 'org.dxos.type.view',
+    version: '0.1.0',
   }),
   internal.SystemTypeAnnotation.set(true),
 );

package/src/internal/{annotations → Annotation}/annotations.test.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
-import { EchoObjectSchema } from '../entities';
+import { EchoObjectSchema } from '../Entity';
 
 import { LabelAnnotation, TypenameSchema, VersionSchema, getLabelWithSchema } from './annotations';
 
@@ -20,7 +20,7 @@ type TestObject = Schema.Schema.Type<typeof TestObject>;
 
 const TestEchoSchema = TestObject.pipe(
   EchoObjectSchema({
-    typename: 'dxos.org/type/Test',
+    typename: 'org.dxos.type.test',
     version: '0.1.0',
   }),
 );
@@ -30,10 +30,10 @@ type TestEchoSchema = Schema.Schema.Type<typeof TestEchoSchema>;
 describe('annotations', () => {
   describe('Typename', () => {
     test('should validate typename', ({ expect }) => {
-      // Valid.
-      expect(TypenameSchema.make('dxos.org/type/foo')).to.exist;
-      expect(TypenameSchema.make('dxos.org/type/foo-bar')).to.exist;
-      expect(TypenameSchema.make('dxos.org/type/foo_bar')).to.exist;
+      // Valid (reverse-DNS format).
+      expect(TypenameSchema.make('org.dxos.type.foo')).to.exist;
+      expect(TypenameSchema.make('org.dxos.type.foo-bar')).to.exist;
+      expect(TypenameSchema.make('org.dxos.type.foobar')).to.exist;
 
       // Invalid.
       expect(() => TypenameSchema.make('dxn:dxos.org')).to.throw();

package/src/internal/{annotations → Annotation}/annotations.ts

@@ -13,7 +13,8 @@ import { assertArgument, invariant } from '@dxos/invariant';
 import { DXN } from '@dxos/keys';
 import { type Primitive } from '@dxos/util';
 
-import { type AnyProperties, EntityKind, TypeId, getSchema } from '../types';
+import { type Mutable } from '../common/proxy';
+import { type AnyProperties, EntityKind, TypeId, getSchema } from '../common/types';
 
 import { type AnnotationHelper, createAnnotationHelper } from './util';
 
@@ -87,14 +88,14 @@ export const getTypeDXNFromSpecifier = (input: Schema.Schema.All | string): DXN
 
 /**
  * Fully qualified globally unique typename.
- * Example: `dxos.org/type/Message`
+ * Example: `org.dxos.type.message`
  */
 // TODO(burdon): Reconcile with short DXN format.
-// TODO(burdon): Change "/type" => "/schema" throughout.
-export const TypenameSchema = Schema.String.pipe(Schema.pattern(/^[a-zA-Z]\w+\.[a-zA-Z]\w{1,}\/[\w/_-]+$/)).annotations(
+// TODO(burdon): Change "type" => "schema" throughout.
+export const TypenameSchema = Schema.String.pipe(Schema.pattern(/^[a-z][a-z0-9]*(\.[a-z][a-z0-9-]*){2,}$/)).annotations(
   {
-    description: 'Fully qualified globally unique typename',
-    example: 'dxos.org/type/Message',
+    description: 'Fully qualified globally unique typename in lowercase reverse-DNS form.',
+    example: 'org.dxos.type.message',
   },
 );
 
@@ -175,7 +176,7 @@ export const getSchemaVersion = (schema: Schema.Schema.All): string | undefined
 /**
  * Gets the typename of the object without the version.
  * Returns only the name portion, not the DXN.
- * @example "example.org/type/Contact"
+ * @example "org.example.type.contact"
  *
  * @internal (use Obj.getTypename)
  */
@@ -207,7 +208,7 @@ export const setTypename = (obj: any, typename: DXN): void => {
 /**
  * @returns Object type as {@link DXN}.
  * @returns undefined if the object doesn't have a type.
- * @example `dxn:example.com/type/Person:1.0.0`
+ * @example `dxn:com.example.type.person:1.0.0`
  *
  * @internal (use Obj.getTypeDXN)
  */
@@ -467,9 +468,9 @@ interface MakeAnnoationsProps<T> {
 // TODO(wittjosiah): Comment.
 export const makeUserAnnotation = <T>(props: MakeAnnoationsProps<T>): AnnotationHelper<T> => {
   assertArgument(
-    /[a-zA-Z0-9]+\.[a-zA-Z.]+\/[a-zA-Z/]+/.test(props.id),
+    /^[a-z][a-z0-9]*(\.[a-z][a-z0-9-]*){2,}$/.test(props.id),
     'id',
-    'Annotation id must be in the FQN format (dxos.org/annotation/Example).',
+    'Annotation id must be in the FQN format (org.dxos.annotation.example).',
   );
 
   const getFromAst = (ast: SchemaAST.AST) =>
@@ -521,6 +522,50 @@ export interface IconAnnotation extends Schema.Schema.Type<typeof IconAnnotation
  * Icon to render in the UI.
  */
 export const IconAnnotation = makeUserAnnotation<IconAnnotation>({
-  id: 'dxos.org/annotation/Icon',
+  id: 'org.dxos.annotation.icon',
   schema: IconAnnotationSchema,
 });
+
+/**
+ * Get the label of an entity.
+ * Accepts both reactive entities and snapshots.
+ */
+export const getLabel = (entity: AnyProperties): string | undefined => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    return getLabelWithSchema(schema, entity);
+  }
+};
+
+/**
+ * Set the label of an entity.
+ * Must be called within an Obj.change or Relation.change callback.
+ */
+export const setLabel = (entity: Mutable<AnyProperties>, label: string) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    setLabelWithSchema(schema, entity, label);
+  }
+};
+
+/**
+ * Get the description of an entity.
+ * Accepts both reactive entities and snapshots.
+ */
+export const getDescription = (entity: AnyProperties): string | undefined => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    return getDescriptionWithSchema(schema, entity);
+  }
+};
+
+/**
+ * Set the description of an entity.
+ * Must be called within an Obj.change or Relation.change callback.
+ */
+export const setDescription = (entity: Mutable<AnyProperties>, description: string) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    setDescriptionWithSchema(schema, entity, description);
+  }
+};

package/src/internal/{annotations → Annotation}/index.ts

@@ -3,4 +3,5 @@
 //
 
 export * from './annotations';
+export * from './sorting';
 export * from './util';

package/src/internal/{api → Annotation}/sorting.ts

@@ -2,10 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { getTypename } from '../annotations';
-import type { AnyEntity } from '../types';
+import type { AnyEntity } from '../common/types';
 
-import { getLabel } from './annotations';
+import { getLabel, getTypename } from './annotations';
 
 /**
  * String comparison helper for sorting.

package/src/internal/{annotations → Annotation}/util.ts

@@ -9,7 +9,7 @@ import * as SchemaAST from 'effect/SchemaAST';
 import { assertArgument } from '@dxos/invariant';
 import { DXN } from '@dxos/keys';
 
-import { EntityKind } from '../types';
+import { EntityKind } from '../common/types';
 
 export interface AnnotationHelper<T> {
   /**

package/src/internal/{api/entity.ts → Entity/api.ts}

@@ -6,8 +6,10 @@ import { invariant } from '@dxos/invariant';
 import { type DXN } from '@dxos/keys';
 import { assumeType } from '@dxos/util';
 
-import { type InternalObjectProps, ObjectDatabaseId, getObjectDXN } from '../entities';
-import type { AnyEntity } from '../types';
+import type { AnyEntity } from '../common/types';
+
+import { type InternalObjectProps, ObjectDatabaseId } from './model';
+import { getObjectDXN } from './util';
 
 /**
  * Get the DXN of an entity.

package/src/internal/{entities → Entity}/entity.ts

@@ -8,8 +8,8 @@ import type * as Types from 'effect/Types';
 
 import { type ToMutable } from '@dxos/util';
 
-import { type TypeMeta } from '../annotations';
-import { type AnyEntity, type EntityKind, SchemaKindId } from '../types';
+import { type TypeMeta } from '../Annotation';
+import { type AnyEntity, type EntityKind, SchemaKindId } from '../common/types';
 
 // TODO(burdon): Define Schema type for `typename` and use consistently for all DXN-like properties.
 

package/src/internal/{entities → Entity}/index.ts

@@ -2,8 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './api';
 export * from './entity';
 export * from './model'; // TODO(burdon): Rename.
 export * from './object';
 export * from './relation';
 export * from './util';
+export * from './version';

package/src/internal/{entities → Entity}/model.ts

@@ -14,58 +14,29 @@ import {
   type ATTR_META,
   type ATTR_PARENT,
   type ATTR_TYPE,
+  ATTR_DELETED,
+  ATTR_RELATION_SOURCE,
+  ATTR_RELATION_TARGET,
+  ATTR_SELF_DXN,
   EntityKind,
   KindId,
   type MetaId,
+  ObjectDatabaseId,
+  ObjectDeletedId,
   type ObjectMeta,
+  ObjectVersionId,
   type ParentId,
-  type SchemaId,
-  TypeId,
-  type Version,
-} from '../types';
-
-import {
-  type ATTR_RELATION_SOURCE,
-  type ATTR_RELATION_TARGET,
   RelationSourceDXNId,
   RelationSourceId,
   RelationTargetDXNId,
   RelationTargetId,
-} from './relation';
-
-//
-// Defines the internal model of the echo object.
-//
-
-/**
- * Property name for self DXN when object is serialized to JSON.
- */
-export const ATTR_SELF_DXN = '@dxn';
-
-/**
- * DXN to the object itself.
- */
-export const SelfDXNId = Symbol.for('@dxos/echo/DXN');
-
-/**
- * Property name for deleted when object is serialized to JSON.
- */
-export const ATTR_DELETED = '@deleted';
-
-/**
- * Deletion marker.
- */
-export const ObjectDeletedId = Symbol.for('@dxos/echo/Deleted');
-
-/**
- * Object version accessor symbol.
- */
-export const ObjectVersionId: unique symbol = Symbol.for('@dxos/echo/Version');
+  type SchemaId,
+  SelfDXNId,
+  TypeId,
+  type Version,
+} from '../common/types';
 
-/**
- * Object database accessor symbol.
- */
-export const ObjectDatabaseId = Symbol.for('@dxos/echo/Database');
+export { ATTR_DELETED, ATTR_SELF_DXN, ObjectDatabaseId, ObjectDeletedId, ObjectVersionId, SelfDXNId };
 
 /**
  * Internal runtime representation of an object.

package/src/internal/{entities → Entity}/object.ts

@@ -7,8 +7,8 @@ import * as SchemaAST from 'effect/SchemaAST';
 
 import { invariant } from '@dxos/invariant';
 
-import { type TypeAnnotation, TypeAnnotationId, type TypeMeta, makeTypeJsonSchemaAnnotation } from '../annotations';
-import { EntityKind } from '../types';
+import { type TypeAnnotation, TypeAnnotationId, type TypeMeta, makeTypeJsonSchemaAnnotation } from '../Annotation';
+import { EntityKind } from '../common/types';
 
 import { type EchoTypeSchema, makeEchoTypeSchema } from './entity';
 

package/src/internal/{entities → Entity}/relation.ts

@@ -17,45 +17,28 @@ import {
   getSchemaTypename,
   getTypeIdentifierAnnotation,
   makeTypeJsonSchemaAnnotation,
-} from '../annotations';
-import { EntityKind } from '../types';
+} from '../Annotation';
+import {
+  ATTR_RELATION_SOURCE,
+  ATTR_RELATION_TARGET,
+  EntityKind,
+  RelationSourceDXNId,
+  RelationSourceId,
+  RelationTargetDXNId,
+  RelationTargetId,
+} from '../common/types';
+
+export {
+  ATTR_RELATION_SOURCE,
+  ATTR_RELATION_TARGET,
+  RelationSourceDXNId,
+  RelationSourceId,
+  RelationTargetDXNId,
+  RelationTargetId,
+};
 
 import { type EchoTypeSchema, makeEchoTypeSchema } from './entity';
 
-/**
- * Property name for relation source when object is serialized to JSON.
- */
-export const ATTR_RELATION_SOURCE = '@relationSource';
-
-/**
- * Used to access relation source ref on live ECHO objects.
- * Reading this symbol must return `Live<EchoObjectSchema<any>>` or a DXN.
- */
-export const RelationSourceId: unique symbol = Symbol.for('@dxos/echo/RelationSource');
-
-/**
- * Used to access relation source ref on live ECHO objects.
- * Reading this symbol must return `Live<EchoObjectSchema<any>>` or a DXN.
- */
-export const RelationSourceDXNId: unique symbol = Symbol.for('@dxos/echo/RelationSourceDXN');
-
-/**
- * Property name for relation target when object is serialized to JSON.
- */
-export const ATTR_RELATION_TARGET = '@relationTarget';
-
-/**
- * Used to access relation target ref on live ECHO objects.
- * Reading this symbol must return `Live<EchoObjectSchema<any>>` or a DXN.
- */
-export const RelationTargetId: unique symbol = Symbol.for('@dxos/echo/RelationTarget');
-
-/**
- * Used to access relation target ref on live ECHO objects.
- * Reading this symbol must return `Live<EchoObjectSchema<any>>` or a DXN.
- */
-export const RelationTargetDXNId: unique symbol = Symbol.for('@dxos/echo/RelationTargetDXN');
-
 /**
  * Source and target props on relations.
  */

package/src/internal/{api → Entity}/version.ts

@@ -4,8 +4,9 @@
 
 import { assertArgument } from '@dxos/invariant';
 
-import { ObjectVersionId } from '../entities';
-import { type AnyEntity, VersionTypeId } from '../types';
+import { type AnyEntity, VersionTypeId } from '../common/types';
+
+import { ObjectVersionId } from './model';
 
 /**
  * Represent entity version.

package/src/internal/{formats → Format}/date.test.ts

@@ -7,7 +7,7 @@ import { describe, expect, test } from 'vitest';
 
 import { log } from '@dxos/log';
 
-import { toJsonSchema } from '../json-schema';
+import { toJsonSchema } from '../JsonSchema';
 
 import {
   DateOnly,