@akbarsafari00/bonyan-content-type-builder 5.52.1-fa.2

package/dist/server/controllers/validation/component.js

@@ -0,0 +1,72 @@
+'use strict';
+
+var _ = require('lodash');
+var utils = require('@strapi/utils');
+var constants = require('../../services/constants.js');
+var common = require('./common.js');
+var modelSchema = require('./model-schema.js');
+var dataTransform = require('./data-transform.js');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var ___default = /*#__PURE__*/_interopDefault(_);
+
+const VALID_RELATIONS = [
+    'oneToOne',
+    'oneToMany'
+];
+const VALID_TYPES = [
+    ...constants.DEFAULT_TYPES,
+    'component',
+    'customField'
+];
+const componentSchema = modelSchema.createSchema(VALID_TYPES, VALID_RELATIONS, {
+    modelType: constants.modelTypes.COMPONENT
+}).shape({
+    displayName: utils.yup.string().min(1).required('displayName.required'),
+    icon: utils.yup.string().nullable().test(common.isValidIcon),
+    category: utils.yup.string().nullable().test(common.isValidCategoryName).required('category.required')
+}).required().noUnknown();
+const nestedComponentSchema = utils.yup.array().of(componentSchema.shape({
+    uid: utils.yup.string(),
+    tmpUID: utils.yup.string()
+}).test({
+    name: 'mustHaveUIDOrTmpUID',
+    message: 'Component must have a uid or a tmpUID',
+    test (attr) {
+        if (___default.default.has(attr, 'uid') && ___default.default.has(attr, 'tmpUID')) return false;
+        if (!___default.default.has(attr, 'uid') && !___default.default.has(attr, 'tmpUID')) return false;
+        return true;
+    }
+}).required().noUnknown());
+const componentInputSchema = utils.yup.object({
+    component: componentSchema,
+    components: nestedComponentSchema
+}).noUnknown();
+const validateComponentInput = utils.validateYupSchema(componentInputSchema);
+const updateComponentInputSchema = utils.yup.object({
+    component: componentSchema,
+    components: nestedComponentSchema
+}).noUnknown();
+const validateUpdateComponentInput = (data)=>{
+    if (___default.default.has(data, 'component') && data.component) {
+        dataTransform.removeEmptyDefaults(data.component);
+    }
+    if (___default.default.has(data, 'components') && Array.isArray(data.components)) {
+        data.components.forEach((data)=>{
+            if (___default.default.has(data, 'uid')) {
+                dataTransform.removeEmptyDefaults(data);
+            }
+        });
+    }
+    return utils.validateYupSchema(updateComponentInputSchema)(data);
+};
+
+exports.VALID_RELATIONS = VALID_RELATIONS;
+exports.VALID_TYPES = VALID_TYPES;
+exports.componentInputSchema = componentInputSchema;
+exports.componentSchema = componentSchema;
+exports.nestedComponentSchema = nestedComponentSchema;
+exports.validateComponentInput = validateComponentInput;
+exports.validateUpdateComponentInput = validateUpdateComponentInput;
+//# sourceMappingURL=component.js.map

package/dist/server/controllers/validation/component.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.js","sources":["../../../../server/src/controllers/validation/component.ts"],"sourcesContent":["import _ from 'lodash';\r\nimport { yup, validateYupSchema } from '@strapi/utils';\r\n\r\nimport type { Struct } from '@strapi/types';\r\nimport { modelTypes, DEFAULT_TYPES } from '../../services/constants';\r\nimport { isValidCategoryName, isValidIcon } from './common';\r\nimport { createSchema } from './model-schema';\r\nimport { removeEmptyDefaults } from './data-transform';\r\n\r\nexport const VALID_RELATIONS = ['oneToOne', 'oneToMany'];\r\nexport const VALID_TYPES = [...DEFAULT_TYPES, 'component', 'customField'];\r\n\r\nexport const componentSchema = createSchema(VALID_TYPES, VALID_RELATIONS, {\r\n  modelType: modelTypes.COMPONENT,\r\n})\r\n  .shape({\r\n    displayName: yup.string().min(1).required('displayName.required'),\r\n    icon: yup.string().nullable().test(isValidIcon),\r\n    category: yup.string().nullable().test(isValidCategoryName).required('category.required'),\r\n  })\r\n  .required()\r\n  .noUnknown();\r\n\r\nexport const nestedComponentSchema = yup.array().of(\r\n  componentSchema\r\n    .shape({\r\n      uid: yup.string(),\r\n      tmpUID: yup.string(),\r\n    })\r\n    .test({\r\n      name: 'mustHaveUIDOrTmpUID',\r\n      message: 'Component must have a uid or a tmpUID',\r\n      test(attr: unknown) {\r\n        if (_.has(attr, 'uid') && _.has(attr, 'tmpUID')) return false;\r\n        if (!_.has(attr, 'uid') && !_.has(attr, 'tmpUID')) return false;\r\n        return true;\r\n      },\r\n    })\r\n    .required()\r\n    .noUnknown()\r\n);\r\n\r\nexport const componentInputSchema = yup\r\n  .object({\r\n    component: componentSchema,\r\n    components: nestedComponentSchema,\r\n  })\r\n  .noUnknown();\r\n\r\nexport const validateComponentInput = validateYupSchema(componentInputSchema);\r\n\r\nconst updateComponentInputSchema = yup\r\n  .object({\r\n    component: componentSchema,\r\n    components: nestedComponentSchema,\r\n  })\r\n  .noUnknown();\r\n\r\nexport const validateUpdateComponentInput = (data: {\r\n  component?: Struct.ComponentSchema;\r\n  components?: Struct.ComponentSchema[];\r\n}) => {\r\n  if (_.has(data, 'component') && data.component) {\r\n    removeEmptyDefaults(data.component);\r\n  }\r\n\r\n  if (_.has(data, 'components') && Array.isArray(data.components)) {\r\n    data.components.forEach((data) => {\r\n      if (_.has(data, 'uid')) {\r\n        removeEmptyDefaults(data);\r\n      }\r\n    });\r\n  }\r\n\r\n  return validateYupSchema(updateComponentInputSchema)(data);\r\n};\r\n"],"names":["VALID_RELATIONS","VALID_TYPES","DEFAULT_TYPES","componentSchema","createSchema","modelType","modelTypes","COMPONENT","shape","displayName","yup","string","min","required","icon","nullable","test","isValidIcon","category","isValidCategoryName","noUnknown","nestedComponentSchema","array","of","uid","tmpUID","name","message","attr","_","has","componentInputSchema","object","component","components","validateComponentInput","validateYupSchema","updateComponentInputSchema","validateUpdateComponentInput","data","removeEmptyDefaults","Array","isArray","forEach"],"mappings":"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"}

package/dist/server/controllers/validation/component.mjs

@@ -0,0 +1,60 @@
+import _ from 'lodash';
+import { yup, validateYupSchema } from '@strapi/utils';
+import { modelTypes, DEFAULT_TYPES } from '../../services/constants.mjs';
+import { isValidCategoryName, isValidIcon } from './common.mjs';
+import { createSchema } from './model-schema.mjs';
+import { removeEmptyDefaults } from './data-transform.mjs';
+
+const VALID_RELATIONS = [
+    'oneToOne',
+    'oneToMany'
+];
+const VALID_TYPES = [
+    ...DEFAULT_TYPES,
+    'component',
+    'customField'
+];
+const componentSchema = createSchema(VALID_TYPES, VALID_RELATIONS, {
+    modelType: modelTypes.COMPONENT
+}).shape({
+    displayName: yup.string().min(1).required('displayName.required'),
+    icon: yup.string().nullable().test(isValidIcon),
+    category: yup.string().nullable().test(isValidCategoryName).required('category.required')
+}).required().noUnknown();
+const nestedComponentSchema = yup.array().of(componentSchema.shape({
+    uid: yup.string(),
+    tmpUID: yup.string()
+}).test({
+    name: 'mustHaveUIDOrTmpUID',
+    message: 'Component must have a uid or a tmpUID',
+    test (attr) {
+        if (_.has(attr, 'uid') && _.has(attr, 'tmpUID')) return false;
+        if (!_.has(attr, 'uid') && !_.has(attr, 'tmpUID')) return false;
+        return true;
+    }
+}).required().noUnknown());
+const componentInputSchema = yup.object({
+    component: componentSchema,
+    components: nestedComponentSchema
+}).noUnknown();
+const validateComponentInput = validateYupSchema(componentInputSchema);
+const updateComponentInputSchema = yup.object({
+    component: componentSchema,
+    components: nestedComponentSchema
+}).noUnknown();
+const validateUpdateComponentInput = (data)=>{
+    if (_.has(data, 'component') && data.component) {
+        removeEmptyDefaults(data.component);
+    }
+    if (_.has(data, 'components') && Array.isArray(data.components)) {
+        data.components.forEach((data)=>{
+            if (_.has(data, 'uid')) {
+                removeEmptyDefaults(data);
+            }
+        });
+    }
+    return validateYupSchema(updateComponentInputSchema)(data);
+};
+
+export { VALID_RELATIONS, VALID_TYPES, componentInputSchema, componentSchema, nestedComponentSchema, validateComponentInput, validateUpdateComponentInput };
+//# sourceMappingURL=component.mjs.map

package/dist/server/controllers/validation/component.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.mjs","sources":["../../../../server/src/controllers/validation/component.ts"],"sourcesContent":["import _ from 'lodash';\r\nimport { yup, validateYupSchema } from '@strapi/utils';\r\n\r\nimport type { Struct } from '@strapi/types';\r\nimport { modelTypes, DEFAULT_TYPES } from '../../services/constants';\r\nimport { isValidCategoryName, isValidIcon } from './common';\r\nimport { createSchema } from './model-schema';\r\nimport { removeEmptyDefaults } from './data-transform';\r\n\r\nexport const VALID_RELATIONS = ['oneToOne', 'oneToMany'];\r\nexport const VALID_TYPES = [...DEFAULT_TYPES, 'component', 'customField'];\r\n\r\nexport const componentSchema = createSchema(VALID_TYPES, VALID_RELATIONS, {\r\n  modelType: modelTypes.COMPONENT,\r\n})\r\n  .shape({\r\n    displayName: yup.string().min(1).required('displayName.required'),\r\n    icon: yup.string().nullable().test(isValidIcon),\r\n    category: yup.string().nullable().test(isValidCategoryName).required('category.required'),\r\n  })\r\n  .required()\r\n  .noUnknown();\r\n\r\nexport const nestedComponentSchema = yup.array().of(\r\n  componentSchema\r\n    .shape({\r\n      uid: yup.string(),\r\n      tmpUID: yup.string(),\r\n    })\r\n    .test({\r\n      name: 'mustHaveUIDOrTmpUID',\r\n      message: 'Component must have a uid or a tmpUID',\r\n      test(attr: unknown) {\r\n        if (_.has(attr, 'uid') && _.has(attr, 'tmpUID')) return false;\r\n        if (!_.has(attr, 'uid') && !_.has(attr, 'tmpUID')) return false;\r\n        return true;\r\n      },\r\n    })\r\n    .required()\r\n    .noUnknown()\r\n);\r\n\r\nexport const componentInputSchema = yup\r\n  .object({\r\n    component: componentSchema,\r\n    components: nestedComponentSchema,\r\n  })\r\n  .noUnknown();\r\n\r\nexport const validateComponentInput = validateYupSchema(componentInputSchema);\r\n\r\nconst updateComponentInputSchema = yup\r\n  .object({\r\n    component: componentSchema,\r\n    components: nestedComponentSchema,\r\n  })\r\n  .noUnknown();\r\n\r\nexport const validateUpdateComponentInput = (data: {\r\n  component?: Struct.ComponentSchema;\r\n  components?: Struct.ComponentSchema[];\r\n}) => {\r\n  if (_.has(data, 'component') && data.component) {\r\n    removeEmptyDefaults(data.component);\r\n  }\r\n\r\n  if (_.has(data, 'components') && Array.isArray(data.components)) {\r\n    data.components.forEach((data) => {\r\n      if (_.has(data, 'uid')) {\r\n        removeEmptyDefaults(data);\r\n      }\r\n    });\r\n  }\r\n\r\n  return validateYupSchema(updateComponentInputSchema)(data);\r\n};\r\n"],"names":["VALID_RELATIONS","VALID_TYPES","DEFAULT_TYPES","componentSchema","createSchema","modelType","modelTypes","COMPONENT","shape","displayName","yup","string","min","required","icon","nullable","test","isValidIcon","category","isValidCategoryName","noUnknown","nestedComponentSchema","array","of","uid","tmpUID","name","message","attr","_","has","componentInputSchema","object","component","components","validateComponentInput","validateYupSchema","updateComponentInputSchema","validateUpdateComponentInput","data","removeEmptyDefaults","Array","isArray","forEach"],"mappings":"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"}

package/dist/server/controllers/validation/content-type.js

@@ -0,0 +1,153 @@
+'use strict';
+
+var fp = require('lodash/fp');
+var utils = require('@strapi/utils');
+var index = require('../../utils/index.js');
+var constants = require('../../services/constants.js');
+var modelSchema = require('./model-schema.js');
+var dataTransform = require('./data-transform.js');
+var component = require('./component.js');
+
+/* eslint-disable no-template-curly-in-string */ // yup templates need to be in this format
+/**
+ * Allowed relation per type kind
+ */ const VALID_RELATIONS = {
+    [constants.typeKinds.SINGLE_TYPE]: [
+        'oneToOne',
+        'oneToMany',
+        'morphOne',
+        'morphMany',
+        'morphToOne',
+        'morphToMany'
+    ],
+    [constants.typeKinds.COLLECTION_TYPE]: [
+        'oneToOne',
+        'oneToMany',
+        'manyToOne',
+        'manyToMany',
+        'morphOne',
+        'morphMany',
+        'morphToOne',
+        'morphToMany'
+    ]
+};
+/**
+ * Allowed types
+ */ const VALID_TYPES = [
+    ...constants.DEFAULT_TYPES,
+    'uid',
+    'component',
+    'dynamiczone',
+    'customField'
+];
+/**
+ * Returns a yup schema to validate a content type payload
+ */ const createContentTypeSchema = (data, { isEdition = false } = {})=>{
+    const kind = fp.getOr(constants.typeKinds.COLLECTION_TYPE, 'contentType.kind', data);
+    const contentTypeSchema = modelSchema.createSchema(VALID_TYPES, VALID_RELATIONS[kind] || [], {
+        modelType: constants.modelTypes.CONTENT_TYPE
+    }).shape({
+        displayName: utils.yup.string().min(1).required(),
+        singularName: utils.yup.string().min(1).test(nameIsAvailable(isEdition)).test(forbiddenContentTypeNameValidator()).isKebabCase().required(),
+        pluralName: utils.yup.string().min(1).test(nameIsAvailable(isEdition)).test(nameIsNotExistingCollectionName(isEdition)) // TODO: v5: require singularName to not match a collection name
+        .test(forbiddenContentTypeNameValidator()).isKebabCase().required()
+    }).test('singularName-not-equal-pluralName', '${path}: singularName and pluralName should be different', (value)=>value.singularName !== value.pluralName);
+    return utils.yup.object({
+        // FIXME .noUnknown(false) will strip off the unwanted properties without throwing an error
+        // Why not having .noUnknown() ? Because we want to be able to add options relatable to EE features
+        // without having any reference to them in CE.
+        // Why not handle an "options" object in the content-type ? The admin panel needs lots of rework
+        // to be able to send this options object instead of top-level attributes.
+        // @nathan-pichon 20/02/2023
+        contentType: contentTypeSchema.required().noUnknown(false),
+        components: component.nestedComponentSchema
+    }).noUnknown();
+};
+/**
+ * Validator for content type creation
+ */ const validateContentTypeInput = (data)=>{
+    return utils.validateYupSchema(createContentTypeSchema(data))(data);
+};
+/**
+ * Validator for content type edition
+ */ const validateUpdateContentTypeInput = (data)=>{
+    if (fp.has('contentType', data)) {
+        dataTransform.removeEmptyDefaults(data.contentType);
+        dataTransform.removeDeletedUIDTargetFields(data.contentType);
+    }
+    if (fp.has('components', data) && Array.isArray(data.components)) {
+        data.components.forEach((comp)=>{
+            if (fp.has('uid', comp)) {
+                dataTransform.removeEmptyDefaults(comp);
+            }
+        });
+    }
+    return utils.validateYupSchema(createContentTypeSchema(data, {
+        isEdition: true
+    }))(data);
+};
+const forbiddenContentTypeNameValidator = ()=>{
+    const reservedNames = index.getService('builder').getReservedNames().models;
+    return {
+        name: 'forbiddenContentTypeName',
+        message: `Content Type name cannot be one of ${reservedNames.join(', ')}`,
+        test (value) {
+            if (typeof value !== 'string') {
+                return true;
+            }
+            return !index.getService('builder').isReservedModelName(value);
+        }
+    };
+};
+const nameIsAvailable = (isEdition)=>{
+    // TODO TS: if strapi.contentTypes (ie, ContentTypes) works as an ArrayLike and is used like this, we may want to ensure it is typed so that it can be without using as
+    const usedNames = fp.flatMap((ct)=>{
+        return [
+            ct.info?.singularName,
+            ct.info?.pluralName
+        ];
+    })(strapi.contentTypes);
+    return {
+        name: 'nameAlreadyUsed',
+        message: 'contentType: name `${value}` is already being used by another content type.',
+        test (value) {
+            // don't check on edition
+            if (isEdition) return true;
+            // ignore if not a string (will be caught in another validator)
+            if (typeof value !== 'string') {
+                return true;
+            }
+            // compare snake case to check the actual column names that will be used in the database
+            return usedNames.every((usedName)=>fp.snakeCase(usedName) !== fp.snakeCase(value));
+        }
+    };
+};
+const nameIsNotExistingCollectionName = (isEdition)=>{
+    const usedNames = Object.keys(strapi.contentTypes).map((key)=>strapi.contentTypes[key].collectionName);
+    return {
+        name: 'nameAlreadyUsed',
+        message: 'contentType: name `${value}` is already being used by another content type.',
+        test (value) {
+            // don't check on edition
+            if (isEdition) return true;
+            // ignore if not a string (will be caught in another validator)
+            if (typeof value !== 'string') {
+                return true;
+            }
+            // compare snake case to check the actual column names that will be used in the database
+            return usedNames.every((usedName)=>fp.snakeCase(usedName) !== fp.snakeCase(value));
+        }
+    };
+};
+/**
+ * Validates type kind
+ */ const kindSchema = utils.yup.string().oneOf([
+    constants.typeKinds.SINGLE_TYPE,
+    constants.typeKinds.COLLECTION_TYPE
+]);
+const validateKind = utils.validateYupSchema(kindSchema);
+
+exports.validateContentTypeInput = validateContentTypeInput;
+exports.validateKind = validateKind;
+exports.validateUpdateContentTypeInput = validateUpdateContentTypeInput;
+//# sourceMappingURL=content-type.js.map

package/dist/server/controllers/validation/content-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-type.js","sources":["../../../../server/src/controllers/validation/content-type.ts"],"sourcesContent":["/* eslint-disable no-template-curly-in-string */ // yup templates need to be in this format\r\n\r\nimport { flatMap, getOr, has, snakeCase } from 'lodash/fp';\r\nimport { yup, validateYupSchema } from '@strapi/utils';\r\n\r\nimport type { Struct, Internal, UID } from '@strapi/types';\r\n\r\nimport { getService } from '../../utils';\r\nimport { modelTypes, DEFAULT_TYPES, typeKinds } from '../../services/constants';\r\nimport { createSchema } from './model-schema';\r\nimport { removeEmptyDefaults, removeDeletedUIDTargetFields } from './data-transform';\r\nimport { nestedComponentSchema } from './component';\r\n\r\n// Input flattens some fields of the \"info\" into the root type\r\nexport type CreateContentTypeInput = {\r\n  uid?: UID.ContentType;\r\n  contentType?: Partial<Struct.ContentTypeSchema> & Partial<Struct.ContentTypeSchemaInfo>;\r\n  components?: Array<\r\n    Partial<Struct.ComponentSchema> &\r\n      Partial<Struct.SchemaInfo> & { tmpUID?: Internal.UID.Component }\r\n  >;\r\n  singularName: Struct.ContentTypeSchemaInfo['singularName'];\r\n  attributes: Struct.SchemaAttributes & Record<string, any>;\r\n  kind: Struct.ContentTypeKind;\r\n  collectionName?: Struct.CollectionTypeSchema['collectionName'];\r\n  pluralName: Struct.ContentTypeSchemaInfo['pluralName'];\r\n  displayName: Struct.ContentTypeSchemaInfo['displayName'];\r\n  description?: Struct.ContentTypeSchemaInfo['description'];\r\n  options?: Struct.SchemaOptions;\r\n  draftAndPublish?: Struct.SchemaOptions['draftAndPublish'];\r\n  pluginOptions?: Struct.ContentTypeSchema['pluginOptions'];\r\n  config?: object;\r\n  plugin?: string;\r\n};\r\n\r\n/**\r\n * Allowed relation per type kind\r\n */\r\nconst VALID_RELATIONS = {\r\n  [typeKinds.SINGLE_TYPE]: [\r\n    'oneToOne',\r\n    'oneToMany',\r\n    'morphOne',\r\n    'morphMany',\r\n    'morphToOne',\r\n    'morphToMany',\r\n  ],\r\n  [typeKinds.COLLECTION_TYPE]: [\r\n    'oneToOne',\r\n    'oneToMany',\r\n    'manyToOne',\r\n    'manyToMany',\r\n    'morphOne',\r\n    'morphMany',\r\n    'morphToOne',\r\n    'morphToMany',\r\n  ],\r\n} as const;\r\n\r\n/**\r\n * Allowed types\r\n */\r\nconst VALID_TYPES = [...DEFAULT_TYPES, 'uid', 'component', 'dynamiczone', 'customField'];\r\n\r\n/**\r\n * Returns a yup schema to validate a content type payload\r\n */\r\nconst createContentTypeSchema = (data: CreateContentTypeInput, { isEdition = false } = {}) => {\r\n  const kind: keyof typeof VALID_RELATIONS = getOr(\r\n    typeKinds.COLLECTION_TYPE,\r\n    'contentType.kind',\r\n    data\r\n  );\r\n\r\n  const contentTypeSchema = createSchema(VALID_TYPES, VALID_RELATIONS[kind] || [], {\r\n    modelType: modelTypes.CONTENT_TYPE,\r\n  })\r\n    .shape({\r\n      displayName: yup.string().min(1).required(),\r\n      singularName: yup\r\n        .string()\r\n        .min(1)\r\n        .test(nameIsAvailable(isEdition))\r\n        .test(forbiddenContentTypeNameValidator())\r\n        .isKebabCase()\r\n        .required(),\r\n      pluralName: yup\r\n        .string()\r\n        .min(1)\r\n        .test(nameIsAvailable(isEdition))\r\n        .test(nameIsNotExistingCollectionName(isEdition)) // TODO: v5: require singularName to not match a collection name\r\n        .test(forbiddenContentTypeNameValidator())\r\n        .isKebabCase()\r\n        .required(),\r\n    })\r\n    .test(\r\n      'singularName-not-equal-pluralName',\r\n      '${path}: singularName and pluralName should be different',\r\n      (value) => value.singularName !== value.pluralName\r\n    );\r\n\r\n  return yup\r\n    .object({\r\n      // FIXME .noUnknown(false) will strip off the unwanted properties without throwing an error\r\n      // Why not having .noUnknown() ? Because we want to be able to add options relatable to EE features\r\n      // without having any reference to them in CE.\r\n      // Why not handle an \"options\" object in the content-type ? The admin panel needs lots of rework\r\n      // to be able to send this options object instead of top-level attributes.\r\n      // @nathan-pichon 20/02/2023\r\n      contentType: contentTypeSchema.required().noUnknown(false),\r\n      components: nestedComponentSchema,\r\n    })\r\n    .noUnknown();\r\n};\r\n\r\n/**\r\n * Validator for content type creation\r\n */\r\nexport const validateContentTypeInput = (data: CreateContentTypeInput) => {\r\n  return validateYupSchema(createContentTypeSchema(data))(data);\r\n};\r\n\r\n/**\r\n * Validator for content type edition\r\n */\r\nexport const validateUpdateContentTypeInput = (data: CreateContentTypeInput) => {\r\n  if (has('contentType', data)) {\r\n    removeEmptyDefaults(data.contentType);\r\n    removeDeletedUIDTargetFields(data.contentType as Struct.ContentTypeSchema);\r\n  }\r\n\r\n  if (has('components', data) && Array.isArray(data.components)) {\r\n    data.components.forEach((comp) => {\r\n      if (has('uid', comp)) {\r\n        removeEmptyDefaults(comp as Struct.ComponentSchema);\r\n      }\r\n    });\r\n  }\r\n\r\n  return validateYupSchema(createContentTypeSchema(data, { isEdition: true }))(data);\r\n};\r\n\r\nconst forbiddenContentTypeNameValidator = () => {\r\n  const reservedNames = getService('builder').getReservedNames().models;\r\n\r\n  return {\r\n    name: 'forbiddenContentTypeName',\r\n    message: `Content Type name cannot be one of ${reservedNames.join(', ')}`,\r\n    test(value: unknown) {\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      return !getService('builder').isReservedModelName(value);\r\n    },\r\n  };\r\n};\r\n\r\nconst nameIsAvailable = (isEdition: boolean) => {\r\n  // TODO TS: if strapi.contentTypes (ie, ContentTypes) works as an ArrayLike and is used like this, we may want to ensure it is typed so that it can be without using as\r\n  const usedNames = flatMap((ct: Struct.ContentTypeSchema) => {\r\n    return [ct.info?.singularName, ct.info?.pluralName];\r\n  })(strapi.contentTypes as any);\r\n\r\n  return {\r\n    name: 'nameAlreadyUsed',\r\n    message: 'contentType: name `${value}` is already being used by another content type.',\r\n    test(value: unknown) {\r\n      // don't check on edition\r\n      if (isEdition) return true;\r\n\r\n      // ignore if not a string (will be caught in another validator)\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      // compare snake case to check the actual column names that will be used in the database\r\n      return usedNames.every((usedName) => snakeCase(usedName) !== snakeCase(value));\r\n    },\r\n  };\r\n};\r\n\r\nconst nameIsNotExistingCollectionName = (isEdition: boolean) => {\r\n  const usedNames = Object.keys(strapi.contentTypes).map(\r\n    (key) => strapi.contentTypes[key as Internal.UID.ContentType].collectionName\r\n  ) as string[];\r\n\r\n  return {\r\n    name: 'nameAlreadyUsed',\r\n    message: 'contentType: name `${value}` is already being used by another content type.',\r\n    test(value: unknown) {\r\n      // don't check on edition\r\n      if (isEdition) return true;\r\n\r\n      // ignore if not a string (will be caught in another validator)\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      // compare snake case to check the actual column names that will be used in the database\r\n      return usedNames.every((usedName) => snakeCase(usedName) !== snakeCase(value));\r\n    },\r\n  };\r\n};\r\n\r\n/**\r\n * Validates type kind\r\n */\r\nconst kindSchema = yup.string().oneOf([typeKinds.SINGLE_TYPE, typeKinds.COLLECTION_TYPE]);\r\n\r\nexport const validateKind = validateYupSchema(kindSchema);\r\n"],"names":["VALID_RELATIONS","typeKinds","SINGLE_TYPE","COLLECTION_TYPE","VALID_TYPES","DEFAULT_TYPES","createContentTypeSchema","data","isEdition","kind","getOr","contentTypeSchema","createSchema","modelType","modelTypes","CONTENT_TYPE","shape","displayName","yup","string","min","required","singularName","test","nameIsAvailable","forbiddenContentTypeNameValidator","isKebabCase","pluralName","nameIsNotExistingCollectionName","value","object","contentType","noUnknown","components","nestedComponentSchema","validateContentTypeInput","validateYupSchema","validateUpdateContentTypeInput","has","removeEmptyDefaults","removeDeletedUIDTargetFields","Array","isArray","forEach","comp","reservedNames","getService","getReservedNames","models","name","message","join","isReservedModelName","usedNames","flatMap","ct","info","strapi","contentTypes","every","usedName","snakeCase","Object","keys","map","key","collectionName","kindSchema","oneOf","validateKind"],"mappings":"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"}

package/dist/server/controllers/validation/content-type.mjs

@@ -0,0 +1,149 @@
+import { has, getOr, flatMap, snakeCase } from 'lodash/fp';
+import { yup, validateYupSchema } from '@strapi/utils';
+import { getService } from '../../utils/index.mjs';
+import { typeKinds, modelTypes, DEFAULT_TYPES } from '../../services/constants.mjs';
+import { createSchema } from './model-schema.mjs';
+import { removeEmptyDefaults, removeDeletedUIDTargetFields } from './data-transform.mjs';
+import { nestedComponentSchema } from './component.mjs';
+
+/* eslint-disable no-template-curly-in-string */ // yup templates need to be in this format
+/**
+ * Allowed relation per type kind
+ */ const VALID_RELATIONS = {
+    [typeKinds.SINGLE_TYPE]: [
+        'oneToOne',
+        'oneToMany',
+        'morphOne',
+        'morphMany',
+        'morphToOne',
+        'morphToMany'
+    ],
+    [typeKinds.COLLECTION_TYPE]: [
+        'oneToOne',
+        'oneToMany',
+        'manyToOne',
+        'manyToMany',
+        'morphOne',
+        'morphMany',
+        'morphToOne',
+        'morphToMany'
+    ]
+};
+/**
+ * Allowed types
+ */ const VALID_TYPES = [
+    ...DEFAULT_TYPES,
+    'uid',
+    'component',
+    'dynamiczone',
+    'customField'
+];
+/**
+ * Returns a yup schema to validate a content type payload
+ */ const createContentTypeSchema = (data, { isEdition = false } = {})=>{
+    const kind = getOr(typeKinds.COLLECTION_TYPE, 'contentType.kind', data);
+    const contentTypeSchema = createSchema(VALID_TYPES, VALID_RELATIONS[kind] || [], {
+        modelType: modelTypes.CONTENT_TYPE
+    }).shape({
+        displayName: yup.string().min(1).required(),
+        singularName: yup.string().min(1).test(nameIsAvailable(isEdition)).test(forbiddenContentTypeNameValidator()).isKebabCase().required(),
+        pluralName: yup.string().min(1).test(nameIsAvailable(isEdition)).test(nameIsNotExistingCollectionName(isEdition)) // TODO: v5: require singularName to not match a collection name
+        .test(forbiddenContentTypeNameValidator()).isKebabCase().required()
+    }).test('singularName-not-equal-pluralName', '${path}: singularName and pluralName should be different', (value)=>value.singularName !== value.pluralName);
+    return yup.object({
+        // FIXME .noUnknown(false) will strip off the unwanted properties without throwing an error
+        // Why not having .noUnknown() ? Because we want to be able to add options relatable to EE features
+        // without having any reference to them in CE.
+        // Why not handle an "options" object in the content-type ? The admin panel needs lots of rework
+        // to be able to send this options object instead of top-level attributes.
+        // @nathan-pichon 20/02/2023
+        contentType: contentTypeSchema.required().noUnknown(false),
+        components: nestedComponentSchema
+    }).noUnknown();
+};
+/**
+ * Validator for content type creation
+ */ const validateContentTypeInput = (data)=>{
+    return validateYupSchema(createContentTypeSchema(data))(data);
+};
+/**
+ * Validator for content type edition
+ */ const validateUpdateContentTypeInput = (data)=>{
+    if (has('contentType', data)) {
+        removeEmptyDefaults(data.contentType);
+        removeDeletedUIDTargetFields(data.contentType);
+    }
+    if (has('components', data) && Array.isArray(data.components)) {
+        data.components.forEach((comp)=>{
+            if (has('uid', comp)) {
+                removeEmptyDefaults(comp);
+            }
+        });
+    }
+    return validateYupSchema(createContentTypeSchema(data, {
+        isEdition: true
+    }))(data);
+};
+const forbiddenContentTypeNameValidator = ()=>{
+    const reservedNames = getService('builder').getReservedNames().models;
+    return {
+        name: 'forbiddenContentTypeName',
+        message: `Content Type name cannot be one of ${reservedNames.join(', ')}`,
+        test (value) {
+            if (typeof value !== 'string') {
+                return true;
+            }
+            return !getService('builder').isReservedModelName(value);
+        }
+    };
+};
+const nameIsAvailable = (isEdition)=>{
+    // TODO TS: if strapi.contentTypes (ie, ContentTypes) works as an ArrayLike and is used like this, we may want to ensure it is typed so that it can be without using as
+    const usedNames = flatMap((ct)=>{
+        return [
+            ct.info?.singularName,
+            ct.info?.pluralName
+        ];
+    })(strapi.contentTypes);
+    return {
+        name: 'nameAlreadyUsed',
+        message: 'contentType: name `${value}` is already being used by another content type.',
+        test (value) {
+            // don't check on edition
+            if (isEdition) return true;
+            // ignore if not a string (will be caught in another validator)
+            if (typeof value !== 'string') {
+                return true;
+            }
+            // compare snake case to check the actual column names that will be used in the database
+            return usedNames.every((usedName)=>snakeCase(usedName) !== snakeCase(value));
+        }
+    };
+};
+const nameIsNotExistingCollectionName = (isEdition)=>{
+    const usedNames = Object.keys(strapi.contentTypes).map((key)=>strapi.contentTypes[key].collectionName);
+    return {
+        name: 'nameAlreadyUsed',
+        message: 'contentType: name `${value}` is already being used by another content type.',
+        test (value) {
+            // don't check on edition
+            if (isEdition) return true;
+            // ignore if not a string (will be caught in another validator)
+            if (typeof value !== 'string') {
+                return true;
+            }
+            // compare snake case to check the actual column names that will be used in the database
+            return usedNames.every((usedName)=>snakeCase(usedName) !== snakeCase(value));
+        }
+    };
+};
+/**
+ * Validates type kind
+ */ const kindSchema = yup.string().oneOf([
+    typeKinds.SINGLE_TYPE,
+    typeKinds.COLLECTION_TYPE
+]);
+const validateKind = validateYupSchema(kindSchema);
+
+export { validateContentTypeInput, validateKind, validateUpdateContentTypeInput };
+//# sourceMappingURL=content-type.mjs.map

package/dist/server/controllers/validation/content-type.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-type.mjs","sources":["../../../../server/src/controllers/validation/content-type.ts"],"sourcesContent":["/* eslint-disable no-template-curly-in-string */ // yup templates need to be in this format\r\n\r\nimport { flatMap, getOr, has, snakeCase } from 'lodash/fp';\r\nimport { yup, validateYupSchema } from '@strapi/utils';\r\n\r\nimport type { Struct, Internal, UID } from '@strapi/types';\r\n\r\nimport { getService } from '../../utils';\r\nimport { modelTypes, DEFAULT_TYPES, typeKinds } from '../../services/constants';\r\nimport { createSchema } from './model-schema';\r\nimport { removeEmptyDefaults, removeDeletedUIDTargetFields } from './data-transform';\r\nimport { nestedComponentSchema } from './component';\r\n\r\n// Input flattens some fields of the \"info\" into the root type\r\nexport type CreateContentTypeInput = {\r\n  uid?: UID.ContentType;\r\n  contentType?: Partial<Struct.ContentTypeSchema> & Partial<Struct.ContentTypeSchemaInfo>;\r\n  components?: Array<\r\n    Partial<Struct.ComponentSchema> &\r\n      Partial<Struct.SchemaInfo> & { tmpUID?: Internal.UID.Component }\r\n  >;\r\n  singularName: Struct.ContentTypeSchemaInfo['singularName'];\r\n  attributes: Struct.SchemaAttributes & Record<string, any>;\r\n  kind: Struct.ContentTypeKind;\r\n  collectionName?: Struct.CollectionTypeSchema['collectionName'];\r\n  pluralName: Struct.ContentTypeSchemaInfo['pluralName'];\r\n  displayName: Struct.ContentTypeSchemaInfo['displayName'];\r\n  description?: Struct.ContentTypeSchemaInfo['description'];\r\n  options?: Struct.SchemaOptions;\r\n  draftAndPublish?: Struct.SchemaOptions['draftAndPublish'];\r\n  pluginOptions?: Struct.ContentTypeSchema['pluginOptions'];\r\n  config?: object;\r\n  plugin?: string;\r\n};\r\n\r\n/**\r\n * Allowed relation per type kind\r\n */\r\nconst VALID_RELATIONS = {\r\n  [typeKinds.SINGLE_TYPE]: [\r\n    'oneToOne',\r\n    'oneToMany',\r\n    'morphOne',\r\n    'morphMany',\r\n    'morphToOne',\r\n    'morphToMany',\r\n  ],\r\n  [typeKinds.COLLECTION_TYPE]: [\r\n    'oneToOne',\r\n    'oneToMany',\r\n    'manyToOne',\r\n    'manyToMany',\r\n    'morphOne',\r\n    'morphMany',\r\n    'morphToOne',\r\n    'morphToMany',\r\n  ],\r\n} as const;\r\n\r\n/**\r\n * Allowed types\r\n */\r\nconst VALID_TYPES = [...DEFAULT_TYPES, 'uid', 'component', 'dynamiczone', 'customField'];\r\n\r\n/**\r\n * Returns a yup schema to validate a content type payload\r\n */\r\nconst createContentTypeSchema = (data: CreateContentTypeInput, { isEdition = false } = {}) => {\r\n  const kind: keyof typeof VALID_RELATIONS = getOr(\r\n    typeKinds.COLLECTION_TYPE,\r\n    'contentType.kind',\r\n    data\r\n  );\r\n\r\n  const contentTypeSchema = createSchema(VALID_TYPES, VALID_RELATIONS[kind] || [], {\r\n    modelType: modelTypes.CONTENT_TYPE,\r\n  })\r\n    .shape({\r\n      displayName: yup.string().min(1).required(),\r\n      singularName: yup\r\n        .string()\r\n        .min(1)\r\n        .test(nameIsAvailable(isEdition))\r\n        .test(forbiddenContentTypeNameValidator())\r\n        .isKebabCase()\r\n        .required(),\r\n      pluralName: yup\r\n        .string()\r\n        .min(1)\r\n        .test(nameIsAvailable(isEdition))\r\n        .test(nameIsNotExistingCollectionName(isEdition)) // TODO: v5: require singularName to not match a collection name\r\n        .test(forbiddenContentTypeNameValidator())\r\n        .isKebabCase()\r\n        .required(),\r\n    })\r\n    .test(\r\n      'singularName-not-equal-pluralName',\r\n      '${path}: singularName and pluralName should be different',\r\n      (value) => value.singularName !== value.pluralName\r\n    );\r\n\r\n  return yup\r\n    .object({\r\n      // FIXME .noUnknown(false) will strip off the unwanted properties without throwing an error\r\n      // Why not having .noUnknown() ? Because we want to be able to add options relatable to EE features\r\n      // without having any reference to them in CE.\r\n      // Why not handle an \"options\" object in the content-type ? The admin panel needs lots of rework\r\n      // to be able to send this options object instead of top-level attributes.\r\n      // @nathan-pichon 20/02/2023\r\n      contentType: contentTypeSchema.required().noUnknown(false),\r\n      components: nestedComponentSchema,\r\n    })\r\n    .noUnknown();\r\n};\r\n\r\n/**\r\n * Validator for content type creation\r\n */\r\nexport const validateContentTypeInput = (data: CreateContentTypeInput) => {\r\n  return validateYupSchema(createContentTypeSchema(data))(data);\r\n};\r\n\r\n/**\r\n * Validator for content type edition\r\n */\r\nexport const validateUpdateContentTypeInput = (data: CreateContentTypeInput) => {\r\n  if (has('contentType', data)) {\r\n    removeEmptyDefaults(data.contentType);\r\n    removeDeletedUIDTargetFields(data.contentType as Struct.ContentTypeSchema);\r\n  }\r\n\r\n  if (has('components', data) && Array.isArray(data.components)) {\r\n    data.components.forEach((comp) => {\r\n      if (has('uid', comp)) {\r\n        removeEmptyDefaults(comp as Struct.ComponentSchema);\r\n      }\r\n    });\r\n  }\r\n\r\n  return validateYupSchema(createContentTypeSchema(data, { isEdition: true }))(data);\r\n};\r\n\r\nconst forbiddenContentTypeNameValidator = () => {\r\n  const reservedNames = getService('builder').getReservedNames().models;\r\n\r\n  return {\r\n    name: 'forbiddenContentTypeName',\r\n    message: `Content Type name cannot be one of ${reservedNames.join(', ')}`,\r\n    test(value: unknown) {\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      return !getService('builder').isReservedModelName(value);\r\n    },\r\n  };\r\n};\r\n\r\nconst nameIsAvailable = (isEdition: boolean) => {\r\n  // TODO TS: if strapi.contentTypes (ie, ContentTypes) works as an ArrayLike and is used like this, we may want to ensure it is typed so that it can be without using as\r\n  const usedNames = flatMap((ct: Struct.ContentTypeSchema) => {\r\n    return [ct.info?.singularName, ct.info?.pluralName];\r\n  })(strapi.contentTypes as any);\r\n\r\n  return {\r\n    name: 'nameAlreadyUsed',\r\n    message: 'contentType: name `${value}` is already being used by another content type.',\r\n    test(value: unknown) {\r\n      // don't check on edition\r\n      if (isEdition) return true;\r\n\r\n      // ignore if not a string (will be caught in another validator)\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      // compare snake case to check the actual column names that will be used in the database\r\n      return usedNames.every((usedName) => snakeCase(usedName) !== snakeCase(value));\r\n    },\r\n  };\r\n};\r\n\r\nconst nameIsNotExistingCollectionName = (isEdition: boolean) => {\r\n  const usedNames = Object.keys(strapi.contentTypes).map(\r\n    (key) => strapi.contentTypes[key as Internal.UID.ContentType].collectionName\r\n  ) as string[];\r\n\r\n  return {\r\n    name: 'nameAlreadyUsed',\r\n    message: 'contentType: name `${value}` is already being used by another content type.',\r\n    test(value: unknown) {\r\n      // don't check on edition\r\n      if (isEdition) return true;\r\n\r\n      // ignore if not a string (will be caught in another validator)\r\n      if (typeof value !== 'string') {\r\n        return true;\r\n      }\r\n\r\n      // compare snake case to check the actual column names that will be used in the database\r\n      return usedNames.every((usedName) => snakeCase(usedName) !== snakeCase(value));\r\n    },\r\n  };\r\n};\r\n\r\n/**\r\n * Validates type kind\r\n */\r\nconst kindSchema = yup.string().oneOf([typeKinds.SINGLE_TYPE, typeKinds.COLLECTION_TYPE]);\r\n\r\nexport const validateKind = validateYupSchema(kindSchema);\r\n"],"names":["VALID_RELATIONS","typeKinds","SINGLE_TYPE","COLLECTION_TYPE","VALID_TYPES","DEFAULT_TYPES","createContentTypeSchema","data","isEdition","kind","getOr","contentTypeSchema","createSchema","modelType","modelTypes","CONTENT_TYPE","shape","displayName","yup","string","min","required","singularName","test","nameIsAvailable","forbiddenContentTypeNameValidator","isKebabCase","pluralName","nameIsNotExistingCollectionName","value","object","contentType","noUnknown","components","nestedComponentSchema","validateContentTypeInput","validateYupSchema","validateUpdateContentTypeInput","has","removeEmptyDefaults","removeDeletedUIDTargetFields","Array","isArray","forEach","comp","reservedNames","getService","getReservedNames","models","name","message","join","isReservedModelName","usedNames","flatMap","ct","info","strapi","contentTypes","every","usedName","snakeCase","Object","keys","map","key","collectionName","kindSchema","oneOf","validateKind"],"mappings":"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"}

package/dist/server/controllers/validation/data-transform.js

@@ -0,0 +1,31 @@
+'use strict';
+
+var _ = require('lodash');
+var typeguards = require('../../utils/typeguards.js');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var ___default = /*#__PURE__*/_interopDefault(_);
+
+const removeEmptyDefaults = (data)=>{
+    const { attributes } = data || {};
+    Object.keys(attributes).forEach((attributeName)=>{
+        const attribute = attributes[attributeName];
+        if (typeguards.hasDefaultAttribute(attribute) && attribute.default === '') {
+            attribute.default = undefined;
+        }
+    });
+};
+const removeDeletedUIDTargetFields = (data)=>{
+    if (___default.default.has(data, 'attributes')) {
+        Object.values(data.attributes).forEach((attribute)=>{
+            if (attribute.type === 'uid' && !___default.default.isUndefined(attribute.targetField) && !___default.default.has(data.attributes, attribute.targetField)) {
+                attribute.targetField = undefined;
+            }
+        });
+    }
+};
+
+exports.removeDeletedUIDTargetFields = removeDeletedUIDTargetFields;
+exports.removeEmptyDefaults = removeEmptyDefaults;
+//# sourceMappingURL=data-transform.js.map

package/dist/server/controllers/validation/data-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-transform.js","sources":["../../../../server/src/controllers/validation/data-transform.ts"],"sourcesContent":["import type { Struct } from '@strapi/types';\r\nimport _ from 'lodash';\r\nimport { hasDefaultAttribute } from '../../utils/typeguards';\r\n\r\nexport const removeEmptyDefaults = (\r\n  data: Partial<Struct.ContentTypeSchema> | Partial<Struct.ComponentSchema> | undefined\r\n) => {\r\n  const { attributes } = data || {};\r\n\r\n  Object.keys(attributes!).forEach((attributeName) => {\r\n    const attribute = attributes![attributeName];\r\n\r\n    if (hasDefaultAttribute(attribute) && attribute.default === '') {\r\n      attribute.default = undefined;\r\n    }\r\n  });\r\n};\r\n\r\nexport const removeDeletedUIDTargetFields = (data: Struct.ContentTypeSchema) => {\r\n  if (_.has(data, 'attributes')) {\r\n    Object.values(data.attributes).forEach((attribute) => {\r\n      if (\r\n        attribute.type === 'uid' &&\r\n        !_.isUndefined(attribute.targetField) &&\r\n        !_.has(data.attributes, attribute.targetField)\r\n      ) {\r\n        attribute.targetField = undefined;\r\n      }\r\n    });\r\n  }\r\n};\r\n"],"names":["removeEmptyDefaults","data","attributes","Object","keys","forEach","attributeName","attribute","hasDefaultAttribute","default","undefined","removeDeletedUIDTargetFields","_","has","values","type","isUndefined","targetField"],"mappings":";;;;;;;;;AAIO,MAAMA,sBAAsB,CACjCC,IAAAA,GAAAA;AAEA,IAAA,MAAM,EAAEC,UAAU,EAAE,GAAGD,QAAQ,EAAC;AAEhCE,IAAAA,MAAAA,CAAOC,IAAI,CAACF,UAAAA,CAAAA,CAAaG,OAAO,CAAC,CAACC,aAAAA,GAAAA;QAChC,MAAMC,SAAAA,GAAYL,UAAW,CAACI,aAAAA,CAAc;AAE5C,QAAA,IAAIE,8BAAAA,CAAoBD,SAAAA,CAAAA,IAAcA,SAAAA,CAAUE,OAAO,KAAK,EAAA,EAAI;AAC9DF,YAAAA,SAAAA,CAAUE,OAAO,GAAGC,SAAAA;AACtB,QAAA;AACF,IAAA,CAAA,CAAA;AACF;AAEO,MAAMC,+BAA+B,CAACV,IAAAA,GAAAA;AAC3C,IAAA,IAAIW,kBAAAA,CAAEC,GAAG,CAACZ,IAAAA,EAAM,YAAA,CAAA,EAAe;AAC7BE,QAAAA,MAAAA,CAAOW,MAAM,CAACb,IAAAA,CAAKC,UAAU,CAAA,CAAEG,OAAO,CAAC,CAACE,SAAAA,GAAAA;YACtC,IACEA,SAAAA,CAAUQ,IAAI,KAAK,KAAA,IACnB,CAACH,kBAAAA,CAAEI,WAAW,CAACT,SAAAA,CAAUU,WAAW,KACpC,CAACL,kBAAAA,CAAEC,GAAG,CAACZ,IAAAA,CAAKC,UAAU,EAAEK,SAAAA,CAAUU,WAAW,CAAA,EAC7C;AACAV,gBAAAA,SAAAA,CAAUU,WAAW,GAAGP,SAAAA;AAC1B,YAAA;AACF,QAAA,CAAA,CAAA;AACF,IAAA;AACF;;;;;"}

package/dist/server/controllers/validation/data-transform.mjs

@@ -0,0 +1,24 @@
+import _ from 'lodash';
+import { hasDefaultAttribute } from '../../utils/typeguards.mjs';
+
+const removeEmptyDefaults = (data)=>{
+    const { attributes } = data || {};
+    Object.keys(attributes).forEach((attributeName)=>{
+        const attribute = attributes[attributeName];
+        if (hasDefaultAttribute(attribute) && attribute.default === '') {
+            attribute.default = undefined;
+        }
+    });
+};
+const removeDeletedUIDTargetFields = (data)=>{
+    if (_.has(data, 'attributes')) {
+        Object.values(data.attributes).forEach((attribute)=>{
+            if (attribute.type === 'uid' && !_.isUndefined(attribute.targetField) && !_.has(data.attributes, attribute.targetField)) {
+                attribute.targetField = undefined;
+            }
+        });
+    }
+};
+
+export { removeDeletedUIDTargetFields, removeEmptyDefaults };
+//# sourceMappingURL=data-transform.mjs.map

package/dist/server/controllers/validation/data-transform.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-transform.mjs","sources":["../../../../server/src/controllers/validation/data-transform.ts"],"sourcesContent":["import type { Struct } from '@strapi/types';\r\nimport _ from 'lodash';\r\nimport { hasDefaultAttribute } from '../../utils/typeguards';\r\n\r\nexport const removeEmptyDefaults = (\r\n  data: Partial<Struct.ContentTypeSchema> | Partial<Struct.ComponentSchema> | undefined\r\n) => {\r\n  const { attributes } = data || {};\r\n\r\n  Object.keys(attributes!).forEach((attributeName) => {\r\n    const attribute = attributes![attributeName];\r\n\r\n    if (hasDefaultAttribute(attribute) && attribute.default === '') {\r\n      attribute.default = undefined;\r\n    }\r\n  });\r\n};\r\n\r\nexport const removeDeletedUIDTargetFields = (data: Struct.ContentTypeSchema) => {\r\n  if (_.has(data, 'attributes')) {\r\n    Object.values(data.attributes).forEach((attribute) => {\r\n      if (\r\n        attribute.type === 'uid' &&\r\n        !_.isUndefined(attribute.targetField) &&\r\n        !_.has(data.attributes, attribute.targetField)\r\n      ) {\r\n        attribute.targetField = undefined;\r\n      }\r\n    });\r\n  }\r\n};\r\n"],"names":["removeEmptyDefaults","data","attributes","Object","keys","forEach","attributeName","attribute","hasDefaultAttribute","default","undefined","removeDeletedUIDTargetFields","_","has","values","type","isUndefined","targetField"],"mappings":";;;AAIO,MAAMA,sBAAsB,CACjCC,IAAAA,GAAAA;AAEA,IAAA,MAAM,EAAEC,UAAU,EAAE,GAAGD,QAAQ,EAAC;AAEhCE,IAAAA,MAAAA,CAAOC,IAAI,CAACF,UAAAA,CAAAA,CAAaG,OAAO,CAAC,CAACC,aAAAA,GAAAA;QAChC,MAAMC,SAAAA,GAAYL,UAAW,CAACI,aAAAA,CAAc;AAE5C,QAAA,IAAIE,mBAAAA,CAAoBD,SAAAA,CAAAA,IAAcA,SAAAA,CAAUE,OAAO,KAAK,EAAA,EAAI;AAC9DF,YAAAA,SAAAA,CAAUE,OAAO,GAAGC,SAAAA;AACtB,QAAA;AACF,IAAA,CAAA,CAAA;AACF;AAEO,MAAMC,+BAA+B,CAACV,IAAAA,GAAAA;AAC3C,IAAA,IAAIW,CAAAA,CAAEC,GAAG,CAACZ,IAAAA,EAAM,YAAA,CAAA,EAAe;AAC7BE,QAAAA,MAAAA,CAAOW,MAAM,CAACb,IAAAA,CAAKC,UAAU,CAAA,CAAEG,OAAO,CAAC,CAACE,SAAAA,GAAAA;YACtC,IACEA,SAAAA,CAAUQ,IAAI,KAAK,KAAA,IACnB,CAACH,CAAAA,CAAEI,WAAW,CAACT,SAAAA,CAAUU,WAAW,KACpC,CAACL,CAAAA,CAAEC,GAAG,CAACZ,IAAAA,CAAKC,UAAU,EAAEK,SAAAA,CAAUU,WAAW,CAAA,EAC7C;AACAV,gBAAAA,SAAAA,CAAUU,WAAW,GAAGP,SAAAA;AAC1B,YAAA;AACF,QAAA,CAAA,CAAA;AACF,IAAA;AACF;;;;"}