@wishknish/knishio-client-js 0.5.2 → 0.6.1

package/src/query/QueryMetaType.js

@@ -45,24 +45,23 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import ResponseMetaType from '../response/ResponseMetaType';
-import { gql } from '@apollo/client/core';
+import Query from './Query'
+import ResponseMetaType from '../response/ResponseMetaType'
+import { gql } from '@urql/core'
 
 /**
  * Query for retrieving Meta Asset information
  */
 export default class QueryMetaType extends Query {
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
-    this.$__query = gql`query( $metaType: String, $metaTypes: [ String! ], $metaId: String, $metaIds: [ String! ], $key: String, $keys: [ String! ], $value: String, $values: [ String! ], $count: String, $latest: Boolean, $filter: [ MetaFilter! ], $latestMetas: Boolean, $queryArgs: QueryArgs, $countBy: String ) {
-      MetaType( metaType: $metaType, metaTypes: $metaTypes, metaId: $metaId, metaIds: $metaIds, key: $key, keys: $keys, value: $value, values: $values, count: $count, filter: $filter, latestMetas: $latestMetas, queryArgs: $queryArgs, countBy: $countBy ) {
+    this.$__query = gql`query( $metaType: String, $metaTypes: [ String! ], $metaId: String, $metaIds: [ String! ], $key: String, $keys: [ String! ], $value: String, $values: [ String! ], $count: String, $latest: Boolean, $filter: [ MetaFilter! ], $queryArgs: QueryArgs, $countBy: String ) {
+      MetaType( metaType: $metaType, metaTypes: $metaTypes, metaId: $metaId, metaIds: $metaIds, key: $key, keys: $keys, value: $value, values: $values, count: $count, filter: $filter, queryArgs: $queryArgs, countBy: $countBy ) {
         metaType,
         instanceCount {
           key,
@@ -85,20 +84,7 @@ export default class QueryMetaType extends Query {
           total
         }
       }
-    }`;
-  }
-
-  /**
-   * Returns a Response object
-   *
-   * @param {object} json
-   * @return {ResponseMetaType}
-   */
-  createResponse ( json ) {
-    return new ResponseMetaType( {
-      query: this,
-      json
-    } );
+    }`
   }
 
   /**
@@ -109,74 +95,76 @@ export default class QueryMetaType extends Query {
    * @param {string|array|null} key
    * @param {string|array|null} value
    * @param {boolean|null} latest
-   * @param {boolean|null} latestMetas
    * @param {object|null} filter
    * @param {object|null} queryArgs
    * @param {string|null} count
    * @param {string|null} countBy
    * @return {{}}
    */
-  static createVariables ( {
+  static createVariables ({
     metaType = null,
     metaId = null,
     key = null,
     value = null,
     latest = null,
-    latestMetas = true,
     filter = null,
     queryArgs = null,
     count = null,
     countBy = null
-  } ) {
-
-    const variables = {};
+  }) {
+    const variables = {}
 
-    if ( metaType ) {
-      variables[ typeof metaType === 'string' ? 'metaType' : 'metaTypes' ] = metaType;
+    if (metaType) {
+      variables[typeof metaType === 'string' ? 'metaType' : 'metaTypes'] = metaType
     }
 
-    if ( metaId ) {
-      variables[ typeof metaId === 'string' ? 'metaId' : 'metaIds' ] = metaId;
+    if (metaId) {
+      variables[typeof metaId === 'string' ? 'metaId' : 'metaIds'] = metaId
     }
 
-    if ( key ) {
-      variables[ typeof key === 'string' ? 'key' : 'keys' ] = key;
+    if (key) {
+      variables[typeof key === 'string' ? 'key' : 'keys'] = key
     }
 
-    if ( value ) {
-      variables[ typeof value === 'string' ? 'value' : 'values' ] = value;
+    if (value) {
+      variables[typeof value === 'string' ? 'value' : 'values'] = value
     }
 
-    if ( latest ) {
-      variables[ 'latest' ] = !!latest;
-    }
+    variables.latest = latest === true
 
-    if ( latestMetas ) {
-      variables[ 'latestMetas' ] = !!latestMetas;
+    if (filter) {
+      variables.filter = filter
     }
 
-    if ( filter ) {
-      variables[ 'filter' ] = filter;
-    }
-
-    if ( queryArgs ) {
-
-      if ( typeof queryArgs.limit === 'undefined' || queryArgs.limit === 0 ) {
-        queryArgs.limit = '*';
+    if (queryArgs) {
+      if (typeof queryArgs.limit === 'undefined' || queryArgs.limit === 0) {
+        queryArgs.limit = '*'
       }
 
-      variables[ 'queryArgs' ] = queryArgs;
+      variables.queryArgs = queryArgs
     }
 
-    if ( count ) {
-      variables[ 'count' ] = count;
+    if (count) {
+      variables.count = count
     }
 
-    if ( countBy ) {
-      variables[ 'countBy' ] = countBy;
+    if (countBy) {
+      variables.countBy = countBy
     }
 
-    return variables;
+    return variables
   }
 
+  /**
+   * Returns a Response object
+   *
+   * @param {object} json
+   * @return {ResponseMetaType}
+   */
+  createResponse (json) {
+    return new ResponseMetaType({
+      query: this,
+      json
+    })
+  }
 }

package/src/query/QueryMetaTypeViaAtom.js

@@ -45,19 +45,17 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import { gql } from '@apollo/client/core';
-import ResponseMetaTypeViaAtom from '../response/ResponseMetaTypeViaAtom';
-
+import Query from './Query'
+import ResponseMetaTypeViaAtom from '../response/ResponseMetaTypeViaAtom'
+import { gql } from '@urql/core'
 
 export default class QueryMetaTypeViaAtom extends Query {
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
     this.$__query = gql`query ($metaTypes: [String!], $metaIds: [String!], $values: [String!], $keys: [String!], $latest: Boolean, $filter: [MetaFilter!], $queryArgs: QueryArgs, $countBy: String, $atomValues: [String!] ) {
       MetaTypeViaAtom(
@@ -91,20 +89,7 @@ export default class QueryMetaTypeViaAtom extends Query {
           total
         }
       }
-    }`;
-  }
-
-  /**
-   * Returns a Response object
-   *
-   * @param {object} json
-   * @return {ResponseMetaTypeViaAtom}
-   */
-  createResponse ( json ) {
-    return new ResponseMetaTypeViaAtom( {
-      query: this,
-      json
-    } );
+    }`
   }
 
   /**
@@ -118,13 +103,12 @@ export default class QueryMetaTypeViaAtom extends Query {
    * @param {array|null} keys
    * @param {array|null} atomValues
    * @param {boolean|null} latest
-   * @param {boolean|null} latestMetas
    * @param {array|null} filter
    * @param {object|null} queryArgs
    * @param {string|null} countBy
    * @return {{}}
    */
-  static createVariables ( {
+  static createVariables ({
     metaType = null,
     metaId = null,
     key = null,
@@ -133,64 +117,72 @@ export default class QueryMetaTypeViaAtom extends Query {
     values = null,
     atomValues = null,
     latest = null,
-    latestMetas = true,
     filter = null,
     queryArgs = null,
     countBy = null
-  } ) {
-    const variables = {};
+  }) {
+    const variables = {}
 
-    if ( atomValues ) {
-      variables[ 'atomValues' ] = atomValues;
+    if (atomValues) {
+      variables.atomValues = atomValues
     }
 
-    if ( keys ) {
-      variables[ 'keys' ] = keys;
+    if (keys) {
+      variables.keys = keys
     }
 
-    if ( values ) {
-      variables[ 'values' ] = values;
+    if (values) {
+      variables.values = values
     }
 
-    if ( metaType ) {
-      variables[ 'metaTypes' ] = typeof metaType === 'string' ? [ metaType ] : metaType;
+    if (metaType) {
+      variables.metaTypes = typeof metaType === 'string' ? [metaType] : metaType
     }
 
-    if ( metaId ) {
-      variables[ 'metaIds' ] = typeof metaId === 'string' ? [ metaId ] : metaId;
+    if (metaId) {
+      variables.metaIds = typeof metaId === 'string' ? [metaId] : metaId
     }
 
-    if ( countBy ) {
-      variables[ 'countBy' ] = countBy;
+    if (countBy) {
+      variables.countBy = countBy
     }
 
-    if ( filter ) {
-      variables[ 'filter' ] = filter;
+    if (filter) {
+      variables.filter = filter
     }
 
-    if ( key && value ) {
-      variables[ 'filter' ] = variables[ 'filter' ] || [];
-      variables[ 'filter' ].push( {
+    if (key && value) {
+      variables.filter = variables.filter || []
+      variables.filter.push({
         key,
         value,
-        'comparison': '='
-      } );
+        comparison: '='
+      })
     }
 
-    if ( latest ) {
-      variables[ 'latest' ] = !!latest;
-      variables[ 'latest' ] = !!latestMetas;
-    }
-
-    if ( queryArgs ) {
+    variables.latest = latest === true
 
-      if ( typeof queryArgs.limit === 'undefined' || queryArgs.limit === 0 ) {
-        queryArgs.limit = '*';
+    if (queryArgs) {
+      if (typeof queryArgs.limit === 'undefined' || queryArgs.limit === 0) {
+        queryArgs.limit = '*'
       }
 
-      variables[ 'queryArgs' ] = queryArgs;
+      variables.queryArgs = queryArgs
     }
 
-    return variables;
+    return variables
+  }
+
+  /**
+   * Returns a Response object
+   *
+   * @param {object} json
+   * @return {ResponseMetaTypeViaAtom}
+   */
+  createResponse (json) {
+    return new ResponseMetaTypeViaAtom({
+      query: this,
+      json
+    })
   }
 }

package/src/query/QueryPolicy.js

@@ -46,18 +46,17 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
 
-import Query from './Query';
-import { gql } from '@apollo/client/core';
-import ResponsePolicy from '../response/ResponsePolicy';
+import Query from './Query'
+import ResponsePolicy from '../response/ResponsePolicy'
+import { gql } from "@urql/core";
 
 export default class QueryPolicy extends Query {
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
     this.$__query = gql`query( $metaType: String, $metaId: String, ) {
       Policy( metaType: $metaType, metaId: $metaId ) {
@@ -70,7 +69,7 @@ export default class QueryPolicy extends Query {
         rule,
         createdAt
       }
-    }`;
+    }`
   }
 
   /**
@@ -79,10 +78,10 @@ export default class QueryPolicy extends Query {
    * @param {object} json
    * @return {ResponsePolicy}
    */
-  createResponse ( json ) {
-    return new ResponsePolicy( {
+  createResponse (json) {
+    return new ResponsePolicy({
       query: this,
       json
-    } );
+    })
   }
 }

package/src/query/QueryToken.js

@@ -45,22 +45,20 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import { gql } from '@apollo/client/core';
-import Response from '../response/Response';
-
+import Query from './Query'
+import Response from '../response/Response'
+import { gql } from '@urql/core'
 
 /**
  * Query for getting the token info
  */
 export default class QueryToken extends Query {
   /**
-   * Class constructor
-   *
-   * @param apolloClient
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( apolloClient ) {
-    super( apolloClient );
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
     this.$__query = gql`query( $slug: String, $slugs: [ String! ], $limit: Int, $order: String ) {
       Token( slug: $slug, slugs: $slugs, limit: $limit, order: $order ) {
@@ -72,7 +70,7 @@ export default class QueryToken extends Query {
         amount,
         icon,
       }
-    }`;
+    }`
   }
 
   /**
@@ -80,11 +78,11 @@ export default class QueryToken extends Query {
    * @param json
    * @returns {Response}
    */
-  createResponse ( json ) {
-    return new Response( {
+  createResponse (json) {
+    return new Response({
       query: this,
       json,
       dataKey: 'data.Token'
-    } );
+    })
   }
 }

package/src/query/QueryUserActivity.js

@@ -45,21 +45,20 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import ResponseQueryUserActivity from '../response/ResponseQueryUserActivity';
-import { gql } from '@apollo/client/core';
+import Query from './Query'
+import ResponseQueryUserActivity from '../response/ResponseQueryUserActivity'
+import { gql } from '@urql/core'
 
 /**
  * Query for retrieving information about user activity
  */
 export default class QueryUserActivity extends Query {
   /**
-   * Class constructor
-   *
-   * @param httpClient
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
    */
-  constructor ( httpClient ) {
-    super( httpClient );
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
     this.$__query = gql`query UserActivity (
       $bundleHash:String,
@@ -134,7 +133,7 @@ export default class QueryUserActivity extends Query {
           }
         }
       }
-    }`;
+    }`
   }
 
   /**
@@ -143,11 +142,10 @@ export default class QueryUserActivity extends Query {
    * @param {object} json
    * @return {ResponseQueryUserActivity}
    */
-  createResponse ( json ) {
-    return new ResponseQueryUserActivity( {
+  createResponse (json) {
+    return new ResponseQueryUserActivity({
       query: this,
       json
-    } );
+    })
   }
-
 }

package/src/query/QueryWalletBundle.js

@@ -45,19 +45,23 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import ResponseWalletBundle from '../response/ResponseWalletBundle';
-import { gql } from '@apollo/client/core';
+import Query from './Query'
+import ResponseWalletBundle from '../response/ResponseWalletBundle'
+import { gql } from '@urql/core'
 
 /**
  * Query for retrieving information about Wallet Bundles
  */
 export default class QueryWalletBundle extends Query {
+  /**
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
+   */
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
-  constructor ( apolloClient ) {
-    super( apolloClient );
-    this.$__query = gql`query( $bundleHash: String, $bundleHashes: [ String! ], $key: String, $keys: [ String! ], $value: String, $values: [ String! ], $keys_values: [ MetaInput ], $latest: Boolean, $limit: Int, $order: String ) {
-      WalletBundle( bundleHash: $bundleHash, bundleHashes: $bundleHashes, key: $key, keys: $keys, value: $value, values: $values, keys_values: $keys_values, latest: $latest, limit: $limit, order: $order ) {
+    this.$__query = gql`query( $bundleHashes: [ String! ] ) {
+      WalletBundle( bundleHashes: $bundleHashes ) {
         bundleHash,
         metas {
           molecularHash,
@@ -68,7 +72,7 @@ export default class QueryWalletBundle extends Query {
         },
         createdAt
       }
-    }`;
+    }`
   }
 
   /**
@@ -77,46 +81,10 @@ export default class QueryWalletBundle extends Query {
    * @param {object} json
    * @return {ResponseWalletBundle}
    */
-  createResponse ( json ) {
-    return new ResponseWalletBundle( {
+  createResponse (json) {
+    return new ResponseWalletBundle({
       query: this,
       json
-    } );
+    })
   }
-
-  /**
-   * Builds a GraphQL-friendly variables object based on input fields
-   *
-   * @param {string|array|null} bundleHash
-   * @param {string|array|null} key
-   * @param {string|array|null} value
-   * @param {boolean|null} latest
-   * @return {{}}
-   */
-  static createVariables ( {
-    bundleHash = null,
-    key = null,
-    value = null,
-    latest = true
-  } ) {
-
-    const variables = {
-      latest: latest
-    };
-
-    if ( bundleHash ) {
-      variables[ typeof bundleHash === 'string' ? 'bundleHash' : 'bundleHashes' ] = bundleHash;
-    }
-
-    if ( key ) {
-      variables[ typeof key === 'string' ? 'key' : 'keys' ] = key;
-    }
-
-    if ( value ) {
-      variables[ typeof value === 'string' ? 'value' : 'values' ] = value;
-    }
-
-    return variables;
-  }
-
 }

package/src/query/QueryWalletList.js

@@ -45,19 +45,23 @@ Please visit https://github.com/WishKnish/KnishIO-Client-JS for information.
 
 License: https://github.com/WishKnish/KnishIO-Client-JS/blob/master/LICENSE
 */
-import Query from './Query';
-import ResponseWalletList from '../response/ResponseWalletList';
-import { gql } from '@apollo/client/core';
+import Query from './Query'
+import ResponseWalletList from '../response/ResponseWalletList'
+import { gql } from '@urql/core'
 
 /**
  * Query for getting a list of Wallets
  */
 export default class QueryWalletList extends Query {
+  /**
+   * @param {UrqlClientWrapper} graphQLClient
+   * @param {KnishIOClient} knishIOClient
+   */
+  constructor (graphQLClient, knishIOClient) {
+    super(graphQLClient, knishIOClient)
 
-  constructor ( apolloClient ) {
-    super( apolloClient );
-    this.$__query = gql`query( $address: String, $bundleHash: String, $token: String, $position: String, $unspent: Boolean ) {
-      Wallet( address: $address, bundleHash: $bundleHash, token: $token, position: $position, unspent: $unspent ) {
+    this.$__query = gql`query( $bundleHash: String, $tokenSlug: String ) {
+      Wallet( bundleHash: $bundleHash, tokenSlug: $tokenSlug ) {
         address,
         bundleHash,
         token {
@@ -66,10 +70,6 @@ export default class QueryWalletList extends Query {
           fungibility,
           supply
         },
-        molecules {
-          molecularHash,
-          createdAt
-        }
         tokenSlug,
         batchId,
         position,
@@ -87,7 +87,7 @@ export default class QueryWalletList extends Query {
           amount
         }
       }
-    }`;
+    }`
   }
 
   /**
@@ -96,11 +96,10 @@ export default class QueryWalletList extends Query {
    * @param {object} json
    * @return {ResponseWalletList}
    */
-  createResponse ( json ) {
-    return new ResponseWalletList( {
+  createResponse (json) {
+    return new ResponseWalletList({
       query: this,
       json
-    } );
+    })
   }
-
 }