fix: conflicts resolved

Author: Vikram Kalta

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/delivery-sdk",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "type": "module",
   "license": "MIT",
   "main": "./dist/legacy/index.cjs",

package.json

@@ -37,7 +37,8 @@ export function stack(config: StackConfig): StackClass {
     defaultHostname: 'cdn.contentstack.io',
     headers: {} as AxiosRequestHeaders,
     params: {} as any,
-    live_preview: {} as any
+    live_preview: {} as any,
+    port: config.port as number,
   };
 
   defaultConfig.defaultHostname = config.host || Utility.getHost(config.region, config.host);

src/lib/contentstack.ts

@@ -10,7 +10,6 @@ export class Entry {
   private _urlPath: string;
   protected _variants: string;
   _queryParams: { [key: string]: string | number | string[] } = {};
-
   constructor(client: AxiosInstance, contentTypeUid: string, entryUid: string) {
     this._client = client;
     this._contentTypeUid = contentTypeUid;
@@ -195,4 +194,22 @@ export class Entry {
 
     return response;
   }
+
+    /**
+   * @method addParams
+   * @memberof Entry
+   * @description Adds a query parameter to the query.
+   * @example
+   * import contentstack from '@contentstack/delivery-sdk'
+   *
+   * const stack = contentstack.stack({ apiKey: "apiKey", deliveryToken: "deliveryToken", environment: "environment" });
+   * const result = stack.contentType("contentTypeUid").entry().addParams({"key": "value"}).fetch()
+   *
+   * @returns {Entry}
+   */
+  addParams(paramObj: { [key: string]: string | number | string[] }): Entry {
+    this._queryParams = { ...this._queryParams, ...paramObj };
+
+    return this;
+  }
 }

src/lib/entry.ts

@@ -78,8 +78,8 @@ export class Stack {
    * const taxonomy = stack.taxonomy() // For taxonomy query object
    */
   taxonomy(): TaxonomyQuery {
-    return new TaxonomyQuery(this._client)
-  };
+    return new TaxonomyQuery(this._client);
+  }
 
   /**
    * @method GlobalField
@@ -170,16 +170,17 @@ export class Stack {
       this._client.stackConfig.live_preview = livePreviewParams;
     }
 
-    if (query.hasOwnProperty('release_id')) {
-      this._client.defaults.headers['release_id'] = query.release_id;
+    if (query.hasOwnProperty("release_id")) {
+      this._client.defaults.headers["release_id"] = query.release_id;
     } else {
-      delete this._client.defaults.headers['release_id'];
+      delete this._client.defaults.headers["release_id"];
     }
 
-    if (query.hasOwnProperty('preview_timestamp')) {
-      this._client.defaults.headers['preview_timestamp'] = query.preview_timestamp;
+    if (query.hasOwnProperty("preview_timestamp")) {
+      this._client.defaults.headers["preview_timestamp"] =
+        query.preview_timestamp;
     } else {
-      delete this._client.defaults.headers['preview_timestamp'];
+      delete this._client.defaults.headers["preview_timestamp"];
     }
   }
 
@@ -200,4 +201,30 @@ export class Stack {
       throw new Error("Error fetching last activities");
     }
   }
+
+  /**
+   * @method setPort
+   * @memberOf Stack
+   * @description Sets the port of the host
+   * @param {Number} port - Port Number
+   * @return {Stack}
+   * @instance
+   * */
+  setPort(port: number) {
+    if (typeof port === "number") this.config.port = port;
+    return this;
+  }
+
+  /**
+   * @method setDebug
+   * @memberOf Stack
+   * @description Sets the debug option
+   * @param {Number} debug - Debug value
+   * @return {Stack}
+   * @instance
+   * */
+  setDebug(debug: boolean) {
+    if (typeof debug === "boolean") this.config.debug = debug;
+    return this;
+  }
 }

src/lib/stack.ts

@@ -22,6 +22,8 @@ export interface StackConfig extends HttpClientParams {
   logHandler?: (level: string, data: any) => void;
   cacheOptions?: CacheOptions;
   live_preview?: LivePreview;
+  port?: number;
+  debug?: boolean;
 }
 export interface CacheOptions extends PersistanceStoreOptions {
   policy: Policy;

src/lib/types.ts

@@ -152,5 +152,10 @@ describe('Stack class tests', () => {
     expect(response.content_types).toBeDefined();
     expect(Array.isArray(response.content_types)).toBe(true);
   });
+
+  it('should set port to 3000', () => {
+    stack.setPort(3000);
+    expect(stack.config.port).toEqual(3000);
+  });
 });