@strapi/strapi 4.0.0-next.11 → 4.0.0-next.15

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const { has, prop, omit } = require('lodash/fp');
+const { has, prop, omit, toString } = require('lodash/fp');
 
 const { contentTypes: contentTypesUtils } = require('@strapi/utils');
 
@@ -131,11 +131,26 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           componentValue.map(value => updateOrCreateComponent(componentUID, value))
         );
 
-        // TODO: add order
-        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => id);
+        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }, idx) => {
+          return {
+            id,
+            __pivot: {
+              order: idx + 1,
+              field: attributeName,
+              component_type: componentUID,
+            },
+          };
+        });
       } else {
         const component = await updateOrCreateComponent(componentUID, componentValue);
-        componentBody[attributeName] = component && component.id;
+        componentBody[attributeName] = component && {
+          id: component.id,
+          __pivot: {
+            order: 1,
+            field: attributeName,
+            component_type: componentUID,
+          },
+        };
       }
 
       continue;
@@ -151,9 +166,17 @@ const updateComponents = async (uid, entityToUpdate, data) => {
       }
 
       componentBody[attributeName] = await Promise.all(
-        dynamiczoneValues.map(async value => {
+        dynamiczoneValues.map(async (value, idx) => {
           const { id } = await updateOrCreateComponent(value.__component, value);
-          return { id, __component: value.__component };
+
+          return {
+            id,
+            __component: value.__component,
+            __pivot: {
+              order: idx + 1,
+              field: attributeName,
+            },
+          };
         })
       );
 
@@ -175,11 +198,13 @@ const deleteOldComponents = async (
 
   const idsToKeep = _.castArray(componentValue)
     .filter(has('id'))
-    .map(prop('id'));
+    .map(prop('id'))
+    .map(toString);
 
   const allIds = _.castArray(previousValue)
     .filter(has('id'))
-    .map(prop('id'));
+    .map(prop('id'))
+    .map(toString);
 
   idsToKeep.forEach(id => {
     if (!allIds.includes(id)) {
@@ -206,14 +231,14 @@ const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamic
   const idsToKeep = _.castArray(dynamiczoneValues)
     .filter(has('id'))
     .map(({ id, __component }) => ({
-      id,
+      id: toString(id),
       __component,
     }));
 
   const allIds = _.castArray(previousValue)
     .filter(has('id'))
     .map(({ id, __component }) => ({
-      id,
+      id: toString(id),
       __component,
     }));
 
@@ -293,7 +318,7 @@ const createComponent = async (uid, data) => {
 
   const componentData = await createComponents(uid, data);
 
-  return await strapi.query(uid).create({
+  return strapi.query(uid).create({
     data: Object.assign(omitComponentData(model, data), componentData),
   });
 };
@@ -304,7 +329,7 @@ const updateComponent = async (uid, componentToUpdate, data) => {
 
   const componentData = await updateComponents(uid, componentToUpdate, data);
 
-  return await strapi.query(uid).update({
+  return strapi.query(uid).update({
     where: {
       id: componentToUpdate.id,
     },

package/lib/services/entity-service/index.d.ts

@@ -0,0 +1,91 @@
+import { Database } from '@strapi/database';
+import { Strapi } from '../../';
+
+type ID = number | string;
+
+type EntityServiceAction =
+  | 'findMany'
+  | 'findPage'
+  | 'findWithRelationCounts'
+  | 'findOne'
+  | 'count'
+  | 'create'
+  | 'update'
+  | 'delete';
+
+type PaginationInfo = {
+  page: number;
+  pageSize: number;
+  pageCount: number;
+  total: number;
+};
+
+type Params<T> = {
+  fields?: (keyof T)[];
+  filters?: any;
+  _q?: string;
+  populate?: any;
+  sort?: any;
+  start?: number;
+  limit?: number;
+  page?: number;
+  pageSize?: number;
+  publicationState?: string;
+  data?: any;
+  files?: any;
+};
+
+interface EntityService {
+  uploadFiles<K extends keyof AllTypes, T extends AllTypes[K]>(uid: K, entity, files);
+  wrapParams<K extends keyof AllTypes, T extends AllTypes[K]>(
+    params: Params<T>,
+    { uid: K, action: EntityServiceAction }
+  );
+
+  findMany<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    params: Params<T>
+  ): Promise<T[]>;
+  findPage<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    params: Params<T>
+  ): Promise<{
+    results: T[];
+    pagination: PaginationInfo;
+  }>;
+
+  findWithRelationCounts<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    params: Params<T>
+  ): Promise<{
+    results: T[];
+    pagination: PaginationInfo;
+  }>;
+
+  findOne<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    entityId: ID,
+    params: Params<T>
+  ): Promise<T>;
+
+  count<K extends keyof AllTypes, T extends AllTypes[K]>(uid: K, params: Params<T>): Promise<any>;
+  create<K extends keyof AllTypes, T extends AllTypes[K]>(uid: K, params: Params<T>): Promise<any>;
+  update<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    entityId: ID,
+    params: Params<T>
+  ): Promise<any>;
+  delete<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    entityId: ID,
+    params: Params<T>
+  ): Promise<any>;
+}
+
+export default function(opts: {
+  strapi: Strapi;
+  db: Database;
+  // TODO: define types
+  eventHub: any;
+  entityValidator: any;
+}): EntityService;

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

@@ -1,11 +1,12 @@
 'use strict';
 
 const delegate = require('delegates');
+const { pipe } = require('lodash/fp');
+
 const {
   sanitizeEntity,
   webhook: webhookUtils,
   contentTypes: contentTypesUtils,
-  relations: relationsUtils,
 } = require('@strapi/utils');
 const uploadFiles = require('../utils/upload-files');
 
@@ -15,9 +16,12 @@ const {
   updateComponents,
   deleteComponents,
 } = require('./components');
-const { transformParamsToQuery, pickSelectionParams } = require('./params');
-
-const { MANY_RELATIONS } = relationsUtils.constants;
+const {
+  transformCommonParams,
+  transformPaginationParams,
+  transformParamsToQuery,
+  pickSelectionParams,
+} = require('./params');
 
 // TODO: those should be strapi events used by the webhooks not the other way arround
 const { ENTRY_CREATE, ENTRY_UPDATE, ENTRY_DELETE } = webhookUtils.webhookEvents;
@@ -45,10 +49,13 @@ module.exports = ctx => {
   return service;
 };
 
+/**
+ * @type {import('.').default}
+ */
 const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator }) => ({
   uploadFiles,
 
-  async wrapOptions(options = {}) {
+  async wrapParams(options = {}) {
     return options;
   },
 
@@ -61,13 +68,12 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     });
   },
 
-  // TODO: rename to findMany
-  async find(uid, opts) {
+  async findMany(uid, opts) {
     const { kind } = strapi.getModel(uid);
 
-    const { params } = await this.wrapOptions(opts, { uid, action: 'find' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findMany' });
 
-    const query = transformParamsToQuery(uid, params);
+    const query = transformParamsToQuery(uid, wrappedParams);
 
     if (kind === 'singleType') {
       return db.query(uid).findOne(query);
@@ -77,42 +83,20 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   async findPage(uid, opts) {
-    const { params } = await this.wrapOptions(opts, { uid, action: 'findPage' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findPage' });
 
-    const query = transformParamsToQuery(uid, params);
+    const query = transformParamsToQuery(uid, wrappedParams);
 
     return db.query(uid).findPage(query);
   },
 
   // TODO: streamline the logic based on the populate option
   async findWithRelationCounts(uid, opts) {
-    const model = strapi.getModel(uid);
-
-    const { params } = await this.wrapOptions(opts, { uid, action: 'findWithRelationCounts' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findWithRelationCounts' });
 
-    const query = transformParamsToQuery(uid, params);
-
-    const { attributes } = model;
-
-    const populate = (query.populate || []).reduce((populate, attributeName) => {
-      const attribute = attributes[attributeName];
-
-      if (
-        MANY_RELATIONS.includes(attribute.relation) &&
-        contentTypesUtils.isVisibleAttribute(model, attributeName)
-      ) {
-        populate[attributeName] = { count: true };
-      } else {
-        populate[attributeName] = true;
-      }
+    const query = transformParamsToQuery(uid, wrappedParams);
 
-      return populate;
-    }, {});
-
-    const { results, pagination } = await db.query(uid).findPage({
-      ...query,
-      populate,
-    });
+    const { results, pagination } = await db.query(uid).findPage(query);
 
     return {
       results,
@@ -121,23 +105,24 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   async findOne(uid, entityId, opts) {
-    const { params } = await this.wrapOptions(opts, { uid, action: 'findOne' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findOne' });
 
-    const query = transformParamsToQuery(uid, pickSelectionParams(params));
+    const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
     return db.query(uid).findOne({ ...query, where: { id: entityId } });
   },
 
   async count(uid, opts) {
-    const { params } = await this.wrapOptions(opts, { uid, action: 'count' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'count' });
 
-    const query = transformParamsToQuery(uid, params);
+    const query = transformParamsToQuery(uid, wrappedParams);
 
     return db.query(uid).count(query);
   },
 
   async create(uid, opts) {
-    const { params, data, files } = await this.wrapOptions(opts, { uid, action: 'create' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'create' });
+    const { data, files } = wrappedParams;
 
     const model = strapi.getModel(uid);
 
@@ -145,7 +130,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     const validData = await entityValidator.validateEntityCreation(model, data, { isDraft });
 
     // select / populate
-    const query = transformParamsToQuery(uid, pickSelectionParams(params));
+    const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
     // TODO: wrap into transaction
     const componentData = await createComponents(uid, validData);
@@ -159,7 +144,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
       await this.uploadFiles(uid, entity, files);
-      entity = await this.findOne(uid, entity.id, { params });
+      entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
     this.emitEvent(uid, ENTRY_CREATE, entity);
@@ -168,7 +153,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   async update(uid, entityId, opts) {
-    const { params, data, files } = await this.wrapOptions(opts, { uid, action: 'update' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'update' });
+    const { data, files } = wrappedParams;
 
     const model = strapi.getModel(uid);
 
@@ -184,7 +170,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       isDraft,
     });
 
-    const query = transformParamsToQuery(uid, pickSelectionParams(params));
+    const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
     // TODO: wrap in transaction
     const componentData = await updateComponents(uid, entityToUpdate, validData);
@@ -199,7 +185,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
       await this.uploadFiles(uid, entity, files);
-      entity = await this.findOne(uid, entity.id, { params });
+      entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
     this.emitEvent(uid, ENTRY_UPDATE, entity);
@@ -208,10 +194,10 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   async delete(uid, entityId, opts) {
-    const { params } = await this.wrapOptions(opts, { uid, action: 'delete' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'delete' });
 
     // select / populate
-    const query = transformParamsToQuery(uid, pickSelectionParams(params));
+    const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
 
     const entityToDelete = await db.query(uid).findOne({
       ...query,
@@ -232,11 +218,27 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
   // FIXME: used only for the CM to be removed
   async deleteMany(uid, opts) {
-    const { params } = await this.wrapOptions(opts, { uid, action: 'delete' });
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'delete' });
 
     // select / populate
-    const query = transformParamsToQuery(uid, params);
+    const query = transformParamsToQuery(uid, wrappedParams);
 
     return db.query(uid).deleteMany(query);
   },
+
+  load(uid, entity, field, params) {
+    const { attributes } = strapi.getModel(uid);
+
+    const attribute = attributes[field];
+
+    const loadParams =
+      attribute.type === 'relation'
+        ? transformParamsToQuery(attribute.target, params)
+        : pipe(
+            transformCommonParams,
+            transformPaginationParams
+          )(params);
+
+    return db.query(uid).load(entity, field, loadParams);
+  },
 });

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const { pick } = require('lodash/fp');
+const { pick, pipe, isNil } = require('lodash/fp');
 
 const {
   convertSortQueryParams,
@@ -15,45 +15,26 @@ const { contentTypes: contentTypesUtils } = require('@strapi/utils');
 
 const { PUBLISHED_AT_ATTRIBUTE } = contentTypesUtils.constants;
 
-// TODO: check invalid values / add defaults ....
-const transformParamsToQuery = (uid, params = {}) => {
-  const model = strapi.getModel(uid);
-
+// TODO: to remove once the front is migrated
+const convertOldQuery = params => {
   const query = {};
 
-  const {
-    start,
-    page,
-    pageSize,
-    limit,
-    sort,
-    filters,
-    fields,
-    populate,
-    publicationState,
-    _q,
-    _where,
-    ...rest
-  } = params;
-
-  if (_q) {
-    query._q = _q;
-  }
-
-  if (page) {
-    query.page = Number(page);
-  }
+  Object.keys(params).forEach(key => {
+    if (key.startsWith('_')) {
+      query[key.slice(1)] = params[key];
+    } else {
+      query[key] = params[key];
+    }
+  });
 
-  if (pageSize) {
-    query.pageSize = Number(pageSize);
-  }
+  return query;
+};
 
-  if (start) {
-    query.offset = convertStartQueryParams(start);
-  }
+const transformCommonParams = (params = {}) => {
+  const { _q, sort, filters, _where, fields, populate, ...query } = params;
 
-  if (limit) {
-    query.limit = convertLimitQueryParams(limit);
+  if (_q) {
+    query._q = _q;
   }
 
   if (sort) {
@@ -78,8 +59,50 @@ const transformParamsToQuery = (uid, params = {}) => {
     query.populate = convertPopulateQueryParams(populate);
   }
 
-  // TODO: move to convert-query-params ?
-  if (publicationState && contentTypesUtils.hasDraftAndPublish(model)) {
+  return { ...convertOldQuery(query), ...query };
+};
+
+const transformPaginationParams = (params = {}) => {
+  const { page, pageSize, start, limit, ...query } = params;
+
+  const isPagePagination = !isNil(page) || !isNil(pageSize);
+  const isOffsetPagination = !isNil(start) || !isNil(limit);
+
+  if (isPagePagination && isOffsetPagination) {
+    throw new Error(
+      'Invalid pagination attributes. You cannot use page and offset pagination in the same query'
+    );
+  }
+
+  if (page) {
+    query.page = Number(page);
+  }
+
+  if (pageSize) {
+    query.pageSize = Number(pageSize);
+  }
+
+  if (start) {
+    query.offset = convertStartQueryParams(start);
+  }
+
+  if (limit) {
+    query.limit = convertLimitQueryParams(limit);
+  }
+
+  return { ...convertOldQuery(query), ...query };
+};
+
+const transformPublicationStateParams = uid => (params = {}) => {
+  const contentType = strapi.getModel(uid);
+
+  if (!contentType) {
+    return params;
+  }
+
+  const { publicationState, ...query } = params;
+
+  if (publicationState && contentTypesUtils.hasDraftAndPublish(contentType)) {
     const { publicationState = 'live' } = params;
 
     const liveClause = {
@@ -97,32 +120,26 @@ const transformParamsToQuery = (uid, params = {}) => {
     }
   }
 
-  const finalQuery = {
-    ...convertOldQuery(rest),
-    ...query,
-  };
-
-  return finalQuery;
+  return { ...convertOldQuery(query), ...query };
 };
 
-// TODO: to remove once the front is migrated
-const convertOldQuery = params => {
-  const obj = {};
-
-  Object.keys(params).forEach(key => {
-    if (key.startsWith('_')) {
-      obj[key.slice(1)] = params[key];
-    } else {
-      obj[key] = params[key];
-    }
-  });
+const pickSelectionParams = pick(['fields', 'populate']);
 
-  return obj;
+const transformParamsToQuery = (uid, params) => {
+  return pipe(
+    // _q, _where, filters, etc...
+    transformCommonParams,
+    // page, pageSize, start, limit
+    transformPaginationParams,
+    // publicationState
+    transformPublicationStateParams(uid)
+  )(params);
 };
 
-const pickSelectionParams = pick(['fields', 'populate']);
-
 module.exports = {
+  transformCommonParams,
+  transformPublicationStateParams,
+  transformPaginationParams,
   transformParamsToQuery,
   pickSelectionParams,
 };

package/lib/services/fs.js

@@ -12,7 +12,7 @@ module.exports = strapi => {
 
     const normalizedPath = path.normalize(filePath).replace(/^\/?(\.\/|\.\.\/)+/, '');
 
-    return path.join(strapi.dir, normalizedPath);
+    return path.join(strapi.dirs.root, normalizedPath);
   }
 
   const strapiFS = {

package/lib/services/metrics/index.js

@@ -88,7 +88,7 @@ const hashProject = strapi =>
 
 const hashDep = strapi => {
   const depStr = JSON.stringify(strapi.config.info.dependencies);
-  const readmePath = path.join(strapi.dir, 'README.md');
+  const readmePath = path.join(strapi.dirs.root, 'README.md');
 
   try {
     if (fs.existsSync(readmePath)) {

package/lib/services/server/policy.js

@@ -11,11 +11,22 @@ const resolvePolicies = route => {
   const { pluginName, apiName } = route.info || {};
   const policiesConfig = getPoliciesConfig(route);
 
-  const policies = policiesConfig.map(policyName => {
-    return policy.get(policyName, { pluginName, apiName });
-  });
+  const policiesMiddleware = async (ctx, next) => {
+    const context = policy.createPolicyContext('koa', ctx);
 
-  return [...policies, bodyPolicy];
+    for (const policyName of policiesConfig) {
+      const resolvedPolicy = await policy.get(policyName, { pluginName, apiName });
+      const result = await resolvedPolicy({ ctx: context, strapi });
+
+      if (![true, undefined].includes(result)) {
+        throw new Error('Policies failed.');
+      }
+    }
+
+    await next();
+  };
+
+  return [policiesMiddleware, bodyPolicy];
 };
 
 module.exports = {

package/lib/services/webhook-runner.js

@@ -79,7 +79,7 @@ class WebhookRunner {
       method: 'post',
       body: JSON.stringify({
         event,
-        created_at: new Date(),
+        createdAt: new Date(),
         ...info,
       }),
       headers: {

package/lib/utils/ee.js

@@ -78,7 +78,7 @@ module.exports = ({ dir, logger = noLog }) => {
 };
 
 Object.defineProperty(module.exports, 'licenseInfo', {
-  get: () => {
+  get() {
     mustHaveKey('licenseInfo');
     return internals.licenseInfo;
   },
@@ -87,7 +87,7 @@ Object.defineProperty(module.exports, 'licenseInfo', {
 });
 
 Object.defineProperty(module.exports, 'isEE', {
-  get: () => {
+  get() {
     mustHaveKey('isEE');
     return internals.isEE;
   },
@@ -96,7 +96,7 @@ Object.defineProperty(module.exports, 'isEE', {
 });
 
 Object.defineProperty(module.exports, 'features', {
-  get: () => {
+  get() {
     mustHaveKey('licenseInfo');
 
     const { type: licenseType } = module.exports.licenseInfo;

package/lib/utils/get-dirs.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const { join } = require('path');
+
+const getDirs = root => ({
+  root,
+  src: join(root, 'src'),
+  api: join(root, 'src', 'api'),
+  components: join(root, 'src', 'components'),
+  extensions: join(root, 'src', 'extensions'),
+  policies: join(root, 'src', 'policies'),
+  config: join(root, 'config'),
+});
+
+module.exports = getDirs;