@dotcms/client 1.2.1 → 1.2.2

package/index.cjs.js

@@ -526,6 +526,279 @@ const CONTENT_TYPE_MAIN_FIELDS = [
  */
 const CONTENT_API_URL = '/api/content/_search';
 
+var _BaseBuilder_page, _BaseBuilder_limit, _BaseBuilder_depth, _BaseBuilder_render, _BaseBuilder_sortBy;
+/**
+ * Abstract base class for content builders that provides common functionality
+ * for querying content from the DotCMS Content API.
+ *
+ * This class extracts shared behavior between different builder implementations,
+ * including pagination, sorting, rendering, and response formatting.
+ *
+ * @export
+ * @abstract
+ * @class BaseBuilder
+ * @template T - The type of the content items (defaults to unknown)
+ */
+class BaseBuilder extends BaseApiClient {
+    /**
+     * Creates an instance of BaseBuilder.
+     *
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
+     * @memberof BaseBuilder
+     */
+    constructor(params) {
+        super(params.config, params.requestOptions, params.httpClient);
+        /**
+         * Current page number for pagination.
+         * @private
+         */
+        _BaseBuilder_page.set(this, 1);
+        /**
+         * Maximum number of items per page.
+         * @private
+         */
+        _BaseBuilder_limit.set(this, 10);
+        /**
+         * Depth of related content to include in results.
+         * Valid values: 0-3
+         * @private
+         */
+        _BaseBuilder_depth.set(this, 0);
+        /**
+         * Whether to server-side render widgets in content.
+         * @private
+         */
+        _BaseBuilder_render.set(this, false);
+        /**
+         * Sorting configuration for results.
+         * @private
+         */
+        _BaseBuilder_sortBy.set(this, void 0);
+    }
+    /**
+     * Returns the offset for pagination based on current page and limit.
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    get offset() {
+        return __classPrivateFieldGet(this, _BaseBuilder_limit, "f") * (__classPrivateFieldGet(this, _BaseBuilder_page, "f") - 1);
+    }
+    /**
+     * Returns the sort query in the format: field order, field order, ...
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    get sort() {
+        return __classPrivateFieldGet(this, _BaseBuilder_sortBy, "f")?.map((sort) => `${sort.field} ${sort.order}`).join(',');
+    }
+    /**
+     * Returns the full URL for the content API.
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    get url() {
+        return `${this.config.dotcmsUrl}${CONTENT_API_URL}`;
+    }
+    /**
+     * Sets the maximum amount of content to fetch.
+     *
+     * @example
+     * ```typescript
+     * builder.limit(20);
+     * ```
+     *
+     * @param {number} limit - The maximum amount of content to fetch
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    limit(limit) {
+        __classPrivateFieldSet(this, _BaseBuilder_limit, limit, "f");
+        return this;
+    }
+    /**
+     * Sets the page number to fetch.
+     *
+     * @example
+     * ```typescript
+     * builder.page(2);
+     * ```
+     *
+     * @param {number} page - The page number to fetch
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    page(page) {
+        __classPrivateFieldSet(this, _BaseBuilder_page, page, "f");
+        return this;
+    }
+    /**
+     * Sorts the content by the specified fields and orders.
+     *
+     * @example
+     * ```typescript
+     * const sortBy = [
+     *     { field: 'title', order: 'asc' },
+     *     { field: 'modDate', order: 'desc' }
+     * ];
+     * builder.sortBy(sortBy);
+     * ```
+     *
+     * @param {SortBy[]} sortBy - Array of constraints to sort the content by
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    sortBy(sortBy) {
+        __classPrivateFieldSet(this, _BaseBuilder_sortBy, sortBy, "f");
+        return this;
+    }
+    /**
+     * Setting this to true will server-side render (using velocity) any widgets
+     * that are returned by the content query.
+     *
+     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
+     *
+     * @example
+     * ```typescript
+     * builder.render();
+     * ```
+     *
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    render() {
+        __classPrivateFieldSet(this, _BaseBuilder_render, true, "f");
+        return this;
+    }
+    /**
+     * Sets the depth of the relationships of the content.
+     * Specifies the depth of related content to return in the results.
+     *
+     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
+     *
+     * @example
+     * ```typescript
+     * builder.depth(2);
+     * ```
+     *
+     * @param {number} depth - The depth of the relationships of the content (0-3)
+     * @return {this} The builder instance for method chaining
+     * @throws {Error} When depth is not between 0 and 3
+     * @memberof BaseBuilder
+     */
+    depth(depth) {
+        if (depth < 0 || depth > 3) {
+            throw new Error('Depth value must be between 0 and 3');
+        }
+        __classPrivateFieldSet(this, _BaseBuilder_depth, depth, "f");
+        return this;
+    }
+    /**
+     * Executes the fetch and returns a promise that resolves to the content or rejects with an error.
+     *
+     * @example
+     * ```typescript
+     * builder
+     *     .limit(10)
+     *     .then((response) => console.log(response))
+     *     .catch((error) => console.error(error));
+     * ```
+     *
+     * @example Using async/await
+     * ```typescript
+     * const response = await builder.limit(10);
+     * ```
+     *
+     * @param {OnFullfilled} [onfulfilled] - A callback that is called when the fetch is successful
+     * @param {OnRejected} [onrejected] - A callback that is called when the fetch fails
+     * @return {Promise<GetCollectionResponse<T> | DotErrorContent>} A promise that resolves to the content or rejects with an error
+     * @memberof BaseBuilder
+     */
+    then(onfulfilled, onrejected) {
+        return this.fetch().then((data) => {
+            const formattedResponse = this.formatResponse(data);
+            if (typeof onfulfilled === 'function') {
+                const result = onfulfilled(formattedResponse);
+                // Ensure we always return a value, fallback to formattedResponse if callback returns undefined
+                return result ?? formattedResponse;
+            }
+            return formattedResponse;
+        }, (error) => {
+            // Wrap error in DotErrorContent
+            const contentError = this.wrapError(error);
+            if (typeof onrejected === 'function') {
+                const result = onrejected(contentError);
+                // Ensure we always return a value, fallback to original error if callback returns undefined
+                return result ?? contentError;
+            }
+            // Throw the wrapped error to trigger .catch()
+            throw contentError;
+        });
+    }
+    /**
+     * Formats the response to the desired format.
+     *
+     * @protected
+     * @param {GetCollectionRawResponse<T>} data - The raw response data
+     * @return {GetCollectionResponse<T>} The formatted response
+     * @memberof BaseBuilder
+     */
+    formatResponse(data) {
+        const contentlets = data.entity.jsonObjectView.contentlets;
+        const total = data.entity.resultsSize;
+        const mappedResponse = {
+            contentlets,
+            total,
+            page: __classPrivateFieldGet(this, _BaseBuilder_page, "f"),
+            size: contentlets.length
+        };
+        return __classPrivateFieldGet(this, _BaseBuilder_sortBy, "f")
+            ? {
+                ...mappedResponse,
+                sortedBy: __classPrivateFieldGet(this, _BaseBuilder_sortBy, "f")
+            }
+            : mappedResponse;
+    }
+    /**
+     * Calls the content API to fetch the content.
+     *
+     * @protected
+     * @return {Promise<GetCollectionRawResponse<T>>} The fetch response data
+     * @throws {DotHttpError} When the HTTP request fails
+     * @memberof BaseBuilder
+     */
+    fetch() {
+        const finalQuery = this.buildFinalQuery();
+        const languageId = this.getLanguageId();
+        return this.httpClient.request(this.url, {
+            ...this.requestOptions,
+            method: 'POST',
+            headers: {
+                ...this.requestOptions.headers,
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                query: finalQuery,
+                render: __classPrivateFieldGet(this, _BaseBuilder_render, "f"),
+                sort: this.sort,
+                limit: __classPrivateFieldGet(this, _BaseBuilder_limit, "f"),
+                offset: this.offset,
+                depth: __classPrivateFieldGet(this, _BaseBuilder_depth, "f"),
+                ...(languageId !== undefined ? { languageId } : {})
+            })
+        });
+    }
+}
+_BaseBuilder_page = new WeakMap(), _BaseBuilder_limit = new WeakMap(), _BaseBuilder_depth = new WeakMap(), _BaseBuilder_render = new WeakMap(), _BaseBuilder_sortBy = new WeakMap();
+
 /**
  * @description
  * Sanitizes the query for the given content type.
@@ -1108,7 +1381,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;
+var _CollectionBuilder_contentType, _CollectionBuilder_defaultQuery, _CollectionBuilder_query, _CollectionBuilder_rawQuery, _CollectionBuilder_languageId, _CollectionBuilder_draft;
 /**
  * Creates a Builder to filter and fetch content from the content API for a specific content type.
  *
@@ -1116,62 +1389,28 @@ var _CollectionBuilder_page, _CollectionBuilder_limit, _CollectionBuilder_depth,
  * @class CollectionBuilder
  * @template T Represents the type of the content type to fetch. Defaults to unknown.
  */
-class CollectionBuilder extends BaseApiClient {
+class CollectionBuilder extends BaseBuilder {
     /**
      * Creates an instance of CollectionBuilder.
-     * @param {ClientOptions} requestOptions Options for the client request.
-     * @param {DotCMSClientConfig} config The client configuration.
-     * @param {string} contentType The content type to fetch.
-     * @param {DotHttpClient} httpClient HTTP client for making requests.
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {string} params.contentType - The content type to fetch
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
      * @memberof CollectionBuilder
      */
-    constructor(requestOptions, config, contentType, httpClient) {
-        super(config, requestOptions, httpClient);
-        _CollectionBuilder_page.set(this, 1);
-        _CollectionBuilder_limit.set(this, 10);
-        _CollectionBuilder_depth.set(this, 0);
-        _CollectionBuilder_render.set(this, false);
-        _CollectionBuilder_sortBy.set(this, void 0);
+    constructor(params) {
+        super(params);
         _CollectionBuilder_contentType.set(this, void 0);
         _CollectionBuilder_defaultQuery.set(this, void 0);
         _CollectionBuilder_query.set(this, void 0);
         _CollectionBuilder_rawQuery.set(this, void 0);
         _CollectionBuilder_languageId.set(this, 1);
         _CollectionBuilder_draft.set(this, false);
-        __classPrivateFieldSet(this, _CollectionBuilder_contentType, contentType, "f");
+        __classPrivateFieldSet(this, _CollectionBuilder_contentType, params.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");
     }
-    /**
-     * Returns the sort query in the format: field order, field order, ...
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    get sort() {
-        return __classPrivateFieldGet(this, _CollectionBuilder_sortBy, "f")?.map((sort) => `${sort.field} ${sort.order}`).join(',');
-    }
-    /**
-     * Returns the offset for pagination.
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    get offset() {
-        return __classPrivateFieldGet(this, _CollectionBuilder_limit, "f") * (__classPrivateFieldGet(this, _CollectionBuilder_page, "f") - 1);
-    }
-    /**
-     * Returns the full URL for the content API.
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    get url() {
-        return `${this.config.dotcmsUrl}${CONTENT_API_URL}`;
-    }
     /**
      * Returns the current query built.
      *
@@ -1200,59 +1439,6 @@ class CollectionBuilder extends BaseApiClient {
         __classPrivateFieldSet(this, _CollectionBuilder_languageId, languageId, "f");
         return this;
     }
-    /**
-     * Setting this to true will server side render (using velocity) any widgets that are returned by the content query.
-     *
-     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
-     *
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    render() {
-        __classPrivateFieldSet(this, _CollectionBuilder_render, true, "f");
-        return this;
-    }
-    /**
-     * Sorts the content by the specified fields and orders.
-     *
-     * @example
-     * ```typescript
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * const sortBy = [{ field: 'title', order: 'asc' }, { field: 'modDate', order: 'desc' }];
-     * collectionBuilder("Blog").sortBy(sortBy);
-     * ```
-     *
-     * @param {SortBy[]} sortBy Array of constraints to sort the content by.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    sortBy(sortBy) {
-        __classPrivateFieldSet(this, _CollectionBuilder_sortBy, sortBy, "f");
-        return this;
-    }
-    /**
-     * Sets the maximum amount of content to fetch.
-     *
-     * @param {number} limit The maximum amount of content to fetch.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    limit(limit) {
-        __classPrivateFieldSet(this, _CollectionBuilder_limit, limit, "f");
-        return this;
-    }
-    /**
-     * Sets the page number to fetch.
-     *
-     * @param {number} page The page number to fetch.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    page(page) {
-        __classPrivateFieldSet(this, _CollectionBuilder_page, page, "f");
-        return this;
-    }
     query(arg) {
         if (typeof arg === 'string') {
             __classPrivateFieldSet(this, _CollectionBuilder_rawQuery, arg, "f");
@@ -1314,132 +1500,29 @@ class CollectionBuilder extends BaseApiClient {
         return this;
     }
     /**
-     * Sets the depth of the relationships of the content.
-     * Specifies the depth of related content to return in the results.
+     * Wraps an error in a DotErrorContent instance with helpful context.
      *
-     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
-     *
-     * @example
-     * ```ts
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * collectionBuilder
-     *      .depth(1)
-     *      .then((response) => // Your code here })
-     *      .catch((error) => // Your code here })
-     * ```
-     *
-     * @param {number} depth The depth of the relationships of the content.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
+     * @protected
+     * @param {unknown} error - The error to wrap
+     * @return {DotErrorContent} The wrapped error
      * @memberof CollectionBuilder
      */
-    depth(depth) {
-        if (depth < 0 || depth > 3) {
-            throw new Error('Depth value must be between 0 and 3');
+    wrapError(error) {
+        if (error instanceof types.DotHttpError) {
+            return new types.DotErrorContent(`Content API failed for '${__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")}' (fetch): ${error.message}`, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"), 'fetch', error, this.buildFinalQuery());
         }
-        __classPrivateFieldSet(this, _CollectionBuilder_depth, depth, "f");
-        return this;
-    }
-    /**
-     * Executes the fetch and returns a promise that resolves to the content or rejects with an error.
-     *
-     * @example
-     * ```ts
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * collectionBuilder
-     *      .limit(10)
-     *      .then((response) => // Your code here })
-     *      .catch((error) => // Your code here })
-     * ```
-     *
-     * @param {OnFullfilled} [onfulfilled] A callback that is called when the fetch is successful.
-     * @param {OnRejected} [onrejected] A callback that is called when the fetch fails.
-     * @return {Promise<GetCollectionResponse<T> | DotErrorContent>} A promise that resolves to the content or rejects with an error.
-     * @memberof CollectionBuilder
-     */
-    then(onfulfilled, onrejected) {
-        return this.fetch().then((data) => {
-            const formattedResponse = this.formatResponse(data);
-            if (typeof onfulfilled === 'function') {
-                const result = onfulfilled(formattedResponse);
-                // Ensure we always return a value, fallback to formattedResponse if callback returns undefined
-                return result ?? formattedResponse;
-            }
-            return formattedResponse;
-        }, (error) => {
-            // Wrap error in DotCMSContentError
-            let contentError;
-            if (error instanceof types.DotHttpError) {
-                contentError = new types.DotErrorContent(`Content API failed for '${__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")}' (fetch): ${error.message}`, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"), 'fetch', error, this.getFinalQuery());
-            }
-            else {
-                const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-                contentError = new types.DotErrorContent(`Content API failed for '${__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")}' (fetch): ${errorMessage}`, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"), 'fetch', undefined, this.getFinalQuery());
-            }
-            if (typeof onrejected === 'function') {
-                const result = onrejected(contentError);
-                // Ensure we always return a value, fallback to original error if callback returns undefined
-                return result ?? contentError;
-            }
-            // Throw the wrapped error to trigger .catch()
-            throw contentError;
-        });
-    }
-    /**
-     * Formats the response to the desired format.
-     *
-     * @private
-     * @param {GetCollectionRawResponse<T>} data The raw response data.
-     * @return {GetCollectionResponse<T>} The formatted response.
-     * @memberof CollectionBuilder
-     */
-    formatResponse(data) {
-        const contentlets = data.entity.jsonObjectView.contentlets;
-        const total = data.entity.resultsSize;
-        const mappedResponse = {
-            contentlets,
-            total,
-            page: __classPrivateFieldGet(this, _CollectionBuilder_page, "f"),
-            size: contentlets.length
-        };
-        return __classPrivateFieldGet(this, _CollectionBuilder_sortBy, "f")
-            ? {
-                ...mappedResponse,
-                sortedBy: __classPrivateFieldGet(this, _CollectionBuilder_sortBy, "f")
-            }
-            : mappedResponse;
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+        return new types.DotErrorContent(`Content API failed for '${__classPrivateFieldGet(this, _CollectionBuilder_contentType, "f")}' (fetch): ${errorMessage}`, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"), 'fetch', undefined, this.buildFinalQuery());
     }
     /**
-     * Calls the content API to fetch the content.
+     * Gets the language ID for the query.
      *
-     * @private
-     * @return {Promise<GetCollectionRawResponse<T>>} The fetch response data.
-     * @throws {DotHttpError} When the HTTP request fails.
+     * @protected
+     * @return {number | string} The language ID
      * @memberof CollectionBuilder
      */
-    fetch() {
-        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 this.httpClient.request(this.url, {
-            ...this.requestOptions,
-            method: 'POST',
-            headers: {
-                ...this.requestOptions.headers,
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-                query,
-                render: __classPrivateFieldGet(this, _CollectionBuilder_render, "f"),
-                sort: this.sort,
-                limit: __classPrivateFieldGet(this, _CollectionBuilder_limit, "f"),
-                offset: this.offset,
-                depth: __classPrivateFieldGet(this, _CollectionBuilder_depth, "f")
-                //userId: This exist but we currently don't use it
-                //allCategoriesInfo: This exist but we currently don't use it
-            })
-        });
+    getLanguageId() {
+        return __classPrivateFieldGet(this, _CollectionBuilder_languageId, "f");
     }
     /**
      * Builds the final Lucene query string by combining the base query with required system constraints.
@@ -1447,14 +1530,15 @@ class CollectionBuilder extends BaseApiClient {
      * 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
+     * 3. Applying content type specific query sanitization
+     * 4. 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
+     * @protected
      * @returns {string} The complete Lucene query string ready for the Content API
      * @memberof CollectionBuilder
      *
@@ -1476,8 +1560,11 @@ class CollectionBuilder extends BaseApiClient {
      * // 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
+    buildFinalQuery() {
+        // Build base query with language and live/draft constraints.
+        // NOTE: languageId is intentionally sent in BOTH places:
+        // - in the Lucene query (backend requires this)
+        // - as a top-level request body field (backend also requires this)
         let baseQuery = this.currentQuery.field('languageId').equals(__classPrivateFieldGet(this, _CollectionBuilder_languageId, "f").toString());
         if (__classPrivateFieldGet(this, _CollectionBuilder_draft, "f")) {
             baseQuery = baseQuery.raw('+(live:false AND working:true AND deleted:false)');
@@ -1489,14 +1576,122 @@ class CollectionBuilder extends BaseApiClient {
         // Check if site ID constraint should be added using utility function
         const shouldAddSiteId = shouldAddSiteIdConstraint(builtQuery, this.siteId);
         // Add site ID constraint if needed
+        let finalQuery;
         if (shouldAddSiteId) {
-            const queryWithSiteId = `${builtQuery} +conhost:${this.siteId}`;
-            return sanitizeQuery(queryWithSiteId);
+            finalQuery = `${builtQuery} +conhost:${this.siteId}`;
         }
-        return builtQuery;
+        else {
+            finalQuery = builtQuery;
+        }
+        // Apply content-type specific sanitization (adds contentType. prefix to fields)
+        const sanitizedQuery = sanitizeQueryForContentType(finalQuery, __classPrivateFieldGet(this, _CollectionBuilder_contentType, "f"));
+        // Append raw query if provided (raw query is NOT sanitized for content type)
+        const query = __classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f") ? `${sanitizedQuery} ${__classPrivateFieldGet(this, _CollectionBuilder_rawQuery, "f")}` : sanitizedQuery;
+        return sanitizeQuery(query);
     }
 }
-_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_contentType = new WeakMap(), _CollectionBuilder_defaultQuery = new WeakMap(), _CollectionBuilder_query = new WeakMap(), _CollectionBuilder_rawQuery = new WeakMap(), _CollectionBuilder_languageId = new WeakMap(), _CollectionBuilder_draft = new WeakMap();
+
+var _RawQueryBuilder_rawQuery, _RawQueryBuilder_languageId;
+/**
+ * Builder for executing raw Lucene queries against the DotCMS Content API.
+ *
+ * This builder provides direct access to Lucene query syntax while still
+ * offering common functionality like pagination, sorting, and language filtering.
+ *
+ * @export
+ * @class RawQueryBuilder
+ * @template T - The type of the content items (defaults to unknown)
+ */
+class RawQueryBuilder extends BaseBuilder {
+    /**
+     * Creates an instance of RawQueryBuilder.
+     *
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {string} params.rawQuery - The raw Lucene query string
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
+     * @memberof RawQueryBuilder
+     */
+    constructor(params) {
+        super(params);
+        /**
+         * The raw Lucene query string.
+         * @private
+         */
+        _RawQueryBuilder_rawQuery.set(this, void 0);
+        /**
+         * Optional language ID for the request body.
+         * When provided, it will be sent as `languageId` in the request payload.
+         *
+         * NOTE: This does NOT modify the raw query string. If you need `+languageId:<id>` inside
+         * the Lucene query, include it in the raw query yourself.
+         *
+         * @private
+         */
+        _RawQueryBuilder_languageId.set(this, void 0);
+        __classPrivateFieldSet(this, _RawQueryBuilder_rawQuery, params.rawQuery, "f");
+    }
+    /**
+     * Filters the content by the specified language ID.
+     *
+     * This sets the `languageId` request body field (it does not alter the raw Lucene query string).
+     *
+     * @example
+     * ```typescript
+     * const response = await client.content
+     *     .query('+contentType:Blog +title:Hello')
+     *     .language(1)
+     *     .limit(10);
+     * ```
+     *
+     * @param {number | string} languageId The language ID to filter the content by.
+     * @return {RawQueryBuilder} A RawQueryBuilder instance.
+     * @memberof RawQueryBuilder
+     */
+    language(languageId) {
+        __classPrivateFieldSet(this, _RawQueryBuilder_languageId, languageId, "f");
+        return this;
+    }
+    /**
+     * Wraps an error in a DotErrorContent instance with helpful context.
+     *
+     * @protected
+     * @param {unknown} error - The error to wrap
+     * @return {DotErrorContent} The wrapped error
+     * @memberof RawQueryBuilder
+     */
+    wrapError(error) {
+        if (error instanceof types.DotHttpError) {
+            return new types.DotErrorContent(`Content API failed for raw query (fetch): ${error.message}`, 'raw-query', 'fetch', error, this.buildFinalQuery());
+        }
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+        return new types.DotErrorContent(`Content API failed for raw query (fetch): ${errorMessage}`, 'raw-query', 'fetch', undefined, this.buildFinalQuery());
+    }
+    /**
+     * @protected
+     * @return {number | string | undefined} Optional languageId to send in the request body.
+     * @memberof RawQueryBuilder
+     */
+    getLanguageId() {
+        return __classPrivateFieldGet(this, _RawQueryBuilder_languageId, "f");
+    }
+    /**
+     * Builds the final Lucene query string.
+     *
+     * Raw query is used as provided (only minimal sanitization is applied).
+     * No implicit constraints are added.
+     *
+     * @protected
+     * @return {string} The final Lucene query string
+     * @memberof RawQueryBuilder
+     */
+    buildFinalQuery() {
+        return sanitizeQuery(__classPrivateFieldGet(this, _RawQueryBuilder_rawQuery, "f"));
+    }
+}
+_RawQueryBuilder_rawQuery = new WeakMap(), _RawQueryBuilder_languageId = new WeakMap();
 
 /**
  * Creates a builder to filter and fetch a collection of content items.
@@ -1623,7 +1818,102 @@ class Content extends BaseApiClient {
      *
      */
     getCollection(contentType) {
-        return new CollectionBuilder(this.requestOptions, this.config, contentType, this.httpClient);
+        return new CollectionBuilder({
+            requestOptions: this.requestOptions,
+            config: this.config,
+            contentType,
+            httpClient: this.httpClient
+        });
+    }
+    /**
+     * Executes a raw Lucene query with optional pagination, sorting, and rendering options.
+     *
+     * This method provides direct access to Lucene query syntax, giving you full control
+     * over query construction while still benefiting from common features like pagination,
+     * sorting, and error handling.
+     *
+     * **Important Notes:**
+     * - The raw query is used as-is (minimal sanitization only)
+     * - NO automatic field prefixing (unlike `getCollection()`)
+     * - NO implicit/system constraints are added (language, live/draft, site, variant, etc.)
+     * - If you need constraints, include them in the raw query string (e.g. `+contentType:Blog +languageId:1 +live:true`)
+     *
+     * @template T - The type of the content items (defaults to unknown)
+     * @param {string} rawQuery - Raw Lucene query string
+     * @return {RawQueryBuilder<T>} A RawQueryBuilder instance for chaining options
+     * @memberof Content
+     *
+     * @example Simple query with pagination
+     * ```typescript
+     * const response = await client.content
+     *     .query('+contentType:Blog +title:"Hello World"')
+     *     .limit(10)
+     *     .page(1);
+     *
+     * console.log(response.contentlets);
+     * ```
+     *
+     * @example Complex query with all available options
+     * ```typescript
+     * const response = await client.content
+     *     .query('+(contentType:Blog OR contentType:News) +tags:"technology" +languageId:1 +(live:false AND working:true AND deleted:false) +variant:legends-forceSensitive')
+     *     .limit(20)
+     *     .page(2)
+     *     .sortBy([{ field: 'modDate', order: 'desc' }])
+     *     .render()
+     *     .depth(2);
+     *
+     * console.log(`Found ${response.total} items`);
+     * response.contentlets.forEach(item => console.log(item.title));
+     * ```
+     *
+     * @example Using TypeScript generics for type safety
+     * ```typescript
+     * interface BlogPost {
+     *     title: string;
+     *     author: string;
+     *     publishDate: string;
+     * }
+     *
+     * const response = await client.content
+     *     .query<BlogPost>('+contentType:Blog +author:"John Doe"')
+     *     .limit(10);
+     *
+     * // TypeScript knows the type of contentlets
+     * response.contentlets.forEach(post => {
+     *     console.log(post.title, post.author);
+     * });
+     * ```
+     *
+     * @example Error handling with helpful messages
+     * ```typescript
+     * try {
+     *     const response = await client.content
+     *         .query('+contentType:Blog +publishDate:[2024-01-01 TO 2024-12-31]');
+     * } catch (error) {
+     *     if (error instanceof DotErrorContent) {
+     *         console.error('Query failed:', error.message);
+     *         console.error('Failed query:', error.query);
+     *     }
+     * }
+     * ```
+     *
+     * @example Using Promise chain instead of async/await
+     * ```typescript
+     * client.content
+     *     .query('+contentType:Blog')
+     *     .limit(10)
+     *     .then(response => console.log(response.contentlets))
+     *     .catch(error => console.error(error));
+     * ```
+     */
+    query(rawQuery) {
+        return new RawQueryBuilder({
+            requestOptions: this.requestOptions,
+            config: this.config,
+            rawQuery,
+            httpClient: this.httpClient
+        });
     }
 }