Finish subquery

G4brym · G4brym · commit bdc60d058e67 · 2025-07-21T09:34:25.000+01:00
diff --git a/biome.json b/biome.json
@@ -1,34 +1,34 @@
 {
-	"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-	"vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
-	"files": { "ignoreUnknown": false, "ignore": ["dist", "docs/site"] },
-	"formatter": {
-		"enabled": true,
-		"useEditorconfig": true,
-		"formatWithErrors": false,
-		"indentStyle": "space",
-		"indentWidth": 2,
-		"lineEnding": "lf",
-		"lineWidth": 120,
-		"attributePosition": "auto",
-		"bracketSpacing": true
-	},
-	"organizeImports": { "enabled": true },
-	"linter": {
-		"enabled": true,
-		"rules": { "recommended": false }
-	},
-	"javascript": {
-		"formatter": {
-			"jsxQuoteStyle": "double",
-			"quoteProperties": "asNeeded",
-			"trailingCommas": "es5",
-			"semicolons": "asNeeded",
-			"arrowParentheses": "always",
-			"bracketSameLine": false,
-			"quoteStyle": "single",
-			"attributePosition": "auto",
-			"bracketSpacing": true
-		}
-	}
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
+  "files": { "ignoreUnknown": false, "ignore": ["dist", "docs/site"] },
+  "formatter": {
+    "enabled": true,
+    "useEditorconfig": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 120,
+    "attributePosition": "auto",
+    "bracketSpacing": true
+  },
+  "organizeImports": { "enabled": true },
+  "linter": {
+    "enabled": true,
+    "rules": { "recommended": false }
+  },
+  "javascript": {
+    "formatter": {
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "trailingCommas": "es5",
+      "semicolons": "asNeeded",
+      "arrowParentheses": "always",
+      "bracketSameLine": false,
+      "quoteStyle": "single",
+      "attributePosition": "auto",
+      "bracketSpacing": true
+    }
+  }
 }
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
@@ -1,47 +1,56 @@
-import {defineConfig} from 'vitepress'
+import { defineConfig } from 'vitepress'
 
 // https://vitepress.dev/reference/site-config
 export default defineConfig({
-  title: "workers-qb",
-  text: "Zero dependencies Query Builder for Cloudflare Workers",
+  title: 'workers-qb',
+  text: 'Zero dependencies Query Builder for Cloudflare Workers',
   cleanUrls: true,
-  head: [['link', {rel: 'icon', type: "image/png", href: 'https://raw.githubusercontent.com/G4brym/workers-qb/refs/heads/main/docs/assets/logo-icon.png'}]],
+  head: [
+    [
+      'link',
+      {
+        rel: 'icon',
+        type: 'image/png',
+        href: 'https://raw.githubusercontent.com/G4brym/workers-qb/refs/heads/main/docs/assets/logo-icon.png',
+      },
+    ],
+  ],
   themeConfig: {
     // https://vitepress.dev/reference/default-theme-config
     logo: 'https://raw.githubusercontent.com/G4brym/workers-qb/refs/heads/main/docs/assets/logo-icon.png',
     outline: [2, 3],
     nav: [
-      {text: 'Home', link: '/'},
-      {text: 'Docs', link: '/introduction'}
+      { text: 'Home', link: '/' },
+      { text: 'Docs', link: '/introduction' },
     ],
     sidebar: [
       {
         text: 'Getting Started',
         items: [
-          {text: 'Introduction', link: '/introduction'},
-          {text: 'Basic Queries', link: '/basic-queries'},
-          {text: 'Advanced Queries', link: '/advanced-queries'},
-          {text: 'Migrations', link: '/migrations'},
-          {text: 'Type Checking', link: '/type-check'},
-        ]
+          { text: 'Introduction', link: '/introduction' },
+          { text: 'Basic Queries', link: '/basic-queries' },
+          { text: 'Advanced Queries', link: '/advanced-queries' },
+          { text: 'Migrations', link: '/migrations' },
+          { text: 'Type Checking', link: '/type-check' },
+        ],
       },
       {
         text: 'Databases',
         items: [
-          {text: 'D1', link: '/databases/d1'},
-          {text: 'Durable Objects', link: '/databases/do'},
-          {text: 'PostgreSQL', link: '/databases/postgresql'},
-          {text: 'Bring your own', link: '/databases/byodb'},
-        ]
+          { text: 'D1', link: '/databases/d1' },
+          { text: 'Durable Objects', link: '/databases/do' },
+          { text: 'PostgreSQL', link: '/databases/postgresql' },
+          { text: 'Bring your own', link: '/databases/byodb' },
+        ],
       },
     ],
     socialLinks: [
-      {icon: 'github', link: 'https://github.com/G4brym/workers-qb'},
-      {icon: 'x', link: 'https://x.com/G4brym'}
+      { icon: 'github', link: 'https://github.com/G4brym/workers-qb' },
+      { icon: 'x', link: 'https://x.com/G4brym' },
     ],
     footer: {
       message: 'Released under the MIT License.',
-      copyright: 'Copyright © 2024-present Gabriel Massadas'
-    }
-  }
+      copyright: 'Copyright © 2024-present Gabriel Massadas',
+    },
+  },
 })
diff --git a/docs/advanced-queries.md b/docs/advanced-queries.md
@@ -89,11 +89,7 @@ console.log('User and product combinations:', userProductCombinations.results);
 
 ## Subqueries
 
-`workers-qb` supports using subqueries within your `WHERE`, `HAVING` and `JOIN` clauses, allowing for more complex and powerful queries. 
-You can construct a subquery in two main ways:
-
-1.  **Passing a `SelectBuilder` instance**: Useful when you want to build a subquery and reuse it in multiple places.
-2.  **Using an inline function**: A concise way to define a subquery directly within the main query.
+`workers-qb` supports using subqueries within your `WHERE`, `HAVING` and `JOIN` clauses, allowing for more complex and powerful queries.
 
 ### `IN` with a Subquery
 
@@ -122,23 +118,6 @@ console.log(tasksInActiveProjects.results);
 // SQL: SELECT * FROM tasks WHERE project_id IN (SELECT id FROM projects WHERE status = 'active')
 ```
 
-#### Using an inline function
-
-```typescript
-import { D1QB } from 'workers-qb';
-
-// ... (D1QB initialization) ...
-
-// Main query: Get tasks that belong to active projects
-const tasksInActiveProjects = await qb
-  .select('tasks')
-  .where('project_id IN ?', (qb) => qb.select('projects').fields('id').where('status = ?', 'active'))
-  .execute();
-
-console.log(tasksInActiveProjects.results);
-// SQL: SELECT * FROM tasks WHERE project_id IN (SELECT id FROM projects WHERE status = 'active')
-```
-
 ### `EXISTS` with a Subquery
 
 Check for the existence of rows in a subquery. This is useful for conditional filtering.
diff --git a/package.json b/package.json
@@ -5,11 +5,7 @@
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
+  "files": ["dist", "LICENSE", "README.md"],
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "lint": "npx @biomejs/biome check src/ tests/ || (npx @biomejs/biome check --write src/ tests/; exit 1)",
diff --git a/tests/unit/subquery.test.ts b/tests/unit/subquery.test.ts
@@ -18,21 +18,13 @@ describe('Subqueries using SelectBuilder instance', () => {
     expect(q.arguments).toEqual(['active'])
   })
 
-  it('column IN (subquery) - using an inline function', () => {
-    const q = new QuerybuilderTest()
-      .select('tasks')
-      .where('project_id IN ?', (qb) => qb.select('projects').fields('id').where('status = ?', 'active'))
-      .getQueryAll()
-
-    expect(q.query).toEqual('SELECT * FROM tasks WHERE project_id IN (SELECT id FROM projects WHERE status = ?)')
-    expect(q.arguments).toEqual(['active'])
-  })
-
   it('EXISTS (subquery)', () => {
     const sub = new QuerybuilderTest().select('permissions').where('user_id = ?', 100).where('action = ?', 'edit')
     const q = new QuerybuilderTest().select('documents').where('EXISTS ?', sub).getQueryAll()
 
-    expect(q.query).toEqual('SELECT * FROM documents WHERE EXISTS (SELECT * FROM permissions WHERE user_id = ? AND action = ?)')
+    expect(q.query).toEqual(
+      'SELECT * FROM documents WHERE EXISTS (SELECT * FROM permissions WHERE (user_id = ?) AND (action = ?))'
+    )
     expect(q.arguments).toEqual([100, 'edit'])
   })
 
@@ -50,11 +42,7 @@ describe('Subqueries using SelectBuilder instance', () => {
       .fields('customer_id')
       .groupBy('customer_id')
       .having('SUM(total) > ?', 1000)
-    const q = new QuerybuilderTest()
-      .select('customers')
-      .fields(['id', 'name'])
-      .having('id IN ?', sub)
-      .getQueryAll()
+    const q = new QuerybuilderTest().select('customers').fields(['id', 'name']).having('id IN ?', sub).getQueryAll()
 
     expect(q.query).toEqual(
       'SELECT id, name FROM customers HAVING id IN (SELECT customer_id FROM orders GROUP BY customer_id HAVING SUM(total) > ?)'
