@strapi/strapi 4.5.0-beta.0 → 4.5.1

package/lib/Strapi.js

@@ -127,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() {

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/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/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: {},

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

@@ -1,7 +1,25 @@
 'use strict';
 
 const { has } = require('lodash/fp');
-const validators = require('../../services/entity-validator/validators');
+
+const ALLOWED_TYPES = [
+  'biginteger',
+  'boolean',
+  'date',
+  'datetime',
+  'decimal',
+  'email',
+  'enumeration',
+  'float',
+  'integer',
+  'json',
+  'password',
+  'richtext',
+  'string',
+  'text',
+  'time',
+  'uid',
+];
 
 const customFieldsRegistry = (strapi) => {
   const customFields = {};
@@ -27,7 +45,7 @@ const customFieldsRegistry = (strapi) => {
         }
 
         const { name, plugin, type } = cf;
-        if (!has(type, validators)) {
+        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`
           );

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/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 });
 };

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

@@ -267,44 +267,34 @@ const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamic
   }
 };
 
-const deleteComponents = async (uid, entityToDelete) => {
+const deleteComponents = async (uid, entityToDelete, { loadComponents = true } = {}) => {
   const { attributes = {} } = strapi.getModel(uid);
 
   for (const attributeName of Object.keys(attributes)) {
     const attribute = attributes[attributeName];
 
-    if (attribute.type === 'component') {
-      const { component: componentUID } = attribute;
-
-      // Load attribute value if it's not already loaded
-      const value =
-        entityToDelete[attributeName] ||
-        (await strapi.query(uid).load(entityToDelete, attributeName));
-
-      if (!value) {
-        continue;
-      }
-
-      if (Array.isArray(value)) {
-        await Promise.all(value.map((subValue) => deleteComponent(componentUID, subValue)));
+    if (attribute.type === 'component' || attribute.type === 'dynamiczone') {
+      let value;
+      if (loadComponents) {
+        value = await strapi.query(uid).load(entityToDelete, attributeName);
       } else {
-        await deleteComponent(componentUID, value);
+        value = entityToDelete[attributeName];
       }
 
-      continue;
-    }
-
-    if (attribute.type === 'dynamiczone') {
-      const value =
-        entityToDelete[attributeName] ||
-        (await strapi.query(uid).load(entityToDelete, attributeName));
-
       if (!value) {
         continue;
       }
 
-      if (Array.isArray(value)) {
-        await Promise.all(value.map((subValue) => deleteComponent(subValue.__component, subValue)));
+      if (attribute.type === 'component') {
+        const { component: componentUID } = attribute;
+        await Promise.all(
+          _.castArray(value).map((subValue) => deleteComponent(componentUID, subValue))
+        );
+      } else {
+        // delete dynamic zone components
+        await Promise.all(
+          _.castArray(value).map((subValue) => deleteComponent(subValue.__component, subValue))
+        );
       }
 
       continue;

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

@@ -219,7 +219,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     const componentsToDelete = await getComponents(uid, entityToDelete);
 
     await db.query(uid).delete({ where: { id: entityToDelete.id } });
-    await deleteComponents(uid, { ...entityToDelete, ...componentsToDelete });
+    await deleteComponents(uid, componentsToDelete, { loadComponents: false });
 
     await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
 
@@ -244,7 +244,9 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     );
 
     const deletedEntities = await db.query(uid).deleteMany(query);
-    await Promise.all(componentsToDelete.map((compos) => deleteComponents(uid, compos)));
+    await Promise.all(
+      componentsToDelete.map((compos) => deleteComponents(uid, compos, { loadComponents: false }))
+    );
 
     // 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

@@ -5,7 +5,8 @@
 
 'use strict';
 
-const { has, assoc, prop, isObject } = require('lodash/fp');
+const { uniqBy, castArray, isNil } = require('lodash');
+const { has, assoc, prop, isObject, isEmpty, merge } = require('lodash/fp');
 const strapiUtils = require('@strapi/utils');
 const validators = require('./validators');
 
@@ -222,10 +223,136 @@ const createValidateEntity =
         entity,
       },
       { isDraft }
-    ).required();
+    )
+      .test('relations-test', 'check that all relations exist', async function (data) {
+        try {
+          await checkRelationsExist(buildRelationsStore({ uid: model.uid, data }));
+        } catch (e) {
+          return this.createError({
+            path: this.path,
+            message: e.message,
+          });
+        }
+        return true;
+      })
+      .required();
+
     return validateYupSchema(validator, { strict: false, abortEarly: false })(data);
   };
 
+/**
+ * Builds an object containing all the media and relations being associated with an entity
+ * @param {String} uid of the model
+ * @param {Object} data
+ * @returns {Object}
+ */
+const buildRelationsStore = ({ uid, data }) => {
+  if (isEmpty(data)) {
+    return {};
+  }
+  const currentModel = strapi.getModel(uid);
+
+  return Object.keys(currentModel.attributes).reduce((result, attributeName) => {
+    const attribute = currentModel.attributes[attributeName];
+    const value = data[attributeName];
+
+    if (isNil(value)) {
+      return result;
+    }
+
+    switch (attribute.type) {
+      case 'relation':
+      case 'media': {
+        if (attribute.relation === 'morphToMany' || attribute.relation === 'morphToOne') {
+          // TODO: handle polymorphic relations
+          break;
+        }
+
+        const target = attribute.type === 'media' ? 'plugin::upload.file' : attribute.target;
+        // As there are multiple formats supported for associating relations
+        // with an entity, the value here can be an: array, object or number.
+        let source;
+        if (Array.isArray(value)) {
+          source = value;
+        } else if (isObject(value)) {
+          source = value.connect ?? value.set ?? [];
+        } else {
+          source = castArray(value);
+        }
+        const idArray = source.map((v) => ({ id: v.id || v }));
+
+        // Update the relationStore to keep track of all associations being made
+        // with relations and media.
+        result[target] = result[target] || [];
+        result[target].push(...idArray);
+        break;
+      }
+      case 'component': {
+        return castArray(value).reduce(
+          (relationsStore, componentValue) =>
+            merge(
+              relationsStore,
+              buildRelationsStore({
+                uid: attribute.component,
+                data: componentValue,
+              })
+            ),
+          result
+        );
+      }
+      case 'dynamiczone': {
+        return value.reduce(
+          (relationsStore, dzValue) =>
+            merge(
+              relationsStore,
+              buildRelationsStore({
+                uid: dzValue.__component,
+                data: dzValue,
+              })
+            ),
+          result
+        );
+      }
+      default:
+        break;
+    }
+
+    return result;
+  }, {});
+};
+
+/**
+ * Iterate through the relations store and validates that every relation or media
+ * mentioned exists
+ */
+const checkRelationsExist = async (relationsStore = {}) => {
+  const promises = [];
+
+  for (const [key, value] of Object.entries(relationsStore)) {
+    const evaluate = async () => {
+      const uniqueValues = uniqBy(value, `id`);
+      const count = await strapi.db.query(key).count({
+        where: {
+          id: {
+            $in: uniqueValues.map((v) => v.id),
+          },
+        },
+      });
+
+      if (count !== uniqueValues.length) {
+        throw new ValidationError(
+          `${
+            uniqueValues.length - count
+          } relation(s) of type ${key} associated with this entity do not exist`
+        );
+      }
+    };
+    promises.push(evaluate());
+  }
+
+  return Promise.all(promises);
+};
+
 module.exports = {
   validateEntityCreation: createValidateEntity('creation'),
   validateEntityUpdate: createValidateEntity('update'),

package/lib/services/server/middleware.js

@@ -2,6 +2,7 @@
 
 const path = require('path');
 const { propOr, isArray, isNil } = require('lodash/fp');
+const { importDefault } = require('@strapi/utils');
 
 const getMiddlewareConfig = propOr([], 'config.middlewares');
 
@@ -119,7 +120,7 @@ const resolveCustomMiddleware = (resolve, strapi) => {
   }
 
   try {
-    return require(modulePath);
+    return importDefault(modulePath);
   } catch (err) {
     throw new Error(`Could not load middleware "${modulePath}".`);
   }

package/lib/utils/index.js

@@ -3,11 +3,9 @@
 const openBrowser = require('./open-browser');
 const isInitialized = require('./is-initialized');
 const getDirs = require('./get-dirs');
-const importDefault = require('./import-default');
 
 module.exports = {
   isInitialized,
   openBrowser,
   getDirs,
-  importDefault,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.5.0-beta.0",
+  "version": "4.5.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",
@@ -78,25 +78,25 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "@koa/cors": "3.4.2",
+    "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.5.0-beta.0",
-    "@strapi/database": "4.5.0-beta.0",
-    "@strapi/generate-new": "4.5.0-beta.0",
-    "@strapi/generators": "4.5.0-beta.0",
-    "@strapi/logger": "4.5.0-beta.0",
-    "@strapi/permissions": "4.5.0-beta.0",
-    "@strapi/plugin-content-manager": "4.5.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.5.0-beta.0",
-    "@strapi/plugin-email": "4.5.0-beta.0",
-    "@strapi/plugin-upload": "4.5.0-beta.0",
-    "@strapi/typescript-utils": "4.5.0-beta.0",
-    "@strapi/utils": "4.5.0-beta.0",
+    "@strapi/admin": "4.5.1",
+    "@strapi/database": "4.5.1",
+    "@strapi/generate-new": "4.5.1",
+    "@strapi/generators": "4.5.1",
+    "@strapi/logger": "4.5.1",
+    "@strapi/permissions": "4.5.1",
+    "@strapi/plugin-content-manager": "4.5.1",
+    "@strapi/plugin-content-type-builder": "4.5.1",
+    "@strapi/plugin-email": "4.5.1",
+    "@strapi/plugin-upload": "4.5.1",
+    "@strapi/typescript-utils": "4.5.1",
+    "@strapi/utils": "4.5.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
     "chokidar": "3.5.2",
-    "ci-info": "3.3.2",
+    "ci-info": "3.5.0",
     "cli-table3": "0.6.2",
     "commander": "8.2.0",
     "configstore": "5.0.1",
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "ee98b9a9cbb6e0e07e781ff9e87eb170c72e50df"
+  "gitHead": "8c20ea2b5c5a115b78454086ea270dcd59b06004"
 }

package/lib/utils/import-default.js

@@ -1,10 +0,0 @@
-'use strict';
-
-const importDefault =
-  (this && this.importDefault) ||
-  function (modName) {
-    const mod = require(modName);
-    return mod && mod.__esModule ? mod.default : mod;
-  };
-
-module.exports = importDefault;