@strapi/utils 4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8 → 4.9.1

package/.eslintignore

@@ -0,0 +1,2 @@
+node_modules/
+.eslintrc.js

package/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom/back'],
+};

package/lib/async.js

@@ -6,9 +6,8 @@ const { curry, curryN } = require('lodash/fp');
 function pipeAsync(...methods) {
   return async (data) => {
     let res = data;
-
-    for (const method of methods) {
-      res = await method(res);
+    for (let i = 0; i < methods.length; i += 1) {
+      res = await methods[i](res);
     }
 
     return res;

package/lib/errors.js

@@ -89,6 +89,14 @@ class PolicyError extends ForbiddenError {
   }
 }
 
+class NotImplementedError extends ApplicationError {
+  constructor(message, details) {
+    super(message, details);
+    this.name = 'NotImplementedError';
+    this.message = message || 'This feature is not implemented yet';
+  }
+}
+
 module.exports = {
   HttpError,
   ApplicationError,
@@ -101,4 +109,5 @@ module.exports = {
   RateLimitError,
   PayloadTooLargeError,
   PolicyError,
+  NotImplementedError,
 };

package/lib/sanitize/index.js

@@ -37,12 +37,16 @@ const createContentAPISanitizers = () => {
     return pipeAsync(...transforms)(data);
   };
 
-  const sanitizeOuput = (data, schema, { auth } = {}) => {
+  const sanitizeOutput = async (data, schema, { auth } = {}) => {
     if (isArray(data)) {
-      return Promise.all(data.map((entry) => sanitizeOuput(entry, schema, { auth })));
+      const res = new Array(data.length);
+      for (let i = 0; i < data.length; i += 1) {
+        res[i] = await sanitizeOutput(data[i], schema, { auth });
+      }
+      return res;
     }
 
-    const transforms = [sanitizers.defaultSanitizeOutput(schema)];
+    const transforms = [(data) => sanitizers.defaultSanitizeOutput(schema, data)];
 
     if (auth) {
       transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
@@ -122,7 +126,7 @@ const createContentAPISanitizers = () => {
 
   return {
     input: sanitizeInput,
-    output: sanitizeOuput,
+    output: sanitizeOutput,
     query: sanitizeQuery,
     filters: sanitizeFilters,
     sort: sanitizeSort,

package/lib/sanitize/sanitizers.js

@@ -20,17 +20,20 @@ const {
   removeMorphToRelations,
 } = require('./visitors');
 
-const sanitizePasswords = curry((schema, entity) => {
+const sanitizePasswords = (schema) => async (entity) => {
   return traverseEntity(removePassword, { schema }, entity);
-});
-
-const sanitizePrivates = curry((schema, entity) => {
-  return traverseEntity(removePrivate, { schema }, entity);
-});
+};
 
-const defaultSanitizeOutput = curry((schema, entity) => {
-  return pipeAsync(sanitizePrivates(schema), sanitizePasswords(schema))(entity);
-});
+const defaultSanitizeOutput = async (schema, entity) => {
+  return traverseEntity(
+    (...args) => {
+      removePassword(...args);
+      removePrivate(...args);
+    },
+    { schema },
+    entity
+  );
+};
 
 const defaultSanitizeFilters = curry((schema, filters) => {
   return pipeAsync(
@@ -59,6 +62,12 @@ const defaultSanitizeSort = curry((schema, sort) => {
     // Remove non attribute keys
     traverseQuerySort(
       ({ key, attribute }, { remove }) => {
+        // ID is not an attribute per se, so we need to make
+        // an extra check to ensure we're not removing it
+        if (key === 'id') {
+          return;
+        }
+
         if (!attribute) {
           remove(key);
         }
@@ -134,7 +143,6 @@ const defaultSanitizePopulate = curry((schema, populate) => {
 
 module.exports = {
   sanitizePasswords,
-  sanitizePrivates,
   defaultSanitizeOutput,
   defaultSanitizeFilters,
   defaultSanitizeSort,

package/lib/traverse/factory.js

@@ -39,7 +39,8 @@ module.exports = () => {
     for (const key of keys) {
       const attribute =
         schema?.attributes?.[key] ??
-        // look for the attribute when key is in snake_case
+        // FIX: Needed to not break existing behavior on the API.
+        //      It looks for the attribute in the DB metadata when the key is in snake_case
         schema?.attributes?.[strapi.db.metadata.get(schema?.uid).columnToAttribute[key]];
 
       const newPath = { ...path };

package/lib/traverse/query-populate.js

@@ -160,6 +160,8 @@ const populate = traverseFactory()
       const { components } = attribute;
       const { on, ...properties } = value;
 
+      const newValue = {};
+
       // Handle legacy DZ params
       let newProperties = properties;
 
@@ -168,11 +170,15 @@ const populate = traverseFactory()
         newProperties = await recurse(visitor, { schema: componentSchema, path }, newProperties);
       }
 
+      Object.assign(newValue, newProperties);
+
       // Handle new morph fragment syntax
-      const newOn = await recurse(visitor, { schema, path }, { on });
+      if (on) {
+        const newOn = await recurse(visitor, { schema, path }, { on });
 
-      // Recompose both syntaxes
-      const newValue = { ...newOn, ...newProperties };
+        // Recompose both syntaxes
+        Object.assign(newValue, newOn);
+      }
 
       set(key, newValue);
     } else {

package/lib/traverse-entity.js

@@ -1,6 +1,42 @@
 'use strict';
 
-const { cloneDeep, isObject, isArray, isNil, curry } = require('lodash/fp');
+const { clone, isObject, isArray, isNil, curry } = require('lodash/fp');
+
+const traverseMorphRelationTarget = async (visitor, path, entry) => {
+  const targetSchema = strapi.getModel(entry.__type);
+
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseRelationTarget = (schema) => async (visitor, path, entry) => {
+  const traverseOptions = { schema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseMediaTarget = async (visitor, path, entry) => {
+  const targetSchemaUID = 'plugin::upload.file';
+  const targetSchema = strapi.getModel(targetSchemaUID);
+
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const traverseComponent = async (visitor, path, schema, entry) => {
+  const traverseOptions = { schema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
+
+const visitDynamicZoneEntry = async (visitor, path, entry) => {
+  const targetSchema = strapi.getModel(entry.__component);
+  const traverseOptions = { schema: targetSchema, path };
+
+  return traverseEntity(visitor, traverseOptions, entry);
+};
 
 const traverseEntity = async (visitor, options, entity) => {
   const { path = { raw: null, attribute: null }, schema } = options;
@@ -11,9 +47,13 @@ const traverseEntity = async (visitor, options, entity) => {
   }
 
   // Don't mutate the original entity object
-  const copy = cloneDeep(entity);
+  // only clone at 1st level as the next level will get clone when traversed
+  const copy = clone(entity);
+  const visitorUtils = createVisitorUtils({ data: copy });
 
-  for (const key of Object.keys(copy)) {
+  const keys = Object.keys(copy);
+  for (let i = 0; i < keys.length; i += 1) {
+    const key = keys[i];
     // Retrieve the attribute definition associated to the key from the schema
     const attribute = schema.attributes[key];
 
@@ -32,7 +72,6 @@ const traverseEntity = async (visitor, options, entity) => {
 
     // Visit the current attribute
     const visitorOptions = { data: copy, schema, key, value: copy[key], attribute, path: newPath };
-    const visitorUtils = createVisitorUtils({ data: copy });
 
     await visitor(visitorOptions, visitorUtils);
 
@@ -52,58 +91,62 @@ const traverseEntity = async (visitor, options, entity) => {
     if (isRelation) {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');
 
-      const traverseTarget = (entry) => {
-        // Handle polymorphic relationships
-        const targetSchemaUID = isMorphRelation ? entry.__type : attribute.target;
-        const targetSchema = strapi.getModel(targetSchemaUID);
-
-        const traverseOptions = { schema: targetSchema, path: newPath };
+      const method = isMorphRelation
+        ? traverseMorphRelationTarget
+        : traverseRelationTarget(strapi.getModel(attribute.target));
 
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await method(visitor, newPath, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await method(visitor, newPath, value);
+      }
 
-      // need to update copy
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseTarget))
-        : await traverseTarget(value);
+      continue;
     }
 
     if (isMedia) {
-      const traverseTarget = (entry) => {
-        const targetSchemaUID = 'plugin::upload.file';
-        const targetSchema = strapi.getModel(targetSchemaUID);
-
-        const traverseOptions = { schema: targetSchema, path: newPath };
-
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
-
       // need to update copy
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseTarget))
-        : await traverseTarget(value);
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await traverseMediaTarget(visitor, newPath, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await traverseMediaTarget(visitor, newPath, value);
+      }
+
+      continue;
     }
 
     if (isComponent) {
       const targetSchema = strapi.getModel(attribute.component);
-      const traverseOptions = { schema: targetSchema, path: newPath };
 
-      const traverseComponent = (entry) => traverseEntity(visitor, traverseOptions, entry);
+      if (isArray(value)) {
+        const res = new Array(value.length);
+        for (let i = 0; i < value.length; i += 1) {
+          res[i] = await traverseComponent(visitor, newPath, targetSchema, value[i]);
+        }
+        copy[key] = res;
+      } else {
+        copy[key] = await traverseComponent(visitor, newPath, targetSchema, value);
+      }
 
-      copy[key] = isArray(value)
-        ? await Promise.all(value.map(traverseComponent))
-        : await traverseComponent(value);
+      continue;
     }
 
     if (isDynamicZone && isArray(value)) {
-      const visitDynamicZoneEntry = (entry) => {
-        const targetSchema = strapi.getModel(entry.__component);
-        const traverseOptions = { schema: targetSchema, path: newPath };
-
-        return traverseEntity(visitor, traverseOptions, entry);
-      };
+      const res = new Array(value.length);
+      for (let i = 0; i < value.length; i += 1) {
+        res[i] = await visitDynamicZoneEntry(visitor, newPath, value[i]);
+      }
+      copy[key] = res;
 
-      copy[key] = await Promise.all(value.map(visitDynamicZoneEntry));
+      continue;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8",
+  "version": "4.9.1",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -32,7 +32,9 @@
     "lib": "./lib"
   },
   "scripts": {
-    "test:unit": "jest --verbose"
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
@@ -46,5 +48,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "366eb8a0d0f06935914854c6d9c4b3fe859468e0"
+  "gitHead": "c8f2f0543b45dda8eadde21a0782b64d156fc786"
 }