merchi_sdk_ts 1.0.72-test-c → 1.0.72-test-d

package/dist/request.js

@@ -51,30 +51,40 @@ function ensureVersionInUri(baseUrl) {
     if (!uri.endsWith('/')) {
         uri += '/';
     }
-    // Check if the URI already includes the API version
-    var versionPattern = new RegExp("/".concat(version, "/?$"));
-    if (!versionPattern.test(uri)) {
-        uri += version + '/';
+    // 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 uri;
+    return {
+        baseUrl: uri,
+        version: version
+    };
 }
 export function backendFetch(baseUrl, resource, options) {
     var e_1, _a;
-    var uriWithVersion = ensureVersionInUri(baseUrl);
+    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(uriWithVersion + cleanResource);
+    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-c",
+  "version": "1.0.72-test-d",
   "main": "dist/index.js",
   "type": "module",
   "repository": "git@github.com:merchisdk/merchi_sdk_ts.git",

package/src/request.ts

@@ -25,27 +25,43 @@ export class ApiError extends Error {
 
 export const version = 'v6';
 
-function ensureVersionInUri(baseUrl: string): string {
+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 the API version
-  const versionPattern = new RegExp(`/${version}/?$`);
-  if (!versionPattern.test(uri)) {
-    uri += version + '/';
+  // 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 uri;
+  return {
+    baseUrl: uri,
+    version: version
+  };
 }
 
 export function backendFetch(baseUrl: string, resource: string, options?: RequestOptions) {
-  const uriWithVersion = ensureVersionInUri(baseUrl);
+  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(uriWithVersion + cleanResource);
+  const url = new URL(cleanBaseUrl + apiVersion + '/' + cleanResource);
   if (options && options.query) {
     for (const entry of options.query) {
       url.searchParams.append(entry[0], entry[1]);