@rainlanguage/ui-components 0.0.1-alpha.97 → 0.0.1-alpha.99

package/dist/components/CodeMirrorRainlang.svelte

@@ -6,12 +6,16 @@ export let rainlangText = void 0;
 export let codeMirrorTheme;
 export let codeMirrorDisabled = true;
 export let codeMirrorStyles = {};
-$: extendedOrder = order ? extendOrder(order) : void 0;
+let result;
+let extendedOrder;
+$: result = order ? extendOrder(order) : void 0;
+$: extendedOrder = result && !result.error ? result.value : void 0;
+$: extendOrderError = result && result.error ? result.error : void 0;
 </script>
 
 {#if rainlangText || extendedOrder?.rainlang}
 	<CodeMirror
-		value={rainlangText || extendedOrder.rainlang}
+		value={rainlangText || extendedOrder?.rainlang}
 		extensions={[RainlangLR]}
 		theme={codeMirrorTheme}
 		readonly={codeMirrorDisabled}
@@ -24,6 +28,10 @@ $: extendedOrder = order ? extendOrder(order) : void 0;
 			...codeMirrorStyles
 		}}
 	/>
+{:else if extendOrderError}
+	<div class="w-full tracking-tight text-red-600 dark:text-red-400" data-testid="rainlang-error">
+		{extendOrderError.readableMsg}
+	</div>
 {:else if !extendedOrder?.rainlang && !rainlangText}
 	<div
 		class="w-full tracking-tight text-gray-900 dark:text-white"

package/dist/components/charts/OrderTradesChart.svelte

@@ -20,7 +20,8 @@ $: query = createQuery({
       BigInt(1e3),
       void 0
     );
-    return prepareHistoricalOrderChartData(data, $colorTheme);
+    if (data.error) throw new Error(data.error.msg);
+    return prepareHistoricalOrderChartData(data.value, $colorTheme);
   },
   enabled: !!subgraphUrl
 });

package/dist/components/charts/VaultBalanceChart.svelte

@@ -1,9 +1,7 @@
 <script>import { timestampSecondsToUTCTimestamp } from "../../services/time";
 import { bigintToFloat } from "../../utils/number";
 import { createQuery } from "@tanstack/svelte-query";
-import {
-  getVaultBalanceChanges
-} from "@rainlanguage/orderbook";
+import { getVaultBalanceChanges } from "@rainlanguage/orderbook";
 import TanstackLightweightChartLine from "../charts/TanstackLightweightChartLine.svelte";
 import { QKEY_VAULT_CHANGES } from "../../queries/keys";
 export let vault;
@@ -12,11 +10,13 @@ export let subgraphUrl;
 export let lightweightChartsTheme;
 $: query = createQuery({
   queryKey: [id, QKEY_VAULT_CHANGES + id, QKEY_VAULT_CHANGES],
-  queryFn: () => {
-    return getVaultBalanceChanges(subgraphUrl || "", vault.id, {
+  queryFn: async () => {
+    const result = await getVaultBalanceChanges(subgraphUrl || "", vault.id, {
       page: 1,
       pageSize: 1e3
     });
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   enabled: !!subgraphUrl
 });

package/dist/components/detail/OrderDetail.svelte

@@ -44,8 +44,10 @@ const queryClient = useQueryClient();
 const { matchesAccount } = useAccount();
 $: orderDetailQuery = createQuery({
   queryKey: [orderHash, QKEY_ORDER + orderHash],
-  queryFn: () => {
-    return getOrderByHash(subgraphUrl, orderHash);
+  queryFn: async () => {
+    const result = await getOrderByHash(subgraphUrl, orderHash);
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   enabled: !!subgraphUrl
 });

package/dist/components/detail/VaultDetail.svelte

@@ -29,8 +29,10 @@ const queryClient = useQueryClient();
 const { matchesAccount } = useAccount();
 $: vaultDetailQuery = createQuery({
   queryKey: [id, QKEY_VAULT + id],
-  queryFn: () => {
-    return getVault(subgraphUrl || "", id);
+  queryFn: async () => {
+    const result = await getVault(subgraphUrl || "", id);
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   enabled: !!subgraphUrl
 });

package/dist/components/tables/OrderAPY.svelte

@@ -14,14 +14,9 @@ $: queryEndTime = endTimestamp ? BigInt(endTimestamp) : void 0;
 $: orderPerformance = createInfiniteQuery({
   queryKey: [id, QKEY_ORDER_APY + id],
   queryFn: async () => {
-    return [
-      await getOrderPerformance(
-        subgraphUrl || "",
-        id,
-        queryStartTime,
-        queryEndTime
-      )
-    ];
+    const result = await getOrderPerformance(subgraphUrl || "", id, queryStartTime, queryEndTime);
+    if (result.error) throw new Error(result.error.msg);
+    return [result.value];
   },
   initialPageParam: 0,
   getNextPageParam: () => void 0,

package/dist/components/tables/OrderTradesListTable.svelte

@@ -20,7 +20,7 @@ $: orderTradesQuery = createInfiniteQuery({
   queryKey: [id, QKEY_ORDER_TRADES_LIST + id],
   queryFn: async ({ pageParam }) => {
     tradesCount = void 0;
-    const [count, trades] = await Promise.all([
+    const [countResult, tradesResult] = await Promise.all([
       getOrderTradesCount(
         subgraphUrl || "",
         id,
@@ -35,6 +35,10 @@ $: orderTradesQuery = createInfiniteQuery({
         endTimestamp ? BigInt(endTimestamp) : void 0
       )
     ]);
+    if (countResult.error) throw new Error(countResult.error.msg);
+    if (tradesResult.error) throw new Error(tradesResult.error.msg);
+    const count = countResult.value;
+    const trades = tradesResult.value;
     if (typeof count === "number") {
       tradesCount = count;
     }

package/dist/components/tables/OrderVaultsVolTable.svelte

@@ -15,7 +15,16 @@ $: queryStartTime = startTimestamp ? BigInt(startTimestamp) : void 0;
 $: queryEndTime = endTimestamp ? BigInt(endTimestamp) : void 0;
 $: vaultsVol = createInfiniteQuery({
   queryKey: [id, QKEY_VAULTS_VOL_LIST + id],
-  queryFn: () => getOrderVaultsVolume(subgraphUrl || "", id, queryStartTime, queryEndTime),
+  queryFn: async () => {
+    const result = await getOrderVaultsVolume(
+      subgraphUrl || "",
+      id,
+      queryStartTime,
+      queryEndTime
+    );
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
+  },
   initialPageParam: 0,
   getNextPageParam: () => void 0,
   enabled: !!subgraphUrl

package/dist/components/tables/OrdersListTable.svelte

@@ -48,8 +48,8 @@ $: query = createInfiniteQuery({
     $showInactiveOrders,
     $orderHash
   ],
-  queryFn: ({ pageParam }) => {
-    return getOrders(
+  queryFn: async ({ pageParam }) => {
+    const result = await getOrders(
       multiSubgraphArgs,
       {
         owners,
@@ -58,6 +58,8 @@ $: query = createInfiniteQuery({
       },
       { page: pageParam + 1, pageSize: DEFAULT_PAGE_SIZE }
     );
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   initialPageParam: 0,
   getNextPageParam(lastPage, _allPages, lastPageParam) {

package/dist/components/tables/VaultBalanceChangesTable.svelte

@@ -13,11 +13,13 @@ export let id;
 export let subgraphUrl;
 $: balanceChangesQuery = createInfiniteQuery({
   queryKey: [id, QKEY_VAULT_CHANGES + id],
-  queryFn: ({ pageParam }) => {
-    return getVaultBalanceChanges(subgraphUrl || "", id, {
+  queryFn: async ({ pageParam }) => {
+    const result = await getVaultBalanceChanges(subgraphUrl || "", id, {
       page: pageParam + 1,
       pageSize: DEFAULT_PAGE_SIZE
     });
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   initialPageParam: 0,
   getNextPageParam(lastPage, _allPages, lastPageParam) {

package/dist/components/tables/VaultsListTable.svelte

@@ -49,8 +49,8 @@ $: query = createInfiniteQuery({
     $settings,
     owners
   ],
-  queryFn: ({ pageParam }) => {
-    return getVaults(
+  queryFn: async ({ pageParam }) => {
+    const result = await getVaults(
       multiSubgraphArgs,
       {
         owners,
@@ -58,6 +58,8 @@ $: query = createInfiniteQuery({
       },
       { page: pageParam + 1, pageSize: DEFAULT_PAGE_SIZE }
     );
+    if (result.error) throw new Error(result.error.msg);
+    return result.value;
   },
   initialPageParam: 0,
   getNextPageParam(lastPage, _allPages, lastPageParam) {

package/dist/services/awaitTransactionIndexing.d.ts

@@ -2,7 +2,7 @@
  * @module awaitTransactionIndexing
  * @description Utilities for waiting for transactions to be indexed by a subgraph
  */
-import type { SgAddOrderWithOrder, SgRemoveOrderWithOrder, SgTransaction } from '@rainlanguage/orderbook';
+import type { SgAddOrderWithOrder, SgRemoveOrderWithOrder, SgTransaction, WasmEncodedResult } from '@rainlanguage/orderbook';
 /**
  * Error message when subgraph indexing times out
  */
@@ -80,7 +80,7 @@ export declare const awaitSubgraphIndexing: <T>(options: {
      * @param subgraphUrl URL of the subgraph
      * @param txHash Transaction hash to query
      */
-    fetchData: (subgraphUrl: string, txHash: string) => Promise<T | null | undefined>;
+    fetchData: (subgraphUrl: string, txHash: string) => Promise<WasmEncodedResult<T | null | undefined>>;
     /**
      * Function to determine if the fetched data indicates success
      * @param data The data returned from the subgraph
@@ -119,7 +119,7 @@ export interface TransactionConfig<T> {
     /**
      * Function to fetch data from the subgraph
      */
-    fetchData: (subgraphUrl: string, txHash: string) => Promise<T>;
+    fetchData: (subgraphUrl: string, txHash: string) => Promise<WasmEncodedResult<T>>;
     /**
      * Function to determine if the fetched data indicates success
      */

package/dist/services/awaitTransactionIndexing.js

@@ -23,12 +23,14 @@ export const awaitSubgraphIndexing = async (options) => {
             attempts++;
             try {
                 const data = await fetchData(subgraphUrl, txHash);
-                if (data && isSuccess(data)) {
+                if (data.value && isSuccess(data.value)) {
                     clearInterval(checkInterval);
                     let orderHash;
                     // Extract orderHash from order data if it exists in the expected format
-                    if (Array.isArray(data) && data.length > 0 && data[0]?.order?.orderHash) {
-                        orderHash = data[0].order.orderHash;
+                    if (Array.isArray(data.value) &&
+                        data.value.length > 0 &&
+                        data.value[0]?.order?.orderHash) {
+                        orderHash = data.value[0].order.orderHash;
                     }
                     resolve({
                         value: {
@@ -36,7 +38,7 @@ export const awaitSubgraphIndexing = async (options) => {
                             successMessage,
                             orderHash,
                             network,
-                            data
+                            data: data.value
                         }
                     });
                     return;

package/dist/stores/transactionStore.d.ts

@@ -1,6 +1,6 @@
 import type { Hex } from 'viem';
 import type { Config } from '@wagmi/core';
-import type { ApprovalCalldata, DepositCalldataResult, RemoveOrderCalldata, SgVault, WithdrawCalldataResult } from '@rainlanguage/orderbook';
+import type { ApprovalCalldata, RemoveOrderCalldata, SgVault, VaultCalldataResult } from '@rainlanguage/orderbook';
 import type { DeploymentArgs } from '../types/transaction';
 export declare const ADDRESS_ZERO = "0x0000000000000000000000000000000000000000";
 export declare const ONE: bigint;
@@ -39,8 +39,8 @@ export type DeploymentTransactionArgs = DeploymentArgsWithoutAccount & {
 };
 export type DepositOrWithdrawTransactionArgs = {
     config: Config;
-    approvalCalldata?: ApprovalCalldata;
-    transactionCalldata: DepositCalldataResult | WithdrawCalldataResult;
+    approvalCalldata?: VaultCalldataResult;
+    transactionCalldata: VaultCalldataResult;
     action: 'deposit' | 'withdraw';
     chainId: number;
     vault: SgVault;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rainlanguage/ui-components",
-	"version": "0.0.1-alpha.97",
+	"version": "0.0.1-alpha.99",
 	"description": "A component library for building Svelte applications to be used with Raindex.",
 	"license": "LicenseRef-DCL-1.0",
 	"author": "Rain Open Source Software Ltd",
@@ -53,7 +53,7 @@
 		"@fontsource/dm-sans": "5.1.0",
 		"@imask/svelte": "7.6.1",
 		"@observablehq/plot": "0.6.16",
-		"@rainlanguage/orderbook": "0.0.1-alpha.97",
+		"@rainlanguage/orderbook": "0.0.1-alpha.99",
 		"@reown/appkit": "1.6.4",
 		"@reown/appkit-adapter-wagmi": "1.6.4",
 		"@sentry/sveltekit": "7.120.0",