@xy-planning-network/trees 0.4.8-rc-2 → 0.4.8

package/dist/trees.es.js

@@ -1237,66 +1237,55 @@ axios$1.isAxiosError = isAxiosError;
 axios$2.exports = axios$1;
 axios$2.exports.default = axios$1;
 var axios = axios$2.exports;
-const apiAxiosInstance = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API_URL || "/api/v1",
-  responseType: "json",
-  withCredentials: true
-});
-const apiDataIntercept = (response) => {
+const apiDelayReqIntercept = (config) => {
+  const delay = config.withDelay || 0;
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(config);
+    }, Math.max(delay, 0));
+  });
+};
+const apiDataRespIntercept = (response) => {
   var _a;
-  if ((_a = response.data) == null ? void 0 : _a.data) {
-    return response.data;
+  if (response.config.dataIntercept && ((_a = response.data) == null ? void 0 : _a.data)) {
+    response.data = response.data.data;
   }
   return response;
 };
-const apiDelay = (func, delay = 0) => {
-  setTimeout(func, delay);
-};
+const apiAxiosInstance = axios.create({
+  baseURL: process.env.VUE_APP_BASE_API_URL || "/api/v1",
+  responseType: "json",
+  withCredentials: true,
+  headers: {
+    "Content-Type": "application/json"
+  }
+});
+apiAxiosInstance.interceptors.request.use(apiDelayReqIntercept);
+apiAxiosInstance.interceptors.response.use(apiDataRespIntercept);
 const BaseAPI = {
-  makeRequest(config, opts) {
-    config.data = JSON.stringify(config.data);
-    config.headers = { "Content-Type": "application/json" };
-    let dataIntercept;
-    if (opts.dataIntercept) {
-      dataIntercept = apiAxiosInstance.interceptors.response.use(apiDataIntercept);
-    }
+  makeRequest(opts) {
     const wait = window.setTimeout(() => {
       if (!opts.skipLoader) {
         window.VueBus.emit("Spinner-show");
       }
     }, 200);
-    return new Promise((resolve, reject) => {
-      apiAxiosInstance(config).then((success) => {
-        apiDelay(() => {
-          resolve(success.data);
-        }, opts.withDelay || 0);
-      }, (err) => {
-        apiDelay(() => {
-          reject(err);
-        }, opts.withDelay || 0);
-      }).finally(() => {
-        if (dataIntercept !== null) {
-          apiAxiosInstance.interceptors.response.eject(dataIntercept);
-        }
-        apiDelay(() => {
-          window.clearTimeout(wait);
-          if (!opts.skipLoader)
-            window.VueBus.emit("Spinner-hide");
-        }, opts.withDelay || 0);
-      });
+    return apiAxiosInstance(opts).then((success) => success.data).finally(() => {
+      if (!opts.skipLoader)
+        window.VueBus.emit("Spinner-hide");
+      window.clearTimeout(wait);
     });
   },
   get(path, opts, params) {
-    return this.makeRequest({ url: path, method: "GET", params }, opts);
+    return this.makeRequest(__spreadValues({ url: path, method: "GET", params }, opts));
   },
   delete(path, opts) {
-    return this.makeRequest({ url: path, method: "DELETE" }, opts);
+    return this.makeRequest(__spreadValues({ url: path, method: "DELETE" }, opts));
   },
   post(path, data2, opts) {
-    return this.makeRequest({ url: path, data: data2, method: "POST" }, opts);
+    return this.makeRequest(__spreadValues({ url: path, data: data2, method: "POST" }, opts));
   },
   put(path, data2, opts) {
-    return this.makeRequest({ url: path, data: data2, method: "PUT" }, opts);
+    return this.makeRequest(__spreadValues({ url: path, data: data2, method: "PUT" }, opts));
   }
 };
 function _extends() {
@@ -9439,7 +9428,7 @@ var components = /* @__PURE__ */ Object.freeze({
   TextArea: _sfc_main$1,
   YesOrNoRadio: _sfc_main
 });
-function useBaseAPI(path, method = "GET", initOpts = {}, initConfig = {}) {
+function useBaseAPI(path, method = "GET", initOpts = {}) {
   const result = ref();
   const error = shallowRef();
   const hasFetched = ref(false);
@@ -9453,21 +9442,21 @@ function useBaseAPI(path, method = "GET", initOpts = {}, initConfig = {}) {
       controller.abort();
     }
   };
-  const execute = (data2 = {}, execOpts = {}, execConfig = {}) => {
+  const execute = (data2 = {}, opts = {}) => {
     requestCount++;
     const count = requestCount;
     controller = new AbortController();
     isAborted.value = false;
     isFinished.value = false;
     isLoading.value = true;
-    const requestConfig = __spreadValues(__spreadProps(__spreadValues({}, initConfig), {
-      data: !["GET", "get"].includes(method) ? data2 : {},
+    const requestOpts = __spreadValues(__spreadProps(__spreadValues({}, initOpts), {
+      data: ["POST", "post", "PUT", "put"].includes(method) ? data2 : {},
       method,
       params: ["GET", "get"].includes(method) ? data2 : {},
       signal: controller.signal,
       url: path
-    }), execConfig);
-    return BaseAPI.makeRequest(requestConfig, __spreadValues(__spreadValues({}, initOpts), execOpts)).then((success) => {
+    }), opts);
+    return BaseAPI.makeRequest(requestOpts).then((success) => {
       result.value = success;
       error.value = void 0;
       isAborted.value = false;
@@ -9500,17 +9489,17 @@ function useBaseAPI(path, method = "GET", initOpts = {}, initConfig = {}) {
     execute
   };
 }
-function useBaseAPIGet(url, initOpts = {}, initConfig = {}) {
-  return useBaseAPI(url, "GET", initOpts, initConfig);
+function useBaseAPIGet(url, opts = {}) {
+  return useBaseAPI(url, "GET", opts);
 }
-function useBaseAPIDelete(url, initOpts = {}, initConfig = {}) {
-  return useBaseAPI(url, "DELETE", initOpts, initConfig);
+function useBaseAPIDelete(url, opts = {}) {
+  return useBaseAPI(url, "DELETE", opts);
 }
-function useBaseAPIPost(url, initOpts = {}, initConfig = {}) {
-  return useBaseAPI(url, "POST", initOpts, initConfig);
+function useBaseAPIPost(url, opts = {}) {
+  return useBaseAPI(url, "POST", opts);
 }
-function useBaseAPIPut(url, initOpts = {}, initConfig = {}) {
-  return useBaseAPI(url, "PUT", initOpts, initConfig);
+function useBaseAPIPut(url, opts = {}) {
+  return useBaseAPI(url, "PUT", opts);
 }
 const install = function installTrees(app) {
   Object.entries(components).forEach(([componentName, component]) => {