@strapi/content-type-builder 5.0.0-rc.2 → 5.0.0-rc.21

package/dist/server/index.mjs

@@ -1,5 +1,5 @@
 import _, { get, has } from "lodash";
-import { getOr, isUndefined, snakeCase, has as has$1, flatMap } from "lodash/fp";
+import { getOr, snakeCase, isUndefined, has as has$1, flatMap } from "lodash/fp";
 import utils, { errors, strings, contentTypes as contentTypes$2, yup, validateYupSchema } from "@strapi/utils";
 import * as path from "path";
 import path__default, { join } from "path";
@@ -437,7 +437,6 @@ const DEFAULT_TYPES = [
   "relation"
 ];
 const VALID_UID_TARGETS = ["string", "text"];
-const FORBIDDEN_ATTRIBUTE_NAMES = ["__component", "__contentType"];
 const coreUids = {
   STRAPI_USER: "admin::user",
   PREFIX: "strapi::"
@@ -528,7 +527,16 @@ function createComponentBuilder() {
         const attribute = infos.attributes[key];
         if (isRelation(attribute)) {
           if (["manyToMany", "oneToOne"].includes(attribute.relation)) {
-            attribute.dominant = true;
+            if (attribute.target === uid && attribute.targetAttribute !== void 0) {
+              const targetAttribute = infos.attributes[attribute.targetAttribute];
+              if (targetAttribute.dominant === void 0) {
+                attribute.dominant = true;
+              } else {
+                attribute.dominant = false;
+              }
+            } else {
+              attribute.dominant = true;
+            }
           }
           this.setRelation({
             key,
@@ -596,7 +604,16 @@ function createComponentBuilder() {
         const attribute = newAttributes[key];
         if (isRelation(attribute)) {
           if (["manyToMany", "oneToOne"].includes(attribute.relation)) {
-            attribute.dominant = true;
+            if (attribute.target === uid && attribute.targetAttribute !== void 0) {
+              const targetAttribute = newAttributes[attribute.targetAttribute];
+              if (targetAttribute.dominant === void 0) {
+                attribute.dominant = true;
+              } else {
+                attribute.dominant = false;
+              }
+            } else {
+              attribute.dominant = true;
+            }
           }
           this.setRelation({
             key,
@@ -1120,50 +1137,80 @@ const componentCategories$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Obje
   deleteCategory,
   editCategory
 }, Symbol.toStringTag, { value: "Module" }));
+const reservedAttributes = [
+  // TODO: these need to come from a centralized place so we don't break things accidentally in the future and can share them outside the CTB, for example on Strapi bootstrap prior to schema db sync
+  // ID fields
+  "id",
+  "document_id",
+  // Creator fields
+  "created_at",
+  "updated_at",
+  "published_at",
+  "created_by_id",
+  "updated_by_id",
+  // does not actually conflict because the fields are called *_by_id but we'll leave it to avoid confusion
+  "created_by",
+  "updated_by",
+  // Used for Strapi functionality
+  "entry_id",
+  "status",
+  "localizations",
+  "meta",
+  "locale",
+  "__component",
+  "__contentType",
+  // We support ending with * to denote prefixes
+  "strapi*",
+  "_strapi*",
+  "__strapi*"
+];
+const reservedModels = [
+  "boolean",
+  "date",
+  "date_time",
+  "time",
+  "upload",
+  "document",
+  "then",
+  // no longer an issue but still restricting for being a javascript keyword
+  // We support ending with * to denote prefixes
+  "strapi*",
+  "_strapi*",
+  "__strapi*"
+];
 const getReservedNames = () => {
   return {
-    // use kebab case everywhere since singularName and pluralName are validated that way
-    models: [
-      "boolean",
-      "date",
-      "date-time",
-      "time",
-      "upload",
-      "document",
-      "then"
-      // no longer an issue but still restricting for being a javascript keyword
-    ],
-    // attributes are compared with snake_case(name), so only snake_case is needed here and camelCase + UPPER_CASE matches will still be caught
-    attributes: [
-      // TODO: these need to come from a centralized place so we don't break things accidentally in the future and can share them outside the CTB, for example on Strapi bootstrap prior to schema db sync
-      // ID fields
-      "id",
-      "document_id",
-      // Creator fields
-      "created_at",
-      "updated_at",
-      "published_at",
-      "created_by_id",
-      "updated_by_id",
-      // does not actually conflict because the fields are called *_by_id but we'll leave it to avoid confusion
-      "created_by",
-      "updated_by",
-      // Used for Strapi functionality
-      "entry_id",
-      "status",
-      "localizations",
-      "meta",
-      "locale",
-      // TODO: remove these in favor of restricting the strapi_ prefix
-      "strapi",
-      "strapi_stage",
-      "strapi_assignee"
-    ]
+    models: reservedModels,
+    attributes: reservedAttributes
   };
 };
+const isReservedModelName = (name) => {
+  const snakeCaseName = snakeCase(name);
+  if (reservedModels.includes(snakeCaseName)) {
+    return true;
+  }
+  if (reservedModels.filter((key) => key.endsWith("*")).map((key) => key.slice(0, -1)).some((prefix) => snakeCaseName.startsWith(prefix))) {
+    return true;
+  }
+  return false;
+};
+const isReservedAttributeName = (name) => {
+  const snakeCaseName = snakeCase(name);
+  if (reservedAttributes.includes(snakeCaseName)) {
+    return true;
+  }
+  if (reservedAttributes.filter((key) => key.endsWith("*")).map((key) => key.slice(0, -1)).some((prefix) => snakeCaseName.startsWith(prefix))) {
+    return true;
+  }
+  return false;
+};
 const builder$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  getReservedNames
+  getReservedNames,
+  isReservedAttributeName,
+  isReservedModelName,
+  reservedAttributes,
+  reservedModels
 }, Symbol.toStringTag, { value: "Module" }));
 async function clear(uid) {
   const { apiName, modelName } = strapi.contentTypes[uid];
@@ -1626,20 +1673,10 @@ const isConflictingKey = (key, attributes) => {
   });
 };
 const isForbiddenKey = (key) => {
-  const snakeCaseKey = snakeCase(key);
-  const reservedNames = [
-    ...FORBIDDEN_ATTRIBUTE_NAMES,
-    ...getService("builder").getReservedNames().attributes
-  ];
-  return reservedNames.some((reserved) => {
-    return snakeCase(reserved) === snakeCaseKey;
-  });
+  return getService("builder").isReservedAttributeName(key);
 };
 const forbiddenValidator = () => {
-  const reservedNames = [
-    ...FORBIDDEN_ATTRIBUTE_NAMES,
-    ...getService("builder").getReservedNames().attributes
-  ];
+  const reservedNames = [...getService("builder").getReservedNames().attributes];
   return yup.mixed().test({
     name: "forbiddenKeys",
     message: `Attribute keys cannot be one of ${reservedNames.join(", ")}`,
@@ -1907,7 +1944,7 @@ const forbiddenContentTypeNameValidator = () => {
       if (typeof value !== "string") {
         return true;
       }
-      return reservedNames.every((reservedName) => snakeCase(reservedName) !== snakeCase(value));
+      return !getService("builder").isReservedModelName(value);
     }
   };
 };