@dxos/echo 0.8.4-staging.ac66bdf99f → 0.9.0

package/dist/types/src/internal/Entity/model.d.ts

@@ -1,48 +1,52 @@
 import type * as Schema from 'effect/Schema';
 import { type ForeignKey } from '@dxos/echo-protocol';
-import { DXN, ObjectId } from '@dxos/keys';
+import { EID, EntityId, type URI } from '@dxos/keys';
 import type * as Database from '../../Database';
-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, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, type SchemaId, SelfDXNId, TypeId, type Version } from '../common/types';
-export { ATTR_DELETED, ATTR_SELF_DXN, ObjectDatabaseId, ObjectDeletedId, ObjectVersionId, SelfDXNId };
+import { type ATTR_PARENT, type ATTR_TYPE, ATTR_DELETED, ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, ATTR_SELF_URI, ATTR_SELF_URI_LEGACY, EntityKind, KindId, ObjectDatabaseId, ObjectDeletedId, ObjectVersionId, type ParentId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, type SchemaId, SelfURIId, TypeId, type Version } from '../common/types';
+import { type ATTR_META, type EntityMeta } from '../common/types/meta';
+import { type MetaId } from '../common/types/model-symbols';
+export { ATTR_DELETED, ATTR_SELF_URI, ATTR_SELF_URI_LEGACY, ObjectDatabaseId, ObjectDeletedId, ObjectVersionId, SelfURIId, };
 /**
  * Internal runtime representation of an object.
  * The fields are accessed through getter functions.
  */
 export interface InternalObjectProps {
-    readonly id: ObjectId;
-    readonly [SelfDXNId]: DXN;
+    readonly id: EntityId;
+    readonly [SelfURIId]: EID.EID;
     readonly [KindId]: EntityKind;
     readonly [SchemaId]: Schema.Schema.AnyNoContext;
-    readonly [TypeId]: DXN;
-    readonly [MetaId]?: ObjectMeta;
+    readonly [TypeId]: URI.URI;
+    readonly [MetaId]?: EntityMeta;
     [ParentId]?: InternalObjectProps;
     readonly [ObjectDatabaseId]?: Database.Database;
     readonly [ObjectDeletedId]?: boolean;
     readonly [ObjectVersionId]?: Version;
-    readonly [RelationSourceDXNId]?: DXN;
-    readonly [RelationTargetDXNId]?: DXN;
+    readonly [RelationSourceDXNId]?: EID.EID;
+    readonly [RelationTargetDXNId]?: EID.EID;
     readonly [RelationSourceId]?: InternalObjectProps;
     readonly [RelationTargetId]?: InternalObjectProps;
 }
 /**
  * Entity metadata.
  */
-export interface ObjectMetaJSON {
+export interface EntityMetaJSON {
     keys: ForeignKey[];
     tags?: string[];
+    key?: string;
+    version?: string;
 }
 /**
  * JSON representation of an object or relation metadata.
  */
 export interface ObjectJSON {
-    id: string;
-    [ATTR_TYPE]: DXN.String;
-    [ATTR_SELF_DXN]?: DXN.String;
-    [ATTR_PARENT]?: string;
+    id: EntityId;
+    [ATTR_TYPE]?: URI.URI;
+    [ATTR_SELF_URI]?: EID.EID;
+    [ATTR_PARENT]?: EID.EID;
     [ATTR_DELETED]?: boolean;
-    [ATTR_META]?: ObjectMetaJSON;
-    [ATTR_RELATION_SOURCE]?: DXN.String;
-    [ATTR_RELATION_TARGET]?: DXN.String;
+    [ATTR_META]?: EntityMetaJSON;
+    [ATTR_RELATION_SOURCE]?: EID.EID;
+    [ATTR_RELATION_TARGET]?: EID.EID;
     /**
      * Application-specific properties.
      */

package/dist/types/src/internal/Entity/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/model.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,KAAK,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,MAAM,EACN,KAAK,MAAM,EACX,gBAAgB,EAChB,eAAe,EACf,KAAK,UAAU,EACf,eAAe,EACf,KAAK,QAAQ,EACb,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,KAAK,QAAQ,EACb,SAAS,EACT,MAAM,EACN,KAAK,OAAO,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;AAEtG;;;GAGG;AAEH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC;IAC1B,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IACvB,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC;IAC/B,CAAC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC;IACjC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAChD,QAAQ,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC;IACrC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC;IACrC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,mBAAmB,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IACxB,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IAC7B,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC;IACvB,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IACzB,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC;IAC7B,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IACpC,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;IAEpC;;OAEG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,mBAAmB,CAgBlF"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/model.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAGrD,OAAO,KAAK,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,UAAU,EACV,MAAM,EACN,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,KAAK,QAAQ,EACb,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,KAAK,QAAQ,EACb,SAAS,EACT,MAAM,EACN,KAAK,OAAO,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EACL,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,SAAS,GACV,CAAC;AAEF;;;GAGG;AAEH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IAC9B,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAChD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC;IAC/B,CAAC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC;IACjC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAChD,QAAQ,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IACzC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IACzC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,CAAC,gBAAgB,CAAC,CAAC,EAAE,mBAAmB,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,QAAQ,CAAC;IACb,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IACtB,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IAC1B,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IACxB,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IACzB,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC;IAC7B,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IACjC,CAAC,oBAAoB,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IAEjC;;OAEG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,mBAAmB,CAgBlF"}

package/dist/types/src/internal/Entity/object.d.ts

@@ -1,7 +1,7 @@
 import * as Schema from 'effect/Schema';
-import { type TypeMeta } from '../Annotation';
+import { DXN } from '@dxos/keys';
 import { EntityKind } from '../common/types';
-import { type EchoTypeSchema } from './entity';
+import { type EchoTypeOptions, type EchoTypeSchema } from './entity';
 /**
  * Object schema type with kind marker.
  */
@@ -11,7 +11,7 @@ export type EchoObjectSchema<Self extends Schema.Schema.Any, Fields extends Sche
  * Pipeable function to add ECHO object annotations to a schema.
  */
 export declare const EchoObjectSchema: {
-    (meta: TypeMeta): <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(self: Self & {
+    (dxn: DXN.DXN, options?: EchoTypeOptions): <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(self: Self & {
         fields?: Fields;
     }) => EchoObjectSchema<Self, Fields>;
 };

package/dist/types/src/internal/Entity/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/object.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,EAAyC,KAAK,QAAQ,EAAgC,MAAM,eAAe,CAAC;AACnH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,UAAU,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAC1B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IACxD,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,CACE,IAAI,EAAE,QAAQ,GACb,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAC5F,IAAI,EAAE,IAAI,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAC7B,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;CA0BrC,CAAC"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/object.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAsB,MAAM,UAAU,CAAC;AAEzF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAC1B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IACxD,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,CACE,GAAG,EAAE,GAAG,CAAC,GAAG,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAC5F,IAAI,EAAE,IAAI,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAC7B,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;CAsCrC,CAAC"}

package/dist/types/src/internal/Entity/relation.d.ts

@@ -1,6 +1,8 @@
 import * as Schema from 'effect/Schema';
-import { type TypeMeta } from '../Annotation';
-import { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, EntityKind, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId } from '../common/types';
+import { DXN, type EntityId } from '@dxos/keys';
+import type * as Obj from '../../Obj';
+import type * as Type from '../../Type';
+import { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, EntityKind, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, type UnknownTypeSchema } from '../common/types';
 export { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, };
 import { type EchoTypeSchema } from './entity';
 /**
@@ -18,18 +20,39 @@ export type RelationSourceTargetRefs<Source = any, Target = any> = {
 };
 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 & {
+/**
+ * Accepted relation endpoint: an object-kind `Type.Type` entity (slot-backed)
+ * or the branded `Obj.Unknown` schema. Source/target are constrained to these
+ * — relations only connect object-kind entities.
+ */
+export type RelationEndpoint = Type.AnyObj | UnknownTypeSchema<any, EntityKind.Object>;
+/**
+ * Resolves a relation endpoint to the instance type it describes — the source /
+ * target instance recorded on the relation's `RelationSourceTargetRefs`.
+ */
+export type RelationEndpointInstance<S> = S extends UnknownTypeSchema<infer A, any> ? A : S extends Type.AnyObj ? Type.InstanceType<S> : unknown;
+export type EchoRelationSchemaOptions<TSource extends RelationEndpoint, TTarget extends RelationEndpoint> = {
+    dxn: DXN.DXN;
     source: TSource;
     target: TTarget;
+    /**
+     * Override the entity id stamped on the in-memory `Type.Type` value.
+     *
+     * Defaults to `EntityId.deterministic(typename, version)` — stable across processes
+     * and workerd-safe (no `crypto.getRandomValues()` at module-evaluation time).
+     */
+    id?: EntityId;
 };
 /**
- * Relation schema type with kind marker.
+ * Relation schema type with kind marker. `SourceInstance` / `TargetInstance`
+ * are the resolved endpoint instance types (see {@link RelationEndpointInstance}).
  */
-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>;
+export type EchoRelationSchema<Self extends Schema.Schema.Any, SourceInstance extends Obj.Unknown, TargetInstance extends Obj.Unknown, Fields extends Schema.Struct.Fields = Schema.Struct.Fields> = EchoTypeSchema<Self, RelationSourceTargetRefs<SourceInstance, TargetInstance>, EntityKind.Relation, Fields>;
 /**
  * Schema for Relation entity types.
  */
-export declare const EchoRelationSchema: <Source extends Schema.Schema.AnyNoContext, Target extends Schema.Schema.AnyNoContext>({ source, target, typename, version, }: EchoRelationSchemaOptions<Source, Target>) => <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(self: Self & {
+export declare const EchoRelationSchema: <Source extends RelationEndpoint, Target extends RelationEndpoint>({ dxn, source, target, id: explicitId, }: EchoRelationSchemaOptions<Source, Target>) => <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(self: Self & {
     fields?: Fields;
-}) => EchoRelationSchema<Self, Source, Target, Fields>;
+}) => EchoRelationSchema<Self, RelationEndpointInstance<Source>, RelationEndpointInstance<Target>, Fields>;
+export declare const getDXNForRelationSchemaRef: (schema: Schema.Schema.Any) => DXN.DXN;
 //# sourceMappingURL=relation.d.ts.map

package/dist/types/src/internal/Entity/relation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relation.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/relation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAOxC,OAAO,EAGL,KAAK,QAAQ,EAKd,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,GACjB,CAAC;AAEF,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,UAAU,CAAC;AAEnE;;GAEG;AAEH,MAAM,MAAM,wBAAwB,CAAC,MAAM,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI;IACjE;;OAEG;IACH,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,wBAAwB,CAAC,MAAM,MAAM,EAAE,MAAM,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AACjH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,wBAAwB,CAAC,MAAM,OAAO,EAAE,MAAM,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEjH,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,IACxC,QAAQ,GAAG;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAC5B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACzC,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACzC,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IACxD,cAAc,CAChB,IAAI,EACJ,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAChF,UAAU,CAAC,QAAQ,EACnB,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACzC,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACzC,wCAKC,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,MAYlC,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAChG,MAAM,IAAI,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,KAC/B,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CA8BnD,CAAC"}
+{"version":3,"file":"relation.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/relation.ts"],"names":[],"mappings":"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"}

package/dist/types/src/internal/Entity/type-kind.d.ts

@@ -0,0 +1,24 @@
+import * as Schema from 'effect/Schema';
+import { DXN } from '@dxos/keys';
+import { EntityKind } from '../common/types';
+import { type EchoTypeOptions, type EchoTypeSchema } from './entity';
+/**
+ * Type-kind schema marker — produced by {@link EchoTypeKindSchema}.
+ *
+ * Distinguishes meta-schemas (entities of `EntityKind.Type`, such as the
+ * built-in `Type.Type` TypeSchema) from object and relation types.
+ */
+export type EchoTypeKindSchema<Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields> = EchoTypeSchema<Self, {}, EntityKind.Type, Fields>;
+/**
+ * Pipeable that brands a schema as a type-kind ECHO entity. Mirrors
+ * {@link EchoObjectSchema} / {@link EchoRelationSchema}, but stamps the
+ * resulting entity with `[SchemaKindId]: EntityKind.Type` and a matching
+ * `TypeAnnotation.kind = 'type'` so meta-schemas surface uniformly through
+ * `Type.isTypeKind`, `Filter.type`, etc.
+ */
+export declare const EchoTypeKindSchema: {
+    (dxn: DXN.DXN, options?: EchoTypeOptions): <Self extends Schema.Schema.Any, Fields extends Schema.Struct.Fields = Schema.Struct.Fields>(self: Self & {
+        fields?: Fields;
+    }) => EchoTypeKindSchema<Self, Fields>;
+};
+//# sourceMappingURL=type-kind.d.ts.map

package/dist/types/src/internal/Entity/type-kind.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-kind.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/type-kind.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAsB,MAAM,UAAU,CAAC;AAEzF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,CAC5B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IACxD,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAEtD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE;IAC/B,CACE,GAAG,EAAE,GAAG,CAAC,GAAG,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAC5F,IAAI,EAAE,IAAI,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAC7B,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;CAkCvC,CAAC"}

package/dist/types/src/internal/Entity/type-uri.d.ts

@@ -0,0 +1,24 @@
+import * as Schema from 'effect/Schema';
+import { URI } from '@dxos/keys';
+import { type AnyEntity, InstancePhantomId } from '../common/types';
+/**
+ * @param input schema, `Type.Type` entity, or a type URI (an `echo:` EID or a `dxn:` DXN).
+ * @return type identifier URI — see {@link getSchemaURI}. A URI is returned verbatim. For a
+ * `Type.Type` entity, the URI of the schema it declares, symmetric with what
+ * `Obj.make(typeEntity, ...)` stamps on `system.type`: a static declaration resolves to its
+ * typename DXN, a persisted entity to its local `echo:/<objectId>`.
+ */
+export declare const getTypeURIFromSpecifier: (input: Schema.Schema.All | AnyEntity | URI.URI) => URI.URI;
+/**
+ * Checks if the object is an instance of the schema.
+ * Only typename is compared, the schema version is ignored.
+ *
+ * The following cases are considered to mean that the object is an instance of the schema:
+ *  - Object was created with this exact schema.
+ *  - Object was created with a different version of this schema.
+ *  - Object was created with a different schema (maybe dynamic) that has the same typename.
+ */
+export declare const isInstanceOf: <S>(schemaOrType: S extends Schema.Schema.AnyNoContext ? S : Schema.Schema.AnyNoContext | AnyEntity, object: any) => object is S extends Schema.Schema.AnyNoContext ? Schema.Schema.Type<S> : S extends {
+    readonly [InstancePhantomId]?: infer A;
+} ? A : unknown;
+//# sourceMappingURL=type-uri.d.ts.map

package/dist/types/src/internal/Entity/type-uri.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-uri.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/type-uri.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAY,GAAG,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,EAAE,KAAK,SAAS,EAAE,iBAAiB,EAAuC,MAAM,iBAAiB,CAAC;AAGzG;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,UAAW,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,GAAG,KAAG,GAAG,CAAC,GAyB5F,CAAC;AAEF;;;;;;;;GAQG;AAEH,eAAO,MAAM,YAAY,GAAI,CAAC,gBACd,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,SAAS,UACvF,GAAG,KACV,MAAM,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,GAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GACrB,CAAC,SAAS;IAAE,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;CAAE,GAClD,CAAC,GACD,OA0BL,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/version.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhE;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAOD;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,OAAO,KAAG,MAAM,IAAI,aAErD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,SAAS,KAAG,aAM3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAI,KAAK,aAAa,KAAG,OAGjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,aAAa,EAAE,UAAU,aAAa,KAAG,oBAgBlF,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,aAAa,KAAG,MAElD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,aAI3C,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/version.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhE;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAOD;;GAEG;AACH,eAAO,MAAM,SAAS,WAAY,OAAO,KAAG,MAAM,IAAI,aAErD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,WAAY,SAAS,KAAG,aAM3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,QAAS,aAAa,KAAG,OAGjD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,aAAc,aAAa,YAAY,aAAa,KAAG,oBAgBlF,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,aAAa,KAAG,MAElD,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,aAI3C,CAAC"}

package/dist/types/src/internal/Format/date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/date.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC;;;;;;;GAOG;AAUH;;GAEG;AACH,eAAO,MAAM,UAAU;;;;EAIrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,eAAO,MAAM,YAAY,GAAI,MAAM,IAAI,KAAG,UAIxC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU;;;;EAIrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,eAAO,MAAM,YAAY,GAAI,MAAM,IAAI,KAAG,UAIxC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;GAAwC,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAc,CAAC,CAAC;AAEvE,eAAO,MAAM,gBAAgB,GAAI,MAAM,IAAI,KAAG,cAG5C,CAAC;AAEH;;GAEG;AAIH;;GAEG;AACH,eAAO,MAAM,QAAQ,2CA4BpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,2CAyBpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,2CAwCpB,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,QAAQ,2CAOpB,CAAC"}
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/date.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC;;;;;;;GAOG;AAUH;;GAEG;AACH,eAAO,MAAM,UAAU;;;;EAIrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,eAAO,MAAM,YAAY,SAAU,IAAI,KAAG,UAIxC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU;;;;EAIrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,eAAO,MAAM,YAAY,SAAU,IAAI,KAAG,UAIxC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;GAAwC,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,cAAc,CAAC,CAAC;AAEvE,eAAO,MAAM,gBAAgB,SAAU,IAAI,KAAG,cAG5C,CAAC;AAEH;;GAEG;AAIH;;GAEG;AACH,eAAO,MAAM,QAAQ,2CA2BpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,2CAwBpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,2CAuCpB,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,QAAQ,2CAMpB,CAAC"}

package/dist/types/src/internal/Format/format.d.ts

@@ -1,4 +1,5 @@
 import * as Schema from 'effect/Schema';
+import * as Keys from '@dxos/keys';
 import * as NumberUtil from './number';
 import * as ObjectUtil from './object';
 import { TypeFormat as TypeFormat$ } from './types';
@@ -9,7 +10,7 @@ import { TypeFormat as TypeFormat$ } from './types';
  */
 export declare namespace Format {
     export import TypeFormat = TypeFormat$;
-    const DXN: Schema.refine<string, typeof Schema.NonEmptyString>;
+    const DXN: Schema.Schema<Keys.DXN.DXN, Keys.DXN.DXN, never>;
     const Email: Schema.refine<string, typeof Schema.String>;
     const Formula: typeof Schema.String;
     const Hostname: typeof Schema.String;
@@ -26,7 +27,7 @@ export declare namespace Format {
     const DateTime: Schema.SchemaClass<string, string, never>;
     const Duration: Schema.SchemaClass<string, string, never>;
     const Time: Schema.SchemaClass<string, string, never>;
-    const GeoPoint: Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>;
+    const GeoPoint: Schema.Tuple<[Schema.transform<Schema.transform<typeof Schema.Number, Schema.filter<Schema.SchemaClass<number, number, never>>>, typeof Schema.Number>, Schema.transform<Schema.transform<typeof Schema.Number, Schema.filter<Schema.SchemaClass<number, number, never>>>, typeof Schema.Number>, Schema.Element<typeof Schema.Number, "?">]>;
     type GeoPoint = ObjectUtil.GeoPoint;
 }
 //# sourceMappingURL=format.d.ts.map

package/dist/types/src/internal/Format/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,UAAU,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,UAAU,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AAKpD;;;;GAIG;AAEH,yBAAiB,MAAM,CAAC;IACtB,MAAM,QAAQ,UAAU,GAAG,WAAW,CAAC;IAGhC,MAAM,GAAG,qDAAkB,CAAC;IAC5B,MAAM,KAAK,6CAAmB,CAAC;IAC/B,MAAM,OAAO,sBAAqB,CAAC;IACnC,MAAM,QAAQ,sBAAsB,CAAC;IACrC,MAAM,IAAI,sBAAkB,CAAC;IAC7B,MAAM,QAAQ,sBAAsB,CAAC;IACrC,MAAM,KAAK,sBAAmB,CAAC;IAC/B,MAAM,GAAG,6CAAiB,CAAC;IAC3B,MAAM,IAAI,oBAAc,CAAC;IAIzB,MAAM,QAAQ,8FAAsB,CAAC;IACrC,MAAM,OAAO,mDAAqB,CAAC;IACnC,MAAM,OAAO,uFAAqB,CAAC;IACnC,MAAM,SAAS,2CAAuB,CAAC;IAGvC,MAAM,IAAI,2CAAoB,CAAC;IAC/B,MAAM,QAAQ,2CAAoB,CAAC;IACnC,MAAM,QAAQ,2CAAoB,CAAC;IACnC,MAAM,IAAI,2CAAoB,CAAC;IAG/B,MAAM,QAAQ,uUAAsB,CAAC;IAC5C,KAAY,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;CAC5C"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAGnC,OAAO,KAAK,UAAU,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,UAAU,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AAKpD;;;;GAIG;AAEH,yBAAiB,MAAM,CAAC,CAAC;IACvB,MAAM,QAAQ,UAAU,GAAG,WAAW,CAAC;IAGhC,MAAM,GAAG,kDAAkB,CAAC;IAC5B,MAAM,KAAK,6CAAmB,CAAC;IAC/B,MAAM,OAAO,sBAAqB,CAAC;IACnC,MAAM,QAAQ,sBAAsB,CAAC;IACrC,MAAM,IAAI,sBAAkB,CAAC;IAC7B,MAAM,QAAQ,sBAAsB,CAAC;IACrC,MAAM,KAAK,sBAAmB,CAAC;IAC/B,MAAM,GAAG,6CAAiB,CAAC;IAC3B,MAAM,IAAI,oBAAc,CAAC;IAIzB,MAAM,QAAQ,8FAAsB,CAAC;IACrC,MAAM,OAAO,mDAAqB,CAAC;IACnC,MAAM,OAAO,uFAAqB,CAAC;IACnC,MAAM,SAAS,2CAAuB,CAAC;IAGvC,MAAM,IAAI,2CAAoB,CAAC;IAC/B,MAAM,QAAQ,2CAAoB,CAAC;IACnC,MAAM,QAAQ,2CAAoB,CAAC;IACnC,MAAM,IAAI,2CAAoB,CAAC;IAG/B,MAAM,QAAQ,+UAAsB,CAAC;IAC5C,KAAY,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;CAC5C"}

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

@@ -1,7 +1,7 @@
-export type { SimpleDate, SimpleDateTime, SimpleTime } from './date';
+export * from './date';
+export * from './format';
 export { CurrencyAnnotationId, DecimalPrecision, Currency } from './number';
 export { GeoPoint, GeoLocation } from './object';
-export * from './format';
 export * from './select';
 export * from './string';
 export * from './types';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/index.ts"],"names":[],"mappings":"AAIA,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEjD,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}

package/dist/types/src/internal/Format/number.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/number.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAWxC;;GAEG;AACH,eAAO,MAAM,gBAAgB,8DAM3B,CAAC;AAEH,eAAO,MAAM,oBAAoB,eAAiD,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAI,qBAAoB,kBAAoC,yCAS9E,CAAC;AAEJ,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,mDAQjB,CAAC;AAEJ;;GAEG;AAEH,eAAO,MAAM,OAAO,GAAI,eAAc,iBAAmC,yCAQtE,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,SAAS,2CAMrB,CAAC"}
+{"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/number.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAWxC;;GAEG;AACH,eAAO,MAAM,gBAAgB,8DAM3B,CAAC;AAEH,eAAO,MAAM,oBAAoB,eAAiD,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,wBAAwB,kBAAkB,yCAS5D,CAAC;AAEJ,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,mDAQjB,CAAC;AAEJ;;GAEG;AAEH,eAAO,MAAM,OAAO,kBAAkB,iBAAiB,yCAQpD,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,SAAS,2CAMrB,CAAC"}

package/dist/types/src/internal/Format/object.d.ts

@@ -11,7 +11,9 @@ import * as Schema from 'effect/Schema';
  * }
  * Note: optional third element for altitude.
  */
-export declare const GeoPoint: Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>;
+/** Decimal places retained for stored coordinates (~1.1cm at the equator). */
+export declare const GEO_PRECISION = 7;
+export declare const GeoPoint: Schema.Tuple<[Schema.transform<Schema.transform<typeof Schema.Number, Schema.filter<Schema.SchemaClass<number, number, never>>>, typeof Schema.Number>, Schema.transform<Schema.transform<typeof Schema.Number, Schema.filter<Schema.SchemaClass<number, number, never>>>, typeof Schema.Number>, Schema.Element<typeof Schema.Number, "?">]>;
 export type GeoPoint = Schema.Schema.Type<typeof GeoPoint>;
 export type GeoLocation = {
     longitude: number;

package/dist/types/src/internal/Format/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/object.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,QAAQ,uUAYpB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,CAAC;AAE3D,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,yBAAiB,WAAW,CAAC;IAC3B;;;OAGG;IACI,MAAM,UAAU,GAAI,iCAAiC,WAAW,KAAG,QAKzE,CAAC;IAEF;;OAEG;IACI,MAAM,YAAY,GAAI,UAAU,QAAQ,GAAG,SAAS,KAAG,WAgB7D,CAAC;CACH"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/object.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC;;;;;;;;;;;GAWG;AACH,8EAA8E;AAC9E,eAAO,MAAM,aAAa,IAAI,CAAC;AAe/B,eAAO,MAAM,QAAQ,+UAYpB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,CAAC;AAE3D,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,yBAAiB,WAAW,CAAC,CAAC;IAC5B;;;OAGG;IACI,MAAM,UAAU,oCAAqC,WAAW,KAAG,QAMzE,CAAC;IAEF;;OAEG;IACI,MAAM,YAAY,aAAc,QAAQ,GAAG,SAAS,KAAG,WAgB7D,CAAC;CACH"}

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/types.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,MAAM,UAAU,GAClB,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,kBAAkB,GAC7B,UAAU,CAAC,cAAc,CAAC;AAI9B,oBAAY,QAAQ;IAClB,KAAK,UAAU,CAAE,wBAAwB;IACzC,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAGD,eAAO,MAAM,WAAW,GAAI,UAAU,cAAc,KAAG,QAAQ,GAAG,SAejE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,eAA+C,CAAC;AAE/E,eAAO,MAAM,gBAAgB,2CAAyD,CAAC;AAEvF,kBAAkB;AAClB,eAAO,MAAM,mBAAmB,GAAI,MAAM,SAAS,CAAC,GAAG,KAAG,UAAU,GAAG,SAC8B,CAAC;AAGtG,oBAAY,UAAU;IACpB,IAAI,SAAS;IAMb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,GAAG,QAAQ;IAMX,GAAG,QAAQ,CAAE,cAAc;IAC3B,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,OAAO,YAAY,CAAE,uBAAuB;IAC5C,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,YAAY,kBAAkB;IAC9B,IAAI,SAAS;IACb,WAAW,iBAAiB;IAC5B,GAAG,QAAQ;IACX,IAAI,SAAS;IAMb,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IAMvB,QAAQ,cAAc;IACtB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,QAAQ,aAAa;IAMrB,QAAQ,WAAW;CACpB;AAED,eAAO,MAAM,WAAW,cAAmC,CAAC;AAE5D,eAAO,MAAM,YAAY;;;CAGxB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAI9D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAoCrD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,eAAgD,CAAC;AAGjF,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AACtC,eAAO,MAAM,iBAAiB,0CAAyD,CAAC;AAExF,kBAAkB;AAClB,eAAO,MAAM,oBAAoB,GAAI,MAAM,SAAS,CAAC,GAAG,KAAG,OAAO,EAAE,GAAG,SAC8B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Format/types.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,MAAM,UAAU,GAClB,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,iBAAiB,GAC5B,UAAU,CAAC,kBAAkB,GAC7B,UAAU,CAAC,cAAc,CAAC;AAI9B,oBAAY,QAAQ;IAClB,KAAK,UAAU,CAAE,wBAAwB;IACzC,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAGD,eAAO,MAAM,WAAW,aAAc,cAAc,KAAG,QAAQ,GAAG,SAejE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,eAA+C,CAAC;AAE/E,eAAO,MAAM,gBAAgB,2CAAyD,CAAC;AAEvF,kBAAkB;AAClB,eAAO,MAAM,mBAAmB,SAAU,SAAS,CAAC,GAAG,KAAG,UAAU,GAAG,SAC8B,CAAC;AAGtG,oBAAY,UAAU;IACpB,IAAI,SAAS;IAMb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,GAAG,QAAQ;IAMX,GAAG,QAAQ,CAAE,cAAc;IAC3B,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,OAAO,YAAY,CAAE,uBAAuB;IAC5C,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,YAAY,kBAAkB;IAC9B,IAAI,SAAS;IACb,WAAW,iBAAiB;IAC5B,GAAG,QAAQ;IACX,IAAI,SAAS;IAMb,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IAMvB,QAAQ,cAAc;IACtB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,QAAQ,aAAa;IAMrB,QAAQ,WAAW;CACpB;AAED,eAAO,MAAM,WAAW,cAAmC,CAAC;AAE5D,eAAO,MAAM,YAAY;IACvB,IAAI;IACJ,MAAM;CACP,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAI9D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,CAoCrD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,eAAgD,CAAC;AAGjF,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AACtC,eAAO,MAAM,iBAAiB,0CAAyD,CAAC;AAExF,kBAAkB;AAClB,eAAO,MAAM,oBAAoB,SAAU,SAAS,CAAC,GAAG,KAAG,OAAO,EAAE,GAAG,SAC8B,CAAC"}

package/dist/types/src/internal/JsonSchema/json-schema-normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-schema-normalize.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema-normalize.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,cAAc,KAAG,cAIxD,CAAC"}
+{"version":3,"file":"json-schema-normalize.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema-normalize.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE3E;;;GAGG;AACH,eAAO,MAAM,eAAe,WAAY,cAAc,KAAG,cAIxD,CAAC"}

package/dist/types/src/internal/JsonSchema/json-schema-type.d.ts

@@ -1,5 +1,5 @@
 import * as Schema from 'effect/Schema';
-import { JsonPath, type JsonProp } from '@dxos/effect';
+import { SchemaEx } from '@dxos/effect';
 import { type Mutable } from '../common/proxy';
 /**
  * Go under the `annotations` property.
@@ -9,7 +9,7 @@ export declare const JsonSchemaEchoAnnotations: Schema.Struct<{
      * Label for this schema.
      * Mapped from {@link LabelAnnotationId}.
      */
-    labelProp: Schema.optional<Schema.Union<[Schema.Schema<JsonPath, JsonPath, never>, Schema.Array$<Schema.Schema<JsonPath, JsonPath, never>>]>>;
+    labelProp: Schema.optional<Schema.Union<[Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>, Schema.Array$<Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>>]>>;
     /**
      * Generator function for this schema.
      * Mapped from {@link GeneratorAnnotationId}.
@@ -158,7 +158,7 @@ declare const _JsonSchemaType: Schema.Struct<{
     patternProperties: Schema.optional<Schema.Record$<typeof Schema.String, Schema.suspend<JsonSchemaType, JsonSchemaType, never>>>;
     propertyNames: Schema.optional<Schema.suspend<JsonSchemaType, JsonSchemaType, never>>;
     definitions: Schema.optional<Schema.Record$<typeof Schema.String, Schema.suspend<JsonSchemaType, JsonSchemaType, never>>>;
-    dependencies: Schema.optional<Schema.Record$<typeof Schema.String, Schema.suspend<string | readonly string[] | JsonSchemaType, string | readonly string[] | JsonSchemaType, never>>>;
+    dependencies: Schema.optional<Schema.Record$<typeof Schema.String, Schema.suspend<string | JsonSchemaType | readonly string[], string | JsonSchemaType | readonly string[], never>>>;
     contentMediaType: Schema.optional<typeof Schema.String>;
     contentEncoding: Schema.optional<typeof Schema.String>;
     if: Schema.optional<Schema.suspend<JsonSchemaType, JsonSchemaType, never>>;
@@ -183,7 +183,7 @@ declare const _JsonSchemaType: Schema.Struct<{
          * Label for this schema.
          * Mapped from {@link LabelAnnotationId}.
          */
-        labelProp: Schema.optional<Schema.Union<[Schema.Schema<JsonPath, JsonPath, never>, Schema.Array$<Schema.Schema<JsonPath, JsonPath, never>>]>>;
+        labelProp: Schema.optional<Schema.Union<[Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>, Schema.Array$<Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>>]>>;
         /**
          * Generator function for this schema.
          * Mapped from {@link GeneratorAnnotationId}.
@@ -214,7 +214,7 @@ declare const _JsonSchemaType: Schema.Struct<{
          * Label for this schema.
          * Mapped from {@link LabelAnnotationId}.
          */
-        labelProp: Schema.optional<Schema.Union<[Schema.Schema<JsonPath, JsonPath, never>, Schema.Array$<Schema.Schema<JsonPath, JsonPath, never>>]>>;
+        labelProp: Schema.optional<Schema.Union<[Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>, Schema.Array$<Schema.Schema<SchemaEx.JsonPath, SchemaEx.JsonPath, never>>]>>;
         /**
          * Generator function for this schema.
          * Mapped from {@link GeneratorAnnotationId}.
@@ -245,31 +245,15 @@ export declare const JsonSchemaFields: string[];
 export interface JsonSchemaType extends Schema.Schema.Type<typeof _JsonSchemaType> {
 }
 export declare const JsonSchemaType: Schema.Schema<JsonSchemaType>;
-export declare const getSchemaProperty: (schema: JsonSchemaType, property: JsonProp) => JsonSchemaType | undefined;
-export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, property: JsonProp, value: Mutable<JsonSchemaType>) => {
-    typename?: string | undefined;
-    version?: string | undefined;
-    annotations?: {
-        annotations?: {
-            [x: string]: any;
-        } | undefined;
-        labelProp?: JsonPath | JsonPath[] | undefined;
-        generator?: string | (string | number)[] | undefined;
-        meta?: {
-            [x: string]: any;
-        } | undefined;
-        type?: {
-            typename: string;
-            version: string;
-            schemaId?: string | undefined;
-        } | undefined;
-    } | undefined;
-    type?: "string" | "number" | "boolean" | "object" | "array" | "integer" | "null" | ("string" | "number" | "boolean" | "object" | "array" | "integer" | "null")[] | undefined;
+export declare const getSchemaProperty: (schema: JsonSchemaType, property: SchemaEx.JsonProp) => JsonSchemaType | undefined;
+export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, property: SchemaEx.JsonProp, value: Mutable<JsonSchemaType>) => {
     $id?: string | undefined;
     $schema?: string | undefined;
     $ref?: string | undefined;
     $comment?: string | undefined;
     entityKind?: import("..").EntityKind | undefined;
+    typename?: string | undefined;
+    version?: string | undefined;
     relationTarget?: /*elided*/ any | undefined;
     relationSource?: /*elided*/ any | undefined;
     title?: string | undefined;
@@ -280,6 +264,7 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
     default?: any;
     const?: any;
     enum?: any[] | undefined;
+    type?: "array" | "boolean" | "integer" | "null" | "number" | "object" | "string" | ("array" | "boolean" | "integer" | "null" | "number" | "object" | "string")[] | undefined;
     multipleOf?: number | undefined;
     maximum?: number | undefined;
     exclusiveMaximum?: number | undefined;
@@ -289,7 +274,7 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
     pattern?: string | undefined;
     format?: string | undefined;
     minLength?: number | undefined;
-    items?: /*elided*/ any | /*elided*/ any[] | undefined;
+    items?: /*elided*/ any[] | /*elided*/ any | undefined;
     additionalItems?: boolean | /*elided*/ any | undefined;
     maxItems?: number | undefined;
     minItems?: number | undefined;
@@ -304,11 +289,11 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
         [x: string]: /*elided*/ any;
     } | undefined;
     patternProperties?: {
-        [x: string]: /*elided*/ any;
+        [x: string]: any;
     } | undefined;
     propertyNames?: /*elided*/ any | undefined;
     definitions?: {
-        [x: string]: /*elided*/ any;
+        [x: string]: any;
     } | undefined;
     dependencies?: {
         [x: string]: string | string[] | /*elided*/ any;
@@ -318,12 +303,12 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
     if?: /*elided*/ any | undefined;
     then?: /*elided*/ any | undefined;
     else?: /*elided*/ any | undefined;
-    allOf?: /*elided*/ any[] | undefined;
-    anyOf?: /*elided*/ any[] | undefined;
-    oneOf?: /*elided*/ any[] | undefined;
+    allOf?: any[] | undefined;
+    anyOf?: any[] | undefined;
+    oneOf?: any[] | undefined;
     not?: /*elided*/ any | undefined;
     $defs?: {
-        [x: string]: /*elided*/ any;
+        [x: string]: any;
     } | undefined;
     currency?: string | undefined;
     reference?: {
@@ -331,11 +316,23 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
         schemaVersion?: string | undefined;
         schemaObject?: string | undefined;
     } | undefined;
-    echo?: {
+    annotations?: {
+        labelProp?: SchemaEx.JsonPath[] | SchemaEx.JsonPath | undefined;
+        generator?: string | (string | number)[] | undefined;
+        meta?: {
+            [x: string]: any;
+        } | undefined;
+        type?: {
+            typename: string;
+            version: string;
+            schemaId?: string | undefined;
+        } | undefined;
         annotations?: {
             [x: string]: any;
         } | undefined;
-        labelProp?: JsonPath | JsonPath[] | undefined;
+    } | undefined;
+    echo?: {
+        labelProp?: SchemaEx.JsonPath[] | SchemaEx.JsonPath | undefined;
         generator?: string | (string | number)[] | undefined;
         meta?: {
             [x: string]: any;
@@ -345,6 +342,9 @@ export declare const setSchemaProperty: (schema: Mutable<JsonSchemaType>, proper
             version: string;
             schemaId?: string | undefined;
         } | undefined;
+        annotations?: {
+            [x: string]: any;
+        } | undefined;
     } | undefined;
 };
 export {};

package/dist/types/src/internal/JsonSchema/json-schema-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-schema-type.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema-type.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAoB/C;;GAEG;AACH,eAAO,MAAM,yBAAyB;IACpC;;;OAGG;;IAGH;;;OAGG;;IAGH;;OAEG;;IAQH;;OAEG;;;;;;IAYH;;OAEG;;EAOH,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE7F;;;;GAIG;AAGH,QAAA,MAAM,eAAe;IACnB;;;OAGG;;IAKH;;;OAGG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;;;;OAKG;;IAGH;;;OAGG;;IAGH;;;;OAIG;;IAGH;;;;OAIG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;IAmBH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;IAiCH;;;;;;OAMG;;;;;;;;;;;;;;;;;;;;;;;;IAiEH;;OAEG;;QA/RH;;;WAGG;;QAGH;;;WAGG;;QAGH;;WAEG;;QAQH;;WAEG;;;;;;QAYH;;WAEG;;;IA6PH;;OAEG;;QArSH;;;WAGG;;QAGH;;;WAGG;;QAGH;;WAEG;;QAQH;;WAEG;;;;;;QAYH;;WAEG;;;EAiQmE,CAAC;AAEzE,eAAO,MAAM,gBAAgB,UAAsC,CAAC;AAEpE;;GAEG;AAEH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAErF,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAmB,CAAC;AAI7E,eAAO,MAAM,iBAAiB,GAAI,QAAQ,cAAc,EAAE,UAAU,QAAQ,KAAG,cAAc,GAAG,SAE/F,CAAC;AAGF,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,OAAO,CAAC,cAAc,CAAC,EAC/B,UAAU,QAAQ,EAClB,OAAO,OAAO,CAAC,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAK/B,CAAC"}
+{"version":3,"file":"json-schema-type.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema-type.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAoB/C;;GAEG;AACH,eAAO,MAAM,yBAAyB;IACpC;;;OAGG;;IAGH;;;OAGG;;IAGH;;OAEG;;IAQH;;OAEG;;;;;;IAYH;;OAEG;;EAOH,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE7F;;;;GAIG;AAGH,QAAA,MAAM,eAAe;IACnB;;;OAGG;;IAKH;;;OAGG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;;;;OAKG;;IAGH;;;OAGG;;IAGH;;;;OAIG;;IAGH;;;;OAIG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;IAmBH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;IAiCH;;;;;;OAMG;;;;;;;;;;;;;;;;;;;;;;;;IAiEH;;OAEG;;QA/RH;;;WAGG;;QAGH;;;WAGG;;QAGH;;WAEG;;QAQH;;WAEG;;;;;;QAYH;;WAEG;;;IA6PH;;OAEG;;QArSH;;;WAGG;;QAGH;;;WAGG;;QAGH;;WAEG;;QAQH;;WAEG;;;;;;QAYH;;WAEG;;;EAiQmE,CAAC;AAEzE,eAAO,MAAM,gBAAgB,UAAsC,CAAC;AAEpE;;GAEG;AAEH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC;CAAG;AAErF,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAmB,CAAC;AAI7E,eAAO,MAAM,iBAAiB,WAAY,cAAc,YAAY,QAAQ,CAAC,QAAQ,KAAG,cAAc,GAAG,SAExG,CAAC;AAGF,eAAO,MAAM,iBAAiB,WACpB,OAAO,CAAC,cAAc,CAAC,YACrB,QAAQ,CAAC,QAAQ,SACpB,OAAO,CAAC,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAK/B,CAAC"}

package/dist/types/src/internal/JsonSchema/json-schema.d.ts

@@ -1,5 +1,6 @@
 import * as Schema from 'effect/Schema';
 import type * as Types from 'effect/Types';
+import type * as Type from '../../Type';
 import { type JsonSchemaType } from './json-schema-type';
 export declare enum PropType {
     NONE = 0,
@@ -20,11 +21,11 @@ export type JsonSchemaOptions = {
  * NOTE: This handles custom annotations.
  * @param schema
  */
-export declare const toJsonSchema: (schema: Schema.Schema.All, options?: JsonSchemaOptions) => Types.DeepMutable<JsonSchemaType>;
+export declare const toJsonSchema: (schema: Schema.Schema.All | Type.AnyEntity, options?: JsonSchemaOptions) => Types.DeepMutable<JsonSchemaType>;
 /**
  * Convert JSON schema to effect schema.
  * @param root
  * @param definitions
  */
-export declare const toEffectSchema: (root: JsonSchemaType, _defs?: JsonSchemaType["$defs"]) => Schema.Schema.AnyNoContext;
+export declare const toEffectSchema: (root: JsonSchemaType, _defs?: JsonSchemaType['$defs']) => Schema.Schema.AnyNoContext;
 //# sourceMappingURL=json-schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAkB3C,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,oBAAoB,CAAC;AAG5B,oBAAY,QAAQ;IAClB,IAAI,IAAI;IACR,MAAM,IAAI,CAAE,yBAAyB;IACrC,MAAM,IAAI;IACV,OAAO,IAAI;IACX,IAAI,IAAI;IACR,GAAG,IAAI;IACP,MAAM,IAAI;IACV,IAAI,IAAI;CACT;AAGD,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,KAAG,MAiB5C,CAAC;AAIF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AAIH,eAAO,MAAM,YAAY,GACvB,QAAQ,MAAM,CAAC,MAAM,CAAC,GAAG,EACzB,UAAS,iBAAsB,KAC9B,KAAK,CAAC,WAAW,CAAC,cAAc,CAqBlC,CAAC;AAkEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,cAAc,EAAE,QAAQ,cAAc,CAAC,OAAO,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,YA0GpG,CAAC"}
+{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../../../../src/internal/JsonSchema/json-schema.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAS3C,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAYxC,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,oBAAoB,CAAC;AAG5B,oBAAY,QAAQ;IAClB,IAAI,IAAI;IACR,MAAM,IAAI,CAAE,yBAAyB;IACrC,MAAM,IAAI;IACV,OAAO,IAAI;IACX,IAAI,IAAI;IACR,GAAG,IAAI;IACP,MAAM,IAAI;IACV,IAAI,IAAI;CACT;AAGD,eAAO,MAAM,UAAU,UAAW,QAAQ,KAAG,MAiB5C,CAAC;AAIF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AAIH,eAAO,MAAM,YAAY,WACf,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,YACjC,iBAAiB,KACzB,KAAK,CAAC,WAAW,CAAC,cAAc,CAgClC,CAAC;AAkEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,SAAU,cAAc,UAAU,cAAc,CAAC,OAAO,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,YA0GpG,CAAC"}

package/dist/types/src/internal/Obj/atoms.d.ts

@@ -0,0 +1,38 @@
+import * as Atom from '@effect-atom/atom/Atom';
+import type * as Entity from '../../Entity';
+import type * as Obj from '../../Obj';
+import type * as Ref from '../../Ref';
+import type * as Relation from '../../Relation';
+/**
+ * Create a read-only snapshot atom for a reactive object or ref.
+ * Updates automatically when the object is mutated.
+ * For refs, subscribes to target object changes after loading.
+ */
+export declare const makeAtom: {
+    <T extends Obj.Unknown>(obj: T): Atom.Atom<Obj.Snapshot<T>>;
+    <T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<Obj.Snapshot<T> | undefined>;
+};
+/**
+ * Create a read-only atom for a specific property of a reactive object.
+ * Only fires updates when the property value actually changes.
+ */
+export declare const makeProperty: <T extends Obj.Unknown, K extends keyof T>(obj: T, key: K) => Atom.Atom<T[K]>;
+/**
+ * Like `makeAtom` but returns the live reactive object instead of a snapshot.
+ * Prefer `makeAtom` (snapshot) unless you need the live Obj for generic mutations.
+ */
+export declare const makeWithReactive: {
+    <T extends Obj.Unknown>(obj: T): Atom.Atom<T>;
+    <T extends Obj.Unknown>(ref: Ref.Ref<T>): Atom.Atom<T | undefined>;
+};
+/**
+ * Create a read-only snapshot atom for any ECHO entity (obj or relation).
+ * Updates automatically when the entity is mutated.
+ */
+export declare const makeEntity: <T extends Entity.Unknown>(entity: T) => Atom.Atom<Entity.Snapshot>;
+/**
+ * Create a read-only snapshot atom for a reactive relation.
+ * Updates automatically when the relation is mutated.
+ */
+export declare const makeRelation: <T extends Relation.Unknown>(relation: T) => Atom.Atom<Relation.Snapshot<T>>;
+//# sourceMappingURL=atoms.d.ts.map

package/dist/types/src/internal/Obj/atoms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"atoms.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Obj/atoms.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAQ/C,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,KAAK,GAAG,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,KAAK,GAAG,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAwKhD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,EAAE;IACrB,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;CASlF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAGrG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;CASpE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,MAAM,CAAC,OAAO,UAAU,CAAC,KAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAGzF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,CAAC,OAAO,YAAY,CAAC,KAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAGpG,CAAC"}

package/dist/types/src/internal/Obj/clone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Obj/clone.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,GAAG,MAAM,WAAW,CAAC;AAKtC;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,CAAC,YAAY,KAAG,CA8B1E,CAAC"}
+{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Obj/clone.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,GAAG,MAAM,WAAW,CAAC;AAMtC;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,CAAC,GAAG,OAAO,CAAC,SAAS,GAAG,CAAC,YAAY,KAAG,CAkC1E,CAAC"}