@dxos/echo 0.8.4-main.03d5cd7b56 → 0.8.4-main.05e74ebcff

package/dist/lib/neutral/{chunk-SJKBWMJY.mjs → chunk-G54OX4IX.mjs}

@@ -3,12 +3,12 @@ import {
   JsonSchemaType,
   toEffectSchema,
   toJsonSchema
-} from "./chunk-O5LRY6CO.mjs";
+} from "./chunk-MLS7U7AT.mjs";
 import {
   Ref,
   refFromEncodedReference,
   setRefResolver
-} from "./chunk-MPAI2MHO.mjs";
+} from "./chunk-BMB7IHGB.mjs";
 import {
   ATTR_PARENT,
   ATTR_TYPE,
@@ -72,11 +72,21 @@ var ObjectMetaSchema = Schema2.Struct({
   // TODO(dmaretskyi): Has to be optional for compatibility with old data.
   // Defaulting to an empty array is possible but requires a bit more work.
   // TODO(dmaretskyi): In automerge this should be a map of { [tag]: boolean } for uniqueness and conflict resolution.
-  tags: Schema2.optional(Schema2.Array(Schema2.String))
+  tags: Schema2.optional(Schema2.Array(Schema2.String)),
+  /**
+  * Fully-qualified registry key for the object (FQN format, e.g. `org.example.type.foo`).
+  * Identifies the canonical registry entry the object instance was created from.
+  */
+  key: Schema2.optional(Schema2.String),
+  /**
+  * Semantic version of the registry entry the object was created from.
+  * Must be a valid semver string (e.g. `1.2.3`).
+  */
+  version: Schema2.optional(Schema2.String)
 });
 var getMeta = (obj) => {
   const metadata = obj[MetaId];
-  invariant(metadata, "ObjectMeta not found.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 37, S: void 0, A: ["metadata", "'ObjectMeta not found.'"] });
+  invariant(metadata, "ObjectMeta not found.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 45, S: void 0, A: ["metadata", "'ObjectMeta not found.'"] });
   return metadata;
 };
 var foreignKey = (source, id) => ({
@@ -1526,13 +1536,13 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database, parent } = {
   }
   const isRelation = typeof jsonData[ATTR_RELATION_SOURCE] === "string" || typeof jsonData[ATTR_RELATION_TARGET] === "string";
   if (isRelation) {
-    const sourceDxn = DXN5.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise2(new TypeError("Missing relation source")));
-    const targetDxn = DXN5.parse(jsonData[ATTR_RELATION_TARGET] ?? raise2(new TypeError("Missing relation target")));
-    const source = await refResolver?.resolve(sourceDxn);
-    const target = await refResolver?.resolve(targetDxn);
+    const sourceDXN = DXN5.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise2(new TypeError("Missing relation source")));
+    const targetDXN = DXN5.parse(jsonData[ATTR_RELATION_TARGET] ?? raise2(new TypeError("Missing relation target")));
+    const source = await refResolver?.resolve(sourceDXN);
+    const target = await refResolver?.resolve(targetDXN);
     defineHiddenProperty(obj, KindId, EntityKind.Relation);
-    defineHiddenProperty(obj, RelationSourceDXNId, sourceDxn);
-    defineHiddenProperty(obj, RelationTargetDXNId, targetDxn);
+    defineHiddenProperty(obj, RelationSourceDXNId, sourceDXN);
+    defineHiddenProperty(obj, RelationTargetDXNId, targetDXN);
     defineHiddenProperty(obj, RelationSourceId, source);
     defineHiddenProperty(obj, RelationTargetId, target);
   } else {
@@ -1548,8 +1558,8 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database, parent } = {
     });
   }
   if (jsonData[ATTR_PARENT]) {
-    const parentDxn = DXN5.parse(jsonData[ATTR_PARENT]);
-    const resolvedParent = await refResolver?.resolve(parentDxn);
+    const parentDXN = DXN5.parse(jsonData[ATTR_PARENT]);
+    const resolvedParent = await refResolver?.resolve(parentDXN);
     defineHiddenProperty(obj, ParentId, resolvedParent);
   } else if (parent) {
     defineHiddenProperty(obj, ParentId, parent);
@@ -1579,7 +1589,7 @@ var decodeGeneric = (jsonData, options) => {
   });
 };
 var stripInternalJsonKeys = (jsonData) => {
-  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDxn, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
+  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDXN, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
   return props;
 };
 var setRefResolverOnData = (obj, refResolver) => {
@@ -1834,6 +1844,9 @@ var clone = (obj, opts) => {
 var prettyFilter = (filter) => {
   switch (filter.type) {
     case "object": {
+      if (filter.typename === null && (filter.id === void 0 || filter.id.length === 0) && Object.keys(filter.props).length === 0 && (filter.foreignKeys === void 0 || filter.foreignKeys.length === 0) && filter.metaKey !== void 0) {
+        return filter.metaVersion !== void 0 ? `Filter.key(${JSON.stringify(filter.metaKey)}, { version: ${JSON.stringify(filter.metaVersion)} })` : `Filter.key(${JSON.stringify(filter.metaKey)})`;
+      }
       const parts = [];
       if (filter.typename !== null) {
         parts.push(String(filter.typename));
@@ -1849,6 +1862,9 @@ var prettyFilter = (filter) => {
       if (filter.foreignKeys !== void 0 && filter.foreignKeys.length > 0) {
         parts.push(`foreignKeys: [${filter.foreignKeys.map((fk) => JSON.stringify(fk)).join(", ")}]`);
       }
+      if (filter.metaKey !== void 0) {
+        parts.push(filter.metaVersion !== void 0 ? `metaKey: ${JSON.stringify(filter.metaKey)} (${filter.metaVersion})` : `metaKey: ${JSON.stringify(filter.metaKey)}`);
+      }
       return parts.length > 0 ? `Filter.type(${parts.join(", ")})` : "Filter.everything()";
     }
     case "compare":
@@ -1936,11 +1952,11 @@ var prettyQuery = (query) => {
         if (scope.spaceIds !== void 0) {
           parts.push(`spaceIds: [${scope.spaceIds.map((s) => JSON.stringify(s)).join(", ")}]`);
         }
-        if (scope.queues !== void 0) {
-          parts.push(`queues: [${scope.queues.map(String).join(", ")}]`);
+        if (scope.feeds !== void 0) {
+          parts.push(`feeds: [${scope.feeds.map(String).join(", ")}]`);
         }
-        if (scope.allQueuesFromSpaces !== void 0) {
-          parts.push(`allQueuesFromSpaces: ${scope.allQueuesFromSpaces}`);
+        if (scope.allFeedsFromSpaces !== void 0) {
+          parts.push(`allFeedsFromSpaces: ${scope.allFeedsFromSpaces}`);
         }
         return `${prettyQuery(query.query)}.from({ ${parts.join(", ")} })`;
       }
@@ -2433,4 +2449,4 @@ export {
   getValue,
   splitJsonPath
 };
-//# sourceMappingURL=chunk-SJKBWMJY.mjs.map
+//# sourceMappingURL=chunk-G54OX4IX.mjs.map