@strapi/strapi 4.3.4 → 4.4.0-alpha.0

package/lib/commands/start.js

@@ -1,4 +1,5 @@
 'use strict';
+
 const fs = require('fs');
 const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');

package/lib/commands/ts/generate-types.js

@@ -4,7 +4,7 @@ const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../../index');
 
-module.exports = async function({ outDir, file, verbose, silent }) {
+module.exports = async function ({ outDir, file, verbose, silent }) {
   if (verbose && silent) {
     console.error('You cannot enable verbose and silent flags at the same time, exiting...');
     process.exit(1);

package/lib/commands/uninstall.js

@@ -21,13 +21,13 @@ module.exports = async (plugins, { deleteFiles }) => {
   const loader = ora();
   const dir = process.cwd();
 
-  const pluginArgs = plugins.map(name => `@strapi/plugin-${name}`);
+  const pluginArgs = plugins.map((name) => `@strapi/plugin-${name}`);
 
   try {
     // verify should rebuild before removing the pacakge
     let shouldRebuild = false;
-    for (let name of plugins) {
-      let pkgPath = findPackagePath(`@strapi/plugin-${name}`);
+    for (const name of plugins) {
+      const pkgPath = findPackagePath(`@strapi/plugin-${name}`);
       if (existsSync(join(pkgPath, 'admin', 'src', 'index.js'))) {
         shouldRebuild = true;
       }
@@ -46,7 +46,7 @@ module.exports = async (plugins, { deleteFiles }) => {
 
     if (deleteFiles === true || answers.deleteFiles === true) {
       loader.start('Deleting old files');
-      for (let name of plugins) {
+      for (const name of plugins) {
         const pluginDir = join(dir, 'extensions', name);
         if (existsSync(pluginDir)) {
           removeSync(pluginDir);

package/lib/commands/watchAdmin.js

@@ -7,7 +7,7 @@ const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins')
 const addSlash = require('../utils/addSlash');
 const strapi = require('../index');
 
-module.exports = async function({ browser }) {
+module.exports = async function ({ browser }) {
   const appContext = await strapi.compile();
 
   const strapiInstance = strapi({

package/lib/compile.js

@@ -2,7 +2,7 @@
 
 const tsUtils = require('@strapi/typescript-utils');
 
-module.exports = async dir => {
+module.exports = async (dir) => {
   const appDir = dir || process.cwd();
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
   const outDir = await tsUtils.resolveOutDir(appDir);

package/lib/container.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const createContainer = strapi => {
+const createContainer = (strapi) => {
   const registered = new Map();
   const resolved = new Map();
 

package/lib/core/app-configuration/config-loader.js

@@ -6,12 +6,12 @@ const loadFile = require('./load-config-file');
 
 const VALID_EXTENSIONS = ['.js', '.json'];
 
-module.exports = dir => {
+module.exports = (dir) => {
   if (!fs.existsSync(dir)) return {};
 
   return fs
     .readdirSync(dir, { withFileTypes: true })
-    .filter(file => file.isFile() && VALID_EXTENSIONS.includes(path.extname(file.name)))
+    .filter((file) => file.isFile() && VALID_EXTENSIONS.includes(path.extname(file.name)))
     .reduce((acc, file) => {
       const key = path.basename(file.name, path.extname(file.name));
 

package/lib/core/app-configuration/load-config-file.js

@@ -6,7 +6,7 @@ const { templateConfiguration, env } = require('@strapi/utils');
 
 const importDefault = require('../../utils/import-default');
 
-const loadJsFile = file => {
+const loadJsFile = (file) => {
   try {
     const jsModule = importDefault(file);
 
@@ -21,7 +21,7 @@ const loadJsFile = file => {
   }
 };
 
-const loadJSONFile = file => {
+const loadJSONFile = (file) => {
   try {
     return templateConfiguration(JSON.parse(fs.readFileSync(file)));
   } catch (error) {
@@ -29,7 +29,7 @@ const loadJSONFile = file => {
   }
 };
 
-const loadFile = file => {
+const loadFile = (file) => {
   const ext = path.extname(file);
 
   switch (ext) {

package/lib/core/bootstrap.js

@@ -3,7 +3,7 @@
 const { getConfigUrls } = require('@strapi/utils');
 const fse = require('fs-extra');
 
-module.exports = async function({ strapi }) {
+module.exports = async function ({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 

package/lib/core/domain/component/validator.js

@@ -7,20 +7,14 @@ const componentSchemaValidator = () =>
     info: yup
       .object()
       .shape({
-        singularName: yup
-          .string()
-          .isCamelCase()
-          .required(),
-        pluralName: yup
-          .string()
-          .isCamelCase()
-          .required(),
+        singularName: yup.string().isCamelCase().required(),
+        pluralName: yup.string().isCamelCase().required(),
         displayName: yup.string().required(),
       })
       .required(),
   });
 
-const validateComponentDefinition = data => {
+const validateComponentDefinition = (data) => {
   return componentSchemaValidator.validateSync(data, { strict: true, abortEarly: false });
 };
 

package/lib/core/domain/content-type/index.js

@@ -114,12 +114,12 @@ const createContentType = (uid, definition) => {
 };
 
 const getGlobalId = (model, modelName, prefix) => {
-  let globalId = prefix ? `${prefix}-${modelName}` : modelName;
+  const globalId = prefix ? `${prefix}-${modelName}` : modelName;
 
   return model.globalId || _.upperFirst(_.camelCase(globalId));
 };
 
-const pickSchema = model => {
+const pickSchema = (model) => {
   const schema = _.cloneDeep(
     _.pick(model, [
       'connection',

package/lib/core/domain/content-type/validator.js

@@ -36,14 +36,9 @@ const LIFECYCLES = [
  * TODO V5: check if we can avoid this coupling by moving this logic
  * into the GraphQL plugin.
  */
-const GRAPHQL_ENUM_REGEX = new RegExp('^[_A-Za-z][_0-9A-Za-z]*$');
+const GRAPHQL_ENUM_REGEX = /^[_A-Za-z][_0-9A-Za-z]*$/;
 
-const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () =>
-  yup
-    .mixed()
-    .nullable()
-    .isFunction()
-);
+const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () => yup.mixed().nullable().isFunction());
 
 const contentTypeSchemaValidator = yup.object().shape({
   schema: yup.object().shape({
@@ -51,34 +46,28 @@ const contentTypeSchemaValidator = yup.object().shape({
       .object()
       .shape({
         displayName: yup.string().required(),
-        singularName: yup
-          .string()
-          .isKebabCase()
-          .required(),
-        pluralName: yup
-          .string()
-          .isKebabCase()
-          .required(),
+        singularName: yup.string().isKebabCase().required(),
+        pluralName: yup.string().isKebabCase().required(),
       })
       .required(),
     attributes: yup.object().test({
       name: 'valuesCollide',
       message: 'Some values collide when normalized',
       test(attributes) {
-        for (const attrName in attributes) {
+        for (const attrName of Object.keys(attributes)) {
           const attr = attributes[attrName];
           if (attr.type === 'enumeration') {
             const regressedValues = attr.enum.map(toRegressedEnumValue);
 
             // should match the GraphQL regex
-            if (!regressedValues.every(value => GRAPHQL_ENUM_REGEX.test(value))) {
+            if (!regressedValues.every((value) => GRAPHQL_ENUM_REGEX.test(value))) {
               const message = `Invalid enumeration value. Values should have at least one alphabetical character preceeding the first occurence of a number. Update your enumeration '${attrName}'.`;
 
               return this.createError({ message });
             }
 
             // should not contain empty values
-            if (regressedValues.some(value => value === '')) {
+            if (regressedValues.some((value) => value === '')) {
               return this.createError({
                 message: `At least one value of the enumeration '${attrName}' appears to be empty. Only alphanumerical characters are taken into account.`,
               });
@@ -104,13 +93,10 @@ const contentTypeSchemaValidator = yup.object().shape({
     }),
   }),
   actions: yup.object().onlyContainsFunctions(),
-  lifecycles: yup
-    .object()
-    .shape(lifecyclesShape)
-    .noUnknown(),
+  lifecycles: yup.object().shape(lifecyclesShape).noUnknown(),
 });
 
-const validateContentTypeDefinition = data => {
+const validateContentTypeDefinition = (data) => {
   return contentTypeSchemaValidator.validateSync(data, { strict: true, abortEarly: false });
 };
 

package/lib/core/domain/module/index.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const { removeNamespace } = require('../../utils');
 const { validateModule } = require('./validation');
 
-const uidToPath = uid => uid.replace('::', '.');
+const uidToPath = (uid) => uid.replace('::', '.');
 
 // Removes the namespace from a map with keys prefixed with a namespace
 const removeNamespacedKeys = (map, namespace) => {

package/lib/core/domain/module/validation.js

@@ -9,12 +9,11 @@ const strapiServerSchema = yup
     destroy: yup.mixed().isFunction(),
     register: yup.mixed().isFunction(),
     config: yup.object(),
-    routes: yup.lazy(value => {
+    routes: yup.lazy((value) => {
       if (Array.isArray(value)) {
         return yup.array();
-      } else {
-        return yup.object();
       }
+      return yup.object();
     }),
     controllers: yup.object(),
     services: yup.object(),
@@ -24,7 +23,7 @@ const strapiServerSchema = yup
   })
   .noUnknown();
 
-const validateModule = data => {
+const validateModule = (data) => {
   return strapiServerSchema.validateSync(data, { strict: true, abortEarly: false });
 };
 

package/lib/core/loaders/admin.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   strapi.admin = require('@strapi/admin/strapi-server');
 
   strapi.container.get('services').add(`admin::`, strapi.admin.services);

package/lib/core/loaders/apis.js

@@ -14,12 +14,12 @@ const DEFAULT_CONTENT_TYPE = {
 };
 
 // to handle names with numbers in it we first check if it is already in kebabCase
-const normalizeName = name => (isKebabCase(name) ? name : _.kebabCase(name));
+const normalizeName = (name) => (isKebabCase(name) ? name : _.kebabCase(name));
 
-const isDirectory = fd => fd.isDirectory();
-const isDotFile = fd => fd.name.startsWith('.');
+const isDirectory = (fd) => fd.isDirectory();
+const isDotFile = (fd) => fd.name.startsWith('.');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   if (!existsSync(strapi.dirs.dist.api)) {
     return;
   }
@@ -45,8 +45,8 @@ module.exports = async strapi => {
   }
 };
 
-const validateContentTypesUnicity = apis => {
-  const allApisSchemas = Object.values(apis).flatMap(api => Object.values(api.contentTypes));
+const validateContentTypesUnicity = (apis) => {
+  const allApisSchemas = Object.values(apis).flatMap((api) => Object.values(api.contentTypes));
 
   const names = [];
   allApisSchemas.forEach(({ schema }) => {
@@ -68,26 +68,18 @@ const validateContentTypesUnicity = apis => {
   });
 };
 
-const loadAPI = async dir => {
-  const [
-    index,
-    config,
-    routes,
-    controllers,
-    services,
-    policies,
-    middlewares,
-    contentTypes,
-  ] = await Promise.all([
-    loadIndex(dir),
-    loadDir(join(dir, 'config')),
-    loadDir(join(dir, 'routes')),
-    loadDir(join(dir, 'controllers')),
-    loadDir(join(dir, 'services')),
-    loadDir(join(dir, 'policies')),
-    loadDir(join(dir, 'middlewares')),
-    loadContentTypes(join(dir, 'content-types')),
-  ]);
+const loadAPI = async (dir) => {
+  const [index, config, routes, controllers, services, policies, middlewares, contentTypes] =
+    await Promise.all([
+      loadIndex(dir),
+      loadDir(join(dir, 'config')),
+      loadDir(join(dir, 'routes')),
+      loadDir(join(dir, 'controllers')),
+      loadDir(join(dir, 'services')),
+      loadDir(join(dir, 'policies')),
+      loadDir(join(dir, 'middlewares')),
+      loadContentTypes(join(dir, 'content-types')),
+    ]);
 
   return {
     ...(index || {}),
@@ -101,13 +93,13 @@ const loadAPI = async dir => {
   };
 };
 
-const loadIndex = async dir => {
+const loadIndex = async (dir) => {
   if (await fse.pathExists(join(dir, 'index.js'))) {
     return loadFile(join(dir, 'index.js'));
   }
 };
 
-const loadContentTypes = async dir => {
+const loadContentTypes = async (dir) => {
   if (!(await fse.pathExists(dir))) {
     return;
   }
@@ -130,7 +122,7 @@ const loadContentTypes = async dir => {
   return contentTypes;
 };
 
-const loadDir = async dir => {
+const loadDir = async (dir) => {
   if (!(await fse.pathExists(dir))) {
     return;
   }
@@ -150,7 +142,7 @@ const loadDir = async dir => {
   return root;
 };
 
-const loadFile = file => {
+const loadFile = (file) => {
   const ext = extname(file);
 
   switch (ext) {

package/lib/core/loaders/components.js

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const { pathExists } = require('fs-extra');
 const loadFiles = require('../../load/load-files');
 
-module.exports = async strapi => {
+module.exports = async (strapi) => {
   if (!(await pathExists(strapi.dirs.dist.components))) {
     return {};
   }
@@ -13,7 +13,7 @@ module.exports = async strapi => {
   const map = await loadFiles(strapi.dirs.dist.components, '*/*.*(js|json)');
 
   return Object.keys(map).reduce((acc, category) => {
-    Object.keys(map[category]).forEach(key => {
+    Object.keys(map[category]).forEach((key) => {
       const schema = map[category][key];
 
       if (!schema.collectionName) {

package/lib/core/loaders/middlewares.js

@@ -14,7 +14,7 @@ module.exports = async function loadMiddlewares(strapi) {
   strapi.container.get('middlewares').add(`strapi::`, internalMiddlewares);
 };
 
-const loadLocalMiddlewares = async strapi => {
+const loadLocalMiddlewares = async (strapi) => {
   const dir = strapi.dirs.dist.middlewares;
 
   if (!(await fse.pathExists(dir))) {

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

@@ -7,7 +7,7 @@ const { get, has, pick, pickBy, defaultsDeep, map, prop, pipe } = require('lodas
 const { isKebabCase } = require('@strapi/utils');
 const getUserPluginsConfig = require('./get-user-plugins-config');
 
-const isStrapiPlugin = info => get('strapi.kind', info) === 'plugin';
+const isStrapiPlugin = (info) => get('strapi.kind', info) === 'plugin';
 const INTERNAL_PLUGINS = [
   '@strapi/plugin-content-manager',
   '@strapi/plugin-content-type-builder',
@@ -15,18 +15,18 @@ const INTERNAL_PLUGINS = [
   '@strapi/plugin-upload',
 ];
 
-const validatePluginName = pluginName => {
+const validatePluginName = (pluginName) => {
   if (!isKebabCase(pluginName)) {
     throw new Error(`Plugin name "${pluginName}" is not in kebab (an-example-of-kebab-case)`);
   }
 };
 
-const toDetailedDeclaration = declaration => {
+const toDetailedDeclaration = (declaration) => {
   if (typeof declaration === 'boolean') {
     return { enabled: declaration };
   }
 
-  let detailedDeclaration = pick(['enabled'], declaration);
+  const detailedDeclaration = pick(['enabled'], declaration);
   if (has('resolve', declaration)) {
     let pathToPlugin = '';
 
@@ -45,7 +45,7 @@ const toDetailedDeclaration = declaration => {
   return detailedDeclaration;
 };
 
-const getEnabledPlugins = async strapi => {
+const getEnabledPlugins = async (strapi) => {
   const internalPlugins = {};
   for (const dep of INTERNAL_PLUGINS) {
     const packagePath = join(dep, 'package.json');
@@ -106,14 +106,14 @@ const getEnabledPlugins = async strapi => {
 
   const declaredPluginsResolves = map(prop('pathToPlugin'), declaredPlugins);
   const installedPluginsNotAlreadyUsed = pickBy(
-    p => !declaredPluginsResolves.includes(p.pathToPlugin),
+    (p) => !declaredPluginsResolves.includes(p.pathToPlugin),
     installedPlugins
   );
 
   const enabledPlugins = pipe(
     defaultsDeep(declaredPlugins),
     defaultsDeep(installedPluginsNotAlreadyUsed),
-    pickBy(p => p.enabled)
+    pickBy((p) => p.enabled)
   )(internalPlugins);
 
   return enabledPlugins;

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

@@ -25,7 +25,7 @@ const defaultPlugin = {
   contentTypes: {},
 };
 
-const applyUserExtension = async plugins => {
+const applyUserExtension = async (plugins) => {
   const extensionsDir = strapi.dirs.dist.extensions;
   if (!(await fse.pathExists(extensionsDir))) {
     return;
@@ -40,11 +40,10 @@ const applyUserExtension = async plugins => {
     for (const ctName in plugin.contentTypes) {
       const extendedSchema = get([pluginName, 'content-types', ctName, 'schema'], extendedSchemas);
       if (extendedSchema) {
-        plugin.contentTypes[ctName].schema = Object.assign(
-          {},
-          plugin.contentTypes[ctName].schema,
-          extendedSchema
-        );
+        plugin.contentTypes[ctName].schema = {
+          ...plugin.contentTypes[ctName].schema,
+          ...extendedSchema,
+        };
       }
     }
     // second: execute strapi-server extension
@@ -55,7 +54,7 @@ const applyUserExtension = async plugins => {
   }
 };
 
-const applyUserConfig = async plugins => {
+const applyUserConfig = async (plugins) => {
   const userPluginsConfig = await getUserPluginsConfig();
 
   for (const pluginName in plugins) {
@@ -76,7 +75,7 @@ const applyUserConfig = async plugins => {
   }
 };
 
-const loadPlugins = async strapi => {
+const loadPlugins = async (strapi) => {
   const plugins = {};
 
   const enabledPlugins = await getEnabledPlugins(strapi);

package/lib/core/loaders/sanitizers.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   strapi.container.get('sanitizers').set('content-api', { input: [], output: [] });
 };

package/lib/core/loaders/src-index.js

@@ -15,11 +15,11 @@ const srcSchema = yup
   })
   .noUnknown();
 
-const validateSrcIndex = srcIndex => {
+const validateSrcIndex = (srcIndex) => {
   return srcSchema.validateSync(srcIndex, { strict: true, abortEarly: false });
 };
 
-module.exports = strapi => {
+module.exports = (strapi) => {
   if (!existsSync(strapi.dirs.dist.src)) {
     return;
   }

package/lib/core/registries/apis.js

@@ -2,7 +2,7 @@
 
 const { has } = require('lodash/fp');
 
-const apisRegistry = strapi => {
+const apisRegistry = (strapi) => {
   const apis = {};
 
   return {

package/lib/core/registries/config.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 
 module.exports = (initialConfig = {}) => {
-  const _config = Object.assign({}, initialConfig); // not deep clone because it would break some config
+  const _config = { ...initialConfig }; // not deep clone because it would break some config
 
   return {
     ..._config, // TODO: to remove

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

@@ -4,7 +4,7 @@ const { pickBy, has } = require('lodash/fp');
 const { createContentType } = require('../domain/content-type');
 const { addNamespace, hasNamespace } = require('../utils');
 
-const validateKeySameToSingularName = contentTypes => {
+const validateKeySameToSingularName = (contentTypes) => {
   for (const ctName in contentTypes) {
     const contentType = contentTypes[ctName];
 

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

@@ -0,0 +1,54 @@
+'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/core/registries/modules.js

@@ -3,7 +3,7 @@
 const { pickBy, has } = require('lodash/fp');
 const { createModule } = require('../domain/module');
 
-const modulesRegistry = strapi => {
+const modulesRegistry = (strapi) => {
   const modules = {};
 
   return {

package/lib/core/registries/plugins.js

@@ -2,7 +2,7 @@
 
 const { has } = require('lodash/fp');
 
-const pluginsRegistry = strapi => {
+const pluginsRegistry = (strapi) => {
   const plugins = {};
 
   return {

package/lib/core/registries/services.js

@@ -8,7 +8,7 @@ const { addNamespace, hasNamespace } = require('../utils');
  * @typedef {import('./services').ServiceFactory} ServiceFactory
  */
 
-const servicesRegistry = strapi => {
+const servicesRegistry = (strapi) => {
   const services = {};
   const instantiatedServices = {};