@whisk/client 0.0.6 → 0.0.9

package/dist/WhiskClient.d.ts

@@ -1,6 +1,4 @@
 import { AnyVariables, TypedDocumentNode } from '@urql/core';
-import { ResultAsync } from 'neverthrow';
-import { WhiskError } from './errors.js';
 
 interface WhiskClientConfig {
     readonly apiKey: string;
@@ -11,7 +9,7 @@ declare class WhiskClient {
     private readonly urql;
     private readonly debug;
     constructor({ apiKey, url, debug }: WhiskClientConfig);
-    query<TValue, TVariables extends AnyVariables>(document: TypedDocumentNode<TValue, TVariables>, variables: TVariables): ResultAsync<TValue, WhiskError>;
+    query<TValue, TVariables extends AnyVariables>(document: TypedDocumentNode<TValue, TVariables>, variables: TVariables): Promise<TValue>;
 }
 
 export { WhiskClient, type WhiskClientConfig };

package/dist/WhiskClient.js

@@ -3,7 +3,6 @@ import {
   fetchExchange,
   Client as UrqlClient
 } from "@urql/core";
-import { errAsync, okAsync, ResultAsync } from "neverthrow";
 import { WhiskError } from "./errors.js";
 import { scalarsExchange } from "./scalarExchange.js";
 const DEFAULT_WHISK_API_URL = "https://api-v2.whisk.so/graphql";
@@ -22,22 +21,18 @@ class WhiskClient {
     });
     this.debug = debug;
   }
-  query(document, variables) {
-    return ResultAsync.fromPromise(
-      this.urql.query(document, variables),
-      (error) => WhiskError.from(error)
-    ).andThen((result) => {
-      if (result.error?.networkError) {
-        return errAsync(WhiskError.from(result.error.networkError));
-      }
-      if (result.data === void 0) {
-        return errAsync(WhiskError.from("No data returned from query"));
-      }
-      if ((result.error?.graphQLErrors?.length ?? 0) > 0 && this.debug) {
-        console.debug("[Whisk Client] GraphQL errors:", result.error?.graphQLErrors);
-      }
-      return okAsync(result.data);
-    });
+  async query(document, variables) {
+    const result = await this.urql.query(document, variables);
+    if (result.error && !result.data) {
+      throw WhiskError.from(result.error);
+    }
+    if (!result.data) {
+      throw WhiskError.from("No data returned from query");
+    }
+    if (result.error && this.debug) {
+      console.debug("[Whisk Client] GraphQL errors:", result.error);
+    }
+    return result.data;
   }
 }
 export {

package/dist/WhiskClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/WhiskClient.ts"],"sourcesContent":["import {\n  type AnyVariables,\n  cacheExchange,\n  fetchExchange,\n  type TypedDocumentNode,\n  Client as UrqlClient,\n} from \"@urql/core\"\nimport { errAsync, okAsync, ResultAsync } from \"neverthrow\"\nimport { WhiskError } from \"./errors.js\"\nimport { scalarsExchange } from \"./scalarExchange.js\"\n\nconst DEFAULT_WHISK_API_URL = \"https://api-v2.whisk.so/graphql\"\n\nexport interface WhiskClientConfig {\n  readonly apiKey: string\n  readonly url?: string\n  readonly debug?: boolean\n}\n\nexport class WhiskClient {\n  private readonly urql: UrqlClient\n  private readonly debug: boolean\n\n  constructor({ apiKey, url = DEFAULT_WHISK_API_URL, debug = false }: WhiskClientConfig) {\n    this.urql = new UrqlClient({\n      url,\n      exchanges: [scalarsExchange, cacheExchange, fetchExchange],\n      fetchOptions: {\n        headers: {\n          Authorization: `Bearer ${apiKey}`,\n        },\n      },\n    })\n\n    this.debug = debug\n  }\n\n  public query<TValue, TVariables extends AnyVariables>(\n    document: TypedDocumentNode<TValue, TVariables>,\n    variables: TVariables,\n  ): ResultAsync<TValue, WhiskError> {\n    return ResultAsync.fromPromise(this.urql.query(document, variables), (error: unknown) =>\n      WhiskError.from(error),\n    ).andThen((result) => {\n      // Bubbles up any network errors\n      if (result.error?.networkError) {\n        return errAsync(WhiskError.from(result.error.networkError))\n      }\n\n      // Error if we have no data\n      if (result.data === undefined) {\n        return errAsync(WhiskError.from(\"No data returned from query\"))\n      }\n\n      // Log any graphql errors (but don't put into error, since partial is fine)\n      if ((result.error?.graphQLErrors?.length ?? 0) > 0 && this.debug) {\n        console.debug(\"[Whisk Client] GraphQL errors:\", result.error?.graphQLErrors)\n      }\n\n      return okAsync(result.data)\n    })\n  }\n}\n"],"mappings":"AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EAEA,UAAU;AAAA,OACL;AACP,SAAS,UAAU,SAAS,mBAAmB;AAC/C,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAEhC,MAAM,wBAAwB;AAQvB,MAAM,YAAY;AAAA,EACN;AAAA,EACA;AAAA,EAEjB,YAAY,EAAE,QAAQ,MAAM,uBAAuB,QAAQ,MAAM,GAAsB;AACrF,SAAK,OAAO,IAAI,WAAW;AAAA,MACzB;AAAA,MACA,WAAW,CAAC,iBAAiB,eAAe,aAAa;AAAA,MACzD,cAAc;AAAA,QACZ,SAAS;AAAA,UACP,eAAe,UAAU,MAAM;AAAA,QACjC;AAAA,MACF;AAAA,IACF,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA,EAEO,MACL,UACA,WACiC;AACjC,WAAO,YAAY;AAAA,MAAY,KAAK,KAAK,MAAM,UAAU,SAAS;AAAA,MAAG,CAAC,UACpE,WAAW,KAAK,KAAK;AAAA,IACvB,EAAE,QAAQ,CAAC,WAAW;AAEpB,UAAI,OAAO,OAAO,cAAc;AAC9B,eAAO,SAAS,WAAW,KAAK,OAAO,MAAM,YAAY,CAAC;AAAA,MAC5D;AAGA,UAAI,OAAO,SAAS,QAAW;AAC7B,eAAO,SAAS,WAAW,KAAK,6BAA6B,CAAC;AAAA,MAChE;AAGA,WAAK,OAAO,OAAO,eAAe,UAAU,KAAK,KAAK,KAAK,OAAO;AAChE,gBAAQ,MAAM,kCAAkC,OAAO,OAAO,aAAa;AAAA,MAC7E;AAEA,aAAO,QAAQ,OAAO,IAAI;AAAA,IAC5B,CAAC;AAAA,EACH;AACF;","names":[]}
+{"version":3,"sources":["../src/WhiskClient.ts"],"sourcesContent":["import {\n  type AnyVariables,\n  cacheExchange,\n  fetchExchange,\n  type TypedDocumentNode,\n  Client as UrqlClient,\n} from \"@urql/core\"\nimport { WhiskError } from \"./errors.js\"\nimport { scalarsExchange } from \"./scalarExchange.js\"\n\nconst DEFAULT_WHISK_API_URL = \"https://api-v2.whisk.so/graphql\"\n\nexport interface WhiskClientConfig {\n  readonly apiKey: string\n  readonly url?: string\n  readonly debug?: boolean\n}\n\nexport class WhiskClient {\n  private readonly urql: UrqlClient\n  private readonly debug: boolean\n\n  constructor({ apiKey, url = DEFAULT_WHISK_API_URL, debug = false }: WhiskClientConfig) {\n    this.urql = new UrqlClient({\n      url,\n      exchanges: [scalarsExchange, cacheExchange, fetchExchange],\n      fetchOptions: {\n        headers: {\n          Authorization: `Bearer ${apiKey}`,\n        },\n      },\n    })\n\n    this.debug = debug\n  }\n\n  public async query<TValue, TVariables extends AnyVariables>(\n    document: TypedDocumentNode<TValue, TVariables>,\n    variables: TVariables,\n  ): Promise<TValue> {\n    const result = await this.urql.query(document, variables)\n\n    // Bubbles up any network errors\n    if (result.error && !result.data) {\n      throw WhiskError.from(result.error)\n    }\n\n    // Error if we have no data\n    if (!result.data) {\n      throw WhiskError.from(\"No data returned from query\")\n    }\n\n    // Log any graphql errors (but don't put into error, since partial is fine)\n    if (result.error && this.debug) {\n      console.debug(\"[Whisk Client] GraphQL errors:\", result.error)\n    }\n\n    return result.data\n  }\n}\n"],"mappings":"AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EAEA,UAAU;AAAA,OACL;AACP,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAEhC,MAAM,wBAAwB;AAQvB,MAAM,YAAY;AAAA,EACN;AAAA,EACA;AAAA,EAEjB,YAAY,EAAE,QAAQ,MAAM,uBAAuB,QAAQ,MAAM,GAAsB;AACrF,SAAK,OAAO,IAAI,WAAW;AAAA,MACzB;AAAA,MACA,WAAW,CAAC,iBAAiB,eAAe,aAAa;AAAA,MACzD,cAAc;AAAA,QACZ,SAAS;AAAA,UACP,eAAe,UAAU,MAAM;AAAA,QACjC;AAAA,MACF;AAAA,IACF,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,MAAa,MACX,UACA,WACiB;AACjB,UAAM,SAAS,MAAM,KAAK,KAAK,MAAM,UAAU,SAAS;AAGxD,QAAI,OAAO,SAAS,CAAC,OAAO,MAAM;AAChC,YAAM,WAAW,KAAK,OAAO,KAAK;AAAA,IACpC;AAGA,QAAI,CAAC,OAAO,MAAM;AAChB,YAAM,WAAW,KAAK,6BAA6B;AAAA,IACrD;AAGA,QAAI,OAAO,SAAS,KAAK,OAAO;AAC9B,cAAQ,MAAM,kCAAkC,OAAO,KAAK;AAAA,IAC9D;AAEA,WAAO,OAAO;AAAA,EAChB;AACF;","names":[]}

package/dist/index.d.ts

@@ -1,8 +1,3 @@
-export { GetVaultSummariesResult, GetVaultSummariesVariables, getVaultSummaries, vaultSummaryQuery } from './actions/getVaultSummaries.js';
-export { WhiskActionFn } from './types.js';
+export { WhiskError } from './errors.js';
 export { WhiskClient, WhiskClientConfig } from './WhiskClient.js';
-import 'gql.tada';
-import '@whisk/graphql';
-import 'neverthrow';
-import './errors.js';
 import '@urql/core';

package/dist/index.js

@@ -1,4 +1,3 @@
-export * from "./actions/getVaultSummaries.js";
-export * from "./types.js";
+export * from "./errors.js";
 export * from "./WhiskClient.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from \"./actions/getVaultSummaries.js\"\nexport * from \"./types.js\"\nexport * from \"./WhiskClient.js\"\n"],"mappings":"AAAA,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from \"./errors.js\"\nexport * from \"./WhiskClient.js\"\n"],"mappings":"AAAA,cAAc;AACd,cAAc;","names":[]}

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@whisk/client",
-  "version": "0.0.6",
+  "version": "0.0.9",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/office-supply-ventures/whisk-sdk.git",
+    "directory": "packages/client"
+  },
   "type": "module",
   "main": "./dist/index.js",
   "license": "MIT",
@@ -19,11 +24,10 @@
     }
   },
   "dependencies": {
-    "@atmina/urql-custom-scalars-exchange": "^1.2.0",
-    "@urql/core": "^6.0.1",
+    "@atmina/urql-custom-scalars-exchange": "1.2.0",
+    "@urql/core": "6.0.1",
     "gql.tada": "1.9.0",
-    "neverthrow": "^8.2.0",
-    "@whisk/graphql": "0.0.6"
+    "@whisk/graphql": "0.0.9"
   },
   "peerDependencies": {
     "graphql": ">=16"

package/src/WhiskClient.ts

@@ -5,7 +5,6 @@ import {
   type TypedDocumentNode,
   Client as UrqlClient,
 } from "@urql/core"
-import { errAsync, okAsync, ResultAsync } from "neverthrow"
 import { WhiskError } from "./errors.js"
 import { scalarsExchange } from "./scalarExchange.js"
 
@@ -35,29 +34,27 @@ export class WhiskClient {
     this.debug = debug
   }
 
-  public query<TValue, TVariables extends AnyVariables>(
+  public async query<TValue, TVariables extends AnyVariables>(
     document: TypedDocumentNode<TValue, TVariables>,
     variables: TVariables,
-  ): ResultAsync<TValue, WhiskError> {
-    return ResultAsync.fromPromise(this.urql.query(document, variables), (error: unknown) =>
-      WhiskError.from(error),
-    ).andThen((result) => {
-      // Bubbles up any network errors
-      if (result.error?.networkError) {
-        return errAsync(WhiskError.from(result.error.networkError))
-      }
-
-      // Error if we have no data
-      if (result.data === undefined) {
-        return errAsync(WhiskError.from("No data returned from query"))
-      }
-
-      // Log any graphql errors (but don't put into error, since partial is fine)
-      if ((result.error?.graphQLErrors?.length ?? 0) > 0 && this.debug) {
-        console.debug("[Whisk Client] GraphQL errors:", result.error?.graphQLErrors)
-      }
-
-      return okAsync(result.data)
-    })
+  ): Promise<TValue> {
+    const result = await this.urql.query(document, variables)
+
+    // Bubbles up any network errors
+    if (result.error && !result.data) {
+      throw WhiskError.from(result.error)
+    }
+
+    // Error if we have no data
+    if (!result.data) {
+      throw WhiskError.from("No data returned from query")
+    }
+
+    // Log any graphql errors (but don't put into error, since partial is fine)
+    if (result.error && this.debug) {
+      console.debug("[Whisk Client] GraphQL errors:", result.error)
+    }
+
+    return result.data
   }
 }

package/src/index.ts

@@ -1,3 +1,2 @@
-export * from "./actions/getVaultSummaries.js"
-export * from "./types.js"
+export * from "./errors.js"
 export * from "./WhiskClient.js"

package/dist/actions/fragments/vault.d.ts

@@ -1,19 +0,0 @@
-import * as gql_tada from 'gql.tada';
-import { FragmentOf } from '@whisk/graphql';
-
-declare const vaultSummaryFragment: gql_tada.TadaDocumentNode<{
-    chain: {
-        id: number;
-    };
-    vaultAddress: `0x${string}`;
-    totalSupplied: {
-        raw: bigint;
-    };
-}, {}, {
-    fragment: "VaultSummaryFragment";
-    on: "MorphoVault";
-    masked: false;
-}>;
-type VaultSummary = FragmentOf<typeof vaultSummaryFragment>;
-
-export { type VaultSummary, vaultSummaryFragment };

package/dist/actions/fragments/vault.js

@@ -1,16 +0,0 @@
-import { graphql } from "@whisk/graphql";
-const vaultSummaryFragment = graphql(`
-  fragment VaultSummaryFragment on MorphoVault {
-    chain {
-      id
-    }
-    vaultAddress
-    totalSupplied {
-      raw
-    }
-  }
-`);
-export {
-  vaultSummaryFragment
-};
-//# sourceMappingURL=vault.js.map

package/dist/actions/fragments/vault.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/actions/fragments/vault.ts"],"sourcesContent":["import { type FragmentOf, graphql } from \"@whisk/graphql\"\n\nexport const vaultSummaryFragment = graphql(`\n  fragment VaultSummaryFragment on MorphoVault {\n    chain {\n      id\n    }\n    vaultAddress\n    totalSupplied {\n      raw\n    }\n  }\n`)\n\nexport type VaultSummary = FragmentOf<typeof vaultSummaryFragment>\n"],"mappings":"AAAA,SAA0B,eAAe;AAElC,MAAM,uBAAuB,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,CAU3C;","names":[]}

package/dist/actions/getVaultSummaries.d.ts

@@ -1,29 +0,0 @@
-import * as gql_tada from 'gql.tada';
-import { VariablesOf } from 'gql.tada';
-import { ResultOf } from '@whisk/graphql';
-import { WhiskActionFn } from '../types.js';
-import '../WhiskClient.js';
-import 'neverthrow';
-import '../errors.js';
-import '@urql/core';
-
-declare const vaultSummaryQuery: gql_tada.TadaDocumentNode<{
-    morphoVaults: {
-        items: ({
-            chain: {
-                id: number;
-            };
-            vaultAddress: `0x${string}`;
-            totalSupplied: {
-                raw: bigint;
-            };
-        } | null)[];
-    };
-}, {
-    limit: number;
-}, void>;
-type GetVaultSummariesVariables = VariablesOf<typeof vaultSummaryQuery>;
-type GetVaultSummariesResult = ResultOf<typeof vaultSummaryQuery>["morphoVaults"]["items"];
-declare const getVaultSummaries: WhiskActionFn<GetVaultSummariesResult, GetVaultSummariesVariables>;
-
-export { type GetVaultSummariesResult, type GetVaultSummariesVariables, getVaultSummaries, vaultSummaryQuery };

package/dist/actions/getVaultSummaries.js

@@ -1,22 +0,0 @@
-import { graphql } from "@whisk/graphql";
-import { vaultSummaryFragment } from "./fragments/vault.js";
-const vaultSummaryQuery = graphql(
-  `
-    query ($limit: Int!) {
-      morphoVaults(limit: $limit) {
-        items {
-          ...VaultSummaryFragment
-        }
-      }
-    }
-  `,
-  [vaultSummaryFragment]
-);
-const getVaultSummaries = (client, variables) => {
-  return client.query(vaultSummaryQuery, variables).map((result) => result.morphoVaults.items);
-};
-export {
-  getVaultSummaries,
-  vaultSummaryQuery
-};
-//# sourceMappingURL=getVaultSummaries.js.map

package/dist/actions/getVaultSummaries.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/actions/getVaultSummaries.ts"],"sourcesContent":["import { graphql, type ResultOf } from \"@whisk/graphql\"\nimport type { VariablesOf } from \"gql.tada\"\nimport type { WhiskActionFn } from \"../types.js\"\nimport { vaultSummaryFragment } from \"./fragments/vault.js\"\n\nexport const vaultSummaryQuery = graphql(\n  `\n    query ($limit: Int!) {\n      morphoVaults(limit: $limit) {\n        items {\n          ...VaultSummaryFragment\n        }\n      }\n    }\n  `,\n  [vaultSummaryFragment],\n)\n\nexport type GetVaultSummariesVariables = VariablesOf<typeof vaultSummaryQuery>\nexport type GetVaultSummariesResult = ResultOf<typeof vaultSummaryQuery>[\"morphoVaults\"][\"items\"]\n\nexport const getVaultSummaries: WhiskActionFn<\n  GetVaultSummariesResult,\n  GetVaultSummariesVariables\n> = (client, variables) => {\n  return client.query(vaultSummaryQuery, variables).map((result) => result.morphoVaults.items)\n}\n"],"mappings":"AAAA,SAAS,eAA8B;AAGvC,SAAS,4BAA4B;AAE9B,MAAM,oBAAoB;AAAA,EAC/B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,CAAC,oBAAoB;AACvB;AAKO,MAAM,oBAGT,CAAC,QAAQ,cAAc;AACzB,SAAO,OAAO,MAAM,mBAAmB,SAAS,EAAE,IAAI,CAAC,WAAW,OAAO,aAAa,KAAK;AAC7F;","names":[]}

package/dist/types.d.ts

@@ -1,8 +0,0 @@
-import { ResultAsync } from 'neverthrow';
-import { WhiskError } from './errors.js';
-import { WhiskClient } from './WhiskClient.js';
-import '@urql/core';
-
-type WhiskActionFn<TData, TVariables = void> = (client: WhiskClient, variables: TVariables) => ResultAsync<TData, WhiskError>;
-
-export type { WhiskActionFn };

package/dist/types.js

@@ -1 +0,0 @@
-//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/src/actions/fragments/vault.ts

@@ -1,15 +0,0 @@
-import { type FragmentOf, graphql } from "@whisk/graphql"
-
-export const vaultSummaryFragment = graphql(`
-  fragment VaultSummaryFragment on MorphoVault {
-    chain {
-      id
-    }
-    vaultAddress
-    totalSupplied {
-      raw
-    }
-  }
-`)
-
-export type VaultSummary = FragmentOf<typeof vaultSummaryFragment>

package/src/actions/getVaultSummaries.ts

@@ -1,27 +0,0 @@
-import { graphql, type ResultOf } from "@whisk/graphql"
-import type { VariablesOf } from "gql.tada"
-import type { WhiskActionFn } from "../types.js"
-import { vaultSummaryFragment } from "./fragments/vault.js"
-
-export const vaultSummaryQuery = graphql(
-  `
-    query ($limit: Int!) {
-      morphoVaults(limit: $limit) {
-        items {
-          ...VaultSummaryFragment
-        }
-      }
-    }
-  `,
-  [vaultSummaryFragment],
-)
-
-export type GetVaultSummariesVariables = VariablesOf<typeof vaultSummaryQuery>
-export type GetVaultSummariesResult = ResultOf<typeof vaultSummaryQuery>["morphoVaults"]["items"]
-
-export const getVaultSummaries: WhiskActionFn<
-  GetVaultSummariesResult,
-  GetVaultSummariesVariables
-> = (client, variables) => {
-  return client.query(vaultSummaryQuery, variables).map((result) => result.morphoVaults.items)
-}

package/src/client.test.ts

@@ -1,16 +0,0 @@
-import { describe, test } from "vitest"
-import { getVaultSummaries, WhiskClient } from "./index.js"
-
-describe("dummy", () => {
-  test("default", async () => {
-    const whiskClient = new WhiskClient({
-      url: "https://staging.api-v2.whisk.so/graphql",
-      apiKey: process.env.WHISK_API_KEY as string,
-    })
-
-    const result = await getVaultSummaries(whiskClient, { limit: 10 })
-    if (result.isOk()) {
-      console.log(result.value.map((r) => r?.totalSupplied))
-    }
-  })
-})

package/src/types.ts

@@ -1,8 +0,0 @@
-import type { ResultAsync } from "neverthrow"
-import type { WhiskError } from "./errors.js"
-import type { WhiskClient } from "./WhiskClient.js"
-
-export type WhiskActionFn<TData, TVariables = void> = (
-  client: WhiskClient,
-  variables: TVariables,
-) => ResultAsync<TData, WhiskError>