idxs 0.0.5 → 0.0.6

package/dist/QueryBuilder.js

@@ -146,10 +146,10 @@ class Connection {
     }
     prepareQuery(compiledQuery) {
         let query = compiledQuery.sql;
-        compiledQuery.parameters.forEach((param, i) => {
+        for (let i = compiledQuery.parameters.length - 1; i >= 0; i--) {
             const placeholder = `$${i + 1}`;
-            query = query.replaceAll(placeholder, String(param));
-        });
+            query = query.replaceAll(placeholder, String(compiledQuery.parameters[i]));
+        }
         const signatures = [];
         for (const signature of this.options.signatures ?? []) {
             const abiItem = parseAbiItem(signature);

package/dist/QueryBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../src/QueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilder.js","sourceRoot":"","sources":["../src/QueryBuilder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "idxs",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "./dist/index.js",
   "license": "MIT",
   "repository": {

package/src/QueryBuilder.test.ts

@@ -326,6 +326,25 @@ describe('from', () => {
     expect(page2.length).toBeLessThanOrEqual(limit)
   })
 
+  test('behavior: IN clause with 10+ parameters', async () => {
+    const qb = QueryBuilder.from(is)
+    const txs = await qb
+      .selectFrom('txs')
+      .select(['hash'])
+      .where('chain', '=', 8453)
+      .limit(12)
+      .execute()
+    const hashes = txs.map((tx) => tx.hash)
+
+    const result = await qb
+      .selectFrom('txs')
+      .select(['hash'])
+      .where('chain', '=', 8453)
+      .where('hash', 'in', hashes)
+      .execute()
+    expect(result.length).toBe(12)
+  })
+
   test('behavior: streaming query with live endpoint', async () => {
     const qb = QueryBuilder.from(is).withSignatures([
       'event Transfer(address indexed from, address indexed to, uint256 value)',

package/src/QueryBuilder.ts

@@ -368,10 +368,10 @@ class Connection implements DatabaseConnection {
   prepareQuery(compiledQuery: CompiledQuery) {
     let query = compiledQuery.sql
 
-    compiledQuery.parameters.forEach((param, i) => {
+    for (let i = compiledQuery.parameters.length - 1; i >= 0; i--) {
       const placeholder = `$${i + 1}`
-      query = query.replaceAll(placeholder, String(param))
-    })
+      query = query.replaceAll(placeholder, String(compiledQuery.parameters[i]))
+    }
 
     const signatures: string[] = []