@polymeshassociation/polymesh-sdk 31.0.0 → 31.1.0-beta.10

package/middleware/queries/assets.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { Asset, AssetHolder, AssetHoldersOrderBy, AssetTransaction, DistributionPayment, NftHolder, NftHoldersOrderBy } from '../../middleware/types';
+import { Asset, AssetHolder, AssetHoldersOrderBy, AssetTransaction, AssetTransactionsOrderBy, NftHolder, NftHoldersOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 /**
  * @hidden
@@ -13,23 +13,31 @@ export declare function assetQuery(variables: QueryArgs<Asset, 'id'>): QueryOpti
  *
  * Get asset held by a DID
  */
-export declare function assetHoldersQuery(filters: QueryArgs<AssetHolder, 'identityId'>, size?: BigNumber, start?: BigNumber, orderBy?: AssetHoldersOrderBy): QueryOptions<PaginatedQueryArgs<QueryArgs<DistributionPayment, 'distributionId'>>>;
+export declare function assetHoldersQuery(filters: QueryArgs<AssetHolder, 'identityId'> & {
+    amount?: string;
+}, size?: BigNumber, start?: BigNumber, orderBy?: AssetHoldersOrderBy | AssetHoldersOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<AssetHolder, 'identityId'> & {
+    amount?: string;
+}>>;
 /**
  * @hidden
  *
  * Get NFTs held by a DID
  */
-export declare function nftHoldersQuery(filters: QueryArgs<NftHolder, 'identityId'>, size?: BigNumber, start?: BigNumber, orderBy?: NftHoldersOrderBy): QueryOptions<PaginatedQueryArgs<QueryArgs<NftHolder, 'identityId'>>>;
+export declare function nftHoldersQuery(filters: QueryArgs<NftHolder, 'identityId'> & {
+    nftIds?: number[];
+}, size?: BigNumber, start?: BigNumber, orderBy?: NftHoldersOrderBy | NftHoldersOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<NftHolder, 'identityId'> & {
+    nftIds?: number[];
+}>>;
 /**
  * @hidden
  *
  * Get the balance history for an Asset
  */
-export declare function assetTransactionQuery(filters: QueryArgs<AssetTransaction, 'assetId'>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<AssetTransaction, 'assetId'>>>;
+export declare function assetTransactionQuery(filters: QueryArgs<AssetTransaction, 'assetId'>, size?: BigNumber, start?: BigNumber, orderBy?: AssetTransactionsOrderBy | AssetTransactionsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<AssetTransaction, 'assetId'>>>;
 /**
  * @hidden
  *
  * Get holders on an NFT Collection
  */
-export declare function nftCollectionHolders(assetId: string, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<NftHolder, 'assetId'>>>;
+export declare function nftCollectionHolders(assetId: string, size?: BigNumber, start?: BigNumber, orderBy?: NftHoldersOrderBy | NftHoldersOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<NftHolder, 'assetId'>>>;
 //# sourceMappingURL=assets.d.ts.map

package/middleware/queries/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAEhB,mBAAmB,EACnB,SAAS,EACT,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,GAChC,YAAY,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAoBtC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,EAC7C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,sBAAiC,GACvC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAkCpF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,EAC3C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,oBAA+B,GACrC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAgCtE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAC/C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC,CA8C1E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAsBnE"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,OAAO,EACL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EACxB,SAAS,EACT,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,GAChC,YAAY,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAoBtC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EACnE,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GACpD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAmD9F;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,EACnE,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAChD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAAC,CAgD9F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAC/C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,wBAAwB,GAAG,wBAAwB,EAAE,GAC9D,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC,CAmD1E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAChD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAyBnE"}

package/middleware/queries/assets.js

@@ -41,23 +41,37 @@ function assetQuery(variables) {
  *
  * Get asset held by a DID
  */
-function assetHoldersQuery(filters, size, start, orderBy = types_1.AssetHoldersOrderBy.AssetIdAsc) {
-    if (orderBy === types_1.AssetHoldersOrderBy.CreatedAtAsc) {
-        orderBy = types_1.AssetHoldersOrderBy.CreatedBlockIdAsc;
-    }
-    if (orderBy === types_1.AssetHoldersOrderBy.CreatedAtDesc) {
-        orderBy = types_1.AssetHoldersOrderBy.CreatedBlockIdDesc;
-    }
+function assetHoldersQuery(filters, size, start, orderBy) {
+    // the indexer exposes no `createdAt` ordering; both map onto block order
+    const supplied = (0, common_1.toOrderByList)(orderBy).map(key => {
+        if (key === types_1.AssetHoldersOrderBy.CreatedAtAsc) {
+            return types_1.AssetHoldersOrderBy.CreatedBlockIdAsc;
+        }
+        if (key === types_1.AssetHoldersOrderBy.CreatedAtDesc) {
+            return types_1.AssetHoldersOrderBy.CreatedBlockIdDesc;
+        }
+        return key;
+    });
+    // a holding is unique per Asset given the Identity this always filters by
+    const ordering = (0, common_1.orderByClause)(supplied, [types_1.AssetHoldersOrderBy.AssetIdAsc]);
+    // a holding is kept once created, so excluding zero balances has to happen in the query —
+    // filtering client side would leave `totalCount` and the cursor describing the unfiltered set
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
+        amount: { type: 'BigFloat', operator: 'greaterThan' },
+    });
     const query = (0, graphql_tag_1.default) `
-    query AssetHoldersQuery($identityId: String!, $size: Int, $start: Int) {
+    query AssetHoldersQuery
+      ${args}
+     {
       assetHolders(
-        filter: { identityId: { equalTo: $identityId } }
+        ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
+          amount
           asset {
             id
             ticker
@@ -76,20 +90,33 @@ function assetHoldersQuery(filters, size, start, orderBy = types_1.AssetHoldersO
  *
  * Get NFTs held by a DID
  */
-function nftHoldersQuery(filters, size, start, orderBy = types_1.NftHoldersOrderBy.AssetIdAsc) {
-    if (orderBy === types_1.NftHoldersOrderBy.CreatedAtAsc) {
-        orderBy = types_1.NftHoldersOrderBy.CreatedBlockIdAsc;
-    }
-    if (orderBy === types_1.NftHoldersOrderBy.CreatedAtDesc) {
-        orderBy = types_1.NftHoldersOrderBy.CreatedBlockIdDesc;
-    }
+function nftHoldersQuery(filters, size, start, orderBy) {
+    // the indexer exposes no `createdAt` ordering; both map onto block order
+    const supplied = (0, common_1.toOrderByList)(orderBy).map(key => {
+        if (key === types_1.NftHoldersOrderBy.CreatedAtAsc) {
+            return types_1.NftHoldersOrderBy.CreatedBlockIdAsc;
+        }
+        if (key === types_1.NftHoldersOrderBy.CreatedAtDesc) {
+            return types_1.NftHoldersOrderBy.CreatedBlockIdDesc;
+        }
+        return key;
+    });
+    // a holding is unique per Asset given the Identity this always filters by
+    const ordering = (0, common_1.orderByClause)(supplied, [types_1.NftHoldersOrderBy.AssetIdAsc]);
+    // a holding is kept once created, so excluding collections the Identity no longer holds any of
+    // has to happen in the query, or `totalCount` and the cursor describe the unfiltered set
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
+        nftIds: { type: 'JSON', operator: 'notEqualTo' },
+    });
     const query = (0, graphql_tag_1.default) `
-    query NftHolderQuery($identityId: String!, $size: Int, $start: Int) {
+    query NftHolderQuery
+      ${args}
+     {
       nftHolders(
-        filter: { identityId: { equalTo: $identityId } }
+        ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
@@ -112,15 +139,19 @@ function nftHoldersQuery(filters, size, start, orderBy = types_1.NftHoldersOrder
  *
  * Get the balance history for an Asset
  */
-function assetTransactionQuery(filters, size, start) {
-    const orderBy = `${types_1.AssetTransactionsOrderBy.CreatedBlockIdAsc}`;
+function assetTransactionQuery(filters, size, start, orderBy) {
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {});
+    // `id` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.AssetTransactionsOrderBy.IdAsc]);
     const query = (0, graphql_tag_1.default) `
-    query AssetTransactionQuery($assetId: String!, $size: Int, $start: Int) {
+    query AssetTransactionQuery
+      ${args}
+     {
       assetTransactions(
-        filter: { assetId: { equalTo: $assetId } }
+        ${filter}
         first: $size
         offset: $start
-        orderBy:  [${orderBy}]
+        orderBy:  [${ordering}]
       ) {
         totalCount
         nodes {
@@ -162,14 +193,16 @@ function assetTransactionQuery(filters, size, start) {
  *
  * Get holders on an NFT Collection
  */
-function nftCollectionHolders(assetId, size, start) {
+function nftCollectionHolders(assetId, size, start, orderBy) {
+    // a holder appears once per collection, which this always filters by
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.NftHoldersOrderBy.IdentityIdDesc]);
     const query = (0, graphql_tag_1.default) `
     query NftCollectionHolders($assetId: String!, $size: Int, $start: Int) {
       nftHolders(
         first: $size
         offset: $start
         filter: { assetId: { equalTo: $assetId }, nftIds: { notEqualTo: [] } }
-        orderBy: IDENTITY_ID_DESC
+        orderBy: [${ordering}]
       ) {
         nodes {
           identityId

package/middleware/queries/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/middleware/queries/assets.ts"],"names":[],"mappings":";;;;;AAsBA,gCAsBC;AAOD,8CAuCC;AAOD,0CAqCC;AAOD,sDAkDC;AAOD,oDA0BC;AA9ND,8DAA8B;AAE9B,wDAA+D;AAC/D,8CAS4B;AAG5B;;;;GAIG;AACH,SAAgB,UAAU,CACxB,SAAiC;IAEjC,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;GAahB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,OAA6C,EAC7C,IAAgB,EAChB,KAAiB,EACjB,OAAO,GAAG,2BAAmB,CAAC,UAAU;IAExC,IAAI,OAAO,KAAK,2BAAmB,CAAC,YAAY,EAAE,CAAC;QACjD,OAAO,GAAG,2BAAmB,CAAC,iBAAiB,CAAC;IAClD,CAAC;IACD,IAAI,OAAO,KAAK,2BAAmB,CAAC,aAAa,EAAE,CAAC;QAClD,OAAO,GAAG,2BAAmB,CAAC,kBAAkB,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;oBAMC,OAAO;;;;;;;;;;;GAWxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCACJ,OAAO,GACP,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CACjC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,OAA2C,EAC3C,IAAgB,EAChB,KAAiB,EACjB,OAAO,GAAG,yBAAiB,CAAC,UAAU;IAEtC,IAAI,OAAO,KAAK,yBAAiB,CAAC,YAAY,EAAE,CAAC;QAC/C,OAAO,GAAG,yBAAiB,CAAC,iBAAiB,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,KAAK,yBAAiB,CAAC,aAAa,EAAE,CAAC;QAChD,OAAO,GAAG,yBAAiB,CAAC,kBAAkB,CAAC;IACjD,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;oBAMC,OAAO;;;;;;;;;;;;GAYxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,OAA+C,EAC/C,IAAgB,EAChB,KAAiB;IAEjB,MAAM,OAAO,GAAG,GAAG,gCAAwB,CAAC,iBAAiB,EAAE,CAAC;IAEhE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;qBAME,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAClC,OAAe,EACf,IAAgB,EAChB,KAAiB;IAEjB,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;GAehB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,KAAE,OAAO,GAAE;KACzD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/middleware/queries/assets.ts"],"names":[],"mappings":"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"}

package/middleware/queries/authorizations.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { Authorization } from '../../middleware/types';
+import { Authorization, AuthorizationsOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 export type AuthorizationArgs = 'fromId' | 'type' | 'status' | 'toId' | 'toKey' | 'expiry';
 /**
@@ -8,5 +8,5 @@ export type AuthorizationArgs = 'fromId' | 'type' | 'status' | 'toId' | 'toKey'
  *
  * Get all authorizations with specified filters
  */
-export declare function authorizationsQuery(filters: QueryArgs<Authorization, AuthorizationArgs>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<Authorization, AuthorizationArgs>>>;
+export declare function authorizationsQuery(filters: QueryArgs<Authorization, AuthorizationArgs>, size?: BigNumber, start?: BigNumber, orderBy?: AuthorizationsOrderBy | AuthorizationsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Authorization, AuthorizationArgs>>>;
 //# sourceMappingURL=authorizations.d.ts.map

package/middleware/queries/authorizations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorizations.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/authorizations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,aAAa,EAAyB,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAwC3F;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC,EACpD,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAoC/E"}
+{"version":3,"file":"authorizations.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/authorizations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAQrC,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAwC3F;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC,EACpD,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,qBAAqB,GAAG,qBAAqB,EAAE,GACxD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAqC/E"}

package/middleware/queries/authorizations.js

@@ -45,9 +45,10 @@ function createAuthorizationFilters(variables) {
  *
  * Get all authorizations with specified filters
  */
-function authorizationsQuery(filters, size, start) {
+function authorizationsQuery(filters, size, start, orderBy) {
     const { args, filter } = createAuthorizationFilters(filters);
-    const orderBy = `${types_1.AuthorizationsOrderBy.CreatedEventIdAsc}`;
+    // `createdEventId` is the composite of block and event index, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.AuthorizationsOrderBy.CreatedEventIdAsc]);
     const query = (0, graphql_tag_1.default) `
     query AuthorizationsQuery
       ${args}
@@ -56,7 +57,7 @@ function authorizationsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {

package/middleware/queries/authorizations.js.map

@@ -1 +1 @@
-{"version":3,"file":"authorizations.js","sourceRoot":"","sources":["../../../src/middleware/queries/authorizations.ts"],"names":[],"mappings":";;;;;AAqDA,kDAwCC;AA3FD,8DAA8B;AAE9B,wDAAsF;AACtF,8CAA0E;AAK1E;;GAEG;AACH,SAAS,0BAA0B,CAAC,SAAsD;IAKxF,MAAM,IAAI,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IACxD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE;QAC7D,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CACjC,OAAoD,EACpD,IAAgB,EAChB,KAAiB;IAEjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAE7D,MAAM,OAAO,GAAG,GAAG,6BAAqB,CAAC,iBAAiB,EAAE,CAAC;IAE7D,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,OAAO;;;;;;;;;;;;;;;;;GAiBxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,EAAE,IAAA,8BAAqB,kCAAM,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,EAAG;KACnF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"authorizations.js","sourceRoot":"","sources":["../../../src/middleware/queries/authorizations.ts"],"names":[],"mappings":";;;;;AAyDA,kDA0CC;AAjGD,8DAA8B;AAE9B,wDAIqC;AACrC,8CAA0E;AAK1E;;GAEG;AACH,SAAS,0BAA0B,CAAC,SAAsD;IAKxF,MAAM,IAAI,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;IACxD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE;QAC7D,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CACjC,OAAoD,EACpD,IAAgB,EAChB,KAAiB,EACjB,OAAyD;IAEzD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAE7D,yEAAyE;IACzE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,6BAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAEnF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;;;GAiBzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,EAAE,IAAA,8BAAqB,kCAAM,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,EAAG;KACnF,CAAC;AACJ,CAAC"}

package/middleware/queries/claims.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { ClaimsOrderBy, ClaimTypeEnum, TrustedClaimIssuer } from '../../middleware/types';
+import { ClaimsOrderBy, ClaimTypeEnum, CustomClaimTypesOrderBy, TrustedClaimIssuer } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 export interface ClaimsQueryFilter {
     dids?: string[] | undefined;
@@ -16,13 +16,13 @@ export interface ClaimsQueryFilter {
  *
  * Get all dids with at least one claim for a given scope and from one of the given trusted claim issuers
  */
-export declare function claimsGroupingQuery(variables: ClaimsQueryFilter, orderBy?: ClaimsOrderBy, groupBy?: string): QueryOptions<PaginatedQueryArgs<ClaimsQueryFilter>>;
+export declare function claimsGroupingQuery(variables: ClaimsQueryFilter, orderBy?: ClaimsOrderBy | ClaimsOrderBy[], groupBy?: string): QueryOptions<PaginatedQueryArgs<ClaimsQueryFilter>>;
 /**
  * @hidden
  *
  * Get all claims that a given target DID has, with a given scope and from one of the given trustedClaimIssuers
  */
-export declare function claimsQuery(filters: ClaimsQueryFilter, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<ClaimsQueryFilter>>;
+export declare function claimsQuery(filters: ClaimsQueryFilter, size?: BigNumber, start?: BigNumber, orderBy?: ClaimsOrderBy | ClaimsOrderBy[]): QueryOptions<PaginatedQueryArgs<ClaimsQueryFilter>>;
 /**
  * @hidden
  *
@@ -50,5 +50,5 @@ export interface CustomClaimTypesQuery {
  *
  * Get registered CustomClaimTypes
  */
-export declare function customClaimTypeQuery(size?: BigNumber, start?: BigNumber, dids?: string[]): QueryOptions<PaginatedQueryArgs<CustomClaimTypesQuery>>;
+export declare function customClaimTypeQuery(size?: BigNumber, start?: BigNumber, dids?: string[], orderBy?: CustomClaimTypesOrderBy | CustomClaimTypesOrderBy[]): QueryOptions<PaginatedQueryArgs<CustomClaimTypesQuery>>;
 //# sourceMappingURL=claims.d.ts.map

package/middleware/queries/claims.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claims.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/claims.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAqD9D,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC3C,UAAU,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC3C;AACD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,iBAAiB,EAC5B,OAAO,gBAA4B,EACnC,OAAO,SAAc,GACpB,YAAY,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAwBrD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,iBAAiB,EAC1B,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CAwCrD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC,GAC7D,YAAY,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,CAyBnE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,YAAY,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAqBvD;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,qBAAqB,GAAG;IACnF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAeA;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AACD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE,MAAM,EAAE,GACd,YAAY,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,CA0BzD"}
+{"version":3,"file":"claims.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/claims.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAQrC,OAAO,EACL,aAAa,EACb,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAqD9D,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAC3C,UAAU,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC3C;AACD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,iBAAiB,EAC5B,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,EACzC,OAAO,SAAc,GACpB,YAAY,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CA0BrD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,iBAAiB,EAC1B,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,GACxC,YAAY,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC,CA6CrD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC,GAC7D,YAAY,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC,CAyBnE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GACjD,YAAY,CAAC,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAqBvD;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,qBAAqB,GAAG;IACnF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAeA;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AACD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,uBAAuB,GAAG,uBAAuB,EAAE,GAC5D,YAAY,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,CAiCzD"}

package/middleware/queries/claims.js

@@ -59,15 +59,16 @@ function createClaimsFilters(variables) {
  *
  * Get all dids with at least one claim for a given scope and from one of the given trusted claim issuers
  */
-function claimsGroupingQuery(variables, orderBy = types_1.ClaimsOrderBy.TargetIdAsc, groupBy = 'TARGET_ID') {
+function claimsGroupingQuery(variables, orderBy, groupBy = 'TARGET_ID') {
     const { args, filter } = createClaimsFilters(variables);
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.ClaimsOrderBy.TargetIdAsc]);
     const query = (0, graphql_tag_1.default) `
     query claimsGroupingQuery
       ${args}
      {
       claims(
         ${filter}
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
         first: $size
         offset: $start
       ) {
@@ -87,16 +88,21 @@ function claimsGroupingQuery(variables, orderBy = types_1.ClaimsOrderBy.TargetId
  *
  * Get all claims that a given target DID has, with a given scope and from one of the given trustedClaimIssuers
  */
-function claimsQuery(filters, size, start) {
+function claimsQuery(filters, size, start, orderBy) {
     const { args, filter } = createClaimsFilters(filters);
-    const orderBy = `${types_1.ClaimsOrderBy.TargetIdAsc}, ${types_1.ClaimsOrderBy.CreatedBlockIdAsc}, ${types_1.ClaimsOrderBy.EventIdxAsc}`;
+    // block and event index together are unique, so this is a total order per target
+    const ordering = (0, common_1.orderByClause)(orderBy, [
+        types_1.ClaimsOrderBy.TargetIdAsc,
+        types_1.ClaimsOrderBy.CreatedBlockIdAsc,
+        types_1.ClaimsOrderBy.EventIdxAsc,
+    ]);
     const query = (0, graphql_tag_1.default) `
     query ClaimsQuery
       ${args}
       {
         claims(
           ${filter}
-          orderBy: [${orderBy}]
+          orderBy: [${ordering}]
           first: $size
           offset: $start
         ) {
@@ -197,8 +203,13 @@ function createCustomClaimTypeQueryFilters(variables) {
  *
  * Get registered CustomClaimTypes
  */
-function customClaimTypeQuery(size, start, dids) {
+function customClaimTypeQuery(size, start, dids, orderBy) {
     const { args, filter } = createCustomClaimTypeQueryFilters(Object.assign({}, (dids && { dids })));
+    // a custom claim type's `id` is the chain's numeric id, unpadded, so it serves only as a tiebreaker
+    const ordering = (0, common_1.orderByClause)(orderBy, [
+        types_1.CustomClaimTypesOrderBy.CreatedBlockIdAsc,
+        types_1.CustomClaimTypesOrderBy.IdAsc,
+    ]);
     const query = (0, graphql_tag_1.default) `
   query CustomClaimTypesQuery
     ${args}
@@ -207,6 +218,7 @@ function customClaimTypeQuery(size, start, dids) {
         ${filter}
         first: $size
         offset: $start
+        orderBy: [${ordering}]
       ){
         nodes {
           id

package/middleware/queries/claims.js.map

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

package/middleware/queries/common.d.ts

@@ -32,10 +32,50 @@ export declare function latestSqVersionQuery(): QueryOptions;
  *
  * @hidden
  */
-export declare function createArgsAndFilters(filters: Record<string, unknown>, typeMap: Record<string, string>): {
+/**
+ * @hidden
+ *
+ * How a filter attribute is turned into a GQL variable and comparison
+ */
+export interface FilterSpec {
+    /**
+     * GQL type of the variable. Defaults to `String`
+     */
+    type?: string;
+    /**
+     * GQL comparison to apply. Defaults to `equalTo`
+     */
+    operator?: string;
+}
+/**
+ * @hidden
+ *
+ * Build the GQL argument list and `filter:` block for the attributes actually supplied
+ */
+export declare function createArgsAndFilters(filters: Record<string, unknown>, typeMap: Record<string, string | FilterSpec>): {
     args: string;
     filter: string;
 };
+/**
+ * @hidden
+ *
+ * Read an ordering the caller may have given as one key or as several
+ */
+export declare function toOrderByList<Key>(orderBy?: Key | Key[]): Key[];
+/**
+ * @hidden
+ *
+ * Build a paginated query's `orderBy` list from the ordering the caller supplied.
+ *
+ * What a caller asks for comes first, and the query's own ordering follows it, rather than being
+ * replaced by it: `first`/`offset` paging over an order that does not decide every row repeats and
+ * skips rows, so the keys that make the order unique are appended, except where the caller already
+ * orders by that column and has said which direction they want it in
+ *
+ * @param orderBy - ordering the caller supplied, if any
+ * @param tiebreaker - the keys that make this query's order unique, which are also its default
+ */
+export declare function orderByClause<Key extends string>(orderBy: Key | Key[] | undefined, tiebreaker: Key[]): string;
 /**
  * Create args and filters to be supplied to GQL query
  *

package/middleware/queries/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAMrC;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,YAAY,CAc/C;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,YAAY,CAc7C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,YAAY,CAqB5C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,YAAY,CAenD;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAgBA;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAKjC;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,GACnD,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAE3C"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAMrC;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,YAAY,CAc/C;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,YAAY,CAc7C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,YAAY,CAqB5C;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,YAAY,CAenD;AAED;;;;;;;GAOG;AACH;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,GAC3C;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAyBA;AAWD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAM/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,GAAG,SAAS,MAAM,EAC9C,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,GAAG,EAAE,GAChB,MAAM,CAOR;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAKjC;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,GACnD,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAE3C"}

package/middleware/queries/common.js

@@ -8,6 +8,8 @@ exports.heartbeatQuery = heartbeatQuery;
 exports.metadataQuery = metadataQuery;
 exports.latestSqVersionQuery = latestSqVersionQuery;
 exports.createArgsAndFilters = createArgsAndFilters;
+exports.toOrderByList = toOrderByList;
+exports.orderByClause = orderByClause;
 exports.getSizeAndOffset = getSizeAndOffset;
 exports.removeUndefinedValues = removeUndefinedValues;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
@@ -98,29 +100,69 @@ function latestSqVersionQuery() {
     };
 }
 /**
- * Create args and filters to be supplied to GQL query
- *
- * @param filters - filters to be applied
- * @param typeMap - Map defining the types corresponding to each attribute. All missing attributes whose types are not defined are considered to be `String`
- *
  * @hidden
+ *
+ * Build the GQL argument list and `filter:` block for the attributes actually supplied
  */
 function createArgsAndFilters(filters, typeMap) {
     const args = ['$start: Int', '$size: Int'];
     const gqlFilters = [];
     Object.keys(filters).forEach(attribute => {
         var _a;
-        if (filters[attribute]) {
-            const type = (_a = typeMap[attribute]) !== null && _a !== void 0 ? _a : 'String';
-            args.push(`$${attribute}: ${type}!`);
-            gqlFilters.push(`${attribute}: { equalTo: $${attribute} }`);
+        /*
+         * a supplied value is filtered on even when it is falsy: `success: 0` means "only the failed
+         * ones", and dropping it returned everything instead
+         */
+        if (filters[attribute] === undefined || filters[attribute] === null) {
+            return;
         }
+        const spec = (_a = typeMap[attribute]) !== null && _a !== void 0 ? _a : {};
+        const { type = 'String', operator = 'equalTo' } = typeof spec === 'string' ? { type: spec } : spec;
+        args.push(`$${attribute}: ${type}!`);
+        gqlFilters.push(`${attribute}: { ${operator}: $${attribute} }`);
     });
     return {
         args: `(${args.join()})`,
         filter: gqlFilters.length ? `filter: { ${gqlFilters.join()} }` : '',
     };
 }
+/**
+ * @hidden
+ *
+ * The column an ordering key names, without its direction
+ */
+function orderByColumn(key) {
+    return key.replace(/_(ASC|DESC)$/, '');
+}
+/**
+ * @hidden
+ *
+ * Read an ordering the caller may have given as one key or as several
+ */
+function toOrderByList(orderBy) {
+    if (orderBy === undefined) {
+        return [];
+    }
+    return Array.isArray(orderBy) ? orderBy : [orderBy];
+}
+/**
+ * @hidden
+ *
+ * Build a paginated query's `orderBy` list from the ordering the caller supplied.
+ *
+ * What a caller asks for comes first, and the query's own ordering follows it, rather than being
+ * replaced by it: `first`/`offset` paging over an order that does not decide every row repeats and
+ * skips rows, so the keys that make the order unique are appended, except where the caller already
+ * orders by that column and has said which direction they want it in
+ *
+ * @param orderBy - ordering the caller supplied, if any
+ * @param tiebreaker - the keys that make this query's order unique, which are also its default
+ */
+function orderByClause(orderBy, tiebreaker) {
+    const supplied = toOrderByList(orderBy);
+    const orderedColumns = new Set(supplied.map(orderByColumn));
+    return [...supplied, ...tiebreaker.filter(key => !orderedColumns.has(orderByColumn(key)))].join(', ');
+}
 /**
  * Create args and filters to be supplied to GQL query
  *

package/middleware/queries/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/middleware/queries/common.ts"],"names":[],"mappings":";;;;;AAYA,4CAcC;AAOD,wCAcC;AAOD,sCAqBC;AAOD,oDAeC;AAUD,oDAsBC;AAUD,4CAQC;AASD,sDAIC;AA9JD,8DAA8B;AAE9B,8CAA4E;AAC5E,iDAA0D;AAE1D;;;;GAIG;AACH,SAAgB,gBAAgB;IAC9B,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;mCAEgB,qBAAa,CAAC,WAAW;;;;;;GAMzD,CAAC;IAEF,OAAO;QACL,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc;IAC5B,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;GAQhB,CAAC;IAEF,OAAO;QACL,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa;IAC3B,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;GAehB,CAAC;IAEF,OAAO;QACL,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;mCAEgB,+BAAuB,CAAC,MAAM;;;;;;;GAO9D,CAAC;IAEF,OAAO;QACL,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAClC,OAAgC,EAChC,OAA+B;IAK/B,MAAM,IAAI,GAAa,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IACrD,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;;QACvC,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,SAAS,CAAC,mCAAI,QAAQ,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,KAAK,IAAI,GAAG,CAAC,CAAC;YACrC,UAAU,CAAC,IAAI,CAAC,GAAG,SAAS,iBAAiB,SAAS,IAAI,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE;KACpE,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,gBAAgB,CAC9B,IAAgB,EAChB,KAAiB;;IAEjB,OAAO;QACL,IAAI,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,mCAAI,iCAAqB;QAC/C,KAAK,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,mCAAI,CAAC;KAC9B,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,SAAoD;IAEpD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC;AAClG,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/middleware/queries/common.ts"],"names":[],"mappings":"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"}

package/middleware/queries/distributions.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { Distribution, DistributionPayment } from '../../middleware/types';
+import { Distribution, DistributionPayment, DistributionPaymentsOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 /**
  * @hidden
@@ -13,5 +13,5 @@ export declare function distributionQuery(variables: QueryArgs<Distribution, 'as
  *
  * Get history of claims for a distribution
  */
-export declare function distributionPaymentsQuery(filters: QueryArgs<DistributionPayment, 'distributionId'>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<DistributionPayment, 'distributionId'>>>;
+export declare function distributionPaymentsQuery(filters: QueryArgs<DistributionPayment, 'distributionId'>, size?: BigNumber, start?: BigNumber, orderBy?: DistributionPaymentsOrderBy | DistributionPaymentsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<DistributionPayment, 'distributionId'>>>;
 //# sourceMappingURL=distributions.d.ts.map

package/middleware/queries/distributions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distributions.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/distributions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC,GACxD,YAAY,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC,CAe9D;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,EACzD,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CA4BpF"}
+{"version":3,"file":"distributions.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/distributions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,SAAS,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC,GACxD,YAAY,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC,CAe9D;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,EACzD,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,2BAA2B,GAAG,2BAA2B,EAAE,GACpE,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAoCpF"}

package/middleware/queries/distributions.js

@@ -7,6 +7,7 @@ exports.distributionQuery = distributionQuery;
 exports.distributionPaymentsQuery = distributionPaymentsQuery;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 const common_1 = require("../../middleware/queries/common");
+const types_1 = require("../../middleware/types");
 /**
  * @hidden
  *
@@ -32,13 +33,19 @@ function distributionQuery(variables) {
  *
  * Get history of claims for a distribution
  */
-function distributionPaymentsQuery(filters, size, start) {
+function distributionPaymentsQuery(filters, size, start, orderBy) {
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {});
+    // `id` is `<block>/<event index>`, zero padded: chronological, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.DistributionPaymentsOrderBy.IdAsc]);
     const query = (0, graphql_tag_1.default) `
-    query DistributionPaymentQuery($distributionId: String!, $size: Int, $start: Int) {
+    query DistributionPaymentQuery
+      ${args}
+     {
       distributionPayments(
-        filter: { distributionId: { equalTo: $distributionId } }
+        ${filter}
         first: $size
         offset: $start
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {

package/middleware/queries/distributions.js.map

@@ -1 +1 @@
-{"version":3,"file":"distributions.js","sourceRoot":"","sources":["../../../src/middleware/queries/distributions.ts"],"names":[],"mappings":";;;;;AAaA,8CAiBC;AAOD,8DAgCC;AAnED,8DAA8B;AAE9B,wDAA+D;AAI/D;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,SAAyD;IAEzD,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;GAQhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,OAAyD,EACzD,IAAgB,EAChB,KAAiB;IAEjB,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;GAqBhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"distributions.js","sourceRoot":"","sources":["../../../src/middleware/queries/distributions.ts"],"names":[],"mappings":";;;;;AAaA,8CAiBC;AAOD,8DAyCC;AA5ED,8DAA8B;AAE9B,wDAAoG;AACpG,8CAAoG;AAGpG;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,SAAyD;IAEzD,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;GAQhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,OAAyD,EACzD,IAAgB,EAChB,KAAiB,EACjB,OAAqE;IAErE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE3D,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,mCAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7E,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;;GAgBzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}