use native UrlSearchParams

Author: lbendavid-cloudinary

__TESTS__/unit/url/url.test.ts

@@ -96,13 +96,13 @@ describe('Tests for URL configuration', () => {
   });
 
   it('Should include query params', function () {
-    const image = createNewImage('sample', {cloudName: 'demo'}, {queryParams: {"_i": "abcde", "_z": 1234}});
+    const image = createNewImage('sample', {cloudName: 'demo'}, {urlSearchParams: {"_i": "abcde", "_z": 1234, "_t": false}});
     const url = image.toURL();
-    expect(url).toEqual(`https://res.cloudinary.com/demo/image/upload/sample?_i=abcde&_z=1234`);
+    expect(url).toEqual(`https://res.cloudinary.com/demo/image/upload/sample?_i=abcde&_z=1234&_t=false`);
   });
 
   it('Should include query params with analytics', function () {
-    const image = createNewImage('sample', {cloudName: 'demo'}, {analytics: true, queryParams: {"_i": "abcde"}});
+    const image = createNewImage('sample', {cloudName: 'demo'}, {analytics: true, urlSearchParams: {"_i": "abcde"}});
     const url = image.toURL();
     expect(url).toEqual(`https://res.cloudinary.com/demo/image/upload/sample?_i=abcde&_a=E`);
   });

__TESTS__/unit/urlConfig.test.ts

@@ -158,7 +158,7 @@ describe('It tests a combination of Cloudinary URL and Configuration', () => {
       .setShorten(true)
       .setSignUrl(true)
       .setUseRootPath(true)
-      .setQueryParams({foo: 'bar'});
+      .setUrlSearchParams({foo: 'bar', baz: 111, dummy: true});
 
     expect(conf.cname).toBe('foo');
     expect(conf.forceVersion).toBe(true);
@@ -168,6 +168,6 @@ describe('It tests a combination of Cloudinary URL and Configuration', () => {
     expect(conf.shorten).toBe(true);
     expect(conf.signUrl).toBe(true);
     expect(conf.useRootPath).toBe(true);
-    expect(conf.queryParams).toEqual({foo: 'bar'});
+    expect(conf.setUrlSearchParams).toEqual({foo: 'bar', baz: 111, dummy: true});
   });
 });

src/assets/CloudinaryFile.ts

@@ -283,17 +283,17 @@ class CloudinaryFile {
         .replace(/\?/g, '%3F')
         .replace(/=/g, '%3D');
 
-      const queryParams: Record<string, string | number> = this.urlConfig.queryParams || {};
+      const urlSearchParams = new URLSearchParams(this.urlConfig.urlSearchParams as Record<string, string>);
 
       // urlConfig.analytics is true by default, has to be explicitly set to false to overwrite
       // Don't add analytics when publicId includes a '?' to not risk changing existing query params
       if (this.urlConfig.analytics !== false && !(publicID.includes('?'))) {
-        queryParams._a = getSDKAnalyticsSignature(trackedAnalytics);
+        urlSearchParams.set("_a", getSDKAnalyticsSignature(trackedAnalytics));
       }
 
-      const queryParamsStr = `${Object.entries(queryParams).map(([key, value]) => `${key}=${value}`).join('&')}`;
-      if (queryParamsStr) {
-        return `${safeURL}?${queryParamsStr}`;
+      const searchParams = urlSearchParams.toString();
+      if (searchParams) {
+        return `${safeURL}?${searchParams}`;
       } else {
         return safeURL;
       }

src/config/URLConfig.ts

@@ -13,7 +13,7 @@ class URLConfig extends Config implements IURLConfig {
   useRootPath?: boolean;
   secure?: boolean;
   forceVersion?: boolean;
-  queryParams?: Record<string, string | number>
+  urlSearchParams?: Record<string, string | number | boolean>;
 
   /**
    * @param {IURLConfig} userURLConfig
@@ -104,10 +104,10 @@ class URLConfig extends Config implements IURLConfig {
   }
 
   /**
-   * @param params Sets additional query params
+   * @param params Sets additional params
    */
-  setQueryParams(params: Record<string, string | number>):this {
-    this.queryParams = params;
+  setUrlSearchParams(params: Record<string, string | number | boolean>):this {
+    this.urlSearchParams = params;
     return this;
   }
 }

src/config/interfaces/Config/IURLConfig.ts

@@ -13,7 +13,7 @@
  * @prop {boolean} [secure]
  * @prop {boolean} [forceVersion]
  * @prop {boolean} [analytics]
- * @prop {object} [additionalQueryParams]
+ * @prop {object} [urlSearchParams]
  * @example
  * import Cloudinary from '@cloudinary/url-gen';
  * // The Cloudinary Instance accepts a URLConfig under the `url` key
@@ -96,9 +96,9 @@ interface IURLConfig {
   forceVersion?: boolean;
 
   /**
-   * Additional query params to be added to the URL
+   * Additional params to be added to the URL
    */
-  queryParams?: Record<string, string | number>
+  urlSearchParams?: Record<string, string | number | boolean>
 }
 
 export default IURLConfig;

src/internal/internalConstants.ts

@@ -17,7 +17,7 @@ export const ALLOWED_URL_CONFIG = [
   'secure',
   'forceVersion',
   'analytics',
-  'queryParams'
+  'urlSearchParams'
 ];
 
 /**