@strapi/strapi 4.0.0-next.7 → 4.0.1

package/lib/core/registries/services.js

@@ -1,43 +1,114 @@
 'use strict';
 
-const _ = require('lodash');
 const { pickBy, has } = require('lodash/fp');
+const { addNamespace, hasNamespace } = require('../utils');
 
-const contentTypesRegistry = strapi => {
+/**
+ * @typedef {import('./services').Service} Service
+ * @typedef {import('./services').ServiceFactory} ServiceFactory
+ */
+
+const servicesRegistry = strapi => {
   const services = {};
-  const instanciatedServices = {};
+  const instantiatedServices = {};
 
   return {
-    get(serviceUID) {
-      if (instanciatedServices[serviceUID]) {
-        return instanciatedServices[serviceUID];
+    /**
+     * Returns this list of registered services uids
+     * @returns {string[]}
+     */
+    keys() {
+      return Object.keys(services);
+    },
+
+    /**
+     * Returns the instance of a service. Instantiate the service if not already done
+     * @param {string} uid
+     * @returns {Service}
+     */
+    get(uid) {
+      if (instantiatedServices[uid]) {
+        return instantiatedServices[uid];
       }
 
-      const service = services[serviceUID];
+      const service = services[uid];
       if (service) {
-        instanciatedServices[serviceUID] = service({ strapi });
-        return instanciatedServices[serviceUID];
+        instantiatedServices[uid] = typeof service === 'function' ? service({ strapi }) : service;
+        return instantiatedServices[uid];
       }
+    },
+
+    /**
+     * Returns a map with all the services in a namespace
+     * @param {string} namespace
+     * @returns {{ [key: string]: Service }}
+     */
+    getAll(namespace) {
+      const filteredServices = pickBy((_, uid) => hasNamespace(uid, namespace))(services);
 
-      return undefined;
+      // create lazy accessor to avoid instantiating the services;
+      const map = {};
+      for (const uid in filteredServices) {
+        Object.defineProperty(map, uid, {
+          enumerable: true,
+          get: () => {
+            return this.get(uid);
+          },
+        });
+      }
+
+      return map;
     },
-    getAll(prefix = '') {
-      const filteredServices = pickBy((service, serviceUID) => serviceUID.startsWith(prefix))(
-        services
-      );
-      return _.mapValues(filteredServices, (service, serviceUID) => this.get(serviceUID));
+
+    /**
+     * Registers a service
+     * @param {string} uid
+     * @param {Service} service
+     */
+    set(uid, service) {
+      services[uid] = service;
+      delete instantiatedServices[uid];
+      return this;
     },
+
+    /**
+     * Registers a map of services for a specific namespace
+     * @param {string} namespace
+     * @param {{ [key: string]: Service|ServiceFactory }} newServices
+     * @returns
+     */
     add(namespace, newServices) {
       for (const serviceName in newServices) {
         const service = newServices[serviceName];
-        const uid = `${namespace}.${serviceName}`;
+        const uid = addNamespace(serviceName, namespace);
+
         if (has(uid, services)) {
           throw new Error(`Service ${uid} has already been registered.`);
         }
         services[uid] = service;
       }
+
+      return this;
+    },
+
+    /**
+     * Wraps a service to extend it
+     * @param {string} uid
+     * @param {(service: Service) => Service} extendFn
+     */
+    extend(uid, extendFn) {
+      const currentService = this.get(uid);
+
+      if (!currentService) {
+        throw new Error(`Service ${uid} doesn't exist`);
+      }
+
+      const newService = extendFn(currentService);
+      instantiatedServices[uid] = newService;
+
+      return this;
     },
   };
 };
 
-module.exports = contentTypesRegistry;
+module.exports = servicesRegistry;

package/lib/core/utils.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const hasNamespace = (name, namespace) => {
+  if (!namespace) {
+    return true;
+  }
+
+  if (namespace.endsWith('::')) {
+    return name.startsWith(namespace);
+  } else {
+    return name.startsWith(`${namespace}.`);
+  }
+};
+
+const addNamespace = (name, namespace) => {
+  if (namespace.endsWith('::')) {
+    return `${namespace}${name}`;
+  } else {
+    return `${namespace}.${name}`;
+  }
+};
+
+const removeNamespace = (name, namespace) => {
+  if (namespace.endsWith('::')) {
+    return name.replace(namespace, '');
+  } else {
+    return name.replace(`${namespace}.`, '');
+  }
+};
+
+module.exports = {
+  addNamespace,
+  removeNamespace,
+  hasNamespace,
+};

package/lib/core-api/controller/collection-type.js

@@ -1,12 +1,17 @@
 'use strict';
 
-const { transformResponse } = require('./transform');
+const { isObject } = require('lodash/fp');
+const { ValidationError } = require('@strapi/utils').errors;
+
+const { parseBody } = require('./transform');
 
 /**
  *
  * Returns a collection type controller to handle default core-api actions
  */
-const createCollectionTypeController = ({ service, sanitize, parseMultipartData }) => {
+const createCollectionTypeController = ({ contentType }) => {
+  const { uid } = contentType;
+
   return {
     /**
      * Retrieve records.
@@ -16,9 +21,10 @@ const createCollectionTypeController = ({ service, sanitize, parseMultipartData
     async find(ctx) {
       const { query } = ctx;
 
-      const { results, pagination } = await service.find({ params: query });
+      const { results, pagination } = await strapi.service(uid).find(query);
+      const sanitizedResults = await this.sanitizeOutput(results, ctx);
 
-      return transformResponse(sanitize(results), { pagination });
+      return this.transformResponse(sanitizedResults, { pagination });
     },
 
     /**
@@ -30,9 +36,10 @@ const createCollectionTypeController = ({ service, sanitize, parseMultipartData
       const { id } = ctx.params;
       const { query } = ctx;
 
-      const entity = await service.findOne(id, { params: query });
+      const entity = await strapi.service(uid).findOne(id, query);
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
 
-      return transformResponse(sanitize(entity));
+      return this.transformResponse(sanitizedEntity);
     },
 
     /**
@@ -41,17 +48,22 @@ const createCollectionTypeController = ({ service, sanitize, parseMultipartData
      * @return {Object}
      */
     async create(ctx) {
-      const { body, query } = ctx.request;
-
-      let entity;
-      if (ctx.is('multipart')) {
-        const { data, files } = parseMultipartData(ctx);
-        entity = await service.create({ params: query, data, files });
-      } else {
-        entity = await service.create({ params: query, data: body });
+      const { query } = ctx.request;
+
+      const { data, files } = parseBody(ctx);
+
+      if (!isObject(data)) {
+        throw new ValidationError('Missing "data" payload in the request body');
       }
 
-      return transformResponse(sanitize(entity));
+      const sanitizedInputData = await this.sanitizeInput(data, ctx);
+
+      const entity = await strapi
+        .service(uid)
+        .create({ ...query, data: sanitizedInputData, files });
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
 
     /**
@@ -61,17 +73,22 @@ const createCollectionTypeController = ({ service, sanitize, parseMultipartData
      */
     async update(ctx) {
       const { id } = ctx.params;
-      const { body, query } = ctx.request;
-
-      let entity;
-      if (ctx.is('multipart')) {
-        const { data, files } = parseMultipartData(ctx);
-        entity = await service.update(id, { params: query, data, files });
-      } else {
-        entity = await service.update(id, { params: query, data: body });
+      const { query } = ctx.request;
+
+      const { data, files } = parseBody(ctx);
+
+      if (!isObject(data)) {
+        throw new ValidationError('Missing "data" payload in the request body');
       }
 
-      return transformResponse(sanitize(entity));
+      const sanitizedInputData = await this.sanitizeInput(data, ctx);
+
+      const entity = await strapi
+        .service(uid)
+        .update(id, { ...query, data: sanitizedInputData, files });
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
 
     /**
@@ -83,8 +100,10 @@ const createCollectionTypeController = ({ service, sanitize, parseMultipartData
       const { id } = ctx.params;
       const { query } = ctx;
 
-      const entity = await service.delete(id, { params: query });
-      return transformResponse(sanitize(entity));
+      const entity = await strapi.service(uid).delete(id, query);
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
   };
 };

package/lib/core-api/controller/index.d.ts

@@ -0,0 +1,25 @@
+import { Context } from 'koa';
+
+type Response = object;
+
+interface BaseController {
+  transformResponse(data: object, meta: object): object;
+  sanitizeOutput(data: object, ctx: Context): Promise<object>;
+  sanitizeInput(data: object, ctx: Context): Promise<object>;
+}
+
+export interface SingleTypeController extends BaseController {
+  find(ctx: Context): Promise<Response>;
+  update(ctx: Context): Promise<Response>;
+  delete(ctx: Context): Promise<Response>;
+}
+
+export interface CollectionTypeController extends BaseController {
+  find(ctx: Context): Promise<Response>;
+  findOne(ctx: Context): Promise<Response>;
+  create(ctx: Context): Promise<Response>;
+  update(ctx: Context): Promise<Response>;
+  delete(ctx: Context): Promise<Response>;
+}
+
+export type Controller = SingleTypeController | CollectionTypeController;

package/lib/core-api/controller/index.js

@@ -1,23 +1,45 @@
 'use strict';
 
-const { parseMultipartData, sanitizeEntity } = require('@strapi/utils');
+const { getOr } = require('lodash/fp');
 
+const { contentTypes, sanitize } = require('@strapi/utils');
+
+const { transformResponse } = require('./transform');
 const createSingleTypeController = require('./single-type');
 const createCollectionTypeController = require('./collection-type');
 
-module.exports = ({ service, model }) => {
-  const ctx = {
-    model,
-    service,
-    parseMultipartData,
-    sanitize(data) {
-      return sanitizeEntity(data, { model: strapi.getModel(model.uid) });
+const getAuthFromKoaContext = getOr({}, 'state.auth');
+
+const createController = ({ contentType }) => {
+  const ctx = { contentType };
+
+  const proto = {
+    transformResponse(data, meta) {
+      return transformResponse(data, meta, { contentType });
+    },
+
+    sanitizeOutput(data, ctx) {
+      const auth = getAuthFromKoaContext(ctx);
+
+      return sanitize.contentAPI.output(data, contentType, { auth });
+    },
+
+    sanitizeInput(data, ctx) {
+      const auth = getAuthFromKoaContext(ctx);
+
+      return sanitize.contentAPI.input(data, contentType, { auth });
     },
   };
 
-  if (model.kind === 'singleType') {
-    return createSingleTypeController(ctx);
+  let ctrl;
+
+  if (contentTypes.isSingleType(contentType)) {
+    ctrl = createSingleTypeController(ctx);
+  } else {
+    ctrl = createCollectionTypeController(ctx);
   }
 
-  return createCollectionTypeController(ctx);
+  return Object.assign(Object.create(proto), ctrl);
 };
+
+module.exports = { createController };

package/lib/core-api/controller/single-type.js

@@ -1,11 +1,16 @@
 'use strict';
 
-const { transformResponse } = require('./transform');
+const { isObject } = require('lodash/fp');
+const { ValidationError } = require('@strapi/utils').errors;
+
+const { parseBody } = require('./transform');
 
 /**
  * Returns a single type controller to handle default core-api actions
  */
-const createSingleTypeController = ({ service, parseMultipartData, sanitize }) => {
+const createSingleTypeController = ({ contentType }) => {
+  const { uid } = contentType;
+
   return {
     /**
      * Retrieve single type content
@@ -14,8 +19,11 @@ const createSingleTypeController = ({ service, parseMultipartData, sanitize }) =
      */
     async find(ctx) {
       const { query } = ctx;
-      const entity = await service.find({ params: query });
-      return transformResponse(sanitize(entity));
+
+      const entity = await strapi.service(uid).find(query);
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
 
     /**
@@ -24,24 +32,30 @@ const createSingleTypeController = ({ service, parseMultipartData, sanitize }) =
      * @return {Object}
      */
     async update(ctx) {
-      const { body, query } = ctx.request;
-
-      let entity;
-      if (ctx.is('multipart')) {
-        const { data, files } = parseMultipartData(ctx);
-        entity = await service.createOrUpdate({ params: query, data, files });
-      } else {
-        entity = await service.createOrUpdate({ params: query, data: body });
+      const { query } = ctx.request;
+      const { data, files } = parseBody(ctx);
+
+      if (!isObject(data)) {
+        throw new ValidationError('Missing "data" payload in the request body');
       }
 
-      return transformResponse(sanitize(entity));
+      const sanitizedInputData = await this.sanitizeInput(data, ctx);
+
+      const entity = await strapi
+        .service(uid)
+        .createOrUpdate({ ...query, data: sanitizedInputData, files });
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
 
     async delete(ctx) {
       const { query } = ctx;
 
-      const entity = await service.delete({ params: query });
-      return transformResponse(sanitize(entity));
+      const entity = await strapi.service(uid).delete(query);
+      const sanitizedEntity = await this.sanitizeOutput(entity, ctx);
+
+      return this.transformResponse(sanitizedEntity);
     },
   };
 };

package/lib/core-api/controller/transform.js

@@ -1,41 +1,97 @@
 'use strict';
 
 const { isNil, isPlainObject } = require('lodash/fp');
+const { parseMultipartData } = require('@strapi/utils');
 
-const transformResponse = (resource, meta = {}) => {
+const parseBody = ctx => {
+  if (ctx.is('multipart')) {
+    return parseMultipartData(ctx);
+  }
+
+  const { data } = ctx.request.body || {};
+
+  return { data };
+};
+
+const transformResponse = (resource, meta = {}, { contentType } = {}) => {
   if (isNil(resource)) {
     return resource;
   }
 
   return {
-    data: transformEntry(resource),
+    data: transformEntry(resource, contentType),
     meta,
   };
 };
 
-const transformEntry = entry => {
+const transformComponent = (data, component) => {
+  if (Array.isArray(data)) {
+    return data.map(datum => transformComponent(datum, component));
+  }
+
+  const res = transformEntry(data, component);
+
+  if (isNil(res)) {
+    return res;
+  }
+
+  const { id, attributes } = res;
+  return { id, ...attributes };
+};
+
+const transformEntry = (entry, type) => {
   if (isNil(entry)) {
     return entry;
   }
 
   if (Array.isArray(entry)) {
-    return entry.map(singleEntry => transformEntry(singleEntry));
+    return entry.map(singleEntry => transformEntry(singleEntry, type));
   }
 
   if (!isPlainObject(entry)) {
     throw new Error('Entry must be an object');
   }
 
-  const { id, ...attributes } = entry;
+  const { id, ...properties } = entry;
+
+  const attributeValues = {};
+
+  for (const key in properties) {
+    const property = properties[key];
+    const attribute = type && type.attributes[key];
+
+    if (attribute && attribute.type === 'relation') {
+      const data = transformEntry(property, strapi.contentType(attribute.target));
+
+      attributeValues[key] = { data };
+    } else if (attribute && attribute.type === 'component') {
+      attributeValues[key] = transformComponent(property, strapi.components[attribute.component]);
+    } else if (attribute && attribute.type === 'dynamiczone') {
+      if (isNil(property)) {
+        attributeValues[key] = property;
+      }
+
+      attributeValues[key] = property.map(subProperty => {
+        return transformComponent(subProperty, strapi.components[subProperty.__component]);
+      });
+    } else if (attribute && attribute.type === 'media') {
+      const data = transformEntry(property, strapi.contentType('plugin::upload.file'));
+
+      attributeValues[key] = { data };
+    } else {
+      attributeValues[key] = property;
+    }
+  }
 
   return {
     id,
-    attributes,
+    attributes: attributeValues,
     // NOTE: not necessary for now
     // meta: {},
   };
 };
 
 module.exports = {
+  parseBody,
   transformResponse,
 };

package/lib/core-api/routes/index.js

@@ -0,0 +1,71 @@
+'use strict';
+
+const { isSingleType } = require('@strapi/utils').contentTypes;
+
+const createRoutes = ({ contentType }) => {
+  if (isSingleType(contentType)) {
+    return getSingleTypeRoutes(contentType);
+  }
+
+  return getCollectionTypeRoutes(contentType);
+};
+
+const getSingleTypeRoutes = ({ uid, info }) => {
+  return {
+    find: {
+      method: 'GET',
+      path: `/${info.singularName}`,
+      handler: `${uid}.find`,
+      config: {},
+    },
+    update: {
+      method: 'PUT',
+      path: `/${info.singularName}`,
+      handler: `${uid}.update`,
+      config: {},
+    },
+    delete: {
+      method: 'DELETE',
+      path: `/${info.singularName}`,
+      handler: `${uid}.delete`,
+      config: {},
+    },
+  };
+};
+
+const getCollectionTypeRoutes = ({ uid, info }) => {
+  return {
+    find: {
+      method: 'GET',
+      path: `/${info.pluralName}`,
+      handler: `${uid}.find`,
+      config: {},
+    },
+    findOne: {
+      method: 'GET',
+      path: `/${info.pluralName}/:id`,
+      handler: `${uid}.findOne`,
+      config: {},
+    },
+    create: {
+      method: 'POST',
+      path: `/${info.pluralName}`,
+      handler: `${uid}.create`,
+      config: {},
+    },
+    update: {
+      method: 'PUT',
+      path: `/${info.pluralName}/:id`,
+      handler: `${uid}.update`,
+      config: {},
+    },
+    delete: {
+      method: 'DELETE',
+      path: `/${info.pluralName}/:id`,
+      handler: `${uid}.delete`,
+      config: {},
+    },
+  };
+};
+
+module.exports = { createRoutes };