@strapi/utils 4.0.7 → 4.0.8

package/lib/content-types.js

@@ -104,13 +104,21 @@ const isPrivateAttribute = (model = {}, attributeName) => {
 };
 
 const isScalarAttribute = attribute => {
-  return !['component', 'relation', 'dynamiczone'].includes(attribute.type);
+  return !['media', 'component', 'relation', 'dynamiczone'].includes(attribute.type);
 };
 
-const isMediaAttribute = attr => {
-  return attr.type === 'media';
+const getScalarAttributes = schema => {
+  return _.reduce(
+    schema.attributes,
+    (acc, attr, attrName) => {
+      if (isScalarAttribute(attr)) acc.push(attrName);
+      return acc;
+    },
+    []
+  );
 };
 
+const isMediaAttribute = attribute => attribute.type === 'media';
 const isRelationalAttribute = attribute => attribute.type === 'relation';
 const isComponentAttribute = attribute => ['component', 'dynamiczone'].includes(attribute.type);
 
@@ -144,6 +152,7 @@ module.exports = {
   isPrivateAttribute,
   constants,
   getNonWritableAttributes,
+  getScalarAttributes,
   getWritableAttributes,
   isWritableAttribute,
   getNonVisibleAttributes,

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 } = require('lodash/fp');
+const { has, isEmpty, isObject, cloneDeep, get } = require('lodash/fp');
 const _ = require('lodash');
 const parseType = require('./parse-type');
 const contentTypesUtils = require('./content-types');
@@ -218,7 +218,90 @@ const convertFieldsQueryParams = (fields, depth = 0) => {
   throw new Error('Invalid fields parameter. Expected a string or an array of strings');
 };
 
-const convertFiltersQueryParams = filters => filters;
+const convertFiltersQueryParams = (filters, schema) => {
+  // Filters need to be either an array or an object
+  // Here we're only checking for 'object' type since typeof [] => object and typeof {} => object
+  if (!isObject(filters)) {
+    throw new Error('The filters parameter must be an object or an array');
+  }
+
+  // Don't mutate the original object
+  const filtersCopy = cloneDeep(filters);
+
+  return convertAndSanitizeFilters(filtersCopy, schema);
+};
+
+const convertAndSanitizeFilters = (filters, schema) => {
+  if (!isObject(filters)) {
+    return filters;
+  }
+
+  if (Array.isArray(filters)) {
+    return (
+      filters
+        // Sanitize each filter
+        .map(filter => convertAndSanitizeFilters(filter, schema))
+        // Filter out empty filters
+        .filter(filter => !isObject(filter) || !isEmpty(filter))
+    );
+  }
+
+  const removeOperator = operator => delete filters[operator];
+
+  // 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);
+
+    // Handle attributes
+    if (attribute) {
+      // Relations
+      if (attribute.type === 'relation') {
+        filters[key] = convertAndSanitizeFilters(value, strapi.getModel(attribute.target));
+      }
+
+      // Components
+      else if (attribute.type === 'component') {
+        filters[key] = convertAndSanitizeFilters(value, strapi.getModel(attribute.component));
+      }
+
+      // Media
+      else if (attribute.type === 'media') {
+        filters[key] = convertAndSanitizeFilters(value, strapi.getModel('plugin::upload.file'));
+      }
+
+      // Dynamic Zones
+      else if (attribute.type === 'dynamiczone') {
+        removeOperator(key);
+      }
+
+      // Scalar attributes
+      else {
+        // Always remove password attributes from filters object
+        if (attribute.type === 'password') {
+          removeOperator(key);
+        } else {
+          filters[key] = convertAndSanitizeFilters(value);
+        }
+      }
+    }
+
+    // Handle operators
+    else {
+      if (['$null', '$notNull'].includes(key)) {
+        filters[key] = parseType({ type: 'boolean', value: filters[key], forceCast: true });
+      } else if (isObject(value)) {
+        filters[key] = convertAndSanitizeFilters(value, schema);
+      }
+    }
+
+    // Remove empty objects & arrays
+    if (isObject(filters[key]) && isEmpty(filters[key])) {
+      removeOperator(key);
+    }
+  }
+
+  return filters;
+};
 
 const convertPublicationStateParams = (type, params = {}, query = {}) => {
   if (!type) {

package/lib/parse-type.js

@@ -57,7 +57,7 @@ const parseDateTimeOrTimestamp = value => {
  * @param {string} options.type - type of the atribute
  * @param {*} options.value - value tu cast
  */
-const parseType = ({ type, value }) => {
+const parseType = ({ type, value, forceCast = false }) => {
   switch (type) {
     case 'boolean': {
       if (typeof value === 'boolean') return value;
@@ -70,6 +70,10 @@ const parseType = ({ type, value }) => {
         return false;
       }
 
+      if (forceCast) {
+        return Boolean(value);
+      }
+
       throw new Error('Invalid boolean input. Expected "t","1","true","false","0","f"');
     }
     case 'integer':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "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": "af0cba8c5b2ba7b371523e8f55413ef0fce98e1e"
+  "gitHead": "669bb2f0440d3b21a23c8d665fdba98bd3d8cc71"
 }