@strapi/utils 4.4.0-alpha.0 → 4.4.0-beta.0

package/lib/build-query.js

@@ -21,7 +21,7 @@ const getAssociationFromFieldKey = ({ model, field }) => {
   let association;
   let attribute;
 
-  for (let i = 0; i < fieldParts.length; i++) {
+  for (let i = 0; i < fieldParts.length; i += 1) {
     const part = fieldParts[i];
     attribute = part;
 

package/lib/content-types.js

@@ -106,6 +106,20 @@ const isPrivateAttribute = (model = {}, attributeName) => {
 const isScalarAttribute = (attribute) => {
   return !['media', 'component', 'relation', 'dynamiczone'].includes(attribute.type);
 };
+const isMediaAttribute = (attribute) => attribute.type === 'media';
+const isRelationalAttribute = (attribute) => attribute.type === 'relation';
+const isComponentAttribute = (attribute) => ['component', 'dynamiczone'].includes(attribute.type);
+
+const getComponentAttributes = (schema) => {
+  return _.reduce(
+    schema.attributes,
+    (acc, attr, attrName) => {
+      if (isComponentAttribute(attr)) acc.push(attrName);
+      return acc;
+    },
+    []
+  );
+};
 
 const getScalarAttributes = (schema) => {
   return _.reduce(
@@ -118,10 +132,6 @@ const getScalarAttributes = (schema) => {
   );
 };
 
-const isMediaAttribute = (attribute) => attribute.type === 'media';
-const isRelationalAttribute = (attribute) => attribute.type === 'relation';
-const isComponentAttribute = (attribute) => ['component', 'dynamiczone'].includes(attribute.type);
-
 /**
  * Checks if an attribute is of type `type`
  * @param {object} attribute
@@ -152,6 +162,7 @@ module.exports = {
   isPrivateAttribute,
   constants,
   getNonWritableAttributes,
+  getComponentAttributes,
   getScalarAttributes,
   getWritableAttributes,
   isWritableAttribute,

package/lib/convert-query-params.js

@@ -174,7 +174,13 @@ const convertPopulateObject = (populate, schema) => {
     if (attribute.type === 'dynamiczone') {
       const populates = attribute.components
         .map((uid) => strapi.getModel(uid))
-        .map((schema) => convertNestedPopulate(subPopulate, schema));
+        .map((schema) => convertNestedPopulate(subPopulate, schema))
+        .map((populate) => (populate === true ? {} : populate)) // cast boolean to empty object to avoid merging issues
+        .filter((populate) => populate !== false);
+
+      if (isEmpty(populates)) {
+        return acc;
+      }
 
       return {
         ...acc,
@@ -203,16 +209,22 @@ const convertPopulateObject = (populate, schema) => {
       return acc;
     }
 
+    const populateObject = convertNestedPopulate(subPopulate, targetSchema);
+
+    if (!populateObject) {
+      return acc;
+    }
+
     return {
       ...acc,
-      [key]: convertNestedPopulate(subPopulate, targetSchema),
+      [key]: populateObject,
     };
   }, {});
 };
 
 const convertNestedPopulate = (subPopulate, schema) => {
-  if (subPopulate === '*') {
-    return true;
+  if (_.isString(subPopulate)) {
+    return parseType({ type: 'boolean', value: subPopulate, forceCast: true });
   }
 
   if (_.isBoolean(subPopulate)) {

package/lib/hooks.js

@@ -2,17 +2,8 @@
 
 const { eq, remove, cloneDeep } = require('lodash/fp');
 
-/**
- * @typedef Hook
- * @property {Array<Function>} _handlers - A registry of handler used by the hook
- * @property {function(Function):Hook} register - Register a new handler into the hook's registry
- * @property {function(Function):Hook} delete- Delete the given handler from the hook's registry
- * @property {Function} call - Not implemented by default, can be replaced by any implementation.
- */
-
 /**
  * Create a default Strapi hook
- * @return {Hook}
  */
 const createHook = () => {
   const state = {
@@ -45,7 +36,6 @@ const createHook = () => {
 /**
  * Create an async series hook.
  * Upon execution, it will execute every handler in order with the same context
- * @return {Hook}
  */
 const createAsyncSeriesHook = () => ({
   ...createHook(),
@@ -60,7 +50,6 @@ const createAsyncSeriesHook = () => ({
 /**
  * Create an async series waterfall hook.
  * Upon execution, it will execute every handler in order and pass the return value of the last handler to the next one
- * @return {Hook}
  */
 const createAsyncSeriesWaterfallHook = () => ({
   ...createHook(),
@@ -79,7 +68,6 @@ const createAsyncSeriesWaterfallHook = () => ({
 /**
  * Create an async parallel hook.
  * Upon execution, it will execute every registered handler in band.
- * @return {Hook}
  */
 const createAsyncParallelHook = () => ({
   ...createHook(),
@@ -91,6 +79,24 @@ const createAsyncParallelHook = () => ({
   },
 });
 
+/**
+ * Create an async parallel hook.
+ * Upon execution, it will execute every registered handler in serie and return the first result found.
+ */
+const createAsyncBailHook = () => ({
+  ...createHook(),
+
+  async call(context) {
+    for (const handler of this.getHandlers()) {
+      const result = await handler(context);
+
+      if (result !== undefined) {
+        return result;
+      }
+    }
+  },
+});
+
 module.exports = {
   // Internal utils
   internals: {
@@ -100,4 +106,5 @@ module.exports = {
   createAsyncSeriesHook,
   createAsyncSeriesWaterfallHook,
   createAsyncParallelHook,
+  createAsyncBailHook,
 };

package/lib/print-value.js

@@ -11,6 +11,7 @@ const symbolToString = typeof Symbol !== 'undefined' ? Symbol.prototype.toString
 const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/;
 
 function printNumber(val) {
+  // eslint-disable-next-line eqeqeq
   if (val != +val) return 'NaN';
   const isNegativeZero = val === 0 && 1 / val < 0;
   return isNegativeZero ? '-0' : `${val}`;

package/lib/provider-factory.js

@@ -25,25 +25,9 @@ const createProviderHooksMap = () => ({
 });
 
 /**
- * A customizable item provider enhanced with register/delete hooks
- * @typedef {Object} Provider
- * @property hooks
- * @property register
- * @property delete
- * @property get
- * @property getWhere
- * @property values
- * @property keys
- * @property has
- * @property size
- * @property clear
- */
-
-/**
- * A {@link Provider} factory
+ * A Provider factory
  * @param {Object} [options] - The factory options
  * @param {boolean = true} options.throwOnDuplicates - Specify the wanted behaviour when encountering a duplicate key on register
- * @return {Provider}
  */
 const providerFactory = (options = {}) => {
   const { throwOnDuplicates = true } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.4.0-alpha.0",
+  "version": "4.4.0-beta.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -42,8 +42,8 @@
     "yup": "0.32.9"
   },
   "engines": {
-    "node": ">=14.19.1 <=16.x.x",
+    "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "fc78298ae4f9b247d636beda568734d5f8ed7b3e"
+  "gitHead": "cae16f7f259fa4473a55e8fea57839cda98f34ae"
 }