@strapi/utils 4.26.0 → 4.26.2

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import _$1, { isString, isPlainObject as isPlainObject$1, kebabCase } from "lodash";
-import { eq, isEmpty, toPath, defaults, trimChars, trimCharsEnd, trimCharsStart, get, isNumber, isInteger, has, union, getOr, assoc, assign, cloneDeep, remove, merge, isNil, pipe, omit, curry, isArray, isString as isString$1, isObject, clone, pick, trim, split, map, flatten, first, join, constant, mergeAll, toNumber } from "lodash/fp";
+import { eq, isEmpty, toPath, defaults, trimChars, trimCharsEnd, trimCharsStart, get, isNumber, isInteger, union, getOr, has, assoc, assign, cloneDeep, remove, merge, isNil, pipe, omit, curry, isArray, isString as isString$1, isObject, clone, pick, trim, split, map, flatten, first, join, constant, toNumber, mergeAll } from "lodash/fp";
 import * as yup$1 from "yup";
 import { HttpError } from "http-errors";
 import slugify from "@sindresorhus/slugify";
@@ -87,8 +87,7 @@ const parseDate = (value2) => {
   }
   try {
     const date = dates.parseISO(value2);
-    if (dates.isValid(date))
-      return dates.format(date, "yyyy-MM-dd");
+    if (dates.isValid(date)) return dates.format(date, "yyyy-MM-dd");
     throw new Error(`Invalid format, expected an ISO compatible date`);
   } catch (error) {
     throw new Error(`Invalid format, expected an ISO compatible date`);
@@ -103,11 +102,9 @@ const parseDateTimeOrTimestamp = (value2) => {
   }
   try {
     const date = dates.parseISO(value2);
-    if (dates.isValid(date))
-      return date;
+    if (dates.isValid(date)) return date;
     const milliUnixDate = dates.parse(value2, "T", /* @__PURE__ */ new Date());
-    if (dates.isValid(milliUnixDate))
-      return milliUnixDate;
+    if (dates.isValid(milliUnixDate)) return milliUnixDate;
     throw new Error(`Invalid format, expected a timestamp or an ISO date`);
   } catch (error) {
     throw new Error(`Invalid format, expected a timestamp or an ISO date`);
@@ -441,12 +438,9 @@ const joinBy = (joint, ...args) => {
   const trimEnd = trimCharsEnd(joint);
   const trimStart = trimCharsStart(joint);
   return args.reduce((url, path, index2) => {
-    if (args.length === 1)
-      return path;
-    if (index2 === 0)
-      return trimEnd(path);
-    if (index2 === args.length - 1)
-      return url + joint + trimStart(path);
+    if (args.length === 1) return path;
+    if (index2 === 0) return trimEnd(path);
+    if (index2 === args.length - 1) return url + joint + trimStart(path);
     return url + joint + trim2(path);
   }, "");
 };
@@ -457,43 +451,33 @@ const regExpToString = RegExp.prototype.toString;
 const symbolToString = typeof Symbol !== "undefined" ? Symbol.prototype.toString : () => "";
 const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/;
 function printNumber(val) {
-  if (val != +val)
-    return "NaN";
+  if (val != +val) return "NaN";
   const isNegativeZero = val === 0 && 1 / val < 0;
   return isNegativeZero ? "-0" : `${val}`;
 }
 function printSimpleValue(val, quoteStrings = false) {
-  if (val == null || val === true || val === false)
-    return `${val}`;
-  if (typeof val === "number")
-    return printNumber(val);
-  if (typeof val === "string")
-    return quoteStrings ? `"${val}"` : val;
-  if (typeof val === "function")
-    return `[Function ${val.name || "anonymous"}]`;
-  if (typeof val === "symbol")
-    return symbolToString.call(val).replace(SYMBOL_REGEXP, "Symbol($1)");
+  if (val == null || val === true || val === false) return `${val}`;
+  if (typeof val === "number") return printNumber(val);
+  if (typeof val === "string") return quoteStrings ? `"${val}"` : val;
+  if (typeof val === "function") return `[Function ${val.name || "anonymous"}]`;
+  if (typeof val === "symbol") return symbolToString.call(val).replace(SYMBOL_REGEXP, "Symbol($1)");
   const tag = toString.call(val).slice(8, -1);
   if (tag === "Date") {
     const v = val;
     return Number.isNaN(v.getTime()) ? `${v}` : v.toISOString();
   }
-  if (tag === "Error" || val instanceof Error)
-    return `[${errorToString.call(val)}]`;
-  if (tag === "RegExp")
-    return regExpToString.call(val);
+  if (tag === "Error" || val instanceof Error) return `[${errorToString.call(val)}]`;
+  if (tag === "RegExp") return regExpToString.call(val);
   return null;
 }
 function printValue(value2, quoteStrings) {
   const result = printSimpleValue(value2, quoteStrings);
-  if (result !== null)
-    return result;
+  if (result !== null) return result;
   return JSON.stringify(
     value2,
     function replacer(key2, value22) {
       const result2 = printSimpleValue(this[key2], quoteStrings);
-      if (result2 !== null)
-        return result2;
+      if (result2 !== null) return result2;
       return value22;
     },
     2
@@ -709,8 +693,7 @@ const getCreatorFields = (model) => {
   return attributes;
 };
 const getNonWritableAttributes = (model) => {
-  if (!model)
-    return [];
+  if (!model) return [];
   const nonWritableAttributes = _$1.reduce(
     model.attributes,
     (acc2, attr, attrName) => attr.writable === false ? acc2.concat(attrName) : acc2,
@@ -719,8 +702,7 @@ const getNonWritableAttributes = (model) => {
   return _$1.uniq([ID_ATTRIBUTE, ...getTimestamps(model), ...nonWritableAttributes]);
 };
 const getWritableAttributes = (model) => {
-  if (!model)
-    return [];
+  if (!model) return [];
   return _$1.difference(Object.keys(model.attributes), getNonWritableAttributes(model));
 };
 const isWritableAttribute = (model, attributeName) => {
@@ -776,8 +758,7 @@ const getComponentAttributes = (schema) => {
   return _$1.reduce(
     schema.attributes,
     (acc2, attr, attrName) => {
-      if (isComponentAttribute(attr))
-        acc2.push(attrName);
+      if (isComponentAttribute(attr)) acc2.push(attrName);
       return acc2;
     },
     []
@@ -787,8 +768,7 @@ const getScalarAttributes = (schema) => {
   return _$1.reduce(
     schema.attributes,
     (acc2, attr, attrName) => {
-      if (isScalarAttribute(attr))
-        acc2.push(attrName);
+      if (isScalarAttribute(attr)) acc2.push(attrName);
       return acc2;
     },
     []
@@ -1181,8 +1161,12 @@ const removeRestrictedRelations = (auth) => async ({ data, key: key2, attribute,
     return;
   }
   const handleMorphRelation = async () => {
+    const elements = data[key2];
+    if (!Array.isArray(elements)) {
+      return;
+    }
     const newMorphValue = [];
-    for (const element of data[key2]) {
+    for (const element of elements) {
       const scopes = ACTIONS_TO_VERIFY$1.map((action) => `${element.__type}.${action}`);
       const isAllowed = await hasAccessToSomeScopes$1(scopes, auth);
       if (isAllowed) {
@@ -2121,7 +2105,9 @@ const createContentAPISanitizers = () => {
       Object.assign(sanitizedQuery, { fields: await sanitizeFields(fields2, schema) });
     }
     if (populate2) {
-      Object.assign(sanitizedQuery, { populate: await sanitizePopulate(populate2, schema) });
+      Object.assign(sanitizedQuery, {
+        populate: await sanitizePopulate(populate2, schema, { auth })
+      });
     }
     return sanitizedQuery;
   };
@@ -2161,7 +2147,26 @@ const createContentAPISanitizers = () => {
     }
     const transforms = [defaultSanitizePopulate(schema)];
     if (auth) {
-      transforms.push(traverseQueryPopulate(removeRestrictedRelations(auth), { schema }));
+      transforms.push(
+        traverseQueryPopulate(removeRestrictedRelations(auth), { schema }),
+        traverseQueryPopulate(
+          async ({ key: key2, value: value2, schema: schema2, attribute }, { set }) => {
+            if (attribute) {
+              return;
+            }
+            if (key2 === "sort") {
+              set(key2, await sanitizeSort(value2, schema2, { auth }));
+            }
+            if (key2 === "filters") {
+              set(key2, await sanitizeFilters(value2, schema2, { auth }));
+            }
+            if (key2 === "fields") {
+              set(key2, await sanitizeFields(value2, schema2));
+            }
+          },
+          { schema }
+        )
+      );
     }
     return pipeAsync(...transforms)(populate2);
   };
@@ -2209,7 +2214,11 @@ const throwRestrictedRelations = (auth) => async ({ data, key: key2, attribute,
     return;
   }
   const handleMorphRelation = async () => {
-    for (const element of data[key2]) {
+    const elements = data[key2];
+    if (!Array.isArray(elements)) {
+      return;
+    }
+    for (const element of elements) {
       const scopes = ACTIONS_TO_VERIFY.map((action) => `${element.__type}.${action}`);
       const isAllowed = await hasAccessToSomeScopes(scopes, auth);
       if (!isAllowed) {
@@ -2408,10 +2417,35 @@ const defaultValidateFields = curry((schema, fields2) => {
     traverseQueryFields(visitor$3, { schema })
   )(fields2);
 });
+const defaultValidatePopulate = curry((schema, populate2) => {
+  if (!schema) {
+    throw new Error("Missing schema in defaultValidatePopulate");
+  }
+  return pipeAsync(
+    traverseQueryPopulate(
+      async ({ key: key2, value: value2, schema: schema2, attribute }) => {
+        if (attribute) {
+          return;
+        }
+        if (key2 === "sort") {
+          await defaultValidateSort(schema2, value2);
+        }
+        if (key2 === "filters") {
+          await defaultValidateFilters(schema2, value2);
+        }
+        if (key2 === "fields") {
+          await defaultValidateFields(schema2, value2);
+        }
+      },
+      { schema }
+    )
+  )(populate2);
+});
 const validators = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   defaultValidateFields,
   defaultValidateFilters,
+  defaultValidatePopulate,
   defaultValidateSort,
   throwPasswords
 }, Symbol.toStringTag, { value: "Module" }));
@@ -2444,7 +2478,7 @@ const createContentAPIValidators = () => {
     if (!schema) {
       throw new Error("Missing schema in validateQuery");
     }
-    const { filters: filters2, sort: sort2, fields: fields2 } = query;
+    const { filters: filters2, sort: sort2, fields: fields2, populate: populate2 } = query;
     if (filters2) {
       await validateFilters(filters2, schema, { auth });
     }
@@ -2454,6 +2488,9 @@ const createContentAPIValidators = () => {
     if (fields2) {
       await validateFields(fields2, schema);
     }
+    if (populate2 && populate2 !== "*") {
+      await validatePopulate(populate2, schema, { auth });
+    }
   };
   const validateFilters = async (filters2, schema, { auth } = {}) => {
     if (!schema) {
@@ -2486,12 +2523,41 @@ const createContentAPIValidators = () => {
     const transforms = [defaultValidateFields(schema)];
     return pipeAsync(...transforms)(fields2);
   };
+  const validatePopulate = async (populate2, schema, { auth } = {}) => {
+    if (!schema) {
+      throw new Error("Missing schema in validatePopulate");
+    }
+    const transforms = [defaultValidatePopulate(schema)];
+    if (auth) {
+      transforms.push(
+        traverseQueryPopulate(
+          async ({ key: key2, value: value2, schema: schema2, attribute }) => {
+            if (attribute) {
+              return;
+            }
+            if (key2 === "sort") {
+              await validateSort(value2, schema2, { auth });
+            }
+            if (key2 === "filters") {
+              await validateFilters(value2, schema2, { auth });
+            }
+            if (key2 === "fields") {
+              await validateFields(value2, schema2);
+            }
+          },
+          { schema }
+        )
+      );
+    }
+    return pipeAsync(...transforms)(populate2);
+  };
   return {
     input: validateInput,
     query: validateQuery,
     filters: validateFilters,
     sort: validateSort,
-    fields: validateFields
+    fields: validateFields,
+    populate: validatePopulate
   };
 };
 const contentAPI = createContentAPIValidators();
@@ -2903,8 +2969,7 @@ const kbytesToBytes = (kbytes) => kbytes * 1e3;
 const bytesToKbytes = (bytes) => Math.round(bytes / 1e3 * 100) / 100;
 const bytesToHumanReadable = (bytes) => {
   const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB"];
-  if (bytes === 0)
-    return "0 Bytes";
+  if (bytes === 0) return "0 Bytes";
   const i = parseInt(`${Math.floor(Math.log(bytes) / Math.log(1e3))}`, 10);
   return `${Math.round(bytes / 1e3 ** i)} ${sizes[i]}`;
 };