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

package/lib/content-types.js

@@ -106,9 +106,10 @@ 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 isMediaAttribute = (attribute) => attribute && attribute.type === 'media';
+const isRelationalAttribute = (attribute) => attribute && attribute.type === 'relation';
+const isComponentAttribute = (attribute) =>
+  attribute && ['component', 'dynamiczone'].includes(attribute.type);
 
 const getComponentAttributes = (schema) => {
   return _.reduce(

package/lib/convert-query-params.js

@@ -49,6 +49,10 @@ const convertCountQueryParams = (countQuery) => {
   return parseType({ type: 'boolean', value: countQuery });
 };
 
+const convertOrderingQueryParams = (ordering) => {
+  return ordering;
+};
+
 /**
  * Sort query parser
  * @param {string} sortQuery - ex: id:asc,price:desc
@@ -248,7 +252,7 @@ const convertNestedPopulate = (subPopulate, schema) => {
   }
 
   // TODO: We will need to consider a way to add limitation / pagination
-  const { sort, filters, fields, populate, count } = subPopulate;
+  const { sort, filters, fields, populate, count, ordering } = subPopulate;
 
   const query = {};
 
@@ -272,6 +276,10 @@ const convertNestedPopulate = (subPopulate, schema) => {
     query.count = convertCountQueryParams(count);
   }
 
+  if (ordering) {
+    query.ordering = convertOrderingQueryParams(ordering);
+  }
+
   return query;
 };
 

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/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/lib/relations.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { isRelationalAttribute } = require('./content-types');
+
 const MANY_RELATIONS = ['oneToMany', 'manyToMany'];
 
 const getRelationalFields = (contentType) => {
@@ -8,8 +10,21 @@ const getRelationalFields = (contentType) => {
   });
 };
 
+const isOneToAny = (attribute) =>
+  isRelationalAttribute(attribute) && ['oneToOne', 'oneToMany'].includes(attribute.relation);
+const isManyToAny = (attribute) =>
+  isRelationalAttribute(attribute) && ['manyToMany', 'manyToOne'].includes(attribute.relation);
+const isAnyToOne = (attribute) =>
+  isRelationalAttribute(attribute) && ['oneToOne', 'manyToOne'].includes(attribute.relation);
+const isAnyToMany = (attribute) =>
+  isRelationalAttribute(attribute) && ['oneToMany', 'manyToMany'].includes(attribute.relation);
+
 module.exports = {
   getRelationalFields,
+  isOneToAny,
+  isManyToAny,
+  isAnyToOne,
+  isAnyToMany,
   constants: {
     MANY_RELATIONS,
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.5.0-alpha.0",
+  "version": "4.5.0-beta.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -45,5 +45,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "c9a98c4dbcf3c4f2a449f8d96e7cbe4cd9b1e0f5"
+  "gitHead": "ee98b9a9cbb6e0e07e781ff9e87eb170c72e50df"
 }