npm - @arkiv-network/sdk - Versions diffs - 0.3.2-dev.0 → 0.3.2-dev.1 - Mend

@arkiv-network/sdk 0.3.2-dev.0 → 0.3.2-dev.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/dist/chains/index.d.ts +25 -25
package/dist/{entity-OY78HYxA.d.cts → entity-DvQtQL8v.d.ts} +7 -1
package/dist/entity-DvQtQL8v.d.ts.map +1 -0
package/dist/{entity-o4fwHXKf.d.ts → entity-jTQZmEAd.d.cts} +7 -1
package/dist/entity-jTQZmEAd.d.cts.map +1 -0
package/dist/index.cjs +1 -1
package/dist/index.d.cts +2 -2
package/dist/index.d.ts +2 -2
package/dist/index.js +1 -1
package/dist/query/index.cjs +1 -1
package/dist/query/index.d.cts +2 -2
package/dist/query/index.d.ts +2 -2
package/dist/query/index.js +1 -1
package/dist/{queryBuilder-CboWSREN.d.ts → queryBuilder-BBtwhH0G.d.ts} +17 -2
package/dist/{queryBuilder-CboWSREN.d.ts.map → queryBuilder-BBtwhH0G.d.ts.map} +1 -1
package/dist/{queryBuilder-n9ocnT4P.cjs → queryBuilder-D-bqHg3w.cjs} +29 -2
package/dist/{queryBuilder-BueP5de6.js → queryBuilder-D22Tamry.js} +30 -3
package/dist/queryBuilder-D22Tamry.js.map +1 -0
package/dist/{queryBuilder-Bm1zGqKA.d.cts → queryBuilder-DkhyyeFr.d.cts} +17 -2
package/dist/{queryBuilder-Bm1zGqKA.d.cts.map → queryBuilder-DkhyyeFr.d.cts.map} +1 -1
package/dist/types/index.d.cts +1 -1
package/dist/types/index.d.ts +1 -1
package/dist/utils/index.d.cts.map +1 -1
package/package.json +1 -1
package/src/query/engine.test.ts +69 -0
package/src/query/engine.ts +8 -3
package/src/query/queryBuilder.test.ts +34 -0
package/src/query/queryBuilder.ts +33 -0
package/src/types/rpcSchema.ts +7 -0
package/dist/entity-OY78HYxA.d.cts.map +0 -1
package/dist/entity-o4fwHXKf.d.ts.map +0 -1
package/dist/queryBuilder-BueP5de6.js.map +0 -1

package/dist/chains/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import * as viem8 from "viem";
+import * as viem0 from "viem";
 //#region src/chains/kaolin.d.ts
 declare const kaolin: {
@@ -11,13 +11,13 @@ declare const kaolin: {
   };
   blockTime?: number | undefined | undefined;
   contracts?: {
-    [x: string]: viem8.ChainContract | {
-      [sourceId: number]: viem8.ChainContract | undefined;
+    [x: string]: viem0.ChainContract | {
+      [sourceId: number]: viem0.ChainContract | undefined;
     } | undefined;
-    ensRegistry?: viem8.ChainContract | undefined;
-    ensUniversalResolver?: viem8.ChainContract | undefined;
-    multicall3?: viem8.ChainContract | undefined;
-    erc6492Verifier?: viem8.ChainContract | undefined;
+    ensRegistry?: viem0.ChainContract | undefined;
+    ensUniversalResolver?: viem0.ChainContract | undefined;
+    multicall3?: viem0.ChainContract | undefined;
+    erc6492Verifier?: viem0.ChainContract | undefined;
   } | undefined;
   ensTlds?: readonly string[] | undefined;
   id: 60138453025;
@@ -37,9 +37,9 @@ declare const kaolin: {
   sourceId?: number | undefined | undefined;
   testnet: true;
   custom?: Record<string, unknown> | undefined;
-  fees?: viem8.ChainFees<undefined> | undefined;
+  fees?: viem0.ChainFees<undefined> | undefined;
   formatters?: undefined;
-  serializers?: viem8.ChainSerializers<undefined, viem8.TransactionSerializable> | undefined;
+  serializers?: viem0.ChainSerializers<undefined, viem0.TransactionSerializable> | undefined;
   readonly network: "kaolin";
 };
 //#endregion
@@ -59,13 +59,13 @@ declare const localhost: {
   } | undefined | undefined;
   blockTime?: number | undefined | undefined;
   contracts?: {
-    [x: string]: viem8.ChainContract | {
-      [sourceId: number]: viem8.ChainContract | undefined;
+    [x: string]: viem0.ChainContract | {
+      [sourceId: number]: viem0.ChainContract | undefined;
     } | undefined;
-    ensRegistry?: viem8.ChainContract | undefined;
-    ensUniversalResolver?: viem8.ChainContract | undefined;
-    multicall3?: viem8.ChainContract | undefined;
-    erc6492Verifier?: viem8.ChainContract | undefined;
+    ensRegistry?: viem0.ChainContract | undefined;
+    ensUniversalResolver?: viem0.ChainContract | undefined;
+    multicall3?: viem0.ChainContract | undefined;
+    erc6492Verifier?: viem0.ChainContract | undefined;
   } | undefined;
   ensTlds?: readonly string[] | undefined;
   id: 1337;
@@ -84,9 +84,9 @@ declare const localhost: {
   sourceId?: number | undefined | undefined;
   testnet?: boolean | undefined | undefined;
   custom?: Record<string, unknown> | undefined;
-  fees?: viem8.ChainFees<undefined> | undefined;
+  fees?: viem0.ChainFees<undefined> | undefined;
   formatters?: undefined;
-  serializers?: viem8.ChainSerializers<undefined, viem8.TransactionSerializable> | undefined;
+  serializers?: viem0.ChainSerializers<undefined, viem0.TransactionSerializable> | undefined;
 };
 //#endregion
 //#region src/chains/marketplace.d.ts
@@ -100,13 +100,13 @@ declare const marketplace: {
   };
   blockTime?: number | undefined | undefined;
   contracts?: {
-    [x: string]: viem8.ChainContract | {
-      [sourceId: number]: viem8.ChainContract | undefined;
+    [x: string]: viem0.ChainContract | {
+      [sourceId: number]: viem0.ChainContract | undefined;
     } | undefined;
-    ensRegistry?: viem8.ChainContract | undefined;
-    ensUniversalResolver?: viem8.ChainContract | undefined;
-    multicall3?: viem8.ChainContract | undefined;
-    erc6492Verifier?: viem8.ChainContract | undefined;
+    ensRegistry?: viem0.ChainContract | undefined;
+    ensUniversalResolver?: viem0.ChainContract | undefined;
+    multicall3?: viem0.ChainContract | undefined;
+    erc6492Verifier?: viem0.ChainContract | undefined;
   } | undefined;
   ensTlds?: readonly string[] | undefined;
   id: 60138453027;
@@ -126,9 +126,9 @@ declare const marketplace: {
   sourceId?: number | undefined | undefined;
   testnet: true;
   custom?: Record<string, unknown> | undefined;
-  fees?: viem8.ChainFees<undefined> | undefined;
+  fees?: viem0.ChainFees<undefined> | undefined;
   formatters?: undefined;
-  serializers?: viem8.ChainSerializers<undefined, viem8.TransactionSerializable> | undefined;
+  serializers?: viem0.ChainSerializers<undefined, viem0.TransactionSerializable> | undefined;
   readonly network: "marketplace";
 };
 //#endregion

package/dist/{entity-OY78HYxA.d.cts → entity-DvQtQL8v.d.ts} RENAMED Viewed

@@ -19,9 +19,15 @@ type RpcEntity = {
     value: number;
   }];
 };
+type RpcOrderByAttribute = {
+  name: string;
+  type: "string" | "numeric";
+  desc: boolean;
+};
 type RpcQueryOptions = {
   atBlock?: number;
   includeData?: RpcIncludeData;
+  orderBy?: RpcOrderByAttribute[];
   resultsPerPage?: number;
   cursor?: string;
 };
@@ -237,4 +243,4 @@ declare class Entity {
 }
 //#endregion
 export { ArkivRpcSchema as _, MutateEntitiesReturnType as a, RpcQueryOptions as b, ExtendEntityParameters as c, DeleteEntityReturnType as d, CreateEntityParameters as f, ArkivClient as g, ChangeOwnershipReturnType as h, MutateEntitiesParameters as i, ExtendEntityReturnType as l, ChangeOwnershipParameters as m, TxParams as n, UpdateEntityParameters as o, CreateEntityReturnType as p, Attribute as r, UpdateEntityReturnType as s, Entity as t, DeleteEntityParameters as u, RpcEntity as v, MimeType as x, RpcIncludeData as y };
-//# sourceMappingURL=entity-OY78HYxA.d.cts.map
+//# sourceMappingURL=entity-DvQtQL8v.d.ts.map

package/dist/entity-DvQtQL8v.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"entity-DvQtQL8v.d.ts","names":[],"sources":["../src/types/mimeTypes.ts","../src/types/rpcSchema.ts","../src/clients/baseClient.ts","../src/actions/wallet/changeOwnership.ts","../src/actions/wallet/createEntity.ts","../src/actions/wallet/deleteEntity.ts","../src/actions/wallet/extendEntity.ts","../src/actions/wallet/updateEntity.ts","../src/actions/wallet/mutateEntities.ts","../src/types/attributes.ts","../src/types/txParams.ts","../src/types/entity.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/{entity-o4fwHXKf.d.ts → entity-jTQZmEAd.d.cts} RENAMED Viewed

@@ -19,9 +19,15 @@ type RpcEntity = {
     value: number;
   }];
 };
+type RpcOrderByAttribute = {
+  name: string;
+  type: "string" | "numeric";
+  desc: boolean;
+};
 type RpcQueryOptions = {
   atBlock?: number;
   includeData?: RpcIncludeData;
+  orderBy?: RpcOrderByAttribute[];
   resultsPerPage?: number;
   cursor?: string;
 };
@@ -237,4 +243,4 @@ declare class Entity {
 }
 //#endregion
 export { ArkivRpcSchema as _, MutateEntitiesReturnType as a, RpcQueryOptions as b, ExtendEntityParameters as c, DeleteEntityReturnType as d, CreateEntityParameters as f, ArkivClient as g, ChangeOwnershipReturnType as h, MutateEntitiesParameters as i, ExtendEntityReturnType as l, ChangeOwnershipParameters as m, TxParams as n, UpdateEntityParameters as o, CreateEntityReturnType as p, Attribute as r, UpdateEntityReturnType as s, Entity as t, DeleteEntityParameters as u, RpcEntity as v, MimeType as x, RpcIncludeData as y };
-//# sourceMappingURL=entity-o4fwHXKf.d.ts.map
+//# sourceMappingURL=entity-jTQZmEAd.d.cts.map

package/dist/entity-jTQZmEAd.d.cts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"entity-jTQZmEAd.d.cts","names":[],"sources":["../src/types/mimeTypes.ts","../src/types/rpcSchema.ts","../src/clients/baseClient.ts","../src/actions/wallet/changeOwnership.ts","../src/actions/wallet/createEntity.ts","../src/actions/wallet/deleteEntity.ts","../src/actions/wallet/extendEntity.ts","../src/actions/wallet/updateEntity.ts","../src/actions/wallet/mutateEntities.ts","../src/types/attributes.ts","../src/types/txParams.ts","../src/types/entity.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/index.cjs CHANGED Viewed

@@ -1,4 +1,4 @@
-const require_queryBuilder = require('./queryBuilder-n9ocnT4P.cjs');
+const require_queryBuilder = require('./queryBuilder-D-bqHg3w.cjs');
 const require_consts = require('./consts-BV9DVKgE.cjs');
 let viem = require("viem");

package/dist/index.d.cts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, g as ArkivClient, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "./entity-OY78HYxA.cjs";
-import { t as QueryBuilder } from "./queryBuilder-Bm1zGqKA.cjs";
+import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, g as ArkivClient, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "./entity-jTQZmEAd.cjs";
+import { t as QueryBuilder } from "./queryBuilder-DkhyyeFr.cjs";
 import { Account, Account as Account$1, Address, Address as Address$1, Chain, Chain as Chain$1, Client, Hex, Hex as Hex$1, ParseAccount, Prettify, PublicActions, PublicClientConfig, PublicClientConfig as PublicClientConfig$1, RpcSchema, RpcSchema as RpcSchema$1, Transport, Transport as Transport$1, WalletActions, WalletClientConfig, http, toBytes, toHex, toRlp, webSocket } from "viem";
 //#region src/types/events.d.ts

package/dist/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, g as ArkivClient, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "./entity-o4fwHXKf.js";
-import { t as QueryBuilder } from "./queryBuilder-CboWSREN.js";
+import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, g as ArkivClient, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "./entity-DvQtQL8v.js";
+import { t as QueryBuilder } from "./queryBuilder-BBtwhH0G.js";
 import { Account, Account as Account$1, Address, Address as Address$1, Chain, Chain as Chain$1, Client, Hex, Hex as Hex$1, ParseAccount, Prettify, PublicActions, PublicClientConfig, PublicClientConfig as PublicClientConfig$1, RpcSchema, RpcSchema as RpcSchema$1, Transport, Transport as Transport$1, WalletActions, WalletClientConfig, http, toBytes, toHex, toRlp, webSocket } from "viem";
 //#region src/types/events.d.ts

package/dist/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { a as NoEntityFoundError, r as entityFromRpcResult, t as QueryBuilder } from "./queryBuilder-BueP5de6.js";
+import { a as NoEntityFoundError, r as entityFromRpcResult, t as QueryBuilder } from "./queryBuilder-D22Tamry.js";
 import { n as BLOCK_TIME, t as ARKIV_ADDRESS } from "./consts-CHtLBwGd.js";
 import { createClient, decodeEventLog, http, parseAbi, publicActions, toBytes, toBytes as toBytes$1, toHex, toHex as toHex$1, toRlp, toRlp as toRlp$1, walletActions, webSocket } from "viem";

package/dist/query/index.cjs CHANGED Viewed

@@ -1,4 +1,4 @@
-const require_queryBuilder = require('../queryBuilder-n9ocnT4P.cjs');
+const require_queryBuilder = require('../queryBuilder-D-bqHg3w.cjs');
 //#region src/query/predicate.ts
 /**

package/dist/query/index.d.cts CHANGED Viewed

@@ -1,5 +1,5 @@
-import "../entity-OY78HYxA.cjs";
-import { a as PredicateType, c as gt, d as lte, f as neq, i as PredicateContainerType, l as gte, m as or, n as QueryResult, o as and, p as not, r as Predicate, s as eq, t as QueryBuilder, u as lt } from "../queryBuilder-Bm1zGqKA.cjs";
+import "../entity-jTQZmEAd.cjs";
+import { a as PredicateType, c as gt, d as lte, f as neq, i as PredicateContainerType, l as gte, m as or, n as QueryResult, o as and, p as not, r as Predicate, s as eq, t as QueryBuilder, u as lt } from "../queryBuilder-DkhyyeFr.cjs";
 //#region src/query/errors.d.ts
 declare class NoMoreResultsError extends Error {

package/dist/query/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import "../entity-o4fwHXKf.js";
-import { a as PredicateType, c as gt, d as lte, f as neq, i as PredicateContainerType, l as gte, m as or, n as QueryResult, o as and, p as not, r as Predicate, s as eq, t as QueryBuilder, u as lt } from "../queryBuilder-CboWSREN.js";
+import "../entity-DvQtQL8v.js";
+import { a as PredicateType, c as gt, d as lte, f as neq, i as PredicateContainerType, l as gte, m as or, n as QueryResult, o as and, p as not, r as Predicate, s as eq, t as QueryBuilder, u as lt } from "../queryBuilder-BBtwhH0G.js";
 //#region src/query/errors.d.ts
 declare class NoMoreResultsError extends Error {

package/dist/query/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { a as NoEntityFoundError, i as NoCursorOrLimitError, n as QueryResult, o as NoMoreResultsError, s as OffsetCannotBeLessThanZeroError, t as QueryBuilder } from "../queryBuilder-BueP5de6.js";
+import { a as NoEntityFoundError, i as NoCursorOrLimitError, n as QueryResult, o as NoMoreResultsError, s as OffsetCannotBeLessThanZeroError, t as QueryBuilder } from "../queryBuilder-D22Tamry.js";
 //#region src/query/predicate.ts
 /**

package/dist/{queryBuilder-CboWSREN.d.ts → queryBuilder-BBtwhH0G.d.ts} RENAMED Viewed

@@ -1,4 +1,4 @@
-import { g as ArkivClient, t as Entity } from "./entity-o4fwHXKf.js";
+import { g as ArkivClient, t as Entity } from "./entity-DvQtQL8v.js";
 import { Hex } from "viem";
 //#region src/query/predicate.d.ts
@@ -138,6 +138,7 @@ declare class QueryResult {
 declare class QueryBuilder {
   private _client;
   private _ownedBy;
+  private _orderBy;
   private _validAtBlock;
   private _withAttributes;
   private _withMetadata;
@@ -156,6 +157,20 @@ declare class QueryBuilder {
    * builder.ownedBy("0x1234567890123456789012345678901234567890")
    */
   ownedBy(ownedBy: Hex): this;
+  /**
+   * Sets the orderBy for the query.
+   * It can be called multiple times to order by multiple attributes.
+   * The order of the attributes is important. The first attribute is the primary order by attribute.
+   * @param attributeName - The name of the attribute to order by
+   * @param attributeType - The type of the attribute to order by (string or number)
+   * @param descending - The boolean value to set the order by descending
+   * @returns The QueryBuilder instance
+   *
+   * @example
+   * const builder = new QueryBuilder(client)
+   * builder.orderBy("name", "string", true)
+   */
+  orderBy(attributeName: string, attributeType: "string" | "number", descending?: boolean | undefined): this;
   /**
    * Sets the withAttributes flag which will return the attributes for the entities if true
    * @param withAttributes - The boolean value to set
@@ -258,4 +273,4 @@ declare class QueryBuilder {
 }
 //#endregion
 export { PredicateType as a, gt as c, lte as d, neq as f, PredicateContainerType as i, gte as l, or as m, QueryResult as n, and as o, not as p, Predicate as r, eq as s, QueryBuilder as t, lt as u };
-//# sourceMappingURL=queryBuilder-CboWSREN.d.ts.map
+//# sourceMappingURL=queryBuilder-BBtwhH0G.d.ts.map

package/dist/{queryBuilder-CboWSREN.d.ts.map → queryBuilder-BBtwhH0G.d.ts.map} RENAMED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"queryBuilder-~~CboWSREN~~.d.ts","names":[],"sources":["../src/query/predicate.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":[],"mappings":";;;;KAAY,aAAA;KACA,sBAAA;KAEA,SAAA;QAEA;EALA,GAAA,EAAA,MAAA;EACA,KAAA,EAAA,MAAA,GAAA,MAAA;AAEZ,CAAA,GAAY;EAEA,IAAA,EAKA,sBALA;EAKA,UAAA,EACM,SADN,EAAA;CACM;;AAclB;AAeA;AAcA;AAcA;AAcA;AAcA;AAcA;AAcA;AAaA;;iBAhHgB,EAAA,aAAe,cAAc;;ACrB7C;;;;;;;;;;~~ACSa~~,~~iBF2BG~~,GAAA,~~CE3BS~~,UAAA,~~EF2BO~~,~~SE3BP~~,EAAA,CAAA,~~EF2BqB~~,~~SE3BrB~~;;;;;;;;;;;~~iBFyCT~~,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;iBAa1C,GAAA,eAAkB;;;cCrIrB,WAAA;YACD;EDLA,QAAA,eAAa;EACb,QAAA,OAAA;EAEA,QAAA,MAAS;EAET,QAAA,aAAA;EAKA,QAAA,aAAA;EACM,IAAA,YAAA,CAAA,CAAA,ECEI,YDFJ;EAAS,IAAA,MAAA,CAAA,CAAA,EAAA,MAAA,GAAA,SAAA;EAcX,WAAE,CAAA,QAAa,ECHjB,MDG+B,EAAA,EAAA,YAAS,ECFpC,YDEoC,EAAA,MAAA,EAAA,MAAA,GAAA,SAAA,EAAA,KAAA,EAAA,MAAA,GAAA,SAAA,EAAA,YAAA,EAAA,MAAA,GAAA,SAAA;EAetC,IAAA,CAAA,CAAG,ECJP,ODIO,CAAA,IAAa,CAAA;EAchB,WAAE,CAAA,CAAA,EAAA,OAAuC;AAczD;;;AApEA;AACA;AAEA;;;;AAQ2B,~~cEEd~~,YAAA,~~CFFc~~;EAcX,QAAE,OAAA;EAeF,QAAG,QAAA;EAcH,QAAE,~~aAAuC~~;~~EAczC~~,QAAG,~~eAAuC~~;EAc1C,QAAE,~~aAAuC~~;EAczC,QAAG,~~YAAuC~~;EAc1C,QAAE,~~MAAA~~;~~EAcF~~,QAAG,~~OAAA~~;EAaH,QAAG,~~WAAe;sBEjHZ;;;ADpBtB;;;;;;;mBCkCmB;;;AAzBnB;;;;;;;EAqLa,cAAA,CAAA,cAAA,CAAA,EAAA,~~OAAA,~~CAAA,EAAA,IAAA;EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAlDO,~~cAAc;;;;;;;;;;;WAmBrB,QAAA;;;;;;;;;;~~WA+BA~~"}
1	+ {"version":3,"file":"queryBuilder-BBtwhH0G.d.ts","names":[],"sources":["../src/query/predicate.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":[],"mappings":";;;;KAAY,aAAA;KACA,sBAAA;KAEA,SAAA;QAEA;EALA,GAAA,EAAA,MAAA;EACA,KAAA,EAAA,MAAA,GAAA,MAAA;AAEZ,CAAA,GAAY;EAEA,IAAA,EAKA,sBALA;EAKA,UAAA,EACM,SADN,EAAA;CACM;;AAclB;AAeA;AAcA;AAcA;AAcA;AAcA;AAcA;AAcA;AAaA;;iBAhHgB,EAAA,aAAe,cAAc;;ACrB7C;;;;;;;;;;ACUa,iBF0BG,GAAA,CE1BS,UAAA,EF0BO,SE1BP,EAAA,CAAA,EF0BqB,SE1BrB;;;;;;;;;;;iBFwCT,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;iBAa1C,GAAA,eAAkB;;;cCrIrB,WAAA;YACD;EDLA,QAAA,eAAa;EACb,QAAA,OAAA;EAEA,QAAA,MAAS;EAET,QAAA,aAAA;EAKA,QAAA,aAAA;EACM,IAAA,YAAA,CAAA,CAAA,ECEI,YDFJ;EAAS,IAAA,MAAA,CAAA,CAAA,EAAA,MAAA,GAAA,SAAA;EAcX,WAAE,CAAA,QAAa,ECHjB,MDG+B,EAAA,EAAA,YAAS,ECFpC,YDEoC,EAAA,MAAA,EAAA,MAAA,GAAA,SAAA,EAAA,KAAA,EAAA,MAAA,GAAA,SAAA,EAAA,YAAA,EAAA,MAAA,GAAA,SAAA;EAetC,IAAA,CAAA,CAAG,ECJP,ODIO,CAAA,IAAa,CAAA;EAchB,WAAE,CAAA,CAAA,EAAA,OAAuC;AAczD;;;AApEA;AACA;AAEA;;;;AAQ2B,cEGd,YAAA,CFHc;EAcX,QAAE,OAAA;EAeF,QAAG,QAAA;EAcH,QAAE,QAAA;EAcF,QAAG,aAAuC;EAc1C,QAAE,eAAuC;EAczC,QAAG,aAAuC;EAc1C,QAAE,YAAuC;EAczC,QAAG,MAAA;EAaH,QAAG,OAAA;;sBE/GG;;ADtBtB;;;;;;;;mBCoCmB;;AA1BnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAiKoB,cAAc;;;;;;;;;;;WAmBrB,QAAA;;;;;;;;;;WAgCA"}

package/dist/{queryBuilder-n9ocnT4P.cjs → queryBuilder-D-bqHg3w.cjs} RENAMED Viewed

@@ -82,8 +82,8 @@ function processPredicates(predicates) {
 	}).join(" && ");
 }
 async function processQuery(client, queryParams) {
-	const { predicates, limit, cursor, ownedBy, validAtBlock, withAttributes, withMetadata, withPayload } = queryParams;
-	console.debug(`Processing query with params: predicates: ${predicates}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`);
+	const { predicates, limit, cursor, ownedBy, orderBy, validAtBlock, withAttributes, withMetadata, withPayload } = queryParams;
+	console.debug(`Processing query with params: predicates: ${JSON.stringify(predicates)}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, orderBy: ${JSON.stringify(orderBy)}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`);
 	let query = processPredicates(predicates);
 	if (ownedBy) query += ` && $owner=${ownedBy}`;
 	query = query.trim();
@@ -99,9 +99,11 @@ async function processQuery(client, queryParams) {
 	if (validAtBlock !== void 0) queryOptions.atBlock = Number(validAtBlock);
 	if (limit !== void 0) queryOptions.resultsPerPage = limit;
 	if (cursor !== void 0) queryOptions.cursor = cursor;
+	if (orderBy !== void 0) queryOptions.orderBy = orderBy;
 	console.debug(`Built query to send: ${query}, queryOptions: ${JSON.stringify({
 		includeData: queryOptions.includeData,
 		atBlock: queryOptions.atBlock?.toString(),
+		orderBy: queryOptions.orderBy,
 		resultsPerPage: queryOptions.resultsPerPage,
 		cursor: queryOptions.cursor
 	})}`);
@@ -163,6 +165,7 @@ var QueryResult = class {
 var QueryBuilder = class {
 	_client;
 	_ownedBy;
+	_orderBy;
 	_validAtBlock;
 	_withAttributes;
 	_withMetadata;
@@ -188,6 +191,28 @@ var QueryBuilder = class {
 		return this;
 	}
 	/**
+	* Sets the orderBy for the query.
+	* It can be called multiple times to order by multiple attributes.
+	* The order of the attributes is important. The first attribute is the primary order by attribute.
+	* @param attributeName - The name of the attribute to order by
+	* @param attributeType - The type of the attribute to order by (string or number)
+	* @param descending - The boolean value to set the order by descending
+	* @returns The QueryBuilder instance
+	*
+	* @example
+	* const builder = new QueryBuilder(client)
+	* builder.orderBy("name", "string", true)
+	*/
+	orderBy(attributeName, attributeType, descending = void 0) {
+		if (!this._orderBy) this._orderBy = [];
+		this._orderBy.push({
+			name: attributeName,
+			type: attributeType === "number" ? "numeric" : attributeType,
+			desc: !!descending
+		});
+		return this;
+	}
+	/**
 	* Sets the withAttributes flag which will return the attributes for the entities if true
 	* @param withAttributes - The boolean value to set
 	* @returns The QueryBuilder instance
@@ -303,6 +328,7 @@ var QueryBuilder = class {
 			limit: this._limit,
 			cursor: this._cursor,
 			ownedBy: this._ownedBy,
+			orderBy: this._orderBy,
 			validAtBlock: this._validAtBlock,
 			withAttributes: this._withAttributes,
 			withMetadata: this._withMetadata,
@@ -328,6 +354,7 @@ var QueryBuilder = class {
 			limit: this._limit,
 			cursor: this._cursor,
 			ownedBy: this._ownedBy,
+			orderBy: void 0,
 			validAtBlock: this._validAtBlock,
 			withAttributes: false,
 			withMetadata: false,

package/dist/{queryBuilder-BueP5de6.js → queryBuilder-D22Tamry.js} RENAMED Viewed

@@ -82,8 +82,8 @@ function processPredicates(predicates) {
 	}).join(" && ");
 }
 async function processQuery(client, queryParams) {
-	const { predicates, limit, cursor, ownedBy, validAtBlock, withAttributes, withMetadata, withPayload } = queryParams;
-	console.debug(`Processing query with params: predicates: ${predicates}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`);
+	const { predicates, limit, cursor, ownedBy, orderBy, validAtBlock, withAttributes, withMetadata, withPayload } = queryParams;
+	console.debug(`Processing query with params: predicates: ${JSON.stringify(predicates)}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, orderBy: ${JSON.stringify(orderBy)}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`);
 	let query = processPredicates(predicates);
 	if (ownedBy) query += ` && $owner=${ownedBy}`;
 	query = query.trim();
@@ -99,9 +99,11 @@ async function processQuery(client, queryParams) {
 	if (validAtBlock !== void 0) queryOptions.atBlock = Number(validAtBlock);
 	if (limit !== void 0) queryOptions.resultsPerPage = limit;
 	if (cursor !== void 0) queryOptions.cursor = cursor;
+	if (orderBy !== void 0) queryOptions.orderBy = orderBy;
 	console.debug(`Built query to send: ${query}, queryOptions: ${JSON.stringify({
 		includeData: queryOptions.includeData,
 		atBlock: queryOptions.atBlock?.toString(),
+		orderBy: queryOptions.orderBy,
 		resultsPerPage: queryOptions.resultsPerPage,
 		cursor: queryOptions.cursor
 	})}`);
@@ -163,6 +165,7 @@ var QueryResult = class {
 var QueryBuilder = class {
 	_client;
 	_ownedBy;
+	_orderBy;
 	_validAtBlock;
 	_withAttributes;
 	_withMetadata;
@@ -188,6 +191,28 @@ var QueryBuilder = class {
 		return this;
 	}
 	/**
+	* Sets the orderBy for the query.
+	* It can be called multiple times to order by multiple attributes.
+	* The order of the attributes is important. The first attribute is the primary order by attribute.
+	* @param attributeName - The name of the attribute to order by
+	* @param attributeType - The type of the attribute to order by (string or number)
+	* @param descending - The boolean value to set the order by descending
+	* @returns The QueryBuilder instance
+	*
+	* @example
+	* const builder = new QueryBuilder(client)
+	* builder.orderBy("name", "string", true)
+	*/
+	orderBy(attributeName, attributeType, descending = void 0) {
+		if (!this._orderBy) this._orderBy = [];
+		this._orderBy.push({
+			name: attributeName,
+			type: attributeType === "number" ? "numeric" : attributeType,
+			desc: !!descending
+		});
+		return this;
+	}
+	/**
 	* Sets the withAttributes flag which will return the attributes for the entities if true
 	* @param withAttributes - The boolean value to set
 	* @returns The QueryBuilder instance
@@ -303,6 +328,7 @@ var QueryBuilder = class {
 			limit: this._limit,
 			cursor: this._cursor,
 			ownedBy: this._ownedBy,
+			orderBy: this._orderBy,
 			validAtBlock: this._validAtBlock,
 			withAttributes: this._withAttributes,
 			withMetadata: this._withMetadata,
@@ -328,6 +354,7 @@ var QueryBuilder = class {
 			limit: this._limit,
 			cursor: this._cursor,
 			ownedBy: this._ownedBy,
+			orderBy: void 0,
 			validAtBlock: this._validAtBlock,
 			withAttributes: false,
 			withMetadata: false,
@@ -338,4 +365,4 @@ var QueryBuilder = class {
 //#endregion
 export { NoEntityFoundError as a, NoCursorOrLimitError as i, QueryResult as n, NoMoreResultsError as o, entityFromRpcResult as r, OffsetCannotBeLessThanZeroError as s, QueryBuilder as t };
-//# sourceMappingURL=queryBuilder-BueP5de6.js.map
+//# sourceMappingURL=queryBuilder-D22Tamry.js.map

package/dist/queryBuilder-D22Tamry.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"queryBuilder-D22Tamry.js","names":["predicate","queryOptions: RpcQueryOptions"],"sources":["../src/query/errors.ts","../src/types/entity.ts","../src/utils/entities.ts","../src/query/engine.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":["export class NoMoreResultsError extends Error {\n constructor() {\n super(\"No more results\")\n }\n}\n\nexport class NoCursorOrLimitError extends Error {\n constructor() {\n super(\"Cursor and limit must be defined to fetch next\")\n }\n}\n\nexport class OffsetCannotBeLessThanZeroError extends Error {\n constructor() {\n super(\"Offset cannot be less than 0\")\n }\n}\n\nexport class NoEntityFoundError extends Error {\n constructor() {\n super(\"No entity found\")\n }\n}\n","import { bytesToString, type Hex } from \"viem\"\nimport type { MimeType } from \"../types\"\nimport type { Attribute } from \"./attributes\"\n\nexport class Entity {\n key: Hex\n owner: Hex\n expiresAtBlock: bigint\n payload: Uint8Array\n attributes: Attribute[]\n contentType: MimeType\n\n constructor(\n key: Hex,\n contentType: MimeType,\n owner: Hex,\n expiresAtBlock: bigint,\n payload: Uint8Array,\n attributes: Attribute[],\n ) {\n this.key = key\n this.owner = owner\n this.expiresAtBlock = expiresAtBlock\n this.payload = payload\n this.attributes = attributes\n this.contentType = contentType\n }\n\n toText(): string {\n return bytesToString(this.payload)\n }\n\n toJson(): any {\n return JSON.parse(bytesToString(this.payload))\n }\n}\n","import { toBytes } from \"viem\"\nimport { Entity } from \"../types/entity\"\nimport type { RpcEntity } from \"../types/rpcSchema\"\n\nexport async function entityFromRpcResult(rpcEntity: RpcEntity) {\n return new Entity(\n rpcEntity.key,\n rpcEntity.contentType,\n rpcEntity.owner,\n rpcEntity.expiresAt,\n toBytes(rpcEntity.value),\n [\n ...(rpcEntity.stringAttributes ?? []).map(({ key, value }) => ({\n key,\n value,\n })),\n ...(rpcEntity.numericAttributes ?? []).map(({ key, value }) => ({\n key,\n value: Number(value),\n })),\n ],\n )\n}\n","import type { Hex } from \"viem\"\nimport type { ArkivClient } from \"../clients/baseClient\"\nimport type { RpcOrderByAttribute, RpcQueryOptions } from \"../types/rpcSchema\"\nimport type { Predicate } from \"./predicate\"\n\nfunction processPredicates(predicates: Predicate[]): string {\n const processValue = (value: string | number) => {\n if (typeof value === \"string\") {\n return `\"${value}\"`\n }\n return value\n }\n return predicates\n .map((predicate) => {\n switch (predicate.type) {\n case \"eq\":\n return `${predicate.key} = ${processValue(predicate.value)}`\n case \"neq\":\n return `${predicate.key} != ${processValue(predicate.value)}`\n case \"gt\":\n return `${predicate.key} > ${processValue(predicate.value)}`\n case \"gte\":\n return `${predicate.key} >= ${processValue(predicate.value)}`\n case \"lt\":\n return `${predicate.key} < ${processValue(predicate.value)}`\n case \"lte\":\n return `${predicate.key} <= ${processValue(predicate.value)}`\n case \"not\":\n return `!${predicate.key}`\n case \"or\":\n return `(${predicate.predicates.map((predicate) => processPredicates([predicate])).join(\" || \")})`\n case \"and\":\n return `(${predicate.predicates.map((predicate) => processPredicates([predicate])).join(\" && \")})`\n default:\n return \"\"\n }\n })\n .join(\" && \")\n}\n\nexport async function processQuery(\n client: ArkivClient,\n queryParams: {\n predicates: Predicate[]\n limit: number | undefined\n cursor: string | undefined\n ownedBy: Hex | undefined\n orderBy: RpcOrderByAttribute[] | undefined\n validAtBlock?: bigint | undefined\n withAttributes?: boolean | undefined\n withMetadata?: boolean | undefined\n withPayload?: boolean | undefined\n },\n) {\n const {\n predicates,\n limit,\n cursor,\n ownedBy,\n orderBy,\n validAtBlock,\n withAttributes,\n withMetadata,\n withPayload,\n } = queryParams\n\n console.debug(\n `Processing query with params: predicates: ${JSON.stringify(predicates)}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, orderBy: ${JSON.stringify(orderBy)}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`,\n )\n\n let query = processPredicates(predicates)\n if (ownedBy) {\n query += ` && $owner=${ownedBy}`\n }\n\n // remove leading and trailing spaces and leading &&\n query = query.trim()\n if (query.startsWith(\"&& \")) {\n query = query.slice(3)\n }\n\n const queryOptions: RpcQueryOptions = {\n includeData: {\n key: true,\n attributes: withAttributes ?? false,\n payload: withPayload ?? false,\n contentType: withMetadata ?? false,\n expiration: withMetadata ?? false,\n owner: withMetadata ?? false,\n },\n }\n\n if (validAtBlock !== undefined) {\n queryOptions.atBlock = Number(validAtBlock)\n }\n if (limit !== undefined) {\n queryOptions.resultsPerPage = limit\n }\n if (cursor !== undefined) {\n queryOptions.cursor = cursor\n }\n if (orderBy !== undefined) {\n queryOptions.orderBy = orderBy\n }\n\n console.debug(\n `Built query to send: ${query}, queryOptions: ${JSON.stringify({ includeData: queryOptions.includeData, atBlock: queryOptions.atBlock?.toString(), orderBy: queryOptions.orderBy, resultsPerPage: queryOptions.resultsPerPage, cursor: queryOptions.cursor })}`,\n )\n\n const result = await client.request({\n method: \"arkiv_query\",\n params: [query, queryOptions],\n })\n console.debug(\"Raw result from query: \", result)\n\n return result\n}\n","import type { Entity } from \"../types/entity\"\nimport { NoCursorOrLimitError, NoMoreResultsError } from \"./errors\"\nimport type { QueryBuilder } from \"./queryBuilder\"\n\nexport class QueryResult {\n entities: Entity[]\n private _endOfIteration: boolean\n private _cursor: string | undefined\n private _limit: number | undefined\n private _validAtBlock: bigint | undefined\n private _queryBuilder: QueryBuilder\n\n // Public getters for internal state\n get queryBuilder(): QueryBuilder {\n return this._queryBuilder\n }\n\n get cursor(): string | undefined {\n return this._cursor\n }\n\n constructor(\n entities: Entity[],\n queryBuilder: QueryBuilder,\n cursor: string | undefined,\n limit: number | undefined,\n validAtBlock: bigint | undefined,\n ) {\n this.entities = entities\n this._queryBuilder = queryBuilder\n this._endOfIteration = !limit || entities.length < limit\n this._cursor = cursor\n this._limit = limit\n this._validAtBlock = validAtBlock\n }\n\n async next() {\n if (this._cursor === undefined || this._limit === undefined) {\n throw new NoCursorOrLimitError()\n }\n if (this._endOfIteration) {\n throw new NoMoreResultsError()\n }\n this._queryBuilder.cursor(this._cursor)\n const result = await this._queryBuilder.fetch()\n this.entities = result.entities\n // Update the query builder reference\n this._queryBuilder = result.queryBuilder\n // Check if we've reached the end (no more cursor or we got fewer entities than limit)\n this._endOfIteration = !result.cursor || result.entities.length < this._limit\n // Update the cursor\n this._cursor = result.cursor\n\n // TODO check current block height and if it is not too old\n console.debug(\"Current block height for next page: \", this._validAtBlock)\n }\n\n hasNextPage() {\n return !this._endOfIteration\n }\n}\n","import type { Hex } from \"viem\"\nimport type { ArkivClient } from \"../clients/baseClient\"\nimport type { RpcOrderByAttribute } from \"../types/rpcSchema\"\nimport { entityFromRpcResult } from \"../utils/entities\"\nimport { processQuery } from \"./engine\"\nimport type { Predicate } from \"./predicate\"\nimport { QueryResult } from \"./queryResult\"\n\n/**\n * QueryBuilder is a helper class to build queries to the Arkiv DBChains.\n * It can be used to fetch entities from the Arkiv DBChains. It follows the Builder pattern allowing chaining of methods.\n * @param client - The Arkiv client\n * @returns The QueryBuilder instance {@link QueryBuilder}\n */\nexport class QueryBuilder {\n private _client: ArkivClient\n private _ownedBy: Hex | undefined\n private _orderBy: RpcOrderByAttribute[] | undefined\n private _validAtBlock: bigint | undefined\n private _withAttributes: boolean | undefined\n private _withMetadata: boolean | undefined\n private _withPayload: boolean | undefined\n private _limit: number | undefined\n private _cursor: string | undefined\n private _predicates: Predicate[]\n\n constructor(client: ArkivClient) {\n this._client = client\n this._predicates = []\n }\n\n /**\n * Sets the ownedBy filter\n * @param ownedBy - The address of the owner\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.ownedBy(\"0x1234567890123456789012345678901234567890\")\n */\n ownedBy(ownedBy: Hex) {\n this._ownedBy = ownedBy\n return this\n }\n\n /**\n * Sets the orderBy for the query.\n * It can be called multiple times to order by multiple attributes.\n * The order of the attributes is important. The first attribute is the primary order by attribute.\n * @param attributeName - The name of the attribute to order by\n * @param attributeType - The type of the attribute to order by (string or number)\n * @param descending - The boolean value to set the order by descending\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.orderBy(\"name\", \"string\", true)\n */\n orderBy(\n attributeName: string,\n attributeType: \"string\" | \"number\",\n descending: boolean | undefined = undefined,\n ) {\n if (!this._orderBy) {\n this._orderBy = []\n }\n this._orderBy.push({\n name: attributeName,\n type: attributeType === \"number\" ? \"numeric\" : attributeType,\n desc: !!descending,\n } as RpcOrderByAttribute)\n return this\n }\n\n /**\n * Sets the withAttributes flag which will return the attributes for the entities if true\n * @param withAttributes - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withAttributes(true)\n */\n withAttributes(withAttributes: boolean = true) {\n this._withAttributes = withAttributes\n return this\n }\n\n /**\n * Sets the withMetadata flag which will return the metadata (like owner, expiredAt, etc.) for the entities if true\n * @param withMetadata - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withMetadata(true)\n */\n withMetadata(withMetadata: boolean = true) {\n this._withMetadata = withMetadata\n return this\n }\n\n /**\n * Sets the withPayload flag which will return the payload for the entities if true\n * @param withPayload - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withPayload(true)\n */\n withPayload(withPayload: boolean = true) {\n this._withPayload = withPayload\n return this\n }\n\n /**\n * Sets the limit for the query\n * @param limit - The number of entities to return\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.limit(10)\n */\n limit(limit: number) {\n this._limit = limit\n return this\n }\n\n /**\n * Sets the cursor for the query - it is advances setting which rather shouldn't be used manually but it is provided from query result if limit is used (pagination).\n * @param cursor - The cursor to set which tells to RPC Query server where to start or continue the query.\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.offset(10)\n */\n cursor(cursor: string) {\n this._cursor = cursor\n return this\n }\n\n /**\n * Sets the validAtBlock for the query which tells at which block height the state we are intested.\n * If not set, the latest block is used.\n * @param validAtBlock - The block number to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.validAtBlock(10000)\n */\n validAtBlock(validAtBlock: bigint) {\n this._validAtBlock = validAtBlock\n return this\n }\n\n /**\n * Sets the predicates for the query limiting the results. It can be a single predicate or an array of predicates combined with 'and'.\n * Predicates can be nested using 'or' and 'and' predicates.\n * @param predicates - The predicates to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.where(eq(\"name\", \"John\"))\n * builder.where([eq(\"name\", \"John\"), eq(\"age\", 30)])\n * builder.where([eq(\"name\", \"John\"), or([eq(\"age\", 30), eq(\"age\", 31)])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), eq(\"age\", 31)])])\n * builder.where([eq(\"name\", \"John\"), or([eq(\"age\", 30), and([eq(\"age\", 31), eq(\"age\", 32)])])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), or([eq(\"age\", 31), eq(\"age\", 32)])])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), or([eq(\"age\", 31), and([eq(\"age\", 32), eq(\"age\", 33)])])])])\n */\n where(predicates: Predicate[] | Predicate) {\n if (Array.isArray(predicates)) {\n this._predicates.push(...predicates)\n } else {\n this._predicates.push(predicates)\n }\n return this\n }\n\n /**\n * Fetches the entities from the query. Re\n * It will return a QueryResult instance which can be used to fetch the next and previous pages.\n * @returns The QueryResult instance {@link QueryResult}\n *\n * @example\n * const builder = new QueryBuilder(client)\n * const result = await builder.where(eq(\"name\", \"John\")).fetch()\n * // result = { entities: [Entity, Entity, Entity], next: async () => QueryResult, previous: async () => QueryResult }\n */\n async fetch() {\n const queryResult = await processQuery(this._client, {\n predicates: this._predicates,\n limit: this._limit,\n cursor: this._cursor,\n ownedBy: this._ownedBy,\n orderBy: this._orderBy,\n validAtBlock: this._validAtBlock,\n withAttributes: this._withAttributes,\n withMetadata: this._withMetadata,\n withPayload: this._withPayload,\n })\n\n const entities = await Promise.all(\n queryResult.data.map((entity) => entityFromRpcResult(entity)),\n )\n\n this.cursor(queryResult.cursor)\n this.validAtBlock(queryResult.blockNumber)\n\n return new QueryResult(entities, this, this._cursor, this._limit, this._validAtBlock)\n }\n\n /**\n * Counts the entities from the query.\n * @returns The number of entities\n *\n * @example\n * const builder = new QueryBuilder(client)\n * const result = await builder.where(eq(\"name\", \"John\")).count()\n * // result = 10\n */\n async count() {\n const queryResult = await processQuery(this._client, {\n predicates: this._predicates,\n limit: this._limit,\n cursor: this._cursor,\n ownedBy: this._ownedBy,\n orderBy: undefined,\n validAtBlock: this._validAtBlock,\n withAttributes: false,\n withMetadata: false,\n withPayload: false,\n })\n\n return queryResult.data.length ?? 0\n }\n}\n"],"mappings":"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"}

package/dist/{queryBuilder-Bm1zGqKA.d.cts → queryBuilder-DkhyyeFr.d.cts} RENAMED Viewed

@@ -1,4 +1,4 @@
-import { g as ArkivClient, t as Entity } from "./entity-OY78HYxA.cjs";
+import { g as ArkivClient, t as Entity } from "./entity-jTQZmEAd.cjs";
 import { Hex } from "viem";
 //#region src/query/predicate.d.ts
@@ -138,6 +138,7 @@ declare class QueryResult {
 declare class QueryBuilder {
   private _client;
   private _ownedBy;
+  private _orderBy;
   private _validAtBlock;
   private _withAttributes;
   private _withMetadata;
@@ -156,6 +157,20 @@ declare class QueryBuilder {
    * builder.ownedBy("0x1234567890123456789012345678901234567890")
    */
   ownedBy(ownedBy: Hex): this;
+  /**
+   * Sets the orderBy for the query.
+   * It can be called multiple times to order by multiple attributes.
+   * The order of the attributes is important. The first attribute is the primary order by attribute.
+   * @param attributeName - The name of the attribute to order by
+   * @param attributeType - The type of the attribute to order by (string or number)
+   * @param descending - The boolean value to set the order by descending
+   * @returns The QueryBuilder instance
+   *
+   * @example
+   * const builder = new QueryBuilder(client)
+   * builder.orderBy("name", "string", true)
+   */
+  orderBy(attributeName: string, attributeType: "string" | "number", descending?: boolean | undefined): this;
   /**
    * Sets the withAttributes flag which will return the attributes for the entities if true
    * @param withAttributes - The boolean value to set
@@ -258,4 +273,4 @@ declare class QueryBuilder {
 }
 //#endregion
 export { PredicateType as a, gt as c, lte as d, neq as f, PredicateContainerType as i, gte as l, or as m, QueryResult as n, and as o, not as p, Predicate as r, eq as s, QueryBuilder as t, lt as u };
-//# sourceMappingURL=queryBuilder-Bm1zGqKA.d.cts.map
+//# sourceMappingURL=queryBuilder-DkhyyeFr.d.cts.map

package/dist/{queryBuilder-Bm1zGqKA.d.cts.map → queryBuilder-DkhyyeFr.d.cts.map} RENAMED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"queryBuilder-~~Bm1zGqKA~~.d.cts","names":[],"sources":["../src/query/predicate.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":[],"mappings":";;;;KAAY,aAAA;KACA,sBAAA;KAEA,SAAA;QAEA;EALA,GAAA,EAAA,MAAA;EACA,KAAA,EAAA,MAAA,GAAA,MAAA;AAEZ,CAAA,GAAY;EAEA,IAAA,EAKA,sBALA;EAKA,UAAA,EACM,SADN,EAAA;CACM;;AAclB;AAeA;AAcA;AAcA;AAcA;AAcA;AAcA;AAcA;AAaA;;iBAhHgB,EAAA,aAAe,cAAc;;ACrB7C;;;;;;;;;;~~ACSa~~,~~iBF2BG~~,GAAA,~~CE3BS~~,UAAA,~~EF2BO~~,~~SE3BP~~,EAAA,CAAA,~~EF2BqB~~,~~SE3BrB~~;;;;;;;;;;;~~iBFyCT~~,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;iBAa1C,GAAA,eAAkB;;;cCrIrB,WAAA;YACD;EDLA,QAAA,eAAa;EACb,QAAA,OAAA;EAEA,QAAA,MAAS;EAET,QAAA,aAAA;EAKA,QAAA,aAAA;EACM,IAAA,YAAA,CAAA,CAAA,ECEI,YDFJ;EAAS,IAAA,MAAA,CAAA,CAAA,EAAA,MAAA,GAAA,SAAA;EAcX,WAAE,CAAA,QAAa,ECHjB,MDG+B,EAAA,EAAA,YAAS,ECFpC,YDEoC,EAAA,MAAA,EAAA,MAAA,GAAA,SAAA,EAAA,KAAA,EAAA,MAAA,GAAA,SAAA,EAAA,YAAA,EAAA,MAAA,GAAA,SAAA;EAetC,IAAA,CAAA,CAAG,ECJP,ODIO,CAAA,IAAa,CAAA;EAchB,WAAE,CAAA,CAAA,EAAA,OAAuC;AAczD;;;AApEA;AACA;AAEA;;;;AAQ2B,~~cEEd~~,YAAA,~~CFFc~~;EAcX,QAAE,OAAA;EAeF,QAAG,QAAA;EAcH,QAAE,~~aAAuC~~;~~EAczC~~,QAAG,~~eAAuC~~;EAc1C,QAAE,~~aAAuC~~;EAczC,QAAG,~~YAAuC~~;EAc1C,QAAE,~~MAAA~~;~~EAcF~~,QAAG,~~OAAA~~;EAaH,QAAG,~~WAAe;sBEjHZ;;;ADpBtB;;;;;;;mBCkCmB;;;AAzBnB;;;;;;;EAqLa,cAAA,CAAA,cAAA,CAAA,EAAA,~~OAAA,~~CAAA,EAAA,IAAA;EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAlDO,~~cAAc;;;;;;;;;;;WAmBrB,QAAA;;;;;;;;;;~~WA+BA~~"}
1	+ {"version":3,"file":"queryBuilder-DkhyyeFr.d.cts","names":[],"sources":["../src/query/predicate.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":[],"mappings":";;;;KAAY,aAAA;KACA,sBAAA;KAEA,SAAA;QAEA;EALA,GAAA,EAAA,MAAA;EACA,KAAA,EAAA,MAAA,GAAA,MAAA;AAEZ,CAAA,GAAY;EAEA,IAAA,EAKA,sBALA;EAKA,UAAA,EACM,SADN,EAAA;CACM;;AAclB;AAeA;AAcA;AAcA;AAcA;AAcA;AAcA;AAcA;AAaA;;iBAhHgB,EAAA,aAAe,cAAc;;ACrB7C;;;;;;;;;;ACUa,iBF0BG,GAAA,CE1BS,UAAA,EF0BO,SE1BP,EAAA,CAAA,EF0BqB,SE1BrB;;;;;;;;;;;iBFwCT,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;;iBAc1C,EAAA,uCAAyC;;;;;;;;;;;iBAczC,GAAA,uCAA0C;;;;;;;;;;iBAa1C,GAAA,eAAkB;;;cCrIrB,WAAA;YACD;EDLA,QAAA,eAAa;EACb,QAAA,OAAA;EAEA,QAAA,MAAS;EAET,QAAA,aAAA;EAKA,QAAA,aAAA;EACM,IAAA,YAAA,CAAA,CAAA,ECEI,YDFJ;EAAS,IAAA,MAAA,CAAA,CAAA,EAAA,MAAA,GAAA,SAAA;EAcX,WAAE,CAAA,QAAa,ECHjB,MDG+B,EAAA,EAAA,YAAS,ECFpC,YDEoC,EAAA,MAAA,EAAA,MAAA,GAAA,SAAA,EAAA,KAAA,EAAA,MAAA,GAAA,SAAA,EAAA,YAAA,EAAA,MAAA,GAAA,SAAA;EAetC,IAAA,CAAA,CAAG,ECJP,ODIO,CAAA,IAAa,CAAA;EAchB,WAAE,CAAA,CAAA,EAAA,OAAuC;AAczD;;;AApEA;AACA;AAEA;;;;AAQ2B,cEGd,YAAA,CFHc;EAcX,QAAE,OAAA;EAeF,QAAG,QAAA;EAcH,QAAE,QAAA;EAcF,QAAG,aAAuC;EAc1C,QAAE,eAAuC;EAczC,QAAG,aAAuC;EAc1C,QAAE,YAAuC;EAczC,QAAG,MAAA;EAaH,QAAG,OAAA;;sBE/GG;;ADtBtB;;;;;;;;mBCoCmB;;AA1BnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAiKoB,cAAc;;;;;;;;;;;WAmBrB,QAAA;;;;;;;;;;WAgCA"}

package/dist/types/index.d.cts CHANGED Viewed

@@ -1,2 +1,2 @@
-import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "../entity-OY78HYxA.cjs";
+import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "../entity-jTQZmEAd.cjs";
 export { ArkivRpcSchema, Attribute, ChangeOwnershipParameters, ChangeOwnershipReturnType, CreateEntityParameters, CreateEntityReturnType, DeleteEntityParameters, DeleteEntityReturnType, Entity, ExtendEntityParameters, ExtendEntityReturnType, MimeType, MutateEntitiesParameters, MutateEntitiesReturnType, RpcEntity, RpcIncludeData, RpcQueryOptions, TxParams, UpdateEntityParameters, UpdateEntityReturnType };

package/dist/types/index.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "../entity-o4fwHXKf.js";
+import { _ as ArkivRpcSchema, a as MutateEntitiesReturnType, b as RpcQueryOptions, c as ExtendEntityParameters, d as DeleteEntityReturnType, f as CreateEntityParameters, h as ChangeOwnershipReturnType, i as MutateEntitiesParameters, l as ExtendEntityReturnType, m as ChangeOwnershipParameters, n as TxParams, o as UpdateEntityParameters, p as CreateEntityReturnType, r as Attribute, s as UpdateEntityReturnType, t as Entity, u as DeleteEntityParameters, v as RpcEntity, x as MimeType, y as RpcIncludeData } from "../entity-DvQtQL8v.js";
 export { ArkivRpcSchema, Attribute, ChangeOwnershipParameters, ChangeOwnershipReturnType, CreateEntityParameters, CreateEntityReturnType, DeleteEntityParameters, DeleteEntityReturnType, Entity, ExtendEntityParameters, ExtendEntityReturnType, MimeType, MutateEntitiesParameters, MutateEntitiesReturnType, RpcEntity, RpcIncludeData, RpcQueryOptions, TxParams, UpdateEntityParameters, UpdateEntityReturnType };

package/dist/utils/index.d.cts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.cts","names":[],"sources":["../../src/utils/expirationTime.ts","../../src/utils/payload.ts"],"sourcesContent":[],"mappings":";;;cAEa;;;EAAA,SAAA,EAAA,CAAA,KAUZ,EAAA,MAAA,EAAA,GADkB,MAAI;;;;ECTP,SAAA,EAAA,CAAA,KAAa,EAAA,MAAA,~~EAAgB~~,~~GAAA~~,MAAA;EAI7B,UAAA,EAAA,CAAA,MAAe,EAAA,MAAA,~~EAAgB~~,~~GAAA~~,MAAA;mBDK5B;;;;iBCTH,aAAA,gBAA6B;iBAI7B,eAAA,gBAA+B"}
1	+ {"version":3,"file":"index.d.cts","names":[],"sources":["../../src/utils/expirationTime.ts","../../src/utils/payload.ts"],"sourcesContent":[],"mappings":";;;cAEa;;;EAAA,SAAA,EAAA,CAAA,KAUZ,EAAA,MAAA,EAAA,GADkB,MAAI;;;;ECTP,SAAA,EAAA,CAAA,KAAa,EAAA,MAAA,EAAA,GAAgB,MAAA;EAI7B,UAAA,EAAA,CAAA,MAAe,EAAA,MAAA,EAAA,GAAgB,MAAA;mBDK5B;;;;iBCTH,aAAA,gBAA6B;iBAI7B,eAAA,gBAA+B"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@arkiv-network/sdk",
-  "version": "0.3.2-dev.0",
+  "version": "0.3.2-dev.1",
   "description": "TypeScript client library for Arkiv's blockchains interactions",
   "type": "module",
   "target": "esnext",

package/src/query/engine.test.ts CHANGED Viewed

@@ -15,6 +15,7 @@ describe("processQuery tests", () => {
       limit: undefined,
       cursor: undefined,
       ownedBy: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -53,6 +54,7 @@ describe("processQuery tests", () => {
       limit: undefined,
       cursor: undefined,
       ownedBy: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -92,6 +94,7 @@ describe("processQuery tests", () => {
       limit: undefined,
       cursor: undefined,
       ownedBy: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -131,6 +134,7 @@ describe("processQuery tests", () => {
       limit: undefined,
       cursor: undefined,
       ownedBy: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -176,6 +180,7 @@ describe("processQuery tests", () => {
       limit: undefined,
       cursor: undefined,
       ownedBy: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -203,6 +208,7 @@ describe("processQuery tests", () => {
     const predicates = [{ type: "eq" as const, key: "key", value: "value" }]
     await processQuery(client, {
       predicates,
+      orderBy: undefined,
       limit: undefined,
       cursor: undefined,
       ownedBy: "0x123",
@@ -232,6 +238,7 @@ describe("processQuery tests", () => {
       predicates,
       limit: undefined,
       cursor: undefined,
+      orderBy: undefined,
       validAtBlock: undefined,
       withAttributes: undefined,
       withMetadata: undefined,
@@ -256,12 +263,74 @@ describe("processQuery tests", () => {
     })
   })
+  it("should process simple predicates with orderBy", async () => {
+    const predicates = [{ type: "eq" as const, key: "key", value: "value" }]
+    await processQuery(client, {
+      predicates,
+      orderBy: [{ name: "key", type: "string", descending: true }],
+      limit: undefined,
+      cursor: undefined,
+      ownedBy: undefined,
+    })
+    expect(client.request).lastCalledWith({
+      method: "arkiv_query",
+      params: [
+        `key = "value"`,
+        {
+          orderBy: [{ name: "key", type: "string", descending: true }],
+          includeData: {
+            key: true,
+            attributes: false,
+            contentType: false,
+            payload: false,
+            expiration: false,
+            owner: false,
+          },
+        },
+      ],
+    })
+  })
+  it("should process only orderBy", async () => {
+    const predicates = [] as Predicate[]
+    await processQuery(client, {
+      predicates,
+      limit: undefined,
+      cursor: undefined,
+      ownedBy: undefined,
+      orderBy: [{ name: "key", type: "string", descending: true }],
+      validAtBlock: undefined,
+      withAttributes: undefined,
+      withMetadata: undefined,
+    })
+    expect(client.request).lastCalledWith({
+      method: "arkiv_query",
+      params: [
+        "",
+        {
+          orderBy: [{ name: "key", type: "string", descending: true }],
+          includeData: {
+            key: true,
+            attributes: false,
+            contentType: false,
+            payload: false,
+            expiration: false,
+            owner: false,
+          },
+        },
+      ],
+    })
+  })
   it("should process simple predicate with validAtBlock and paging", async () => {
     const predicates = [{ type: "eq" as const, key: "key", value: "value" }]
     await processQuery(client, {
       predicates,
       limit: 10,
       cursor: undefined,
+      orderBy: undefined,
       validAtBlock: 123n,
       ownedBy: "0x123",
     })

package/src/query/engine.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { Hex } from "viem"
 import type { ArkivClient } from "../clients/baseClient"
-import type { RpcQueryOptions } from "../types/rpcSchema"
+import type { RpcOrderByAttribute, RpcQueryOptions } from "../types/rpcSchema"
 import type { Predicate } from "./predicate"
 function processPredicates(predicates: Predicate[]): string {
@@ -45,6 +45,7 @@ export async function processQuery(
     limit: number | undefined
     cursor: string | undefined
     ownedBy: Hex | undefined
+    orderBy: RpcOrderByAttribute[] | undefined
     validAtBlock?: bigint | undefined
     withAttributes?: boolean | undefined
     withMetadata?: boolean | undefined
@@ -56,6 +57,7 @@ export async function processQuery(
     limit,
     cursor,
     ownedBy,
+    orderBy,
     validAtBlock,
     withAttributes,
     withMetadata,
@@ -63,7 +65,7 @@ export async function processQuery(
   } = queryParams
   console.debug(
-    `Processing query with params: predicates: ${predicates}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`,
+    `Processing query with params: predicates: ${JSON.stringify(predicates)}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, orderBy: ${JSON.stringify(orderBy)}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`,
   )
   let query = processPredicates(predicates)
@@ -97,9 +99,12 @@ export async function processQuery(
   if (cursor !== undefined) {
     queryOptions.cursor = cursor
   }
+  if (orderBy !== undefined) {
+    queryOptions.orderBy = orderBy
+  }
   console.debug(
-    `Built query to send: ${query}, queryOptions: ${JSON.stringify({ includeData: queryOptions.includeData, atBlock: queryOptions.atBlock?.toString(), resultsPerPage: queryOptions.resultsPerPage, cursor: queryOptions.cursor })}`,
+    `Built query to send: ${query}, queryOptions: ${JSON.stringify({ includeData: queryOptions.includeData, atBlock: queryOptions.atBlock?.toString(), orderBy: queryOptions.orderBy, resultsPerPage: queryOptions.resultsPerPage, cursor: queryOptions.cursor })}`,
   )
   const result = await client.request({

package/src/query/queryBuilder.test.ts CHANGED Viewed

@@ -46,6 +46,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -67,6 +68,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -96,6 +98,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -117,6 +120,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -141,6 +145,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -164,6 +169,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: owner,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -171,6 +177,27 @@ describe("QueryBuilder", () => {
       })
     })
+    test("orderBy() sets orderBy", async () => {
+      mockProcessQuery.mockResolvedValue({
+        data: [],
+      })
+      const builder = new QueryBuilder(mockClient)
+      await builder.orderBy("name", "string", true).fetch()
+      expect(mockProcessQuery).toHaveBeenCalledWith(mockClient, {
+        predicates: [],
+        limit: undefined,
+        offset: undefined,
+        ownedBy: undefined,
+        orderBy: [{ name: "name", type: "string", desc: true }],
+        validAtBlock: undefined,
+        withAttributes: undefined,
+        withMetadata: undefined,
+        withPayload: undefined,
+      })
+    })
     test("limit() sets limit", async () => {
       mockProcessQuery.mockResolvedValue({
         data: [],
@@ -184,6 +211,7 @@ describe("QueryBuilder", () => {
         limit: 10,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -204,6 +232,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         cursor: "0xABC123",
         ownedBy: undefined,
+        orderBy: undefined,
         validAtBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,
@@ -224,6 +253,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         offset: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: true,
         withMetadata: undefined,
@@ -244,6 +274,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         cursor: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validBeforeBlock: undefined,
         withAttributes: false,
         withMetadata: undefined,
@@ -264,6 +295,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         cursor: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validAtBlock: undefined,
         withAttributes: undefined,
         withMetadata: true,
@@ -284,6 +316,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         cursor: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validAtBlock: undefined,
         withAttributes: undefined,
         withMetadata: false,
@@ -304,6 +337,7 @@ describe("QueryBuilder", () => {
         limit: undefined,
         cursor: undefined,
         ownedBy: undefined,
+        orderBy: undefined,
         validAtBlock: undefined,
         withAttributes: undefined,
         withMetadata: undefined,

package/src/query/queryBuilder.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { Hex } from "viem"
 import type { ArkivClient } from "../clients/baseClient"
+import type { RpcOrderByAttribute } from "../types/rpcSchema"
 import { entityFromRpcResult } from "../utils/entities"
 import { processQuery } from "./engine"
 import type { Predicate } from "./predicate"
@@ -14,6 +15,7 @@ import { QueryResult } from "./queryResult"
 export class QueryBuilder {
   private _client: ArkivClient
   private _ownedBy: Hex | undefined
+  private _orderBy: RpcOrderByAttribute[] | undefined
   private _validAtBlock: bigint | undefined
   private _withAttributes: boolean | undefined
   private _withMetadata: boolean | undefined
@@ -41,6 +43,35 @@ export class QueryBuilder {
     return this
   }
+  /**
+   * Sets the orderBy for the query.
+   * It can be called multiple times to order by multiple attributes.
+   * The order of the attributes is important. The first attribute is the primary order by attribute.
+   * @param attributeName - The name of the attribute to order by
+   * @param attributeType - The type of the attribute to order by (string or number)
+   * @param descending - The boolean value to set the order by descending
+   * @returns The QueryBuilder instance
+   *
+   * @example
+   * const builder = new QueryBuilder(client)
+   * builder.orderBy("name", "string", true)
+   */
+  orderBy(
+    attributeName: string,
+    attributeType: "string" | "number",
+    descending: boolean | undefined = undefined,
+  ) {
+    if (!this._orderBy) {
+      this._orderBy = []
+    }
+    this._orderBy.push({
+      name: attributeName,
+      type: attributeType === "number" ? "numeric" : attributeType,
+      desc: !!descending,
+    } as RpcOrderByAttribute)
+    return this
+  }
   /**
    * Sets the withAttributes flag which will return the attributes for the entities if true
    * @param withAttributes - The boolean value to set
@@ -167,6 +198,7 @@ export class QueryBuilder {
       limit: this._limit,
       cursor: this._cursor,
       ownedBy: this._ownedBy,
+      orderBy: this._orderBy,
       validAtBlock: this._validAtBlock,
       withAttributes: this._withAttributes,
       withMetadata: this._withMetadata,
@@ -198,6 +230,7 @@ export class QueryBuilder {
       limit: this._limit,
       cursor: this._cursor,
       ownedBy: this._ownedBy,
+      orderBy: undefined,
       validAtBlock: this._validAtBlock,
       withAttributes: false,
       withMetadata: false,

package/src/types/rpcSchema.ts CHANGED Viewed

@@ -11,9 +11,16 @@ export type RpcEntity = {
   numericAttributes?: [{ key: string; value: number }]
 }
+export type RpcOrderByAttribute = {
+  name: string
+  type: "string" | "numeric"
+  desc: boolean
+}
 export type RpcQueryOptions = {
   atBlock?: number
   includeData?: RpcIncludeData
+  orderBy?: RpcOrderByAttribute[]
   resultsPerPage?: number
   cursor?: string
 }

package/dist/entity-OY78HYxA.d.cts.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"entity-OY78HYxA.d.cts","names":[],"sources":["../src/types/mimeTypes.ts","../src/types/rpcSchema.ts","../src/clients/baseClient.ts","../src/actions/wallet/changeOwnership.ts","../src/actions/wallet/createEntity.ts","../src/actions/wallet/deleteEntity.ts","../src/actions/wallet/extendEntity.ts","../src/actions/wallet/updateEntity.ts","../src/actions/wallet/mutateEntities.ts","../src/types/attributes.ts","../src/types/txParams.ts","../src/types/entity.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/entity-o4fwHXKf.d.ts.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"entity-o4fwHXKf.d.ts","names":[],"sources":["../src/types/mimeTypes.ts","../src/types/rpcSchema.ts","../src/clients/baseClient.ts","../src/actions/wallet/changeOwnership.ts","../src/actions/wallet/createEntity.ts","../src/actions/wallet/deleteEntity.ts","../src/actions/wallet/extendEntity.ts","../src/actions/wallet/updateEntity.ts","../src/actions/wallet/mutateEntities.ts","../src/types/attributes.ts","../src/types/txParams.ts","../src/types/entity.ts"],"sourcesContent":[],"mappings":"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"}

package/dist/queryBuilder-BueP5de6.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"queryBuilder-BueP5de6.js","names":["predicate","queryOptions: RpcQueryOptions"],"sources":["../src/query/errors.ts","../src/types/entity.ts","../src/utils/entities.ts","../src/query/engine.ts","../src/query/queryResult.ts","../src/query/queryBuilder.ts"],"sourcesContent":["export class NoMoreResultsError extends Error {\n constructor() {\n super(\"No more results\")\n }\n}\n\nexport class NoCursorOrLimitError extends Error {\n constructor() {\n super(\"Cursor and limit must be defined to fetch next\")\n }\n}\n\nexport class OffsetCannotBeLessThanZeroError extends Error {\n constructor() {\n super(\"Offset cannot be less than 0\")\n }\n}\n\nexport class NoEntityFoundError extends Error {\n constructor() {\n super(\"No entity found\")\n }\n}\n","import { bytesToString, type Hex } from \"viem\"\nimport type { MimeType } from \"../types\"\nimport type { Attribute } from \"./attributes\"\n\nexport class Entity {\n key: Hex\n owner: Hex\n expiresAtBlock: bigint\n payload: Uint8Array\n attributes: Attribute[]\n contentType: MimeType\n\n constructor(\n key: Hex,\n contentType: MimeType,\n owner: Hex,\n expiresAtBlock: bigint,\n payload: Uint8Array,\n attributes: Attribute[],\n ) {\n this.key = key\n this.owner = owner\n this.expiresAtBlock = expiresAtBlock\n this.payload = payload\n this.attributes = attributes\n this.contentType = contentType\n }\n\n toText(): string {\n return bytesToString(this.payload)\n }\n\n toJson(): any {\n return JSON.parse(bytesToString(this.payload))\n }\n}\n","import { toBytes } from \"viem\"\nimport { Entity } from \"../types/entity\"\nimport type { RpcEntity } from \"../types/rpcSchema\"\n\nexport async function entityFromRpcResult(rpcEntity: RpcEntity) {\n return new Entity(\n rpcEntity.key,\n rpcEntity.contentType,\n rpcEntity.owner,\n rpcEntity.expiresAt,\n toBytes(rpcEntity.value),\n [\n ...(rpcEntity.stringAttributes ?? []).map(({ key, value }) => ({\n key,\n value,\n })),\n ...(rpcEntity.numericAttributes ?? []).map(({ key, value }) => ({\n key,\n value: Number(value),\n })),\n ],\n )\n}\n","import type { Hex } from \"viem\"\nimport type { ArkivClient } from \"../clients/baseClient\"\nimport type { RpcQueryOptions } from \"../types/rpcSchema\"\nimport type { Predicate } from \"./predicate\"\n\nfunction processPredicates(predicates: Predicate[]): string {\n const processValue = (value: string | number) => {\n if (typeof value === \"string\") {\n return `\"${value}\"`\n }\n return value\n }\n return predicates\n .map((predicate) => {\n switch (predicate.type) {\n case \"eq\":\n return `${predicate.key} = ${processValue(predicate.value)}`\n case \"neq\":\n return `${predicate.key} != ${processValue(predicate.value)}`\n case \"gt\":\n return `${predicate.key} > ${processValue(predicate.value)}`\n case \"gte\":\n return `${predicate.key} >= ${processValue(predicate.value)}`\n case \"lt\":\n return `${predicate.key} < ${processValue(predicate.value)}`\n case \"lte\":\n return `${predicate.key} <= ${processValue(predicate.value)}`\n case \"not\":\n return `!${predicate.key}`\n case \"or\":\n return `(${predicate.predicates.map((predicate) => processPredicates([predicate])).join(\" || \")})`\n case \"and\":\n return `(${predicate.predicates.map((predicate) => processPredicates([predicate])).join(\" && \")})`\n default:\n return \"\"\n }\n })\n .join(\" && \")\n}\n\nexport async function processQuery(\n client: ArkivClient,\n queryParams: {\n predicates: Predicate[]\n limit: number | undefined\n cursor: string | undefined\n ownedBy: Hex | undefined\n validAtBlock?: bigint | undefined\n withAttributes?: boolean | undefined\n withMetadata?: boolean | undefined\n withPayload?: boolean | undefined\n },\n) {\n const {\n predicates,\n limit,\n cursor,\n ownedBy,\n validAtBlock,\n withAttributes,\n withMetadata,\n withPayload,\n } = queryParams\n\n console.debug(\n `Processing query with params: predicates: ${predicates}, cursor: ${cursor}, limit: ${limit}, ownedBy: ${ownedBy}, validAtBlock: ${validAtBlock}, withAttributes: ${withAttributes}, withMetadata: ${withMetadata}, withPayload: ${withPayload}`,\n )\n\n let query = processPredicates(predicates)\n if (ownedBy) {\n query += ` && $owner=${ownedBy}`\n }\n\n // remove leading and trailing spaces and leading &&\n query = query.trim()\n if (query.startsWith(\"&& \")) {\n query = query.slice(3)\n }\n\n const queryOptions: RpcQueryOptions = {\n includeData: {\n key: true,\n attributes: withAttributes ?? false,\n payload: withPayload ?? false,\n contentType: withMetadata ?? false,\n expiration: withMetadata ?? false,\n owner: withMetadata ?? false,\n },\n }\n\n if (validAtBlock !== undefined) {\n queryOptions.atBlock = Number(validAtBlock)\n }\n if (limit !== undefined) {\n queryOptions.resultsPerPage = limit\n }\n if (cursor !== undefined) {\n queryOptions.cursor = cursor\n }\n\n console.debug(\n `Built query to send: ${query}, queryOptions: ${JSON.stringify({ includeData: queryOptions.includeData, atBlock: queryOptions.atBlock?.toString(), resultsPerPage: queryOptions.resultsPerPage, cursor: queryOptions.cursor })}`,\n )\n\n const result = await client.request({\n method: \"arkiv_query\",\n params: [query, queryOptions],\n })\n console.debug(\"Raw result from query: \", result)\n\n return result\n}\n","import type { Entity } from \"../types/entity\"\nimport { NoCursorOrLimitError, NoMoreResultsError } from \"./errors\"\nimport type { QueryBuilder } from \"./queryBuilder\"\n\nexport class QueryResult {\n entities: Entity[]\n private _endOfIteration: boolean\n private _cursor: string | undefined\n private _limit: number | undefined\n private _validAtBlock: bigint | undefined\n private _queryBuilder: QueryBuilder\n\n // Public getters for internal state\n get queryBuilder(): QueryBuilder {\n return this._queryBuilder\n }\n\n get cursor(): string | undefined {\n return this._cursor\n }\n\n constructor(\n entities: Entity[],\n queryBuilder: QueryBuilder,\n cursor: string | undefined,\n limit: number | undefined,\n validAtBlock: bigint | undefined,\n ) {\n this.entities = entities\n this._queryBuilder = queryBuilder\n this._endOfIteration = !limit || entities.length < limit\n this._cursor = cursor\n this._limit = limit\n this._validAtBlock = validAtBlock\n }\n\n async next() {\n if (this._cursor === undefined || this._limit === undefined) {\n throw new NoCursorOrLimitError()\n }\n if (this._endOfIteration) {\n throw new NoMoreResultsError()\n }\n this._queryBuilder.cursor(this._cursor)\n const result = await this._queryBuilder.fetch()\n this.entities = result.entities\n // Update the query builder reference\n this._queryBuilder = result.queryBuilder\n // Check if we've reached the end (no more cursor or we got fewer entities than limit)\n this._endOfIteration = !result.cursor || result.entities.length < this._limit\n // Update the cursor\n this._cursor = result.cursor\n\n // TODO check current block height and if it is not too old\n console.debug(\"Current block height for next page: \", this._validAtBlock)\n }\n\n hasNextPage() {\n return !this._endOfIteration\n }\n}\n","import type { Hex } from \"viem\"\nimport type { ArkivClient } from \"../clients/baseClient\"\nimport { entityFromRpcResult } from \"../utils/entities\"\nimport { processQuery } from \"./engine\"\nimport type { Predicate } from \"./predicate\"\nimport { QueryResult } from \"./queryResult\"\n\n/**\n * QueryBuilder is a helper class to build queries to the Arkiv DBChains.\n * It can be used to fetch entities from the Arkiv DBChains. It follows the Builder pattern allowing chaining of methods.\n * @param client - The Arkiv client\n * @returns The QueryBuilder instance {@link QueryBuilder}\n */\nexport class QueryBuilder {\n private _client: ArkivClient\n private _ownedBy: Hex | undefined\n private _validAtBlock: bigint | undefined\n private _withAttributes: boolean | undefined\n private _withMetadata: boolean | undefined\n private _withPayload: boolean | undefined\n private _limit: number | undefined\n private _cursor: string | undefined\n private _predicates: Predicate[]\n\n constructor(client: ArkivClient) {\n this._client = client\n this._predicates = []\n }\n\n /**\n * Sets the ownedBy filter\n * @param ownedBy - The address of the owner\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.ownedBy(\"0x1234567890123456789012345678901234567890\")\n */\n ownedBy(ownedBy: Hex) {\n this._ownedBy = ownedBy\n return this\n }\n\n /**\n * Sets the withAttributes flag which will return the attributes for the entities if true\n * @param withAttributes - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withAttributes(true)\n */\n withAttributes(withAttributes: boolean = true) {\n this._withAttributes = withAttributes\n return this\n }\n\n /**\n * Sets the withMetadata flag which will return the metadata (like owner, expiredAt, etc.) for the entities if true\n * @param withMetadata - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withMetadata(true)\n */\n withMetadata(withMetadata: boolean = true) {\n this._withMetadata = withMetadata\n return this\n }\n\n /**\n * Sets the withPayload flag which will return the payload for the entities if true\n * @param withPayload - The boolean value to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.withPayload(true)\n */\n withPayload(withPayload: boolean = true) {\n this._withPayload = withPayload\n return this\n }\n\n /**\n * Sets the limit for the query\n * @param limit - The number of entities to return\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.limit(10)\n */\n limit(limit: number) {\n this._limit = limit\n return this\n }\n\n /**\n * Sets the cursor for the query - it is advances setting which rather shouldn't be used manually but it is provided from query result if limit is used (pagination).\n * @param cursor - The cursor to set which tells to RPC Query server where to start or continue the query.\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.offset(10)\n */\n cursor(cursor: string) {\n this._cursor = cursor\n return this\n }\n\n /**\n * Sets the validAtBlock for the query which tells at which block height the state we are intested.\n * If not set, the latest block is used.\n * @param validAtBlock - The block number to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.validAtBlock(10000)\n */\n validAtBlock(validAtBlock: bigint) {\n this._validAtBlock = validAtBlock\n return this\n }\n\n /**\n * Sets the predicates for the query limiting the results. It can be a single predicate or an array of predicates combined with 'and'.\n * Predicates can be nested using 'or' and 'and' predicates.\n * @param predicates - The predicates to set\n * @returns The QueryBuilder instance\n *\n * @example\n * const builder = new QueryBuilder(client)\n * builder.where(eq(\"name\", \"John\"))\n * builder.where([eq(\"name\", \"John\"), eq(\"age\", 30)])\n * builder.where([eq(\"name\", \"John\"), or([eq(\"age\", 30), eq(\"age\", 31)])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), eq(\"age\", 31)])])\n * builder.where([eq(\"name\", \"John\"), or([eq(\"age\", 30), and([eq(\"age\", 31), eq(\"age\", 32)])])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), or([eq(\"age\", 31), eq(\"age\", 32)])])])\n * builder.where([eq(\"name\", \"John\"), and([eq(\"age\", 30), or([eq(\"age\", 31), and([eq(\"age\", 32), eq(\"age\", 33)])])])])\n */\n where(predicates: Predicate[] | Predicate) {\n if (Array.isArray(predicates)) {\n this._predicates.push(...predicates)\n } else {\n this._predicates.push(predicates)\n }\n return this\n }\n\n /**\n * Fetches the entities from the query. Re\n * It will return a QueryResult instance which can be used to fetch the next and previous pages.\n * @returns The QueryResult instance {@link QueryResult}\n *\n * @example\n * const builder = new QueryBuilder(client)\n * const result = await builder.where(eq(\"name\", \"John\")).fetch()\n * // result = { entities: [Entity, Entity, Entity], next: async () => QueryResult, previous: async () => QueryResult }\n */\n async fetch() {\n const queryResult = await processQuery(this._client, {\n predicates: this._predicates,\n limit: this._limit,\n cursor: this._cursor,\n ownedBy: this._ownedBy,\n validAtBlock: this._validAtBlock,\n withAttributes: this._withAttributes,\n withMetadata: this._withMetadata,\n withPayload: this._withPayload,\n })\n\n const entities = await Promise.all(\n queryResult.data.map((entity) => entityFromRpcResult(entity)),\n )\n\n this.cursor(queryResult.cursor)\n this.validAtBlock(queryResult.blockNumber)\n\n return new QueryResult(entities, this, this._cursor, this._limit, this._validAtBlock)\n }\n\n /**\n * Counts the entities from the query.\n * @returns The number of entities\n *\n * @example\n * const builder = new QueryBuilder(client)\n * const result = await builder.where(eq(\"name\", \"John\")).count()\n * // result = 10\n */\n async count() {\n const queryResult = await processQuery(this._client, {\n predicates: this._predicates,\n limit: this._limit,\n cursor: this._cursor,\n ownedBy: this._ownedBy,\n validAtBlock: this._validAtBlock,\n withAttributes: false,\n withMetadata: false,\n withPayload: false,\n })\n\n return queryResult.data.length ?? 0\n }\n}\n"],"mappings":"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"}