@strapi/utils 4.1.1 → 4.2.0-alpha.O

package/lib/convert-query-params.js

@@ -124,7 +124,7 @@ class InvalidPopulateError extends Error {
 }
 
 // NOTE: we could support foo.* or foo.bar.* etc later on
-const convertPopulateQueryParams = (populate, depth = 0) => {
+const convertPopulateQueryParams = (populate, schema, depth = 0) => {
   if (depth === 0 && populate === '*') {
     return true;
   }
@@ -147,18 +147,72 @@ const convertPopulateQueryParams = (populate, depth = 0) => {
   }
 
   if (_.isPlainObject(populate)) {
-    const transformedPopulate = {};
-    for (const key in populate) {
-      transformedPopulate[key] = convertNestedPopulate(populate[key]);
-    }
-
-    return transformedPopulate;
+    return convertPopulateObject(populate, schema);
   }
 
   throw new InvalidPopulateError();
 };
 
-const convertNestedPopulate = subPopulate => {
+const convertPopulateObject = (populate, schema) => {
+  if (!schema) {
+    return {};
+  }
+
+  const { attributes } = schema;
+
+  return Object.entries(populate).reduce((acc, [key, subPopulate]) => {
+    const attribute = attributes[key];
+
+    if (!attribute) {
+      return acc;
+    }
+
+    // FIXME: This is a temporary solution for dynamic zones that should be
+    // fixed when we'll implement a more accurate way to query them
+    if (attribute.type === 'dynamiczone') {
+      const generatedFakeDynamicZoneSchema = {
+        uid: `${schema.uid}.${key}`,
+        attributes: attribute.components
+          .sort()
+          .map(uid => strapi.getModel(uid).attributes)
+          .reduce((acc, componentAttributes) => ({ ...acc, ...componentAttributes }), {}),
+      };
+
+      return {
+        ...acc,
+        [key]: convertNestedPopulate(subPopulate, generatedFakeDynamicZoneSchema),
+      };
+    }
+
+    // NOTE: Retrieve the target schema UID.
+    // Only handles basic relations, medias and component since it's not possible
+    // to populate with options for a dynamic zone or a polymorphic relation
+    let targetSchemaUID;
+
+    if (attribute.type === 'relation') {
+      targetSchemaUID = attribute.target;
+    } else if (attribute.type === 'component') {
+      targetSchemaUID = attribute.component;
+    } else if (attribute.type === 'media') {
+      targetSchemaUID = 'plugin::upload.file';
+    } else {
+      return acc;
+    }
+
+    const targetSchema = strapi.getModel(targetSchemaUID);
+
+    if (!targetSchema) {
+      return acc;
+    }
+
+    return {
+      ...acc,
+      [key]: convertNestedPopulate(subPopulate, targetSchema),
+    };
+  }, {});
+};
+
+const convertNestedPopulate = (subPopulate, schema) => {
   if (subPopulate === '*') {
     return true;
   }
@@ -181,7 +235,7 @@ const convertNestedPopulate = subPopulate => {
   }
 
   if (filters) {
-    query.where = convertFiltersQueryParams(filters);
+    query.where = convertFiltersQueryParams(filters, schema);
   }
 
   if (fields) {
@@ -189,7 +243,7 @@ const convertNestedPopulate = subPopulate => {
   }
 
   if (populate) {
-    query.populate = convertPopulateQueryParams(populate);
+    query.populate = convertPopulateQueryParams(populate, schema);
   }
 
   if (count) {
@@ -250,7 +304,7 @@ const convertAndSanitizeFilters = (filters, schema) => {
 
   // Here, `key` can either be an operator or an attribute name
   for (const [key, value] of Object.entries(filters)) {
-    const attribute = get('key', schema.attributes);
+    const attribute = get(key, schema.attributes);
 
     // Handle attributes
     if (attribute) {
@@ -280,7 +334,7 @@ const convertAndSanitizeFilters = (filters, schema) => {
         if (attribute.type === 'password') {
           removeOperator(key);
         } else {
-          filters[key] = convertAndSanitizeFilters(value);
+          filters[key] = convertAndSanitizeFilters(value, schema);
         }
       }
     }

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.1",
+  "version": "4.2.0-alpha.O",
   "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": "3a4db96af2a2d3fa54fe04bd09b1a4bf364caf3c"
+  "gitHead": "0e1f1ae08565a5f2427753582f37645a43c00cb2"
 }