@dxos/echo-query 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-query",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.4f23b4e393",
   "description": "ECHO queries.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -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.422d1c7879",
-    "@dxos/debug": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/errors": "0.8.4-main.422d1c7879",
-    "@dxos/echo-protocol": "0.8.4-main.422d1c7879",
-    "@dxos/invariant": "0.8.4-main.422d1c7879",
-    "@dxos/node-std": "0.8.4-main.422d1c7879",
-    "@dxos/vendor-quickjs": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879"
+    "@dxos/context": "0.8.4-main.4f23b4e393",
+    "@dxos/echo-protocol": "0.8.4-main.4f23b4e393",
+    "@dxos/echo": "0.8.4-main.4f23b4e393",
+    "@dxos/errors": "0.8.4-main.4f23b4e393",
+    "@dxos/debug": "0.8.4-main.4f23b4e393",
+    "@dxos/invariant": "0.8.4-main.4f23b4e393",
+    "@dxos/node-std": "0.8.4-main.4f23b4e393",
+    "@dxos/util": "0.8.4-main.4f23b4e393",
+    "@dxos/vendor-quickjs": "0.8.4-main.4f23b4e393"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
     "tsdown": "^0.16.7",
     "typescript": "^6.0.3",
-    "@dxos/echo-generator": "0.8.4-main.422d1c7879",
-    "@dxos/random": "0.8.4-main.422d1c7879"
+    "@dxos/echo-generator": "0.8.4-main.4f23b4e393",
+    "@dxos/random": "0.8.4-main.4f23b4e393"
   },
   "publishConfig": {
     "access": "public"

package/src/parser/query-builder.ts

@@ -246,8 +246,9 @@ export class QueryBuilder {
             let exprEnd = cursor.to;
 
             while (cursor.nextSibling() && depth > 0) {
-              if (cursor.node.name === '(') depth++;
-              else if (cursor.node.name === ')') {
+              if (cursor.node.name === '(') {
+                depth++;
+              } else if (cursor.node.name === ')') {
                 depth--;
                 if (depth === 0) {
                   exprEnd = cursor.from;
@@ -681,12 +682,24 @@ export const normalizeInput = (input: string): string => {
     let scanIndex = pos;
     while (scanIndex < input.length) {
       const innerChar = input[scanIndex];
-      if (innerChar === '"') break;
-      if (innerChar === "'" && scanIndex > pos && !/[a-zA-Z0-9_]/.test(input[scanIndex - 1])) break;
-      if (innerChar === "'" && scanIndex === pos) break;
-      if (innerChar !== "'" && SPECIAL_CHARS.test(innerChar)) break;
-      if (innerChar === '-' && input[scanIndex + 1] === '>') break;
-      if (innerChar === '<' && input[scanIndex + 1] === '-') break;
+      if (innerChar === '"') {
+        break;
+      }
+      if (innerChar === "'" && scanIndex > pos && !/[a-zA-Z0-9_]/.test(input[scanIndex - 1])) {
+        break;
+      }
+      if (innerChar === "'" && scanIndex === pos) {
+        break;
+      }
+      if (innerChar !== "'" && SPECIAL_CHARS.test(innerChar)) {
+        break;
+      }
+      if (innerChar === '-' && input[scanIndex + 1] === '>') {
+        break;
+      }
+      if (innerChar === '<' && input[scanIndex + 1] === '-') {
+        break;
+      }
       scanIndex++;
     }
     // Defensive: if no characters were consumed, advance one to avoid infinite loops.

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: {},
     });
   }
@@ -451,7 +451,7 @@ class QueryClass implements Query$.Any {
         from: {
           _tag: 'scope',
           scope: {
-            ...(options?.includeFeeds ? { allQueuesFromSpaces: true } : {}),
+            ...(options?.includeFeeds ? { allFeedsFromSpaces: true } : {}),
           },
         },
       });
@@ -573,6 +573,21 @@ class QueryClass implements Query$.Any {
       options,
     });
   }
+
+  debugLabel(label: string): Query$.Any {
+    if (this.ast.type === 'options') {
+      return new QueryClass({
+        type: 'options',
+        query: this.ast.query,
+        options: { ...this.ast.options, debugLabel: label },
+      });
+    }
+    return new QueryClass({
+      type: 'options',
+      query: this.ast,
+      options: { debugLabel: label },
+    });
+  }
 }
 
 export const Query1: typeof Query$ = QueryClass;
@@ -583,7 +598,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}`;
@@ -599,7 +614,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)) {
@@ -701,6 +716,9 @@ const prettyQuery = (query: QueryAST.Query): string => {
       if (query.options.deleted !== undefined) {
         parts.push(`deleted: ${JSON.stringify(query.options.deleted)}`);
       }
+      if (query.options.debugLabel !== undefined) {
+        parts.push(`debugLabel: ${JSON.stringify(query.options.debugLabel)}`);
+      }
       return `${prettyQuery(query.query)}.options({ ${parts.join(', ')} })`;
     }
     case 'from': {
@@ -710,11 +728,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(', ')} })`;
       }