Merge pull request #81 from AbstractSDK/refactor/core-and-react

feat!: api changes to `core` and `react` packages
AbstractSDK · Mar 14, 2024 · 6b5fbf4 · 6b5fbf4
2 parents 48cdc3b + 427df38
commit 6b5fbf4
Show file tree

Hide file tree

Showing 119 changed files with 2,052 additions and 1,568 deletions.
diff --git a/.changeset/strange-clocks-return.md b/.changeset/strange-clocks-return.md
@@ -0,0 +1,9 @@
+---
+"@abstract-money/core": major
+"@abstract-money/react": major
+"wagemos-cosmoskit-nextjs": patch
+"wagemos-graz-nextjs": patch
+"@abstract-money/cli": patch
+---
+
+Changed the API for `react` and `core` packages. Previously `core` package had unnecessary `args:{}` wrapping, now it doesn't. Also, `query` and `mutation` fields were added to the `react` package to have a clear separation of concerns, as well as fixed inconsistent API around `chainName` and types.
diff --git a/examples/wagemos-cosmoskit-nextjs/src/_generated/index.ts b/examples/wagemos-cosmoskit-nextjs/src/_generated/index.ts
@@ -66,14 +66,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -128,14 +126,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -192,14 +188,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -255,14 +249,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -320,14 +312,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -383,14 +373,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,

diff --git a/examples/wagemos-graz-nextjs/src/_generated/index.ts b/examples/wagemos-graz-nextjs/src/_generated/index.ts
@@ -66,14 +66,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -128,14 +126,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -192,14 +188,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -255,14 +249,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -320,14 +312,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,
@@ -383,14 +373,12 @@ export const betting = {
         isLoading: isBettingAppQueryClientLoading,
         isError: isBettingAppQueryClientError,
         error: bettingAppQueryClientError,
-      } = useAbstractModuleQueryClient(
-        {
-          moduleId: BETTING_MODULE_ID,
-          ...rest,
-          Module: BettingAppQueryClient,
-        },
-        { enabled: options?.enabled },
-      )
+      } = useAbstractModuleQueryClient({
+        moduleId: BETTING_MODULE_ID,
+        ...rest,
+        Module: BettingAppQueryClient,
+        query: { enabled: options?.enabled },
+      })
 
       const {
         data,

diff --git a/examples/wagemos-graz-nextjs/src/app/authz-osmosis/page.tsx b/examples/wagemos-graz-nextjs/src/app/authz-osmosis/page.tsx
@@ -36,10 +36,10 @@ export default function AuthzPage() {
   const { data: account } = useAccount({ chainId: 'osmosis-1' })
 
   const { data: accountFactory, isLoading } =
-    useAccountFactoryQueryClientFromApi(CHAIN_NAME)
+    useAccountFactoryQueryClientFromApi({ chainName: CHAIN_NAME, args: {} })
 
   const { mutate: createAccount } = useCreateAccountMonarchy({
-    args: { chainName: CHAIN_NAME },
+    chainName: CHAIN_NAME,
   })
 
   const onCreateAccount = useCallback(async () => {
@@ -59,17 +59,13 @@ export default function AuthzPage() {
     })
   }, [accountFactory])
 
-  const { data: savingsAppAddress } = useModuleInstantiate2AddressFromApi(
-    {
-      accountId: stringToAccountId(TEST_SAVINGS_ACCOUNT_ID, CHAIN_NAME),
-      args: {
-        moduleId: SAVINGS_APP_MODULE_ID,
-      },
+  const { data: savingsAppAddress } = useModuleInstantiate2AddressFromApi({
+    accountId: stringToAccountId(TEST_SAVINGS_ACCOUNT_ID, CHAIN_NAME),
+    args: {
+      moduleId: SAVINGS_APP_MODULE_ID,
     },
-    {
-      enabled: true,
-    },
-  )
+    query: { enabled: true },
+  })
 
   console.log('calculated savings app address', savingsAppAddress)
 

diff --git a/packages/cli/src/plugins/react.ts b/packages/cli/src/plugins/react.ts
@@ -311,8 +311,12 @@ export function react(options: ReactOptions = {}): ReactResult {
                         }
                         ...rest,
                         Module: ${queryClientPascalCase},
+                      ${
+                        hasAbstractApp
+                          ? 'query: { enabled: options?.enabled }'
+                          : ''
+                      }
                       },
-                      ${hasAbstractApp ? '{ enabled: options?.enabled }' : ''}
                     )
 
                     const {

diff --git a/packages/core/.gitignore b/packages/core/.gitignore
@@ -1,4 +1,5 @@
 # Generated file. Do not edit directly.
+actions/**
 clients/**
 utils/**
 legacy/**
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -79,6 +79,10 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./actions": {
+      "types": "./dist/actions/index.d.ts",
+      "default": "./dist/actions/index.js"
+    },
     "./clients": {
       "types": "./dist/clients/index.d.ts",
       "default": "./dist/clients/index.js"
@@ -94,6 +98,7 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "/actions",
     "/clients",
     "/utils",
     "/legacy",

diff --git a/packages/core/src/actions/account/public/get-account-base-addresses-from-api.ts b/packages/core/src/actions/account/public/get-account-base-addresses-from-api.ts
@@ -1,23 +1,22 @@
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import { VersionControlTypes } from '../../../codegen/abstract'
-import { WithArgs } from '../../../types/with-args'
 import { accountIdToParameter } from '../../../utils/account-id'
 import { getVersionControlQueryClientFromApi } from '../../public/get-version-control-query-client-from-api'
 
-export type GetAccountBaseAddressesFromApiParameters = WithArgs<{
+export type GetAccountBaseAddressesFromApiParameters = {
   accountId: VersionControlTypes.AccountId
   cosmWasmClient: CosmWasmClient
   apiUrl: string
-}>
+}
 
 export async function getAccountBaseAddressesFromApi({
-  args: { accountId, cosmWasmClient, apiUrl },
+  accountId,
+  cosmWasmClient,
+  apiUrl,
 }: GetAccountBaseAddressesFromApiParameters) {
   const versionControlQueryClient = await getVersionControlQueryClientFromApi({
-    args: {
-      cosmWasmClient,
-      apiUrl,
-    },
+    cosmWasmClient,
+    apiUrl,
   })
   const { account_base: accountBase } =
     await versionControlQueryClient.accountBase({