@strapi/strapi 4.3.7 → 4.3.9

package/README.md

@@ -86,7 +86,7 @@ Complete installation requirements can be found in the documentation under <a hr
 
 **Node:**
 
-- NodeJS >= 14 <= 16
+- NodeJS >= 14 <= 18
 - NPM >= 6.x
 
 **Database:**

package/lib/Strapi.js

@@ -21,6 +21,7 @@ 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 createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
@@ -108,6 +109,7 @@ class Strapi {
     this.log = createLogger(this.config.get('logger', {}));
     this.cron = createCronService();
     this.telemetry = createTelemetry(this);
+    this.requestContext = requestContext;
 
     createUpdateNotifier(this).notify();
   }

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/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]);
   }
 };
@@ -131,11 +131,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/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/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

@@ -18,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)) {
@@ -118,11 +118,11 @@ const getComponents = async (uid, entity) => {
   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)) {
@@ -275,9 +275,9 @@ 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') {

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/request-context.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const { AsyncLocalStorage } = require('async_hooks');
+
+const storage = new AsyncLocalStorage();
+
+const requestCtx = {
+  async run(store, cb) {
+    return storage.run(store, cb);
+  },
+
+  get() {
+    return storage.getStore();
+  },
+};
+
+module.exports = requestCtx;

package/lib/services/server/index.js

@@ -9,6 +9,7 @@ const { createContentAPI } = require('./content-api');
 const registerAllRoutes = require('./register-routes');
 const registerApplicationMiddlewares = require('./register-middlewares');
 const createKoaApp = require('./koa');
+const requestCtx = require('../request-context');
 
 const healthCheck = async (ctx) => {
   ctx.set('strapi', 'You are so French!');
@@ -33,6 +34,8 @@ const createServer = (strapi) => {
     keys: strapi.config.get('server.app.keys'),
   });
 
+  app.use((ctx, next) => requestCtx.run(ctx, () => next()));
+
   const router = new Router();
 
   const routeManager = createRouteManager(strapi);

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/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.3.7",
+  "version": "4.3.9",
   "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,17 @@
   "dependencies": {
     "@koa/cors": "3.4.1",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.3.7",
-    "@strapi/database": "4.3.7",
-    "@strapi/generate-new": "4.3.7",
-    "@strapi/generators": "4.3.7",
-    "@strapi/logger": "4.3.7",
-    "@strapi/plugin-content-manager": "4.3.7",
-    "@strapi/plugin-content-type-builder": "4.3.7",
-    "@strapi/plugin-email": "4.3.7",
-    "@strapi/plugin-upload": "4.3.7",
-    "@strapi/typescript-utils": "4.3.7",
-    "@strapi/utils": "4.3.7",
+    "@strapi/admin": "4.3.9",
+    "@strapi/database": "4.3.9",
+    "@strapi/generate-new": "4.3.9",
+    "@strapi/generators": "4.3.9",
+    "@strapi/logger": "4.3.9",
+    "@strapi/plugin-content-manager": "4.3.9",
+    "@strapi/plugin-content-type-builder": "4.3.9",
+    "@strapi/plugin-email": "4.3.9",
+    "@strapi/plugin-upload": "4.3.9",
+    "@strapi/typescript-utils": "4.3.9",
+    "@strapi/utils": "4.3.9",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,8 +136,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": "73f523b98322cea8992c72977b94a73a624d2e79"
+  "gitHead": "8ebf58d9edb62872acf88d19d1f878b4a1632ff7"
 }