@strapi/strapi 4.4.3 → 4.5.0-beta.0

package/lib/services/entity-service/components.js

@@ -47,12 +47,10 @@ const createComponents = async (uid, data) => {
           componentValue.map((value) => createComponent(componentUID, value))
         );
 
-        // TODO: add order
-        componentBody[attributeName] = components.map(({ id }, idx) => {
+        componentBody[attributeName] = components.map(({ id }) => {
           return {
             id,
             __pivot: {
-              order: idx + 1,
               field: attributeName,
               component_type: componentUID,
             },
@@ -63,7 +61,6 @@ const createComponents = async (uid, data) => {
         componentBody[attributeName] = {
           id: component.id,
           __pivot: {
-            order: 1,
             field: attributeName,
             component_type: componentUID,
           },
@@ -81,13 +78,12 @@ const createComponents = async (uid, data) => {
       }
 
       componentBody[attributeName] = await Promise.all(
-        dynamiczoneValues.map(async (value, idx) => {
+        dynamiczoneValues.map(async (value) => {
           const { id } = await createComponent(value.__component, value);
           return {
             id,
             __component: value.__component,
             __pivot: {
-              order: idx + 1,
               field: attributeName,
             },
           };
@@ -145,11 +141,10 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           componentValue.map((value) => updateOrCreateComponent(componentUID, value))
         );
 
-        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }, idx) => {
+        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
           return {
             id,
             __pivot: {
-              order: idx + 1,
               field: attributeName,
               component_type: componentUID,
             },
@@ -160,7 +155,6 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         componentBody[attributeName] = component && {
           id: component.id,
           __pivot: {
-            order: 1,
             field: attributeName,
             component_type: componentUID,
           },
@@ -180,14 +174,13 @@ const updateComponents = async (uid, entityToUpdate, data) => {
       }
 
       componentBody[attributeName] = await Promise.all(
-        dynamiczoneValues.map(async (value, idx) => {
+        dynamiczoneValues.map(async (value) => {
           const { id } = await updateOrCreateComponent(value.__component, value);
 
           return {
             id,
             __component: value.__component,
             __pivot: {
-              order: idx + 1,
               field: attributeName,
             },
           };

package/lib/services/entity-service/index.js

@@ -10,6 +10,8 @@ const {
   sanitize,
 } = require('@strapi/utils');
 const { ValidationError } = require('@strapi/utils').errors;
+const { isAnyToMany } = require('@strapi/utils').relations;
+const { transformParamsToQuery } = require('@strapi/utils').convertQueryParams;
 const uploadFiles = require('../utils/upload-files');
 
 const {
@@ -19,9 +21,16 @@ const {
   updateComponents,
   deleteComponents,
 } = require('./components');
-const { transformParamsToQuery, pickSelectionParams } = require('./params');
+const { pickSelectionParams } = require('./params');
 const { applyTransforms } = require('./attributes');
 
+const transformLoadParamsToQuery = (uid, field, params = {}, pagination = {}) => {
+  return {
+    ...transformParamsToQuery(uid, { populate: { [field]: params } }).populate[field],
+    ...pagination,
+  };
+};
+
 // TODO: those should be strapi events used by the webhooks not the other way arround
 const { ENTRY_CREATE, ENTRY_UPDATE, ENTRY_DELETE } = webhookUtils.webhookEvents;
 
@@ -83,12 +92,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    const { results, pagination } = await db.query(uid).findPage(query);
-
-    return {
-      results,
-      pagination,
-    };
+    return db.query(uid).findPage(query);
   },
 
   async findWithRelationCounts(uid, opts) {
@@ -96,9 +100,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    const results = await db.query(uid).findMany(query);
-
-    return results;
+    return db.query(uid).findMany(query);
   },
 
   async findOne(uid, entityId, opts) {
@@ -251,35 +253,28 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   load(uid, entity, field, params = {}) {
-    const { attributes } = strapi.getModel(uid);
+    if (!_.isString(field)) {
+      throw new Error(`Invalid load. Expected "${field}" to be a string`);
+    }
 
-    const attribute = attributes[field];
+    return db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params));
+  },
 
-    const loadParams = {};
+  loadPages(uid, entity, field, params = {}, pagination = {}) {
+    if (!_.isString(field)) {
+      throw new Error(`Invalid load. Expected "${field}" to be a string`);
+    }
 
-    switch (attribute.type) {
-      case 'relation': {
-        Object.assign(loadParams, transformParamsToQuery(attribute.target, params));
-        break;
-      }
-      case 'component': {
-        Object.assign(loadParams, transformParamsToQuery(attribute.component, params));
-        break;
-      }
-      case 'dynamiczone': {
-        Object.assign(loadParams, transformParamsToQuery(null, params));
-        break;
-      }
-      case 'media': {
-        Object.assign(loadParams, transformParamsToQuery('plugin::upload.file', params));
-        break;
-      }
-      default: {
-        break;
-      }
+    const { attributes } = strapi.getModel(uid);
+    const attribute = attributes[field];
+
+    if (!isAnyToMany(attribute)) {
+      throw new Error(`Invalid load. Expected "${field}" to be an anyToMany relational attribute`);
     }
 
-    return db.query(uid).load(entity, field, loadParams);
+    const query = transformLoadParamsToQuery(uid, field, params, pagination);
+
+    return db.query(uid).loadPages(entity, field, query);
   },
 });
 

package/lib/services/entity-service/params.js

@@ -1,95 +1,9 @@
 'use strict';
 
-const { pick, isNil, toNumber, isInteger } = require('lodash/fp');
-const { PaginationError } = require('@strapi/utils').errors;
-
-const {
-  convertSortQueryParams,
-  convertLimitQueryParams,
-  convertStartQueryParams,
-  convertPopulateQueryParams,
-  convertFiltersQueryParams,
-  convertFieldsQueryParams,
-  convertPublicationStateParams,
-} = require('@strapi/utils/lib/convert-query-params');
+const { pick } = require('lodash/fp');
 
 const pickSelectionParams = pick(['fields', 'populate']);
 
-const transformParamsToQuery = (uid, params) => {
-  // NOTE: can be a CT, a Compo or nothing in the case of polymorphism (DZ & morph relations)
-  const schema = strapi.getModel(uid);
-
-  const query = {};
-
-  const { _q, sort, filters, fields, populate, page, pageSize, start, limit } = params;
-
-  if (!isNil(_q)) {
-    query._q = _q;
-  }
-
-  if (!isNil(sort)) {
-    query.orderBy = convertSortQueryParams(sort);
-  }
-
-  if (!isNil(filters)) {
-    query.where = convertFiltersQueryParams(filters, schema);
-  }
-
-  if (!isNil(fields)) {
-    query.select = convertFieldsQueryParams(fields);
-  }
-
-  if (!isNil(populate)) {
-    query.populate = convertPopulateQueryParams(populate, schema);
-  }
-
-  const isPagePagination = !isNil(page) || !isNil(pageSize);
-  const isOffsetPagination = !isNil(start) || !isNil(limit);
-
-  if (isPagePagination && isOffsetPagination) {
-    throw new PaginationError(
-      'Invalid pagination attributes. You cannot use page and offset pagination in the same query'
-    );
-  }
-
-  if (!isNil(page)) {
-    const pageVal = toNumber(page);
-
-    if (!isInteger(pageVal) || pageVal <= 0) {
-      throw new PaginationError(
-        `Invalid 'page' parameter. Expected an integer > 0, received: ${page}`
-      );
-    }
-
-    query.page = pageVal;
-  }
-
-  if (!isNil(pageSize)) {
-    const pageSizeVal = toNumber(pageSize);
-
-    if (!isInteger(pageSizeVal) || pageSizeVal <= 0) {
-      throw new PaginationError(
-        `Invalid 'pageSize' parameter. Expected an integer > 0, received: ${page}`
-      );
-    }
-
-    query.pageSize = pageSizeVal;
-  }
-
-  if (!isNil(start)) {
-    query.offset = convertStartQueryParams(start);
-  }
-
-  if (!isNil(limit)) {
-    query.limit = convertLimitQueryParams(limit);
-  }
-
-  convertPublicationStateParams(schema, params, query);
-
-  return query;
-};
-
 module.exports = {
-  transformParamsToQuery,
   pickSelectionParams,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.4.3",
+  "version": "4.5.0-beta.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -78,20 +78,20 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "@koa/cors": "3.4.1",
+    "@koa/cors": "3.4.2",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.4.3",
-    "@strapi/database": "4.4.3",
-    "@strapi/generate-new": "4.4.3",
-    "@strapi/generators": "4.4.3",
-    "@strapi/logger": "4.4.3",
-    "@strapi/permissions": "4.4.3",
-    "@strapi/plugin-content-manager": "4.4.3",
-    "@strapi/plugin-content-type-builder": "4.4.3",
-    "@strapi/plugin-email": "4.4.3",
-    "@strapi/plugin-upload": "4.4.3",
-    "@strapi/typescript-utils": "4.4.3",
-    "@strapi/utils": "4.4.3",
+    "@strapi/admin": "4.5.0-beta.0",
+    "@strapi/database": "4.5.0-beta.0",
+    "@strapi/generate-new": "4.5.0-beta.0",
+    "@strapi/generators": "4.5.0-beta.0",
+    "@strapi/logger": "4.5.0-beta.0",
+    "@strapi/permissions": "4.5.0-beta.0",
+    "@strapi/plugin-content-manager": "4.5.0-beta.0",
+    "@strapi/plugin-content-type-builder": "4.5.0-beta.0",
+    "@strapi/plugin-email": "4.5.0-beta.0",
+    "@strapi/plugin-upload": "4.5.0-beta.0",
+    "@strapi/typescript-utils": "4.5.0-beta.0",
+    "@strapi/utils": "4.5.0-beta.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "f99314ead7f0fdf82b921b9d8f0282a91e952ca8"
+  "gitHead": "ee98b9a9cbb6e0e07e781ff9e87eb170c72e50df"
 }