@dxos/echo 0.8.4-main.ef1bc66f44 → 0.8.4-main.effb148878

package/dist/types/src/internal/schema/persistent-schema.d.ts

@@ -1,20 +0,0 @@
-import * as Schema from 'effect/Schema';
-import { EchoObjectSchema } from '../entities';
-import { JsonSchemaType } from '../json-schema';
-/**
- * Persistent representation of a schema.
- */
-export declare const PersistentSchema: EchoObjectSchema<Schema.Struct<{
-    name: Schema.optional<typeof Schema.String>;
-    typename: Schema.refine<string, typeof Schema.String>;
-    version: Schema.refine<string, typeof Schema.String>;
-    jsonSchema: Schema.Schema<JsonSchemaType, JsonSchemaType, never>;
-}>, Readonly<{
-    name: Schema.optional<typeof Schema.String>;
-    typename: Schema.refine<string, typeof Schema.String>;
-    version: Schema.refine<string, typeof Schema.String>;
-    jsonSchema: Schema.Schema<JsonSchemaType, JsonSchemaType, never>;
-}>>;
-export interface PersistentSchema extends Schema.Schema.Type<typeof PersistentSchema> {
-}
-//# sourceMappingURL=persistent-schema.d.ts.map

package/dist/types/src/internal/schema/persistent-schema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"persistent-schema.d.ts","sourceRoot":"","sources":["../../../../../src/internal/schema/persistent-schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD;;GAEG;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;GAW5B,CAAC;AAEF,MAAM,WAAW,gBAAiB,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG"}

package/dist/types/src/internal/types/base.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEzD;;;;GAIG;AAGH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhD;;GAEG;AAEH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;CACvB;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,aAAa,IAAI,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAE/D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAGvF,KAAK,QAAQ,GAAG;IAAE,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAA;CAAE,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EAC5D,QAAQ,CAAC,KACR,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAErF,CAAC"}

package/dist/types/src/internal/types/entity.d.ts

@@ -1,37 +0,0 @@
-import * as Schema from 'effect/Schema';
-/**
- * String key used to identify the kind of an entity instance (object or relation).
- */
-export declare const KindId: "~@dxos/echo/Kind";
-export type KindId = typeof KindId;
-/**
- * String key used to identify the kind of a schema (object schema or relation schema).
- * Parallels KindId which identifies instance kinds.
- */
-export declare const SchemaKindId: "~@dxos/echo/SchemaKind";
-export type SchemaKindId = typeof SchemaKindId;
-/**
- * String key used to brand snapshot types.
- * Snapshots have SnapshotKindId instead of KindId, making them
- * distinguishable from reactive objects at the type level.
- */
-export declare const SnapshotKindId: "~@dxos/echo/SnapshotKind";
-export type SnapshotKindId = typeof SnapshotKindId;
-/**
- * Kinds of entities stored in ECHO: objects and relations.
- */
-export declare enum EntityKind {
-    Object = "object",
-    Relation = "relation"
-}
-export declare const EntityKindSchema: Schema.Enums<typeof EntityKind>;
-/**
- * Typename for generic object references (Type.Obj / Type.Ref(Type.Obj)).
- * Used when referencing any object without a specific schema.
- */
-export declare const ANY_OBJECT_TYPENAME = "dxos.org/schema/AnyObject";
-/**
- * Version for generic object references.
- */
-export declare const ANY_OBJECT_VERSION = "0.0.0";
-//# sourceMappingURL=entity.d.ts.map

package/dist/types/src/internal/types/entity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/entity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AASxC;;GAEG;AACH,eAAO,MAAM,MAAM,EAAG,kBAA2B,CAAC;AAClD,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAG,wBAAiC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAG,0BAAmC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC;AAEnD;;GAEG;AACH,oBAAY,UAAU;IACpB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,gBAAgB,iCAA2B,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,8BAA8B,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAAU,CAAC"}

package/dist/types/src/internal/types/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC"}

package/dist/types/src/internal/types/meta.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/meta.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,MAAM,eAAgC,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;;IAG3B;;;;OAIG;;EAIH,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAmBrE,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,KAAG,UAA8B,CAAC;AACvF,eAAO,MAAM,gBAAgB,GAAI,GAAG,UAAU,EAAE,GAAG,UAAU,YAA2C,CAAC;AAGzG,eAAO,MAAM,kBAAkB,EAAE,UAAU,CAAC,aAAa,CACoB,CAAC"}

package/dist/types/src/internal/types/typename.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"typename.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/typename.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,MAAM,eAAgC,CAAC;AAEpD;;GAEG;AACH,eAAO,MAAM,QAAQ,eAAkC,CAAC;AAExD;;GAEG;AACH,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC;;GAEG;AACH,eAAO,MAAM,QAAQ,eAAkC,CAAC"}

package/dist/types/src/internal/types/version.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/version.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,MAA+C,CAAC;AAEnF,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B"}

package/src/internal/annotations/annotations.test.ts

@@ -1,96 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Schema from 'effect/Schema';
-import { describe, test } from 'vitest';
-
-import { EchoObjectSchema } from '../entities';
-
-import { LabelAnnotation, TypenameSchema, VersionSchema, getLabelWithSchema } from './annotations';
-
-// TODO(dmaretskyi): Use one of the testing schemas.
-const TestObject = Schema.Struct({
-  name: Schema.optional(Schema.String),
-  fallbackName: Schema.optional(Schema.String),
-  other: Schema.String,
-}).pipe(LabelAnnotation.set(['name', 'fallbackName']));
-
-type TestObject = Schema.Schema.Type<typeof TestObject>;
-
-const TestEchoSchema = TestObject.pipe(
-  EchoObjectSchema({
-    typename: 'dxos.org/type/Test',
-    version: '0.1.0',
-  }),
-);
-
-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;
-
-      // Invalid.
-      expect(() => TypenameSchema.make('dxn:dxos.org')).to.throw();
-      expect(() => TypenameSchema.make('2dxos.org')).to.throw();
-      expect(() => TypenameSchema.make('dxos org')).to.throw();
-    });
-
-    test('should validate version', ({ expect }) => {
-      // Valid.
-      expect(VersionSchema.make('0.1.0')).to.exist;
-
-      // Invalid.
-      expect(() => VersionSchema.make('0.1.x')).to.throw();
-      expect(() => VersionSchema.make('0.1.0-alpha')).to.throw();
-    });
-  });
-
-  describe('getLabelWithSchema', () => {
-    test('should return first available label value', ({ expect }) => {
-      const obj: TestObject = {
-        name: 'Primary Name',
-        fallbackName: 'Fallback Name',
-        other: 'Other',
-      };
-
-      expect(getLabelWithSchema(TestObject, obj)).toEqual('Primary Name');
-    });
-
-    test('should fallback to second path if first is undefined', ({ expect }) => {
-      const obj: TestObject = {
-        name: undefined,
-        fallbackName: 'Fallback Name',
-        other: 'Other',
-      };
-
-      expect(getLabelWithSchema(TestObject, obj)).toEqual('Fallback Name');
-    });
-
-    test('should return undefined if no label paths resolve', ({ expect }) => {
-      const obj: TestObject = {
-        name: undefined,
-        fallbackName: undefined,
-        other: 'Other',
-      };
-
-      expect(getLabelWithSchema(TestObject, obj)).toBeUndefined();
-    });
-
-    test('should return label from echo object', ({ expect }) => {
-      const obj: TestEchoSchema = {
-        id: 'test',
-        name: 'Primary Name',
-        fallbackName: 'Fallback Name',
-        other: 'Other',
-      };
-
-      expect(getLabelWithSchema(TestEchoSchema, obj)).toEqual('Primary Name');
-    });
-  });
-});

package/src/internal/api/annotations.ts

@@ -1,60 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-/**
- * Common annotation helpers shared by Obj and Relation modules.
- */
-
-import {
-  getDescriptionWithSchema,
-  getLabelWithSchema,
-  setDescriptionWithSchema,
-  setLabelWithSchema,
-} from '../annotations';
-import { type Mutable } from '../proxy';
-import { type AnyProperties, getSchema as getSchema$ } from '../types';
-
-/**
- * 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/entities/entity.ts

@@ -1,126 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import * as Schema from 'effect/Schema';
-import type * as SchemaAST from 'effect/SchemaAST';
-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';
-
-// TODO(burdon): Define Schema type for `typename` and use consistently for all DXN-like properties.
-
-// type RequiredKeys<T> = { [K in keyof T]-?: {} extends Pick<T, K> ? never : K }[keyof T];
-export type EchoTypeSchemaProps<T, ExtraFields = {}> = Types.Simplify<AnyEntity & ToMutable<T> & ExtraFields>;
-
-// TODO(burdon): Rename EchoEntitySchema.
-export interface EchoTypeSchema<
-  Self extends Schema.Schema.Any,
-  ExtraFields = {},
-  K extends EntityKind = EntityKind,
-  Fields extends Schema.Struct.Fields = Schema.Struct.Fields,
-> extends TypeMeta,
-    Schema.AnnotableClass<
-      EchoTypeSchema<Self, ExtraFields, K, Fields>,
-      EchoTypeSchemaProps<Schema.Schema.Type<Self>, ExtraFields>,
-      EchoTypeSchemaProps<Schema.Schema.Encoded<Self>, ExtraFields>,
-      Schema.Schema.Context<Self>
-    > {
-  /**
-   * Schema kind key that marks this as an ECHO schema and indicates its kind.
-   * Makes EchoTypeSchema satisfy the Type.Obj.Any or Type.Relation.Any type.
-   */
-  readonly [SchemaKindId]: K;
-
-  /**
-   * The fields defined in the original struct schema.
-   * Allows accessing field definitions for introspection.
-   */
-  readonly fields: Fields;
-
-  instanceOf(value: unknown): boolean;
-}
-
-// type MakeProps =
-//   | boolean
-//   | {
-//       readonly disableValidation?: boolean;
-//     };
-
-// NOTE: Utils copied from Effect `Schema.ts`.
-// const _ownKeys = (o: object): Array<PropertyKey> =>
-//   (Object.keys(o) as Array<PropertyKey>).concat(Object.getOwnPropertySymbols(o));
-
-// const _lazilyMergeDefaults = (
-//   fields: Schema.Struct.Fields,
-//   out: Record<PropertyKey, unknown>,
-// ): { [x: string | symbol]: unknown } => {
-//   const ownKeys = _ownKeys(fields);
-//   for (const key of ownKeys) {
-//     const field = fields[key];
-//     if (out[key] === undefined && Schema.isPropertySignature(field)) {
-//       const ast = field.ast;
-//       const defaultValue = ast._tag === 'PropertySignatureDeclaration' ? ast.defaultValue : ast.to.defaultValue;
-//       if (defaultValue !== undefined) {
-//         out[key] = defaultValue();
-//       }
-//     }
-//   }
-//   return out;
-// };
-
-// const _getDisableValidationMakeOption = (options: MakeProps | undefined): boolean =>
-//   Predicate.isBoolean(options) ? options : options?.disableValidation ?? false;
-
-/**
- * @internal
- */
-export const makeEchoTypeSchema = <
-  Self extends Schema.Schema.Any,
-  K extends EntityKind = EntityKind,
-  // TODO(wittjosiah): Can this be inferred from the schema?
-  Fields extends Schema.Struct.Fields = Schema.Struct.Fields,
->(
-  fields: Fields,
-  ast: SchemaAST.AST,
-  typename: string,
-  version: string,
-  kind: K,
-): EchoTypeSchema<Self, {}, K, Fields> => {
-  return class EchoObjectSchemaClass extends Schema.make<
-    EchoTypeSchemaProps<Schema.Schema.Type<Self>>,
-    EchoTypeSchemaProps<Schema.Schema.Encoded<Self>>,
-    Schema.Schema.Context<Self>
-  >(ast) {
-    static readonly typename = typename;
-    static readonly version = version;
-    static readonly [SchemaKindId] = kind;
-    static readonly fields = fields;
-
-    static override annotations(
-      annotations: Schema.Annotations.GenericSchema<EchoTypeSchemaProps<Schema.Schema.Type<Self>>>,
-    ): EchoTypeSchema<Self, {}, K, Fields> {
-      const schema = Schema.make<EchoTypeSchemaProps<Schema.Schema.Type<Self>>>(ast).annotations(annotations);
-      return makeEchoTypeSchema<Self, K, Fields>(fields, schema.ast, typename, version, kind);
-    }
-
-    // static make(
-    //   props: RequiredKeys<Schema.TypeLiteral.Constructor<Fields, []>> extends never
-    //     ? void | Simplify<Schema.TypeLiteral.Constructor<Fields, []>>
-    //     : Simplify<Schema.TypeLiteral.Constructor<Fields, []>>,
-    //   options?: MakeProps,
-    // ): Simplify<Schema.TypeLiteral.Type<Fields, []>> {
-    //   const propsWithDefaults: any = _lazilyMergeDefaults(fields, { ...(props as any) });
-    //   return _getDisableValidationMakeOption(options)
-    //     ? propsWithDefaults
-    //     : ParseResult.validateSync(this)(propsWithDefaults);
-    // }
-
-    static instanceOf(value: unknown): boolean {
-      return Schema.is(this)(value);
-    }
-  };
-};

package/src/internal/entities/relation.ts

@@ -1,171 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import * as Schema from 'effect/Schema';
-import * as SchemaAST from 'effect/SchemaAST';
-
-import { raise } from '@dxos/debug';
-import { assertArgument, invariant } from '@dxos/invariant';
-import { DXN } from '@dxos/keys';
-
-import {
-  type TypeAnnotation,
-  TypeAnnotationId,
-  type TypeMeta,
-  getEntityKind,
-  getSchemaTypename,
-  getTypeIdentifierAnnotation,
-  makeTypeJsonSchemaAnnotation,
-} from '../annotations';
-import { EntityKind } from '../types';
-
-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.
- */
-// TODO(burdon): any?
-export type RelationSourceTargetRefs<Source = any, Target = any> = {
-  /**
-   * Source ECHO live object.
-   */
-  [RelationSourceId]: Source;
-
-  /**
-   * Target ECHO live object.
-   */
-  [RelationTargetId]: Target;
-};
-
-export type RelationSource<R> = R extends RelationSourceTargetRefs<infer Source, infer _Target> ? Source : never;
-export type RelationTarget<R> = R extends RelationSourceTargetRefs<infer _Source, infer Target> ? Target : never;
-
-export type EchoRelationSchemaOptions<
-  TSource extends Schema.Schema.AnyNoContext,
-  TTarget extends Schema.Schema.AnyNoContext,
-> = TypeMeta & {
-  source: TSource;
-  target: TTarget;
-};
-
-/**
- * Relation schema type with kind marker.
- */
-export type EchoRelationSchema<
-  Self extends Schema.Schema.Any,
-  Source extends Schema.Schema.AnyNoContext,
-  Target extends Schema.Schema.AnyNoContext,
-  Fields extends Schema.Struct.Fields = Schema.Struct.Fields,
-> = EchoTypeSchema<
-  Self,
-  RelationSourceTargetRefs<Schema.Schema.Type<Source>, Schema.Schema.Type<Target>>,
-  EntityKind.Relation,
-  Fields
->;
-
-/**
- * Schema for Relation entity types.
- */
-export const EchoRelationSchema = <
-  Source extends Schema.Schema.AnyNoContext,
-  Target extends Schema.Schema.AnyNoContext,
->({
-  source,
-  target,
-  typename,
-  version,
-}: EchoRelationSchemaOptions<Source, Target>) => {
-  assertArgument(Schema.isSchema(source), 'source');
-  assertArgument(Schema.isSchema(target), 'target');
-  const sourceDXN = getDXNForRelationSchemaRef(source);
-  const targetDXN = getDXNForRelationSchemaRef(target);
-  if (getEntityKind(source) !== EntityKind.Object) {
-    raise(new Error('Source schema must be an echo object schema.'));
-  }
-  if (getEntityKind(target) !== EntityKind.Object) {
-    raise(new Error('Target schema must be an echo object schema.'));
-  }
-
-  return <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(
-    self: Self & { fields?: Fields },
-  ): EchoRelationSchema<Self, Source, Target, Fields> => {
-    invariant(SchemaAST.isTypeLiteral(self.ast), 'Schema must be a TypeLiteral.');
-
-    // Extract fields from the schema if available (Struct schemas have .fields).
-    const fields = ((self as any).fields ?? {}) as Fields;
-
-    const schemaWithId = Schema.extend(self, Schema.Struct({ id: Schema.String }));
-    const ast = SchemaAST.annotations(schemaWithId.ast, {
-      // TODO(dmaretskyi): `extend` kills the annotations.
-      ...self.ast.annotations,
-      [TypeAnnotationId]: {
-        kind: EntityKind.Relation,
-        typename,
-        version,
-        sourceSchema: sourceDXN,
-        targetSchema: targetDXN,
-      } satisfies TypeAnnotation,
-      // TODO(dmaretskyi): TypeIdentifierAnnotationId?
-
-      [SchemaAST.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
-        kind: EntityKind.Relation,
-        typename,
-        version,
-        relationSource: sourceDXN,
-        relationTarget: targetDXN,
-      }),
-    });
-
-    return makeEchoTypeSchema<Self, EntityKind.Relation, Fields>(fields, ast, typename, version, EntityKind.Relation);
-  };
-};
-
-const getDXNForRelationSchemaRef = (schema: Schema.Schema.Any): string => {
-  assertArgument(Schema.isSchema(schema), 'schema');
-  const identifier = getTypeIdentifierAnnotation(schema);
-  if (identifier) {
-    return identifier;
-  }
-
-  const typename = getSchemaTypename(schema);
-  if (!typename) {
-    throw new Error('Schema must have a typename');
-  }
-
-  return DXN.fromTypename(typename).toString();
-};

package/src/internal/entities/util.ts

@@ -1,33 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import * as Schema from 'effect/Schema';
-
-import { assertArgument, invariant } from '@dxos/invariant';
-import { DXN, ObjectId } from '@dxos/keys';
-import { assumeType } from '@dxos/util';
-
-import { type InternalObjectProps, SelfDXNId } from './model';
-
-/**
- * Returns a DXN for an object or schema.
- *
- * @internal
- */
-export const getObjectDXN = (object: any): DXN | undefined => {
-  invariant(!Schema.isSchema(object), 'schema not allowed in this function');
-  assertArgument(typeof object === 'object' && object != null, 'object', 'expected object');
-  assumeType<InternalObjectProps>(object);
-
-  if (object[SelfDXNId]) {
-    invariant(object[SelfDXNId] instanceof DXN, 'Invalid object model: invalid self dxn');
-    return object[SelfDXNId];
-  }
-
-  if (!ObjectId.isValid(object.id)) {
-    throw new TypeError('Object id is not valid.');
-  }
-
-  return DXN.fromLocalObjectId(object.id);
-};

package/src/internal/object/create-object.ts

@@ -1,95 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import type * as Schema from 'effect/Schema';
-
-import { raise } from '@dxos/debug';
-import { assertArgument, failedInvariant } from '@dxos/invariant';
-import { ObjectId } from '@dxos/keys';
-
-import { getSchemaDXN, getTypeAnnotation, setTypename } from '../annotations';
-import {
-  RelationSourceDXNId,
-  RelationSourceId,
-  RelationTargetDXNId,
-  RelationTargetId,
-  assertObjectModel,
-  getObjectDXN,
-} from '../entities';
-import { defineHiddenProperty } from '../proxy';
-import { EntityKind, KindId, MetaId, setSchema } from '../types';
-
-import { attachedTypedObjectInspector } from './inspect';
-import { attachTypedJsonSerializer } from './json-serializer';
-
-export type CreateObjectProps<T> = T extends { id: string } ? Omit<T, 'id' | KindId> & { id?: string } : T;
-
-/**
- * Creates a new object instance from a schema and data, without signal reactivity.
- * This static version creates plain JavaScript objects that are not reactive/observable.
- * For reactive objects that automatically update UI when changed, use the regular live() function.
- *
- * @param schema - The Effect schema that defines the object's structure and type, piped into EchoObjectSchema
- * @param data - The data to initialize the object with. The id and @type fields are handled automatically.
- * @returns A new non-reactive object instance conforming to the schema
- * @throws {Error} If the schema is not an object schema
- * @throws {TypeError} If data contains an @type field
- *
- * @example
- * ```ts
- * const Contact = Schema.Struct({
- *   name: Schema.String,
- *   email: Schema.String,
- * }).pipe(Type.object({
- *   typename: 'example.com/type/Person',
- *   version: '0.1.0',
- * }))
- *
- * const contact = createObject(Contact, {
- *   name: "John",
- *   email: "john@example.com",
- * })
- * ```
- */
-// TODO(burdon): Make internal.
-export const createObject = <S extends Schema.Schema.AnyNoContext>(
-  schema: S,
-  props: CreateObjectProps<Schema.Schema.Type<S>>,
-): CreateObjectProps<Schema.Schema.Type<S>> & { id: string; [KindId]: EntityKind } => {
-  const annotation = getTypeAnnotation(schema);
-  if (!annotation) {
-    throw new Error('Schema is not an ECHO schema');
-  }
-  assertArgument(!('@type' in props), 'data', '@type is not allowed');
-  assertArgument(!(RelationSourceDXNId in props), 'data', 'Relation source DXN is not allowed in the constructor');
-  assertArgument(!(RelationTargetDXNId in props), 'data', 'Relation target DXN is not allowed in the constructor');
-  assertArgument(
-    RelationSourceId in props === RelationTargetId in props,
-    'data',
-    'Relation source and target must be provided together',
-  );
-
-  // Raw object.
-  const obj = { ...props, id: props.id ?? ObjectId.random() };
-
-  // Metadata.
-  const kind = RelationSourceId in props ? EntityKind.Relation : EntityKind.Object;
-  defineHiddenProperty(obj, KindId, kind);
-  defineHiddenProperty(obj, MetaId, { keys: [] });
-  setSchema(obj, schema);
-  setTypename(obj, getSchemaDXN(schema) ?? failedInvariant('Missing schema DXN'));
-  attachTypedJsonSerializer(obj);
-  attachedTypedObjectInspector(obj);
-
-  // Relation.
-  if (kind === EntityKind.Relation) {
-    const sourceDXN = getObjectDXN(props[RelationSourceId]) ?? raise(new Error('Unresolved relation source'));
-    const targetDXN = getObjectDXN(props[RelationTargetId]) ?? raise(new Error('Unresolved relation target'));
-    defineHiddenProperty(obj, RelationSourceDXNId, sourceDXN);
-    defineHiddenProperty(obj, RelationTargetDXNId, targetDXN);
-  }
-
-  assertObjectModel(obj);
-  return obj;
-};