@strapi/utils 4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8 → 4.10.0-beta.0

package/lib/content-types.js

@@ -82,6 +82,7 @@ const isVisibleAttribute = (model, attributeName) => {
   return getVisibleAttributes(model).includes(attributeName);
 };
 
+const getOptions = (model) => _.assign({ draftAndPublish: false }, _.get(model, 'options', {}));
 const hasDraftAndPublish = (model) => _.get(model, 'options.draftAndPublish', false) === true;
 
 const isDraft = (data, model) =>
@@ -178,6 +179,7 @@ module.exports = {
   getTimestamps,
   isVisibleAttribute,
   hasDraftAndPublish,
+  getOptions,
   isDraft,
   isSingleType,
   isCollectionType,

package/lib/errors.js

@@ -89,6 +89,14 @@ class PolicyError extends ForbiddenError {
   }
 }
 
+class NotImplementedError extends ApplicationError {
+  constructor(message, details) {
+    super(message, details);
+    this.name = 'NotImplementedError';
+    this.message = message || 'This feature is not implemented yet';
+  }
+}
+
 module.exports = {
   HttpError,
   ApplicationError,
@@ -101,4 +109,5 @@ module.exports = {
   RateLimitError,
   PayloadTooLargeError,
   PolicyError,
+  NotImplementedError,
 };

package/lib/sanitize/sanitizers.js

@@ -59,6 +59,12 @@ const defaultSanitizeSort = curry((schema, sort) => {
     // Remove non attribute keys
     traverseQuerySort(
       ({ key, attribute }, { remove }) => {
+        // ID is not an attribute per se, so we need to make
+        // an extra check to ensure we're not removing it
+        if (key === 'id') {
+          return;
+        }
+
         if (!attribute) {
           remove(key);
         }

package/lib/traverse/factory.js

@@ -39,7 +39,8 @@ module.exports = () => {
     for (const key of keys) {
       const attribute =
         schema?.attributes?.[key] ??
-        // look for the attribute when key is in snake_case
+        // FIX: Needed to not break existing behavior on the API.
+        //      It looks for the attribute in the DB metadata when the key is in snake_case
         schema?.attributes?.[strapi.db.metadata.get(schema?.uid).columnToAttribute[key]];
 
       const newPath = { ...path };

package/lib/traverse/query-populate.js

@@ -160,6 +160,8 @@ const populate = traverseFactory()
       const { components } = attribute;
       const { on, ...properties } = value;
 
+      const newValue = {};
+
       // Handle legacy DZ params
       let newProperties = properties;
 
@@ -168,11 +170,15 @@ const populate = traverseFactory()
         newProperties = await recurse(visitor, { schema: componentSchema, path }, newProperties);
       }
 
+      Object.assign(newValue, newProperties);
+
       // Handle new morph fragment syntax
-      const newOn = await recurse(visitor, { schema, path }, { on });
+      if (on) {
+        const newOn = await recurse(visitor, { schema, path }, { on });
 
-      // Recompose both syntaxes
-      const newValue = { ...newOn, ...newProperties };
+        // Recompose both syntaxes
+        Object.assign(newValue, newOn);
+      }
 
       set(key, newValue);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.9.0-exp.90df253ba90fd6879eb56a720a1f80d04ff745b8",
+  "version": "4.10.0-beta.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -46,5 +46,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "366eb8a0d0f06935914854c6d9c4b3fe859468e0"
+  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
 }