merchi_sdk_ts 1.0.72-test → 1.0.72-test-b

package/dist/merchi.js

@@ -194,10 +194,17 @@ var Merchi = /** @class */ (function () {
         if (!determinedBaseUri) {
             determinedBaseUri = 'https://api.merchi.co/';
         }
+        // Ensure determinedBaseUri ends with a slash before appending version
         if (!determinedBaseUri.endsWith('/')) {
             determinedBaseUri += '/';
         }
-        this.backendUri = determinedBaseUri + API_VERSION + '/';
+        // 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);
         this.Variation = this.setupClass(Variation);

package/dist/request.js

@@ -48,6 +48,7 @@ export var version = 'v6';
 export function backendFetch(baseUrl, resource, options) {
     var e_1, _a;
     var url = new URL(resource, baseUrl);
+    console.log(url, 'what is the url here?');
     if (options && options.query) {
         try {
             for (var _b = __values(options.query), _c = _b.next(); !_c.done; _c = _b.next()) {

package/package.json

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

package/src/merchi.ts

@@ -240,10 +240,19 @@ export class Merchi {
       determinedBaseUri = 'https://api.merchi.co/';
     }
 
+    // Ensure determinedBaseUri ends with a slash before appending version
     if (!determinedBaseUri.endsWith('/')) {
       determinedBaseUri += '/';
     }
-    this.backendUri = determinedBaseUri + API_VERSION + '/';
+
+    // 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
     this.AutomaticPaymentRelationship = this.setupClass(

package/src/request.ts

@@ -27,6 +27,7 @@ export const version = 'v6';
 
 export function backendFetch(baseUrl: string, resource: string, options?: RequestOptions) {
   const url = new URL(resource, baseUrl);
+  console.log(url, 'what is the url here?');
   if (options && options.query) {
     for (const entry of options.query) {
       url.searchParams.append(entry[0], entry[1]);