feat(indexer-nibi 99% coverage): coverage

.github/workflows/test-ts-sdk.yaml

@@ -9,7 +9,7 @@ on:
     paths: ["**.js", "**.ts", "**.tsx", "**.json"]
 
 jobs:
-  test-nibijs:
+  test-ts-sdk:
     runs-on: ubuntu-latest
     env:
       CHAIN_HOST: ${{ secrets.CHAIN_HOST }}

README.md

@@ -65,7 +65,7 @@ The entrypoint for `nibijs` is the `Sdk` object, which is meant to mimic the roo
 ```js
 import { newRandomWallet, WalletHD } from "@nibiruchain/nibijs"
 
-const wallet: WalletHD = await newRandomWallet()
+const wallet = await newRandomWallet()
 const [{ address }] = await wallet.getAccounts()
 
 // Save the mnemonic somewhere to re-use the account

examples/01_new-wallet-and-faucet.ts

@@ -1,14 +1,13 @@
 import {
   useFaucet,
-  WalletHD,
   newRandomWallet,
   IncentivizedTestnet,
 } from "@nibiruchain/nibijs"
 
 const TEST_CHAIN = IncentivizedTestnet(2)
 
 async function runExample() {
-  const wallet: WalletHD = await newRandomWallet()
+  const wallet = await newRandomWallet()
   const [{ address }] = await wallet.getAccounts()
 
   // Save the mnemonic somewhere to re-use the account

jest.config.js

@@ -30,6 +30,8 @@ module.exports = function (root = __dirname) {
       "packages/nibijs/src/**/*.{js,jsx,ts,tsx}",
       "!**/node_modules/**",
       "!**/dist/**",
+      "!**/index.ts",
+      "!**/nibijs/src/test/helpers.ts",
     ],
 
     // The directory where Jest should output its coverage files
@@ -45,10 +47,10 @@ module.exports = function (root = __dirname) {
     // An object that configures minimum threshold enforcement for coverage results
     coverageThreshold: {
       global: {
-        branches: 50,
-        functions: 50,
-        lines: 50,
-        statements: 50,
+        branches: 75,
+        functions: 75,
+        lines: 75,
+        statements: 75,
       },
     },
 

package.json

@@ -18,7 +18,7 @@
     "clean": "lerna run --parallel clean",
     "commit": "cz",
     "publish:all": "lerna publish from-package",
-    "test": "jest --verbose",
+    "test": "jest --verbose --detectOpenHandles",
     "lint": "eslint -c './.eslintrc.js' './packages/**/*.{ts,js}'",
     "lint:ci": "yarn lint . --format junit",
     "lint:md": "markdownlint --ignore node_modules --ignore .git",

packages/indexer-nibi/src/graphql-codegen/codegen.ts → packages/indexer-nibi/codegen.ts

@@ -1,6 +1,6 @@
 import type { CodegenConfig } from "@graphql-codegen/cli"
 
-const config: CodegenConfig = {
+export default {
   schema: {
     "indexer-nibi": {
       loader: "./src/graphql-codegen/codegen-loader.js",
@@ -26,6 +26,4 @@ const config: CodegenConfig = {
       },
     },
   },
-}
-
-export default config
+} as CodegenConfig

packages/indexer-nibi/package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "build": "tsc --build",
     "build:watch": "tsc --build --watch",
-    "gql-generate": "rm -rf src/gql && graphql-code-generator --config ./src/graphql-codegen/codegen.ts",
+    "gql-generate": "rm -rf src/gql && graphql-code-generator --config codegen.ts",
     "clean": "tsc --clean",
     "test": "jest",
     "test:watch": "jest --watch",

packages/indexer-nibi/src/batchHandlers/queryBatchHandler.test.ts

@@ -0,0 +1,43 @@
+import { queryBatchHandler } from "./queryBatchHandler"
+import { communityPoolQueryString } from "../query/communityPool"
+import { delegationsQueryString } from "../query"
+
+const checkFields = (objects: any[], fields: any[]) => {
+  objects.forEach((obj: any) => {
+    fields.forEach((field: string | any[]) => {
+      expect(obj).toHaveProperty(field)
+    })
+  })
+}
+
+describe("queryBatchHandler tests", () => {
+  test("queryBatchHandler", async () => {
+    const resp = await queryBatchHandler(
+      [
+        communityPoolQueryString({}, true),
+        delegationsQueryString(
+          {
+            limit: 1,
+          },
+          true
+        ),
+      ],
+      "https://hm-graphql.itn-3.nibiru.fi/query"
+    )
+
+    expect(resp).toHaveProperty("communityPool")
+    expect(resp).toHaveProperty("delegations")
+
+    if (resp.communityPool?.length) {
+      const [communityPool] = resp.communityPool
+      const communityPoolFields = ["amount", "denom"]
+      checkFields([communityPool], communityPoolFields)
+    }
+
+    if (resp.delegations?.length) {
+      const [delegation] = resp.delegations
+      const delegationFields = ["amount", "delegator", "validator"]
+      checkFields([delegation], delegationFields)
+    }
+  })
+})

packages/indexer-nibi/src/gql.ts

@@ -66,44 +66,17 @@ export const gqlQuery = <T>(
   properties: string,
   excludeParentObject?: boolean
 ) => {
-  let queryArgList = []
-
-  if (
-    typedQueryArgs.where !== undefined ||
-    typedQueryArgs.limit !== undefined ||
-    typedQueryArgs.order_by !== undefined ||
-    typedQueryArgs.order_desc !== undefined ||
-    typedQueryArgs.order !== undefined ||
-    typedQueryArgs.orderDesc !== undefined
-  ) {
-    if (typedQueryArgs.where !== undefined) {
-      queryArgList.push(getWhereArgArr(typedQueryArgs.where))
-    }
-
-    if (typedQueryArgs.limit !== undefined) {
-      queryArgList.push(arg("limit", typedQueryArgs.limit))
-    }
+  const queryArgList = []
 
-    if (typedQueryArgs.order_by !== undefined) {
-      queryArgList.push(arg("order_by", typedQueryArgs.order_by, true))
-    }
-
-    if (typedQueryArgs.order !== undefined) {
-      queryArgList.push(arg("order", typedQueryArgs.order, true))
-    }
+  if (typedQueryArgs.where !== undefined) {
+    queryArgList.push(getWhereArgArr(typedQueryArgs.where))
+  }
 
-    if (typedQueryArgs.order_desc !== undefined) {
-      queryArgList.push(arg("order_desc", typedQueryArgs.order_desc))
-    }
+  delete typedQueryArgs.where
 
-    if (typedQueryArgs.orderDesc !== undefined) {
-      queryArgList.push(arg("orderDesc", typedQueryArgs.orderDesc))
-    }
-  } else {
-    queryArgList = Object.keys(typedQueryArgs).map((key) =>
-      arg(key, typedQueryArgs[key])
-    )
-  }
+  Object.keys(typedQueryArgs).forEach((key) =>
+    queryArgList.push(arg(key, typedQueryArgs[key], true))
+  )
 
   const hasQueryList = (char: string) => (queryArgList.length > 0 ? char : "")
 

packages/indexer-nibi/src/graphql-codegen/codegen-loader.js

@@ -19,6 +19,6 @@ module.exports = async () => {
     return buildClientSchema(data)
   } catch (error) {
     console.error(error)
-    throw error
+    return undefined
   }
 }

packages/indexer-nibi/src/graphql-codegen/codegen-loader.test.ts

@@ -0,0 +1,10 @@
+import { GraphQLSchema } from "graphql"
+
+const loader = require("./codegen-loader")
+
+describe("codegen-loader tests", () => {
+  test("codegen-loader", async () => {
+    const testResult = await loader()
+    expect(testResult).toBeInstanceOf(GraphQLSchema)
+  })
+})