@putkoff/abstract-utilities 0.1.1 → 0.1.102

package/dist/cjs/functions/fetch_utils/src/fetchIt_utils.d.ts

@@ -7,6 +7,7 @@
 *
 */
 /** Pulls base-URL from AppConfig.API_BASE_URL, strips trailing slashes */
+export declare function get_app_config_url(endpoint: any): string;
 export declare function fetchIt(endpoint: string, body?: unknown, method?: string | null, headers?: Record<string, string> | null, blob?: boolean | null, no_api?: boolean, requireAuth?: boolean): Promise<unknown>;
 export declare function secureFetchIt<T>(endpoint: string, body?: unknown, method?: string, headers?: Record<string, string> | null, blob?: false, noApi?: boolean, requireAuth?: boolean): Promise<T>;
 export declare function secureFetchIt(endpoint: string, body?: unknown, method?: string, headers?: Record<string, string> | null, blob?: boolean, noApi?: boolean, withCredentials?: boolean, returnJson?: boolean): Promise<Blob>;

package/dist/cjs/index.js

@@ -1009,6 +1009,18 @@ function ensureAbstractUrl(endpoint, slices = []) {
     // 5) hand it back to make_path to join “target” + “strippedEndpoint”
     return make_path(target, strippedEndpoint);
 }
+/**
+ * Unwraps nested { result } fields until you hit a non-object or no more "result" keys.
+ */
+function getResult(obj) {
+    let current = obj;
+    while (current &&
+        typeof current === "object" &&
+        Object.prototype.hasOwnProperty.call(current, "result")) {
+        current = current.result;
+    }
+    return current;
+}
 // Constructs API URL from endpoint
 function api(endpoint) {
     return ensureAbstractUrl(endpoint);
@@ -1121,6 +1133,13 @@ function getAppConfig(endpoint) {
 /** Pulls base-URL from AppConfig.API_BASE_URL, strips trailing slashes */
 // src/functions/fetch/secureFetchIt.ts
 // --- fetch_utils/src/fetch_utils.ts ----------------------------
+function get_app_config_url(endpoint) {
+    const cleanEndpoint = endpoint.replace(/^\/+/, "");
+    const baseUrl = getAppConfig(cleanEndpoint);
+    const baseSlices = baseUrl.split("/").filter(Boolean);
+    const url = ensureAbstractUrl(cleanEndpoint, baseSlices);
+    return url;
+}
 function fetchIt(endpoint_1) {
     return __awaiter(this, arguments, void 0, function* (endpoint, body = null, method = null, headers = null, blob = null, no_api = false, requireAuth = true) {
         const vars = getFetchVars(headers, method, body);
@@ -1133,14 +1152,10 @@ function secureFetchIt(endpoint_1) {
     return __awaiter(this, arguments, void 0, function* (endpoint, body = null, method = null, customHeaders = null, blob = false, noApi = false, withCredentials = true, returnJson = true) {
         // strip leading slashes off the endpoint
         method = method || "GET";
-        const cleanEndpoint = endpoint.replace(/^\/+/, "");
-        // decide whether to build off your API_BASE_URL or not
-        const rawBase = getAppConfig(cleanEndpoint);
-        const baseSlices = noApi
-            ? []
-            : rawBase.split("/").filter(Boolean);
-        // build final URL
-        const url = ensureAbstractUrl(cleanEndpoint, baseSlices);
+        let url = endpoint.replace(/^\/+/, "");
+        if (!noApi) {
+            url = get_app_config_url(url);
+        }
         // headers: JSON by default, plus any auth + overrides
         const headers = Object.assign(Object.assign(Object.assign({}, (body instanceof FormData ? {} : { "Content-Type": "application/json" })), getAuthorizationHeader()), customHeaders);
         const opts = {
@@ -1162,7 +1177,7 @@ function secureFetchIt(endpoint_1) {
         if (blob)
             return res.blob();
         if (returnJson)
-            return res.json();
+            return getResult(res.json());
         return res;
     });
 }
@@ -1176,15 +1191,22 @@ function requestPatch(url_1) {
 // Performs PATCH request for file sharing
 function fetchSharePatch(file) {
     return __awaiter(this, void 0, void 0, function* () {
-        const url = getAppConfig('/files/share');
+        const cleanEndpoint = '/files/share';
+        const baseUrl = getAppConfig(cleanEndpoint);
+        const baseSlices = baseUrl.split("/").filter(Boolean);
+        const url = ensureAbstractUrl(cleanEndpoint, baseSlices);
+        // build final URL
         const token = localStorage.getItem('token');
+        const body = JSON.stringify(file);
+        const method = 'PATCH';
+        const headers = {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`,
+        };
         const resp = yield fetch(url, {
-            method: 'PATCH',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${token}`,
-            },
-            body: JSON.stringify(file),
+            method,
+            headers,
+            body
         });
         if (!resp.ok) {
             console.error('Error from server', yield resp.text());
@@ -1740,6 +1762,7 @@ exports.getSrcDir = getSrcDir;
 exports.getSubstring = getSubstring;
 exports.getToggleShare = getToggleShare;
 exports.getToken = getToken;
+exports.get_app_config_url = get_app_config_url;
 exports.get_basename = get_basename;
 exports.get_dirname = get_dirname;
 exports.get_extname = get_extname;