@strapi/utils 4.9.0 → 4.10.0-beta.0

package/lib/async.js

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

package/lib/content-types.js

@@ -82,6 +82,7 @@ const isVisibleAttribute = (model, attributeName) => {
   return getVisibleAttributes(model).includes(attributeName);
 };
 
+const getOptions = (model) => _.assign({ draftAndPublish: false }, _.get(model, 'options', {}));
 const hasDraftAndPublish = (model) => _.get(model, 'options.draftAndPublish', false) === true;
 
 const isDraft = (data, model) =>
@@ -178,6 +179,7 @@ module.exports = {
   getTimestamps,
   isVisibleAttribute,
   hasDraftAndPublish,
+  getOptions,
   isDraft,
   isSingleType,
   isCollectionType,

package/lib/sanitize/index.js

@@ -37,16 +37,12 @@ const createContentAPISanitizers = () => {
     return pipeAsync(...transforms)(data);
   };
 
-  const sanitizeOutput = async (data, schema, { auth } = {}) => {
+  const sanitizeOuput = (data, schema, { auth } = {}) => {
     if (isArray(data)) {
-      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;
+      return Promise.all(data.map((entry) => sanitizeOuput(entry, schema, { auth })));
     }
 
-    const transforms = [(data) => sanitizers.defaultSanitizeOutput(schema, data)];
+    const transforms = [sanitizers.defaultSanitizeOutput(schema)];
 
     if (auth) {
       transforms.push(traverseEntity(visitors.removeRestrictedRelations(auth), { schema }));
@@ -126,7 +122,7 @@ const createContentAPISanitizers = () => {
 
   return {
     input: sanitizeInput,
-    output: sanitizeOutput,
+    output: sanitizeOuput,
     query: sanitizeQuery,
     filters: sanitizeFilters,
     sort: sanitizeSort,

package/lib/sanitize/sanitizers.js

@@ -20,20 +20,17 @@ const {
   removeMorphToRelations,
 } = require('./visitors');
 
-const sanitizePasswords = (schema) => async (entity) => {
+const sanitizePasswords = curry((schema, entity) => {
   return traverseEntity(removePassword, { schema }, entity);
-};
+});
 
-const defaultSanitizeOutput = async (schema, entity) => {
-  return traverseEntity(
-    (...args) => {
-      removePassword(...args);
-      removePrivate(...args);
-    },
-    { 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 defaultSanitizeFilters = curry((schema, filters) => {
   return pipeAsync(
@@ -143,6 +140,7 @@ const defaultSanitizePopulate = curry((schema, populate) => {
 
 module.exports = {
   sanitizePasswords,
+  sanitizePrivates,
   defaultSanitizeOutput,
   defaultSanitizeFilters,
   defaultSanitizeSort,

package/lib/traverse-entity.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.9.0",
+  "version": "4.10.0-beta.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -32,9 +32,7 @@
     "lib": "./lib"
   },
   "scripts": {
-    "test:unit": "jest",
-    "test:unit:watch": "jest --watch",
-    "lint": "eslint ."
+    "test:unit": "jest --verbose"
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
@@ -48,5 +46,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "ffe3f4621ccc968ce56fda9a8317ec30d4bad205"
+  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
 }

package/.eslintignore

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

package/.eslintrc.js

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