@dotcms/client 1.0.6-next.2 → 1.0.6-next.3

package/index.cjs.js

@@ -45,7 +45,13 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
  * Fields that should not be formatted when sanitizing the query.
  * These fields are essential for maintaining the integrity of the content type.
  */
-const CONTENT_TYPE_MAIN_FIELDS = ['live', 'variant', 'contentType', 'languageId'];
+const CONTENT_TYPE_MAIN_FIELDS = [
+    'live',
+    'variant',
+    'contentType',
+    'languageId',
+    'conhost'
+];
 /**
  * URL endpoint for the content API search functionality.
  */
@@ -77,6 +83,58 @@ function sanitizeQueryForContentType(query, contentType) {
             : original; // Return the field if it is a content type field
     });
 }
+/**
+ * @description
+ * Determines whether a site ID constraint should be added to a query based on existing constraints.
+ *
+ * The site ID constraint is added only when:
+ * - Query doesn't already contain a positive site constraint (+conhost)
+ * - Query doesn't explicitly exclude the specified site ID (-conhost:siteId)
+ * - Site ID is provided and configured
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +languageId:1';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // true
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog -conhost:123';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (explicitly excluded)
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +conhost:456';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (already has constraint)
+ * ```
+ *
+ * @export
+ * @param {string} query - The Lucene query string to analyze
+ * @param {string | number | null | undefined} siteId - The site ID to check for
+ * @returns {boolean} True if site ID constraint should be added, false otherwise
+ */
+function shouldAddSiteIdConstraint(query, siteId) {
+    // No site ID configured
+    if (!siteId) {
+        return false;
+    }
+    // Query already contains a positive site constraint
+    const hasExistingSiteConstraint = /\+conhost/gi.test(query);
+    if (hasExistingSiteConstraint) {
+        return false;
+    }
+    // Query explicitly excludes this specific site ID
+    const hasThisSiteIdExclusion = new RegExp(`-conhost:${siteId}`, 'gi').test(query);
+    if (hasThisSiteIdExclusion) {
+        return false;
+    }
+    return true;
+}
 
 var _Field_query;
 /**
@@ -579,7 +637,7 @@ class QueryBuilder {
 }
 _QueryBuilder_query = new WeakMap();
 
-var _CollectionBuilder_page, _CollectionBuilder_limit, _CollectionBuilder_depth, _CollectionBuilder_render, _CollectionBuilder_sortBy, _CollectionBuilder_contentType, _CollectionBuilder_defaultQuery, _CollectionBuilder_query, _CollectionBuilder_rawQuery, _CollectionBuilder_languageId, _CollectionBuilder_draft, _CollectionBuilder_serverUrl, _CollectionBuilder_requestOptions;
+var _CollectionBuilder_page, _CollectionBuilder_limit, _CollectionBuilder_depth, _CollectionBuilder_render, _CollectionBuilder_sortBy, _CollectionBuilder_contentType, _CollectionBuilder_defaultQuery, _CollectionBuilder_query, _CollectionBuilder_rawQuery, _CollectionBuilder_languageId, _CollectionBuilder_draft, _CollectionBuilder_requestOptions, _CollectionBuilder_config;
 /**
  * Creates a Builder to filter and fetch content from the content API for a specific content type.
  *
@@ -591,11 +649,11 @@ class CollectionBuilder {
     /**
      * Creates an instance of CollectionBuilder.
      * @param {ClientOptions} requestOptions Options for the client request.
-     * @param {string} serverUrl The server URL.
+     * @param {DotCMSClientConfig} config The client configuration.
      * @param {string} contentType The content type to fetch.
      * @memberof CollectionBuilder
      */
-    constructor(requestOptions, serverUrl, contentType) {
+    constructor(requestOptions, config, contentType) {
         _CollectionBuilder_page.set(this, 1);
         _CollectionBuilder_limit.set(this, 10);
         _CollectionBuilder_depth.set(this, 0);
@@ -607,10 +665,10 @@ class CollectionBuilder {
         _CollectionBuilder_rawQuery.set(this, void 0);
         _CollectionBuilder_languageId.set(this, 1);
         _CollectionBuilder_draft.set(this, false);
-        _CollectionBuilder_serverUrl.set(this, void 0);
         _CollectionBuilder_requestOptions.set(this, void 0);
+        _CollectionBuilder_config.set(this, void 0);
         __classPrivateFieldSet(this, _CollectionBuilder_requestOptions, requestOptions, "f");
-        __classPrivateFieldSet(this, _CollectionBuilder_serverUrl, serverUrl, "f");
+        __classPrivateFieldSet(this, _CollectionBuilder_config, config, "f");
         __classPrivateFieldSet(this, _CollectionBuilder_contentType, contentType, "f");
         // Build the default query with the contentType field
         __classPrivateFieldSet(this, _CollectionBuilder_defaultQuery, new QueryBuilder().field('contentType').equals(__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")), "f");
@@ -643,7 +701,17 @@ class CollectionBuilder {
      * @memberof CollectionBuilder
      */
     get url() {
-        return `${__classPrivateFieldGet(this, _CollectionBuilder_serverUrl, "f")}${CONTENT_API_URL}`;
+        return `${__classPrivateFieldGet(this, _CollectionBuilder_config, "f").dotcmsUrl}${CONTENT_API_URL}`;
+    }
+    /**
+     * Returns the site ID from the configuration.
+     *
+     * @readonly
+     * @private
+     * @memberof CollectionBuilder
+     */
+    get siteId() {
+        return __classPrivateFieldGet(this, _CollectionBuilder_config, "f").siteId;
     }
     /**
      * Returns the current query built.
@@ -881,12 +949,7 @@ class CollectionBuilder {
      * @memberof CollectionBuilder
      */
     fetch() {
-        const finalQuery = this.currentQuery
-            .field('languageId')
-            .equals(__classPrivateFieldGet(this, _CollectionBuilder_languageId, "f").toString())
-            .field('live')
-            .equals((!__classPrivateFieldGet(this, _CollectionBuilder_draft, "f")).toString())
-            .build();
+        const finalQuery = this.getFinalQuery();
         const sanitizedQuery = sanitizeQueryForContentType(finalQuery, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"));
         const query = __classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f") ? `${sanitizedQuery} ${__classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f")}` : sanitizedQuery;
         return fetch(this.url, {
@@ -908,10 +971,62 @@ class CollectionBuilder {
             })
         });
     }
+    /**
+     * Builds the final Lucene query string by combining the base query with required system constraints.
+     *
+     * This method constructs the complete query by:
+     * 1. Adding language ID filter to ensure content matches the specified language
+     * 2. Adding live/draft status filter based on the draft flag
+     * 3. Optionally adding site ID constraint if conditions are met
+     *
+     * Site ID constraint is added only when:
+     * - Query doesn't already contain a positive site constraint (+conhost)
+     * - Query doesn't explicitly exclude the current site ID (-conhost:currentSiteId)
+     * - Site ID is configured in the system
+     *
+     * @private
+     * @returns {string} The complete Lucene query string ready for the Content API
+     * @memberof CollectionBuilder
+     *
+     * @example
+     * // For live content in language 1 with site ID 123:
+     * // Returns: "+contentType:Blog +languageId:1 +live:true +conhost:123"
+     *
+     * @example
+     * // For draft content without site constraint:
+     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     *
+     * @example
+     * // For content with explicit exclusion of current site (site ID 123):
+     * // Query: "+contentType:Blog -conhost:123"
+     * // Returns: "+contentType:Blog -conhost:123 +languageId:1 +live:true" (no site ID added)
+     *
+     * @example
+     * // For content with exclusion of different site (site ID 456, current is 123):
+     * // Query: "+contentType:Blog -conhost:456"
+     * // Returns: "+contentType:Blog -conhost:456 +languageId:1 +live:true +conhost:123" (site ID still added)
+     */
+    getFinalQuery() {
+        // Build base query with language and live/draft constraints
+        const baseQuery = this.currentQuery
+            .field('languageId')
+            .equals(__classPrivateFieldGet(this, _CollectionBuilder_languageId, "f").toString())
+            .field('live')
+            .equals((!__classPrivateFieldGet(this, _CollectionBuilder_draft, "f")).toString())
+            .build();
+        // Check if site ID constraint should be added using utility function
+        const shouldAddSiteId = shouldAddSiteIdConstraint(baseQuery, this.siteId);
+        // Add site ID constraint if needed
+        if (shouldAddSiteId) {
+            const queryWithSiteId = `${baseQuery} +conhost:${this.siteId}`;
+            return sanitizeQuery(queryWithSiteId);
+        }
+        return baseQuery;
+    }
 }
-_CollectionBuilder_page = new WeakMap(), _CollectionBuilder_limit = new WeakMap(), _CollectionBuilder_depth = new WeakMap(), _CollectionBuilder_render = new WeakMap(), _CollectionBuilder_sortBy = new WeakMap(), _CollectionBuilder_contentType = new WeakMap(), _CollectionBuilder_defaultQuery = new WeakMap(), _CollectionBuilder_query = new WeakMap(), _CollectionBuilder_rawQuery = new WeakMap(), _CollectionBuilder_languageId = new WeakMap(), _CollectionBuilder_draft = new WeakMap(), _CollectionBuilder_serverUrl = new WeakMap(), _CollectionBuilder_requestOptions = new WeakMap();
+_CollectionBuilder_page = new WeakMap(), _CollectionBuilder_limit = new WeakMap(), _CollectionBuilder_depth = new WeakMap(), _CollectionBuilder_render = new WeakMap(), _CollectionBuilder_sortBy = new WeakMap(), _CollectionBuilder_contentType = new WeakMap(), _CollectionBuilder_defaultQuery = new WeakMap(), _CollectionBuilder_query = new WeakMap(), _CollectionBuilder_rawQuery = new WeakMap(), _CollectionBuilder_languageId = new WeakMap(), _CollectionBuilder_draft = new WeakMap(), _CollectionBuilder_requestOptions = new WeakMap(), _CollectionBuilder_config = new WeakMap();
 
-var _Content_requestOptions, _Content_serverUrl;
+var _Content_requestOptions, _Content_config;
 /**
  * Creates a builder to filter and fetch a collection of content items.
  * @param contentType - The content type to retrieve.
@@ -967,11 +1082,11 @@ class Content {
      * @param {RequestOptions} requestOptions - The options for the client request.
      * @param {string} serverUrl - The server URL.
      */
-    constructor(requestOptions, serverUrl) {
+    constructor(config, requestOptions) {
         _Content_requestOptions.set(this, void 0);
-        _Content_serverUrl.set(this, void 0);
+        _Content_config.set(this, void 0);
         __classPrivateFieldSet(this, _Content_requestOptions, requestOptions, "f");
-        __classPrivateFieldSet(this, _Content_serverUrl, serverUrl, "f");
+        __classPrivateFieldSet(this, _Content_config, config, "f");
     }
     /**
      * Takes a content type and returns a builder to filter and fetch the collection.
@@ -1039,10 +1154,10 @@ class Content {
      *
      */
     getCollection(contentType) {
-        return new CollectionBuilder(__classPrivateFieldGet(this, _Content_requestOptions, "f"), __classPrivateFieldGet(this, _Content_serverUrl, "f"), contentType);
+        return new CollectionBuilder(__classPrivateFieldGet(this, _Content_requestOptions, "f"), __classPrivateFieldGet(this, _Content_config, "f"), contentType);
     }
 }
-_Content_requestOptions = new WeakMap(), _Content_serverUrl = new WeakMap();
+_Content_requestOptions = new WeakMap(), _Content_config = new WeakMap();
 
 class NavigationClient {
     constructor(config, requestOptions) {
@@ -1538,7 +1653,7 @@ class DotCMSClient {
         // Initialize clients
         this.page = new PageClient(this.config, this.requestOptions);
         this.nav = new NavigationClient(this.config, this.requestOptions);
-        this.content = new Content(this.requestOptions, this.config.dotcmsUrl);
+        this.content = new Content(this.config, this.requestOptions);
     }
     /**
      * Creates request options with authentication headers.

package/index.esm.js

@@ -43,7 +43,13 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
  * Fields that should not be formatted when sanitizing the query.
  * These fields are essential for maintaining the integrity of the content type.
  */
-const CONTENT_TYPE_MAIN_FIELDS = ['live', 'variant', 'contentType', 'languageId'];
+const CONTENT_TYPE_MAIN_FIELDS = [
+    'live',
+    'variant',
+    'contentType',
+    'languageId',
+    'conhost'
+];
 /**
  * URL endpoint for the content API search functionality.
  */
@@ -75,6 +81,58 @@ function sanitizeQueryForContentType(query, contentType) {
             : original; // Return the field if it is a content type field
     });
 }
+/**
+ * @description
+ * Determines whether a site ID constraint should be added to a query based on existing constraints.
+ *
+ * The site ID constraint is added only when:
+ * - Query doesn't already contain a positive site constraint (+conhost)
+ * - Query doesn't explicitly exclude the specified site ID (-conhost:siteId)
+ * - Site ID is provided and configured
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +languageId:1';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // true
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog -conhost:123';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (explicitly excluded)
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +conhost:456';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (already has constraint)
+ * ```
+ *
+ * @export
+ * @param {string} query - The Lucene query string to analyze
+ * @param {string | number | null | undefined} siteId - The site ID to check for
+ * @returns {boolean} True if site ID constraint should be added, false otherwise
+ */
+function shouldAddSiteIdConstraint(query, siteId) {
+    // No site ID configured
+    if (!siteId) {
+        return false;
+    }
+    // Query already contains a positive site constraint
+    const hasExistingSiteConstraint = /\+conhost/gi.test(query);
+    if (hasExistingSiteConstraint) {
+        return false;
+    }
+    // Query explicitly excludes this specific site ID
+    const hasThisSiteIdExclusion = new RegExp(`-conhost:${siteId}`, 'gi').test(query);
+    if (hasThisSiteIdExclusion) {
+        return false;
+    }
+    return true;
+}
 
 var _Field_query;
 /**
@@ -577,7 +635,7 @@ class QueryBuilder {
 }
 _QueryBuilder_query = new WeakMap();
 
-var _CollectionBuilder_page, _CollectionBuilder_limit, _CollectionBuilder_depth, _CollectionBuilder_render, _CollectionBuilder_sortBy, _CollectionBuilder_contentType, _CollectionBuilder_defaultQuery, _CollectionBuilder_query, _CollectionBuilder_rawQuery, _CollectionBuilder_languageId, _CollectionBuilder_draft, _CollectionBuilder_serverUrl, _CollectionBuilder_requestOptions;
+var _CollectionBuilder_page, _CollectionBuilder_limit, _CollectionBuilder_depth, _CollectionBuilder_render, _CollectionBuilder_sortBy, _CollectionBuilder_contentType, _CollectionBuilder_defaultQuery, _CollectionBuilder_query, _CollectionBuilder_rawQuery, _CollectionBuilder_languageId, _CollectionBuilder_draft, _CollectionBuilder_requestOptions, _CollectionBuilder_config;
 /**
  * Creates a Builder to filter and fetch content from the content API for a specific content type.
  *
@@ -589,11 +647,11 @@ class CollectionBuilder {
     /**
      * Creates an instance of CollectionBuilder.
      * @param {ClientOptions} requestOptions Options for the client request.
-     * @param {string} serverUrl The server URL.
+     * @param {DotCMSClientConfig} config The client configuration.
      * @param {string} contentType The content type to fetch.
      * @memberof CollectionBuilder
      */
-    constructor(requestOptions, serverUrl, contentType) {
+    constructor(requestOptions, config, contentType) {
         _CollectionBuilder_page.set(this, 1);
         _CollectionBuilder_limit.set(this, 10);
         _CollectionBuilder_depth.set(this, 0);
@@ -605,10 +663,10 @@ class CollectionBuilder {
         _CollectionBuilder_rawQuery.set(this, void 0);
         _CollectionBuilder_languageId.set(this, 1);
         _CollectionBuilder_draft.set(this, false);
-        _CollectionBuilder_serverUrl.set(this, void 0);
         _CollectionBuilder_requestOptions.set(this, void 0);
+        _CollectionBuilder_config.set(this, void 0);
         __classPrivateFieldSet(this, _CollectionBuilder_requestOptions, requestOptions, "f");
-        __classPrivateFieldSet(this, _CollectionBuilder_serverUrl, serverUrl, "f");
+        __classPrivateFieldSet(this, _CollectionBuilder_config, config, "f");
         __classPrivateFieldSet(this, _CollectionBuilder_contentType, contentType, "f");
         // Build the default query with the contentType field
         __classPrivateFieldSet(this, _CollectionBuilder_defaultQuery, new QueryBuilder().field('contentType').equals(__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")), "f");
@@ -641,7 +699,17 @@ class CollectionBuilder {
      * @memberof CollectionBuilder
      */
     get url() {
-        return `${__classPrivateFieldGet(this, _CollectionBuilder_serverUrl, "f")}${CONTENT_API_URL}`;
+        return `${__classPrivateFieldGet(this, _CollectionBuilder_config, "f").dotcmsUrl}${CONTENT_API_URL}`;
+    }
+    /**
+     * Returns the site ID from the configuration.
+     *
+     * @readonly
+     * @private
+     * @memberof CollectionBuilder
+     */
+    get siteId() {
+        return __classPrivateFieldGet(this, _CollectionBuilder_config, "f").siteId;
     }
     /**
      * Returns the current query built.
@@ -879,12 +947,7 @@ class CollectionBuilder {
      * @memberof CollectionBuilder
      */
     fetch() {
-        const finalQuery = this.currentQuery
-            .field('languageId')
-            .equals(__classPrivateFieldGet(this, _CollectionBuilder_languageId, "f").toString())
-            .field('live')
-            .equals((!__classPrivateFieldGet(this, _CollectionBuilder_draft, "f")).toString())
-            .build();
+        const finalQuery = this.getFinalQuery();
         const sanitizedQuery = sanitizeQueryForContentType(finalQuery, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"));
         const query = __classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f") ? `${sanitizedQuery} ${__classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f")}` : sanitizedQuery;
         return fetch(this.url, {
@@ -906,10 +969,62 @@ class CollectionBuilder {
             })
         });
     }
+    /**
+     * Builds the final Lucene query string by combining the base query with required system constraints.
+     *
+     * This method constructs the complete query by:
+     * 1. Adding language ID filter to ensure content matches the specified language
+     * 2. Adding live/draft status filter based on the draft flag
+     * 3. Optionally adding site ID constraint if conditions are met
+     *
+     * Site ID constraint is added only when:
+     * - Query doesn't already contain a positive site constraint (+conhost)
+     * - Query doesn't explicitly exclude the current site ID (-conhost:currentSiteId)
+     * - Site ID is configured in the system
+     *
+     * @private
+     * @returns {string} The complete Lucene query string ready for the Content API
+     * @memberof CollectionBuilder
+     *
+     * @example
+     * // For live content in language 1 with site ID 123:
+     * // Returns: "+contentType:Blog +languageId:1 +live:true +conhost:123"
+     *
+     * @example
+     * // For draft content without site constraint:
+     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     *
+     * @example
+     * // For content with explicit exclusion of current site (site ID 123):
+     * // Query: "+contentType:Blog -conhost:123"
+     * // Returns: "+contentType:Blog -conhost:123 +languageId:1 +live:true" (no site ID added)
+     *
+     * @example
+     * // For content with exclusion of different site (site ID 456, current is 123):
+     * // Query: "+contentType:Blog -conhost:456"
+     * // Returns: "+contentType:Blog -conhost:456 +languageId:1 +live:true +conhost:123" (site ID still added)
+     */
+    getFinalQuery() {
+        // Build base query with language and live/draft constraints
+        const baseQuery = this.currentQuery
+            .field('languageId')
+            .equals(__classPrivateFieldGet(this, _CollectionBuilder_languageId, "f").toString())
+            .field('live')
+            .equals((!__classPrivateFieldGet(this, _CollectionBuilder_draft, "f")).toString())
+            .build();
+        // Check if site ID constraint should be added using utility function
+        const shouldAddSiteId = shouldAddSiteIdConstraint(baseQuery, this.siteId);
+        // Add site ID constraint if needed
+        if (shouldAddSiteId) {
+            const queryWithSiteId = `${baseQuery} +conhost:${this.siteId}`;
+            return sanitizeQuery(queryWithSiteId);
+        }
+        return baseQuery;
+    }
 }
-_CollectionBuilder_page = new WeakMap(), _CollectionBuilder_limit = new WeakMap(), _CollectionBuilder_depth = new WeakMap(), _CollectionBuilder_render = new WeakMap(), _CollectionBuilder_sortBy = new WeakMap(), _CollectionBuilder_contentType = new WeakMap(), _CollectionBuilder_defaultQuery = new WeakMap(), _CollectionBuilder_query = new WeakMap(), _CollectionBuilder_rawQuery = new WeakMap(), _CollectionBuilder_languageId = new WeakMap(), _CollectionBuilder_draft = new WeakMap(), _CollectionBuilder_serverUrl = new WeakMap(), _CollectionBuilder_requestOptions = new WeakMap();
+_CollectionBuilder_page = new WeakMap(), _CollectionBuilder_limit = new WeakMap(), _CollectionBuilder_depth = new WeakMap(), _CollectionBuilder_render = new WeakMap(), _CollectionBuilder_sortBy = new WeakMap(), _CollectionBuilder_contentType = new WeakMap(), _CollectionBuilder_defaultQuery = new WeakMap(), _CollectionBuilder_query = new WeakMap(), _CollectionBuilder_rawQuery = new WeakMap(), _CollectionBuilder_languageId = new WeakMap(), _CollectionBuilder_draft = new WeakMap(), _CollectionBuilder_requestOptions = new WeakMap(), _CollectionBuilder_config = new WeakMap();
 
-var _Content_requestOptions, _Content_serverUrl;
+var _Content_requestOptions, _Content_config;
 /**
  * Creates a builder to filter and fetch a collection of content items.
  * @param contentType - The content type to retrieve.
@@ -965,11 +1080,11 @@ class Content {
      * @param {RequestOptions} requestOptions - The options for the client request.
      * @param {string} serverUrl - The server URL.
      */
-    constructor(requestOptions, serverUrl) {
+    constructor(config, requestOptions) {
         _Content_requestOptions.set(this, void 0);
-        _Content_serverUrl.set(this, void 0);
+        _Content_config.set(this, void 0);
         __classPrivateFieldSet(this, _Content_requestOptions, requestOptions, "f");
-        __classPrivateFieldSet(this, _Content_serverUrl, serverUrl, "f");
+        __classPrivateFieldSet(this, _Content_config, config, "f");
     }
     /**
      * Takes a content type and returns a builder to filter and fetch the collection.
@@ -1037,10 +1152,10 @@ class Content {
      *
      */
     getCollection(contentType) {
-        return new CollectionBuilder(__classPrivateFieldGet(this, _Content_requestOptions, "f"), __classPrivateFieldGet(this, _Content_serverUrl, "f"), contentType);
+        return new CollectionBuilder(__classPrivateFieldGet(this, _Content_requestOptions, "f"), __classPrivateFieldGet(this, _Content_config, "f"), contentType);
     }
 }
-_Content_requestOptions = new WeakMap(), _Content_serverUrl = new WeakMap();
+_Content_requestOptions = new WeakMap(), _Content_config = new WeakMap();
 
 class NavigationClient {
     constructor(config, requestOptions) {
@@ -1536,7 +1651,7 @@ class DotCMSClient {
         // Initialize clients
         this.page = new PageClient(this.config, this.requestOptions);
         this.nav = new NavigationClient(this.config, this.requestOptions);
-        this.content = new Content(this.requestOptions, this.config.dotcmsUrl);
+        this.content = new Content(this.config, this.requestOptions);
     }
     /**
      * Creates request options with authentication headers.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcms/client",
-  "version": "1.0.6-next.2",
+  "version": "1.0.6-next.3",
   "description": "Official JavaScript library for interacting with DotCMS REST APIs.",
   "repository": {
     "type": "git",

package/src/lib/client/content/builders/collection/collection.d.ts

@@ -1,3 +1,4 @@
+import { DotCMSClientConfig } from '@dotcms/types';
 import { GetCollectionResponse, BuildQuery, SortBy, GetCollectionError, OnFullfilled, OnRejected } from '../../shared/types';
 export type ClientOptions = Omit<RequestInit, 'body' | 'method'>;
 /**
@@ -12,11 +13,11 @@ export declare class CollectionBuilder<T = unknown> {
     /**
      * Creates an instance of CollectionBuilder.
      * @param {ClientOptions} requestOptions Options for the client request.
-     * @param {string} serverUrl The server URL.
+     * @param {DotCMSClientConfig} config The client configuration.
      * @param {string} contentType The content type to fetch.
      * @memberof CollectionBuilder
      */
-    constructor(requestOptions: ClientOptions, serverUrl: string, contentType: string);
+    constructor(requestOptions: ClientOptions, config: DotCMSClientConfig, contentType: string);
     /**
      * Returns the sort query in the format: field order, field order, ...
      *
@@ -41,6 +42,14 @@ export declare class CollectionBuilder<T = unknown> {
      * @memberof CollectionBuilder
      */
     private get url();
+    /**
+     * Returns the site ID from the configuration.
+     *
+     * @readonly
+     * @private
+     * @memberof CollectionBuilder
+     */
+    private get siteId();
     /**
      * Returns the current query built.
      *
@@ -223,4 +232,40 @@ export declare class CollectionBuilder<T = unknown> {
      * @memberof CollectionBuilder
      */
     private fetch;
+    /**
+     * Builds the final Lucene query string by combining the base query with required system constraints.
+     *
+     * This method constructs the complete query by:
+     * 1. Adding language ID filter to ensure content matches the specified language
+     * 2. Adding live/draft status filter based on the draft flag
+     * 3. Optionally adding site ID constraint if conditions are met
+     *
+     * Site ID constraint is added only when:
+     * - Query doesn't already contain a positive site constraint (+conhost)
+     * - Query doesn't explicitly exclude the current site ID (-conhost:currentSiteId)
+     * - Site ID is configured in the system
+     *
+     * @private
+     * @returns {string} The complete Lucene query string ready for the Content API
+     * @memberof CollectionBuilder
+     *
+     * @example
+     * // For live content in language 1 with site ID 123:
+     * // Returns: "+contentType:Blog +languageId:1 +live:true +conhost:123"
+     *
+     * @example
+     * // For draft content without site constraint:
+     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     *
+     * @example
+     * // For content with explicit exclusion of current site (site ID 123):
+     * // Query: "+contentType:Blog -conhost:123"
+     * // Returns: "+contentType:Blog -conhost:123 +languageId:1 +live:true" (no site ID added)
+     *
+     * @example
+     * // For content with exclusion of different site (site ID 456, current is 123):
+     * // Query: "+contentType:Blog -conhost:456"
+     * // Returns: "+contentType:Blog -conhost:456 +languageId:1 +live:true +conhost:123" (site ID still added)
+     */
+    private getFinalQuery;
 }

package/src/lib/client/content/content-api.d.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from '@dotcms/types';
+import { DotCMSClientConfig, RequestOptions } from '@dotcms/types';
 import { CollectionBuilder } from './builders/collection/collection';
 /**
  * Creates a builder to filter and fetch a collection of content items.
@@ -56,7 +56,7 @@ export declare class Content {
      * @param {RequestOptions} requestOptions - The options for the client request.
      * @param {string} serverUrl - The server URL.
      */
-    constructor(requestOptions: RequestOptions, serverUrl: string);
+    constructor(config: DotCMSClientConfig, requestOptions: RequestOptions);
     /**
      * Takes a content type and returns a builder to filter and fetch the collection.
      * @param {string} contentType - The content type to get the collection.

package/src/lib/client/content/shared/utils.d.ts

@@ -18,3 +18,39 @@
  * @returns {string} The sanitized query string.
  */
 export declare function sanitizeQueryForContentType(query: string, contentType: string): string;
+/**
+ * @description
+ * Determines whether a site ID constraint should be added to a query based on existing constraints.
+ *
+ * The site ID constraint is added only when:
+ * - Query doesn't already contain a positive site constraint (+conhost)
+ * - Query doesn't explicitly exclude the specified site ID (-conhost:siteId)
+ * - Site ID is provided and configured
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +languageId:1';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // true
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog -conhost:123';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (explicitly excluded)
+ * ```
+ *
+ * @example
+ * ```ts
+ * const query = '+contentType:Blog +conhost:456';
+ * const siteId = '123';
+ * const shouldAdd = shouldAddSiteIdConstraint(query, siteId); // false (already has constraint)
+ * ```
+ *
+ * @export
+ * @param {string} query - The Lucene query string to analyze
+ * @param {string | number | null | undefined} siteId - The site ID to check for
+ * @returns {boolean} True if site ID constraint should be added, false otherwise
+ */
+export declare function shouldAddSiteIdConstraint(query: string, siteId: string | number | null | undefined): boolean;