@dxos/echo 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/dist/lib/browser/index.mjs

@@ -1,49 +1,49 @@
 import "@dxos/node-std/globals";
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
-// packages/core/echo/echo/src/api/index.ts
-import { Format } from "@dxos/echo-schema";
+// packages/core/echo/echo/src/index.ts
 import { DXN } from "@dxos/keys";
 
-// packages/core/echo/echo/src/api/type.ts
-import { EchoObject, EntityKind, Expando as Expando$, ObjectId as ObjectId$, Ref as Ref$, SpaceIdSchema as SpaceIdSchema$, getTypeAnnotation, getSchema as getSchema$, getSchemaDXN, getSchemaTypename, getSchemaVersion, isInstanceOf, toJsonSchema as toJsonSchema$ } from "@dxos/echo-schema";
-import { invariant } from "@dxos/invariant";
-import { SpaceId as SpaceId$ } from "@dxos/keys";
-import { live as live$ } from "@dxos/live-object";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/api/type.ts";
-var Type;
-(function(Type2) {
-  Type2.SpaceIdSchema = SpaceIdSchema$;
-  Type2.SpaceId = SpaceId$;
-  Type2.ObjectId = ObjectId$;
-  Type2.Kind = EntityKind;
-  Type2.Expando = Expando$;
-  Type2.create = live$;
-  Type2.def = (meta) => EchoObject(meta);
-  Type2.Ref = (self) => Ref$(self);
-  Type2.ref = Ref$.make;
-  Type2.getMeta = getTypeAnnotation;
-  Type2.getSchema = getSchema$;
-  Type2.instanceOf = isInstanceOf;
-  Type2.getDXN = getSchemaDXN;
-  Type2.getTypename = (schema) => {
-    const typename = getSchemaTypename(schema);
-    invariant(typename, "Invalid object", {
-      F: __dxlog_file,
-      L: 138,
-      S: this,
-      A: [
-        "typename",
-        "'Invalid object'"
-      ]
-    });
-    return typename;
-  };
-  Type2.getVersion = getSchemaVersion;
-  Type2.toJsonSchema = toJsonSchema$;
-})(Type || (Type = {}));
+// packages/core/echo/echo/src/Database.ts
+var Database_exports = {};
+
+// packages/core/echo/echo/src/Queue.ts
+var Queue_exports = {};
+
+// packages/core/echo/echo/src/Space.ts
+var Space_exports = {};
+
+// packages/core/echo/echo/src/Type.ts
+var Type_exports = {};
+__export(Type_exports, {
+  Kind: () => EntityKind,
+  ObjectId: () => ObjectId,
+  Ref: () => Ref,
+  create: () => create,
+  def: () => def,
+  getDXN: () => getSchemaDXN,
+  getMeta: () => getTypeAnnotation,
+  getSchema: () => getSchema,
+  getTypename: () => getSchemaTypename,
+  getVersion: () => getSchemaVersion,
+  instanceOf: () => isInstanceOf,
+  ref: () => ref
+});
+import { EchoObject, EntityKind, ObjectId, Ref as Ref$, getTypeAnnotation, getSchema, getSchemaDXN, getSchemaTypename, getSchemaVersion, isInstanceOf } from "@dxos/echo-schema";
+import { live as create$, makeRef } from "@dxos/live-object";
+var ref = makeRef;
+var create = create$;
+var def = (meta) => EchoObject(meta);
+var Ref = (self) => Ref$(self);
 export {
   DXN,
-  Format,
-  Type
+  Database_exports as Database,
+  Queue_exports as Queue,
+  Space_exports as Space,
+  Type_exports as Type
 };
 //# sourceMappingURL=index.mjs.map

package/dist/lib/browser/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/api/index.ts", "../../../src/api/type.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nexport { Format } from '@dxos/echo-schema';\nexport { DXN } from '@dxos/keys';\n\n// export type { Database } from './database';\n// export type { Queue } from './queue';\n// export type { Space } from './space';\n\nexport { Type } from './type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport { type AnyLiveObject as AnyLiveObject$ } from '@dxos/echo-db';\nimport {\n  type BaseEchoObject,\n  type BaseObject,\n  type BaseSchema,\n  type EchoSchema,\n  EchoObject,\n  EntityKind,\n  Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  ObjectId as ObjectId$,\n  Ref as Ref$,\n  SpaceIdSchema as SpaceIdSchema$,\n  type StoredSchema,\n  type TypeMeta,\n  getTypeAnnotation,\n  getSchema as getSchema$,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n  toJsonSchema as toJsonSchema$,\n} from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { SpaceId as SpaceId$ } from '@dxos/keys';\nimport { live as live$ } from '@dxos/live-object';\n\n// TODO(burdon): Type vs. Relation vs. Object.\n\n/**\n * Type System API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport namespace Type {\n  //\n  // Keys\n  //\n\n  export const SpaceIdSchema = SpaceIdSchema$; // TODO(burdon): Reconcile with SpaceId as with ObjectId.\n  export const SpaceId = SpaceId$;\n  export type SpaceId = SpaceId$;\n\n  export const ObjectId = ObjectId$;\n  export type ObjectId = ObjectId$;\n\n  //\n  // Objects\n  //\n\n  export const Kind = EntityKind;\n  export type AnyObject = BaseEchoObject;\n  export type AnyLiveObject<T extends BaseObject> = AnyLiveObject$<T>;\n\n  //\n  // Schema\n  //\n\n  export type JsonSchema = JsonSchemaType;\n\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export const Expando = Expando$;\n  export type Expando = Expando$;\n\n  // TODO(burdon): Review/remove.\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n  export type StoredType = StoredSchema;\n\n  export const create = live$;\n\n  /**\n   * Defines an ECHO type.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Organization = Schema.Struct({\n   *   name: Schema.String,\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Organization',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const def = (meta: TypeMeta) => EchoObject(meta);\n\n  //\n  // Refs\n  //\n\n  /**\n   * Defines a reference to an ECHO object.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Person = Schema.Struct({\n   *   name: Schema.String,\n   *   organization: Type.Ref(Organization),\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Person',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n\n  export const ref = Ref$.make;\n\n  //\n  // Object utils\n  //\n\n  export const getMeta = getTypeAnnotation;\n  export const getSchema = getSchema$;\n  export const instanceOf = isInstanceOf;\n\n  //\n  // Type utils\n  //\n\n  // TODO(burdon): Reconcile getDXN and getTypename.\n  export const getDXN = getSchemaDXN;\n  export const getTypename = (schema: Schema.Schema.AnyNoContext): string => {\n    const typename = getSchemaTypename(schema);\n    invariant(typename, 'Invalid object');\n    return typename;\n  };\n  export const getVersion = getSchemaVersion;\n  export const toJsonSchema = toJsonSchema$;\n}\n"],
-  "mappings": ";;;AAIA,SAASA,cAAc;AACvB,SAASC,WAAW;;;ACEpB,SAKEC,YACAC,YACAC,WAAWC,UAGXC,YAAYC,WACZC,OAAOC,MACPC,iBAAiBC,gBAGjBC,mBACAC,aAAaC,YACbC,cACAC,mBACAC,kBACAC,cACAC,gBAAgBC,qBACX;AACP,SAASC,iBAAiB;AAC1B,SAASC,WAAWC,gBAAgB;AACpC,SAASC,QAAQC,aAAa;;;UAUbC,OAAAA;QAKFhB,gBAAgBC;QAChBW,UAAUC;QAGVjB,WAAWC;QAOXoB,OAAOxB;AAYnB,EAAAuB,MACYtB,UAAUC;QASVuB,SAASH;AAerB,EAAAC,MACYG,MAAM,CAACC,SAAmB5B,WAAW4B,IAAAA;AAoBjD,EAAAJ,MACYlB,MAAM,CAAuCuB,SAAYtB,KAA4BsB,IAAAA;QAErFC,MAAMvB,KAAKwB;QAMXC,UAAUtB;QACVC,YAAYC;QACZqB,aAAajB;QAObkB,SAASrB;QACTsB,cAAc,CAACC,WAAAA;AAC1B,UAAMC,WAAWvB,kBAAkBsB,MAAAA;AACnCjB,cAAUkB,UAAU,kBAAA;;;;;;;;;AACpB,WAAOA;EACT;QACaC,aAAavB;QACbE,eAAeC;AAC9B,GApGiBM,SAAAA,OAAAA,CAAAA,EAAAA;",
-  "names": ["Format", "DXN", "EchoObject", "EntityKind", "Expando", "Expando$", "ObjectId", "ObjectId$", "Ref", "Ref$", "SpaceIdSchema", "SpaceIdSchema$", "getTypeAnnotation", "getSchema", "getSchema$", "getSchemaDXN", "getSchemaTypename", "getSchemaVersion", "isInstanceOf", "toJsonSchema", "toJsonSchema$", "invariant", "SpaceId", "SpaceId$", "live", "live$", "Type", "Kind", "create", "def", "meta", "self", "ref", "make", "getMeta", "instanceOf", "getDXN", "getTypename", "schema", "typename", "getVersion"]
+  "sources": ["../../../src/index.ts", "../../../src/Database.ts", "../../../src/Queue.ts", "../../../src/Space.ts", "../../../src/Type.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { DXN } from '@dxos/keys';\n\nexport { DXN };\n\nexport * as Database from './Database';\nexport * as Queue from './Queue';\nexport * as Space from './Space';\nexport * as Type from './Type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Database API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Database {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Queue API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Queue {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Space API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Space {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport {\n  type BaseSchema,\n  type EchoSchema,\n  type Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  type TypeMeta,\n  EchoObject,\n  EntityKind,\n  ObjectId,\n  Ref as Ref$,\n  getTypeAnnotation,\n  getSchema,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n} from '@dxos/echo-schema';\nimport { live as create$, makeRef } from '@dxos/live-object';\n\n// NOTES:\n// - New Echo package and namespaces allow for incremental migration; vastly simplifies imports.\n// - Split into separate ECHO namespaces: Database, Space, Type, Query, Queue.\n//  - Example; import { Database, Type, Query, Queue } from '@dxos/echo';\n// - Use `declare namespace` for types (no code is generated). See Effect pattern, where Schema is a namespace, interface, and function.\n// - Test with @dxos/schema/testing types.\n// - Define user (Composer) types in namespace (e.g., of plugin) and drop Type suffix; remove all deprecated Braneframe types.\n\nexport type { TypeMeta as Meta, JsonSchemaType as JsonSchema };\nexport {\n  EntityKind as Kind,\n  ObjectId,\n  getTypeAnnotation as getMeta,\n  getSchema,\n  getSchemaDXN as getDXN,\n  getSchemaTypename as getTypename,\n  getSchemaVersion as getVersion,\n  isInstanceOf as instanceOf,\n};\n\n/**\n * Type API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Type {\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export type Expando = Expando$;\n\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n}\n\n//\n// Constructors\n//\n\nexport const ref = makeRef;\nexport const create = create$;\n\n//\n// Combinators\n//\n\n/**\n * Defines an ECHO type.\n *\n * @example\n * ```ts\n * const Organization = S.Struct({\n *   name: S.String,\n * }).pipe(Type.def({ typename: 'example.com/type/Organization', version: '1.0.0' }));\n * ```\n */\nexport const def = (meta: TypeMeta) => EchoObject(meta);\n\n/**\n * Defines a reference to an ECHO object.\n *\n * @example\n * ```ts\n * import { Type } from '@dxos/echo';\n * const Contact = S.Struct({\n *   name: S.String,\n *   organization: Type.Ref(Organization),\n * }).pipe(Type.def({ typename: 'example.com/type/Contact', version: '1.0.0' }));\n * ```\n */\nexport const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n"],
+  "mappings": ";;;;;;;;AAIA,SAASA,WAAW;;;ACJpB;;;ACAA;;;ACAA;;;ACAA;;;;;;;;;;;;;;;AAMA,SAOEC,YACAC,YACAC,UACAC,OAAOC,MACPC,mBACAC,WACAC,cACAC,mBACAC,kBACAC,oBACK;AACP,SAASC,QAAQC,SAASC,eAAe;AA2ClC,IAAMC,MAAMC;AACZ,IAAMC,SAASC;AAgBf,IAAMC,MAAM,CAACC,SAAmBC,WAAWD,IAAAA;AAc3C,IAAME,MAAM,CAAuCC,SAAYC,KAA4BD,IAAAA;",
+  "names": ["DXN", "EchoObject", "EntityKind", "ObjectId", "Ref", "Ref$", "getTypeAnnotation", "getSchema", "getSchemaDXN", "getSchemaTypename", "getSchemaVersion", "isInstanceOf", "live", "create$", "makeRef", "ref", "makeRef", "create", "create$", "def", "meta", "EchoObject", "Ref", "self", "Ref$"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/core/echo/echo/src/api/type.ts":{"bytes":9128,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/api/index.ts":{"bytes":1177,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/api/type.ts","kind":"import-statement","original":"./type"}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":482,"imports":[{"path":"packages/core/echo/echo/src/api/index.ts","kind":"import-statement","original":"./api"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5033},"packages/core/echo/echo/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Format","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/api/index.ts":{"bytesInOutput":78},"packages/core/echo/echo/src/api/type.ts":{"bytesInOutput":1352},"packages/core/echo/echo/src/index.ts":{"bytesInOutput":0}},"bytes":1623}}}
+{"inputs":{"packages/core/echo/echo/src/Database.ts":{"bytes":689,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Queue.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Space.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Type.ts":{"bytes":6078,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":1157,"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/Database.ts","kind":"import-statement","original":"./Database"},{"path":"packages/core/echo/echo/src/Queue.ts","kind":"import-statement","original":"./Queue"},{"path":"packages/core/echo/echo/src/Space.ts","kind":"import-statement","original":"./Space"},{"path":"packages/core/echo/echo/src/Type.ts","kind":"import-statement","original":"./Type"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":4048},"packages/core/echo/echo/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Database","Queue","Space","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/index.ts":{"bytesInOutput":34},"packages/core/echo/echo/src/Database.ts":{"bytesInOutput":27},"packages/core/echo/echo/src/Queue.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Space.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Type.ts":{"bytesInOutput":742}},"bytes":1419}}}

package/dist/lib/node/index.cjs

@@ -19,52 +19,48 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   DXN: () => import_keys.DXN,
-  Format: () => import_echo_schema.Format,
-  Type: () => Type
+  Database: () => Database_exports,
+  Queue: () => Queue_exports,
+  Space: () => Space_exports,
+  Type: () => Type_exports
 });
 module.exports = __toCommonJS(node_exports);
-var import_echo_schema = require("@dxos/echo-schema");
 var import_keys = require("@dxos/keys");
-var import_echo_schema2 = require("@dxos/echo-schema");
-var import_invariant = require("@dxos/invariant");
-var import_keys2 = require("@dxos/keys");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_live_object = require("@dxos/live-object");
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/api/type.ts";
-var Type;
-(function(Type2) {
-  Type2.SpaceIdSchema = import_echo_schema2.SpaceIdSchema;
-  Type2.SpaceId = import_keys2.SpaceId;
-  Type2.ObjectId = import_echo_schema2.ObjectId;
-  Type2.Kind = import_echo_schema2.EntityKind;
-  Type2.Expando = import_echo_schema2.Expando;
-  Type2.create = import_live_object.live;
-  Type2.def = (meta) => (0, import_echo_schema2.EchoObject)(meta);
-  Type2.Ref = (self) => (0, import_echo_schema2.Ref)(self);
-  Type2.ref = import_echo_schema2.Ref.make;
-  Type2.getMeta = import_echo_schema2.getTypeAnnotation;
-  Type2.getSchema = import_echo_schema2.getSchema;
-  Type2.instanceOf = import_echo_schema2.isInstanceOf;
-  Type2.getDXN = import_echo_schema2.getSchemaDXN;
-  Type2.getTypename = (schema) => {
-    const typename = (0, import_echo_schema2.getSchemaTypename)(schema);
-    (0, import_invariant.invariant)(typename, "Invalid object", {
-      F: __dxlog_file,
-      L: 138,
-      S: this,
-      A: [
-        "typename",
-        "'Invalid object'"
-      ]
-    });
-    return typename;
-  };
-  Type2.getVersion = import_echo_schema2.getSchemaVersion;
-  Type2.toJsonSchema = import_echo_schema2.toJsonSchema;
-})(Type || (Type = {}));
+var __defProp2 = Object.defineProperty;
+var __export2 = (target, all) => {
+  for (var name in all)
+    __defProp2(target, name, { get: all[name], enumerable: true });
+};
+var Database_exports = {};
+var Queue_exports = {};
+var Space_exports = {};
+var Type_exports = {};
+__export2(Type_exports, {
+  Kind: () => import_echo_schema.EntityKind,
+  ObjectId: () => import_echo_schema.ObjectId,
+  Ref: () => Ref,
+  create: () => create,
+  def: () => def,
+  getDXN: () => import_echo_schema.getSchemaDXN,
+  getMeta: () => import_echo_schema.getTypeAnnotation,
+  getSchema: () => import_echo_schema.getSchema,
+  getTypename: () => import_echo_schema.getSchemaTypename,
+  getVersion: () => import_echo_schema.getSchemaVersion,
+  instanceOf: () => import_echo_schema.isInstanceOf,
+  ref: () => ref
+});
+var ref = import_live_object.makeRef;
+var create = import_live_object.live;
+var def = (meta) => (0, import_echo_schema.EchoObject)(meta);
+var Ref = (self) => (0, import_echo_schema.Ref)(self);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DXN,
-  Format,
+  Database,
+  Queue,
+  Space,
   Type
 });
 //# sourceMappingURL=index.cjs.map

package/dist/lib/node/index.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/api/index.ts", "../../../src/api/type.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nexport { Format } from '@dxos/echo-schema';\nexport { DXN } from '@dxos/keys';\n\n// export type { Database } from './database';\n// export type { Queue } from './queue';\n// export type { Space } from './space';\n\nexport { Type } from './type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport { type AnyLiveObject as AnyLiveObject$ } from '@dxos/echo-db';\nimport {\n  type BaseEchoObject,\n  type BaseObject,\n  type BaseSchema,\n  type EchoSchema,\n  EchoObject,\n  EntityKind,\n  Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  ObjectId as ObjectId$,\n  Ref as Ref$,\n  SpaceIdSchema as SpaceIdSchema$,\n  type StoredSchema,\n  type TypeMeta,\n  getTypeAnnotation,\n  getSchema as getSchema$,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n  toJsonSchema as toJsonSchema$,\n} from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { SpaceId as SpaceId$ } from '@dxos/keys';\nimport { live as live$ } from '@dxos/live-object';\n\n// TODO(burdon): Type vs. Relation vs. Object.\n\n/**\n * Type System API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport namespace Type {\n  //\n  // Keys\n  //\n\n  export const SpaceIdSchema = SpaceIdSchema$; // TODO(burdon): Reconcile with SpaceId as with ObjectId.\n  export const SpaceId = SpaceId$;\n  export type SpaceId = SpaceId$;\n\n  export const ObjectId = ObjectId$;\n  export type ObjectId = ObjectId$;\n\n  //\n  // Objects\n  //\n\n  export const Kind = EntityKind;\n  export type AnyObject = BaseEchoObject;\n  export type AnyLiveObject<T extends BaseObject> = AnyLiveObject$<T>;\n\n  //\n  // Schema\n  //\n\n  export type JsonSchema = JsonSchemaType;\n\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export const Expando = Expando$;\n  export type Expando = Expando$;\n\n  // TODO(burdon): Review/remove.\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n  export type StoredType = StoredSchema;\n\n  export const create = live$;\n\n  /**\n   * Defines an ECHO type.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Organization = Schema.Struct({\n   *   name: Schema.String,\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Organization',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const def = (meta: TypeMeta) => EchoObject(meta);\n\n  //\n  // Refs\n  //\n\n  /**\n   * Defines a reference to an ECHO object.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Person = Schema.Struct({\n   *   name: Schema.String,\n   *   organization: Type.Ref(Organization),\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Person',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n\n  export const ref = Ref$.make;\n\n  //\n  // Object utils\n  //\n\n  export const getMeta = getTypeAnnotation;\n  export const getSchema = getSchema$;\n  export const instanceOf = isInstanceOf;\n\n  //\n  // Type utils\n  //\n\n  // TODO(burdon): Reconcile getDXN and getTypename.\n  export const getDXN = getSchemaDXN;\n  export const getTypename = (schema: Schema.Schema.AnyNoContext): string => {\n    const typename = getSchemaTypename(schema);\n    invariant(typename, 'Invalid object');\n    return typename;\n  };\n  export const getVersion = getSchemaVersion;\n  export const toJsonSchema = toJsonSchema$;\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,yBAAuB;AACvB,kBAAoB;ACEpB,IAAAA,sBAsBO;AACP,uBAA0B;AAC1B,IAAAC,eAAoC;AACpC,yBAA8B;;;UAUbC,OAAAA;QAKFC,gBAAgBC,oBAAAA;QAChBC,UAAUC,aAAAA;QAGVC,WAAWC,oBAAAA;QAOXC,OAAOC;AAYnBR,QACYS,UAAUC,oBAAAA;QASVC,SAASC,mBAAAA;AAerBZ,QACYa,MAAM,CAACC,aAAmBC,gCAAWD,IAAAA;AAoBjDd,QACYgB,MAAM,CAAuCC,aAAYC,oBAAAA,KAA4BD,IAAAA;QAErFE,MAAMD,oBAAAA,IAAKE;QAMXC,UAAUC;QACVC,YAAYC,oBAAAA;QACZC,aAAaC;QAObC,SAASC;QACTC,cAAc,CAACC,WAAAA;AAC1B,UAAMC,eAAWC,uCAAkBF,MAAAA;AACnCG,oCAAUF,UAAU,kBAAA;;;;;;;;;AACpB,WAAOA;EACT;QACaG,aAAaC;QACbC,eAAeC,oBAAAA;AAC9B,GApGiBrC,SAAAA,OAAAA,CAAAA,EAAAA;",
-  "names": ["import_echo_schema", "import_keys", "Type", "SpaceIdSchema", "SpaceIdSchema$", "SpaceId", "SpaceId$", "ObjectId", "ObjectId$", "Kind", "EntityKind", "Expando", "Expando$", "create", "live$", "def", "meta", "EchoObject", "Ref", "self", "Ref$", "ref", "make", "getMeta", "getTypeAnnotation", "getSchema", "getSchema$", "instanceOf", "isInstanceOf", "getDXN", "getSchemaDXN", "getTypename", "schema", "typename", "getSchemaTypename", "invariant", "getVersion", "getSchemaVersion", "toJsonSchema", "toJsonSchema$"]
+  "sources": ["../../../src/index.ts", "../../../src/Database.ts", "../../../src/Queue.ts", "../../../src/Space.ts", "../../../src/Type.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { DXN } from '@dxos/keys';\n\nexport { DXN };\n\nexport * as Database from './Database';\nexport * as Queue from './Queue';\nexport * as Space from './Space';\nexport * as Type from './Type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Database API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Database {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Queue API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Queue {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Space API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Space {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport {\n  type BaseSchema,\n  type EchoSchema,\n  type Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  type TypeMeta,\n  EchoObject,\n  EntityKind,\n  ObjectId,\n  Ref as Ref$,\n  getTypeAnnotation,\n  getSchema,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n} from '@dxos/echo-schema';\nimport { live as create$, makeRef } from '@dxos/live-object';\n\n// NOTES:\n// - New Echo package and namespaces allow for incremental migration; vastly simplifies imports.\n// - Split into separate ECHO namespaces: Database, Space, Type, Query, Queue.\n//  - Example; import { Database, Type, Query, Queue } from '@dxos/echo';\n// - Use `declare namespace` for types (no code is generated). See Effect pattern, where Schema is a namespace, interface, and function.\n// - Test with @dxos/schema/testing types.\n// - Define user (Composer) types in namespace (e.g., of plugin) and drop Type suffix; remove all deprecated Braneframe types.\n\nexport type { TypeMeta as Meta, JsonSchemaType as JsonSchema };\nexport {\n  EntityKind as Kind,\n  ObjectId,\n  getTypeAnnotation as getMeta,\n  getSchema,\n  getSchemaDXN as getDXN,\n  getSchemaTypename as getTypename,\n  getSchemaVersion as getVersion,\n  isInstanceOf as instanceOf,\n};\n\n/**\n * Type API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Type {\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export type Expando = Expando$;\n\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n}\n\n//\n// Constructors\n//\n\nexport const ref = makeRef;\nexport const create = create$;\n\n//\n// Combinators\n//\n\n/**\n * Defines an ECHO type.\n *\n * @example\n * ```ts\n * const Organization = S.Struct({\n *   name: S.String,\n * }).pipe(Type.def({ typename: 'example.com/type/Organization', version: '1.0.0' }));\n * ```\n */\nexport const def = (meta: TypeMeta) => EchoObject(meta);\n\n/**\n * Defines a reference to an ECHO object.\n *\n * @example\n * ```ts\n * import { Type } from '@dxos/echo';\n * const Contact = S.Struct({\n *   name: S.String,\n *   organization: Type.Ref(Organization),\n * }).pipe(Type.def({ typename: 'example.com/type/Contact', version: '1.0.0' }));\n * ```\n */\nexport const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,kBAAoB;AIEpB,yBAiBO;AACP,yBAAyC;;;;;;AHxBzC,IAAA,mBAAA,CAAA;ACAA,IAAA,gBAAA,CAAA;ACAA,IAAA,gBAAA,CAAA;ACAA,IAAA,eAAA,CAAA;;;;;;;;;;;;;;;AAmEO,IAAMA,MAAMC;AACZ,IAAMC,SAASC,mBAAAA;AAgBf,IAAMC,MAAM,CAACC,aAAmBC,+BAAWD,IAAAA;AAc3C,IAAME,MAAM,CAAuCC,aAAYC,mBAAAA,KAA4BD,IAAAA;",
+  "names": ["ref", "makeRef", "create", "create$", "def", "meta", "EchoObject", "Ref", "self", "Ref$"]
 }

package/dist/lib/node/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/core/echo/echo/src/api/type.ts":{"bytes":9128,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/api/index.ts":{"bytes":1177,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/api/type.ts","kind":"import-statement","original":"./type"}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":482,"imports":[{"path":"packages/core/echo/echo/src/api/index.ts","kind":"import-statement","original":"./api"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5031},"packages/core/echo/echo/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Format","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/api/index.ts":{"bytesInOutput":78},"packages/core/echo/echo/src/api/type.ts":{"bytesInOutput":1352},"packages/core/echo/echo/src/index.ts":{"bytesInOutput":0}},"bytes":1589}}}
+{"inputs":{"packages/core/echo/echo/src/Database.ts":{"bytes":689,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Queue.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Space.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Type.ts":{"bytes":6078,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":1157,"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/Database.ts","kind":"import-statement","original":"./Database"},{"path":"packages/core/echo/echo/src/Queue.ts","kind":"import-statement","original":"./Queue"},{"path":"packages/core/echo/echo/src/Space.ts","kind":"import-statement","original":"./Space"},{"path":"packages/core/echo/echo/src/Type.ts","kind":"import-statement","original":"./Type"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":4047},"packages/core/echo/echo/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Database","Queue","Space","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/index.ts":{"bytesInOutput":34},"packages/core/echo/echo/src/Database.ts":{"bytesInOutput":27},"packages/core/echo/echo/src/Queue.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Space.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Type.ts":{"bytesInOutput":742}},"bytes":1386}}}

package/dist/lib/node-esm/index.mjs

@@ -1,49 +1,49 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
-// packages/core/echo/echo/src/api/index.ts
-import { Format } from "@dxos/echo-schema";
+// packages/core/echo/echo/src/index.ts
 import { DXN } from "@dxos/keys";
 
-// packages/core/echo/echo/src/api/type.ts
-import { EchoObject, EntityKind, Expando as Expando$, ObjectId as ObjectId$, Ref as Ref$, SpaceIdSchema as SpaceIdSchema$, getTypeAnnotation, getSchema as getSchema$, getSchemaDXN, getSchemaTypename, getSchemaVersion, isInstanceOf, toJsonSchema as toJsonSchema$ } from "@dxos/echo-schema";
-import { invariant } from "@dxos/invariant";
-import { SpaceId as SpaceId$ } from "@dxos/keys";
-import { live as live$ } from "@dxos/live-object";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/api/type.ts";
-var Type;
-(function(Type2) {
-  Type2.SpaceIdSchema = SpaceIdSchema$;
-  Type2.SpaceId = SpaceId$;
-  Type2.ObjectId = ObjectId$;
-  Type2.Kind = EntityKind;
-  Type2.Expando = Expando$;
-  Type2.create = live$;
-  Type2.def = (meta) => EchoObject(meta);
-  Type2.Ref = (self) => Ref$(self);
-  Type2.ref = Ref$.make;
-  Type2.getMeta = getTypeAnnotation;
-  Type2.getSchema = getSchema$;
-  Type2.instanceOf = isInstanceOf;
-  Type2.getDXN = getSchemaDXN;
-  Type2.getTypename = (schema) => {
-    const typename = getSchemaTypename(schema);
-    invariant(typename, "Invalid object", {
-      F: __dxlog_file,
-      L: 138,
-      S: this,
-      A: [
-        "typename",
-        "'Invalid object'"
-      ]
-    });
-    return typename;
-  };
-  Type2.getVersion = getSchemaVersion;
-  Type2.toJsonSchema = toJsonSchema$;
-})(Type || (Type = {}));
+// packages/core/echo/echo/src/Database.ts
+var Database_exports = {};
+
+// packages/core/echo/echo/src/Queue.ts
+var Queue_exports = {};
+
+// packages/core/echo/echo/src/Space.ts
+var Space_exports = {};
+
+// packages/core/echo/echo/src/Type.ts
+var Type_exports = {};
+__export(Type_exports, {
+  Kind: () => EntityKind,
+  ObjectId: () => ObjectId,
+  Ref: () => Ref,
+  create: () => create,
+  def: () => def,
+  getDXN: () => getSchemaDXN,
+  getMeta: () => getTypeAnnotation,
+  getSchema: () => getSchema,
+  getTypename: () => getSchemaTypename,
+  getVersion: () => getSchemaVersion,
+  instanceOf: () => isInstanceOf,
+  ref: () => ref
+});
+import { EchoObject, EntityKind, ObjectId, Ref as Ref$, getTypeAnnotation, getSchema, getSchemaDXN, getSchemaTypename, getSchemaVersion, isInstanceOf } from "@dxos/echo-schema";
+import { live as create$, makeRef } from "@dxos/live-object";
+var ref = makeRef;
+var create = create$;
+var def = (meta) => EchoObject(meta);
+var Ref = (self) => Ref$(self);
 export {
   DXN,
-  Format,
-  Type
+  Database_exports as Database,
+  Queue_exports as Queue,
+  Space_exports as Space,
+  Type_exports as Type
 };
 //# sourceMappingURL=index.mjs.map

package/dist/lib/node-esm/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/api/index.ts", "../../../src/api/type.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nexport { Format } from '@dxos/echo-schema';\nexport { DXN } from '@dxos/keys';\n\n// export type { Database } from './database';\n// export type { Queue } from './queue';\n// export type { Space } from './space';\n\nexport { Type } from './type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport { type AnyLiveObject as AnyLiveObject$ } from '@dxos/echo-db';\nimport {\n  type BaseEchoObject,\n  type BaseObject,\n  type BaseSchema,\n  type EchoSchema,\n  EchoObject,\n  EntityKind,\n  Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  ObjectId as ObjectId$,\n  Ref as Ref$,\n  SpaceIdSchema as SpaceIdSchema$,\n  type StoredSchema,\n  type TypeMeta,\n  getTypeAnnotation,\n  getSchema as getSchema$,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n  toJsonSchema as toJsonSchema$,\n} from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { SpaceId as SpaceId$ } from '@dxos/keys';\nimport { live as live$ } from '@dxos/live-object';\n\n// TODO(burdon): Type vs. Relation vs. Object.\n\n/**\n * Type System API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport namespace Type {\n  //\n  // Keys\n  //\n\n  export const SpaceIdSchema = SpaceIdSchema$; // TODO(burdon): Reconcile with SpaceId as with ObjectId.\n  export const SpaceId = SpaceId$;\n  export type SpaceId = SpaceId$;\n\n  export const ObjectId = ObjectId$;\n  export type ObjectId = ObjectId$;\n\n  //\n  // Objects\n  //\n\n  export const Kind = EntityKind;\n  export type AnyObject = BaseEchoObject;\n  export type AnyLiveObject<T extends BaseObject> = AnyLiveObject$<T>;\n\n  //\n  // Schema\n  //\n\n  export type JsonSchema = JsonSchemaType;\n\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export const Expando = Expando$;\n  export type Expando = Expando$;\n\n  // TODO(burdon): Review/remove.\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n  export type StoredType = StoredSchema;\n\n  export const create = live$;\n\n  /**\n   * Defines an ECHO type.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Organization = Schema.Struct({\n   *   name: Schema.String,\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Organization',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const def = (meta: TypeMeta) => EchoObject(meta);\n\n  //\n  // Refs\n  //\n\n  /**\n   * Defines a reference to an ECHO object.\n   *\n   * @example\n   * ```ts\n   * import { Type } from '@dxos/echo';\n   * const Person = Schema.Struct({\n   *   name: Schema.String,\n   *   organization: Type.Ref(Organization),\n   * }).pipe(Type.def({\n   *   typename: 'example.com/type/Person',\n   *   version: '0.1.0',\n   * }));\n   * ```\n   */\n  export const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n\n  export const ref = Ref$.make;\n\n  //\n  // Object utils\n  //\n\n  export const getMeta = getTypeAnnotation;\n  export const getSchema = getSchema$;\n  export const instanceOf = isInstanceOf;\n\n  //\n  // Type utils\n  //\n\n  // TODO(burdon): Reconcile getDXN and getTypename.\n  export const getDXN = getSchemaDXN;\n  export const getTypename = (schema: Schema.Schema.AnyNoContext): string => {\n    const typename = getSchemaTypename(schema);\n    invariant(typename, 'Invalid object');\n    return typename;\n  };\n  export const getVersion = getSchemaVersion;\n  export const toJsonSchema = toJsonSchema$;\n}\n"],
-  "mappings": ";;;AAIA,SAASA,cAAc;AACvB,SAASC,WAAW;;;ACEpB,SAKEC,YACAC,YACAC,WAAWC,UAGXC,YAAYC,WACZC,OAAOC,MACPC,iBAAiBC,gBAGjBC,mBACAC,aAAaC,YACbC,cACAC,mBACAC,kBACAC,cACAC,gBAAgBC,qBACX;AACP,SAASC,iBAAiB;AAC1B,SAASC,WAAWC,gBAAgB;AACpC,SAASC,QAAQC,aAAa;;;UAUbC,OAAAA;QAKFhB,gBAAgBC;QAChBW,UAAUC;QAGVjB,WAAWC;QAOXoB,OAAOxB;AAYnB,EAAAuB,MACYtB,UAAUC;QASVuB,SAASH;AAerB,EAAAC,MACYG,MAAM,CAACC,SAAmB5B,WAAW4B,IAAAA;AAoBjD,EAAAJ,MACYlB,MAAM,CAAuCuB,SAAYtB,KAA4BsB,IAAAA;QAErFC,MAAMvB,KAAKwB;QAMXC,UAAUtB;QACVC,YAAYC;QACZqB,aAAajB;QAObkB,SAASrB;QACTsB,cAAc,CAACC,WAAAA;AAC1B,UAAMC,WAAWvB,kBAAkBsB,MAAAA;AACnCjB,cAAUkB,UAAU,kBAAA;;;;;;;;;AACpB,WAAOA;EACT;QACaC,aAAavB;QACbE,eAAeC;AAC9B,GApGiBM,SAAAA,OAAAA,CAAAA,EAAAA;",
-  "names": ["Format", "DXN", "EchoObject", "EntityKind", "Expando", "Expando$", "ObjectId", "ObjectId$", "Ref", "Ref$", "SpaceIdSchema", "SpaceIdSchema$", "getTypeAnnotation", "getSchema", "getSchema$", "getSchemaDXN", "getSchemaTypename", "getSchemaVersion", "isInstanceOf", "toJsonSchema", "toJsonSchema$", "invariant", "SpaceId", "SpaceId$", "live", "live$", "Type", "Kind", "create", "def", "meta", "self", "ref", "make", "getMeta", "instanceOf", "getDXN", "getTypename", "schema", "typename", "getVersion"]
+  "sources": ["../../../src/index.ts", "../../../src/Database.ts", "../../../src/Queue.ts", "../../../src/Space.ts", "../../../src/Type.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { DXN } from '@dxos/keys';\n\nexport { DXN };\n\nexport * as Database from './Database';\nexport * as Queue from './Queue';\nexport * as Space from './Space';\nexport * as Type from './Type';\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Database API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Database {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Queue API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Queue {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\n/**\n * Space API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Space {}\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Schema } from 'effect';\n\nimport {\n  type BaseSchema,\n  type EchoSchema,\n  type Expando as Expando$,\n  type ImmutableSchema,\n  type JsonSchemaType,\n  type TypeMeta,\n  EchoObject,\n  EntityKind,\n  ObjectId,\n  Ref as Ref$,\n  getTypeAnnotation,\n  getSchema,\n  getSchemaDXN,\n  getSchemaTypename,\n  getSchemaVersion,\n  isInstanceOf,\n} from '@dxos/echo-schema';\nimport { live as create$, makeRef } from '@dxos/live-object';\n\n// NOTES:\n// - New Echo package and namespaces allow for incremental migration; vastly simplifies imports.\n// - Split into separate ECHO namespaces: Database, Space, Type, Query, Queue.\n//  - Example; import { Database, Type, Query, Queue } from '@dxos/echo';\n// - Use `declare namespace` for types (no code is generated). See Effect pattern, where Schema is a namespace, interface, and function.\n// - Test with @dxos/schema/testing types.\n// - Define user (Composer) types in namespace (e.g., of plugin) and drop Type suffix; remove all deprecated Braneframe types.\n\nexport type { TypeMeta as Meta, JsonSchemaType as JsonSchema };\nexport {\n  EntityKind as Kind,\n  ObjectId,\n  getTypeAnnotation as getMeta,\n  getSchema,\n  getSchemaDXN as getDXN,\n  getSchemaTypename as getTypename,\n  getSchemaVersion as getVersion,\n  isInstanceOf as instanceOf,\n};\n\n/**\n * Type API.\n *\n * @category api namespace\n * @since 0.9.0\n */\nexport declare namespace Type {\n  /**\n   * A schema that can be extended with arbitrary properties.\n   */\n  export type Expando = Expando$;\n\n  export type Abstract<T = any> = BaseSchema<T>;\n  export type ImmutableType<T> = ImmutableSchema<T>;\n  export type MutableType<T> = EchoSchema<T>;\n}\n\n//\n// Constructors\n//\n\nexport const ref = makeRef;\nexport const create = create$;\n\n//\n// Combinators\n//\n\n/**\n * Defines an ECHO type.\n *\n * @example\n * ```ts\n * const Organization = S.Struct({\n *   name: S.String,\n * }).pipe(Type.def({ typename: 'example.com/type/Organization', version: '1.0.0' }));\n * ```\n */\nexport const def = (meta: TypeMeta) => EchoObject(meta);\n\n/**\n * Defines a reference to an ECHO object.\n *\n * @example\n * ```ts\n * import { Type } from '@dxos/echo';\n * const Contact = S.Struct({\n *   name: S.String,\n *   organization: Type.Ref(Organization),\n * }).pipe(Type.def({ typename: 'example.com/type/Contact', version: '1.0.0' }));\n * ```\n */\nexport const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);\n"],
+  "mappings": ";;;;;;;;AAIA,SAASA,WAAW;;;ACJpB;;;ACAA;;;ACAA;;;ACAA;;;;;;;;;;;;;;;AAMA,SAOEC,YACAC,YACAC,UACAC,OAAOC,MACPC,mBACAC,WACAC,cACAC,mBACAC,kBACAC,oBACK;AACP,SAASC,QAAQC,SAASC,eAAe;AA2ClC,IAAMC,MAAMC;AACZ,IAAMC,SAASC;AAgBf,IAAMC,MAAM,CAACC,SAAmBC,WAAWD,IAAAA;AAc3C,IAAME,MAAM,CAAuCC,SAAYC,KAA4BD,IAAAA;",
+  "names": ["DXN", "EchoObject", "EntityKind", "ObjectId", "Ref", "Ref$", "getTypeAnnotation", "getSchema", "getSchemaDXN", "getSchemaTypename", "getSchemaVersion", "isInstanceOf", "live", "create$", "makeRef", "ref", "makeRef", "create", "create$", "def", "meta", "EchoObject", "Ref", "self", "Ref$"]
 }

package/dist/lib/node-esm/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/core/echo/echo/src/api/type.ts":{"bytes":9128,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/api/index.ts":{"bytes":1177,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/api/type.ts","kind":"import-statement","original":"./type"}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":482,"imports":[{"path":"packages/core/echo/echo/src/api/index.ts","kind":"import-statement","original":"./api"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5033},"packages/core/echo/echo/dist/lib/node-esm/index.mjs":{"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Format","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/api/index.ts":{"bytesInOutput":78},"packages/core/echo/echo/src/api/type.ts":{"bytesInOutput":1352},"packages/core/echo/echo/src/index.ts":{"bytesInOutput":0}},"bytes":1682}}}
+{"inputs":{"packages/core/echo/echo/src/Database.ts":{"bytes":689,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Queue.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Space.ts":{"bytes":671,"imports":[],"format":"esm"},"packages/core/echo/echo/src/Type.ts":{"bytes":6078,"imports":[{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"format":"esm"},"packages/core/echo/echo/src/index.ts":{"bytes":1157,"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"packages/core/echo/echo/src/Database.ts","kind":"import-statement","original":"./Database"},{"path":"packages/core/echo/echo/src/Queue.ts","kind":"import-statement","original":"./Queue"},{"path":"packages/core/echo/echo/src/Space.ts","kind":"import-statement","original":"./Space"},{"path":"packages/core/echo/echo/src/Type.ts","kind":"import-statement","original":"./Type"}],"format":"esm"}},"outputs":{"packages/core/echo/echo/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":4048},"packages/core/echo/echo/dist/lib/node-esm/index.mjs":{"imports":[{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/live-object","kind":"import-statement","external":true}],"exports":["DXN","Database","Queue","Space","Type"],"entryPoint":"packages/core/echo/echo/src/index.ts","inputs":{"packages/core/echo/echo/src/index.ts":{"bytesInOutput":34},"packages/core/echo/echo/src/Database.ts":{"bytesInOutput":27},"packages/core/echo/echo/src/Queue.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Space.ts":{"bytesInOutput":24},"packages/core/echo/echo/src/Type.ts":{"bytesInOutput":742}},"bytes":1478}}}

package/dist/types/src/{api/database.d.ts → Database.d.ts}

@@ -5,4 +5,4 @@
  * @since 0.9.0
  */
 export declare namespace Database { }
-//# sourceMappingURL=database.d.ts.map
+//# sourceMappingURL=Database.d.ts.map

package/dist/types/src/Database.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../../src/Database.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC,GAAE"}

package/dist/types/src/{api/queue.d.ts → Queue.d.ts}

@@ -5,4 +5,4 @@
  * @since 0.9.0
  */
 export declare namespace Queue { }
-//# sourceMappingURL=queue.d.ts.map
+//# sourceMappingURL=Queue.d.ts.map

package/dist/types/src/Queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../src/Queue.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC,GAAE"}

package/dist/types/src/{api/space.d.ts → Space.d.ts}

@@ -5,4 +5,4 @@
  * @since 0.9.0
  */
 export declare namespace Space { }
-//# sourceMappingURL=space.d.ts.map
+//# sourceMappingURL=Space.d.ts.map

package/dist/types/src/Space.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Space.d.ts","sourceRoot":"","sources":["../../../src/Space.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC,GAAE"}

package/dist/types/src/Type.d.ts

@@ -0,0 +1,49 @@
+import { type Schema } from 'effect';
+import { type BaseSchema, type EchoSchema, type Expando as Expando$, type ImmutableSchema, type JsonSchemaType, type TypeMeta, EntityKind, ObjectId, Ref as Ref$, getTypeAnnotation, getSchema, getSchemaDXN, getSchemaTypename, getSchemaVersion, isInstanceOf } from '@dxos/echo-schema';
+export type { TypeMeta as Meta, JsonSchemaType as JsonSchema };
+export { EntityKind as Kind, ObjectId, getTypeAnnotation as getMeta, getSchema, getSchemaDXN as getDXN, getSchemaTypename as getTypename, getSchemaVersion as getVersion, isInstanceOf as instanceOf, };
+/**
+ * Type API.
+ *
+ * @category api namespace
+ * @since 0.9.0
+ */
+export declare namespace Type {
+    /**
+     * A schema that can be extended with arbitrary properties.
+     */
+    type Expando = Expando$;
+    type Abstract<T = any> = BaseSchema<T>;
+    type ImmutableType<T> = ImmutableSchema<T>;
+    type MutableType<T> = EchoSchema<T>;
+}
+export declare const ref: <T extends import("@dxos/echo-schema").BaseObject>(obj: T) => Ref$<T>;
+export declare const create: {
+    <T extends import("@dxos/echo-schema").BaseObject>(obj: T): import("@dxos/live-object").Live<T>;
+    <T extends import("@dxos/echo-schema").BaseObject>(schema: Schema.Schema<T, any, never>, obj: NoInfer<import("@dxos/echo-schema").ExcludeId<T>>, meta?: import("@dxos/echo-schema").ObjectMeta): import("@dxos/live-object").Live<T>;
+};
+/**
+ * Defines an ECHO type.
+ *
+ * @example
+ * ```ts
+ * const Organization = S.Struct({
+ *   name: S.String,
+ * }).pipe(Type.def({ typename: 'example.com/type/Organization', version: '1.0.0' }));
+ * ```
+ */
+export declare const def: (meta: TypeMeta) => <Self extends Schema.Schema.Any>(self: Self) => import("@dxos/echo-schema").EchoObjectSchema<Self>;
+/**
+ * Defines a reference to an ECHO object.
+ *
+ * @example
+ * ```ts
+ * import { Type } from '@dxos/echo';
+ * const Contact = S.Struct({
+ *   name: S.String,
+ *   organization: Type.Ref(Organization),
+ * }).pipe(Type.def({ typename: 'example.com/type/Contact', version: '1.0.0' }));
+ * ```
+ */
+export declare const Ref: <S extends Schema.Schema.AnyNoContext>(self: S) => import("@dxos/echo-schema").Ref$<Schema.Schema.Type<S>>;
+//# sourceMappingURL=Type.d.ts.map

package/dist/types/src/Type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Type.d.ts","sourceRoot":"","sources":["../../../src/Type.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,OAAO,IAAI,QAAQ,EACxB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,QAAQ,EAEb,UAAU,EACV,QAAQ,EACR,GAAG,IAAI,IAAI,EACX,iBAAiB,EACjB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACb,MAAM,mBAAmB,CAAC;AAW3B,YAAY,EAAE,QAAQ,IAAI,IAAI,EAAE,cAAc,IAAI,UAAU,EAAE,CAAC;AAC/D,OAAO,EACL,UAAU,IAAI,IAAI,EAClB,QAAQ,EACR,iBAAiB,IAAI,OAAO,EAC5B,SAAS,EACT,YAAY,IAAI,MAAM,EACtB,iBAAiB,IAAI,WAAW,EAChC,gBAAgB,IAAI,UAAU,EAC9B,YAAY,IAAI,UAAU,GAC3B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B;;OAEG;IACH,KAAY,OAAO,GAAG,QAAQ,CAAC;IAE/B,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9C,KAAY,aAAa,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAClD,KAAY,WAAW,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;CAC5C;AAMD,eAAO,MAAM,GAAG,uEAAU,CAAC;AAC3B,eAAO,MAAM,MAAM;;;CAAU,CAAC;AAM9B;;;;;;;;;GASG;AACH,eAAO,MAAM,GAAG,SAAU,QAAQ,uGAAqB,CAAC;AAExD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,GAAG,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,QAAQ,CAAC,4DAAsC,CAAC"}

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

@@ -1,2 +1,7 @@
-export * from './api';
+import { DXN } from '@dxos/keys';
+export { DXN };
+export * as Database from './Database';
+export * as Queue from './Queue';
+export * as Space from './Space';
+export * as Type from './Type';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo",
-  "version": "0.8.2-main.2f9c567",
+  "version": "0.8.2-main.36232bc",
   "description": "ECHO API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,19 +22,19 @@
   ],
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
-    "effect": "3.14.21",
-    "@dxos/debug": "0.8.2-main.2f9c567",
-    "@dxos/echo-protocol": "0.8.2-main.2f9c567",
-    "@dxos/echo-db": "0.8.2-main.2f9c567",
-    "@dxos/echo-schema": "0.8.2-main.2f9c567",
-    "@dxos/echo-signals": "0.8.2-main.2f9c567",
-    "@dxos/effect": "0.8.2-main.2f9c567",
-    "@dxos/keys": "0.8.2-main.2f9c567",
-    "@dxos/log": "0.8.2-main.2f9c567",
-    "@dxos/invariant": "0.8.2-main.2f9c567",
-    "@dxos/live-object": "0.8.2-main.2f9c567",
-    "@dxos/node-std": "0.8.2-main.2f9c567",
-    "@dxos/util": "0.8.2-main.2f9c567"
+    "effect": "3.13.3",
+    "@dxos/debug": "0.8.2-main.36232bc",
+    "@dxos/echo-db": "0.8.2-main.36232bc",
+    "@dxos/echo-protocol": "0.8.2-main.36232bc",
+    "@dxos/echo-schema": "0.8.2-main.36232bc",
+    "@dxos/effect": "0.8.2-main.36232bc",
+    "@dxos/echo-signals": "0.8.2-main.36232bc",
+    "@dxos/invariant": "0.8.2-main.36232bc",
+    "@dxos/keys": "0.8.2-main.36232bc",
+    "@dxos/live-object": "0.8.2-main.36232bc",
+    "@dxos/log": "0.8.2-main.36232bc",
+    "@dxos/node-std": "0.8.2-main.36232bc",
+    "@dxos/util": "0.8.2-main.36232bc"
   },
   "publishConfig": {
     "access": "public"

package/src/{api/database.ts → Database.ts}

@@ -8,4 +8,4 @@
  * @category api namespace
  * @since 0.9.0
  */
-export namespace Database {}
+export declare namespace Database {}

package/src/{api/queue.ts → Queue.ts}

@@ -8,4 +8,4 @@
  * @category api namespace
  * @since 0.9.0
  */
-export namespace Queue {}
+export declare namespace Queue {}

package/src/Type.ts

@@ -0,0 +1,99 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Schema } from 'effect';
+
+import {
+  type BaseSchema,
+  type EchoSchema,
+  type Expando as Expando$,
+  type ImmutableSchema,
+  type JsonSchemaType,
+  type TypeMeta,
+  EchoObject,
+  EntityKind,
+  ObjectId,
+  Ref as Ref$,
+  getTypeAnnotation,
+  getSchema,
+  getSchemaDXN,
+  getSchemaTypename,
+  getSchemaVersion,
+  isInstanceOf,
+} from '@dxos/echo-schema';
+import { live as create$, makeRef } from '@dxos/live-object';
+
+// NOTES:
+// - New Echo package and namespaces allow for incremental migration; vastly simplifies imports.
+// - Split into separate ECHO namespaces: Database, Space, Type, Query, Queue.
+//  - Example; import { Database, Type, Query, Queue } from '@dxos/echo';
+// - Use `declare namespace` for types (no code is generated). See Effect pattern, where Schema is a namespace, interface, and function.
+// - Test with @dxos/schema/testing types.
+// - Define user (Composer) types in namespace (e.g., of plugin) and drop Type suffix; remove all deprecated Braneframe types.
+
+export type { TypeMeta as Meta, JsonSchemaType as JsonSchema };
+export {
+  EntityKind as Kind,
+  ObjectId,
+  getTypeAnnotation as getMeta,
+  getSchema,
+  getSchemaDXN as getDXN,
+  getSchemaTypename as getTypename,
+  getSchemaVersion as getVersion,
+  isInstanceOf as instanceOf,
+};
+
+/**
+ * Type API.
+ *
+ * @category api namespace
+ * @since 0.9.0
+ */
+export declare namespace Type {
+  /**
+   * A schema that can be extended with arbitrary properties.
+   */
+  export type Expando = Expando$;
+
+  export type Abstract<T = any> = BaseSchema<T>;
+  export type ImmutableType<T> = ImmutableSchema<T>;
+  export type MutableType<T> = EchoSchema<T>;
+}
+
+//
+// Constructors
+//
+
+export const ref = makeRef;
+export const create = create$;
+
+//
+// Combinators
+//
+
+/**
+ * Defines an ECHO type.
+ *
+ * @example
+ * ```ts
+ * const Organization = S.Struct({
+ *   name: S.String,
+ * }).pipe(Type.def({ typename: 'example.com/type/Organization', version: '1.0.0' }));
+ * ```
+ */
+export const def = (meta: TypeMeta) => EchoObject(meta);
+
+/**
+ * Defines a reference to an ECHO object.
+ *
+ * @example
+ * ```ts
+ * import { Type } from '@dxos/echo';
+ * const Contact = S.Struct({
+ *   name: S.String,
+ *   organization: Type.Ref(Organization),
+ * }).pipe(Type.def({ typename: 'example.com/type/Contact', version: '1.0.0' }));
+ * ```
+ */
+export const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);

package/src/api.test.ts

@@ -2,18 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 import { describe, test } from 'vitest';
 
 import { raise } from '@dxos/debug';
 import { FormatEnum, FormatAnnotation } from '@dxos/echo-schema';
 
-import { Type } from './api';
+// Deliberately testing top-level import as if external consumer for @dxos/echo.
+import { Type } from '.';
 
 namespace Testing {
-  export const Organization = Schema.Struct({
+  export const Organization = S.Struct({
     id: Type.ObjectId,
-    name: Schema.String,
+    name: S.String,
   }).pipe(
     Type.def({
       typename: 'example.com/type/Organization',
@@ -21,46 +22,31 @@ namespace Testing {
     }),
   );
 
-  export interface Organization extends Schema.Schema.Type<typeof Organization> {}
+  export interface Organization extends S.Schema.Type<typeof Organization> {}
 
-  export const Person = Schema.Struct({
-    name: Schema.String,
-    dob: Schema.optional(Schema.String),
-    email: Schema.optional(Schema.String.pipe(FormatAnnotation.set(FormatEnum.Email))),
-    organization: Schema.optional(Type.Ref(Organization)),
+  export const Contact = S.Struct({
+    name: S.String,
+    dob: S.optional(S.String),
+    email: S.optional(S.String.pipe(FormatAnnotation.set(FormatEnum.Email))),
+    organization: S.optional(Type.Ref(Organization)),
   }).pipe(
     Type.def({
-      typename: 'example.com/type/Person',
+      typename: 'example.com/type/Contact',
       version: '0.1.0',
     }),
   );
 
-  export interface Person extends Schema.Schema.Type<typeof Person> {}
+  export interface Contact extends S.Schema.Type<typeof Contact> {}
 
-  export const Message = Schema.Struct({
+  export const Message = S.Struct({
     // TODO(burdon): Support S.Date; Custom Timestamp (with defaults).
     // TODO(burdon): Support defaults (update create and create).
-    timestamp: Schema.String.pipe(
-      Schema.propertySignature,
-      Schema.withConstructorDefault(() => new Date().toISOString()),
+    timestamp: S.String.pipe(
+      S.propertySignature,
+      S.withConstructorDefault(() => new Date().toISOString()),
     ),
   });
 
-  export const WorksFor = Schema.Struct({
-    // id: Type.ObjectId,
-    role: Schema.String,
-  }).pipe(
-    // Relation.def
-    Type.def({
-      typename: 'example.com/type/WorksFor',
-      version: '0.1.0',
-      // source: Person,
-      // target: Organization,
-    }),
-  );
-
-  export interface WorksFor extends Schema.Schema.Type<typeof WorksFor> {}
-
   // TODO(burdon): Fix (Type.def currently removes TypeLiteral that implements the `make` function)..
   // }).pipe(
   //   Type.def({
@@ -69,31 +55,31 @@ namespace Testing {
   //   }),
   // );
 
-  export interface Message extends Schema.Schema.Type<typeof Message> {}
+  export interface Message extends S.Schema.Type<typeof Message> {}
 }
 
 describe('Experimental API review', () => {
   test('type checks', ({ expect }) => {
-    const contact = Type.create(Testing.Person, { name: 'Test' });
-    const type: Schema.Schema<Testing.Person> = Type.getSchema(contact) ?? raise(new Error('No schema found'));
+    const contact = Type.create(Testing.Contact, { name: 'Test' });
+    const type: S.Schema<Testing.Contact> = Type.getSchema(contact) ?? raise(new Error('No schema found'));
 
-    expect(Type.getDXN(type)?.typename).to.eq(Testing.Person.typename);
-    expect(Type.getTypename(type)).to.eq('example.com/type/Person');
+    expect(Type.getDXN(type)?.typename).to.eq(Testing.Contact.typename);
+    expect(Type.getTypename(type)).to.eq('example.com/type/Contact');
     expect(Type.getVersion(type)).to.eq('0.1.0');
     expect(Type.getMeta(type)).to.deep.eq({
       kind: Type.Kind.Object,
-      typename: 'example.com/type/Person',
+      typename: 'example.com/type/Contact',
       version: '0.1.0',
     });
   });
 
   test('instance checks', ({ expect }) => {
     const organization = Type.create(Testing.Organization, { name: 'DXOS' });
-    const contact = Type.create(Testing.Person, { name: 'Test', organization: Type.ref(organization) });
+    const contact = Type.create(Testing.Contact, { name: 'Test', organization: Type.ref(organization) });
 
-    expect(Schema.is(Testing.Person)(contact)).to.be.true;
-    expect(Testing.Person.instanceOf(contact)).to.be.true;
-    expect(Type.instanceOf(Testing.Person, contact)).to.be.true;
+    expect(S.is(Testing.Contact)(contact)).to.be.true;
+    expect(Testing.Contact.instanceOf(contact)).to.be.true;
+    expect(Type.instanceOf(Testing.Contact, contact)).to.be.true;
     expect(Type.instanceOf(Testing.Organization, organization)).to.be.true;
   });
 

package/src/index.ts

@@ -2,4 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './api';
+import { DXN } from '@dxos/keys';
+
+export { DXN };
+
+export * as Database from './Database';
+export * as Queue from './Queue';
+export * as Space from './Space';
+export * as Type from './Type';

package/dist/types/src/api/database.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../../src/api/database.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,yBAAiB,QAAQ,CAAC,GAAE"}

package/dist/types/src/api/index.d.ts

@@ -1,4 +0,0 @@
-export { Format } from '@dxos/echo-schema';
-export { DXN } from '@dxos/keys';
-export { Type } from './type';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/api/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMjC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC"}

package/dist/types/src/api/queue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../../src/api/queue.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,yBAAiB,KAAK,CAAC,GAAE"}

package/dist/types/src/api/space.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../../src/api/space.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,WAAW,KAAK,CAAC,GAAE"}

package/dist/types/src/api/type.d.ts

@@ -1,80 +0,0 @@
-import { type Schema } from 'effect';
-import { type AnyLiveObject as AnyLiveObject$ } from '@dxos/echo-db';
-import { type BaseEchoObject, type BaseObject, type BaseSchema, type EchoSchema, EntityKind, Expando as Expando$, type ImmutableSchema, type JsonSchemaType, ObjectId as ObjectId$, Ref as Ref$, type StoredSchema, type TypeMeta } from '@dxos/echo-schema';
-import { SpaceId as SpaceId$ } from '@dxos/keys';
-/**
- * Type System API.
- *
- * @category api namespace
- * @since 0.9.0
- */
-export declare namespace Type {
-    const SpaceIdSchema: Schema.Schema<SpaceId$, string, never>;
-    const SpaceId: Readonly<{
-        byteLength: 20;
-        encode: (value: Uint8Array) => SpaceId$;
-        decode: (value: SpaceId$) => Uint8Array;
-        isValid: (value: string) => value is SpaceId$;
-        random: () => SpaceId$;
-    }>;
-    type SpaceId = SpaceId$;
-    const ObjectId: import("@dxos/echo-schema").ObjectIdClass;
-    type ObjectId = ObjectId$;
-    const Kind: typeof EntityKind;
-    type AnyObject = BaseEchoObject;
-    type AnyLiveObject<T extends BaseObject> = AnyLiveObject$<T>;
-    type JsonSchema = JsonSchemaType;
-    /**
-     * A schema that can be extended with arbitrary properties.
-     */
-    const Expando: Schema.Schema<Expando$, Expando$, never>;
-    type Expando = Expando$;
-    type Abstract<T = any> = BaseSchema<T>;
-    type ImmutableType<T> = ImmutableSchema<T>;
-    type MutableType<T> = EchoSchema<T>;
-    type StoredType = StoredSchema;
-    const create: {
-        <T extends BaseObject>(obj: T): import("@dxos/live-object").Live<T>;
-        <T extends BaseObject>(schema: Schema.Schema<T, any, never>, obj: NoInfer<import("@dxos/echo-schema").ExcludeId<T>>, meta?: import("@dxos/echo-schema").ObjectMeta): import("@dxos/live-object").Live<T>;
-    };
-    /**
-     * Defines an ECHO type.
-     *
-     * @example
-     * ```ts
-     * import { Type } from '@dxos/echo';
-     * const Organization = Schema.Struct({
-     *   name: Schema.String,
-     * }).pipe(Type.def({
-     *   typename: 'example.com/type/Organization',
-     *   version: '0.1.0',
-     * }));
-     * ```
-     */
-    const def: (meta: TypeMeta) => <Self extends Schema.Schema.Any>(self: Self) => import("@dxos/echo-schema").EchoTypeSchema<Self>;
-    /**
-     * Defines a reference to an ECHO object.
-     *
-     * @example
-     * ```ts
-     * import { Type } from '@dxos/echo';
-     * const Person = Schema.Struct({
-     *   name: Schema.String,
-     *   organization: Type.Ref(Organization),
-     * }).pipe(Type.def({
-     *   typename: 'example.com/type/Person',
-     *   version: '0.1.0',
-     * }));
-     * ```
-     */
-    const Ref: <S extends Schema.Schema.AnyNoContext>(self: S) => import("@dxos/echo-schema").Ref$<Schema.Schema.Type<S>>;
-    const ref: <T extends import("@dxos/echo-schema").WithId>(object: T) => Ref$<T>;
-    const getMeta: (schema: Schema.Schema.All) => import("@dxos/echo-schema").TypeAnnotation | undefined;
-    const getSchema: (obj: unknown | undefined) => Schema.Schema.AnyNoContext | undefined;
-    const instanceOf: <Schema extends Schema.Schema.AnyNoContext>(schema: Schema, object: any) => object is Schema.Schema.Type<Schema>;
-    const getDXN: (schema: Schema.Schema.All) => import("@dxos/keys").DXN | undefined;
-    const getTypename: (schema: Schema.Schema.AnyNoContext) => string;
-    const getVersion: (schema: Schema.Schema.All) => string | undefined;
-    const toJsonSchema: (schema: Schema.Schema.All) => JsonSchemaType;
-}
-//# sourceMappingURL=type.d.ts.map

package/dist/types/src/api/type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/api/type.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,KAAK,aAAa,IAAI,cAAc,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,UAAU,EAEf,UAAU,EACV,OAAO,IAAI,QAAQ,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,QAAQ,IAAI,SAAS,EACrB,GAAG,IAAI,IAAI,EAEX,KAAK,YAAY,EACjB,KAAK,QAAQ,EAQd,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AAKjD;;;;;GAKG;AACH,yBAAiB,IAAI,CAAC;IAKb,MAAM,aAAa,wCAAiB,CAAC;IACrC,MAAM,OAAO;;;;;;MAAW,CAAC;IAChC,KAAY,OAAO,GAAG,QAAQ,CAAC;IAExB,MAAM,QAAQ,2CAAY,CAAC;IAClC,KAAY,QAAQ,GAAG,SAAS,CAAC;IAM1B,MAAM,IAAI,mBAAa,CAAC;IAC/B,KAAY,SAAS,GAAG,cAAc,CAAC;IACvC,KAAY,aAAa,CAAC,CAAC,SAAS,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;IAMpE,KAAY,UAAU,GAAG,cAAc,CAAC;IAExC;;OAEG;IACI,MAAM,OAAO,0CAAW,CAAC;IAChC,KAAY,OAAO,GAAG,QAAQ,CAAC;IAG/B,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9C,KAAY,aAAa,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;IAClD,KAAY,WAAW,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3C,KAAY,UAAU,GAAG,YAAY,CAAC;IAE/B,MAAM,MAAM;;uCA7DX,OAAS,MAAK;KA6DK,CAAC;IAE5B;;;;;;;;;;;;;OAaG;IACI,MAAM,GAAG,SAAU,QAAQ,mBAqBuD,OAAQ,MAAM,CAEvG,GAAD,iEAvBwD,CAAC;IAMxD;;;;;;;;;;;;;;OAcG;IACI,MAAM,GAAG,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,QAAQ,CAAC,4DAAsC,CAAC;IAEjG,MAAM,GAAG,sEAAY,CAAC;IAMtB,MAAM,OAAO,WApCD,OAClB,MAAI,CAAC,GAAG,2DAmC+B,CAAC;IAClC,MAAM,SAAS,gCA/GV,OAAQ,MAClB,CAAC,YAAY,YA8GoB,CAAC;IAC7B,MAAM,UAAU,kBAfL,OAAQ,MAAM,CAAC,YAChC,4CAGA,OACC,MAAM,CAAC,IAAI,QAUyB,CAAC;IAOhC,MAAM,MAAM,WA9Gb,OACN,MAAI,CAAC,GAAG,yCA6G0B,CAAC;IAC5B,MAAM,WAAW,WAAY,MAAM,CAAC,MAAM,CAAC,YAAY,KAAG,MAIhE,CAAC;IACK,MAAM,UAAU,WA5BtB,OAAI,MAAM,CAAC,GAAG,uBA4B2B,CAAC;IACpC,MAAM,YAAY,WAlHvB,OAAQ,MACV,CAAC,GAAG,mBAiHqC,CAAC;CAC3C"}

package/src/api/index.ts

@@ -1,12 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-export { Format } from '@dxos/echo-schema';
-export { DXN } from '@dxos/keys';
-
-// export type { Database } from './database';
-// export type { Queue } from './queue';
-// export type { Space } from './space';
-
-export { Type } from './type';

package/src/api/type.ts

@@ -1,143 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type Schema } from 'effect';
-
-import { type AnyLiveObject as AnyLiveObject$ } from '@dxos/echo-db';
-import {
-  type BaseEchoObject,
-  type BaseObject,
-  type BaseSchema,
-  type EchoSchema,
-  EchoObject,
-  EntityKind,
-  Expando as Expando$,
-  type ImmutableSchema,
-  type JsonSchemaType,
-  ObjectId as ObjectId$,
-  Ref as Ref$,
-  SpaceIdSchema as SpaceIdSchema$,
-  type StoredSchema,
-  type TypeMeta,
-  getTypeAnnotation,
-  getSchema as getSchema$,
-  getSchemaDXN,
-  getSchemaTypename,
-  getSchemaVersion,
-  isInstanceOf,
-  toJsonSchema as toJsonSchema$,
-} from '@dxos/echo-schema';
-import { invariant } from '@dxos/invariant';
-import { SpaceId as SpaceId$ } from '@dxos/keys';
-import { live as live$ } from '@dxos/live-object';
-
-// TODO(burdon): Type vs. Relation vs. Object.
-
-/**
- * Type System API.
- *
- * @category api namespace
- * @since 0.9.0
- */
-export namespace Type {
-  //
-  // Keys
-  //
-
-  export const SpaceIdSchema = SpaceIdSchema$; // TODO(burdon): Reconcile with SpaceId as with ObjectId.
-  export const SpaceId = SpaceId$;
-  export type SpaceId = SpaceId$;
-
-  export const ObjectId = ObjectId$;
-  export type ObjectId = ObjectId$;
-
-  //
-  // Objects
-  //
-
-  export const Kind = EntityKind;
-  export type AnyObject = BaseEchoObject;
-  export type AnyLiveObject<T extends BaseObject> = AnyLiveObject$<T>;
-
-  //
-  // Schema
-  //
-
-  export type JsonSchema = JsonSchemaType;
-
-  /**
-   * A schema that can be extended with arbitrary properties.
-   */
-  export const Expando = Expando$;
-  export type Expando = Expando$;
-
-  // TODO(burdon): Review/remove.
-  export type Abstract<T = any> = BaseSchema<T>;
-  export type ImmutableType<T> = ImmutableSchema<T>;
-  export type MutableType<T> = EchoSchema<T>;
-  export type StoredType = StoredSchema;
-
-  export const create = live$;
-
-  /**
-   * Defines an ECHO type.
-   *
-   * @example
-   * ```ts
-   * import { Type } from '@dxos/echo';
-   * const Organization = Schema.Struct({
-   *   name: Schema.String,
-   * }).pipe(Type.def({
-   *   typename: 'example.com/type/Organization',
-   *   version: '0.1.0',
-   * }));
-   * ```
-   */
-  export const def = (meta: TypeMeta) => EchoObject(meta);
-
-  //
-  // Refs
-  //
-
-  /**
-   * Defines a reference to an ECHO object.
-   *
-   * @example
-   * ```ts
-   * import { Type } from '@dxos/echo';
-   * const Person = Schema.Struct({
-   *   name: Schema.String,
-   *   organization: Type.Ref(Organization),
-   * }).pipe(Type.def({
-   *   typename: 'example.com/type/Person',
-   *   version: '0.1.0',
-   * }));
-   * ```
-   */
-  export const Ref = <S extends Schema.Schema.AnyNoContext>(self: S) => Ref$<Schema.Schema.Type<S>>(self);
-
-  export const ref = Ref$.make;
-
-  //
-  // Object utils
-  //
-
-  export const getMeta = getTypeAnnotation;
-  export const getSchema = getSchema$;
-  export const instanceOf = isInstanceOf;
-
-  //
-  // Type utils
-  //
-
-  // TODO(burdon): Reconcile getDXN and getTypename.
-  export const getDXN = getSchemaDXN;
-  export const getTypename = (schema: Schema.Schema.AnyNoContext): string => {
-    const typename = getSchemaTypename(schema);
-    invariant(typename, 'Invalid object');
-    return typename;
-  };
-  export const getVersion = getSchemaVersion;
-  export const toJsonSchema = toJsonSchema$;
-}