@dxos/echo-protocol 0.8.4-main.a4bbb77 → 0.8.4-main.abd8ff62ef

package/dist/lib/{browser → neutral}/index.mjs

@@ -11,20 +11,16 @@ import { visitValues } from "@dxos/util";
 // src/reference.ts
 import { assertArgument } from "@dxos/invariant";
 import { DXN, LOCAL_SPACE_TAG } from "@dxos/keys";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var Reference = class _Reference {
+  _objectId;
+  _protocol;
+  _host;
+  _dxn;
+  /**
+  * Protocol references to runtime registered types.
+  * @deprecated
+  */
+  static TYPE_PROTOCOL = "protobuf";
   static fromDXN(dxn) {
     switch (dxn.kind) {
       case DXN.kind.TYPE:
@@ -39,8 +35,8 @@ var Reference = class _Reference {
         return new _Reference(dxn.parts[0], void 0, dxn.parts[0], dxn);
     }
   }
-  static fromValue(value) {
-    return new _Reference(value.objectId, value.protocol, value.host);
+  static fromValue(value2) {
+    return new _Reference(value2.objectId, value2.protocol, value2.host);
   }
   /**
   * Reference an object in the local space.
@@ -62,6 +58,13 @@ var Reference = class _Reference {
   static fromObjectIdAndSpaceKey(objectId, spaceKey) {
     return new _Reference(objectId, void 0, spaceKey.toHex());
   }
+  // prettier-ignore
+  constructor(_objectId, _protocol, _host, _dxn) {
+    this._objectId = _objectId;
+    this._protocol = _protocol;
+    this._host = _host;
+    this._dxn = _dxn;
+  }
   get dxn() {
     return this._dxn;
   }
@@ -116,45 +119,40 @@ var Reference = class _Reference {
       }
     }
   }
-  // prettier-ignore
-  constructor(_objectId, _protocol, _host, _dxn) {
-    _define_property(this, "_objectId", void 0);
-    _define_property(this, "_protocol", void 0);
-    _define_property(this, "_host", void 0);
-    _define_property(this, "_dxn", void 0);
-    this._objectId = _objectId;
-    this._protocol = _protocol;
-    this._host = _host;
-    this._dxn = _dxn;
-  }
 };
-_define_property(Reference, "TYPE_PROTOCOL", "protobuf");
 var REFERENCE_TYPE_TAG = "dxos.echo.model.document.Reference";
 var encodeReference = (reference) => ({
   "/": reference.toDXN().toString()
 });
-var decodeReference = (value) => {
-  if (typeof value !== "object" || value === null || typeof value["/"] !== "string") {
+var decodeReference = (value2) => {
+  if (typeof value2 !== "object" || value2 === null || typeof value2["/"] !== "string") {
     throw new Error("Invalid reference");
   }
-  const dxnString = value["/"];
+  const dxnString = value2["/"];
   if (dxnString.length % 2 === 0 && dxnString.slice(0, dxnString.length / 2) === dxnString.slice(dxnString.length / 2) && dxnString.includes("dxn:echo")) {
     throw new Error("Automerge bug detected!");
   }
   return Reference.fromDXN(DXN.parse(dxnString));
 };
-var isEncodedReference = (value) => typeof value === "object" && value !== null && Object.keys(value).length === 1 && typeof value["/"] === "string";
+var isEncodedReference = (value2) => typeof value2 === "object" && value2 !== null && Object.keys(value2).length === 1 && typeof value2["/"] === "string";
 var EncodedReference = Object.freeze({
   isEncodedReference,
-  getReferenceString: (value) => {
-    assertArgument(isEncodedReference(value), "value", "invalid reference");
-    return value["/"];
+  getReferenceString: (value2) => {
+    assertArgument(isEncodedReference(value2), "value", "invalid reference");
+    return value2["/"];
   },
-  toDXN: (value) => {
-    return DXN.parse(EncodedReference.getReferenceString(value));
+  toDXN: (value2) => {
+    return DXN.parse(EncodedReference.getReferenceString(value2));
   },
   fromDXN: (dxn) => {
-    return encodeReference(Reference.fromDXN(dxn));
+    return {
+      "/": dxn.toString()
+    };
+  },
+  fromLegacyTypename: (typename) => {
+    return {
+      "/": DXN.fromTypename(typename).toString()
+    };
   }
 });
 
@@ -170,15 +168,7 @@ var DatabaseDirectory = Object.freeze({
       return null;
     }
     const rawKey = String(rawSpaceKey);
-    invariant(!rawKey.startsWith("0x"), "Space key must not start with 0x", {
-      F: __dxlog_file,
-      L: 66,
-      S: void 0,
-      A: [
-        "!rawKey.startsWith('0x')",
-        "'Space key must not start with 0x'"
-      ]
-    });
+    invariant(!rawKey.startsWith("0x"), "Space key must not start with 0x", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 17, S: void 0, A: ["!rawKey.startsWith('0x')", "'Space key must not start with 0x'"] });
     return rawKey;
   },
   getInlineObject: (doc, id) => {
@@ -207,15 +197,7 @@ var ObjectStructure = Object.freeze({
   */
   getEntityKind: (object) => {
     const kind = object.system?.kind ?? "object";
-    invariant(kind === "object" || kind === "relation", "Invalid kind", {
-      F: __dxlog_file,
-      L: 124,
-      S: void 0,
-      A: [
-        "kind === 'object' || kind === 'relation'",
-        "'Invalid kind'"
-      ]
-    });
+    invariant(kind === "object" || kind === "relation", "Invalid kind", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 45, S: void 0, A: ["kind === 'object' || kind === 'relation'", "'Invalid kind'"] });
     return kind;
   },
   isDeleted: (object) => {
@@ -227,29 +209,35 @@ var ObjectStructure = Object.freeze({
   getRelationTarget: (object) => {
     return object.system?.target;
   },
+  getParent: (object) => {
+    return object.system?.parent;
+  },
   /**
   * @returns All references in the data section of the object.
   */
   getAllOutgoingReferences: (object) => {
     const references = [];
-    const visit2 = (path, value) => {
-      if (isEncodedReference(value)) {
+    const visit2 = (path, value2) => {
+      if (isEncodedReference(value2)) {
         references.push({
           path,
-          reference: value
+          reference: value2
         });
       } else {
-        visitValues(value, (value2, key) => visit2([
+        visitValues(value2, (value3, key) => visit2([
           ...path,
           String(key)
-        ], value2));
+        ], value3));
       }
     };
-    visitValues(object.data, (value, key) => visit2([
+    visitValues(object.data, (value2, key) => visit2([
       String(key)
-    ], value));
+    ], value2));
     return references;
   },
+  getTags: (object) => {
+    return object.meta.tags ?? [];
+  },
   makeObject: ({ type, data, keys }) => {
     return {
       system: {
@@ -285,37 +273,63 @@ var ObjectStructure = Object.freeze({
 var PROPERTY_ID = "id";
 var DATA_NAMESPACE = "data";
 
-// src/space-doc-version.ts
-var SpaceDocVersion = Object.freeze({
+// src/echo-feed-codec.ts
+import { FeedProtocol } from "@dxos/protocols";
+var ATTR_META = "@meta";
+var EchoFeedCodec = class _EchoFeedCodec {
+  static #encoder = new TextEncoder();
+  static #decoder = new TextDecoder();
   /**
-  * For the documents created before the versioning was introduced.
+  * Prepares a value for feed storage (strips queue position from metadata) and encodes to bytes.
   */
-  LEGACY: 0,
+  static encode(value2) {
+    const prepared = _EchoFeedCodec.#stripQueuePosition(value2);
+    return _EchoFeedCodec.#encoder.encode(JSON.stringify(prepared));
+  }
   /**
-  * Current version.
+  * Decodes feed block bytes to a JSON value.
+  * If position is provided, injects queue position into the decoded object's metadata.
   */
-  CURRENT: 1
-});
-
-// src/space-id.ts
-import { subtleCrypto } from "@dxos/crypto";
-import { PublicKey, SpaceId } from "@dxos/keys";
-import { ComplexMap } from "@dxos/util";
-var SPACE_IDS_CACHE = new ComplexMap(PublicKey.hash);
-var createIdFromSpaceKey = async (spaceKey) => {
-  const cachedValue = SPACE_IDS_CACHE.get(spaceKey);
-  if (cachedValue !== void 0) {
-    return cachedValue;
+  static decode(data, position) {
+    const decoded = JSON.parse(_EchoFeedCodec.#decoder.decode(data));
+    if (position !== void 0 && typeof decoded === "object" && decoded !== null) {
+      _EchoFeedCodec.#setQueuePosition(decoded, position);
+    }
+    return decoded;
+  }
+  static #stripQueuePosition(value2) {
+    if (typeof value2 !== "object" || value2 === null) {
+      return value2;
+    }
+    const obj = structuredClone(value2);
+    const meta = obj[ATTR_META];
+    if (meta?.keys?.some((key) => key.source === FeedProtocol.KEY_QUEUE_POSITION)) {
+      meta.keys = meta.keys.filter((key) => key.source !== FeedProtocol.KEY_QUEUE_POSITION);
+    }
+    return obj;
+  }
+  static #setQueuePosition(obj, position) {
+    obj[ATTR_META] ??= {
+      keys: []
+    };
+    obj[ATTR_META].keys ??= [];
+    const keys = obj[ATTR_META].keys;
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].source === FeedProtocol.KEY_QUEUE_POSITION) {
+        keys.splice(i, 1);
+        i--;
+      }
+    }
+    keys.push({
+      source: FeedProtocol.KEY_QUEUE_POSITION,
+      id: position.toString()
+    });
   }
-  const digest = await subtleCrypto.digest("SHA-256", spaceKey.asUint8Array());
-  const bytes = new Uint8Array(digest).slice(0, SpaceId.byteLength);
-  const spaceId = SpaceId.encode(bytes);
-  SPACE_IDS_CACHE.set(spaceKey, spaceId);
-  return spaceId;
 };
 
 // src/foreign-key.ts
-import { Schema, SchemaAST } from "effect";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
 var ForeignKey_ = Schema.Struct({
   /**
   * Name of the foreign database/system.
@@ -338,6 +352,7 @@ var ast_exports = {};
 __export(ast_exports, {
   Filter: () => Filter,
   FilterAnd: () => FilterAnd,
+  FilterChildOf: () => FilterChildOf,
   FilterCompare: () => FilterCompare,
   FilterContains: () => FilterContains,
   FilterIn: () => FilterIn,
@@ -347,11 +362,16 @@ __export(ast_exports, {
   FilterRange: () => FilterRange,
   FilterTag: () => FilterTag,
   FilterTextSearch: () => FilterTextSearch,
+  FilterTimestamp: () => FilterTimestamp,
   Order: () => Order,
   OrderDirection: () => OrderDirection,
   Query: () => Query,
   QueryFilterClause: () => QueryFilterClause,
+  QueryFromClause: () => QueryFromClause,
+  QueryFromClause_: () => QueryFromClause_,
+  QueryHierarchyTraversalClause: () => QueryHierarchyTraversalClause,
   QueryIncomingReferencesClause: () => QueryIncomingReferencesClause,
+  QueryLimitClause: () => QueryLimitClause,
   QueryOptions: () => QueryOptions,
   QueryOptionsClause: () => QueryOptionsClause,
   QueryOrderClause: () => QueryOrderClause,
@@ -361,13 +381,16 @@ __export(ast_exports, {
   QuerySelectClause: () => QuerySelectClause,
   QuerySetDifferenceClause: () => QuerySetDifferenceClause,
   QueryUnionClause: () => QueryUnionClause,
+  Scope: () => Scope,
   fold: () => fold,
+  map: () => map,
   visit: () => visit
 });
-import { Match, Schema as Schema2 } from "effect";
+import * as Match from "effect/Match";
+import * as Schema2 from "effect/Schema";
 import { DXN as DXN2, ObjectId } from "@dxos/keys";
 var TypenameSpecifier = Schema2.Union(DXN2.Schema, Schema2.Null).annotations({
-  description: "DXN or null. Null means any type will match"
+  description: "DXN or null; null matches any type"
 });
 var FilterObject_ = Schema2.Struct({
   type: Schema2.Literal("object"),
@@ -416,6 +439,13 @@ var FilterRange_ = Schema2.Struct({
   to: Schema2.Any
 });
 var FilterRange = FilterRange_;
+var FilterTimestamp_ = Schema2.Struct({
+  type: Schema2.Literal("timestamp"),
+  field: Schema2.Literal("createdAt", "updatedAt"),
+  operator: Schema2.Literal("gt", "gte", "lt", "lte"),
+  value: Schema2.Number
+});
+var FilterTimestamp = FilterTimestamp_;
 var FilterTextSearch_ = Schema2.Struct({
   type: Schema2.Literal("text-search"),
   text: Schema2.String,
@@ -437,8 +467,16 @@ var FilterOr_ = Schema2.Struct({
   filters: Schema2.Array(Schema2.suspend(() => Filter))
 });
 var FilterOr = FilterOr_;
-var Filter = Schema2.Union(FilterObject, FilterCompare, FilterIn, FilterContains, FilterTag, FilterRange, FilterTextSearch, FilterNot, FilterAnd, FilterOr).annotations({
-  identifier: "dxos.org/schema/Filter"
+var FilterChildOf_ = Schema2.Struct({
+  type: Schema2.Literal("child-of"),
+  /** Parent DXNs to match children of. */
+  parents: Schema2.Array(DXN2.Schema),
+  /** Whether to match transitively (grandchildren, etc.). Defaults to true. */
+  transitive: Schema2.Boolean
+});
+var FilterChildOf = FilterChildOf_;
+var Filter = Schema2.Union(FilterObject, FilterCompare, FilterIn, FilterContains, FilterTag, FilterRange, FilterTimestamp, FilterTextSearch, FilterChildOf, FilterNot, FilterAnd, FilterOr).annotations({
+  identifier: "org.dxos.schema.filter"
 });
 var QuerySelectClause_ = Schema2.Struct({
   type: Schema2.Literal("select"),
@@ -460,7 +498,11 @@ var QueryReferenceTraversalClause = QueryReferenceTraversalClause_;
 var QueryIncomingReferencesClause_ = Schema2.Struct({
   type: Schema2.Literal("incoming-references"),
   anchor: Schema2.suspend(() => Query),
-  property: Schema2.String,
+  /**
+  * Property path where the reference is located.
+  * If null, matches references from any property.
+  */
+  property: Schema2.NullOr(Schema2.String),
   typename: TypenameSpecifier
 });
 var QueryIncomingReferencesClause = QueryIncomingReferencesClause_;
@@ -482,6 +524,16 @@ var QueryRelationTraversalClause_ = Schema2.Struct({
   direction: Schema2.Literal("source", "target", "both")
 });
 var QueryRelationTraversalClause = QueryRelationTraversalClause_;
+var QueryHierarchyTraversalClause_ = Schema2.Struct({
+  type: Schema2.Literal("hierarchy-traversal"),
+  anchor: Schema2.suspend(() => Query),
+  /**
+  * to-parent: traverse from child to parent.
+  * to-children: traverse from parent to children.
+  */
+  direction: Schema2.Literal("to-parent", "to-children")
+});
+var QueryHierarchyTraversalClause = QueryHierarchyTraversalClause_;
 var QueryUnionClause_ = Schema2.Struct({
   type: Schema2.Literal("union"),
   queries: Schema2.Array(Schema2.suspend(() => Query))
@@ -501,6 +553,11 @@ var Order_ = Schema2.Union(Schema2.Struct({
   kind: Schema2.Literal("property"),
   property: Schema2.String,
   direction: OrderDirection
+}), Schema2.Struct({
+  // Order by relevance rank (for FTS/vector search results).
+  // Default direction is 'desc' (higher rank = better match first).
+  kind: Schema2.Literal("rank"),
+  direction: OrderDirection
 }));
 var Order = Order_;
 var QueryOrderClause_ = Schema2.Struct({
@@ -515,11 +572,37 @@ var QueryOptionsClause_ = Schema2.Struct({
   options: Schema2.suspend(() => QueryOptions)
 });
 var QueryOptionsClause = QueryOptionsClause_;
-var Query_ = Schema2.Union(QuerySelectClause, QueryFilterClause, QueryReferenceTraversalClause, QueryIncomingReferencesClause, QueryRelationClause, QueryRelationTraversalClause, QueryUnionClause, QuerySetDifferenceClause, QueryOrderClause, QueryOptionsClause).annotations({
-  identifier: "dxos.org/schema/Query"
+var QueryLimitClause_ = Schema2.Struct({
+  type: Schema2.Literal("limit"),
+  query: Schema2.suspend(() => Query),
+  limit: Schema2.Number
+});
+var QueryLimitClause = QueryLimitClause_;
+var QueryFromClause_ = Schema2.Struct({
+  type: Schema2.Literal("from"),
+  query: Schema2.suspend(() => Query),
+  from: Schema2.Union(Schema2.TaggedStruct("scope", {
+    scope: Schema2.suspend(() => Scope)
+  }), Schema2.TaggedStruct("query", {
+    query: Schema2.suspend(() => Query)
+  }))
+});
+var QueryFromClause = QueryFromClause_;
+var Query_ = Schema2.Union(QuerySelectClause, QueryFilterClause, QueryReferenceTraversalClause, QueryIncomingReferencesClause, QueryRelationClause, QueryRelationTraversalClause, QueryHierarchyTraversalClause, QueryUnionClause, QuerySetDifferenceClause, QueryOrderClause, QueryOptionsClause, QueryLimitClause, QueryFromClause).annotations({
+  identifier: "org.dxos.schema.query"
 });
 var Query = Query_;
 var QueryOptions = Schema2.Struct({
+  /**
+  * Nested select statements will use this option to filter deleted objects.
+  */
+  deleted: Schema2.optional(Schema2.Literal("include", "exclude", "only")),
+  /**
+  * Diagnostics-only label for logs / tooling (not used by execution semantics).
+  */
+  debugLabel: Schema2.optional(Schema2.String)
+});
+var Scope = Schema2.Struct({
   /**
   * The nested select statemets will select from the given spaces.
   *
@@ -527,15 +610,15 @@ var QueryOptions = Schema2.Struct({
   */
   spaceIds: Schema2.optional(Schema2.Array(Schema2.String)),
   /**
+  * If true, the nested select statements will select from all queues in the spaces specified by `spaceIds`.
+  */
+  allQueuesFromSpaces: Schema2.optional(Schema2.Boolean),
+  /**
   * The nested select statemets will select from the given queues.
   *
   * NOTE: Spaces and queues are unioned together if both are specified.
   */
-  queues: Schema2.optional(Schema2.Array(DXN2.Schema)),
-  /**
-  * Nested select statements will use this option to filter deleted objects.
-  */
-  deleted: Schema2.optional(Schema2.Literal("include", "exclude", "only"))
+  queues: Schema2.optional(Schema2.Array(DXN2.Schema))
 });
 var visit = (query, visitor) => {
   visitor(query);
@@ -551,6 +634,8 @@ var visit = (query, visitor) => {
     type: "options"
   }, ({ query: query2 }) => visit(query2, visitor)), Match.when({
     type: "relation-traversal"
+  }, ({ anchor }) => visit(anchor, visitor)), Match.when({
+    type: "hierarchy-traversal"
   }, ({ anchor }) => visit(anchor, visitor)), Match.when({
     type: "union"
   }, ({ queries }) => queries.forEach((q) => visit(q, visitor))), Match.when({
@@ -561,10 +646,92 @@ var visit = (query, visitor) => {
   }), Match.when({
     type: "order"
   }, ({ query: query2 }) => visit(query2, visitor)), Match.when({
+    type: "limit"
+  }, ({ query: query2 }) => visit(query2, visitor)), Match.when({
+    type: "from"
+  }, (node) => {
+    visit(node.query, visitor);
+    if (node.from._tag === "query") {
+      visit(node.from.query, visitor);
+    }
+  }), Match.when({
     type: "select"
   }, () => {
   }), Match.exhaustive);
 };
+var map = (query, mapper) => {
+  const mapped = Match.value(query).pipe(Match.when({
+    type: "filter"
+  }, (node) => ({
+    ...node,
+    selection: map(node.selection, mapper)
+  })), Match.when({
+    type: "reference-traversal"
+  }, (node) => ({
+    ...node,
+    anchor: map(node.anchor, mapper)
+  })), Match.when({
+    type: "incoming-references"
+  }, (node) => ({
+    ...node,
+    anchor: map(node.anchor, mapper)
+  })), Match.when({
+    type: "relation"
+  }, (node) => ({
+    ...node,
+    anchor: map(node.anchor, mapper)
+  })), Match.when({
+    type: "relation-traversal"
+  }, (node) => ({
+    ...node,
+    anchor: map(node.anchor, mapper)
+  })), Match.when({
+    type: "hierarchy-traversal"
+  }, (node) => ({
+    ...node,
+    anchor: map(node.anchor, mapper)
+  })), Match.when({
+    type: "options"
+  }, (node) => ({
+    ...node,
+    query: map(node.query, mapper)
+  })), Match.when({
+    type: "order"
+  }, (node) => ({
+    ...node,
+    query: map(node.query, mapper)
+  })), Match.when({
+    type: "limit"
+  }, (node) => ({
+    ...node,
+    query: map(node.query, mapper)
+  })), Match.when({
+    type: "from"
+  }, (node) => ({
+    ...node,
+    query: map(node.query, mapper),
+    ...node.from._tag === "query" ? {
+      from: {
+        _tag: "query",
+        query: map(node.from.query, mapper)
+      }
+    } : {}
+  })), Match.when({
+    type: "union"
+  }, (node) => ({
+    ...node,
+    queries: node.queries.map((q) => map(q, mapper))
+  })), Match.when({
+    type: "set-difference"
+  }, (node) => ({
+    ...node,
+    source: map(node.source, mapper),
+    exclude: map(node.exclude, mapper)
+  })), Match.when({
+    type: "select"
+  }, (node) => node), Match.exhaustive);
+  return mapper(mapped);
+};
 var fold = (query, reducer) => {
   return Match.value(query).pipe(Match.withReturnType(), Match.when({
     type: "filter"
@@ -578,6 +745,8 @@ var fold = (query, reducer) => {
     type: "options"
   }, ({ query: query2 }) => fold(query2, reducer)), Match.when({
     type: "relation-traversal"
+  }, ({ anchor }) => fold(anchor, reducer)), Match.when({
+    type: "hierarchy-traversal"
   }, ({ anchor }) => fold(anchor, reducer)), Match.when({
     type: "union"
   }, ({ queries }) => queries.flatMap((q) => fold(q, reducer))), Match.when({
@@ -585,12 +754,52 @@ var fold = (query, reducer) => {
   }, ({ source, exclude }) => fold(source, reducer).concat(fold(exclude, reducer))), Match.when({
     type: "order"
   }, ({ query: query2 }) => fold(query2, reducer)), Match.when({
+    type: "limit"
+  }, ({ query: query2 }) => fold(query2, reducer)), Match.when({
+    type: "from"
+  }, (node) => {
+    const results = fold(node.query, reducer);
+    if (node.from._tag === "query") {
+      return results.concat(fold(node.from.query, reducer));
+    }
+    return results;
+  }), Match.when({
     type: "select"
   }, () => []), Match.exhaustive);
 };
+
+// src/space-doc-version.ts
+var SpaceDocVersion = Object.freeze({
+  /**
+  * For the documents created before the versioning was introduced.
+  */
+  LEGACY: 0,
+  /**
+  * Current version.
+  */
+  CURRENT: 1
+});
+
+// src/space-id.ts
+import { subtleCrypto } from "@dxos/crypto";
+import { PublicKey, SpaceId } from "@dxos/keys";
+import { ComplexMap } from "@dxos/util";
+var SPACE_IDS_CACHE = new ComplexMap(PublicKey.hash);
+var createIdFromSpaceKey = async (spaceKey) => {
+  const cachedValue = SPACE_IDS_CACHE.get(spaceKey);
+  if (cachedValue !== void 0) {
+    return cachedValue;
+  }
+  const digest = await subtleCrypto.digest("SHA-256", spaceKey.asUint8Array());
+  const bytes = new Uint8Array(digest).slice(0, SpaceId.byteLength);
+  const spaceId = SpaceId.encode(bytes);
+  SPACE_IDS_CACHE.set(spaceKey, spaceId);
+  return spaceId;
+};
 export {
   DATA_NAMESPACE,
   DatabaseDirectory,
+  EchoFeedCodec,
   EncodedReference,
   ForeignKey,
   ObjectStructure,