@dev-fastn-ai/react-core 1.0.13 → 1.0.15

package/dist/core/src/index.d.ts

@@ -6,6 +6,7 @@ export declare class Fastn {
     getConfigurationForm(input: GetConfigurationFormInput): Promise<import("./types").ConfigurationForm>;
     registerRefetchFunction(input: RegisterRefetchFunctionInput): void;
     onEvent(event: Event, callback: () => void): void;
+    offEvent(event: Event, callback: () => void): void;
 }
 export * from './types';
 export { FastnError, MissingConfigError, AuthenticationError, MissingAuthTokenError, MissingSpaceIdError, MissingTenantIdError } from './utils/errors';

package/dist/index.cjs.js

@@ -1036,6 +1036,11 @@ const onEvent = (event, callback) => {
     var _a;
     (_a = listeners[event]) === null || _a === void 0 ? void 0 : _a.add(callback);
 };
+// Unregister a callback
+const offEvent = (event, callback) => {
+    var _a;
+    (_a = listeners[event]) === null || _a === void 0 ? void 0 : _a.delete(callback);
+};
 // Internal postMessage listener
 const handleMessage = (e) => {
     const data = e.data;
@@ -1107,10 +1112,8 @@ async function getConnectors({ disabled = false, status = "ALL", refetch } = {})
                         else {
                             response = await executeActionHandler(action === null || action === void 0 ? void 0 : action.handler);
                         }
-                        sendEvent("INVALIDATE_CONNECTORS");
-                        sendEvent("REFETCH_CONNECTORS");
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
                         sendEvent("REFETCH_CONFIGURATIONS");
+                        sendEvent("REFETCH_CONNECTORS");
                         return response;
                     }
                     catch (e) {
@@ -1165,7 +1168,6 @@ const handleDisableConfiguration = async ({ id, connectorId, }) => {
             },
         });
         sendEvent("REFETCH_CONFIGURATIONS");
-        sendEvent("INVALIDATE_CONFIGURATIONS");
     }
     catch (error) {
         throw new Error(formatApolloErrors(error));
@@ -1175,18 +1177,15 @@ const handleDeleteConfiguration = async ({ id, connectorId, }) => {
     try {
         const config = getConfig();
         await deleteTenantConfiguration({
-            variables: {
-                input: {
-                    clientId: config.spaceId,
-                    tenantId: config.tenantId,
-                    id: id,
-                    connectorId,
-                    widgetConnectorId: connectorId,
-                },
+            input: {
+                clientId: config.spaceId,
+                tenantId: config.tenantId,
+                id: id,
+                connectorId,
+                widgetConnectorId: connectorId,
             },
         });
         sendEvent("REFETCH_CONFIGURATIONS");
-        sendEvent("INVALIDATE_CONFIGURATIONS");
     }
     catch (error) {
         throw new Error(formatApolloErrors(error));
@@ -1216,8 +1215,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                     actionType: ConnectorActionType.DISABLE,
                     onClick: async () => {
                         await handleDisableConfiguration({ connectorId: configSubscription.connector.id, id: configurationId });
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
-                        sendEvent("REFETCH_CONFIGURATIONS");
                         return { data: null, status: "SUCCESS" };
                     },
                 });
@@ -1226,8 +1223,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                     actionType: ConnectorActionType.DELETE,
                     onClick: async () => {
                         await handleDeleteConfiguration({ connectorId: configSubscription.connector.id, id: configurationId });
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
-                        sendEvent("REFETCH_CONFIGURATIONS");
                         return { data: null, status: "SUCCESS" };
                     },
                 });
@@ -1245,9 +1240,7 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                         authMethod: (_h = (_g = (_f = configSubscription === null || configSubscription === void 0 ? void 0 : configSubscription.connector) === null || _f === void 0 ? void 0 : _f.connectedConnectors) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.authMethods[0],
                         input: formData,
                     });
-                    sendEvent("INVALIDATE_CONFIGURATIONS");
                     sendEvent("REFETCH_CONFIGURATIONS");
-                    sendEvent("INVALIDATE_CONNECTORS");
                     sendEvent("REFETCH_CONNECTORS");
                     return { data: result, status: "SUCCESS" };
                 };
@@ -1280,13 +1273,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
     }
 }
 
-const refetchFunctions = {};
-const registerRefetchFunction = (input) => {
-    console.log("registering refetch function", input);
-    const { refetchFunction, refetchKey } = input;
-    refetchFunctions[refetchKey] = refetchFunction;
-};
-
 function loadGapiClient() {
     return new Promise((resolve, reject) => {
         const script = document.createElement('script');
@@ -1352,7 +1338,6 @@ async function createGooglePicker(developerKey, accessToken) {
     });
 }
 
-const REFETCH_KEY = "configuration-form";
 function openGoogleFilesPicker(parentArgs) {
     return async (args) => {
         var _a, _b;
@@ -1405,7 +1390,6 @@ function openGoogleFilesPicker(parentArgs) {
  */
 function getSubmitHandler({ configuration, configurationId, connectorId, }) {
     return async ({ formData }) => {
-        var _a;
         const config = getConfig();
         const uiCode = populateFormDataInUiCode(configuration.uiCode, formData);
         try {
@@ -1422,7 +1406,6 @@ function getSubmitHandler({ configuration, configurationId, connectorId, }) {
                         configurations: formData,
                     }),
                 });
-                await ((_a = refetchFunctions[REFETCH_KEY]) === null || _a === void 0 ? void 0 : _a.call(refetchFunctions));
             }
             else {
                 await createTenantConfiguration({
@@ -1439,7 +1422,7 @@ function getSubmitHandler({ configuration, configurationId, connectorId, }) {
                 });
             }
             sendEvent("REFRESH_CONFIGURATION_FORM");
-            sendEvent("REFETCH_CONNECTORS");
+            sendEvent("REFETCH_CONFIGURATIONS");
         }
         catch (error) {
             throw new Error(formatApolloErrors(error));
@@ -1565,6 +1548,11 @@ async function getConfigurationForm(input) {
     }
 }
 
+const registerRefetchFunction = (input) => {
+    console.log("registering refetch function", input);
+    const { refetchFunction, refetchKey } = input;
+};
+
 class Fastn {
     constructor(config) {
         setConfig(config);
@@ -1584,6 +1572,9 @@ class Fastn {
     onEvent(event, callback) {
         return onEvent(event, callback);
     }
+    offEvent(event, callback) {
+        return offEvent(event, callback);
+    }
 }
 
 const FastnContext = react.createContext(null);
@@ -1603,7 +1594,6 @@ const useFastn = () => {
 
 const useConfigurations = (input) => {
     const fastn = useFastn();
-    const queryClient = reactQuery.useQueryClient();
     const query = reactQuery.useQuery({
         queryKey: ["configurations", input],
         queryFn: () => fastn.getConfigurations(input),
@@ -1611,10 +1601,12 @@ const useConfigurations = (input) => {
     });
     react.useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({ queryKey: ["configurations"] });
             query.refetch();
         };
         fastn.onEvent("REFETCH_CONFIGURATIONS", invalidate);
+        return () => {
+            fastn.offEvent("REFETCH_CONFIGURATIONS", invalidate);
+        };
     }, [query.data]);
     return query;
 };
@@ -1622,7 +1614,6 @@ const useConfigurations = (input) => {
 const useConfigurationForm = (input) => {
     var _a;
     const fastn = useFastn();
-    const queryClient = reactQuery.useQueryClient();
     const configurations = useConfigurations({
         configurationId: input.configurationId,
     });
@@ -1636,22 +1627,18 @@ const useConfigurationForm = (input) => {
     });
     react.useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({
-                queryKey: ["configuration-form", input],
-            });
-            queryClient.invalidateQueries({
-                queryKey: ["configurations"],
-            });
             query.refetch();
         };
         fastn.onEvent("REFRESH_CONFIGURATION_FORM", invalidate);
+        return () => {
+            fastn.offEvent("REFRESH_CONFIGURATION_FORM", invalidate);
+        };
     }, [query.data]);
     return query;
 };
 
 const useConnectors = () => {
     const fastn = useFastn();
-    const queryClient = reactQuery.useQueryClient();
     const query = reactQuery.useQuery({
         queryKey: ["connectors"],
         queryFn: () => fastn.getConnectors(),
@@ -1659,10 +1646,12 @@ const useConnectors = () => {
     });
     react.useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({ queryKey: ["connectors"] });
             query.refetch();
         };
         fastn.onEvent("REFETCH_CONNECTORS", invalidate);
+        return () => {
+            fastn.offEvent("REFETCH_CONNECTORS", invalidate);
+        };
     }, [query.data]);
     return query;
 };
@@ -1788,19 +1777,30 @@ function useFieldOptions(field) {
             setSearchQuery("");
             // Invalidate and refetch initial query
             if ((_a = field.optionsSource) === null || _a === void 0 ? void 0 : _a.getOptions) {
-                await queryClient.invalidateQueries({ queryKey: [...queryKey, "initial"] });
+                await queryClient.invalidateQueries({
+                    queryKey: [...queryKey, "initial"],
+                });
                 await initialQuery.refetch();
             }
             // Invalidate and refetch infinite query
             if ((_b = field.optionsSource) === null || _b === void 0 ? void 0 : _b.loadMore) {
-                await queryClient.invalidateQueries({ queryKey: [...queryKey, "infinite"] });
+                await queryClient.invalidateQueries({
+                    queryKey: [...queryKey, "infinite"],
+                });
                 await infiniteQuery.refetch();
             }
         }
         catch (error) {
             console.error("Error in refresh:", error);
         }
-    }, [queryClient, queryKey, initialQuery, infiniteQuery, field.optionsSource, field]);
+    }, [
+        queryClient,
+        queryKey,
+        initialQuery,
+        infiniteQuery,
+        field.optionsSource,
+        field,
+    ]);
     return {
         options: filteredOptions,
         loading: initialQuery.isLoading || infiniteQuery.isLoading,

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useMemo, useContext, useEffect, useState, useCallback } from 'react';
-import { QueryClientProvider, QueryClient, useQueryClient, useQuery, useInfiniteQuery } from '@tanstack/react-query';
+import { QueryClientProvider, QueryClient, useQuery, useQueryClient, useInfiniteQuery } from '@tanstack/react-query';
 export * from '@dev-fastn-ai/core';
 
 const REQUEST_TRACE_ID_HEADER_KEY = 'x-fastn-request-trace-id';
@@ -1034,6 +1034,11 @@ const onEvent = (event, callback) => {
     var _a;
     (_a = listeners[event]) === null || _a === void 0 ? void 0 : _a.add(callback);
 };
+// Unregister a callback
+const offEvent = (event, callback) => {
+    var _a;
+    (_a = listeners[event]) === null || _a === void 0 ? void 0 : _a.delete(callback);
+};
 // Internal postMessage listener
 const handleMessage = (e) => {
     const data = e.data;
@@ -1105,10 +1110,8 @@ async function getConnectors({ disabled = false, status = "ALL", refetch } = {})
                         else {
                             response = await executeActionHandler(action === null || action === void 0 ? void 0 : action.handler);
                         }
-                        sendEvent("INVALIDATE_CONNECTORS");
-                        sendEvent("REFETCH_CONNECTORS");
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
                         sendEvent("REFETCH_CONFIGURATIONS");
+                        sendEvent("REFETCH_CONNECTORS");
                         return response;
                     }
                     catch (e) {
@@ -1163,7 +1166,6 @@ const handleDisableConfiguration = async ({ id, connectorId, }) => {
             },
         });
         sendEvent("REFETCH_CONFIGURATIONS");
-        sendEvent("INVALIDATE_CONFIGURATIONS");
     }
     catch (error) {
         throw new Error(formatApolloErrors(error));
@@ -1173,18 +1175,15 @@ const handleDeleteConfiguration = async ({ id, connectorId, }) => {
     try {
         const config = getConfig();
         await deleteTenantConfiguration({
-            variables: {
-                input: {
-                    clientId: config.spaceId,
-                    tenantId: config.tenantId,
-                    id: id,
-                    connectorId,
-                    widgetConnectorId: connectorId,
-                },
+            input: {
+                clientId: config.spaceId,
+                tenantId: config.tenantId,
+                id: id,
+                connectorId,
+                widgetConnectorId: connectorId,
             },
         });
         sendEvent("REFETCH_CONFIGURATIONS");
-        sendEvent("INVALIDATE_CONFIGURATIONS");
     }
     catch (error) {
         throw new Error(formatApolloErrors(error));
@@ -1214,8 +1213,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                     actionType: ConnectorActionType.DISABLE,
                     onClick: async () => {
                         await handleDisableConfiguration({ connectorId: configSubscription.connector.id, id: configurationId });
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
-                        sendEvent("REFETCH_CONFIGURATIONS");
                         return { data: null, status: "SUCCESS" };
                     },
                 });
@@ -1224,8 +1221,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                     actionType: ConnectorActionType.DELETE,
                     onClick: async () => {
                         await handleDeleteConfiguration({ connectorId: configSubscription.connector.id, id: configurationId });
-                        sendEvent("INVALIDATE_CONFIGURATIONS");
-                        sendEvent("REFETCH_CONFIGURATIONS");
                         return { data: null, status: "SUCCESS" };
                     },
                 });
@@ -1243,9 +1238,7 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
                         authMethod: (_h = (_g = (_f = configSubscription === null || configSubscription === void 0 ? void 0 : configSubscription.connector) === null || _f === void 0 ? void 0 : _f.connectedConnectors) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.authMethods[0],
                         input: formData,
                     });
-                    sendEvent("INVALIDATE_CONFIGURATIONS");
                     sendEvent("REFETCH_CONFIGURATIONS");
-                    sendEvent("INVALIDATE_CONNECTORS");
                     sendEvent("REFETCH_CONNECTORS");
                     return { data: result, status: "SUCCESS" };
                 };
@@ -1278,13 +1271,6 @@ async function getConfigurations({ configurationId, status = "ALL", }) {
     }
 }
 
-const refetchFunctions = {};
-const registerRefetchFunction = (input) => {
-    console.log("registering refetch function", input);
-    const { refetchFunction, refetchKey } = input;
-    refetchFunctions[refetchKey] = refetchFunction;
-};
-
 function loadGapiClient() {
     return new Promise((resolve, reject) => {
         const script = document.createElement('script');
@@ -1350,7 +1336,6 @@ async function createGooglePicker(developerKey, accessToken) {
     });
 }
 
-const REFETCH_KEY = "configuration-form";
 function openGoogleFilesPicker(parentArgs) {
     return async (args) => {
         var _a, _b;
@@ -1403,7 +1388,6 @@ function openGoogleFilesPicker(parentArgs) {
  */
 function getSubmitHandler({ configuration, configurationId, connectorId, }) {
     return async ({ formData }) => {
-        var _a;
         const config = getConfig();
         const uiCode = populateFormDataInUiCode(configuration.uiCode, formData);
         try {
@@ -1420,7 +1404,6 @@ function getSubmitHandler({ configuration, configurationId, connectorId, }) {
                         configurations: formData,
                     }),
                 });
-                await ((_a = refetchFunctions[REFETCH_KEY]) === null || _a === void 0 ? void 0 : _a.call(refetchFunctions));
             }
             else {
                 await createTenantConfiguration({
@@ -1437,7 +1420,7 @@ function getSubmitHandler({ configuration, configurationId, connectorId, }) {
                 });
             }
             sendEvent("REFRESH_CONFIGURATION_FORM");
-            sendEvent("REFETCH_CONNECTORS");
+            sendEvent("REFETCH_CONFIGURATIONS");
         }
         catch (error) {
             throw new Error(formatApolloErrors(error));
@@ -1563,6 +1546,11 @@ async function getConfigurationForm(input) {
     }
 }
 
+const registerRefetchFunction = (input) => {
+    console.log("registering refetch function", input);
+    const { refetchFunction, refetchKey } = input;
+};
+
 class Fastn {
     constructor(config) {
         setConfig(config);
@@ -1582,6 +1570,9 @@ class Fastn {
     onEvent(event, callback) {
         return onEvent(event, callback);
     }
+    offEvent(event, callback) {
+        return offEvent(event, callback);
+    }
 }
 
 const FastnContext = createContext(null);
@@ -1601,7 +1592,6 @@ const useFastn = () => {
 
 const useConfigurations = (input) => {
     const fastn = useFastn();
-    const queryClient = useQueryClient();
     const query = useQuery({
         queryKey: ["configurations", input],
         queryFn: () => fastn.getConfigurations(input),
@@ -1609,10 +1599,12 @@ const useConfigurations = (input) => {
     });
     useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({ queryKey: ["configurations"] });
             query.refetch();
         };
         fastn.onEvent("REFETCH_CONFIGURATIONS", invalidate);
+        return () => {
+            fastn.offEvent("REFETCH_CONFIGURATIONS", invalidate);
+        };
     }, [query.data]);
     return query;
 };
@@ -1620,7 +1612,6 @@ const useConfigurations = (input) => {
 const useConfigurationForm = (input) => {
     var _a;
     const fastn = useFastn();
-    const queryClient = useQueryClient();
     const configurations = useConfigurations({
         configurationId: input.configurationId,
     });
@@ -1634,22 +1625,18 @@ const useConfigurationForm = (input) => {
     });
     useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({
-                queryKey: ["configuration-form", input],
-            });
-            queryClient.invalidateQueries({
-                queryKey: ["configurations"],
-            });
             query.refetch();
         };
         fastn.onEvent("REFRESH_CONFIGURATION_FORM", invalidate);
+        return () => {
+            fastn.offEvent("REFRESH_CONFIGURATION_FORM", invalidate);
+        };
     }, [query.data]);
     return query;
 };
 
 const useConnectors = () => {
     const fastn = useFastn();
-    const queryClient = useQueryClient();
     const query = useQuery({
         queryKey: ["connectors"],
         queryFn: () => fastn.getConnectors(),
@@ -1657,10 +1644,12 @@ const useConnectors = () => {
     });
     useEffect(() => {
         const invalidate = () => {
-            queryClient.invalidateQueries({ queryKey: ["connectors"] });
             query.refetch();
         };
         fastn.onEvent("REFETCH_CONNECTORS", invalidate);
+        return () => {
+            fastn.offEvent("REFETCH_CONNECTORS", invalidate);
+        };
     }, [query.data]);
     return query;
 };
@@ -1786,19 +1775,30 @@ function useFieldOptions(field) {
             setSearchQuery("");
             // Invalidate and refetch initial query
             if ((_a = field.optionsSource) === null || _a === void 0 ? void 0 : _a.getOptions) {
-                await queryClient.invalidateQueries({ queryKey: [...queryKey, "initial"] });
+                await queryClient.invalidateQueries({
+                    queryKey: [...queryKey, "initial"],
+                });
                 await initialQuery.refetch();
             }
             // Invalidate and refetch infinite query
             if ((_b = field.optionsSource) === null || _b === void 0 ? void 0 : _b.loadMore) {
-                await queryClient.invalidateQueries({ queryKey: [...queryKey, "infinite"] });
+                await queryClient.invalidateQueries({
+                    queryKey: [...queryKey, "infinite"],
+                });
                 await infiniteQuery.refetch();
             }
         }
         catch (error) {
             console.error("Error in refresh:", error);
         }
-    }, [queryClient, queryKey, initialQuery, infiniteQuery, field.optionsSource, field]);
+    }, [
+        queryClient,
+        queryKey,
+        initialQuery,
+        infiniteQuery,
+        field.optionsSource,
+        field,
+    ]);
     return {
         options: filteredOptions,
         loading: initialQuery.isLoading || infiniteQuery.isLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-fastn-ai/react-core",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "React hooks and components for integrating Fastn AI connector marketplace into your applications. Built on top of @fastn-ai/core with React Query for optimal performance.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -59,7 +59,7 @@
   },
   "homepage": "https://docs.fastn.ai",
   "dependencies": {
-    "@dev-fastn-ai/core": "^1.0.9"
+    "@dev-fastn-ai/core": "^1.0.10"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",