@strapi/utils 4.8.1 → 4.8.2

package/lib/env-helper.js

@@ -71,6 +71,26 @@ const utils = {
     const value = process.env[key];
     return new Date(value);
   },
+
+  /**
+   * Gets a value from env that matches oneOf provided values
+   * @param {string} key
+   * @param {string[]} expectedValues
+   * @param {string|undefined} defaultValue
+   * @returns {string|undefined}
+   */
+  oneOf(key, expectedValues, defaultValue) {
+    if (!expectedValues) {
+      throw new Error(`env.oneOf requires expectedValues`);
+    }
+
+    if (defaultValue && !expectedValues.includes(defaultValue)) {
+      throw new Error(`env.oneOf requires defaultValue to be included in expectedValues`);
+    }
+
+    const rawValue = env(key, defaultValue);
+    return expectedValues.includes(rawValue) ? rawValue : defaultValue;
+  },
 };
 
 Object.assign(env, utils);

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.8.1",
+  "version": "4.8.2",
   "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": "b3cb13cb14302ba2ccf2ab6fab774f08efe9f1b7"
+  "gitHead": "cc73bed97b19d44f7c7999ab44f1a4288590d7ab"
 }