@strapi/utils 4.1.2 → 4.1.4-alpha.1

package/lib/convert-query-params.js

@@ -4,7 +4,7 @@
  * Converts the standard Strapi REST query params to a more usable format for querying
  * You can read more here: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest-api.html#filters
  */
-const { has, isEmpty, isObject, cloneDeep, get } = require('lodash/fp');
+const { has, isEmpty, isObject, isPlainObject, cloneDeep, get } = require('lodash/fp');
 const _ = require('lodash');
 const parseType = require('./parse-type');
 const contentTypesUtils = require('./content-types');
@@ -286,7 +286,7 @@ const convertFiltersQueryParams = (filters, schema) => {
 };
 
 const convertAndSanitizeFilters = (filters, schema) => {
-  if (!isObject(filters)) {
+  if (!isPlainObject(filters)) {
     return filters;
   }
 
@@ -349,7 +349,7 @@ const convertAndSanitizeFilters = (filters, schema) => {
     }
 
     // Remove empty objects & arrays
-    if (isObject(filters[key]) && isEmpty(filters[key])) {
+    if (isPlainObject(filters[key]) && isEmpty(filters[key])) {
       removeOperator(key);
     }
   }

package/lib/index.js

@@ -19,6 +19,8 @@ const {
   stringEquals,
   isKebabCase,
   isCamelCase,
+  toRegressedEnumValue,
+  startsWithANumber,
 } = require('./string-formatting');
 const { removeUndefined } = require('./object-formatting');
 const { getConfigUrls, getAbsoluteAdminUrl, getAbsoluteServerUrl } = require('./config');
@@ -47,6 +49,8 @@ module.exports = {
   traverseEntity,
   parseType,
   nameToSlug,
+  toRegressedEnumValue,
+  startsWithANumber,
   nameToCollectionName,
   getCommonBeginning,
   getConfigUrls,

package/lib/sanitize/visitors/remove-restricted-relations.js

@@ -2,6 +2,7 @@
 
 const ACTIONS_TO_VERIFY = ['find'];
 
+// FIXME: Support populating creator fields
 module.exports = auth => async ({ data, key, attribute }, { remove, set }) => {
   const isRelation = attribute.type === 'relation';
 

package/lib/string-formatting.js

@@ -6,6 +6,13 @@ const nameToSlug = (name, options = { separator: '-' }) => slugify(name, options
 
 const nameToCollectionName = name => slugify(name, { separator: '_' });
 
+const toRegressedEnumValue = value =>
+  slugify(value, {
+    decamelize: false,
+    lowercase: false,
+    separator: '_',
+  });
+
 const getCommonBeginning = (...strings) =>
   _.takeWhile(strings[0], (char, index) => strings.every(string => string[index] === char)).join(
     ''
@@ -35,6 +42,7 @@ const stringIncludes = (arr, val) => arr.map(String).includes(String(val));
 const stringEquals = (a, b) => String(a) === String(b);
 const isCamelCase = value => /^[a-z][a-zA-Z0-9]+$/.test(value);
 const isKebabCase = value => /^([a-z][a-z0-9]*)(-[a-z0-9]+)*$/.test(value);
+const startsWithANumber = value => /^[0-9]/.test(value);
 
 module.exports = {
   nameToSlug,
@@ -46,4 +54,6 @@ module.exports = {
   stringEquals,
   isCamelCase,
   isKebabCase,
+  toRegressedEnumValue,
+  startsWithANumber,
 };

package/lib/traverse-entity.js

@@ -41,6 +41,7 @@ const traverseEntity = async (visitor, options, entity) => {
     const isRelation = attribute.type === 'relation';
     const isComponent = attribute.type === 'component';
     const isDynamicZone = attribute.type === 'dynamiczone';
+    const isMedia = attribute.type === 'media';
 
     if (isRelation) {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');
@@ -61,6 +62,22 @@ const traverseEntity = async (visitor, options, entity) => {
         : await traverseTarget(value);
     }
 
+    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 (isComponent) {
       const targetSchema = strapi.getModel(attribute.component);
       const traverseOptions = { schema: targetSchema, path: newPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.1.2",
+  "version": "4.1.4-alpha.1",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -45,5 +45,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "6f72c3805232bc6c4b229aecfb19909b9f68d98d"
+  "gitHead": "28155df2bef16f415127fd6e65bd5f223f816d47"
 }