@putkoff/abstract-utilities 0.1.116 → 0.1.118

package/dist/cjs/functions/fetch_utils/imports.d.ts

@@ -5,4 +5,4 @@ export { alertit } from './../rndm_utils';
 export { ensure_list } from './../type_utils';
 export { eatInner } from './../string_utils';
 export type { LogoutButtonProps, FetchVariables } from './../../types';
-export { getAppConfig } from '@putkoff/abstract-configs';
+export { getConfig } from './../config_utils';

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

@@ -7,9 +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 get_app_config_url(endpoint: any, appKey?: any): Promise<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: any, body?: any, method?: any, headers?: Record<string, string> | null, blob?: boolean, noApi?: boolean, withCredentials?: boolean, returnJson?: boolean, returnReult?: boolean): Promise<T>;
 export declare function secureFetchIt(endpoint: any, body?: any, method?: any, 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>;
+export declare function fetchSharePatch(file: unknown, appKey?: any): Promise<void>;

package/dist/cjs/index.d.ts

@@ -1,2 +1,3 @@
 export * from './functions';
 export * from './types';
+export { loadConfig } from './utils';

package/dist/cjs/index.js

@@ -1016,21 +1016,29 @@ function alertit(obj = null) {
     alert(msg);
 }
 
-/** Will be filled in by loadConfig() */
-function getAppConfig(endpoint) {
-    const base = apiBase(); // '' until load() finishes
-    const clean = endpoint.replace(/^\/+/, '');
-    return base ? `${base}/${clean}` : `/api/${clean}`;
-}
-/** Accessor for the loaded config. Throws if you forgot to loadConfig(). */
-function getConfig$1() {
-    {
-        throw new Error('Config not loaded! Call loadConfig() first.');
-    }
+let _cachedConfig = null;
+function loadConfig$1() {
+    return __awaiter(this, arguments, void 0, function* (filePath = null) {
+        // 1. If nobody passed a custom path, we default to "config.json" (relative)
+        const relativePath = filePath || 'config.json';
+        // 2. Resolve it against the running page’s URL (document.baseURI)
+        const configUrl = new URL(relativePath, document.baseURI).href;
+        // 3. Fetch + cache
+        if (_cachedConfig)
+            return _cachedConfig;
+        const res = yield fetch(configUrl);
+        if (!res.ok) {
+            throw new Error(`Could not fetch ${configUrl}: ${res.status}`);
+        }
+        _cachedConfig = (yield res.json());
+        return _cachedConfig;
+    });
 }
-/** Convenience to grab the base URL once loaded. */
-function apiBase() {
-    return getConfig$1().API_BASE_URL.replace(/\/+$/, '');
+function getConfig(key) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cfg = yield loadConfig$1();
+        return key ? cfg[key] : cfg;
+    });
 }
 
 function ensureAbstractUrl(endpoint, slices = []) {
@@ -1158,12 +1166,17 @@ function getFetchVars(headers = null, method = null, body = null) {
 /** 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 get_app_config_url(endpoint_1) {
+    return __awaiter(this, arguments, void 0, function* (endpoint, appKey = null) {
+        const cleanEndpoint = endpoint.replace(/^\/+/, "");
+        const config = yield getConfig();
+        const baseUrl = JSON.stringify(config);
+        appKey = appKey || 'BASE_API_URL';
+        const base = baseUrl[appKey];
+        const baseSlices = base.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) {
@@ -1179,7 +1192,7 @@ function secureFetchIt(endpoint_1) {
         method = method || "GET";
         let url = endpoint;
         if (!noApi) {
-            url = get_app_config_url(url);
+            url = yield get_app_config_url(endpoint);
         }
         // 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);
@@ -1216,13 +1229,11 @@ function requestPatch(url_1) {
     });
 }
 // Performs PATCH request for file sharing
-function fetchSharePatch(file) {
-    return __awaiter(this, void 0, void 0, function* () {
+function fetchSharePatch(file_1) {
+    return __awaiter(this, arguments, void 0, function* (file, appKey = null) {
         const cleanEndpoint = '/files/share';
-        const baseUrl = getAppConfig(cleanEndpoint);
-        const baseSlices = baseUrl.split("/").filter(Boolean);
-        const url = ensureAbstractUrl(cleanEndpoint, baseSlices);
         // build final URL
+        const url = yield get_app_config_url(cleanEndpoint);
         const token = localStorage.getItem('token');
         const body = JSON.stringify(file);
         const method = 'PATCH';
@@ -1280,31 +1291,6 @@ function Spinner() {
     return (jsxRuntime.jsx("p", { className: 'animate-pulse', children: "Loading\u2026" }));
 }
 
-let _cachedConfig = null;
-function loadConfig() {
-    return __awaiter(this, arguments, void 0, function* (filePath = null) {
-        // 1. If nobody passed a custom path, we default to "config.json" (relative)
-        const relativePath = filePath || 'config.json';
-        // 2. Resolve it against the running page’s URL (document.baseURI)
-        const configUrl = new URL(relativePath, document.baseURI).href;
-        // 3. Fetch + cache
-        if (_cachedConfig)
-            return _cachedConfig;
-        const res = yield fetch(configUrl);
-        if (!res.ok) {
-            throw new Error(`Could not fetch ${configUrl}: ${res.status}`);
-        }
-        _cachedConfig = (yield res.json());
-        return _cachedConfig;
-    });
-}
-function getConfig(key) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cfg = yield loadConfig();
-        return key ? cfg[key] : cfg;
-    });
-}
-
 // src/read_utils.ts
 /**
  * Attempt to load the Node-only modules.
@@ -1352,6 +1338,17 @@ function readJsonFile(relativeOrAbsolutePath) {
     });
 }
 
+function loadConfig() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const base = (process.env.BASE_API_URL || "").replace(/\/+$/, "");
+        const url = `${base}/config.json`;
+        const res = yield fetch(url);
+        if (!res.ok)
+            throw new Error(`Failed to load ${url}: ${res.status}`);
+        yield res.json();
+    });
+}
+
 Object.defineProperty(exports, "useCallback", {
     enumerable: true,
     get: function () { return react.useCallback; }
@@ -1432,6 +1429,7 @@ exports.get_window_parts = get_window_parts;
 exports.get_window_pathname = get_window_pathname;
 exports.isLoggedIn = isLoggedIn;
 exports.isTokenExpired = isTokenExpired;
+exports.loadConfig = loadConfig;
 exports.make_path = make_path;
 exports.make_sanitized_path = make_sanitized_path;
 exports.normalizeUrl = normalizeUrl;