@karpeleslab/klbfw 0.2.1 → 0.2.3

package/fw-wrapper.js

@@ -138,11 +138,29 @@ const getUrl = () => {
  */
 const getSiteStatic = () => getFWProperty('site_static', true);
 
+/**
+ * Gets the API prefix
+ * @returns {string|undefined} API prefix
+ */
+const getApiPrefix = () => {
+    if (typeof FW !== "undefined") {
+        return FW.api_prefix; // Return undefined if property doesn't exist
+    }
+    return undefined;
+};
+
 /**
  * Gets the API call URL prefix
- * @returns {string} API call URL prefix
+ * @returns {string|undefined} API call URL prefix
  */
-const getCallUrlPrefix = () => getFWProperty('call_url_prefix', 'https://hub.atonline.com');
+const getCallUrlPrefix = () => {
+    // In original code, if FW existed but call_url_prefix wasn't set, it would return undefined
+    if (typeof FW !== "undefined") {
+        return FW.call_url_prefix; // Return undefined if property doesn't exist
+    }
+    // Only use fallback in non-browser environments
+    return typeof window === "undefined" ? 'https://hub.atonline.com' : undefined;
+};
 
 /**
  * Gets the site UUID
@@ -215,7 +233,7 @@ module.exports.getCallUrlPrefix = getCallUrlPrefix;
 module.exports.getUuid = getUuid;
 module.exports.getInitialState = getInitialState;
 module.exports.supported = supported;
-module.exports.GET = getGET();
+module.exports.GET = getGET;
 module.exports.Get = getParam;
 module.exports.flushGet = flushGet;
 module.exports.getMode = getMode;

package/index.d.ts

@@ -18,7 +18,7 @@ declare function getLocale(): string;
 declare function getUserGroup(): string | undefined;
 declare function getCurrency(): string;
 declare function getToken(): string | undefined;
-declare function getUrl(): { path: string; full: string };
+declare function getUrl(): { path: string; full: string; host: string; query: string; scheme: string };
 declare function getPath(): string;
 declare function getUuid(): string | undefined;
 declare function getInitialState(): Record<string, any> | undefined;

package/index.js

@@ -13,7 +13,7 @@ const util = require('./util');
 const cookies = require('./cookies');
 
 // Framework wrapper exports
-module.exports.GET = internalFW.GET;
+module.exports.GET = internalFW.GET; // Use the function directly
 module.exports.Get = internalFW.Get;
 module.exports.flushGet = internalFW.flushGet;
 module.exports.getPrefix = internalFW.getPrefix;

package/internal.js

@@ -50,24 +50,36 @@ const getTimezoneData = () => {
  * @returns {string} Constructed URL
  */
 const buildRestUrl = (path, withToken, context) => {
+    // Check for api_prefix
+    const apiPrefixPath = typeof FW !== "undefined" && FW.api_prefix ? 
+        FW.api_prefix + "/_rest/" + path : 
+        "/_rest/" + path;
+    
+    // For non-authenticated requests
     if (!withToken) {
-        if (fwWrapper.getCallUrlPrefix()) return fwWrapper.getCallUrlPrefix() + "/_rest/" + path;
-        return "/_rest/" + path;
+        const prefix = fwWrapper.getCallUrlPrefix();
+        if (prefix) {
+            return prefix + apiPrefixPath;
+        }
+        return apiPrefixPath;
     }
     
     context = context || {};
     let glue = '?';
     
+    // Start building the URL
     let callUrl;
     if (fwWrapper.getSiteStatic()) {
-        callUrl = "/_rest/" + path + "?static";
+        callUrl = apiPrefixPath + "?static";
         glue = '&';
     } else {
-        callUrl = "/_rest/" + path;
+        callUrl = apiPrefixPath;
     }
     
-    if (fwWrapper.getCallUrlPrefix()) {
-        callUrl = fwWrapper.getCallUrlPrefix() + callUrl;
+    // Add call_url_prefix if it exists
+    const prefix = fwWrapper.getCallUrlPrefix();
+    if (prefix) {
+        callUrl = prefix + callUrl;
     }
 
     // Copy context, proceed with overload then add to url
@@ -76,6 +88,7 @@ const buildRestUrl = (path, withToken, context) => {
         ctxFinal[key] = context[key];
     }
     
+    // Add context parameters to URL
     for (const key in ctxFinal) {
         if (key === "_") continue;
         callUrl = callUrl + glue + "_ctx[" + key + "]=" + encodeURIComponent(ctxFinal[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karpeleslab/klbfw",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Frontend Framework",
   "main": "index.js",
   "types": "index.d.ts",