@dxos/echo-query 0.8.4-main.406dc2a → 0.8.4-main.40e3dcdf1b

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/echo-query",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.40e3dcdf1b",
   "description": "ECHO queries.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "info@dxos.org",
   "sideEffects": false,
@@ -15,9 +19,9 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
-    }
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./api.d.ts": "./dist/query-lite/index.d.ts"
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
@@ -31,21 +35,22 @@
     "@lezer/common": "^1.2.2",
     "@lezer/lezer": "^1.1.2",
     "@lezer/lr": "^1.4.2",
-    "@orama/orama": "^3.1.7",
-    "@dxos/context": "0.8.4-main.406dc2a",
-    "@dxos/debug": "0.8.4-main.406dc2a",
-    "@dxos/echo-protocol": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/errors": "0.8.4-main.406dc2a",
-    "@dxos/node-std": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/vendor-quickjs": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a"
+    "@dxos/debug": "0.8.4-main.40e3dcdf1b",
+    "@dxos/context": "0.8.4-main.40e3dcdf1b",
+    "@dxos/echo-protocol": "0.8.4-main.40e3dcdf1b",
+    "@dxos/echo": "0.8.4-main.40e3dcdf1b",
+    "@dxos/errors": "0.8.4-main.40e3dcdf1b",
+    "@dxos/util": "0.8.4-main.40e3dcdf1b",
+    "@dxos/vendor-quickjs": "0.8.4-main.40e3dcdf1b",
+    "@dxos/node-std": "0.8.4-main.40e3dcdf1b",
+    "@dxos/invariant": "0.8.4-main.40e3dcdf1b"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
-    "@dxos/echo-generator": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a"
+    "tsdown": "^0.16.7",
+    "typescript": "^5.9.3",
+    "@dxos/echo-generator": "0.8.4-main.40e3dcdf1b",
+    "@dxos/random": "0.8.4-main.40e3dcdf1b"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -3,3 +3,4 @@
 //
 
 export * from './parser';
+export * from './sandbox';

package/src/parser/gen/query.terms.ts

@@ -1,26 +1,27 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 export const
   Query = 1,
-  Filter = 2,
-  TagFilter = 3,
-  Tag = 4,
-  TextFilter = 5,
-  String = 6,
-  TypeFilter = 7,
-  Identifier = 8,
-  TypeKeyword = 9,
-  PropertyFilter = 11,
-  PropertyPath = 12,
-  Value = 14,
-  Number = 15,
-  Boolean = 16,
-  Null = 17,
-  ObjectLiteral = 18,
-  ObjectProperty = 20,
-  ArrayLiteral = 23,
-  Not = 26,
-  And = 27,
-  Or = 28,
-  Relation = 29,
-  ArrowRight = 30,
-  ArrowLeft = 31
+  Assignment = 2,
+  Identifier = 3,
+  Filter = 7,
+  TagFilter = 8,
+  Tag = 9,
+  TextFilter = 10,
+  String = 11,
+  TypeFilter = 12,
+  TypeKeyword = 13,
+  PropertyFilter = 15,
+  PropertyPath = 16,
+  Value = 18,
+  Number = 19,
+  Boolean = 20,
+  Null = 21,
+  ObjectLiteral = 22,
+  ObjectProperty = 24,
+  ArrayLiteral = 27,
+  Not = 30,
+  And = 31,
+  Or = 32,
+  Relation = 33,
+  ArrowRight = 34,
+  ArrowLeft = 35

package/src/parser/gen/query.ts

@@ -1,18 +1,18 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 import {LRParser} from "@lezer/lr"
-const spec_Identifier = {__proto__:null,type:18, NOT:82, not:82, "!":82, AND:84, and:84, OR:86, or:86}
+const spec_Identifier = {__proto__:null,type:26, NOT:86, not:86, "!":86, AND:88, and:88, OR:90, or:90}
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "(QOVQPOOOOQO'#C_'#C_OOQO'#Ca'#CaOnQPO'#CcOsQPO'#ChO{QPO'#CnO!TQPO'#CgOOQO'#C^'#C^OOQO'#Cv'#CvOOQO'#DU'#DUOVQPO'#DUQ!YQPOOOVQPO'#DUO!jQPO,58}O!oQPO'#DOO!tQPO,59SO!|QPO'#CpOOQO,59Y,59YO#RQPO,59YO#ZQQO,59RO#oQPO,59pOOQO'#Cw'#CwOOQO'#Cx'#CxOOQO'#Cy'#CyOVQPO,59pOVQPO,59pOVQPO,59pO$jQPO,59pOOQO1G.i1G.iOOQO,59j,59jOOQO-E6|-E6|O#ZQQO,59[O$}QPO'#DPO%SQPO1G.tOOQO1G.t1G.tO%[QQO'#CsOOQO'#Cj'#CjOOQO1G.m1G.mO%cQPO1G/[O%yQPO1G/[O&aQPO1G/[OOQO1G/[1G/[OOQO1G.v1G.vOOQO,59k,59kOOQO-E6}-E6}OOQO7+$`7+$`OOQO,59_,59_O&wQPO,59_O#ZQQO'#DQO'PQPO1G.yOOQO1G.y1G.yOOQO,59l,59lOOQO-E7O-E7OOOQO7+$e7+$e",
-  stateData: "'X~OwOS~OSPOUQOWSOXROcTOp[OyWO~OY]O~O]^OY[X~OW`OfaO~OYcO~OngOogOzeO{fO~PVOWlO~OWmO~O]^OY[a~OYoO~OepOfrO~OUtO_tO`tOatOcTOhsO~OyWOSxaUxaWxaXxacxanxaoxapxauxazxa{xaqxa~OngOogOqyOzeO{fO~PVOW`O~OepOf}O~Oi!OO~P#ZOnxioxiuxizxi{xiqxi~PVOzeOnxioxiuxi{xiqxi~PVOzeO{fOnxioxiuxiqxi~PVOe!QOi!SO~Oe!QOi!VO~O",
-  goto: "%TyPPz!XP!XP!XPPP!X!fP!sPPP#PP#dPP#^PP#j#x$O$TPPPP$X$_$ePPP$kgXOYZ[hijkvwxgVOYZ[hijkvwxgUOYZ[hijkvwxQucQzoQ!PsR!T!QfVOYZ[hijkvwxXtcos!QQbTR{piYOYZ[dhijkvwxXhZkwxViZkxTjZkQ_SRn_QqbR|qQ!R!PR!U!RQZO^dYZdkvwxQk[QvhQwiRxj",
-  nodeNames: "⚠ Query Filter TagFilter Tag TextFilter String TypeFilter Identifier TypeKeyword : PropertyFilter PropertyPath . Value Number Boolean Null ObjectLiteral { ObjectProperty , } ArrayLiteral [ ] Not And Or Relation ArrowRight ArrowLeft ( )",
-  maxTerm: 43,
+  states: "(jOVQPOOOnQPO'#ClOOQO'#Cd'#CdOOQO'#Cf'#CfOyQPO'#ChO!OQPO'#CrO!WQPO'#CkOOQO'#Cc'#CcOOQO'#Cz'#CzOOQO'#DW'#DWOVQPO'#DWQ!]QPOOOVQPO'#DWO!mQPO,58xO!rQPO'#DQO!wQPO,59WO#PQPO,59SO#UQPO'#CtOOQO,59^,59^O#ZQPO,59^O#cQQO,59VO#wQPO,59rOOQO'#C{'#C{OOQO'#C|'#C|OOQO'#C}'#C}OVQPO,59rOVQPO,59rOVQPO,59rO$rQPO,59rOVQPO1G.dOOQO,59l,59lOOQO-E7O-E7OOOQO1G.n1G.nO#cQQO,59`O%VQPO'#DRO%[QPO1G.xOOQO1G.x1G.xO%dQQO'#CwOOQO'#Cn'#CnOOQO1G.q1G.qO%kQPO1G/^O&RQPO1G/^O&iQPO1G/^OOQO1G/^1G/^O'PQPO7+$OOOQO1G.z1G.zOOQO,59m,59mOOQO-E7P-E7POOQO7+$d7+$dOOQO,59c,59cO'dQPO,59cOOQO<<Gj<<GjO#cQQO'#DSO'lQPO1G.}OOQO1G.}1G.}OOQO,59n,59nOOQO-E7Q-E7QOOQO7+$i7+$i",
+  stateData: "'t~OyOS~ORPOT[OXQOZRO]SOgTO{WO~OS]Oa^O^`X~O^`O~ORaOjbO~O^dO~OrhOshO|fO}gO~PVOTmO~ORnO~Oa^O^`a~ORpO~O^qO~OirOjtO~OZvOcvOdvOevOgTOluO~O{WORzaTzaXzaZza]zagzarzaszawza|za}zaUza~OU{OrhOshO|fO}gO~PVORaO~OirOj!QO~Om!RO~P#cOrzisziwzi|zi}ziUzi~PVO|fOrzisziwzi}ziUzi~PVO|fO}gOrzisziwziUzi~PVOU!TOrhOshO|fO}gO~PVOi!UOm!WO~Oi!UOm!ZO~O",
+  goto: "%h{PP|PPPP|!]P!]P!]PP!]!lP!{PPP#XP#nPP#hPP#t$U$]$cPP$h$n$tPPP$zkXOYZ[ijklmxyz|kVOYZ[ijklmxyz|kUOYZ[ijklmxyz|QwdQ}qQ!SuR!X!UjVOYZ[ijklmxyz|Xvdqu!UQcTR!OrmYOYZ[eijklmxyz|ZiZlyz|XjZlz|VkZl|Q_PRo_QscR!PsQ!V!SR!Y!VQZO`eYZelxyz|Ql[QxiQyjQzkR|m",
+  nodeNames: "⚠ Query Assignment Identifier = ( ) Filter TagFilter Tag TextFilter String TypeFilter TypeKeyword : PropertyFilter PropertyPath . Value Number Boolean Null ObjectLiteral { ObjectProperty , } ArrayLiteral [ ] Not And Or Relation ArrowRight ArrowLeft",
+  maxTerm: 45,
   skippedNodes: [0],
   repeatNodeCount: 3,
-  tokenData: "2w~RrX^#]pq#]rs$Qst%nwx&fxy'}yz(S|}(X}!O(^!O!P)}!Q![(g![!]*S!^!_*X!c!}*d!}#O+O#P#Q+T#R#S*d#T#Y*d#Y#Z+Y#Z#b*d#b#c.i#c#h*d#h#i1Z#i#o*d#o#p2m#q#r2r#y#z#]$f$g#]#BY#BZ#]$IS$I_#]$I|$JO#]$JT$JU#]$KV$KW#]&FU&FV#]~#bYw~X^#]pq#]#y#z#]$f$g#]#BY#BZ#]$IS$I_#]$I|$JO#]$JT$JU#]$KV$KW#]&FU&FV#]~$TVOr$Qrs$js#O$Q#O#P$o#P;'S$Q;'S;=`%h<%lO$Q~$oOU~~$rRO;'S$Q;'S;=`${;=`O$Q~%OWOr$Qrs$js#O$Q#O#P$o#P;'S$Q;'S;=`%h;=`<%l$Q<%lO$Q~%kP;=`<%l$Q~%qT}!O&Q!Q![&Q!c!}&Q#R#S&Q#T#o&Q~&VTS~}!O&Q!Q![&Q!c!}&Q#R#S&Q#T#o&Q~&iVOw&fwx$jx#O&f#O#P'O#P;'S&f;'S;=`'w<%lO&f~'RRO;'S&f;'S;=`'[;=`O&f~'_WOw&fwx$jx#O&f#O#P'O#P;'S&f;'S;=`'w;=`<%l&f<%lO&f~'zP;=`<%l&f~(SOp~~(XOq~~(^Oe~~(aQ!Q![(g!`!a)x~(lS_~!O!P(x!Q![(g!g!h)^#X#Y)^~({P!Q![)O~)TR_~!Q![)O!g!h)^#X#Y)^~)aR{|)j}!O)j!Q![)p~)mP!Q![)p~)uP_~!Q![)p~)}On~~*SO]~~*XOY~~*[P}!O*_~*dOo~P*iVWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#o*d~+TOh~~+YOi~R+_WWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#U+w#U#o*dR+|XWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#`*d#`#a,i#a#o*dR,nXWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#g*d#g#h-Z#h#o*dR-`XWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#X*d#X#Y-{#Y#o*dR.SV`QWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#o*dR.nXWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#i*d#i#j/Z#j#o*dR/`XWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#`*d#`#a/{#a#o*dR0QXWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#`*d#`#a0m#a#o*dR0tVWPaQ}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#o*dR1`XWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#f*d#f#g1{#g#o*dR2QXWP}!O*d!O!P*d!P!Q*d!Q![*d!c!}*d#R#S*d#T#i*d#i#j-Z#j#o*d~2rOc~~2wOf~",
+  tokenData: "3P~RsX^#`pq#`rs$Tst%qwx&ixy(Qyz(V|}([}!O(a!O!P*Q!Q![(j![!]*V!^!_*[!_!`*g!c!}*l!}#O+W#P#Q+]#R#S*l#T#Y*l#Y#Z+b#Z#b*l#b#c.q#c#h*l#h#i1c#i#o*l#o#p2u#q#r2z#y#z#`$f$g#`#BY#BZ#`$IS$I_#`$I|$JO#`$JT$JU#`$KV$KW#`&FU&FV#`~#eYy~X^#`pq#`#y#z#`$f$g#`#BY#BZ#`$IS$I_#`$I|$JO#`$JT$JU#`$KV$KW#`&FU&FV#`~$WVOr$Trs$ms#O$T#O#P$r#P;'S$T;'S;=`%k<%lO$T~$rOZ~~$uRO;'S$T;'S;=`%O;=`O$T~%RWOr$Trs$ms#O$T#O#P$r#P;'S$T;'S;=`%k;=`<%l$T<%lO$T~%nP;=`<%l$T~%tT}!O&T!Q![&T!c!}&T#R#S&T#T#o&T~&YTX~}!O&T!Q![&T!c!}&T#R#S&T#T#o&T~&lVOw&iwx$mx#O&i#O#P'R#P;'S&i;'S;=`'z<%lO&i~'URO;'S&i;'S;=`'_;=`O&i~'bWOw&iwx$mx#O&i#O#P'R#P;'S&i;'S;=`'z;=`<%l&i<%lO&i~'}P;=`<%l&i~(VOT~~([OU~~(aOi~~(dQ!Q![(j!`!a){~(oSc~!O!P({!Q![(j!g!h)a#X#Y)a~)OP!Q![)R~)WRc~!Q![)R!g!h)a#X#Y)a~)dR{|)m}!O)m!Q![)s~)pP!Q![)s~)xPc~!Q![)s~*QOr~~*VOa~~*[O^~~*_P}!O*b~*gOs~~*lOS~P*qVRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#o*l~+]Ol~~+bOm~R+gWRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#U,P#U#o*lR,UXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#`*l#`#a,q#a#o*lR,vXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#g*l#g#h-c#h#o*lR-hXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#X*l#X#Y.T#Y#o*lR.[VdQRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#o*lR.vXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#i*l#i#j/c#j#o*lR/hXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#`*l#`#a0T#a#o*lR0YXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#`*l#`#a0u#a#o*lR0|VRPeQ}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#o*lR1hXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#f*l#f#g2T#g#o*lR2YXRP}!O*l!O!P*l!P!Q*l!Q![*l!c!}*l#R#S*l#T#i*l#i#j-c#j#o*l~2zOg~~3POj~",
   tokenizers: [0, 1],
   topRules: {"Query":[0,1]},
-  specialized: [{term: 8, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}],
+  specialized: [{term: 3, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}],
   tokenPrec: 0
 })

package/src/parser/query-builder.ts

@@ -9,6 +9,9 @@ import { invariant } from '@dxos/invariant';
 
 import { QueryDSL } from './gen';
 
+// TODO(burdon): Return Query AST.
+export type BuildResult = { filter?: Filter.Any; name?: string };
+
 /**
  * Stateless query builder that parses DSL trees into filters.
  *
@@ -18,7 +21,7 @@ import { QueryDSL } from './gen';
 export class QueryBuilder {
   private readonly _parser: Parser = QueryDSL.Parser.configure({ strict: true });
 
-  constructor(private readonly _tags?: Tag.TagMap) {}
+  constructor(private readonly _tags?: Tag.Map) {}
 
   /**
    * Check valid input.
@@ -35,24 +38,24 @@ export class QueryBuilder {
   /**
    * Build a query from the input string.
    */
-  build(input: string): Filter.Any | undefined {
+  build(input: string): BuildResult {
     try {
       const tree = this._parser.parse(input);
       return this.buildQuery(tree, input);
     } catch {
-      return undefined;
+      return {};
     }
   }
 
   /**
    * Build a query from a parsed DSL tree.
    */
-  buildQuery(tree: Tree, input: string): Filter.Any | undefined {
+  buildQuery(tree: Tree, input: string): BuildResult {
     const cursor = tree.cursor();
 
     // Start at root (Query node).
     if (cursor.node.name !== 'Query') {
-      return undefined;
+      return {};
     }
 
     // Check if Query has multiple children (binary expression).
@@ -64,20 +67,70 @@ export class QueryBuilder {
       cursor.parent();
     }
 
+    // Check if this is an assignment.
+    const hasAssignment = children.some((child) => child.name === 'Assignment');
+    if (hasAssignment) {
+      return this._parseAssignment(cursor, input);
+    }
+
     // If we have an operator in the children, or multiple expressions (implicit AND), parse as binary expression.
     const hasOperator = children.some((child) => child.name === 'And' || child.name === 'Or');
     const hasMultipleExpressions =
       children.filter((child) => child.name === 'Filter' || child.name === 'Not' || child.name === '(').length > 1;
     if (hasOperator || hasMultipleExpressions) {
-      return this._parseBinaryExpression(cursor, input);
+      const filter = this._parseBinaryExpression(cursor, input);
+      return { filter };
     }
 
     // Otherwise, parse the single expression.
     if (!cursor.firstChild()) {
-      return Filter.nothing();
+      return { filter: Filter.nothing() };
     }
 
-    return this._parseExpression(cursor, input);
+    const filter = this._parseExpression(cursor, input);
+    return { filter };
+  }
+
+  /**
+   * Parse an assignment node.
+   */
+  private _parseAssignment(cursor: TreeCursor, input: string): BuildResult {
+    if (!cursor.firstChild()) {
+      return {};
+    }
+
+    let name: string | undefined;
+    let filter: Filter.Any | undefined;
+
+    // Find the Assignment node
+    do {
+      if (cursor.node.name === 'Assignment') {
+        // Get the full assignment text first
+        const assignmentText = this._getNodeText(cursor, input);
+
+        if (cursor.firstChild()) {
+          // First child should be the variable name (Identifier)
+          name = this._getNodeText(cursor, input);
+
+          // Find the parentheses in the assignment text and extract the content
+          const openParenIndex = assignmentText.indexOf('(');
+          const closeParenIndex = assignmentText.lastIndexOf(')');
+
+          if (openParenIndex !== -1 && closeParenIndex !== -1 && closeParenIndex > openParenIndex) {
+            const subInput = assignmentText.slice(openParenIndex + 1, closeParenIndex).trim();
+            const subTree = this._parser.parse(subInput);
+            const subResult = this.buildQuery(subTree, subInput);
+            filter = subResult.filter;
+          }
+
+          cursor.parent(); // Back to Assignment
+        }
+        break;
+      }
+    } while (cursor.nextSibling());
+
+    cursor.parent(); // Back to Query
+    return { filter, name };
   }
 
   /**
@@ -204,9 +257,9 @@ export class QueryBuilder {
             // Parse the expression inside parentheses as a subtree.
             const subInput = input.slice(exprStart, exprEnd);
             const subTree = this._parser.parse(subInput);
-            const subFilter = this.buildQuery(subTree, subInput);
-            if (subFilter) {
-              filters.push(subFilter);
+            const subResult = this.buildQuery(subTree, subInput);
+            if (subResult.filter) {
+              filters.push(subResult.filter);
             }
           } else {
             // Simple parenthesized expression.

package/src/parser/query.grammar

@@ -5,6 +5,7 @@
 @top Query { expression }
 
 expression {
+  Assignment |
   Filter |
   !Not Not expression |
   expression !ImplicitAnd expression |
@@ -14,6 +15,10 @@ expression {
   "(" expression ")"
 }
 
+Assignment {
+  Identifier "=" "(" expression ")"
+}
+
 Not { 
   @specialize<Identifier, "NOT" | "not" | "!">
 }
@@ -110,7 +115,7 @@ Value {
   space { @whitespace+ }
 
   "{" "}" "[" "]" "(" ")"
-  ":" ","  "."
+  ":" ","  "." "="
 }
 
 @skip { space }
@@ -120,5 +125,6 @@ Value {
   ImplicitAnd @left,
   And @left,
   Or @left,
-  Relation @left
+  Relation @left,
+  Assignment @right
 }

package/src/parser/query.test.ts

@@ -8,7 +8,7 @@ import { describe, it } from 'vitest';
 import { Filter, Tag } from '@dxos/echo';
 
 import { QueryDSL } from './gen';
-import { QueryBuilder } from './query-builder';
+import { type BuildResult, QueryBuilder } from './query-builder';
 
 // TODO(burdon): Ref/Relation traversal.
 
@@ -51,10 +51,10 @@ describe('query', () => {
       },
       // Type
       {
-        input: 'type:dxos.org/type/Person',
+        input: 'type:org.dxos.type.person',
         expected: [
           'Query',
-          // type:dxos.org/type/Person
+          // type:org.dxos.type.person
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -111,10 +111,10 @@ describe('query', () => {
         ],
       },
       {
-        input: 'type:dxos.org/type/Person OR type:dxos.org/type/Organization',
+        input: 'type:org.dxos.type.person OR type:org.dxos.type.organization',
         expected: [
           'Query',
-          // type:dxos.org/type/Person
+          // type:org.dxos.type.person
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -122,7 +122,7 @@ describe('query', () => {
           'Identifier',
           // OR
           'Or',
-          // type:dxos.org/type/Organization
+          // type:org.dxos.type.organization
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -131,11 +131,11 @@ describe('query', () => {
         ],
       },
       {
-        input: '(type:dxos.org/type/Person OR type:dxos.org/type/Organization) AND { name: "DXOS" }',
+        input: '(type:org.dxos.type.person OR type:org.dxos.type.organization) AND { name: "DXOS" }',
         expected: [
           'Query',
           '(',
-          // type:dxos.org/type/Person
+          // type:org.dxos.type.person
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -143,7 +143,7 @@ describe('query', () => {
           'Identifier',
           // OR
           'Or',
-          // type:dxos.org/type/Organization
+          // type:org.dxos.type.organization
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -164,10 +164,10 @@ describe('query', () => {
         ],
       },
       {
-        input: 'type:dxos.org/type/Person -> type:dxos.org/type/Organization',
+        input: 'type:org.dxos.type.person -> type:org.dxos.type.organization',
         expected: [
           'Query',
-          // type:dxos.org/type/Person
+          // type:org.dxos.type.person
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -175,7 +175,7 @@ describe('query', () => {
           'Identifier',
           'Relation',
           'ArrowRight',
-          // type:dxos.org/type/Organization
+          // type:org.dxos.type.organization
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -184,10 +184,10 @@ describe('query', () => {
         ],
       },
       {
-        input: 'type:dxos.org/type/Organization <- type:dxos.org/type/Person',
+        input: 'type:org.dxos.type.organization <- type:org.dxos.type.person',
         expected: [
           'Query',
-          // type:dxos.org/type/Organization
+          // type:org.dxos.type.organization
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -195,7 +195,7 @@ describe('query', () => {
           'Identifier',
           'Relation',
           'ArrowLeft',
-          // type:dxos.org/type/Person
+          // type:org.dxos.type.person
           'Filter',
           'TypeFilter',
           'TypeKeyword',
@@ -206,7 +206,7 @@ describe('query', () => {
       {
         // Persons for Organizations with name "DXOS"
         // TODO(burdon): Filter relations.
-        input: '((type:dxos.org/type/Organization AND { name: "DXOS" }) -> type:dxos.org/type/Person)',
+        input: '((type:org.dxos.type.organization AND { name: "DXOS" }) -> type:org.dxos.type.person)',
         expected: [
           'Query',
           '(',
@@ -238,7 +238,7 @@ describe('query', () => {
         ],
       },
       {
-        input: 'type:dxos.org/type/Person and { name: "DXOS" }',
+        input: 'type:org.dxos.type.person and { name: "DXOS" }',
         expected: [
           'Query',
           'Filter',
@@ -258,6 +258,22 @@ describe('query', () => {
           '}',
         ],
       },
+      {
+        input: 'x = ( type: org.dxos.type.person )',
+        expected: [
+          'Query',
+          'Assignment',
+          'Identifier',
+          '=',
+          '(',
+          'Filter',
+          'TypeFilter',
+          'TypeKeyword',
+          ':',
+          'Identifier',
+          ')',
+        ],
+      },
     ];
 
     for (const { input, expected } of tests) {
@@ -285,72 +301,109 @@ describe('query', () => {
     });
 
     // TODO(burdon): Test "not"
-    type Test = { input: string; expected: Filter.Any };
+    type Test = { input: string; expected: BuildResult };
     const tests: Test[] = [
       // Types
       {
-        input: 'type:dxos.org/type/Person',
-        expected: Filter.typename('dxos.org/type/Person'),
+        input: 'type:org.dxos.type.person',
+        expected: {
+          filter: Filter.typename('org.dxos.type.person'),
+        },
       },
       // Tags
       {
         input: '#foo',
-        expected: Filter.tag('tag_1'),
+        expected: {
+          filter: Filter.tag('tag_1'),
+        },
       },
       {
         input: '#foo AND #bar',
-        expected: Filter.and(Filter.tag('tag_1'), Filter.tag('tag_2')),
+        expected: {
+          filter: Filter.and(Filter.tag('tag_1'), Filter.tag('tag_2')),
+        },
       },
       {
         input: '#foo #bar',
-        expected: Filter.and(Filter.tag('tag_1'), Filter.tag('tag_2')),
+        expected: {
+          filter: Filter.and(Filter.tag('tag_1'), Filter.tag('tag_2')),
+        },
       },
       // Text
       {
         input: '"test"',
-        expected: Filter.text('test'),
+        expected: {
+          filter: Filter.text('test'),
+        },
       },
       // Mixed
       {
         input: '#foo "test"',
-        expected: Filter.and(Filter.tag('tag_1'), Filter.text('test')),
+        expected: {
+          filter: Filter.and(Filter.tag('tag_1'), Filter.text('test')),
+        },
       },
       // Props
       {
         input: '{ name: "DXOS" }',
-        expected: Filter.props({ name: 'DXOS' }),
+        expected: {
+          filter: Filter.props({ name: 'DXOS' }),
+        },
       },
       {
         input: '{ value: 100 }',
-        expected: Filter.props({ value: 100 }),
+        expected: {
+          filter: Filter.props({ value: 100 }),
+        },
+      },
+      {
+        input: 'type:org.dxos.type.person OR type:org.dxos.type.organization',
+        expected: {
+          filter: Filter.or(Filter.typename('org.dxos.type.person'), Filter.typename('org.dxos.type.organization')),
+        },
+      },
+      {
+        input: '(type:org.dxos.type.person OR type:org.dxos.type.organization) AND { name: "DXOS" }',
+        expected: {
+          filter: Filter.and(
+            Filter.or(Filter.typename('org.dxos.type.person'), Filter.typename('org.dxos.type.organization')),
+            Filter.props({ name: 'DXOS' }),
+          ),
+        },
       },
       {
-        input: 'type:dxos.org/type/Person OR type:dxos.org/type/Organization',
-        expected: Filter.or(Filter.typename('dxos.org/type/Person'), Filter.typename('dxos.org/type/Organization')),
+        input: 'type:org.dxos.type.person and { name: "DXOS" }',
+        expected: {
+          filter: Filter.and(Filter.typename('org.dxos.type.person'), Filter.props({ name: 'DXOS' })),
+        },
       },
+      // Assignment
       {
-        input: '(type:dxos.org/type/Person OR type:dxos.org/type/Organization) AND { name: "DXOS" }',
-        expected: Filter.and(
-          Filter.or(Filter.typename('dxos.org/type/Person'), Filter.typename('dxos.org/type/Organization')),
-          Filter.props({ name: 'DXOS' }),
-        ),
+        input: 'x = ( type:org.dxos.type.person )',
+        expected: {
+          name: 'x',
+          filter: Filter.typename('org.dxos.type.person'),
+        },
       },
       {
-        input: 'type:dxos.org/type/Person and { name: "DXOS" }',
-        expected: Filter.and(Filter.typename('dxos.org/type/Person'), Filter.props({ name: 'DXOS' })),
+        input: 'x = ( #foo AND "bar" )',
+        expected: {
+          name: 'x',
+          filter: Filter.and(Filter.tag('tag_1'), Filter.text('bar')),
+        },
       },
       // TODO(burdon): Convert Query/Filter expr to AST.
       // TODO(burdon): Person -> Organization (many-to-many relation).
       // Get Research Note objects for Organization objects for Person objects with jobTitle.
       //
-      // Cypher: MATCH (p:Person)-[:WorksAt]->(o:Organization)<-[:ResearchOn]-(r:ResearchNote) WHERE p.jotTitle IS NOT NULL
-      // ((type:Person AND { jobTitle: "investor" }) -[:WorksAt]-> type:Organization) <-[:ResearchOn]- type:ResearchNote
+      // Cypher: MATCH (p:Person)-[:WorksAt]->(o:Organization)<-[:HasSubject]-(r:ResearchNote) WHERE p.jotTitle IS NOT NULL
+      // ((type:Person AND { jobTitle: "investor" }) -[:WorksAt]-> type:Organization) <-[:HasSubject]- type:ResearchNote
       //
       // {
       //   input: '',
-      //   expected: Query.select(Filter.typename('dxos.org/type/Person', { jobTitle: 'investor' }))
+      //   expected: Query.select(Filter.typename('org.dxos.type.person', { jobTitle: 'investor' }))
       //     .reference('organization')
-      //     .targetOf(Relation.of('dxos.org/relation/ResearchOn')) // TODO(burdon): Invert?
+      //     .targetOf(Relation.of('org.dxos.relation.has-subject')) // TODO(burdon): Invert?
       //     .source(),
       // },
     ];