feat(query): display queryContext in results

nlf · lukekarrys · commit 6ee5b320d2ea · 2022-09-21T13:08:28.000-07:00
diff --git 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
@@ -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": {}
   }
 ]
 `

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class QuerySelectorItem {`
`21`	`21`	`this.inBundle = node.target.inBundle`
`22`	`22`	`this.deduped = this.from.length > 1`
`23`	`23`	`this.overridden = node.overridden`
	`24`	`+ this.queryContext = node.queryContext`
`24`	`25`	`for (const edge of node.target.edgesIn) {`
`25`	`26`	`this.from.push(edge.from.location)`
`26`	`27`	`}`
`@@ -63,7 +64,7 @@ class Query extends BaseCommand {`
`63`	`64`	`}`
`64`	`65`	`const arb = new Arborist(opts)`
`65`	`66`	`const tree = await arb.loadActual(opts)`
`66`		`- const items = await tree.querySelectorAll(args[0])`
	`67`	`+ const items = await tree.querySelectorAll(args[0], this.npm.flatOptions)`
`67`	`68`	`this.buildResponse(items)`
`68`	`69`
`69`	`70`	`this.npm.output(this.parsedResponse)`
`@@ -84,7 +85,7 @@ class Query extends BaseCommand {`
`84`	`85`	`items = await tree.querySelectorAll(args[0])`
`85`	`86`	`} else {`
`86`	`87`	const [workspace] = await tree.querySelectorAll(`.workspace:path(${workspacePath})`)
`87`		`- items = await workspace.target.querySelectorAll(args[0])`
	`88`	`+ items = await workspace.target.querySelectorAll(args[0], this.npm.flatOptions)`
`88`	`89`	`}`
`89`	`90`	`this.buildResponse(items)`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
@@ -23,7 +23,8 @@ exports[`test/lib/commands/query.js TAP global > should return global package 1`
`23`	`23`	`"dev": false,`
`24`	`24`	`"inBundle": false,`
`25`	`25`	`"deduped": false,`
`26`		`- "overridden": false`
	`26`	`+ "overridden": false,`
	`27`	`+ "queryContext": {}`
`27`	`28`	`}`
`28`	`29`	`]`
`29`	`30`	`
@@ -53,7 +54,8 @@ exports[`test/lib/commands/query.js TAP include-workspace-root > should return w
`53`	`54`	`"dev": false,`
`54`	`55`	`"inBundle": false,`
`55`	`56`	`"deduped": false,`
`56`		`- "overridden": false`
	`57`	`+ "overridden": false,`
	`58`	`+ "queryContext": {}`
`57`	`59`	`},`
`58`	`60`	`{`
`59`	`61`	`"name": "c",`
@@ -69,7 +71,8 @@ exports[`test/lib/commands/query.js TAP include-workspace-root > should return w
`69`	`71`	`"dev": false,`
`70`	`72`	`"inBundle": false,`
`71`	`73`	`"deduped": false,`
`72`		`- "overridden": false`
	`74`	`+ "overridden": false,`
	`75`	`+ "queryContext": {}`
`73`	`76`	`}`
`74`	`77`	`]`
`75`	`78`	`
@@ -90,7 +93,8 @@ exports[`test/lib/commands/query.js TAP linked node > should return linked node
`90`	`93`	`"dev": false,`
`91`	`94`	`"inBundle": false,`
`92`	`95`	`"deduped": false,`
`93`		`- "overridden": false`
	`96`	`+ "overridden": false,`
	`97`	`+ "queryContext": {}`
`94`	`98`	`}`
`95`	`99`	`]`
`96`	`100`	`
@@ -116,7 +120,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
`116`	`120`	`"dev": false,`
`117`	`121`	`"inBundle": false,`
`118`	`122`	`"deduped": false,`
`119`		`- "overridden": false`
	`123`	`+ "overridden": false,`
	`124`	`+ "queryContext": {}`
`120`	`125`	`},`
`121`	`126`	`{`
`122`	`127`	`"pkgid": "a@",`
@@ -131,7 +136,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
`131`	`136`	`"dev": false,`
`132`	`137`	`"inBundle": false,`
`133`	`138`	`"deduped": false,`
`134`		`- "overridden": false`
	`139`	`+ "overridden": false,`
	`140`	`+ "queryContext": {}`
`135`	`141`	`},`
`136`	`142`	`{`
`137`	`143`	`"pkgid": "b@",`
@@ -146,7 +152,8 @@ exports[`test/lib/commands/query.js TAP recursive tree > should return everythin
`146`	`152`	`"dev": false,`
`147`	`153`	`"inBundle": false,`
`148`	`154`	`"deduped": false,`
`149`		`- "overridden": false`
	`155`	`+ "overridden": false,`
	`156`	`+ "queryContext": {}`
`150`	`157`	`}`
`151`	`158`	`]`
`152`	`159`	`
@@ -175,7 +182,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
`175`	`182`	`"dev": false,`
`176`	`183`	`"inBundle": false,`
`177`	`184`	`"deduped": false,`
`178`		`- "overridden": false`
	`185`	`+ "overridden": false,`
	`186`	`+ "queryContext": {}`
`179`	`187`	`},`
`180`	`188`	`{`
`181`	`189`	`"pkgid": "a@",`
@@ -190,7 +198,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
`190`	`198`	`"dev": false,`
`191`	`199`	`"inBundle": false,`
`192`	`200`	`"deduped": false,`
`193`		`- "overridden": false`
	`201`	`+ "overridden": false,`
	`202`	`+ "queryContext": {}`
`194`	`203`	`},`
`195`	`204`	`{`
`196`	`205`	`"pkgid": "b@",`
@@ -205,7 +214,8 @@ exports[`test/lib/commands/query.js TAP simple query > should return root object
`205`	`214`	`"dev": false,`
`206`	`215`	`"inBundle": false,`
`207`	`216`	`"deduped": false,`
`208`		`- "overridden": false`
	`217`	`+ "overridden": false,`
	`218`	`+ "queryContext": {}`
`209`	`219`	`}`
`210`	`220`	`]`
`211`	`221`	`
@@ -226,7 +236,8 @@ exports[`test/lib/commands/query.js TAP workspace query > should return workspac
`226`	`236`	`"dev": false,`
`227`	`237`	`"inBundle": false,`
`228`	`238`	`"deduped": false,`
`229`		`- "overridden": false`
	`239`	`+ "overridden": false,`
	`240`	`+ "queryContext": {}`
`230`	`241`	`}`
`231`	`242`	`]`
`232`	`243`	`