@strapi/strapi 4.4.0-alpha.0 → 4.4.0-beta.1

package/README.md

@@ -1,8 +1,12 @@
 <p align="center">
-  <a href="https://strapi.io">
+  <a href="https://strapi.io/#gh-light-mode-only">
     <img src="https://strapi.io/assets/strapi-logo-dark.svg" width="318px" alt="Strapi logo" />
   </a>
+  <a href="https://strapi.io/#gh-dark-mode-only">
+    <img src="https://strapi.io/assets/strapi-logo-light.svg" width="318px" alt="Strapi logo" />
+  </a>
 </p>
+
 <h3 align="center">API creation made simple, secure and fast.</h3>
 <p align="center">The most advanced open-source headless CMS to build powerful APIs with no effort.</p>
 <p align="center"><a href="https://strapi.io/demo">Try live demo</a></p>
@@ -18,6 +22,9 @@
   <a href="https://discord.strapi.io">
     <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />
   </a>
+  <a href="https://github.com/strapi/strapi/actions/workflows/nightly.yml">
+    <img src="https://github.com/strapi/strapi/actions/workflows/nightly.yml/badge.svg" alt="Strapi Nightly Release Build Status" />
+  </a>
 </p>
 
 <br>
@@ -79,15 +86,17 @@ Complete installation requirements can be found in the documentation under <a hr
 
 **Node:**
 
-- NodeJS >= 12 <= 16
+- NodeJS >= 14 <= 18
 - NPM >= 6.x
 
 **Database:**
 
-- MySQL >= 5.7.8
-- MariaDB >= 10.2.7
-- PostgreSQL >= 10
-- SQLite >= 3
+| Database   | Minimum | Recommended |
+| ---------- | ------- | ----------- |
+| MySQL      | 5.7.8   | 8.0         |
+| MariaDB    | 10.3    | 10.6        |
+| PostgreSQL | 11.0    | 14.0        |
+| SQLite     | 3       | 3           |
 
 **We recommend always using the latest version of Strapi to start your new projects**.
 
@@ -114,7 +123,7 @@ For general help using Strapi, please refer to [the official Strapi documentatio
 - [Discord](https://discord.strapi.io) (For live discussion with the Community and Strapi team)
 - [GitHub](https://github.com/strapi/strapi) (Bug reports, Contributions)
 - [Community Forum](https://forum.strapi.io) (Questions and Discussions)
-- [Roadmap & Feature Requests](https://feedback.strapi.io/)
+- [Feedback section](https://feedback.strapi.io) (Roadmap, Feature requests)
 - [Twitter](https://twitter.com/strapijs) (Get the news fast)
 - [Facebook](https://www.facebook.com/Strapi-616063331867161)
 - [YouTube Channel](https://www.youtube.com/strapi) (Learn from Video Tutorials)
@@ -125,7 +134,7 @@ Follow our [migration guides](https://docs.strapi.io/developer-docs/latest/updat
 
 ## Roadmap
 
-Check out our [roadmap](https://feedback.strapi.io/) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
+Check out our [roadmap](https://feedback.strapi.io) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
 
 ## Documentation
 

package/lib/Strapi.js

@@ -22,7 +22,7 @@ const createCronService = require('./services/cron');
 const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
 const createAuth = require('./services/auth');
-const createCustomFields = require('./services/custom-fields');
+const createContentAPI = require('./services/content-api');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
 const { LIFECYCLES } = require('./utils/lifecycles');
@@ -35,14 +35,12 @@ const hooksRegistry = require('./core/registries/hooks');
 const controllersRegistry = require('./core/registries/controllers');
 const modulesRegistry = require('./core/registries/modules');
 const pluginsRegistry = require('./core/registries/plugins');
-const customFieldsRegistry = require('./core/registries/custom-fields');
 const createConfigProvider = require('./core/registries/config');
 const apisRegistry = require('./core/registries/apis');
 const bootstrap = require('./core/bootstrap');
 const loaders = require('./core/loaders');
 const { destroyOnSignal } = require('./utils/signals');
 const sanitizersRegistry = require('./core/registries/sanitizers');
-const convertCustomFieldType = require('./utils/convert-custom-field-type');
 
 // TODO: move somewhere else
 const draftAndPublishSync = require('./migrations/draft-publish');
@@ -77,7 +75,7 @@ class Strapi {
     // Load the app configuration from the dist directory
     const appConfig = loadConfiguration({ appDir: rootDirs.app, distDir: rootDirs.dist }, opts);
 
-    // Instanciate the Strapi container
+    // Instantiate the Strapi container
     this.container = createContainer(this);
 
     // Register every Strapi registry in the container
@@ -90,9 +88,9 @@ class Strapi {
     this.container.register('controllers', controllersRegistry(this));
     this.container.register('modules', modulesRegistry(this));
     this.container.register('plugins', pluginsRegistry(this));
-    this.container.register('custom-fields', customFieldsRegistry(this));
     this.container.register('apis', apisRegistry(this));
     this.container.register('auth', createAuth(this));
+    this.container.register('content-api', createContentAPI(this));
     this.container.register('sanitizers', sanitizersRegistry(this));
 
     // Create a mapping of every useful directory (for the app, dist and static directories)
@@ -102,7 +100,7 @@ class Strapi {
     this.isLoaded = false;
     this.reload = this.reload();
 
-    // Instanciate the Koa app & the HTTP server
+    // Instantiate the Koa app & the HTTP server
     this.server = createServer(this);
 
     // Strapi utils instanciation
@@ -113,8 +111,6 @@ class Strapi {
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
 
-    this.customFields = createCustomFields(this);
-
     createUpdateNotifier(this).notify();
   }
 
@@ -194,6 +190,10 @@ class Strapi {
     return this.container.get('auth');
   }
 
+  get contentAPI() {
+    return this.container.get('content-api');
+  }
+
   get sanitizers() {
     return this.container.get('sanitizers');
   }
@@ -451,6 +451,8 @@ class Strapi {
     await this.server.initMiddlewares();
     await this.server.initRouting();
 
+    await this.contentAPI.permissions.registerActions();
+
     await this.runLifecyclesFunctions(LIFECYCLES.BOOTSTRAP);
 
     this.cron.start();
@@ -460,8 +462,6 @@ class Strapi {
 
   async load() {
     await this.register();
-    // Swap type customField for underlying data type
-    convertCustomFieldType(this);
     await this.bootstrap();
 
     this.isLoaded = true;

package/lib/commands/configurationDump.js

@@ -9,7 +9,7 @@ const CHUNK_SIZE = 100;
  * Will dump configurations to a file or stdout
  * @param {string} file filepath to use as output
  */
-module.exports = async function ({ file: filePath, pretty }) {
+module.exports = async ({ file: filePath, pretty }) => {
   const output = filePath ? fs.createWriteStream(filePath) : process.stdout;
 
   const appContext = await strapi.compile();
@@ -21,7 +21,7 @@ module.exports = async function ({ file: filePath, pretty }) {
 
   const pageCount = Math.ceil(count / CHUNK_SIZE);
 
-  for (let page = 0; page < pageCount; page++) {
+  for (let page = 0; page < pageCount; page += 1) {
     const results = await app
       .query('strapi::core-store')
       .findMany({ limit: CHUNK_SIZE, offset: page * CHUNK_SIZE, orderBy: 'key' });

package/lib/core/loaders/apis.js

@@ -40,7 +40,7 @@ module.exports = async (strapi) => {
 
   validateContentTypesUnicity(apis);
 
-  for (const apiName in apis) {
+  for (const apiName of Object.keys(apis)) {
     strapi.container.get('apis').add(apiName, apis[apiName]);
   }
 };

package/lib/core/loaders/plugins/get-enabled-plugins.js

@@ -59,7 +59,9 @@ const getEnabledPlugins = async (strapi) => {
   }
 
   const installedPlugins = {};
-  for (const dep in strapi.config.get('info.dependencies', {})) {
+  const dependencies = strapi.config.get('info.dependencies', {});
+
+  for (const dep of Object.keys(dependencies)) {
     const packagePath = join(dep, 'package.json');
     let packageInfo;
     try {

package/lib/core/loaders/plugins/index.js

@@ -34,10 +34,10 @@ const applyUserExtension = async (plugins) => {
   const extendedSchemas = await loadFiles(extensionsDir, '**/content-types/**/schema.json');
   const strapiServers = await loadFiles(extensionsDir, '**/strapi-server.js');
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     const plugin = plugins[pluginName];
     // first: load json schema
-    for (const ctName in plugin.contentTypes) {
+    for (const ctName of Object.keys(plugin.contentTypes)) {
       const extendedSchema = get([pluginName, 'content-types', ctName, 'schema'], extendedSchemas);
       if (extendedSchema) {
         plugin.contentTypes[ctName].schema = {
@@ -57,7 +57,7 @@ const applyUserExtension = async (plugins) => {
 const applyUserConfig = async (plugins) => {
   const userPluginsConfig = await getUserPluginsConfig();
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     const plugin = plugins[pluginName];
     const userPluginConfig = getOr({}, `${pluginName}.config`, userPluginsConfig);
     const defaultConfig =
@@ -82,7 +82,7 @@ const loadPlugins = async (strapi) => {
 
   strapi.config.set('enabledPlugins', enabledPlugins);
 
-  for (const pluginName in enabledPlugins) {
+  for (const pluginName of Object.keys(enabledPlugins)) {
     const enabledPlugin = enabledPlugins[pluginName];
 
     const serverEntrypointPath = join(enabledPlugin.pathToPlugin, 'strapi-server.js');
@@ -100,7 +100,7 @@ const loadPlugins = async (strapi) => {
   await applyUserConfig(plugins);
   await applyUserExtension(plugins);
 
-  for (const pluginName in plugins) {
+  for (const pluginName of Object.keys(plugins)) {
     strapi.container.get('plugins').add(pluginName, plugins[pluginName]);
   }
 };

package/lib/core/registries/content-types.js

@@ -5,7 +5,7 @@ const { createContentType } = require('../domain/content-type');
 const { addNamespace, hasNamespace } = require('../utils');
 
 const validateKeySameToSingularName = (contentTypes) => {
-  for (const ctName in contentTypes) {
+  for (const ctName of Object.keys(contentTypes)) {
     const contentType = contentTypes[ctName];
 
     if (ctName !== contentType.schema.info.singularName) {
@@ -63,7 +63,7 @@ const contentTypesRegistry = () => {
     add(namespace, newContentTypes) {
       validateKeySameToSingularName(newContentTypes);
 
-      for (const rawCtName in newContentTypes) {
+      for (const rawCtName of Object.keys(newContentTypes)) {
         const uid = addNamespace(rawCtName, namespace);
 
         if (has(uid, contentTypes)) {

package/lib/core/registries/controllers.js

@@ -48,7 +48,7 @@ const controllersRegistry = () => {
       const filteredControllers = pickBy((_, uid) => hasNamespace(uid, namespace))(controllers);
 
       const map = {};
-      for (const uid in filteredControllers) {
+      for (const uid of Object.keys(filteredControllers)) {
         Object.defineProperty(map, uid, {
           enumerable: true,
           get: () => {
@@ -78,7 +78,7 @@ const controllersRegistry = () => {
      * @returns
      */
     add(namespace, newControllers) {
-      for (const controllerName in newControllers) {
+      for (const controllerName of Object.keys(newControllers)) {
         const controller = newControllers[controllerName];
         const uid = addNamespace(controllerName, namespace);
 

package/lib/core/registries/hooks.js

@@ -54,7 +54,7 @@ const hooksRegistry = () => {
      * @returns
      */
     add(namespace, hooks) {
-      for (const hookName in hooks) {
+      for (const hookName of Object.keys(hooks)) {
         const hook = hooks[hookName];
         const uid = addNamespace(hookName, namespace);
 

package/lib/core/registries/middlewares.js

@@ -54,8 +54,8 @@ const middlewaresRegistry = () => {
      * @param {{ [key: string]: Middleware }} newMiddlewares
      * @returns
      */
-    add(namespace, rawMiddlewares) {
-      for (const middlewareName in rawMiddlewares) {
+    add(namespace, rawMiddlewares = {}) {
+      for (const middlewareName of Object.keys(rawMiddlewares)) {
         const middleware = rawMiddlewares[middlewareName];
         const uid = addNamespace(middlewareName, namespace);
 

package/lib/core/registries/policies.js

@@ -55,7 +55,7 @@ const policiesRegistry = () => {
      * @returns
      */
     add(namespace, newPolicies) {
-      for (const policyName in newPolicies) {
+      for (const policyName of Object.keys(newPolicies)) {
         const policy = newPolicies[policyName];
         const uid = addNamespace(policyName, namespace);
 

package/lib/core/registries/services.js

@@ -48,7 +48,7 @@ const servicesRegistry = (strapi) => {
 
       // create lazy accessor to avoid instantiating the services;
       const map = {};
-      for (const uid in filteredServices) {
+      for (const uid of Object.keys(filteredServices)) {
         Object.defineProperty(map, uid, {
           enumerable: true,
           get: () => {
@@ -78,7 +78,7 @@ const servicesRegistry = (strapi) => {
      * @returns
      */
     add(namespace, newServices) {
-      for (const serviceName in newServices) {
+      for (const serviceName of Object.keys(newServices)) {
         const service = newServices[serviceName];
         const uid = addNamespace(serviceName, namespace);
 

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

@@ -56,7 +56,7 @@ const transformEntry = (entry, type) => {
 
   const attributeValues = {};
 
-  for (const key in properties) {
+  for (const key of Object.keys(properties)) {
     const property = properties[key];
     const attribute = type && type.attributes[key];
 

package/lib/services/auth/index.js

@@ -32,6 +32,7 @@ const createAuthentication = () => {
 
       return this;
     },
+
     async authenticate(ctx, next) {
       const { route } = ctx.state;
 
@@ -47,7 +48,7 @@ const createAuthentication = () => {
       for (const strategy of strategiesToUse) {
         const result = await strategy.authenticate(ctx);
 
-        const { authenticated = false, error = null, credentials } = result || {};
+        const { authenticated = false, credentials, ability = null, error = null } = result || {};
 
         if (error !== null) {
           return ctx.unauthorized(error);
@@ -58,6 +59,7 @@ const createAuthentication = () => {
           ctx.state.auth = {
             strategy,
             credentials,
+            ability,
           };
 
           return next();
@@ -66,6 +68,7 @@ const createAuthentication = () => {
 
       return ctx.unauthorized('Missing or invalid credentials');
     },
+
     async verify(auth, config = {}) {
       if (config === false) {
         return;

package/lib/services/content-api/index.js

@@ -0,0 +1,74 @@
+'use strict';
+
+const _ = require('lodash');
+const instantiatePermissionsUtilities = require('./permissions');
+
+const transformRoutePrefixFor = (pluginName) => (route) => {
+  const prefix = route.config && route.config.prefix;
+  const path = prefix !== undefined ? `${prefix}${route.path}` : `/${pluginName}${route.path}`;
+
+  return {
+    ...route,
+    path,
+  };
+};
+
+/**
+ * Create a content API container that holds logic, tools and utils. (eg: permissions, ...)
+ */
+const createContentAPI = (strapi) => {
+  const getRoutesMap = async () => {
+    const routesMap = {};
+
+    _.forEach(strapi.api, (api, apiName) => {
+      const routes = _.flatMap(api.routes, (route) => {
+        if (_.has(route, 'routes')) {
+          return route.routes;
+        }
+
+        return route;
+      }).filter((route) => route.info.type === 'content-api');
+
+      if (routes.length === 0) {
+        return;
+      }
+
+      const apiPrefix = strapi.config.get('api.rest.prefix');
+      routesMap[`api::${apiName}`] = routes.map((route) => ({
+        ...route,
+        path: `${apiPrefix}${route.path}`,
+      }));
+    });
+
+    _.forEach(strapi.plugins, (plugin, pluginName) => {
+      const transformPrefix = transformRoutePrefixFor(pluginName);
+
+      const routes = _.flatMap(plugin.routes, (route) => {
+        if (_.has(route, 'routes')) {
+          return route.routes.map(transformPrefix);
+        }
+
+        return transformPrefix(route);
+      }).filter((route) => route.info.type === 'content-api');
+
+      if (routes.length === 0) {
+        return;
+      }
+
+      const apiPrefix = strapi.config.get('api.rest.prefix');
+      routesMap[`plugin::${pluginName}`] = routes.map((route) => ({
+        ...route,
+        path: `${apiPrefix}${route.path}`,
+      }));
+    });
+
+    return routesMap;
+  };
+
+  return {
+    permissions: instantiatePermissionsUtilities(strapi),
+    getRoutesMap,
+  };
+};
+
+module.exports = createContentAPI;

package/lib/services/content-api/permissions/engine.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const permissions = require('@strapi/permissions');
+
+module.exports = ({ providers }) => permissions.engine.new({ providers });

package/lib/services/content-api/permissions/index.js

@@ -0,0 +1,148 @@
+'use strict';
+
+const _ = require('lodash');
+const { createActionProvider, createConditionProvider } = require('./providers');
+const createPermissionEngine = require('./engine');
+
+/**
+ * Creates an handler that checks if the permission's action exists in the action registry
+ */
+const createValidatePermissionHandler =
+  (actionProvider) =>
+  ({ permission }) => {
+    const action = actionProvider.get(permission.action);
+
+    // If the action isn't registered into the action provider, then ignore the permission and warn the user
+    if (!action) {
+      strapi.log.debug(
+        `Unknown action "${permission.action}" supplied when registering a new permission`
+      );
+      return false;
+    }
+  };
+
+/**
+ * Create instances of providers and permission engine for the core content-API service.
+ * Also, expose utilities to get informations about available actions and such.
+ *
+ * @param {Strapi.Strapi} strapi
+ */
+module.exports = (strapi) => {
+  // NOTE: Here we define both an action and condition provider,
+  // but at the moment, we're only using the action one.
+  const providers = {
+    action: createActionProvider(),
+    condition: createConditionProvider(),
+  };
+
+  /**
+   * Get a tree representation of the available Content API actions
+   * based on the methods of the Content API controllers.
+   *
+   * @note Only actions bound to a content-API route are returned.
+   *
+   * @return {{ [api: string]: { [controller: string]: string[] }}}
+   */
+  const getActionsMap = () => {
+    const actionMap = {};
+
+    /**
+     * Check if a controller's action is bound to the
+     * content-api by looking at a potential __type__ symbol
+     *
+     * @param {object} action
+     *
+     * @return {boolean}
+     */
+    const isContentApi = (action) => {
+      if (!_.has(action, Symbol.for('__type__'))) {
+        return false;
+      }
+
+      return action[Symbol.for('__type__')].includes('content-api');
+    };
+
+    /**
+     * Register actions from a specific API source into the result tree
+     *
+     * @param {{ [apiName]: { controllers: { [controller]: object } }}} apis The API container
+     * @param {string} source The prefix to use in front the API name
+     *
+     * @return {void}
+     */
+    const registerAPIsActions = (apis, source) => {
+      _.forEach(apis, (api, apiName) => {
+        const controllers = _.reduce(
+          api.controllers,
+          (acc, controller, controllerName) => {
+            const contentApiActions = _.pickBy(controller, isContentApi);
+
+            if (_.isEmpty(contentApiActions)) {
+              return acc;
+            }
+
+            acc[controllerName] = Object.keys(contentApiActions);
+
+            return acc;
+          },
+          {}
+        );
+
+        if (!_.isEmpty(controllers)) {
+          actionMap[`${source}::${apiName}`] = { controllers };
+        }
+      });
+    };
+
+    registerAPIsActions(strapi.api, 'api');
+    registerAPIsActions(strapi.plugins, 'plugin');
+
+    return actionMap;
+  };
+
+  /**
+   * Register all the content-API's controllers actions into the action provider.
+   * This method make use of the {@link getActionsMap} to generate the list of actions to register.
+   *
+   * @return {void}
+   */
+  const registerActions = async () => {
+    const actionsMap = getActionsMap();
+
+    // For each API
+    for (const [api, value] of Object.entries(actionsMap)) {
+      const { controllers } = value;
+
+      // Register controllers methods as actions
+      for (const [controller, actions] of Object.entries(controllers)) {
+        // Register each action individually
+        await Promise.all(
+          actions.map((action) => {
+            const actionUID = `${api}.${controller}.${action}`;
+
+            return providers.action.register(actionUID, {
+              api,
+              controller,
+              action,
+              uid: actionUID,
+            });
+          })
+        );
+      }
+    }
+  };
+
+  // Create an instance of a content-API permission engine
+  // and binds a custom validation handler to it
+  const engine = createPermissionEngine({ providers }).on(
+    'before-format::validate.permission',
+    createValidatePermissionHandler(providers.action)
+  );
+
+  return {
+    engine,
+    providers,
+    registerActions,
+    getActionsMap,
+  };
+};

package/lib/services/content-api/permissions/providers/action.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { providerFactory } = require('@strapi/utils');
+
+module.exports = (options = {}) => {
+  const provider = providerFactory(options);
+
+  return {
+    ...provider,
+
+    async register(action, payload) {
+      if (strapi.isLoaded) {
+        throw new Error(`You can't register new actions outside the bootstrap function.`);
+      }
+
+      return provider.register(action, payload);
+    },
+  };
+};

package/lib/services/content-api/permissions/providers/condition.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { providerFactory } = require('@strapi/utils');
+
+module.exports = (options = {}) => {
+  const provider = providerFactory(options);
+
+  return {
+    ...provider,
+
+    async register(condition) {
+      if (strapi.isLoaded) {
+        throw new Error(`You can't register new conditions outside the bootstrap function.`);
+      }
+
+      return provider.register(condition.name, condition);
+    },
+  };
+};

package/lib/services/content-api/permissions/providers/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const createActionProvider = require('./action');
+const createConditionProvider = require('./condition');
+
+module.exports = {
+  createActionProvider,
+  createConditionProvider,
+};

package/lib/services/cron.js

@@ -9,7 +9,7 @@ const createCronService = () => {
 
   return {
     add(tasks = {}) {
-      for (const taskExpression in tasks) {
+      for (const taskExpression of Object.keys(tasks)) {
         const taskValue = tasks[taskExpression];
 
         let fn;

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

@@ -5,6 +5,7 @@ const { has, prop, omit, toString } = require('lodash/fp');
 
 const { contentTypes: contentTypesUtils } = require('@strapi/utils');
 const { ApplicationError } = require('@strapi/utils').errors;
+const { getComponentAttributes } = require('@strapi/utils').contentTypes;
 
 const omitComponentData = (contentType, data) => {
   const { attributes } = contentType;
@@ -17,11 +18,11 @@ const omitComponentData = (contentType, data) => {
 
 // NOTE: we could generalize the logic to allow CRUD of relation directly in the DB layer
 const createComponents = async (uid, data) => {
-  const { attributes } = strapi.getModel(uid);
+  const { attributes = {} } = strapi.getModel(uid);
 
   const componentBody = {};
 
-  for (const attributeName in attributes) {
+  for (const attributeName of Object.keys(attributes)) {
     const attribute = attributes[attributeName];
 
     if (!has(attributeName, data) || !contentTypesUtils.isComponentAttribute(attribute)) {
@@ -100,16 +101,28 @@ const createComponents = async (uid, data) => {
   return componentBody;
 };
 
+/**
+ * @param {str} uid
+ * @param {object} entity
+ * @return {Promise<{uid: string, entity: object}>}
+ */
+const getComponents = async (uid, entity) => {
+  const componentAttributes = getComponentAttributes(strapi.getModel(uid));
+
+  if (_.isEmpty(componentAttributes)) return {};
+  return strapi.query(uid).load(entity, componentAttributes);
+};
+
 /*
   delete old components
   create or update
 */
 const updateComponents = async (uid, entityToUpdate, data) => {
-  const { attributes } = strapi.getModel(uid);
+  const { attributes = {} } = strapi.getModel(uid);
 
   const componentBody = {};
 
-  for (const attributeName in attributes) {
+  for (const attributeName of Object.keys(attributes)) {
     const attribute = attributes[attributeName];
 
     if (!has(attributeName, data)) {
@@ -262,15 +275,18 @@ const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamic
 };
 
 const deleteComponents = async (uid, entityToDelete) => {
-  const { attributes } = strapi.getModel(uid);
+  const { attributes = {} } = strapi.getModel(uid);
 
-  for (const attributeName in attributes) {
+  for (const attributeName of Object.keys(attributes)) {
     const attribute = attributes[attributeName];
 
     if (attribute.type === 'component') {
       const { component: componentUID } = attribute;
 
-      const value = await strapi.query(uid).load(entityToDelete, attributeName);
+      // Load attribute value if it's not already loaded
+      const value =
+        entityToDelete[attributeName] ||
+        (await strapi.query(uid).load(entityToDelete, attributeName));
 
       if (!value) {
         continue;
@@ -286,7 +302,9 @@ const deleteComponents = async (uid, entityToDelete) => {
     }
 
     if (attribute.type === 'dynamiczone') {
-      const value = await strapi.query(uid).load(entityToDelete, attributeName);
+      const value =
+        entityToDelete[attributeName] ||
+        (await strapi.query(uid).load(entityToDelete, attributeName));
 
       if (!value) {
         continue;
@@ -352,7 +370,9 @@ const deleteComponent = async (uid, componentToDelete) => {
 
 module.exports = {
   omitComponentData,
+  getComponents,
   createComponents,
   updateComponents,
   deleteComponents,
+  deleteComponent,
 };

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

@@ -14,6 +14,7 @@ const uploadFiles = require('../utils/upload-files');
 
 const {
   omitComponentData,
+  getComponents,
   createComponents,
   updateComponents,
   deleteComponents,
@@ -213,8 +214,10 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       return null;
     }
 
+    const componentsToDelete = await getComponents(uid, entityToDelete);
+
     await db.query(uid).delete({ where: { id: entityToDelete.id } });
-    await deleteComponents(uid, entityToDelete);
+    await deleteComponents(uid, { ...entityToDelete, ...componentsToDelete });
 
     await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
 
@@ -234,8 +237,12 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
       return null;
     }
 
+    const componentsToDelete = await Promise.all(
+      entitiesToDelete.map((entityToDelete) => getComponents(uid, entityToDelete))
+    );
+
     const deletedEntities = await db.query(uid).deleteMany(query);
-    await Promise.all(entitiesToDelete.map((entity) => deleteComponents(uid, entity)));
+    await Promise.all(componentsToDelete.map((compos) => deleteComponents(uid, compos)));
 
     // Trigger webhooks. One for each entity
     await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));

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

@@ -14,51 +14,56 @@ const { isMediaAttribute, isScalarAttribute, getWritableAttributes } = strapiUti
 const { ValidationError } = strapiUtils.errors;
 
 const addMinMax = (validator, { attr, updatedAttribute }) => {
+  let nextValidator = validator;
+
   if (
     Number.isInteger(attr.min) &&
     (attr.required || (Array.isArray(updatedAttribute.value) && updatedAttribute.value.length > 0))
   ) {
-    validator = validator.min(attr.min);
+    nextValidator = nextValidator.min(attr.min);
   }
   if (Number.isInteger(attr.max)) {
-    validator = validator.max(attr.max);
+    nextValidator = nextValidator.max(attr.max);
   }
-  return validator;
+  return nextValidator;
 };
 
-const addRequiredValidation =
-  (createOrUpdate) =>
-  (validator, { attr: { required } }) => {
+const addRequiredValidation = (createOrUpdate) => {
+  return (validator, { attr: { required } }) => {
+    let nextValidator = validator;
     if (required) {
       if (createOrUpdate === 'creation') {
-        validator = validator.notNil();
+        nextValidator = nextValidator.notNil();
       } else if (createOrUpdate === 'update') {
-        validator = validator.notNull();
+        nextValidator = nextValidator.notNull();
       }
     } else {
-      validator = validator.nullable();
+      nextValidator = nextValidator.nullable();
     }
-    return validator;
+    return nextValidator;
   };
+};
+
+const addDefault = (createOrUpdate) => {
+  return (validator, { attr }) => {
+    let nextValidator = validator;
 
-const addDefault =
-  (createOrUpdate) =>
-  (validator, { attr }) => {
     if (createOrUpdate === 'creation') {
       if (
         ((attr.type === 'component' && attr.repeatable) || attr.type === 'dynamiczone') &&
         !attr.required
       ) {
-        validator = validator.default([]);
+        nextValidator = nextValidator.default([]);
       } else {
-        validator = validator.default(attr.default);
+        nextValidator = nextValidator.default(attr.default);
       }
     } else {
-      validator = validator.default(undefined);
+      nextValidator = nextValidator.default(undefined);
     }
 
-    return validator;
+    return nextValidator;
   };
+};
 
 const preventCast = (validator) => validator.transform((val, originalVal) => originalVal);
 

package/lib/services/metrics/middleware.js

@@ -22,7 +22,7 @@ const createMiddleware = ({ sendEvent }) => {
         sendEvent('didReceiveRequest', { url: ctx.request.url });
 
         // Increase counter.
-        _state.counter++;
+        _state.counter += 1;
       }
     }
 

package/lib/services/metrics/sender.js

@@ -45,12 +45,12 @@ module.exports = (strapi) => {
     environment: strapi.config.environment,
     os: os.type(),
     osPlatform: os.platform(),
+    osArch: os.arch(),
     osRelease: os.release(),
-    nodeVersion: process.version,
+    nodeVersion: process.versions.node,
     docker: process.env.DOCKER || isDocker(),
     isCI: ciEnv.isCI,
     version: strapi.config.get('info.strapi'),
-    strapiVersion: strapi.config.get('info.strapi'),
     projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),

package/lib/services/server/register-routes.js

@@ -50,7 +50,7 @@ const registerAdminRoutes = (strapi) => {
  * @param {import('../../').Strapi} strapi
  */
 const registerPluginRoutes = (strapi) => {
-  for (const pluginName in strapi.plugins) {
+  for (const pluginName of Object.keys(strapi.plugins)) {
     const plugin = strapi.plugins[pluginName];
 
     const generateRouteScope = createRouteScopeGenerator(`plugin::${pluginName}`);
@@ -86,7 +86,7 @@ const registerPluginRoutes = (strapi) => {
  * @param {import('../../').Strapi} strapi
  */
 const registerAPIRoutes = (strapi) => {
-  for (const apiName in strapi.api) {
+  for (const apiName of Object.keys(strapi.api)) {
     const api = strapi.api[apiName];
 
     const generateRouteScope = createRouteScopeGenerator(`api::${apiName}`);

package/lib/services/utils/upload-files.js

@@ -27,7 +27,7 @@ module.exports = async (uid, entity, files) => {
     let tmpModel = modelDef;
     let modelUID = uid;
 
-    for (let i = 0; i < path.length; i++) {
+    for (let i = 0; i < path.length; i += 1) {
       if (!tmpModel) return {};
       const part = path[i];
       const attr = tmpModel.attributes[part];

package/lib/services/worker-queue.js

@@ -26,7 +26,7 @@ module.exports = class WorkerQueue {
   enqueue(payload) {
     debug('Enqueue event in worker queue');
     if (this.running < this.concurrency) {
-      this.running++;
+      this.running += 1;
       this.execute(payload);
     } else {
       this.queue.unshift(payload);
@@ -40,7 +40,7 @@ module.exports = class WorkerQueue {
     if (payload) {
       this.execute(payload);
     } else {
-      this.running--;
+      this.running -= 1;
     }
   }
 

package/lib/types/core/strapi/index.d.ts

@@ -24,6 +24,11 @@ export interface Strapi {
    */
   readonly auth: any;
 
+  /**
+   * Getter for the Strapi content API container
+   */
+  readonly contentAPI: any;
+
   /**
    * Getter for the Strapi sanitizers container
    */

package/lib/utils/addSlash.js

@@ -1,10 +1,11 @@
 'use strict';
 
 module.exports = (path) => {
-  if (typeof path !== 'string') throw new Error('admin.url must be a string');
-  if (path === '' || path === '/') return '/';
+  let tmpPath = path;
+  if (typeof tmpPath !== 'string') throw new Error('admin.url must be a string');
+  if (tmpPath === '' || tmpPath === '/') return '/';
 
-  if (path[0] != '/') path = `/${path}`;
-  if (path[path.length - 1] != '/') path += '/';
-  return path;
+  if (tmpPath[0] !== '/') tmpPath = `/${tmpPath}`;
+  if (tmpPath[tmpPath.length - 1] !== '/') tmpPath += '/';
+  return tmpPath;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.4.0-alpha.0",
+  "version": "4.4.0-beta.1",
   "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",
@@ -80,17 +80,18 @@
   "dependencies": {
     "@koa/cors": "3.4.1",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.4.0-alpha.0",
-    "@strapi/database": "4.4.0-alpha.0",
-    "@strapi/generate-new": "4.4.0-alpha.0",
-    "@strapi/generators": "4.4.0-alpha.0",
-    "@strapi/logger": "4.4.0-alpha.0",
-    "@strapi/plugin-content-manager": "4.4.0-alpha.0",
-    "@strapi/plugin-content-type-builder": "4.4.0-alpha.0",
-    "@strapi/plugin-email": "4.4.0-alpha.0",
-    "@strapi/plugin-upload": "4.4.0-alpha.0",
-    "@strapi/typescript-utils": "4.4.0-alpha.0",
-    "@strapi/utils": "4.4.0-alpha.0",
+    "@strapi/admin": "4.4.0-beta.1",
+    "@strapi/database": "4.4.0-beta.1",
+    "@strapi/generate-new": "4.4.0-beta.1",
+    "@strapi/generators": "4.4.0-beta.1",
+    "@strapi/logger": "4.4.0-beta.1",
+    "@strapi/permissions": "4.4.0-beta.1",
+    "@strapi/plugin-content-manager": "4.4.0-beta.1",
+    "@strapi/plugin-content-type-builder": "4.4.0-beta.1",
+    "@strapi/plugin-email": "4.4.0-beta.1",
+    "@strapi/plugin-upload": "4.4.0-beta.1",
+    "@strapi/typescript-utils": "4.4.0-beta.1",
+    "@strapi/utils": "4.4.0-beta.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,8 +137,8 @@
     "typescript": "4.6.2"
   },
   "engines": {
-    "node": ">=14.19.1 <=16.x.x",
+    "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "fc78298ae4f9b247d636beda568734d5f8ed7b3e"
+  "gitHead": "cae16f7f259fa4473a55e8fea57839cda98f34ae"
 }

package/lib/core/registries/custom-fields.js

@@ -1,54 +0,0 @@
-'use strict';
-
-const { has } = require('lodash/fp');
-const validators = require('../../services/entity-validator/validators');
-
-const customFieldsRegistry = strapi => {
-  const customFields = {};
-
-  return {
-    getAll() {
-      return customFields;
-    },
-    get(customField) {
-      const registeredCustomField = customFields[customField];
-      if (!registeredCustomField) {
-        throw new Error(`Could not find Custom Field: ${customField}`);
-      }
-
-      return registeredCustomField;
-    },
-    add(customField) {
-      const customFieldList = Array.isArray(customField) ? customField : [customField];
-
-      for (const cf of customFieldList) {
-        if (!has('name', cf) || !has('type', cf)) {
-          throw new Error(`Custom fields require a 'name' and 'type' key`);
-        }
-
-        const { name, plugin, type } = cf;
-        if (!has(type, validators)) {
-          throw new Error(
-            `Custom field type: '${type}' is not a valid Strapi type or it can't be used with a Custom Field`
-          );
-        }
-
-        const isValidObjectKey = /^(?![0-9])[a-zA-Z0-9$_-]+$/g;
-        if (!isValidObjectKey.test(name)) {
-          throw new Error(`Custom field name: '${name}' is not a valid object key`);
-        }
-
-        // When no plugin is specified, or it isn't found in Strapi, default to global
-        const uid = strapi.plugin(plugin) ? `plugin::${plugin}.${name}` : `global::${name}`;
-
-        if (has(uid, customFields)) {
-          throw new Error(`Custom field: '${uid}' has already been registered`);
-        }
-
-        customFields[uid] = cf;
-      }
-    },
-  };
-};
-
-module.exports = customFieldsRegistry;

package/lib/services/custom-fields.js

@@ -1,11 +0,0 @@
-'use strict';
-
-const createCustomFields = strapi => {
-  return {
-    register(customField) {
-      strapi.container.get('custom-fields').add(customField);
-    },
-  };
-};
-
-module.exports = createCustomFields;

package/lib/utils/convert-custom-field-type.js

@@ -1,22 +0,0 @@
-'use strict';
-
-const convertCustomFieldType = strapi => {
-  const allContentTypeSchemaAttributes = Object.values(strapi.contentTypes).map(
-    schema => schema.attributes
-  );
-  const allComponentSchemaAttributes = Object.values(strapi.components).map(
-    schema => schema.attributes
-  );
-  const allSchemasAttributes = [...allContentTypeSchemaAttributes, ...allComponentSchemaAttributes];
-
-  for (const schemaAttrbutes of allSchemasAttributes) {
-    for (const attribute of Object.values(schemaAttrbutes)) {
-      if (attribute.type === 'customField') {
-        const customField = strapi.container.get('custom-fields').get(attribute.customField);
-        attribute.type = customField.type;
-      }
-    }
-  }
-};
-
-module.exports = convertCustomFieldType;