@dotcms/client 1.2.0-next.6 → 1.2.0-next.8

package/index.cjs.js

@@ -546,7 +546,9 @@ const CONTENT_API_URL = '/api/content/_search';
  * @returns {string} The sanitized query string.
  */
 function sanitizeQueryForContentType(query, contentType) {
-    return query.replace(/\+([^+:]*?):/g, (original, field) => {
+    // Match field names that start with letter/underscore, followed by alphanumeric/underscore/dot
+    // This excludes Lucene grouping operators like +(...)
+    return query.replace(/\+([a-zA-Z_][a-zA-Z0-9_.]*):/g, (original, field) => {
         return !CONTENT_TYPE_MAIN_FIELDS.includes(field) // Fields that are not content type fields
             ? `+${contentType}.${field}:` // Should have this format: +contentTypeVar.field:
             : original; // Return the field if it is a content type field
@@ -1462,7 +1464,7 @@ class CollectionBuilder extends BaseApiClient {
      *
      * @example
      * // For draft content without site constraint:
-     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     * // Returns: "+contentType:Blog +languageId:1 +(live:false AND working:true AND deleted:false)"
      *
      * @example
      * // For content with explicit exclusion of current site (site ID 123):
@@ -1476,20 +1478,22 @@ class CollectionBuilder extends BaseApiClient {
      */
     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();
+        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)');
+        }
+        else {
+            baseQuery = baseQuery.field('live').equals('true');
+        }
+        const builtQuery = baseQuery.build();
         // Check if site ID constraint should be added using utility function
-        const shouldAddSiteId = shouldAddSiteIdConstraint(baseQuery, this.siteId);
+        const shouldAddSiteId = shouldAddSiteIdConstraint(builtQuery, this.siteId);
         // Add site ID constraint if needed
         if (shouldAddSiteId) {
-            const queryWithSiteId = `${baseQuery} +conhost:${this.siteId}`;
+            const queryWithSiteId = `${builtQuery} +conhost:${this.siteId}`;
             return sanitizeQuery(queryWithSiteId);
         }
-        return baseQuery;
+        return builtQuery;
     }
 }
 _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();
@@ -2043,12 +2047,25 @@ class PageClient extends BaseApiClient {
                 response.errors.forEach((error) => {
                     consola.consola.error('[DotCMS GraphQL Error]: ', error.message);
                 });
+                const pageError = response.errors.find((error) => error.message.includes('DotPage'));
+                if (pageError) {
+                    // Throw HTTP error - will be caught and wrapped in DotErrorPage below
+                    throw new types.DotHttpError({
+                        status: 400,
+                        statusText: 'Bad Request',
+                        message: `GraphQL query failed for URL '${url}': ${pageError.message}`,
+                        data: response.errors
+                    });
+                }
             }
             const pageResponse = internal.graphqlToPageEntity(response.data.page);
             if (!pageResponse) {
-                throw new types.DotErrorPage(`Page ${url} not found. Check the page URL and permissions.`, undefined, {
-                    query: completeQuery,
-                    variables: requestVariables
+                // Throw HTTP error - will be caught and wrapped in DotErrorPage below
+                throw new types.DotHttpError({
+                    status: 404,
+                    statusText: 'Not Found',
+                    message: `Page ${url} not found. Check the page URL and permissions.`,
+                    data: response.errors
                 });
             }
             const contentResponse = mapContentResponse(response.data, Object.keys(content));
@@ -2062,7 +2079,7 @@ class PageClient extends BaseApiClient {
             };
         }
         catch (error) {
-            // Handle DotHttpError instances from httpClient.request
+            // Handle DotHttpError instances
             if (error instanceof types.DotHttpError) {
                 throw new types.DotErrorPage(`Page request failed for URL '${url}': ${error.message}`, error, {
                     query: completeQuery,

package/index.esm.js

@@ -544,7 +544,9 @@ const CONTENT_API_URL = '/api/content/_search';
  * @returns {string} The sanitized query string.
  */
 function sanitizeQueryForContentType(query, contentType) {
-    return query.replace(/\+([^+:]*?):/g, (original, field) => {
+    // Match field names that start with letter/underscore, followed by alphanumeric/underscore/dot
+    // This excludes Lucene grouping operators like +(...)
+    return query.replace(/\+([a-zA-Z_][a-zA-Z0-9_.]*):/g, (original, field) => {
         return !CONTENT_TYPE_MAIN_FIELDS.includes(field) // Fields that are not content type fields
             ? `+${contentType}.${field}:` // Should have this format: +contentTypeVar.field:
             : original; // Return the field if it is a content type field
@@ -1460,7 +1462,7 @@ class CollectionBuilder extends BaseApiClient {
      *
      * @example
      * // For draft content without site constraint:
-     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     * // Returns: "+contentType:Blog +languageId:1 +(live:false AND working:true AND deleted:false)"
      *
      * @example
      * // For content with explicit exclusion of current site (site ID 123):
@@ -1474,20 +1476,22 @@ class CollectionBuilder extends BaseApiClient {
      */
     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();
+        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)');
+        }
+        else {
+            baseQuery = baseQuery.field('live').equals('true');
+        }
+        const builtQuery = baseQuery.build();
         // Check if site ID constraint should be added using utility function
-        const shouldAddSiteId = shouldAddSiteIdConstraint(baseQuery, this.siteId);
+        const shouldAddSiteId = shouldAddSiteIdConstraint(builtQuery, this.siteId);
         // Add site ID constraint if needed
         if (shouldAddSiteId) {
-            const queryWithSiteId = `${baseQuery} +conhost:${this.siteId}`;
+            const queryWithSiteId = `${builtQuery} +conhost:${this.siteId}`;
             return sanitizeQuery(queryWithSiteId);
         }
-        return baseQuery;
+        return builtQuery;
     }
 }
 _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();
@@ -2041,12 +2045,25 @@ class PageClient extends BaseApiClient {
                 response.errors.forEach((error) => {
                     consola.error('[DotCMS GraphQL Error]: ', error.message);
                 });
+                const pageError = response.errors.find((error) => error.message.includes('DotPage'));
+                if (pageError) {
+                    // Throw HTTP error - will be caught and wrapped in DotErrorPage below
+                    throw new DotHttpError({
+                        status: 400,
+                        statusText: 'Bad Request',
+                        message: `GraphQL query failed for URL '${url}': ${pageError.message}`,
+                        data: response.errors
+                    });
+                }
             }
             const pageResponse = graphqlToPageEntity(response.data.page);
             if (!pageResponse) {
-                throw new DotErrorPage(`Page ${url} not found. Check the page URL and permissions.`, undefined, {
-                    query: completeQuery,
-                    variables: requestVariables
+                // Throw HTTP error - will be caught and wrapped in DotErrorPage below
+                throw new DotHttpError({
+                    status: 404,
+                    statusText: 'Not Found',
+                    message: `Page ${url} not found. Check the page URL and permissions.`,
+                    data: response.errors
                 });
             }
             const contentResponse = mapContentResponse(response.data, Object.keys(content));
@@ -2060,7 +2077,7 @@ class PageClient extends BaseApiClient {
             };
         }
         catch (error) {
-            // Handle DotHttpError instances from httpClient.request
+            // Handle DotHttpError instances
             if (error instanceof DotHttpError) {
                 throw new DotErrorPage(`Page request failed for URL '${url}': ${error.message}`, error, {
                     query: completeQuery,

package/package.json

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

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

@@ -249,7 +249,7 @@ export declare class CollectionBuilder<T = unknown> extends BaseApiClient {
      *
      * @example
      * // For draft content without site constraint:
-     * // Returns: "+contentType:Blog +languageId:1 +live:false"
+     * // Returns: "+contentType:Blog +languageId:1 +(live:false AND working:true AND deleted:false)"
      *
      * @example
      * // For content with explicit exclusion of current site (site ID 123):