Fix include exclude binding for seclection (#52)

JonoPrest · web-flow · commit 70a4504ed57e · 2026-01-30T13:24:31.000+02:00
* Transform union type to match selection first then filter

Previously Either always matched as filter since filter can always have
nullable fields.

* Upgrade hypersync client rust

* Increment version
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ ruint = "1"
 alloy-primitives = "1.1"
 arrayvec = "0.7.6"
 
-hypersync-client = "0.23.0"
+hypersync-client = "1.0.0"
 strum = "0.27.2"
 strum_macros = "0.27.2"
 
diff --git a/index.d.ts b/index.d.ts
@@ -503,19 +503,19 @@ export interface Query {
    * List of log selections, these have an or relationship between them, so the query will return logs
    * that match any of these selections.
    */
-  logs?: Array<LogFilter | LogSelection>
+  logs?: Array<LogSelection | LogFilter>
   /**
    * List of transaction selections, the query will return transactions that match any of these selections and
    *  it will return transactions that are related to the returned logs.
    */
-  transactions?: Array<TransactionFilter | TransactionSelection>
+  transactions?: Array<TransactionSelection | TransactionFilter>
   /**
    * List of trace selections, the query will return traces that match any of these selections and
    *  it will re turn traces that are related to the returned logs.
    */
-  traces?: Array<TraceFilter | TraceSelection>
+  traces?: Array<TraceSelection | TraceFilter>
   /** List of block selections, the query will return blocks that match any of these selections */
-  blocks?: Array<BlockFilter | BlockSelection>
+  blocks?: Array<BlockSelection | BlockFilter>
   /**
    * Weather to include all blocks regardless of if they are related to a returned transaction or log. Normally
    *  the server will return only the blocks that are related to the transaction or logs in the response. But if this
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-darwin-arm64",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "arm64"
   ],
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-darwin-x64",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "x64"
   ],
diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-linux-arm64-gnu",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "arm64"
   ],
diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-linux-x64-gnu",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "x64"
   ],
diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-linux-x64-musl",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "x64"
   ],
diff --git a/npm/win32-arm64-msvc/package.json b/npm/win32-arm64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-win32-arm64-msvc",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "arm64"
   ],
diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@envio-dev/hypersync-client-win32-x64-msvc",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "cpu": [
     "x64"
   ],
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@envio-dev/hypersync-client",
   "description": "HyperSync Client by Envio",
-  "version": "0.7.2",
+  "version": "1.0.0",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
diff --git a/src/query.rs b/src/query.rs
@@ -341,15 +341,15 @@ pub struct Query {
     pub to_block: Option<i64>,
     /// List of log selections, these have an or relationship between them, so the query will return logs
     /// that match any of these selections.
-    pub logs: Option<Vec<Either<LogFilter, LogSelection>>>,
+    pub logs: Option<Vec<Either<LogSelection, LogFilter>>>,
     /// List of transaction selections, the query will return transactions that match any of these selections and
     ///  it will return transactions that are related to the returned logs.
-    pub transactions: Option<Vec<Either<TransactionFilter, TransactionSelection>>>,
+    pub transactions: Option<Vec<Either<TransactionSelection, TransactionFilter>>>,
     /// List of trace selections, the query will return traces that match any of these selections and
     ///  it will re turn traces that are related to the returned logs.
-    pub traces: Option<Vec<Either<TraceFilter, TraceSelection>>>,
+    pub traces: Option<Vec<Either<TraceSelection, TraceFilter>>>,
     /// List of block selections, the query will return blocks that match any of these selections
-    pub blocks: Option<Vec<Either<BlockFilter, BlockSelection>>>,
+    pub blocks: Option<Vec<Either<BlockSelection, BlockFilter>>>,
     /// Weather to include all blocks regardless of if they are related to a returned transaction or log. Normally
     ///  the server will return only the blocks that are related to the transaction or logs in the response. But if this
     ///  is set to true, the server will return data for all blocks in the requested range [from_block, to_block).
@@ -386,11 +386,11 @@ impl TryFrom<Query> for net_types::Query {
             log_filters
                 .into_iter()
                 .map(|either| match either {
-                    Either::A(filter) => {
+                    Either::A(selection) => net_types::LogSelection::try_from(selection),
+                    Either::B(filter) => {
                         let net_filter = net_types::LogFilter::try_from(filter)?;
                         Ok(net_types::LogSelection::new(net_filter))
                     }
-                    Either::B(selection) => net_types::LogSelection::try_from(selection),
                 })
                 .collect::<Result<Vec<_>>>()?
         } else {
@@ -401,11 +401,11 @@ impl TryFrom<Query> for net_types::Query {
             transaction_filters
                 .into_iter()
                 .map(|either| match either {
-                    Either::A(filter) => {
+                    Either::A(selection) => net_types::TransactionSelection::try_from(selection),
+                    Either::B(filter) => {
                         let net_filter = net_types::TransactionFilter::try_from(filter)?;
                         Ok(net_types::TransactionSelection::new(net_filter))
                     }
-                    Either::B(selection) => net_types::TransactionSelection::try_from(selection),
                 })
                 .collect::<Result<Vec<_>>>()?
         } else {
@@ -416,11 +416,11 @@ impl TryFrom<Query> for net_types::Query {
             trace_filters
                 .into_iter()
                 .map(|either| match either {
-                    Either::A(filter) => {
+                    Either::A(selection) => net_types::TraceSelection::try_from(selection),
+                    Either::B(filter) => {
                         let net_filter = net_types::TraceFilter::try_from(filter)?;
                         Ok(net_types::TraceSelection::new(net_filter))
                     }
-                    Either::B(selection) => net_types::TraceSelection::try_from(selection),
                 })
                 .collect::<Result<Vec<_>>>()?
         } else {
@@ -431,11 +431,11 @@ impl TryFrom<Query> for net_types::Query {
             block_filters
                 .into_iter()
                 .map(|either| match either {
-                    Either::A(filter) => {
+                    Either::A(selection) => net_types::BlockSelection::try_from(selection),
+                    Either::B(filter) => {
                         let net_filter = net_types::BlockFilter::try_from(filter)?;
                         Ok(net_types::BlockSelection::new(net_filter))
                     }
-                    Either::B(selection) => net_types::BlockSelection::try_from(selection),
                 })
                 .collect::<Result<Vec<_>>>()?
         } else {
@@ -900,7 +900,7 @@ impl From<net_types::Query> for Query {
     fn from(query: net_types::Query) -> Query {
         fn map_selections<T, F, S>(
             selections: Vec<net_types::Selection<T>>,
-        ) -> Option<Vec<Either<F, S>>>
+        ) -> Option<Vec<Either<S, F>>>
         where
             T: Into<F>,
             net_types::Selection<T>: Into<S>,
@@ -911,9 +911,9 @@ impl From<net_types::Query> for Query {
                 let mut converted = Vec::new();
                 for selection in selections {
                     if selection.exclude.is_some() {
-                        converted.push(Either::B(selection.into()));
+                        converted.push(Either::A(selection.into()));
                     } else {
-                        converted.push(Either::A(selection.include.into()));
+                        converted.push(Either::B(selection.include.into()));
                     }
                 }
                 Some(converted)
@@ -1594,7 +1594,7 @@ mod tests {
         let query = Query {
             from_block: 100,
             to_block: Some(200),
-            logs: Some(vec![Either::A(LogFilter {
+            logs: Some(vec![Either::B(LogFilter {
                 address: Some(vec![
                     "0xdAC17F958D2ee523a2206206994597C13D831ec7".to_string()
                 ]),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@envio-dev/hypersync-client-darwin-arm64",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"cpu": [`
`5`	`5`	`"arm64"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@envio-dev/hypersync-client-linux-arm64-gnu",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"cpu": [`
`5`	`5`	`"arm64"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@envio-dev/hypersync-client-win32-arm64-msvc",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"cpu": [`
`5`	`5`	`"arm64"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@envio-dev/hypersync-client",`
`3`	`3`	`"description": "HyperSync Client by Envio",`
`4`		`- "version": "0.7.2",`
	`4`	`+ "version": "1.0.0",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"types": "index.d.ts",`
`7`	`7`	`"napi": {`