@putkoff/abstract-utilities 0.1.101 → 0.1.103

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

@@ -7,8 +7,9 @@
 *
 */
 /** 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>;
+export declare function secureFetchIt(endpoint: string, body?: unknown, method?: string, headers?: Record<string, string> | null, blob?: boolean, noApi?: boolean, withCredentials?: boolean, returnJson?: boolean, returnReult?: boolean): Promise<Blob>;
 export declare function requestPatch(url: string, body?: unknown): Promise<Response>;
 export declare function fetchSharePatch(file: unknown): Promise<void>;

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);
@@ -1130,17 +1149,13 @@ function fetchIt(endpoint_1) {
     });
 }
 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) {
+    return __awaiter(this, arguments, void 0, function* (endpoint, body = null, method = null, customHeaders = null, blob = false, noApi = false, withCredentials = true, returnJson = true, returnReult = 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;
+        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 = {
@@ -1161,6 +1176,8 @@ function secureFetchIt(endpoint_1) {
         }
         if (blob)
             return res.blob();
+        if (returnReult)
+            return getResult(res.json());
         if (returnJson)
             return res.json();
         return res;
@@ -1179,8 +1196,8 @@ function fetchSharePatch(file) {
         const cleanEndpoint = '/files/share';
         const baseUrl = getAppConfig(cleanEndpoint);
         const baseSlices = baseUrl.split("/").filter(Boolean);
-        // build final URL
         const url = ensureAbstractUrl(cleanEndpoint, baseSlices);
+        // build final URL
         const token = localStorage.getItem('token');
         const body = JSON.stringify(file);
         const method = 'PATCH';
@@ -1373,7 +1390,7 @@ function uploadFiles(file_1) {
         formData.append('file', file);
         formData.append('subdir', subdir.trim());
         try {
-            const json = yield secureFetchIt('upload', formData, 'POST', null, false, true);
+            const json = yield secureFetchIt('upload', formData, 'POST', null, false, false);
             if (!json || typeof json !== 'object') {
                 throw new Error('Invalid response from server.');
             }
@@ -1747,6 +1764,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;