@pitcher/js-api 1.21.0-beta.4 → 1.21.0-beta.6

package/js-api.esm.js

@@ -1,4 +1,4 @@
-import { camelCase, snakeCase, cloneDeep } from 'lodash-es';
+import { camelCase, snakeCase, pickBy, cloneDeep, isEqual } from 'lodash-es';
 
 function _mergeNamespaces(n, m) {
 	for (var i = 0; i < m.length; i++) {
@@ -2791,13 +2791,23 @@ const MAX_RETRIES = 5;
 const BASE_DELAY = 1e3;
 function paramsSerializer(params) {
   const searchParams = new URLSearchParams();
-  for (const key in params) {
-    if (Array.isArray(params[key])) {
-      params[key].forEach((val) => searchParams.append(key, val));
+  function addParam(key, value) {
+    if (value === void 0 || value === null) {
+      return;
+    }
+    if (Array.isArray(value)) {
+      value.forEach((val) => addParam(key, val));
+    } else if (typeof value === "object" && !Array.isArray(value)) {
+      for (const subKey in value) {
+        addParam(`${key}[${subKey}]`, value[subKey]);
+      }
     } else {
-      searchParams.append(key, params[key]);
+      searchParams.append(key, value);
     }
   }
+  for (const key in params) {
+    addParam(key, params[key]);
+  }
   return searchParams.toString();
 }
 async function fetchWithRetry(url, options, remainingRetries = MAX_RETRIES) {
@@ -2905,13 +2915,29 @@ function createHttpClient(origin, token) {
   };
 }
 
+function normalizeNetworkFilterParams(params) {
+  return Object.entries(params).reduce(
+    (acc, [key, value]) => {
+      if (key.endsWith("__range") && Array.isArray(value)) {
+        acc[key] = value.join(",");
+      } else {
+        acc[key] = value;
+      }
+      return acc;
+    },
+    {}
+  );
+}
+
 let env;
 let http;
-const logInfo = (msg, ...rest) => console.info(`[online handlers]: ${msg}`, ...rest);
-const check = () => {
+function check() {
   if (!env) throw new Error("Missing env");
   if (!http) throw new Error("Missing http");
-};
+}
+function pickNonNullish(data) {
+  return pickBy(data ?? {}, (v) => v !== void 0 && v !== null);
+}
 const setEnv = (e) => {
   env = e;
   http = createHttpClient(
@@ -2921,40 +2947,40 @@ const setEnv = (e) => {
 };
 const onlineRestApiHandlers = {
   get_canvases: async (params) => {
-    logInfo("online handler get_canvases called with:", params);
     check();
-    const { api_base_url, ...restParams } = params;
-    const res = await http.get("/canvases", { params: { ...restParams, instance_id: env.pitcher.instance.id } });
+    const { api_base_url, filters = {}, ...restParams } = params;
+    const res = await http.get("/canvases", {
+      params: {
+        instance_id: env.pitcher.instance.id,
+        ...normalizeNetworkFilterParams(filters),
+        ...pickNonNullish(restParams)
+      }
+    });
     return res;
   },
   get_canvas: async (params) => {
-    logInfo("online handler get_canvas called with:", params);
     check();
     const { id, ...restParams } = params;
     const res = await http.get(`/canvases/${params.id}`, { params: restParams });
     return res;
   },
   create_canvas: async (params) => {
-    logInfo("online handler create_canvas called with:", params);
     check();
     const res = await http.post("/canvases", { ...params, instance_id: env.pitcher.instance.id });
     return res;
   },
   update_canvas: async (params) => {
-    logInfo("online handler update_canvas called with:", params);
     check();
     const { id, ...restParams } = params;
     const res = await http.patch(`/canvases/${params.id}`, restParams);
     return res;
   },
   delete_canvas: async (params) => {
-    logInfo("online handler delete_canvas called with:", params);
     check();
     const res = await http.delete(`/canvases/${params.id}`);
     return res;
   },
   share_canvas: async (params) => {
-    logInfo("online handler share_canvas called with:", params);
     check();
     let link;
     try {
@@ -3400,8 +3426,12 @@ const dsr = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 }, Symbol.toStringTag, { value: 'Module' }));
 
 let highLevelApi;
+let prevOptions;
 function usePitcherApi(options) {
-  if (!highLevelApi) highLevelApi = createHighLevelApi(options);
+  if (!highLevelApi || !isEqual(options, prevOptions)) {
+    highLevelApi = createHighLevelApi(options);
+    prevOptions = options;
+  }
   return highLevelApi;
 }
 const uiApi = Object.entries(
@@ -3444,7 +3474,7 @@ function getAvailableApis() {
   const location = window.parent.jsApiLocation;
   return location === "ui" ? ["ui", "impact"] : [location ?? "impact"];
 }
-function useApi() {
+function useApi(options) {
   if (typeof window === "undefined") throw new Error("useApi: window is not defined");
   const location = window.parent.jsApiLocation;
   switch (location) {
@@ -3455,7 +3485,7 @@ function useApi() {
     case "dsr":
       return useDsr();
     case "impact":
-      return usePitcherApi();
+      return usePitcherApi(options);
     default:
       throw new Error(`Unknown api for location: ${location}`);
   }