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

package/dist/types/src/internal/Annotation/annotations.d.ts

@@ -1,10 +1,11 @@
+import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
-import { DXN } from '@dxos/keys';
+import { DXN, URI } from '@dxos/keys';
 import { type Primitive } from '@dxos/util';
+import type * as Annotation from '../../Annotation';
 import { type Mutable } from '../common/proxy';
 import { type AnyProperties, EntityKind } from '../common/types';
-import { type AnnotationHelper } from './util';
 /**
  * Sets the path for the field.
  * @param path Data source path in the json path format. This is the field path in the source object.
@@ -17,17 +18,17 @@ export declare const FieldPath: (path: string) => <A, I, R>(self: Schema.Schema<
 export declare const TypeIdentifierAnnotationId: unique symbol;
 export declare const getTypeIdentifierAnnotation: (schema: Schema.Schema.All) => string | undefined;
 /**
- * @returns DXN of the schema.
+ * @returns The schema's type identifier URI — whichever URI fits.
  *
- * For non-stored schema returns `dxn:type:`.
- * For stored schema returns `dxn:echo:`.
- */
-export declare const getSchemaDXN: (schema: Schema.Schema.All) => DXN | undefined;
-/**
- * @param input schema or a typename string.
- * @return type DXN.
+ * - Stored (dynamic) schemas: the schema-as-object's EID, so loaded objects ride
+ *   along with their schema as a strong dependency.
+ * - Non-stored (static) schemas: the typename DXN built from `TypeAnnotation`.
+ *
+ * This URI is what gets written to an object's `system.type`; queries that filter by
+ * type also use it (see `Filter.type` / `getTypeURIFromSpecifier`), so both sides
+ * stay symmetric without per-schema branching.
  */
-export declare const getTypeDXNFromSpecifier: (input: Schema.Schema.All | string) => DXN;
+export declare const getSchemaURI: (schema: Schema.Schema.All) => URI.URI | undefined;
 /**
  * Fully qualified globally unique typename.
  * Example: `org.dxos.type.message`
@@ -60,12 +61,12 @@ export declare const TypeAnnotation: Schema.extend<Schema.Struct<{
      * If this is a relation, the schema of the source object.
      * Must be present if entity kind is {@link EntityKind.Relation}.
      */
-    sourceSchema: Schema.optional<Schema.refine<string, typeof Schema.NonEmptyString>>;
+    sourceSchema: Schema.optional<Schema.Schema<DXN.DXN, DXN.DXN, never>>;
     /**
      * If this is a relation, the schema of the target object.
      * Must be present if entity kind is {@link EntityKind.Relation}.
      */
-    targetSchema: Schema.optional<Schema.refine<string, typeof Schema.NonEmptyString>>;
+    targetSchema: Schema.optional<Schema.Schema<DXN.DXN, DXN.DXN, never>>;
 }>>;
 export interface TypeAnnotation extends Schema.Schema.Type<typeof TypeAnnotation> {
 }
@@ -78,16 +79,6 @@ export declare const getTypeAnnotation: (schema: Schema.Schema.All) => TypeAnnot
  * @returns {@link EntityKind} from a schema.
  */
 export declare const getEntityKind: (schema: Schema.Schema.All) => EntityKind | undefined;
-/**
- * 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: <Schema extends Schema.Schema.AnyNoContext>(schema: Schema, object: any) => object is Schema.Schema.Type<Schema>;
 /**
  * PropertyMeta (metadata for dynamic schema properties).
  * For user-defined annotations.
@@ -97,6 +88,12 @@ export type PropertyMetaValue = Primitive | Record<string, Primitive> | Primitiv
 export type PropertyMetaAnnotation = {
     [name: string]: PropertyMetaValue;
 };
+/**
+ * Apply property-level metadata to an Effect schema. Only accepts
+ * `Schema.Schema.Any` — apply BEFORE wrapping the schema with
+ * `Type.makeObject` / `Type.makeRelation`. To read property meta off a
+ * `Type.Type` entity, unwrap it first with `Type.getSchema(entity)`.
+ */
 export declare const PropertyMeta: (name: string, value: PropertyMetaValue) => <A, I, R>(self: Schema.Schema<A, I, R>) => Schema.Schema<A, I, R>;
 export declare const getPropertyMetaAnnotation: <T>(prop: SchemaAST.PropertySignature, name: string) => T | undefined;
 /**
@@ -104,7 +101,7 @@ export declare const getPropertyMetaAnnotation: <T>(prop: SchemaAST.PropertySign
  */
 export declare const ReferenceAnnotationId: unique symbol;
 export type ReferenceAnnotationValue = TypeAnnotation;
-export declare const ReferenceAnnotation: AnnotationHelper<TypeAnnotation>;
+export declare const ReferenceAnnotation: import("./util").AnnotationHelper<TypeAnnotation>;
 /**
  * SchemaMeta.
  */
@@ -113,16 +110,16 @@ export type SchemaMeta = TypeMeta & {
     id: string;
 };
 /**
- * Identifies a schema as a schema for a hidden system type.
+ * Identifies a schema as hidden from user-facing surfaces (like dotfiles — visible only via an advanced setting).
  */
-export declare const SystemTypeAnnotationId: unique symbol;
-export declare const SystemTypeAnnotation: AnnotationHelper<boolean>;
+export declare const HiddenAnnotationId: unique symbol;
+export declare const HiddenAnnotation: import("./util").AnnotationHelper<boolean>;
 /**
  * Identifies label property or JSON path expression.
  * Either a string or an array of strings representing field accessors each matched in priority order.
  */
 export declare const LabelAnnotationId: unique symbol;
-export declare const LabelAnnotation: AnnotationHelper<string[]>;
+export declare const LabelAnnotation: import("./util").AnnotationHelper<string[]>;
 /**
  * Returns the label for a given object based on {@link LabelAnnotationId}.
  * Lower-level version that requires explicit schema parameter.
@@ -139,7 +136,7 @@ export declare const setLabelWithSchema: <S extends Schema.Schema.Any>(schema: S
  * A string representing field accessor.
  */
 export declare const DescriptionAnnotationId: unique symbol;
-export declare const DescriptionAnnotation: AnnotationHelper<string>;
+export declare const DescriptionAnnotation: import("./util").AnnotationHelper<string>;
 /**
  * Returns the description for a given object based on {@link DescriptionAnnotationId}.
  * Lower-level version that requires explicit schema parameter.
@@ -155,7 +152,13 @@ export declare const setDescriptionWithSchema: <S extends Schema.Schema.Any>(sch
  * By default, all properties are included in forms, so this is opt-out.
  */
 export declare const FormInputAnnotationId: unique symbol;
-export declare const FormInputAnnotation: AnnotationHelper<boolean>;
+export declare const FormInputAnnotation: import("./util").AnnotationHelper<boolean>;
+/**
+ * When set on a `Ref` property, the form renders the referenced object's own
+ * fields inline (a nested form bound to the target) instead of a picker.
+ */
+export declare const FormInlineAnnotationId: unique symbol;
+export declare const FormInlineAnnotation: import("./util").AnnotationHelper<boolean>;
 /**
  * Default field to be used on referenced schema to lookup the value.
  */
@@ -169,12 +172,12 @@ export type GeneratorAnnotationValue = string | {
     args?: any[];
     probability?: number;
 };
-export declare const GeneratorAnnotation: AnnotationHelper<GeneratorAnnotationValue>;
+export declare const GeneratorAnnotation: import("./util").AnnotationHelper<GeneratorAnnotationValue>;
 interface MakeAnnoationsProps<T> {
     id: string;
     schema: Schema.Schema<T, any, never>;
 }
-export declare const makeUserAnnotation: <T>(props: MakeAnnoationsProps<T>) => AnnotationHelper<T>;
+export declare const makeUserAnnotation: <T>(props: MakeAnnoationsProps<T>) => Annotation.Annotation<T>;
 declare const IconAnnotationSchema: Schema.Struct<{
     /**
      * Phosphor icon name (e.g., 'ph--user--regular', 'ph--cube--regular', 'ph--link--regular ', etc.)
@@ -206,7 +209,7 @@ export interface IconAnnotation extends Schema.Schema.Type<typeof IconAnnotation
 /**
  * Icon to render in the UI.
  */
-export declare const IconAnnotation: AnnotationHelper<IconAnnotation>;
+export declare const IconAnnotation: Annotation.Annotation<IconAnnotation>;
 /**
  * Indicates that this entity's icon should be resolved from a property whose value is a `Ref`
  * to another entity. Consumers (e.g. graph node builders) resolve the ref target and use that
@@ -215,12 +218,27 @@ export declare const IconAnnotation: AnnotationHelper<IconAnnotation>;
  * Useful for wrapper schemas that delegate their visual identity to a referenced sub-entity
  * (e.g. a generic `Game` whose icon should come from its `variant` ref's typed state).
  */
-export declare const IconFromRefAnnotation: AnnotationHelper<string>;
+export declare const IconFromRefAnnotation: Annotation.Annotation<string>;
+/**
+ * Options for {@link getLabel}.
+ */
+export type GetLabelOptions = {
+    /**
+     * Strategy for deriving a label when the entity has no `LabelAnnotation` value.
+     * - `'typename'`: use the entity's typename (e.g. `org.dxos.type.table`).
+     *   Useful for Card.Title chrome that must always display something, even
+     *   for unlabeled objects.
+     */
+    fallback?: 'typename';
+};
 /**
  * Get the label of an entity.
  * Accepts both reactive entities and snapshots.
+ *
+ * If `options.fallback === 'typename'` and no label is set, returns the
+ * entity's typename instead.
  */
-export declare const getLabel: (entity: AnyProperties) => string | undefined;
+export declare const getLabel: (entity: AnyProperties, options?: GetLabelOptions) => string | undefined;
 /**
  * Set the label of an entity.
  * Must be called within an Obj.update or Relation.update callback.
@@ -231,10 +249,24 @@ export declare const setLabel: (entity: Mutable<AnyProperties>, label: string) =
  * Accepts both reactive entities and snapshots.
  */
 export declare const getDescription: (entity: AnyProperties) => string | undefined;
+/**
+ * Get the icon annotation for an entity, resolved via its type-level `IconAnnotation`.
+ * Accepts both reactive entities and snapshots.
+ *
+ * Returns the full `{ icon, hue }` annotation so callers can use both the phosphor icon
+ * name and the suggested colour. Callers wanting just the icon name typically write
+ * `Obj.getIcon(obj)?.icon ?? 'ph--cube--regular'`.
+ *
+ * Note: this is the "static" icon from the object's own schema. It does not follow
+ * `IconFromRefAnnotation` delegation — call sites needing that (e.g. app-graph node
+ * builders) should resolve the ref themselves.
+ */
+export declare const getIcon: (entity: AnyProperties) => IconAnnotation | undefined;
 /**
  * Set the description of an entity.
  * Must be called within an Obj.update or Relation.update callback.
  */
 export declare const setDescription: (entity: Mutable<AnyProperties>, description: string) => void;
-export {};
+export { Dictionary, Key, getDictionary, setDictionary } from './dictionary';
+export declare const getFromAst: <T>(ast: SchemaAST.AST, annotation: Annotation.Annotation<T>) => Option.Option<T>;
 //# sourceMappingURL=annotations.d.ts.map

package/dist/types/src/internal/Annotation/annotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/annotations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/annotations.ts"],"names":[],"mappings":"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"}

package/dist/types/src/internal/Annotation/dictionary.d.ts

@@ -0,0 +1,24 @@
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
+import * as Types from 'effect/Types';
+import type * as Annotation from '../../Annotation';
+/**
+ * Unique identifier for an annotation.
+ */
+export declare const Key: Schema.brand<typeof Schema.String, "~@dxos/echo/AnnotationKey">;
+export type Key = Schema.Schema.Type<typeof Key>;
+/**
+ * Set of annotation values stored on entity meta or nested in schemas.
+ */
+export declare const Dictionary: Schema.Record$<Schema.brand<typeof Schema.String, "~@dxos/echo/AnnotationKey">, typeof Schema.Unknown>;
+export interface Dictionary extends Schema.Schema.Type<typeof Dictionary> {
+}
+/**
+ * Get the value of an annotation from a dictionary.
+ */
+export declare const getDictionary: <T>(values: Annotation.Dictionary, annotation: Annotation.Annotation<T>) => Option.Option<T>;
+/**
+ * Set the value of an annotation in a dictionary.
+ */
+export declare const setDictionary: <T>(values: Types.Mutable<Annotation.Dictionary>, annotation: Annotation.Annotation<T>, value: T) => void;
+//# sourceMappingURL=dictionary.d.ts.map

package/dist/types/src/internal/Annotation/dictionary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dictionary.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/dictionary.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAEpD;;GAEG;AACH,eAAO,MAAM,GAAG,iEAAgE,CAAC;AACjF,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;AAEjD;;GAEG;AACH,eAAO,MAAM,UAAU,wGAAqD,CAAC;AAC7E,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;CAAG;AAE5E;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,UACrB,UAAU,CAAC,UAAU,cACjB,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAMjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,UACrB,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,cAChC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,SAC7B,CAAC,KACP,IAEF,CAAC"}

package/dist/types/src/internal/Annotation/entity-dictionary.d.ts

@@ -0,0 +1,14 @@
+import * as Option from 'effect/Option';
+import type * as Annotation from '../../Annotation';
+import type * as Entity from '../../Entity';
+import { type Mutable } from '../common/proxy/reactive';
+/**
+ * Get the value of an annotation from an entity instance or snapshot.
+ */
+export declare const get: <T>(target: Entity.Unknown | Entity.Snapshot, annotation: Annotation.Annotation<T>) => Option.Option<T>;
+/**
+ * Set the value of an annotation on an entity instance.
+ * Must be called with a mutable entity — i.e. inside an `Obj.update` callback.
+ */
+export declare const set: <T>(target: Mutable<Entity.Unknown>, annotation: Annotation.Annotation<T>, value: T) => void;
+//# sourceMappingURL=entity-dictionary.d.ts.map

package/dist/types/src/internal/Annotation/entity-dictionary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-dictionary.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/entity-dictionary.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,UAAU,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAIxD;;GAEG;AACH,eAAO,MAAM,GAAG,GAAI,CAAC,UACX,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,cAC5B,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,KACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAOjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,GAAG,GAAI,CAAC,UAAU,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,KAAG,IAOxG,CAAC"}

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

@@ -1,4 +1,6 @@
-export * from './annotations';
-export * from './sorting';
+export * from './dictionary';
 export * from './util';
+export * from './sorting';
+export * from './annotations';
+export * from './entity-dictionary';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/index.ts"],"names":[],"mappings":"AAIA,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC"}

package/dist/types/src/internal/Annotation/util.d.ts

@@ -1,10 +1,15 @@
-import type * as Option from 'effect/Option';
+import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 import { EntityKind } from '../common/types';
 export interface AnnotationHelper<T> {
     /**
-     * Get the annotation value from the schema.
+     * Get the annotation value from an Effect schema.
+     *
+     * Only accepts `Schema.Schema.Any` — to read an annotation off a `Type.Type`
+     * entity, unwrap it first with `Type.getSchema(entity)`. This keeps the
+     * annotation pipeline single-shaped and forces annotations to live on the
+     * source schema, not on the post-construction Type entity.
      */
     get: (schema: Schema.Schema.Any) => Option.Option<T>;
     /**
@@ -12,7 +17,11 @@ export interface AnnotationHelper<T> {
      */
     getFromAst: (ast: SchemaAST.AST) => Option.Option<T>;
     /**
-     * Set the annotation value on the schema.
+     * Set the annotation on an Effect schema.
+     *
+     * Only accepts `Schema.Schema.Any` — annotations must be applied to the
+     * source schema BEFORE wrapping it with `Type.makeObject` / `Type.makeRelation`.
+     * In a pipe, place every `Annotation.X.set(...)` before the `Type.make...` step.
      */
     set: (value: T) => <S extends Schema.Schema.Any>(schema: S) => S;
 }
@@ -35,5 +44,5 @@ export declare const makeTypeJsonSchemaAnnotation: (options: {
     version: string;
     relationSource?: string;
     relationTarget?: string;
-}) => any;
+}) => Record<string, unknown>;
 //# sourceMappingURL=util.d.ts.map

package/dist/types/src/internal/Annotation/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/util.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAK9C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC;;OAEG;IACH,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrD;;OAEG;IACH,UAAU,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrD;;OAEG;IACH,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;CAClE;AAED;;GAEG;AAEH,eAAO,MAAM,sBAAsB,GAAI,CAAC,MAAM,MAAM,KAAG,gBAAgB,CAAC,CAAC,CASxE,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,cAAc,aAAc,SAAS,CAAC,iBAAiB,gDAMnE,CAAC;AAEF;;;GAGG;AAEH,eAAO,MAAM,4BAA4B,YAAa;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QAiBA,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Annotation/util.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAK9C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC;;;;;;;OAOG;IACH,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrD;;OAEG;IACH,UAAU,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrD;;;;;;OAMG;IACH,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;CAClE;AAED;;GAEG;AAGH,eAAO,MAAM,sBAAsB,GAAI,CAAC,MAAM,MAAM,KAAG,gBAAgB,CAAC,CAAC,CASxE,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,cAAc,aAAc,SAAS,CAAC,iBAAiB,gDAMnE,CAAC;AAEF;;;GAGG;AAEH,eAAO,MAAM,4BAA4B,YAAa;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,4BAgBA,CAAC"}

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

@@ -1,10 +1,10 @@
-import { type DXN } from '@dxos/keys';
+import { type EID } from '@dxos/keys';
 import type { AnyEntity } from '../common/types';
 /**
- * Get the DXN of an entity.
+ * Get the canonical EID of an entity.
  * Accepts both reactive entities and snapshots.
  */
-export declare const getDXN: (entity: AnyEntity) => DXN;
+export declare const getUri: (entity: AnyEntity) => EID.EID;
 /**
  * Get the database the entity belongs to.
  * Accepts both reactive entities and snapshots.

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

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/api.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD;;;GAGG;AACH,eAAO,MAAM,MAAM,WAAY,SAAS,KAAG,GAI1C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,WAAY,SAAS,KAAG,GAAG,GAAG,SAGrD,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/api.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjD;;;GAGG;AACH,eAAO,MAAM,MAAM,WAAY,SAAS,KAAG,GAAG,CAAC,GAI9C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,WAAY,SAAS,KAAG,GAAG,GAAG,SAGrD,CAAC"}

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

@@ -1,20 +1,84 @@
 import * as Schema from 'effect/Schema';
 import type * as Types from 'effect/Types';
+import { DXN, EntityId } from '@dxos/keys';
 import { type ToMutable } from '@dxos/util';
-import { type TypeMeta } from '../Annotation';
-import { type AnyEntity, type EntityKind, SchemaKindId } from '../common/types';
+import { type AnyEntity, EntityKind, InstancePhantomId, KindId, SchemaKindId, StaticTypeSchemaSlot } from '../common/types';
+import { JsonSchemaType } from '../JsonSchema/json-schema-type';
 export type EchoTypeSchemaProps<T, ExtraFields = {}> = Types.Simplify<AnyEntity & ToMutable<T> & ExtraFields>;
-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>> {
+/**
+ * Options accepted by every `Type.makeObject` / `Type.makeRelation` / type-kind
+ * factory. Defaults are derived from `(typename, version)` so callers normally
+ * pass nothing.
+ */
+export type EchoTypeOptions = {
     /**
-     * Schema kind key that marks this as an ECHO schema and indicates its kind.
-     * Makes EchoTypeSchema satisfy the Type.AnyObj or Type.Relation.Any type.
+     * 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).
+     * Pass an explicit id (typically `EntityId.random()`) to opt out of the
+     * deterministic default.
      */
+    id?: EntityId;
+};
+/**
+ * In-memory `Type.Type` entity shape produced by `Type.makeObject(dxn)` /
+ * `Type.makeRelation({...})`. A live reactive `TypeSchema` instance —
+ * identical to a persisted `Type.Type` except for database attachment.
+ *
+ * NOT a `Schema.Schema`. The underlying Effect Schema is cached on the hidden
+ * `StaticTypeSchemaSlot` slot — retrieve it via `Type.getSchema(...)`.
+ */
+export interface EchoTypeSchema<Self extends Schema.Schema.Any, ExtraFields = {}, K extends EntityKind = EntityKind, Fields extends Schema.Struct.Fields = Schema.Struct.Fields> {
+    /**
+     * Entity-kind brand. Type entities are their own kind (`Type`) regardless of
+     * the kind of instance they describe — `[SchemaKindId]` carries the latter.
+     * This lets predicates like `Obj.isObject` / `Relation.isRelation` cleanly
+     * reject type entities without also having to inspect `[SchemaKindId]`.
+     */
+    readonly [KindId]: EntityKind.Type;
+    /** Schema-kind brand indicating what kind of instance this type describes. */
     readonly [SchemaKindId]: K;
     /**
-     * The fields defined in the original struct schema.
-     * Allows accessing field definitions for introspection.
+     * Entity id. Always present — stamped at construction — but NOT the type's
+     * identity while in-memory: an unattached type resolves its URI to the typename
+     * DXN, switching to `echo:/<id>` only once attached to a database (see
+     * `getTypeURIFromSpecifier`, which discriminates by database attachment).
      */
+    readonly id: EntityId;
+    /** Source Effect Schema (kept on a hidden slot for `Type.getSchema`). */
+    readonly [StaticTypeSchemaSlot]: Schema.Schema.AnyNoContext;
+    readonly jsonSchema: JsonSchemaType;
+    /** Struct fields for introspection. */
     readonly fields: Fields;
-    instanceOf(value: unknown): boolean;
+    /** Phantom — instance type produced by `Obj.make(self, ...)`. */
+    readonly _instance?: EchoTypeSchemaProps<Schema.Schema.Type<Self>, ExtraFields>;
+    /**
+     * Phantom slot mirroring `Type<A>` so internal helpers (`makeObject`,
+     * `createObject`, `Ref.make`) infer the instance type uniformly whether
+     * the caller passes an `EchoTypeSchema` or a top-level `Type.Type` entity.
+     *
+     * Includes the instance-kind brand (`[KindId]`) so the phantom is assignable
+     * to the matching public-side interface in `Type.ts` (`Type.Obj` /
+     * `Type.Relation` / `Type.Type`). Each kind projects identity: instances of
+     * an object-kind schema are object-kind entities, type-kind schemas produce
+     * type-kind (persisted Type.Type) entities — the latter additionally carry
+     * the `[SchemaKindId]` / `[StaticTypeSchemaSlot]` brands the echo-handler
+     * proxy exposes on persisted Type entities.
+     */
+    readonly [InstancePhantomId]?: EchoTypeSchemaProps<Schema.Schema.Type<Self>, ExtraFields> & {
+        readonly [KindId]: K;
+    } & (K extends EntityKind.Type ? {
+        readonly [SchemaKindId]: EntityKind.Type;
+        readonly [StaticTypeSchemaSlot]: Schema.Schema.AnyNoContext;
+    } : {});
 }
+/**
+ * Identity (typename + version) of the type meta-schema — the `Type.Type` that
+ * every ECHO type entity is itself an instance of. Shared by the materialisation
+ * vehicle ({@link persistentEntitySchema}) and `TypeSchema` so the two cannot
+ * drift on identity.
+ */
+export declare const TypeMetaSchemaDXN: DXN.DXN;
+export { isEntity } from './guard';
 //# sourceMappingURL=entity.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/entity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKhF,MAAM,MAAM,mBAAmB,CAAC,CAAC,EAAE,WAAW,GAAG,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;AAG9G,MAAM,WAAW,cAAc,CAC7B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,WAAW,GAAG,EAAE,EAChB,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAE1D,SACE,QAAQ,EACR,MAAM,CAAC,cAAc,CACnB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,CAAC,EAC5C,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,EAC1D,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,EAC7D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAC5B;IACH;;;OAGG;IACH,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;CACrC"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/entity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAO5C,OAAO,EACL,KAAK,SAAS,EACd,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,YAAY,EACZ,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAKhE,MAAM,MAAM,mBAAmB,CAAC,CAAC,EAAE,WAAW,GAAG,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;AAE9G;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;;OAOG;IACH,EAAE,CAAC,EAAE,QAAQ,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AAEH,MAAM,WAAW,cAAc,CAC7B,IAAI,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAC9B,WAAW,GAAG,EAAE,EAChB,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,MAAM,SAAS,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM;IAE1D;;;;;OAKG;IACH,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;IAEnC,8EAA8E;IAC9E,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IAEtB,yEAAyE;IACzE,QAAQ,CAAC,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAK5D,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAEpC,uCAAuC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,iEAAiE;IACjE,QAAQ,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;IAEhF;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,GAAG;QAC1F,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACtB,GAAG,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,GACxB;QACE,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;QACzC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;KAC7D,GACD,EAAE,CAAC,CAAC;CACX;AAiCD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,SAA4C,CAAC;AAuH3E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC"}

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

@@ -0,0 +1,10 @@
+import type * as Entity from '../../Entity';
+/**
+ * Returns true if the value is an ECHO entity instance (object or relation).
+ */
+export declare const isEntity: (value: unknown) => value is Entity.Unknown;
+/**
+ * Returns true if the value is an ECHO entity snapshot.
+ */
+export declare const isSnapshot: (value: unknown) => value is Entity.Snapshot;
+//# sourceMappingURL=guard.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"guard.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/guard.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAG5C;;GAEG;AACH,eAAO,MAAM,QAAQ,UAAW,OAAO,KAAG,KAAK,IAAI,MAAM,CAAC,OAKzD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,UAAW,OAAO,KAAG,KAAK,IAAI,MAAM,CAAC,QAK3D,CAAC"}

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

@@ -3,6 +3,8 @@ export * from './entity';
 export * from './model';
 export * from './object';
 export * from './relation';
+export * from './type-kind';
+export * from './type-uri';
 export * from './util';
 export * from './version';
 //# sourceMappingURL=index.d.ts.map

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

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

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

@@ -1,33 +1,34 @@
 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 MetaId, type EntityMeta } from '../common/types/meta';
+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;
@@ -37,14 +38,14 @@ export interface ObjectMetaJSON {
  * 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":"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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/internal/Entity/model.ts"],"names":[],"mappings":"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"}

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"}