@strapi/strapi 0.0.0-e6cac9fe30 → 0.0.0-eb69fb6b1facdfef907143ee63f1642a71eb4606

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>
@@ -13,11 +17,14 @@
     <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
   </a>
   <a href="https://github.com/strapi/strapi/actions/workflows/tests.yml">
-    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=master" alt="Tests" />
+    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=main" alt="Tests" />
   </a>
   <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

@@ -21,7 +21,10 @@ const createEntityService = require('./services/entity-service');
 const createCronService = require('./services/cron');
 const entityValidator = require('./services/entity-validator');
 const createTelemetry = require('./services/metrics');
+const requestContext = require('./services/request-context');
 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');
@@ -34,12 +37,14 @@ 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');
@@ -74,7 +79,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
@@ -87,8 +92,10 @@ 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)
@@ -98,7 +105,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
@@ -108,6 +115,9 @@ class Strapi {
     this.log = createLogger(this.config.get('logger', {}));
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
+    this.requestContext = requestContext;
+
+    this.customFields = createCustomFields(this);
 
     createUpdateNotifier(this).notify();
   }
@@ -117,7 +127,7 @@ class Strapi {
   }
 
   get EE() {
-    return ee({ dir: this.dirs.dist.root, logger: this.log });
+    return ee({ dir: this.dirs.app.root, logger: this.log });
   }
 
   get services() {
@@ -188,6 +198,10 @@ class Strapi {
     return this.container.get('auth');
   }
 
+  get contentAPI() {
+    return this.container.get('content-api');
+  }
+
   get sanitizers() {
     return this.container.get('sanitizers');
   }
@@ -377,6 +391,8 @@ class Strapi {
     this.telemetry.register();
 
     await this.runLifecyclesFunctions(LIFECYCLES.REGISTER);
+    // NOTE: Swap type customField for underlying data type
+    convertCustomFieldType(this);
 
     return this;
   }
@@ -445,6 +461,8 @@ class Strapi {
     await this.server.initMiddlewares();
     await this.server.initRouting();
 
+    await this.contentAPI.permissions.registerActions();
+
     await this.runLifecyclesFunctions(LIFECYCLES.BOOTSTRAP);
 
     this.cron.start();

package/lib/commands/admin-create.js

@@ -17,7 +17,7 @@ const passwordValidator = yup
 const adminCreateSchema = yup.object().shape({
   email: emailValidator,
   password: passwordValidator,
-  firstname: yup.string().required('First name is required'),
+  firstname: yup.string().trim().required('First name is required'),
   lastname: yup.string(),
 });
 

package/lib/commands/builders/admin.js

@@ -44,6 +44,7 @@ module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir
       options: {
         backend: serverUrl,
         adminPath: addSlash(adminPath),
+        telemetryIsDisabled: strapiInstance.telemetry.isDisabled,
       },
     })
     .then(() => {

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/app-configuration/load-config-file.js

@@ -2,9 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
-const { templateConfiguration, env } = require('@strapi/utils');
-
-const importDefault = require('../../utils/import-default');
+const { templateConfiguration, env, importDefault } = require('@strapi/utils');
 
 const loadJsFile = (file) => {
   try {

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

@@ -54,7 +54,7 @@ const createContentType = (uid, definition) => {
     });
   } else {
     throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or strapi::.`
+      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
     );
   }
 

package/lib/core/loaders/apis.js

@@ -4,8 +4,7 @@ const { join, extname, basename } = require('path');
 const { existsSync } = require('fs-extra');
 const _ = require('lodash');
 const fse = require('fs-extra');
-const { isKebabCase } = require('@strapi/utils');
-const { importDefault } = require('../../utils');
+const { isKebabCase, importDefault } = require('@strapi/utils');
 
 const DEFAULT_CONTENT_TYPE = {
   schema: {},
@@ -40,7 +39,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]);
   }
 };
@@ -131,11 +130,12 @@ const loadDir = async (dir) => {
 
   const root = {};
   for (const fd of fds) {
-    if (!fd.isFile()) {
+    if (!fd.isFile() || extname(fd.name) === '.map') {
       continue;
     }
 
     const key = basename(fd.name, extname(fd.name));
+
     root[normalizeName(key)] = await loadFile(join(dir, fd.name));
   }
 

package/lib/core/loaders/middlewares.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadMiddlewares(strapi) {

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/loaders/policies.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadPolicies(strapi) {

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

@@ -2,9 +2,7 @@
 
 const { resolve } = require('path');
 const { statSync, existsSync } = require('fs');
-const { yup } = require('@strapi/utils');
-
-const { importDefault } = require('../../utils');
+const { yup, importDefault } = require('@strapi/utils');
 
 const srcSchema = yup
   .object()

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/custom-fields.js

@@ -0,0 +1,72 @@
+'use strict';
+
+const { has } = require('lodash/fp');
+
+const ALLOWED_TYPES = [
+  'biginteger',
+  'boolean',
+  'date',
+  'datetime',
+  'decimal',
+  'email',
+  'enumeration',
+  'float',
+  'integer',
+  'json',
+  'password',
+  'richtext',
+  'string',
+  'text',
+  'time',
+  'uid',
+];
+
+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 (!ALLOWED_TYPES.includes(type)) {
+          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/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/core-api/service/index.d.ts

@@ -12,11 +12,14 @@ export interface SingleTypeService extends BaseService {
 
 export interface CollectionTypeService extends BaseService {
   find?(params: object): Promise<Entity[]> | Entity;
-  findOne?(entityId: string,params: object): Promise<Entity> | Entity;
+  findOne?(entityId: string, params: object): Promise<Entity> | Entity;
   create?(params: object): Promise<Entity> | Entity;
-  update?(entityId: string,params: object): Promise<Entity> | Entity;
-  delete?(entityId: string,params: object): Promise<Entity> | Entity;
+  update?(entityId: string, params: object): Promise<Entity> | Entity;
+  delete?(entityId: string, params: object): Promise<Entity> | Entity;
 }
 
 export type Service = SingleTypeService | CollectionTypeService;
 
+export type GenericService = Partial<Service> & {
+  [method: string | number | symbol]: <T = any>(...args: any) => T;
+};

package/lib/load/load-files.js

@@ -4,7 +4,7 @@ const path = require('path');
 const _ = require('lodash');
 const fse = require('fs-extra');
 
-const { importDefault } = require('../utils');
+const { importDefault } = require('@strapi/utils');
 const glob = require('./glob');
 const filePathToPath = require('./filepath-to-prop-path');
 

package/lib/middlewares/body.js

@@ -23,12 +23,19 @@ function getFiles(ctx) {
 /**
  * @type {import('./').MiddlewareFactory}
  */
-module.exports = (config) => {
+
+module.exports = (config, { strapi }) => {
   const bodyConfig = defaultsDeep(defaults, config);
 
+  let gqlEndpoint;
+  if (strapi.plugin('graphql')) {
+    const { config: gqlConfig } = strapi.plugin('graphql');
+    gqlEndpoint = gqlConfig('endpoint');
+  }
+
   return async (ctx, next) => {
     // TODO: find a better way later
-    if (ctx.url === '/graphql') {
+    if (gqlEndpoint && ctx.url === gqlEndpoint) {
       await next();
     } else {
       try {

package/lib/middlewares/cors.js

@@ -33,7 +33,7 @@ module.exports = (config) => {
 
       const requestOrigin = ctx.accept.headers.origin;
       if (whitelist.includes('*')) {
-        return '*';
+        return credentials ? requestOrigin : '*';
       }
 
       if (!whitelist.includes(requestOrigin)) {

package/lib/middlewares/favicon.js

@@ -1,11 +1,12 @@
 'use strict';
 
+const { existsSync } = require('fs');
 const { resolve } = require('path');
 const { defaultsDeep } = require('lodash/fp');
 const favicon = require('koa-favicon');
 
 const defaults = {
-  path: 'favicon.ico',
+  path: 'favicon.png',
   maxAge: 86400000,
 };
 
@@ -13,7 +14,19 @@ const defaults = {
  * @type {import('./').MiddlewareFactory}
  */
 module.exports = (config, { strapi }) => {
-  const { maxAge, path: faviconPath } = defaultsDeep(defaults, config);
+  const { maxAge, path: faviconDefaultPath } = defaultsDeep(defaults, config);
+  const { root: appRoot } = strapi.dirs.app;
+  let faviconPath = faviconDefaultPath;
 
-  return favicon(resolve(strapi.dirs.app.root, faviconPath), { maxAge });
+  /** TODO (v5): Updating the favicon to use a png caused
+   *  https://github.com/strapi/strapi/issues/14693
+   *
+   *  This check ensures backwards compatibility until
+   *  the next major version
+   */
+  if (!existsSync(resolve(appRoot, faviconPath))) {
+    faviconPath = 'favicon.ico';
+  }
+
+  return favicon(resolve(appRoot, faviconPath), { maxAge });
 };