@strapi/strapi 0.0.0-e4d1f4d78c → 0.0.0-ee00599cd73180e84df84536521183b48892a28c

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/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/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/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/security.js

@@ -30,22 +30,28 @@ const defaults = {
 /**
  * @type {import('./').MiddlewareFactory}
  */
-module.exports = (config) => (ctx, next) => {
-  let helmetConfig = defaultsDeep(defaults, config);
 
-  if (
-    ctx.method === 'GET' &&
-    ['/graphql', '/documentation'].some((str) => ctx.path.startsWith(str))
-  ) {
-    helmetConfig = merge(helmetConfig, {
-      contentSecurityPolicy: {
-        directives: {
-          'script-src': ["'self'", "'unsafe-inline'", 'cdn.jsdelivr.net'],
-          'img-src': ["'self'", 'data:', 'cdn.jsdelivr.net', 'strapi.io'],
+module.exports =
+  (config, { strapi }) =>
+  (ctx, next) => {
+    let helmetConfig = defaultsDeep(defaults, config);
+    const specialPaths = ['/documentation'];
+
+    if (strapi.plugin('graphql')) {
+      const { config: gqlConfig } = strapi.plugin('graphql');
+      specialPaths.push(gqlConfig('endpoint'));
+    }
+
+    if (ctx.method === 'GET' && specialPaths.some((str) => ctx.path.startsWith(str))) {
+      helmetConfig = merge(helmetConfig, {
+        contentSecurityPolicy: {
+          directives: {
+            'script-src': ["'self'", "'unsafe-inline'", 'cdn.jsdelivr.net'],
+            'img-src': ["'self'", 'data:', 'cdn.jsdelivr.net', 'strapi.io'],
+          },
         },
-      },
-    });
-  }
+      });
+    }
 
-  return helmet(helmetConfig)(ctx, next);
-};
+    return helmet(helmetConfig)(ctx, next);
+  };

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);
 
@@ -228,7 +231,23 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // select / populate
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    return db.query(uid).deleteMany(query);
+    const entitiesToDelete = await db.query(uid).findMany(query);
+
+    if (!entitiesToDelete.length) {
+      return null;
+    }
+
+    const componentsToDelete = await Promise.all(
+      entitiesToDelete.map((entityToDelete) => getComponents(uid, entityToDelete))
+    );
+
+    const deletedEntities = await db.query(uid).deleteMany(query);
+    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)));
+
+    return deletedEntities;
   },
 
   load(uid, entity, field, params = {}) {

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

@@ -2,7 +2,8 @@ import type Koa from 'koa';
 import { Database } from '@strapi/database';
 
 import type { StringMap } from './utils';
-import type { GenericController } from '../core-api/controller'
+import type { GenericController } from '../../../core-api/controller'
+import type { GenericService } from '../../../core-api/service'
 
 /**
  * The Strapi interface implemented by the main Strapi class.
@@ -33,12 +34,12 @@ export interface Strapi {
    *
    * It returns all the registered services
    */
-  readonly services: StringMap<Service>;
+  readonly services: StringMap<GenericService>;
 
   /**
    * Find a service using its unique identifier
    */
-  service<T extends Service = unknown>(uid: string): T | undefined;
+  service<T extends GenericService = GenericService>(uid: string): T | undefined;
 
   /**
    * Getter for the Strapi controllers container

package/lib/types/factories.d.ts

@@ -1,4 +1,4 @@
-import { Service } from '../core-api/service';
+import { Service,GenericService } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
@@ -47,14 +47,14 @@ interface Router {
 type ControllerCallback<T extends GenericController = GenericController> = (params: {
   strapi: Strapi;
 }) => T;
-type ServiceCallback<T extends Service = Service> = (params: { strapi: Strapi }) => T;
+type ServiceCallback<T extends GenericService = GenericService> = (params: { strapi: Strapi }) => T;
 
 export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
 export function createCoreController<T extends GenericController = GenericController>(
   uid: string,
   cfg?: ControllerCallback<T> | T = {}
 ): () => T & Controller;
-export function createCoreService<T extends Service = Service>(
+export function createCoreService<T extends GenericService = GenericService>(
   uid: string,
   cfg?: ServiceCallback<T> | T = {}
 ): () => T;

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": "0.0.0-e4d1f4d78c",
+  "version": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
   "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,19 +78,19 @@
     "test:unit": "jest --verbose"
   },
   "dependencies": {
-    "@koa/cors": "3.1.0",
+    "@koa/cors": "3.4.1",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "0.0.0-e4d1f4d78c",
-    "@strapi/database": "0.0.0-e4d1f4d78c",
-    "@strapi/generate-new": "0.0.0-e4d1f4d78c",
-    "@strapi/generators": "0.0.0-e4d1f4d78c",
-    "@strapi/logger": "0.0.0-e4d1f4d78c",
-    "@strapi/plugin-content-manager": "0.0.0-e4d1f4d78c",
-    "@strapi/plugin-content-type-builder": "0.0.0-e4d1f4d78c",
-    "@strapi/plugin-email": "0.0.0-e4d1f4d78c",
-    "@strapi/plugin-upload": "0.0.0-e4d1f4d78c",
-    "@strapi/typescript-utils": "0.0.0-e4d1f4d78c",
-    "@strapi/utils": "0.0.0-e4d1f4d78c",
+    "@strapi/admin": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/database": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/generate-new": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/generators": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/logger": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/plugin-content-manager": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/plugin-content-type-builder": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/plugin-email": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/plugin-upload": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/typescript-utils": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
+    "@strapi/utils": "0.0.0-ee00599cd73180e84df84536521183b48892a28c",
     "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": "e4d1f4d78c41a31d4eac54f29c60bf50ea5f59b4"
+  "gitHead": "ee00599cd73180e84df84536521183b48892a28c"
 }