@strapi/strapi 4.1.1-alpha.0 → 4.1.3

package/lib/commands/develop.js

@@ -120,7 +120,7 @@ function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
       /(^|[/\\])\../, // dot files
       /tmp/,
       '**/src/admin/**',
-      '**/src/plugins/**/admin/',
+      '**/src/plugins/**/admin/**',
       '**/documentation',
       '**/documentation/**',
       '**/node_modules',

package/lib/core/domain/content-type/validator.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { keyBy, mapValues } = require('lodash');
-const { yup } = require('@strapi/utils');
+const _ = require('lodash');
+const { yup, toRegressedEnumValue, startsWithANumber } = require('@strapi/utils');
 
 const LIFECYCLES = [
   'beforeCreate',
@@ -24,7 +24,7 @@ const LIFECYCLES = [
   'afterDeleteMany',
 ];
 
-const lifecyclesShape = mapValues(keyBy(LIFECYCLES), () =>
+const lifecyclesShape = _.mapValues(_.keyBy(LIFECYCLES), () =>
   yup
     .mixed()
     .nullable()
@@ -47,6 +47,40 @@ const contentTypeSchemaValidator = yup.object().shape({
           .required(),
       })
       .required(),
+    attributes: yup.object().test({
+      name: 'valuesCollide',
+      message: 'Some values collide when normalized',
+      test(attributes) {
+        for (const attrName in attributes) {
+          const attr = attributes[attrName];
+          if (attr.type === 'enumeration') {
+            // should not start by a number
+            if (attr.enum.some(startsWithANumber)) {
+              const message = `Enum values should not start with a number. Please modify your enumeration '${attrName}'.`;
+
+              return this.createError({ message });
+            }
+
+            // should not collide
+            const duplicates = _.uniq(
+              attr.enum
+                .map(toRegressedEnumValue)
+                .filter((value, index, values) => values.indexOf(value) !== index)
+            );
+
+            if (duplicates.length) {
+              const message = `Some enum values of the field '${attrName}' collide when normalized: ${duplicates.join(
+                ', '
+              )}. Please modify your enumeration.`;
+
+              return this.createError({ message });
+            }
+          }
+        }
+
+        return true;
+      },
+    }),
   }),
   actions: yup.object().onlyContainsFunctions(),
   lifecycles: yup

package/lib/services/entity-service/params.js

@@ -17,7 +17,7 @@ const pickSelectionParams = pick(['fields', 'populate']);
 
 const transformParamsToQuery = (uid, params) => {
   // NOTE: can be a CT, a Compo or nothing in the case of polymorphism (DZ & morph relations)
-  const type = strapi.getModel(uid);
+  const schema = strapi.getModel(uid);
 
   const query = {};
 
@@ -32,7 +32,7 @@ const transformParamsToQuery = (uid, params) => {
   }
 
   if (!isNil(filters)) {
-    query.where = convertFiltersQueryParams(filters, type);
+    query.where = convertFiltersQueryParams(filters, schema);
   }
 
   if (!isNil(fields)) {
@@ -40,7 +40,7 @@ const transformParamsToQuery = (uid, params) => {
   }
 
   if (!isNil(populate)) {
-    query.populate = convertPopulateQueryParams(populate);
+    query.populate = convertPopulateQueryParams(populate, schema);
   }
 
   const isPagePagination = !isNil(page) || !isNil(pageSize);
@@ -84,7 +84,7 @@ const transformParamsToQuery = (uid, params) => {
     query.limit = convertLimitQueryParams(limit);
   }
 
-  convertPublicationStateParams(type, params, query);
+  convertPublicationStateParams(schema, params, query);
 
   return query;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.1.1-alpha.0",
+  "version": "4.1.3",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,16 +80,16 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.1.1-alpha.0",
-    "@strapi/database": "4.1.1-alpha.0",
-    "@strapi/generate-new": "4.1.1-alpha.0",
-    "@strapi/generators": "4.1.1-alpha.0",
-    "@strapi/logger": "4.1.1-alpha.0",
-    "@strapi/plugin-content-manager": "4.1.1-alpha.0",
-    "@strapi/plugin-content-type-builder": "4.1.1-alpha.0",
-    "@strapi/plugin-email": "4.1.1-alpha.0",
-    "@strapi/plugin-upload": "4.1.1-alpha.0",
-    "@strapi/utils": "4.1.1-alpha.0",
+    "@strapi/admin": "4.1.3",
+    "@strapi/database": "4.1.3",
+    "@strapi/generate-new": "4.1.3",
+    "@strapi/generators": "4.1.3",
+    "@strapi/logger": "4.1.3",
+    "@strapi/plugin-content-manager": "4.1.3",
+    "@strapi/plugin-content-type-builder": "4.1.3",
+    "@strapi/plugin-email": "4.1.3",
+    "@strapi/plugin-upload": "4.1.3",
+    "@strapi/utils": "4.1.3",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,5 +136,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "bedb04a0cc23719e4eac43e6005fe0fa3d48a9a6"
+  "gitHead": "8549f5aca34f2a72bb477a1b305260f39f271f4e"
 }