Merge pull request #17 from Network-Goods/feature/claimtoken-queries

add claimtoken queries and sort claims by creation timestamp

Author: bitbeckers

docs/RELEASE.md

@@ -1,5 +1,10 @@
 # Release notes
 
+## 0.0.13
+
+* Add claimtoken queries
+* Sort queries claim by creation timestamp instead of id
+
 ## 0.0.12
 
 * JSON assertion
@@ -13,6 +18,7 @@
 * Enforce graphclient dependencies
 
 ... [Numbers got lost in testing releasing]
+
 ## 0.0.6
 
 * Added graphql deps to solve publishing blocker

src/.graphclient/index.ts

@@ -848,6 +848,12 @@ const merger = new(BareMerger as any)({
           return printWithCache(ClaimTokensByClaimDocument);
         },
         location: 'ClaimTokensByClaimDocument.graphql'
+      },{
+        document: ClaimTokenByIdDocument,
+        get rawSDL() {
+          return printWithCache(ClaimTokenByIdDocument);
+        },
+        location: 'ClaimTokenByIdDocument.graphql'
       }
     ];
     },
@@ -912,7 +918,10 @@ export type ClaimTokensByOwnerQueryVariables = Exact<{
 }>;
 
 
-export type ClaimTokensByOwnerQuery = { claimTokens: Array<Pick<ClaimToken, 'id' | 'owner' | 'tokenID' | 'units'>> };
+export type ClaimTokensByOwnerQuery = { claimTokens: Array<(
+    Pick<ClaimToken, 'id' | 'owner' | 'tokenID' | 'units'>
+    & { claim: Pick<Claim, 'id' | 'creation' | 'uri' | 'totalUnits'> }
+  )> };
 
 export type ClaimTokensByClaimQueryVariables = Exact<{
   claimId: Scalars['String'];
@@ -921,6 +930,16 @@ export type ClaimTokensByClaimQueryVariables = Exact<{
 
 export type ClaimTokensByClaimQuery = { claimTokens: Array<Pick<ClaimToken, 'id' | 'owner' | 'tokenID' | 'units'>> };
 
+export type ClaimTokenByIdQueryVariables = Exact<{
+  claimTokenId: Scalars['ID'];
+}>;
+
+
+export type ClaimTokenByIdQuery = { claimToken?: Maybe<(
+    Pick<ClaimToken, 'id' | 'owner' | 'tokenID' | 'units'>
+    & { claim: Pick<Claim, 'id' | 'creation' | 'uri' | 'totalUnits'> }
+  )> };
+
 
 export const ClaimsByOwnerDocument = gql`
     query ClaimsByOwner($owner: Bytes = "") {
@@ -937,7 +956,7 @@ export const ClaimsByOwnerDocument = gql`
     ` as unknown as DocumentNode<ClaimsByOwnerQuery, ClaimsByOwnerQueryVariables>;
 export const RecentClaimsDocument = gql`
     query RecentClaims($first: Int = 10) {
-  claims(orderDirection: desc, orderBy: id, first: $first) {
+  claims(orderDirection: desc, orderBy: creation, first: $first) {
     contract
     tokenID
     creator
@@ -963,11 +982,17 @@ export const ClaimByIdDocument = gql`
     ` as unknown as DocumentNode<ClaimByIdQuery, ClaimByIdQueryVariables>;
 export const ClaimTokensByOwnerDocument = gql`
     query ClaimTokensByOwner($owner: Bytes = "") {
-  claimTokens(where: {owner: $owner}) {
+  claimTokens(where: {owner: $owner}, first: 30) {
     id
     owner
     tokenID
     units
+    claim {
+      id
+      creation
+      uri
+      totalUnits
+    }
   }
 }
     ` as unknown as DocumentNode<ClaimTokensByOwnerQuery, ClaimTokensByOwnerQueryVariables>;
@@ -981,6 +1006,23 @@ export const ClaimTokensByClaimDocument = gql`
   }
 }
     ` as unknown as DocumentNode<ClaimTokensByClaimQuery, ClaimTokensByClaimQueryVariables>;
+export const ClaimTokenByIdDocument = gql`
+    query ClaimTokenById($claimTokenId: ID!) {
+  claimToken(id: $claimTokenId) {
+    id
+    owner
+    tokenID
+    units
+    claim {
+      id
+      creation
+      uri
+      totalUnits
+    }
+  }
+}
+    ` as unknown as DocumentNode<ClaimTokenByIdQuery, ClaimTokenByIdQueryVariables>;
+
 
 
 
@@ -1004,6 +1046,9 @@ export function getSdk<C, E>(requester: Requester<C, E>) {
     },
     ClaimTokensByClaim(variables: ClaimTokensByClaimQueryVariables, options?: C): Promise<ClaimTokensByClaimQuery> {
       return requester<ClaimTokensByClaimQuery, ClaimTokensByClaimQueryVariables>(ClaimTokensByClaimDocument, variables, options) as Promise<ClaimTokensByClaimQuery>;
+    },
+    ClaimTokenById(variables: ClaimTokenByIdQueryVariables, options?: C): Promise<ClaimTokenByIdQuery> {
+      return requester<ClaimTokenByIdQuery, ClaimTokenByIdQueryVariables>(ClaimTokenByIdDocument, variables, options) as Promise<ClaimTokenByIdQuery>;
     }
   };
 }

src/fractions.ts

@@ -5,3 +5,5 @@ const sdk = getBuiltGraphSDK();
 export const fractionsByOwner = async (owner: string) => sdk.ClaimTokensByOwner({ owner });
 
 export const fractionsByClaim = async (claimId: string) => sdk.ClaimTokensByClaim({ claimId });
+
+export const fractionById = async (fractionId: string) => sdk.ClaimTokenById({ claimTokenId: fractionId });

src/index.ts

@@ -7,9 +7,9 @@ export { validateMetaData, validateClaimData, storeMetadata, storeData, getMetad
 // Graph
 import { execute } from "./.graphclient/index.js";
 import { claimsByOwner, claimById, firstClaims } from "./claims.js";
-import { fractionsByOwner, fractionsByClaim } from "./fractions.js";
+import { fractionsByOwner, fractionsByClaim, fractionById } from "./fractions.js";
 
-export { execute, claimsByOwner, claimById, firstClaims, fractionsByOwner, fractionsByClaim };
+export { execute, claimsByOwner, claimById, firstClaims, fractionsByOwner, fractionsByClaim, fractionById };
 
 // Protocol
 import * as protocol from "@network-goods/hypercerts-protocol";

src/queries/claims.graphql

@@ -1,35 +1,35 @@
 query ClaimsByOwner($owner: Bytes = "") {
-  claims(where: { owner: $owner }) {
-    contract
-    tokenID
-    creator
-    id
-    owner
-    totalUnits
-    uri
-  }
+    claims(where: { owner: $owner }) {
+        contract
+        tokenID
+        creator
+        id
+        owner
+        totalUnits
+        uri
+    }
 }
 
 query RecentClaims($first: Int = 10) {
-  claims(orderDirection: desc, orderBy: id, first: $first) {
-    contract
-    tokenID
-    creator
-    id
-    owner
-    totalUnits
-    uri
-  }
+    claims(orderDirection: desc, orderBy: creation, first: $first) {
+        contract
+        tokenID
+        creator
+        id
+        owner
+        totalUnits
+        uri
+    }
 }
 
 query ClaimById($id: ID!) {
-  claim(id: $id) {
-    contract
-    tokenID
-    creator
-    id
-    owner
-    totalUnits
-    uri
-  }
+    claim(id: $id) {
+        contract
+        tokenID
+        creator
+        id
+        owner
+        totalUnits
+        uri
+    }
 }

src/queries/fractions.graphql

@@ -1,9 +1,15 @@
 query ClaimTokensByOwner($owner: Bytes = "") {
-    claimTokens(where: {owner: $owner}) {
+    claimTokens(where: {owner: $owner}, first: 30) {
         id
         owner
         tokenID
         units
+        claim {
+            id
+            creation
+            uri
+            totalUnits
+        }
     }
 }
 
@@ -15,3 +21,18 @@ query ClaimTokensByClaim($claimId: String!) {
         units
     }
 }
+
+query ClaimTokenById($claimTokenId: ID!) {
+    claimToken(id: $claimTokenId) {
+        id
+        owner
+        tokenID
+        units
+        claim {
+            id
+            creation
+            uri
+            totalUnits
+        }
+    }
+}