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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-query",
-  "version": "0.8.4-main.03d5cd7b56",
+  "version": "0.8.4-main.05e74ebcff",
   "description": "ECHO queries.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "info@dxos.org",
   "sideEffects": false,
   "type": "module",
@@ -32,22 +32,22 @@
     "@lezer/common": "^1.2.2",
     "@lezer/lezer": "^1.1.2",
     "@lezer/lr": "^1.4.2",
-    "@dxos/context": "0.8.4-main.03d5cd7b56",
-    "@dxos/debug": "0.8.4-main.03d5cd7b56",
-    "@dxos/errors": "0.8.4-main.03d5cd7b56",
-    "@dxos/echo": "0.8.4-main.03d5cd7b56",
-    "@dxos/node-std": "0.8.4-main.03d5cd7b56",
-    "@dxos/invariant": "0.8.4-main.03d5cd7b56",
-    "@dxos/vendor-quickjs": "0.8.4-main.03d5cd7b56",
-    "@dxos/echo-protocol": "0.8.4-main.03d5cd7b56",
-    "@dxos/util": "0.8.4-main.03d5cd7b56"
+    "@dxos/debug": "0.8.4-main.05e74ebcff",
+    "@dxos/context": "0.8.4-main.05e74ebcff",
+    "@dxos/echo": "0.8.4-main.05e74ebcff",
+    "@dxos/invariant": "0.8.4-main.05e74ebcff",
+    "@dxos/errors": "0.8.4-main.05e74ebcff",
+    "@dxos/util": "0.8.4-main.05e74ebcff",
+    "@dxos/node-std": "0.8.4-main.05e74ebcff",
+    "@dxos/echo-protocol": "0.8.4-main.05e74ebcff",
+    "@dxos/vendor-quickjs": "0.8.4-main.05e74ebcff"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
     "tsdown": "^0.16.7",
     "typescript": "^6.0.3",
-    "@dxos/echo-generator": "0.8.4-main.03d5cd7b56",
-    "@dxos/random": "0.8.4-main.03d5cd7b56"
+    "@dxos/echo-generator": "0.8.4-main.05e74ebcff",
+    "@dxos/random": "0.8.4-main.05e74ebcff"
   },
   "publishConfig": {
     "access": "public"

package/src/query-lite/query-lite.ts

@@ -111,7 +111,7 @@ class FilterClass implements Filter$.Any {
     }
     return new FilterClass({
       type: 'object',
-      typename: makeTypeDxn(schema),
+      typename: makeTypeDXN(schema),
       ...propsFilterToAst(props ?? {}),
     });
   }
@@ -119,7 +119,7 @@ class FilterClass implements Filter$.Any {
   static typename(typename: string): Filter$.Any {
     return new FilterClass({
       type: 'object',
-      typename: makeTypeDxn(typename),
+      typename: makeTypeDXN(typename),
       props: {},
     });
   }
@@ -139,6 +139,16 @@ class FilterClass implements Filter$.Any {
     });
   }
 
+  static key(key: string, options?: Filter$.KeyFilterOptions): Filter$.Any {
+    return new FilterClass({
+      type: 'object',
+      typename: null,
+      props: {},
+      metaKey: key,
+      metaVersion: options?.version,
+    });
+  }
+
   static props<T>(props: Filter$.Props<T>): Filter$.Filter<T> {
     return new FilterClass({
       type: 'object',
@@ -451,7 +461,7 @@ class QueryClass implements Query$.Any {
         from: {
           _tag: 'scope',
           scope: {
-            ...(options?.includeFeeds ? { allQueuesFromSpaces: true } : {}),
+            ...(options?.includeFeeds ? { allFeedsFromSpaces: true } : {}),
           },
         },
       });
@@ -598,7 +608,7 @@ const isRef = (obj: any): obj is Ref.Ref<any> => {
   return obj && typeof obj === 'object' && RefTypeId in obj;
 };
 
-const makeTypeDxn = (typename: string) => {
+const makeTypeDXN = (typename: string) => {
   assertArgument(typeof typename === 'string', 'typename');
   assertArgument(!typename.startsWith('dxn:'), 'typename');
   return `dxn:type:${typename}`;
@@ -614,7 +624,7 @@ const isDxnLike = (value: unknown): value is DXN => {
   );
 };
 
-const SCOPE_KEYS = new Set(['spaceIds', 'queues', 'allQueuesFromSpaces']);
+const SCOPE_KEYS = new Set(['spaceIds', 'feeds', 'allFeedsFromSpaces']);
 
 const _isScopeLike = (value: unknown): value is QueryAST.Scope => {
   if (typeof value !== 'object' || value === null || Array.isArray(value)) {
@@ -728,11 +738,11 @@ const prettyQuery = (query: QueryAST.Query): string => {
         if (scope.spaceIds !== undefined) {
           parts.push(`spaceIds: [${scope.spaceIds.join(', ')}]`);
         }
-        if (scope.queues !== undefined) {
-          parts.push(`queues: [${scope.queues.join(', ')}]`);
+        if (scope.feeds !== undefined) {
+          parts.push(`feeds: [${scope.feeds.join(', ')}]`);
         }
-        if (scope.allQueuesFromSpaces !== undefined) {
-          parts.push(`allQueuesFromSpaces: ${scope.allQueuesFromSpaces}`);
+        if (scope.allFeedsFromSpaces !== undefined) {
+          parts.push(`allFeedsFromSpaces: ${scope.allFeedsFromSpaces}`);
         }
         return `${prettyQuery(query.query)}.from({ ${parts.join(', ')} })`;
       }