@wix/wix-data-items-common 1.0.281 → 1.0.283

package/dist/cjs/api/WixDataApi.js

@@ -68,7 +68,8 @@ class WixDataApi {
           dataCollectionId: collectionName,
           dataItemId: itemId,
           ...toReadOptions(options),
-          fields: options == null ? void 0 : options.fields
+          fields: options == null ? void 0 : options.fields,
+          referencedItemOptions: options == null ? void 0 : options.referencedItemOptions
         }).catch(recover(ItemDoesNotExistCode, {}));
         return dataItem ? toDataItem(dataItem) : null;
       });
@@ -239,97 +240,6 @@ class WixDataApi {
         }
       });
     });
-    // --- query, count, distinct ---
-    (0, _defineProperty2.default)(this, "query", collectionName => {
-      const ensureValidQuery = invalidArgs => {
-        if (invalidArgs.length > 0) {
-          throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, invalidArgs));
-        }
-      };
-      return new _WixDataQueryImpl.WixDataQueryImpl({
-        collectionName,
-        onCount: async (args, params, options) => {
-          ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('count', args, 0, 1).options(options).validateAndReturn()]);
-          return this.trace('count', {
-            collectionName
-          })(async env => {
-            const {
-              totalCount
-            } = await this.client.countDataItems({
-              ...env,
-              dataCollectionId: collectionName,
-              filter: params.filterTree,
-              ...toReadOptions(options)
-            });
-            return totalCount;
-          });
-        },
-        onDistinct: async (args, params, field, options) => {
-          var _toSort$find;
-          ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('distinct', args, 1, 2).fieldName(field).options(options).validateAndReturn()]);
-          const order = (_toSort$find = toSort(params.orderBy).find(o => o.fieldName === field)) == null ? void 0 : _toSort$find.order;
-          const fetch = (cursorOrOffset, returnTotalCount) => this.trace('distinct', {
-            collectionName,
-            field
-          })(async env => {
-            const {
-              distinctValues,
-              pagingMetadata
-            } = await this.client.queryDistinctValues({
-              ...env,
-              dataCollectionId: collectionName,
-              ...toReadOptions(options),
-              ...toPaging(params.limitNumber, cursorOrOffset),
-              ...(isOffset(cursorOrOffset) ? {
-                fieldName: field,
-                filter: params.filterTree,
-                order,
-                returnTotalCount
-              } : {})
-            });
-            return [distinctValues, pagingMetadata];
-          });
-          const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
-          return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
-        },
-        onFind: async (args, params, options) => {
-          ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('find', args, 0, 1).options(options).validateAndReturn()]);
-          const fetch = (cursorOrOffset, returnTotalCount) => this.trace('query', {
-            collectionName
-          })(async env => {
-            const {
-              dataItems,
-              pagingMetadata
-            } = await this.client.queryDataItems({
-              ...env,
-              dataCollectionId: collectionName,
-              query: {
-                fields: params.projectedFields,
-                ...toPaging(params.limitNumber, cursorOrOffset),
-                ...(isOffset(cursorOrOffset) ? {
-                  filter: params.filterTree,
-                  sort: toSort(params.orderBy)
-                } : {})
-              },
-              referencedItemOptions: params.included,
-              ...toReadOptions(options),
-              ...(isOffset(cursorOrOffset) ? {
-                returnTotalCount
-              } : {}),
-              ...(params.randomSortOptions ? {
-                sortMode: apiTypes.SortMode.RANDOM,
-                randomOptions: {
-                  seed: params.randomSortOptions.seed
-                }
-              } : {})
-            });
-            return [dataItems.map(toDataItem), pagingMetadata];
-          });
-          const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
-          return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
-        }
-      });
-    });
     (0, _defineProperty2.default)(this, "search", collectionName => {
       const ensureValidQuery = invalidArgs => {
         if (invalidArgs.length > 0) {
@@ -685,6 +595,163 @@ class WixDataApi {
   }
   get filter() {
     return (0, _common.filterBuilder)();
+  } // --- query, count, distinct ---
+  /**
+   * Returns a query builder for the specified collection.
+   * @param collectionName - Name of the collection to query.
+   * @returns A `WixDataQuery` builder object.
+   */
+  /**
+   * Executes a query directly without using the builder pattern.
+   * @internal
+   * @param collectionName - Name of the collection to query.
+   * @param queryRequest - Query parameters including filter, sort, paging, and fields.
+   * @param options - Additional options including referencedItemOptions.
+   * @returns Promise that resolves to the query results.
+   */
+  query(collectionName, queryRequest, options) {
+    // Direct query execution mode
+    if (queryRequest !== undefined) {
+      return this.executeDirectQuery(collectionName, queryRequest, options);
+    }
+
+    // Builder mode
+    const ensureValidQuery = invalidArgs => {
+      if (invalidArgs.length > 0) {
+        throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, invalidArgs));
+      }
+    };
+    return new _WixDataQueryImpl.WixDataQueryImpl({
+      collectionName,
+      onCount: async (args, params, options) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('count', args, 0, 1).options(options).validateAndReturn()]);
+        return this.trace('count', {
+          collectionName
+        })(async env => {
+          const {
+            totalCount
+          } = await this.client.countDataItems({
+            ...env,
+            dataCollectionId: collectionName,
+            filter: params.filterTree,
+            ...toReadOptions(options)
+          });
+          return totalCount;
+        });
+      },
+      onDistinct: async (args, params, field, options) => {
+        var _toSort$find;
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('distinct', args, 1, 2).fieldName(field).options(options).validateAndReturn()]);
+        const order = (_toSort$find = toSort(params.orderBy).find(o => o.fieldName === field)) == null ? void 0 : _toSort$find.order;
+        const fetch = (cursorOrOffset, returnTotalCount) => this.trace('distinct', {
+          collectionName,
+          field
+        })(async env => {
+          const {
+            distinctValues,
+            pagingMetadata
+          } = await this.client.queryDistinctValues({
+            ...env,
+            dataCollectionId: collectionName,
+            ...toReadOptions(options),
+            ...toPaging(params.limitNumber, cursorOrOffset),
+            ...(isOffset(cursorOrOffset) ? {
+              fieldName: field,
+              filter: params.filterTree,
+              order,
+              returnTotalCount
+            } : {})
+          });
+          return [distinctValues, pagingMetadata];
+        });
+        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
+      },
+      onFind: async (args, params, options) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('find', args, 0, 1).options(options).validateAndReturn()]);
+        const fetch = (cursorOrOffset, returnTotalCount) => this.trace('query', {
+          collectionName
+        })(async env => {
+          const {
+            dataItems,
+            pagingMetadata
+          } = await this.client.queryDataItems({
+            ...env,
+            dataCollectionId: collectionName,
+            query: {
+              fields: params.projectedFields,
+              ...toPaging(params.limitNumber, cursorOrOffset),
+              ...(isOffset(cursorOrOffset) ? {
+                filter: params.filterTree,
+                sort: toSort(params.orderBy)
+              } : {})
+            },
+            referencedItemOptions: params.included,
+            ...toReadOptions(options),
+            ...(isOffset(cursorOrOffset) ? {
+              returnTotalCount
+            } : {}),
+            ...(params.randomSortOptions ? {
+              sortMode: apiTypes.SortMode.RANDOM,
+              randomOptions: {
+                seed: params.randomSortOptions.seed
+              }
+            } : {})
+          });
+          return [dataItems.map(toDataItem), pagingMetadata];
+        });
+        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
+      }
+    });
+  }
+  async executeDirectQuery(collectionName, request, options) {
+    var _request$paging, _request$cursorPaging, _request$paging2, _request$cursorPaging2, _options$referencedIt;
+    const validationErrors = apiValidator().collectionName(collectionName).options(options).validateAndReturn();
+    if (validationErrors.length > 0) {
+      throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, validationErrors));
+    }
+    const limit = ((_request$paging = request.paging) == null ? void 0 : _request$paging.limit) ?? ((_request$cursorPaging = request.cursorPaging) == null ? void 0 : _request$cursorPaging.limit);
+    const offset = ((_request$paging2 = request.paging) == null ? void 0 : _request$paging2.offset) ?? 0;
+    const cursor = (_request$cursorPaging2 = request.cursorPaging) == null ? void 0 : _request$cursorPaging2.cursor;
+    const sort = (request.sort ?? []).map(s => ({
+      [s.fieldName]: s.order === 'DESC' ? 'desc' : 'asc'
+    }));
+    const referencedItemOptions = options == null || (_options$referencedIt = options.referencedItemOptions) == null ? void 0 : _options$referencedIt.map(inc => ({
+      fieldName: inc.fieldName,
+      limit: inc.limit
+    }));
+    const fetch = (cursorOrOffset, returnTotalCount) => this.trace('query', {
+      collectionName
+    })(async env => {
+      const {
+        dataItems,
+        pagingMetadata
+      } = await this.client.queryDataItems({
+        ...env,
+        dataCollectionId: collectionName,
+        query: {
+          fields: request.fields,
+          ...toPaging(limit, cursorOrOffset),
+          ...(isOffset(cursorOrOffset) ? {
+            filter: request.filter,
+            sort: toSort(sort)
+          } : {})
+        },
+        referencedItemOptions,
+        ...toReadOptions(options),
+        ...(isOffset(cursorOrOffset) ? {
+          returnTotalCount
+        } : {})
+      });
+      return [dataItems.map(toDataItem), pagingMetadata];
+    });
+    const [items, paging] = await fetch(cursor ?? offset, options == null ? void 0 : options.returnTotalCount);
+    return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, {
+      collectionName,
+      limitNumber: limit,
+      skipNumber: offset
+    });
   }
   async runBulkSave(env, collectionName, items, options, overrideExisting = true) {
     const request = {