From 6ee5b320d2eab58c18d50b861b3cfabe7f24124a Mon Sep 17 00:00:00 2001
From: nlf <quitlahok@gmail.com>
Date: Tue, 20 Sep 2022 13:13:10 -0700
Subject: [PATCH] feat(query): display `queryContext` in results

---
 lib/commands/query.js                         |  5 +--
 .../test/lib/commands/query.js.test.cjs       | 33 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/commands/query.js b/lib/commands/query.js
index 231329b19b5c8..5f05ab3164d7c 100644
--- a/lib/commands/query.js
+++ b/lib/commands/query.js
@@ -21,6 +21,7 @@ class QuerySelectorItem {
     this.inBundle = node.target.inBundle
     this.deduped = this.from.length > 1
     this.overridden = node.overridden
+    this.queryContext = node.queryContext
     for (const edge of node.target.edgesIn) {
       this.from.push(edge.from.location)
     }
@@ -63,7 +64,7 @@ class Query extends BaseCommand {
     }
     const arb = new Arborist(opts)
     const tree = await arb.loadActual(opts)
-    const items = await tree.querySelectorAll(args[0])
+    const items = await tree.querySelectorAll(args[0], this.npm.flatOptions)
     this.buildResponse(items)
 
     this.npm.output(this.parsedResponse)
@@ -84,7 +85,7 @@ class Query extends BaseCommand {
         items = await tree.querySelectorAll(args[0])
       } else {
         const [workspace] = await tree.querySelectorAll(`.workspace:path(${workspacePath})`)
-        items = await workspace.target.querySelectorAll(args[0])
+        items = await workspace.target.querySelectorAll(args[0], this.npm.flatOptions)
       }
       this.buildResponse(items)
     }
diff --git a/tap-snapshots/test/lib/commands/query.js.test.cjs b/tap-snapshots/test/lib/commands/query.js.test.cjs
index d827b62eef740..9ad6e2e38084e 100644
--- a/tap-snapshots/test/lib/commands/query.js.test.cjs
+++ b/tap-snapshots/test/lib/commands/query.js.test.cjs
@@ -23,7 +23,8 @@ exports[`test/lib/commands/query.js TAP global > should return global package 1`
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `
@@ -53,7 +54,8 @@ exports[`test/lib/commands/query.js TAP include-workspace-root > should return w
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   },
   {
     "name": "c",
@@ -69,7 +71,8 @@ exports[`test/lib/commands/query.js TAP include-workspace-root > should return w
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `
@@ -90,7 +93,8 @@ exports[`test/lib/commands/query.js TAP linked node > should return linked node
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `
@@ -116,7 +120,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   },
   {
     "pkgid": "a@",
@@ -131,7 +136,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   },
   {
     "pkgid": "b@",
@@ -146,7 +152,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `
@@ -175,7 +182,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   },
   {
     "pkgid": "a@",
@@ -190,7 +198,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   },
   {
     "pkgid": "b@",
@@ -205,7 +214,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `
@@ -226,7 +236,8 @@ exports[`test/lib/commands/query.js TAP workspace query > should return workspac
     "dev": false,
     "inBundle": false,
     "deduped": false,
-    "overridden": false
+    "overridden": false,
+    "queryContext": {}
   }
 ]
 `