merchi_sdk_ts 1.0.72-test-b → 1.0.72-test-d

package/dist/merchi.js

@@ -194,16 +194,10 @@ var Merchi = /** @class */ (function () {
         if (!determinedBaseUri) {
             determinedBaseUri = 'https://api.merchi.co/';
         }
-        // Ensure determinedBaseUri ends with a slash before appending version
+        // Ensure determinedBaseUri ends with a slash
         if (!determinedBaseUri.endsWith('/')) {
             determinedBaseUri += '/';
         }
-        // Check if the URI already includes the API version
-        var versionPattern = new RegExp("/".concat(API_VERSION, "/?$"));
-        if (!versionPattern.test(determinedBaseUri)) {
-            determinedBaseUri += API_VERSION + '/';
-        }
-        console.log('what is  determinedBaseUri', determinedBaseUri);
         this.backendUri = determinedBaseUri;
         // re-export configured versions of all classes
         this.AutomaticPaymentRelationship = this.setupClass(AutomaticPaymentRelationship);

package/dist/request.js

@@ -45,21 +45,46 @@ var ApiError = /** @class */ (function (_super) {
 }(Error));
 export { ApiError };
 export var version = 'v6';
+function ensureVersionInUri(baseUrl) {
+    // Ensure baseUrl ends with a slash
+    var uri = baseUrl;
+    if (!uri.endsWith('/')) {
+        uri += '/';
+    }
+    // Check if the URI already includes a version
+    var versionPattern = new RegExp('/v\\d+/?$');
+    var match = uri.match(versionPattern);
+    if (match) {
+        // Extract the version and remove it from the URI
+        var foundVersion = match[0].replace(/\//g, '');
+        var strippedUri = uri.replace(versionPattern, '/');
+        return {
+            baseUrl: strippedUri,
+            version: foundVersion
+        };
+    }
+    return {
+        baseUrl: uri,
+        version: version
+    };
+}
 export function backendFetch(baseUrl, resource, options) {
     var e_1, _a;
-    var url = new URL(resource, baseUrl);
-    console.log(url, 'what is the url here?');
+    var _b = ensureVersionInUri(baseUrl), cleanBaseUrl = _b.baseUrl, apiVersion = _b.version;
+    // Remove leading slash from resource if it exists to prevent double slashes
+    var cleanResource = resource.startsWith('/') ? resource.slice(1) : resource;
+    var url = new URL(cleanBaseUrl + apiVersion + '/' + cleanResource);
     if (options && options.query) {
         try {
-            for (var _b = __values(options.query), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var entry = _c.value;
+            for (var _c = __values(options.query), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var entry = _d.value;
                 url.searchParams.append(entry[0], entry[1]);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
             finally { if (e_1) throw e_1.error; }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_sdk_ts",
-  "version": "1.0.72-test-b",
+  "version": "1.0.72-test-d",
   "main": "dist/index.js",
   "type": "module",
   "repository": "git@github.com:merchisdk/merchi_sdk_ts.git",

package/src/merchi.ts

@@ -240,18 +240,11 @@ export class Merchi {
       determinedBaseUri = 'https://api.merchi.co/';
     }
 
-    // Ensure determinedBaseUri ends with a slash before appending version
+    // Ensure determinedBaseUri ends with a slash
     if (!determinedBaseUri.endsWith('/')) {
       determinedBaseUri += '/';
     }
 
-    // Check if the URI already includes the API version
-    const versionPattern = new RegExp(`/${API_VERSION}/?$`);
-    if (!versionPattern.test(determinedBaseUri)) {
-      determinedBaseUri += API_VERSION + '/';
-    }
-
-    console.log('what is  determinedBaseUri', determinedBaseUri);
     this.backendUri = determinedBaseUri;
 
     // re-export configured versions of all classes

package/src/request.ts

@@ -25,9 +25,43 @@ export class ApiError extends Error {
 
 export const version = 'v6';
 
+interface UriComponents {
+  baseUrl: string;
+  version: string;
+}
+
+function ensureVersionInUri(baseUrl: string): UriComponents {
+  // Ensure baseUrl ends with a slash
+  let uri = baseUrl;
+  if (!uri.endsWith('/')) {
+    uri += '/';
+  }
+
+  // Check if the URI already includes a version
+  const versionPattern = new RegExp('/v\\d+/?$');
+  const match = uri.match(versionPattern);
+  
+  if (match) {
+    // Extract the version and remove it from the URI
+    const foundVersion = match[0].replace(/\//g, '');
+    const strippedUri = uri.replace(versionPattern, '/');
+    return {
+      baseUrl: strippedUri,
+      version: foundVersion
+    };
+  }
+
+  return {
+    baseUrl: uri,
+    version: version
+  };
+}
+
 export function backendFetch(baseUrl: string, resource: string, options?: RequestOptions) {
-  const url = new URL(resource, baseUrl);
-  console.log(url, 'what is the url here?');
+  const { baseUrl: cleanBaseUrl, version: apiVersion } = ensureVersionInUri(baseUrl);
+  // Remove leading slash from resource if it exists to prevent double slashes
+  const cleanResource = resource.startsWith('/') ? resource.slice(1) : resource;
+  const url = new URL(cleanBaseUrl + apiVersion + '/' + cleanResource);
   if (options && options.query) {
     for (const entry of options.query) {
       url.searchParams.append(entry[0], entry[1]);