npm - @strapi/content-type-builder - Versions diffs - 5.17.0 → 5.18.0 - Mend

@strapi/content-type-builder 5.17.0 → 5.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/dist/server/controllers/schema.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema.mjs","sources":["../../../server/src/controllers/schema.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { isEmpty } from 'lodash/fp';\n\nimport { getService } from '../utils';\nimport { validateUpdateSchema } from './validation/schema';\n\nexport default () => {\n const internals = {\n isUpdating: false,\n };\n\n return {\n async getSchema(ctx: Context) {\n const schema = await getService('schema').getSchema();\n\n ctx.send({ data: schema });\n },\n\n async updateSchema(ctx: Context) {\n if (internals.isUpdating === true) {\n return ctx.conflict('Schema update is already in progress.');\n }\n\n try {\n const { data } = await validateUpdateSchema(ctx.request.body);\n\n if (isEmpty(data.components) && isEmpty(data.contentTypes)) {\n ctx.body = {};\n return;\n }\n\n internals.isUpdating = true;\n strapi.reload.isWatching = false;\n\n await getService('schema').updateSchema(data);\n\n // NOTE: we do not set isUpdating to false here.\n // We want to wait for the server to restart to get the isUpdate = false only\n setImmediate(() => {\n strapi.reload();\n });\n\n ctx.body = {};\n } catch (error) {\n internals.isUpdating = false;\n return ctx.send({ error }, 400);\n }\n },\n\n async getUpdateSchemaStatus(ctx: Context) {\n ctx.send({ data: { isUpdating: internals.isUpdating } });\n },\n };\n};\n"],"names":["internals","isUpdating","getSchema","ctx","schema","getService","send","data","updateSchema","conflict","validateUpdateSchema","request","body","isEmpty","components","contentTypes","strapi","reload","isWatching","setImmediate","error","getUpdateSchemaStatus"],"mappings":";;;;AAMA,aAAe,CAAA,IAAA;AACb,IAAA,MAAMA,SAAY,GAAA;QAChBC,UAAY,EAAA;AACd,KAAA;IAEA,OAAO;AACL,QAAA,MAAMC,WAAUC,GAAY,EAAA;AAC1B,YAAA,MAAMC,MAAS,GAAA,MAAMC,UAAW,CAAA,QAAA,CAAA,CAAUH,SAAS,EAAA;AAEnDC,YAAAA,GAAAA,CAAIG,IAAI,CAAC;gBAAEC,IAAMH,EAAAA;AAAO,aAAA,CAAA;AAC1B,SAAA;AAEA,QAAA,MAAMI,cAAaL,GAAY,EAAA;YAC7B,IAAIH,SAAAA,CAAUC,UAAU,KAAK,IAAM,EAAA;gBACjC,OAAOE,GAAAA,CAAIM,QAAQ,CAAC,uCAAA,CAAA;AACtB;YAEA,IAAI;gBACF,MAAM,EAAEF,IAAI,EAAE,GAAG,MAAMG,oBAAqBP,CAAAA,GAAAA,CAAIQ,OAAO,CAACC,IAAI,CAAA;AAE5D,gBAAA,IAAIC,QAAQN,IAAKO,CAAAA,UAAU,KAAKD,OAAQN,CAAAA,IAAAA,CAAKQ,YAAY,CAAG,EAAA;oBAC1DZ,GAAIS,CAAAA,IAAI,GAAG,EAAC;AACZ,oBAAA;AACF;AAEAZ,gBAAAA,SAAAA,CAAUC,UAAU,GAAG,IAAA;gBACvBe,MAAOC,CAAAA,MAAM,CAACC,UAAU,GAAG,KAAA;gBAE3B,MAAMb,UAAAA,CAAW,QAAUG,CAAAA,CAAAA,YAAY,CAACD,IAAAA,CAAAA;;;gBAIxCY,YAAa,CAAA,IAAA;AACXH,oBAAAA,MAAAA,CAAOC,MAAM,EAAA;AACf,iBAAA,CAAA;gBAEAd,GAAIS,CAAAA,IAAI,GAAG,EAAC;AACd,aAAA,CAAE,OAAOQ,KAAO,EAAA;AACdpB,gBAAAA,SAAAA,CAAUC,UAAU,GAAG,KAAA;~~gBACvB~~,~~OAAOE~~,GAAAA,CAAIG,IAAI,CAAC;~~AAAEc~~,~~oBAAAA~~;~~iBAAS~~,EAAA,GAAA,CAAA;~~AAC7B~~;AACF,SAAA;AAEA,QAAA,~~MAAMC~~,~~uBAAsBlB~~,GAAY,EAAA;AACtCA,YAAAA,GAAAA,CAAIG,IAAI,CAAC;gBAAEC,IAAM,EAAA;AAAEN,oBAAAA,UAAAA,EAAYD,UAAUC;AAAW;AAAE,aAAA,CAAA;AACxD;AACF,KAAA;AACF,CAAA;;;;"}
1	+ {"version":3,"file":"schema.mjs","sources":["../../../server/src/controllers/schema.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { isEmpty } from 'lodash/fp';\n\nimport { getService } from '../utils';\nimport { validateUpdateSchema } from './validation/schema';\n\nexport default () => {\n const internals = {\n isUpdating: false,\n };\n\n return {\n async getSchema(ctx: Context) {\n const schema = await getService('schema').getSchema();\n\n ctx.send({ data: schema });\n },\n\n async updateSchema(ctx: Context) {\n if (internals.isUpdating === true) {\n return ctx.conflict('Schema update is already in progress.');\n }\n\n try {\n const { data } = await validateUpdateSchema(ctx.request.body);\n\n if (isEmpty(data.components) && isEmpty(data.contentTypes)) {\n ctx.body = {};\n return;\n }\n\n internals.isUpdating = true;\n strapi.reload.isWatching = false;\n\n await getService('schema').updateSchema(data);\n\n // NOTE: we do not set isUpdating to false here.\n // We want to wait for the server to restart to get the isUpdate = false only\n setImmediate(() => {\n strapi.reload();\n });\n\n ctx.body = {};\n } catch (error) {\n internals.isUpdating = false;\n const errorMessage = error instanceof Error ? error.message : String(error);\n return ctx.send({ error: errorMessage }, 400);\n }\n },\n\n async getUpdateSchemaStatus(ctx: Context) {\n ctx.send({ data: { isUpdating: internals.isUpdating } });\n },\n };\n};\n"],"names":["internals","isUpdating","getSchema","ctx","schema","getService","send","data","updateSchema","conflict","validateUpdateSchema","request","body","isEmpty","components","contentTypes","strapi","reload","isWatching","setImmediate","error","errorMessage","Error","message","String","getUpdateSchemaStatus"],"mappings":";;;;AAMA,aAAe,CAAA,IAAA;AACb,IAAA,MAAMA,SAAY,GAAA;QAChBC,UAAY,EAAA;AACd,KAAA;IAEA,OAAO;AACL,QAAA,MAAMC,WAAUC,GAAY,EAAA;AAC1B,YAAA,MAAMC,MAAS,GAAA,MAAMC,UAAW,CAAA,QAAA,CAAA,CAAUH,SAAS,EAAA;AAEnDC,YAAAA,GAAAA,CAAIG,IAAI,CAAC;gBAAEC,IAAMH,EAAAA;AAAO,aAAA,CAAA;AAC1B,SAAA;AAEA,QAAA,MAAMI,cAAaL,GAAY,EAAA;YAC7B,IAAIH,SAAAA,CAAUC,UAAU,KAAK,IAAM,EAAA;gBACjC,OAAOE,GAAAA,CAAIM,QAAQ,CAAC,uCAAA,CAAA;AACtB;YAEA,IAAI;gBACF,MAAM,EAAEF,IAAI,EAAE,GAAG,MAAMG,oBAAqBP,CAAAA,GAAAA,CAAIQ,OAAO,CAACC,IAAI,CAAA;AAE5D,gBAAA,IAAIC,QAAQN,IAAKO,CAAAA,UAAU,KAAKD,OAAQN,CAAAA,IAAAA,CAAKQ,YAAY,CAAG,EAAA;oBAC1DZ,GAAIS,CAAAA,IAAI,GAAG,EAAC;AACZ,oBAAA;AACF;AAEAZ,gBAAAA,SAAAA,CAAUC,UAAU,GAAG,IAAA;gBACvBe,MAAOC,CAAAA,MAAM,CAACC,UAAU,GAAG,KAAA;gBAE3B,MAAMb,UAAAA,CAAW,QAAUG,CAAAA,CAAAA,YAAY,CAACD,IAAAA,CAAAA;;;gBAIxCY,YAAa,CAAA,IAAA;AACXH,oBAAAA,MAAAA,CAAOC,MAAM,EAAA;AACf,iBAAA,CAAA;gBAEAd,GAAIS,CAAAA,IAAI,GAAG,EAAC;AACd,aAAA,CAAE,OAAOQ,KAAO,EAAA;AACdpB,gBAAAA,SAAAA,CAAUC,UAAU,GAAG,KAAA;AACvB,gBAAA,MAAMoB,eAAeD,KAAiBE,YAAAA,KAAAA,GAAQF,KAAMG,CAAAA,OAAO,GAAGC,MAAOJ,CAAAA,KAAAA,CAAAA;gBACrE,OAAOjB,GAAAA,CAAIG,IAAI,CAAC;oBAAEc,KAAOC,EAAAA;iBAAgB,EAAA,GAAA,CAAA;AAC3C;AACF,SAAA;AAEA,QAAA,MAAMI,uBAAsBtB,GAAY,EAAA;AACtCA,YAAAA,GAAAA,CAAIG,IAAI,CAAC;gBAAEC,IAAM,EAAA;AAAEN,oBAAAA,UAAAA,EAAYD,UAAUC;AAAW;AAAE,aAAA,CAAA;AACxD;AACF,KAAA;AACF,CAAA;;;;"}

package/dist/server/services/schema-builder/content-type-builder.js CHANGED Viewed

@@ -16,7 +16,8 @@ const reuseUnsetPreviousProperties = (newAttribute, oldAttribute)=>{
         'unique',
         'pluginOptions',
         'inversedBy',
-        'mappedBy'
+        'mappedBy',
+        'conditions'
     ]));
 };
 function createComponentBuilder() {
@@ -33,19 +34,24 @@ function createComponentBuilder() {
             if (!attribute.targetAttribute) {
                 return;
             }
+            // When generating the inverse relation, preserve existing conditions if they exist
+            // If the target attribute already exists and has conditions, preserve them
+            const targetAttributeData = targetAttribute || {};
+            // If the source doesn't have conditions but the target does, preserve target's conditions
             targetCT.setAttribute(attribute.targetAttribute, generateRelation({
                 key,
                 attribute,
                 uid,
-                targetAttribute
+                targetAttribute: targetAttributeData
             }));
         },
         unsetRelation (attribute) {
-            if (!_.has(attribute, 'target')) {
+            if (!('target' in attribute) || !attribute.target) {
                 return;
             }
             const targetCT = this.contentTypes.get(attribute.target);
-            const targetAttributeName = attribute.inversedBy || attribute.mappedBy;
+            const relationAttribute = attribute;
+            const targetAttributeName = relationAttribute.inversedBy || relationAttribute.mappedBy;
             const targetAttribute = targetCT.getAttribute(targetAttributeName);
             if (!targetAttribute) return;
             return targetCT.deleteAttribute(targetAttributeName);
@@ -66,26 +72,27 @@ function createComponentBuilder() {
             Object.keys(attributes$1).forEach((key)=>{
                 const attribute = attributes$1[key];
                 if (attributes.isRelation(attribute)) {
+                    const relationAttribute = attribute;
                     if ([
                         'manyToMany',
                         'oneToOne'
-                    ].includes(attribute.relation)) {
-                        if (attribute.target === uid && attribute.targetAttribute !== undefined) {
+                    ].includes(relationAttribute.relation)) {
+                        if (relationAttribute.target === uid && relationAttribute.targetAttribute !== undefined) {
                             // self referencing relation
-                            const targetAttribute = attributes$1[attribute.targetAttribute];
+                            const targetAttribute = attributes$1[relationAttribute.targetAttribute];
                             if (targetAttribute.dominant === undefined) {
-                                attribute.dominant = true;
+                                relationAttribute.dominant = true;
                             } else {
-                                attribute.dominant = false;
+                                relationAttribute.dominant = false;
                             }
                         } else {
-                            attribute.dominant = true;
+                            relationAttribute.dominant = true;
                         }
                     }
                     this.setRelation({
                         key,
                         uid,
-                        attribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -136,10 +143,13 @@ function createComponentBuilder() {
             // remove old relations
             deletedKeys.forEach((key)=>{
                 const attribute = oldAttributes[key];
-                const targetAttributeName = attribute.inversedBy || attribute.mappedBy;
                 // if the old relation has a target attribute. we need to remove it in the target type
-                if (attributes.isConfigurable(attribute) && attributes.isRelation(attribute) && !_.isNil(targetAttributeName)) {
-                    this.unsetRelation(attribute);
+                if (attributes.isConfigurable(attribute) && attributes.isRelation(attribute)) {
+                    const relationAttribute = attribute;
+                    const targetAttributeName = relationAttribute.inversedBy || relationAttribute.mappedBy;
+                    if (targetAttributeName !== null && targetAttributeName !== undefined) {
+                        this.unsetRelation(attribute);
+                    }
                 }
             });
             remainingKeys.forEach((key)=>{
@@ -149,30 +159,47 @@ function createComponentBuilder() {
                     return this.setRelation({
                         key,
                         uid,
-                        attribute: newAttributes[key]
+                        attribute: newAttribute
                     });
                 }
                 if (attributes.isRelation(oldAttribute) && !attributes.isRelation(newAttribute)) {
                     return this.unsetRelation(oldAttribute);
                 }
                 if (attributes.isRelation(oldAttribute) && attributes.isRelation(newAttribute)) {
-                    const oldTargetAttributeName = oldAttribute.inversedBy || oldAttribute.mappedBy;
-                    const sameRelation = oldAttribute.relation === newAttribute.relation;
-                    const targetAttributeHasChanged = oldTargetAttributeName !== newAttribute.targetAttribute;
+                    const relationAttribute = newAttribute;
+                    const oldRelationAttribute = oldAttribute;
+                    const oldTargetAttributeName = oldRelationAttribute.inversedBy || oldRelationAttribute.mappedBy;
+                    const sameRelation = oldAttribute.relation === relationAttribute.relation;
+                    const targetAttributeHasChanged = oldTargetAttributeName !== relationAttribute.targetAttribute;
                     if (!sameRelation || targetAttributeHasChanged) {
                         this.unsetRelation(oldAttribute);
                     }
                     // keep extra options that were set manually on oldAttribute
-                    reuseUnsetPreviousProperties(newAttribute, oldAttribute);
-                    if (oldAttribute.inversedBy) {
-                        newAttribute.dominant = true;
-                    } else if (oldAttribute.mappedBy) {
-                        newAttribute.dominant = false;
+                    reuseUnsetPreviousProperties(relationAttribute, oldAttribute);
+                    // Handle conditions explicitly - only preserve if present and not undefined in new attribute
+                    const newAttributeFromInfos = newAttributes[key];
+                    const hasNewConditions = newAttributeFromInfos.conditions !== undefined && newAttributeFromInfos.conditions !== null;
+                    if (oldAttribute.conditions) {
+                        if (hasNewConditions) {
+                            // Conditions are still present, keep them
+                            relationAttribute.conditions = newAttributeFromInfos.conditions;
+                        } else {
+                            // Conditions were removed (undefined or null), ensure they're not preserved
+                            delete relationAttribute.conditions;
+                        }
+                    } else if (hasNewConditions) {
+                        // New conditions added
+                        relationAttribute.conditions = newAttributeFromInfos.conditions;
+                    }
+                    if (oldRelationAttribute.inversedBy) {
+                        relationAttribute.dominant = true;
+                    } else if (oldRelationAttribute.mappedBy) {
+                        relationAttribute.dominant = false;
                     }
                     return this.setRelation({
                         key,
                         uid,
-                        attribute: newAttribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -180,26 +207,27 @@ function createComponentBuilder() {
             newKeys.forEach((key)=>{
                 const attribute = newAttributes[key];
                 if (attributes.isRelation(attribute)) {
+                    const relationAttribute = attribute;
                     if ([
                         'manyToMany',
                         'oneToOne'
-                    ].includes(attribute.relation)) {
-                        if (attribute.target === uid && attribute.targetAttribute !== undefined) {
+                    ].includes(relationAttribute.relation)) {
+                        if (relationAttribute.target === uid && relationAttribute.targetAttribute !== undefined) {
                             // self referencing relation
-                            const targetAttribute = newAttributes[attribute.targetAttribute];
+                            const targetAttribute = newAttributes[relationAttribute.targetAttribute];
                             if (targetAttribute.dominant === undefined) {
-                                attribute.dominant = true;
+                                relationAttribute.dominant = true;
                             } else {
-                                attribute.dominant = false;
+                                relationAttribute.dominant = false;
                             }
                         } else {
-                            attribute.dominant = true;
+                            relationAttribute.dominant = true;
                         }
                     }
                     this.setRelation({
                         key,
                         uid,
-                        attribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -241,7 +269,12 @@ const generateRelation = ({ key, attribute, uid, targetAttribute = {} })=>{
         type: 'relation',
         target: uid,
         private: targetAttribute.private || undefined,
-        pluginOptions: targetAttribute.pluginOptions || undefined
+        pluginOptions: targetAttribute.pluginOptions || undefined,
+        // Preserve conditions from targetAttribute if they exist
+        // This allows each side of the relation to maintain its own conditions
+        ...targetAttribute.conditions && {
+            conditions: targetAttribute.conditions
+        }
     };
     switch(attribute.relation){
         case 'oneToOne':
@@ -279,12 +312,13 @@ const generateRelation = ({ key, attribute, uid, targetAttribute = {} })=>{
     }
     // we do this just to make sure we have the same key order when writing to files
     const { type, relation, target, ...restOptions } = opts;
-    return {
+    const result = {
         type,
         relation,
         target,
         ...restOptions
     };
+    return result;
 };
 module.exports = createComponentBuilder;

package/dist/server/services/schema-builder/content-type-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"content-type-builder.js","sources":["../../../../server/src/services/schema-builder/content-type-builder.ts"],"sourcesContent":["import path from 'path';\nimport _ from 'lodash';\n\nimport { strings, errors } from '@strapi/utils';\nimport type { Schema, Internal } from '@strapi/types';\nimport { isRelation, isConfigurable } from '../../utils/attributes';\nimport { typeKinds } from '../constants';\nimport createSchemaHandler from './schema-handler';\nimport { CreateContentTypeInput } from '../../controllers/validation/content-type';\n\nconst { ApplicationError } = errors;\n\nconst reuseUnsetPreviousProperties = (\n newAttribute: Schema.Attribute.AnyAttribute,\n oldAttribute: Schema.Attribute.AnyAttribute\n) => {\n _.defaults(\n newAttribute,\n _.omit(oldAttribute, [\n 'configurable',\n 'required',\n 'private',\n 'unique',\n 'pluginOptions',\n 'inversedBy',\n 'mappedBy',\n ])\n );\n};\n\nexport default function createComponentBuilder() {\n return {\n setRelation(this: any, { key, uid, attribute }: any) {\n if (!_.has(attribute, 'target')) {\n return;\n }\n\n const targetCT = this.contentTypes.get(attribute.target);\n\n if (!targetCT) {\n throw new ApplicationError(`Content type ${attribute.target} not found`);\n }\n\n const targetAttribute = targetCT.getAttribute(attribute.targetAttribute);\n\n if (!attribute.targetAttribute) {\n return;\n }\n\n targetCT.setAttribute(\n attribute.targetAttribute,\n generateRelation({ key, attribute, uid, targetAttribute })\n );\n },\n\n unsetRelation(this: any, attribute: any) {\n if (!_.has(attribute, 'target')) {\n return;\n }\n\n const targetCT = this.contentTypes.get(attribute.target);\n\n const targetAttributeName = attribute.inversedBy \|\| attribute.mappedBy;\n const targetAttribute = targetCT.getAttribute(targetAttributeName);\n\n if (!targetAttribute) return;\n\n return targetCT.deleteAttribute(targetAttributeName);\n },\n\n createContentTypeAttributes(\n this: any,\n uid: string,\n attributes: CreateContentTypeInput['attributes']\n ) {\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n const contentType = this.contentTypes.get(uid);\n\n // support self referencing content type relation\n Object.keys(attributes).forEach((key) => {\n const { target } = attributes[key];\n if (target === '__self__') {\n attributes[key].target = uid;\n }\n });\n\n contentType.setAttributes(this.convertAttributes(attributes));\n\n Object.keys(attributes).forEach((key) => {\n const attribute = attributes[key];\n\n if (isRelation(attribute)) {\n if (['manyToMany', 'oneToOne'].includes(attribute.relation)) {\n if (attribute.target === uid && attribute.targetAttribute !== undefined) {\n // self referencing relation\n const targetAttribute = attributes[attribute.targetAttribute];\n\n if (targetAttribute.dominant === undefined) {\n attribute.dominant = true;\n } else {\n attribute.dominant = false;\n }\n } else {\n attribute.dominant = true;\n }\n }\n\n this.setRelation({\n key,\n uid,\n attribute,\n });\n }\n });\n\n return contentType;\n },\n\n /*\n Creates a content type in memory to be written to files later on\n /\n createContentType(this: any, infos: CreateContentTypeInput) {\n // TODO:: check for unique uid / singularName & pluralName & collectionName\n\n if (infos.uid && infos.uid !== createContentTypeUID(infos)) {\n throw new ApplicationError('contentType.invalidUID');\n }\n\n const uid = infos.uid ?? createContentTypeUID(infos);\n\n if (this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.alreadyExists');\n }\n\n const contentType = createSchemaHandler({\n modelName: infos.singularName,\n dir: path.join(\n strapi.dirs.app.api,\n infos.singularName,\n 'content-types',\n infos.singularName\n ),\n filename: `schema.json`,\n });\n\n this.contentTypes.set(uid, contentType);\n\n contentType\n .setUID(uid)\n .set('kind', infos.kind \|\| typeKinds.COLLECTION_TYPE)\n .set(\n 'collectionName',\n infos.collectionName \|\| strings.nameToCollectionName(infos.pluralName)\n )\n .set('info', {\n singularName: infos.singularName,\n pluralName: infos.pluralName,\n displayName: infos.displayName,\n description: infos.description,\n })\n .set('options', {\n ...(infos.options ?? {}),\n draftAndPublish: infos.draftAndPublish,\n })\n .set('pluginOptions', infos.pluginOptions)\n .set('config', infos.config);\n\n this.createContentTypeAttributes(uid, infos.attributes);\n\n return contentType;\n },\n\n editContentType(this: any, infos: any) {\n const { uid } = infos;\n\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n const contentType = this.contentTypes.get(uid);\n\n const oldAttributes = contentType.schema.attributes;\n\n const newAttributes = _.omitBy(infos.attributes, (attr, key) => {\n return _.has(oldAttributes, key) && !isConfigurable(oldAttributes[key]);\n });\n\n const newKeys = _.difference(Object.keys(newAttributes), Object.keys(oldAttributes));\n const deletedKeys = _.difference(Object.keys(oldAttributes), Object.keys(newAttributes));\n const remainingKeys = _.intersection(Object.keys(oldAttributes), Object.keys(newAttributes));\n\n // remove old relations\n deletedKeys.forEach((key) => {\n const attribute = oldAttributes[key];\n\n const targetAttributeName = attribute.inversedBy \|\| attribute.mappedBy;\n\n // if the old relation has a target attribute. we need to remove it in the target type\n if (isConfigurable(attribute) && isRelation(attribute) && !_.isNil(targetAttributeName)) {\n this.unsetRelation(attribute);\n }\n });\n\n remainingKeys.forEach((key) => {\n const oldAttribute = oldAttributes[key];\n const newAttribute = newAttributes[key];\n\n if (!isRelation(oldAttribute) && isRelation(newAttribute)) {\n return this.setRelation({\n key,\n uid,\n attribute: newAttributes[key],\n });\n }\n\n if (isRelation(oldAttribute) && !isRelation(newAttribute)) {\n return this.unsetRelation(oldAttribute);\n }\n\n if (isRelation(oldAttribute) && isRelation(newAttribute)) {\n const oldTargetAttributeName = oldAttribute.inversedBy \|\| oldAttribute.mappedBy;\n\n const sameRelation = oldAttribute.relation === newAttribute.relation;\n const targetAttributeHasChanged = oldTargetAttributeName !== newAttribute.targetAttribute;\n\n if (!sameRelation \|\| targetAttributeHasChanged) {\n this.unsetRelation(oldAttribute);\n }\n\n // keep extra options that were set manually on oldAttribute\n reuseUnsetPreviousProperties(newAttribute, oldAttribute);\n\n if (oldAttribute.inversedBy) {\n newAttribute.dominant = true;\n } else if (oldAttribute.mappedBy) {\n newAttribute.dominant = false;\n }\n\n return this.setRelation({\n key,\n uid,\n attribute: newAttribute,\n });\n }\n });\n\n // add new relations\n newKeys.forEach((key) => {\n const attribute = newAttributes[key];\n\n if (isRelation(attribute)) {\n if (['manyToMany', 'oneToOne'].includes(attribute.relation)) {\n if (attribute.target === uid && attribute.targetAttribute !== undefined) {\n // self referencing relation\n const targetAttribute = newAttributes[attribute.targetAttribute];\n\n if (targetAttribute.dominant === undefined) {\n attribute.dominant = true;\n } else {\n attribute.dominant = false;\n }\n } else {\n attribute.dominant = true;\n }\n }\n\n this.setRelation({\n key,\n uid,\n attribute,\n });\n }\n });\n\n contentType\n .set('kind', infos.kind \|\| contentType.schema.kind)\n .set(['info', 'displayName'], infos.displayName)\n .set(['info', 'description'], infos.description)\n .set('options', {\n ...(infos.options ?? {}),\n draftAndPublish: infos.draftAndPublish,\n })\n .set('pluginOptions', infos.pluginOptions)\n .setAttributes(this.convertAttributes(newAttributes));\n\n return contentType;\n },\n\n deleteContentType(this: any, uid: string) {\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n this.components.forEach((compo: any) => {\n compo.removeContentType(uid);\n });\n\n this.contentTypes.forEach((ct: any) => {\n ct.removeContentType(uid);\n });\n\n return this.contentTypes.get(uid).delete();\n },\n };\n}\n\n/\n Returns a uid from a content type infos\n \n @param {object} options options\n * @param {string} options.singularName content-type singularName\n * @returns {string} uid\n */\nconst createContentTypeUID = ({\n singularName,\n}: {\n singularName: string;\n}): Internal.UID.ContentType => `api::${singularName}.${singularName}`;\n\nconst generateRelation = ({ key, attribute, uid, targetAttribute = {} }: any) => {\n const opts: any = {\n type: 'relation',\n target: uid,\n private: targetAttribute.private \|\| undefined,\n pluginOptions: targetAttribute.pluginOptions \|\| undefined,\n };\n\n switch (attribute.relation) {\n case 'oneToOne': {\n opts.relation = 'oneToOne';\n\n if (attribute.dominant) {\n opts.mappedBy = key;\n } else {\n opts.inversedBy = key;\n }\n break;\n }\n case 'oneToMany': {\n opts.relation = 'manyToOne';\n opts.inversedBy = key;\n break;\n }\n case 'manyToOne': {\n opts.relation = 'oneToMany';\n opts.mappedBy = key;\n break;\n }\n case 'manyToMany': {\n opts.relation = 'manyToMany';\n\n if (attribute.dominant) {\n opts.mappedBy = key;\n } else {\n opts.inversedBy = key;\n }\n\n break;\n }\n default:\n }\n\n // we do this just to make sure we have the same key order when writing to files\n const { type, relation, target, ...restOptions } = opts;\n\n return {\n type,\n relation,\n target,\n ...restOptions,\n };\n};\n"],"names":["ApplicationError","errors","reuseUnsetPreviousProperties","newAttribute","oldAttribute","_","defaults","omit","createComponentBuilder","setRelation","key","uid","attribute","has","targetCT","contentTypes","get","target","targetAttribute","getAttribute","setAttribute","generateRelation","unsetRelation","targetAttributeName","inversedBy","mappedBy","deleteAttribute","createContentTypeAttributes","attributes","contentType","Object","keys","forEach","setAttributes","convertAttributes","isRelation","includes","relation","undefined","dominant","createContentType","infos","createContentTypeUID","createSchemaHandler","modelName","singularName","dir","path","join","strapi","dirs","app","api","filename","set","setUID","kind","typeKinds","COLLECTION_TYPE","collectionName","strings","nameToCollectionName","pluralName","displayName","description","options","draftAndPublish","pluginOptions","config","editContentType","oldAttributes","schema","newAttributes","omitBy","attr","isConfigurable","newKeys","difference","deletedKeys","remainingKeys","intersection","isNil","oldTargetAttributeName","sameRelation","targetAttributeHasChanged","deleteContentType","components","compo","removeContentType","ct","delete","opts","type","private","restOptions"],"mappings":";;;;;;;;;AAUA,MAAM,EAAEA,gBAAgB,EAAE,GAAGC,YAAAA;AAE7B,MAAMC,4BAAAA,GAA+B,CACnCC,YACAC,EAAAA,YAAAA,GAAAA;AAEAC,IAAAA,CAAAA,CAAEC,QAAQ,CACRH,YAAAA,EACAE,CAAEE,CAAAA,IAAI,CAACH,YAAc,EAAA;AACnB,QAAA,cAAA;AACA,QAAA,UAAA;AACA,QAAA,SAAA;AACA,QAAA,QAAA;AACA,QAAA,eAAA;AACA,QAAA,YAAA;AACA,QAAA;AACD,KAAA,CAAA,CAAA;AAEL,CAAA;AAEe,SAASI,sBAAAA,GAAAA;IACtB,OAAO;AACLC,QAAAA,WAAAA,CAAAA,CAAuB,EAAEC,GAAG,EAAEC,GAAG,EAAEC,SAAS,EAAO,EAAA;AACjD,YAAA,IAAI,CAACP,CAAAA,CAAEQ,GAAG,CAACD,WAAW,QAAW,CAAA,EAAA;AAC/B,gBAAA;AACF;YAEA,MAAME,QAAAA,GAAW,IAAI,CAACC,YAAY,CAACC,GAAG,CAACJ,UAAUK,MAAM,CAAA;AAEvD,YAAA,IAAI,CAACH,QAAU,EAAA;gBACb,MAAM,IAAId,iBAAiB,CAAC,aAAa,EAAEY,SAAUK,CAAAA,MAAM,CAAC,UAAU,CAAC,CAAA;AACzE;AAEA,YAAA,MAAMC,eAAkBJ,GAAAA,QAAAA,CAASK,YAAY,CAACP,UAAUM,eAAe,CAAA;YAEvE,IAAI,CAACN,SAAUM,CAAAA,eAAe,EAAE;AAC9B,gBAAA;AACF;AAEAJ,YAAAA,QAAAA,CAASM,YAAY,CACnBR,SAAUM,CAAAA,eAAe,EACzBG,gBAAiB,CAAA;AAAEX,gBAAAA,GAAAA;AAAKE,gBAAAA,SAAAA;AAAWD,gBAAAA,GAAAA;AAAKO,gBAAAA;AAAgB,aAAA,CAAA,CAAA;AAE5D,SAAA;AAEAI,QAAAA,aAAAA,CAAAA,CAAyBV,SAAc,EAAA;AACrC,YAAA,IAAI,CAACP,CAAAA,CAAEQ,GAAG,CAACD,WAAW,QAAW,CAAA,EAAA;AAC/B,gBAAA;AACF;YAEA,MAAME,QAAAA,GAAW,IAAI,CAACC,YAAY,CAACC,GAAG,CAACJ,UAAUK,MAAM,CAAA;AAEvD,YAAA,MAAMM,mBAAsBX,GAAAA,SAAAA,CAAUY,UAAU,IAAIZ,UAAUa,QAAQ;YACtE,MAAMP,eAAAA,GAAkBJ,QAASK,CAAAA,YAAY,CAACI,mBAAAA,CAAAA;AAE9C,YAAA,IAAI,CAACL,eAAiB,EAAA;YAEtB,OAAOJ,QAAAA,CAASY,eAAe,CAACH,mBAAAA,CAAAA;AAClC,SAAA;QAEAI,2BAEEhB,CAAAA,CAAAA,GAAW,EACXiB,YAAgD,EAAA;AAEhD,YAAA,IAAI,CAAC,IAAI,CAACb,YAAY,CAACF,GAAG,CAACF,GAAM,CAAA,EAAA;AAC/B,gBAAA,MAAM,IAAIX,gBAAiB,CAAA,sBAAA,CAAA;AAC7B;AAEA,YAAA,MAAM6B,cAAc,IAAI,CAACd,YAAY,CAACC,GAAG,CAACL,GAAAA,CAAAA;;AAG1CmB,YAAAA,MAAAA,CAAOC,IAAI,CAACH,YAAYI,CAAAA,CAAAA,OAAO,CAAC,CAACtB,GAAAA,GAAAA;AAC/B,gBAAA,MAAM,EAAEO,MAAM,EAAE,GAAGW,YAAU,CAAClB,GAAI,CAAA;AAClC,gBAAA,IAAIO,WAAW,UAAY,EAAA;AACzBW,oBAAAA,YAAU,CAAClB,GAAAA,CAAI,CAACO,MAAM,GAAGN,GAAAA;AAC3B;AACF,aAAA,CAAA;AAEAkB,YAAAA,WAAAA,CAAYI,aAAa,CAAC,IAAI,CAACC,iBAAiB,CAACN,YAAAA,CAAAA,CAAAA;AAEjDE,YAAAA,MAAAA,CAAOC,IAAI,CAACH,YAAYI,CAAAA,CAAAA,OAAO,CAAC,CAACtB,GAAAA,GAAAA;gBAC/B,MAAME,SAAAA,GAAYgB,YAAU,CAAClB,GAAI,CAAA;AAEjC,gBAAA,IAAIyB,sBAAWvB,SAAY,CAAA,EAAA;oBACzB,IAAI;AAAC,wBAAA,YAAA;AAAc,wBAAA;AAAW,qBAAA,CAACwB,QAAQ,CAACxB,SAAUyB,CAAAA,QAAQ,CAAG,EAAA;AAC3D,wBAAA,IAAIzB,UAAUK,MAAM,KAAKN,OAAOC,SAAUM,CAAAA,eAAe,KAAKoB,SAAW,EAAA;;AAEvE,4BAAA,MAAMpB,eAAkBU,GAAAA,YAAU,CAAChB,SAAAA,CAAUM,eAAe,CAAC;4BAE7D,IAAIA,eAAAA,CAAgBqB,QAAQ,KAAKD,SAAW,EAAA;AAC1C1B,gCAAAA,SAAAA,CAAU2B,QAAQ,GAAG,IAAA;6BAChB,MAAA;AACL3B,gCAAAA,SAAAA,CAAU2B,QAAQ,GAAG,KAAA;AACvB;yBACK,MAAA;AACL3B,4BAAAA,SAAAA,CAAU2B,QAAQ,GAAG,IAAA;AACvB;AACF;oBAEA,IAAI,CAAC9B,WAAW,CAAC;AACfC,wBAAAA,GAAAA;AACAC,wBAAAA,GAAAA;AACAC,wBAAAA;AACF,qBAAA,CAAA;AACF;AACF,aAAA,CAAA;YAEA,OAAOiB,WAAAA;AACT,SAAA;AAEA;;AAEC,QACDW,mBAA6BC,KAA6B,EAAA;;AAGxD,YAAA,IAAIA,MAAM9B,GAAG,IAAI8B,MAAM9B,GAAG,KAAK+B,qBAAqBD,KAAQ,CAAA,EAAA;AAC1D,gBAAA,MAAM,IAAIzC,gBAAiB,CAAA,wBAAA,CAAA;AAC7B;AAEA,YAAA,MAAMW,GAAM8B,GAAAA,KAAAA,CAAM9B,GAAG,IAAI+B,oBAAqBD,CAAAA,KAAAA,CAAAA;AAE9C,YAAA,IAAI,IAAI,CAAC1B,YAAY,CAACF,GAAG,CAACF,GAAM,CAAA,EAAA;AAC9B,gBAAA,MAAM,IAAIX,gBAAiB,CAAA,2BAAA,CAAA;AAC7B;AAEA,YAAA,MAAM6B,cAAcc,aAAoB,CAAA;AACtCC,gBAAAA,SAAAA,EAAWH,MAAMI,YAAY;AAC7BC,gBAAAA,GAAAA,EAAKC,IAAKC,CAAAA,IAAI,CACZC,MAAAA,CAAOC,IAAI,CAACC,GAAG,CAACC,GAAG,EACnBX,KAAMI,CAAAA,YAAY,EAClB,eAAA,EACAJ,MAAMI,YAAY,CAAA;gBAEpBQ,QAAU,EAAA,CAAC,WAAW;AACxB,aAAA,CAAA;AAEA,YAAA,IAAI,CAACtC,YAAY,CAACuC,GAAG,CAAC3C,GAAKkB,EAAAA,WAAAA,CAAAA;YAE3BA,WACG0B,CAAAA,MAAM,CAAC5C,GAAAA,CAAAA,CACP2C,GAAG,CAAC,MAAQb,EAAAA,KAAAA,CAAMe,IAAI,IAAIC,mBAAUC,CAAAA,eAAe,CACnDJ,CAAAA,GAAG,CACF,gBACAb,EAAAA,KAAAA,CAAMkB,cAAc,IAAIC,aAAQC,CAAAA,oBAAoB,CAACpB,KAAAA,CAAMqB,UAAU,CAAA,CAAA,CAEtER,GAAG,CAAC,MAAQ,EAAA;AACXT,gBAAAA,YAAAA,EAAcJ,MAAMI,YAAY;AAChCiB,gBAAAA,UAAAA,EAAYrB,MAAMqB,UAAU;AAC5BC,gBAAAA,WAAAA,EAAatB,MAAMsB,WAAW;AAC9BC,gBAAAA,WAAAA,EAAavB,MAAMuB;aAEpBV,CAAAA,CAAAA,GAAG,CAAC,SAAW,EAAA;AACd,gBAAA,GAAIb,KAAMwB,CAAAA,OAAO,IAAI,EAAE;AACvBC,gBAAAA,eAAAA,EAAiBzB,MAAMyB;aAExBZ,CAAAA,CAAAA,GAAG,CAAC,eAAA,EAAiBb,KAAM0B,CAAAA,aAAa,EACxCb,GAAG,CAAC,QAAUb,EAAAA,KAAAA,CAAM2B,MAAM,CAAA;AAE7B,YAAA,IAAI,CAACzC,2BAA2B,CAAChB,GAAAA,EAAK8B,MAAMb,UAAU,CAAA;YAEtD,OAAOC,WAAAA;AACT,SAAA;AAEAwC,QAAAA,eAAAA,CAAAA,CAA2B5B,KAAU,EAAA;YACnC,MAAM,EAAE9B,GAAG,EAAE,GAAG8B,KAAAA;AAEhB,YAAA,IAAI,CAAC,IAAI,CAAC1B,YAAY,CAACF,GAAG,CAACF,GAAM,CAAA,EAAA;AAC/B,gBAAA,MAAM,IAAIX,gBAAiB,CAAA,sBAAA,CAAA;AAC7B;AAEA,YAAA,MAAM6B,cAAc,IAAI,CAACd,YAAY,CAACC,GAAG,CAACL,GAAAA,CAAAA;AAE1C,YAAA,MAAM2D,aAAgBzC,GAAAA,WAAAA,CAAY0C,MAAM,CAAC3C,UAAU;YAEnD,MAAM4C,aAAAA,GAAgBnE,EAAEoE,MAAM,CAAChC,MAAMb,UAAU,EAAE,CAAC8C,IAAMhE,EAAAA,GAAAA,GAAAA;gBACtD,OAAOL,CAAAA,CAAEQ,GAAG,CAACyD,aAAAA,EAAe5D,QAAQ,CAACiE,yBAAAA,CAAeL,aAAa,CAAC5D,GAAI,CAAA,CAAA;AACxE,aAAA,CAAA;YAEA,MAAMkE,OAAAA,GAAUvE,CAAEwE,CAAAA,UAAU,CAAC/C,MAAAA,CAAOC,IAAI,CAACyC,aAAAA,CAAAA,EAAgB1C,MAAOC,CAAAA,IAAI,CAACuC,aAAAA,CAAAA,CAAAA;YACrE,MAAMQ,WAAAA,GAAczE,CAAEwE,CAAAA,UAAU,CAAC/C,MAAAA,CAAOC,IAAI,CAACuC,aAAAA,CAAAA,EAAgBxC,MAAOC,CAAAA,IAAI,CAACyC,aAAAA,CAAAA,CAAAA;YACzE,MAAMO,aAAAA,GAAgB1E,CAAE2E,CAAAA,YAAY,CAAClD,MAAAA,CAAOC,IAAI,CAACuC,aAAAA,CAAAA,EAAgBxC,MAAOC,CAAAA,IAAI,CAACyC,aAAAA,CAAAA,CAAAA;;YAG7EM,WAAY9C,CAAAA,OAAO,CAAC,CAACtB,GAAAA,GAAAA;gBACnB,MAAME,SAAAA,GAAY0D,aAAa,CAAC5D,GAAI,CAAA;AAEpC,gBAAA,MAAMa,mBAAsBX,GAAAA,SAAAA,CAAUY,UAAU,IAAIZ,UAAUa,QAAQ;;gBAGtE,IAAIkD,yBAAAA,CAAe/D,cAAcuB,qBAAWvB,CAAAA,SAAAA,CAAAA,IAAc,CAACP,CAAE4E,CAAAA,KAAK,CAAC1D,mBAAsB,CAAA,EAAA;oBACvF,IAAI,CAACD,aAAa,CAACV,SAAAA,CAAAA;AACrB;AACF,aAAA,CAAA;YAEAmE,aAAc/C,CAAAA,OAAO,CAAC,CAACtB,GAAAA,GAAAA;gBACrB,MAAMN,YAAAA,GAAekE,aAAa,CAAC5D,GAAI,CAAA;gBACvC,MAAMP,YAAAA,GAAeqE,aAAa,CAAC9D,GAAI,CAAA;AAEvC,gBAAA,IAAI,CAACyB,qBAAAA,CAAW/B,YAAiB+B,CAAAA,IAAAA,qBAAAA,CAAWhC,YAAe,CAAA,EAAA;oBACzD,OAAO,IAAI,CAACM,WAAW,CAAC;AACtBC,wBAAAA,GAAAA;AACAC,wBAAAA,GAAAA;wBACAC,SAAW4D,EAAAA,aAAa,CAAC9D,GAAI;AAC/B,qBAAA,CAAA;AACF;AAEA,gBAAA,IAAIyB,qBAAW/B,CAAAA,YAAAA,CAAAA,IAAiB,CAAC+B,qBAAAA,CAAWhC,YAAe,CAAA,EAAA;oBACzD,OAAO,IAAI,CAACmB,aAAa,CAAClB,YAAAA,CAAAA;AAC5B;gBAEA,IAAI+B,qBAAAA,CAAW/B,YAAiB+B,CAAAA,IAAAA,qBAAAA,CAAWhC,YAAe,CAAA,EAAA;AACxD,oBAAA,MAAM+E,sBAAyB9E,GAAAA,YAAAA,CAAaoB,UAAU,IAAIpB,aAAaqB,QAAQ;AAE/E,oBAAA,MAAM0D,YAAe/E,GAAAA,YAAAA,CAAaiC,QAAQ,KAAKlC,aAAakC,QAAQ;oBACpE,MAAM+C,yBAAAA,GAA4BF,sBAA2B/E,KAAAA,YAAAA,CAAae,eAAe;oBAEzF,IAAI,CAACiE,gBAAgBC,yBAA2B,EAAA;wBAC9C,IAAI,CAAC9D,aAAa,CAAClB,YAAAA,CAAAA;AACrB;;AAGAF,oBAAAA,4BAAAA,CAA6BC,YAAcC,EAAAA,YAAAA,CAAAA;oBAE3C,IAAIA,YAAAA,CAAaoB,UAAU,EAAE;AAC3BrB,wBAAAA,YAAAA,CAAaoC,QAAQ,GAAG,IAAA;qBACnB,MAAA,IAAInC,YAAaqB,CAAAA,QAAQ,EAAE;AAChCtB,wBAAAA,YAAAA,CAAaoC,QAAQ,GAAG,KAAA;AAC1B;oBAEA,OAAO,IAAI,CAAC9B,WAAW,CAAC;AACtBC,wBAAAA,GAAAA;AACAC,wBAAAA,GAAAA;wBACAC,SAAWT,EAAAA;AACb,qBAAA,CAAA;AACF;AACF,aAAA,CAAA;;YAGAyE,OAAQ5C,CAAAA,OAAO,CAAC,CAACtB,GAAAA,GAAAA;gBACf,MAAME,SAAAA,GAAY4D,aAAa,CAAC9D,GAAI,CAAA;AAEpC,gBAAA,IAAIyB,sBAAWvB,SAAY,CAAA,EAAA;oBACzB,IAAI;AAAC,wBAAA,YAAA;AAAc,wBAAA;AAAW,qBAAA,CAACwB,QAAQ,CAACxB,SAAUyB,CAAAA,QAAQ,CAAG,EAAA;AAC3D,wBAAA,IAAIzB,UAAUK,MAAM,KAAKN,OAAOC,SAAUM,CAAAA,eAAe,KAAKoB,SAAW,EAAA;;AAEvE,4BAAA,MAAMpB,eAAkBsD,GAAAA,aAAa,CAAC5D,SAAAA,CAAUM,eAAe,CAAC;4BAEhE,IAAIA,eAAAA,CAAgBqB,QAAQ,KAAKD,SAAW,EAAA;AAC1C1B,gCAAAA,SAAAA,CAAU2B,QAAQ,GAAG,IAAA;6BAChB,MAAA;AACL3B,gCAAAA,SAAAA,CAAU2B,QAAQ,GAAG,KAAA;AACvB;yBACK,MAAA;AACL3B,4BAAAA,SAAAA,CAAU2B,QAAQ,GAAG,IAAA;AACvB;AACF;oBAEA,IAAI,CAAC9B,WAAW,CAAC;AACfC,wBAAAA,GAAAA;AACAC,wBAAAA,GAAAA;AACAC,wBAAAA;AACF,qBAAA,CAAA;AACF;AACF,aAAA,CAAA;AAEAiB,YAAAA,WAAAA,CACGyB,GAAG,CAAC,MAAQb,EAAAA,KAAAA,CAAMe,IAAI,IAAI3B,WAAY0C,CAAAA,MAAM,CAACf,IAAI,CACjDF,CAAAA,GAAG,CAAC;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc,aAAA,EAAEb,KAAMsB,CAAAA,WAAW,CAC9CT,CAAAA,GAAG,CAAC;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc,aAAA,EAAEb,KAAMuB,CAAAA,WAAW,CAC9CV,CAAAA,GAAG,CAAC,SAAW,EAAA;AACd,gBAAA,GAAIb,KAAMwB,CAAAA,OAAO,IAAI,EAAE;AACvBC,gBAAAA,eAAAA,EAAiBzB,MAAMyB;aAExBZ,CAAAA,CAAAA,GAAG,CAAC,eAAA,EAAiBb,KAAM0B,CAAAA,aAAa,CACxClC,CAAAA,aAAa,CAAC,IAAI,CAACC,iBAAiB,CAACsC,aAAAA,CAAAA,CAAAA;YAExC,OAAO3C,WAAAA;AACT,SAAA;AAEAwD,QAAAA,iBAAAA,CAAAA,CAA6B1E,GAAW,EAAA;AACtC,YAAA,IAAI,CAAC,IAAI,CAACI,YAAY,CAACF,GAAG,CAACF,GAAM,CAAA,EAAA;AAC/B,gBAAA,MAAM,IAAIX,gBAAiB,CAAA,sBAAA,CAAA;AAC7B;AAEA,YAAA,IAAI,CAACsF,UAAU,CAACtD,OAAO,CAAC,CAACuD,KAAAA,GAAAA;AACvBA,gBAAAA,KAAAA,CAAMC,iBAAiB,CAAC7E,GAAAA,CAAAA;AAC1B,aAAA,CAAA;AAEA,YAAA,IAAI,CAACI,YAAY,CAACiB,OAAO,CAAC,CAACyD,EAAAA,GAAAA;AACzBA,gBAAAA,EAAAA,CAAGD,iBAAiB,CAAC7E,GAAAA,CAAAA;AACvB,aAAA,CAAA;AAEA,YAAA,OAAO,IAAI,CAACI,YAAY,CAACC,GAAG,CAACL,KAAK+E,MAAM,EAAA;AAC1C;AACF,KAAA;AACF;AAEA;;;;;;AAMC,IACD,MAAMhD,oBAAAA,GAAuB,CAAC,EAC5BG,YAAY,EAGb,GAA+B,CAAC,KAAK,EAAEA,YAAAA,CAAa,CAAC,EAAEA,aAAa,CAAC;AAEtE,MAAMxB,gBAAmB,GAAA,CAAC,EAAEX,GAAG,EAAEE,SAAS,EAAED,GAAG,EAAEO,eAAAA,GAAkB,EAAE,EAAO,GAAA;AAC1E,IAAA,MAAMyE,IAAY,GAAA;QAChBC,IAAM,EAAA,UAAA;QACN3E,MAAQN,EAAAA,GAAAA;QACRkF,OAAS3E,EAAAA,eAAAA,CAAgB2E,OAAO,IAAIvD,SAAAA;QACpC6B,aAAejD,EAAAA,eAAAA,CAAgBiD,aAAa,IAAI7B;AAClD,KAAA;AAEA,IAAA,OAAQ1B,UAAUyB,QAAQ;QACxB,KAAK,UAAA;AAAY,YAAA;AACfsD,gBAAAA,IAAAA,CAAKtD,QAAQ,GAAG,UAAA;gBAEhB,IAAIzB,SAAAA,CAAU2B,QAAQ,EAAE;AACtBoD,oBAAAA,IAAAA,CAAKlE,QAAQ,GAAGf,GAAAA;iBACX,MAAA;AACLiF,oBAAAA,IAAAA,CAAKnE,UAAU,GAAGd,GAAAA;AACpB;AACA,gBAAA;AACF;QACA,KAAK,WAAA;AAAa,YAAA;AAChBiF,gBAAAA,IAAAA,CAAKtD,QAAQ,GAAG,WAAA;AAChBsD,gBAAAA,IAAAA,CAAKnE,UAAU,GAAGd,GAAAA;AAClB,gBAAA;AACF;QACA,KAAK,WAAA;AAAa,YAAA;AAChBiF,gBAAAA,IAAAA,CAAKtD,QAAQ,GAAG,WAAA;AAChBsD,gBAAAA,IAAAA,CAAKlE,QAAQ,GAAGf,GAAAA;AAChB,gBAAA;AACF;QACA,KAAK,YAAA;AAAc,YAAA;AACjBiF,gBAAAA,IAAAA,CAAKtD,QAAQ,GAAG,YAAA;gBAEhB,IAAIzB,SAAAA,CAAU2B,QAAQ,EAAE;AACtBoD,oBAAAA,IAAAA,CAAKlE,QAAQ,GAAGf,GAAAA;iBACX,MAAA;AACLiF,oBAAAA,IAAAA,CAAKnE,UAAU,GAAGd,GAAAA;AACpB;AAEA,gBAAA;AACF;AAEF;;IAGA,MAAM,EAAEkF,IAAI,EAAEvD,QAAQ,EAAEpB,MAAM,EAAE,GAAG6E,WAAAA,EAAa,GAAGH,IAAAA;IAEnD,OAAO;AACLC,QAAAA,IAAAA;AACAvD,QAAAA,QAAAA;AACApB,QAAAA,MAAAA;AACA,QAAA,GAAG6E;AACL,KAAA;AACF,CAAA;;;;"}
1	+ {"version":3,"file":"content-type-builder.js","sources":["../../../../server/src/services/schema-builder/content-type-builder.ts"],"sourcesContent":["import path from 'path';\nimport _ from 'lodash';\n\nimport { strings, errors } from '@strapi/utils';\nimport type { Schema, Internal } from '@strapi/types';\nimport { isRelation, isConfigurable } from '../../utils/attributes';\nimport { typeKinds } from '../constants';\nimport createSchemaHandler from './schema-handler';\nimport { CreateContentTypeInput } from '../../controllers/validation/content-type';\nimport type { InternalRelationAttribute, InternalAttribute } from './types';\n\nconst { ApplicationError } = errors;\n\nconst reuseUnsetPreviousProperties = (\n newAttribute: Schema.Attribute.AnyAttribute,\n oldAttribute: Schema.Attribute.AnyAttribute\n) => {\n _.defaults(\n newAttribute,\n _.omit(oldAttribute, [\n 'configurable',\n 'required',\n 'private',\n 'unique',\n 'pluginOptions',\n 'inversedBy',\n 'mappedBy',\n 'conditions', // Don't automatically preserve conditions\n ])\n );\n};\n\nexport default function createComponentBuilder() {\n return {\n setRelation(\n this: any,\n { key, uid, attribute }: { key: string; uid: string; attribute: InternalRelationAttribute }\n ) {\n if (!_.has(attribute, 'target')) {\n return;\n }\n\n const targetCT = this.contentTypes.get(attribute.target);\n\n if (!targetCT) {\n throw new ApplicationError(`Content type ${attribute.target} not found`);\n }\n\n const targetAttribute = targetCT.getAttribute(attribute.targetAttribute);\n\n if (!attribute.targetAttribute) {\n return;\n }\n\n // When generating the inverse relation, preserve existing conditions if they exist\n // If the target attribute already exists and has conditions, preserve them\n const targetAttributeData = targetAttribute \|\| {};\n\n // If the source doesn't have conditions but the target does, preserve target's conditions\n\n targetCT.setAttribute(\n attribute.targetAttribute,\n generateRelation({ key, attribute, uid, targetAttribute: targetAttributeData })\n );\n },\n\n unsetRelation(\n this: any,\n attribute: Schema.Attribute.Relation<Schema.Attribute.RelationKind.Any>\n ) {\n if (!('target' in attribute) \|\| !attribute.target) {\n return;\n }\n\n const targetCT = this.contentTypes.get(attribute.target);\n\n const relationAttribute = attribute as InternalRelationAttribute;\n const targetAttributeName = relationAttribute.inversedBy \|\| relationAttribute.mappedBy;\n const targetAttribute = targetCT.getAttribute(targetAttributeName);\n\n if (!targetAttribute) return;\n\n return targetCT.deleteAttribute(targetAttributeName);\n },\n\n createContentTypeAttributes(\n this: any,\n uid: string,\n attributes: CreateContentTypeInput['attributes']\n ) {\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n const contentType = this.contentTypes.get(uid);\n\n // support self referencing content type relation\n Object.keys(attributes).forEach((key) => {\n const { target } = attributes[key];\n if (target === '__self__') {\n attributes[key].target = uid;\n }\n });\n\n contentType.setAttributes(this.convertAttributes(attributes));\n\n Object.keys(attributes).forEach((key) => {\n const attribute = attributes[key] as InternalAttribute;\n\n if (isRelation(attribute)) {\n const relationAttribute = attribute as InternalRelationAttribute;\n if (['manyToMany', 'oneToOne'].includes(relationAttribute.relation)) {\n if (\n relationAttribute.target === uid &&\n relationAttribute.targetAttribute !== undefined\n ) {\n // self referencing relation\n const targetAttribute = attributes[\n relationAttribute.targetAttribute\n ] as InternalRelationAttribute;\n\n if (targetAttribute.dominant === undefined) {\n relationAttribute.dominant = true;\n } else {\n relationAttribute.dominant = false;\n }\n } else {\n relationAttribute.dominant = true;\n }\n }\n\n this.setRelation({\n key,\n uid,\n attribute: relationAttribute,\n });\n }\n });\n\n return contentType;\n },\n\n /*\n Creates a content type in memory to be written to files later on\n /\n createContentType(this: any, infos: CreateContentTypeInput) {\n // TODO:: check for unique uid / singularName & pluralName & collectionName\n\n if (infos.uid && infos.uid !== createContentTypeUID(infos)) {\n throw new ApplicationError('contentType.invalidUID');\n }\n\n const uid = infos.uid ?? createContentTypeUID(infos);\n\n if (this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.alreadyExists');\n }\n\n const contentType = createSchemaHandler({\n modelName: infos.singularName,\n dir: path.join(\n strapi.dirs.app.api,\n infos.singularName,\n 'content-types',\n infos.singularName\n ),\n filename: `schema.json`,\n });\n\n this.contentTypes.set(uid, contentType);\n\n contentType\n .setUID(uid)\n .set('kind', infos.kind \|\| typeKinds.COLLECTION_TYPE)\n .set(\n 'collectionName',\n infos.collectionName \|\| strings.nameToCollectionName(infos.pluralName)\n )\n .set('info', {\n singularName: infos.singularName,\n pluralName: infos.pluralName,\n displayName: infos.displayName,\n description: infos.description,\n })\n .set('options', {\n ...(infos.options ?? {}),\n draftAndPublish: infos.draftAndPublish,\n })\n .set('pluginOptions', infos.pluginOptions)\n .set('config', infos.config);\n\n this.createContentTypeAttributes(uid, infos.attributes);\n\n return contentType;\n },\n\n editContentType(this: any, infos: any) {\n const { uid } = infos;\n\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n const contentType = this.contentTypes.get(uid);\n\n const oldAttributes = contentType.schema.attributes;\n\n const newAttributes = _.omitBy(infos.attributes, (attr, key) => {\n return _.has(oldAttributes, key) && !isConfigurable(oldAttributes[key]);\n });\n\n const newKeys = _.difference(Object.keys(newAttributes), Object.keys(oldAttributes));\n const deletedKeys = _.difference(Object.keys(oldAttributes), Object.keys(newAttributes));\n const remainingKeys = _.intersection(Object.keys(oldAttributes), Object.keys(newAttributes));\n\n // remove old relations\n deletedKeys.forEach((key) => {\n const attribute = oldAttributes[key];\n\n // if the old relation has a target attribute. we need to remove it in the target type\n if (isConfigurable(attribute) && isRelation(attribute)) {\n const relationAttribute = attribute as InternalRelationAttribute;\n const targetAttributeName = relationAttribute.inversedBy \|\| relationAttribute.mappedBy;\n\n if (targetAttributeName !== null && targetAttributeName !== undefined) {\n this.unsetRelation(attribute);\n }\n }\n });\n\n remainingKeys.forEach((key) => {\n const oldAttribute = oldAttributes[key];\n const newAttribute = newAttributes[key] as InternalAttribute;\n\n if (!isRelation(oldAttribute) && isRelation(newAttribute)) {\n return this.setRelation({\n key,\n uid,\n attribute: newAttribute as InternalRelationAttribute,\n });\n }\n\n if (isRelation(oldAttribute) && !isRelation(newAttribute)) {\n return this.unsetRelation(oldAttribute);\n }\n\n if (isRelation(oldAttribute) && isRelation(newAttribute)) {\n const relationAttribute = newAttribute as InternalRelationAttribute;\n const oldRelationAttribute = oldAttribute as InternalRelationAttribute;\n const oldTargetAttributeName =\n oldRelationAttribute.inversedBy \|\| oldRelationAttribute.mappedBy;\n\n const sameRelation = oldAttribute.relation === relationAttribute.relation;\n const targetAttributeHasChanged =\n oldTargetAttributeName !== relationAttribute.targetAttribute;\n\n if (!sameRelation \|\| targetAttributeHasChanged) {\n this.unsetRelation(oldAttribute);\n }\n\n // keep extra options that were set manually on oldAttribute\n reuseUnsetPreviousProperties(relationAttribute, oldAttribute);\n\n // Handle conditions explicitly - only preserve if present and not undefined in new attribute\n const newAttributeFromInfos = newAttributes[key];\n const hasNewConditions =\n newAttributeFromInfos.conditions !== undefined &&\n newAttributeFromInfos.conditions !== null;\n\n if (oldAttribute.conditions) {\n if (hasNewConditions) {\n // Conditions are still present, keep them\n relationAttribute.conditions = newAttributeFromInfos.conditions;\n } else {\n // Conditions were removed (undefined or null), ensure they're not preserved\n delete relationAttribute.conditions;\n }\n } else if (hasNewConditions) {\n // New conditions added\n relationAttribute.conditions = newAttributeFromInfos.conditions;\n }\n\n if (oldRelationAttribute.inversedBy) {\n relationAttribute.dominant = true;\n } else if (oldRelationAttribute.mappedBy) {\n relationAttribute.dominant = false;\n }\n\n return this.setRelation({\n key,\n uid,\n attribute: relationAttribute,\n });\n }\n });\n\n // add new relations\n newKeys.forEach((key) => {\n const attribute = newAttributes[key] as InternalAttribute;\n\n if (isRelation(attribute)) {\n const relationAttribute = attribute as InternalRelationAttribute;\n if (['manyToMany', 'oneToOne'].includes(relationAttribute.relation)) {\n if (\n relationAttribute.target === uid &&\n relationAttribute.targetAttribute !== undefined\n ) {\n // self referencing relation\n const targetAttribute = newAttributes[\n relationAttribute.targetAttribute\n ] as InternalRelationAttribute;\n\n if (targetAttribute.dominant === undefined) {\n relationAttribute.dominant = true;\n } else {\n relationAttribute.dominant = false;\n }\n } else {\n relationAttribute.dominant = true;\n }\n }\n\n this.setRelation({\n key,\n uid,\n attribute: relationAttribute,\n });\n }\n });\n\n contentType\n .set('kind', infos.kind \|\| contentType.schema.kind)\n .set(['info', 'displayName'], infos.displayName)\n .set(['info', 'description'], infos.description)\n .set('options', {\n ...(infos.options ?? {}),\n draftAndPublish: infos.draftAndPublish,\n })\n .set('pluginOptions', infos.pluginOptions)\n .setAttributes(this.convertAttributes(newAttributes));\n\n return contentType;\n },\n\n deleteContentType(this: any, uid: string) {\n if (!this.contentTypes.has(uid)) {\n throw new ApplicationError('contentType.notFound');\n }\n\n this.components.forEach((compo: any) => {\n compo.removeContentType(uid);\n });\n\n this.contentTypes.forEach((ct: any) => {\n ct.removeContentType(uid);\n });\n\n return this.contentTypes.get(uid).delete();\n },\n };\n}\n\n/\n Returns a uid from a content type infos\n \n @param {object} options options\n * @param {string} options.singularName content-type singularName\n * @returns {string} uid\n */\nconst createContentTypeUID = ({\n singularName,\n}: {\n singularName: string;\n}): Internal.UID.ContentType => `api::${singularName}.${singularName}`;\n\nconst generateRelation = ({\n key,\n attribute,\n uid,\n targetAttribute = {},\n}: {\n key: string;\n attribute: InternalRelationAttribute;\n uid: string;\n targetAttribute?: Partial<InternalRelationAttribute>;\n}) => {\n const opts: any = {\n type: 'relation',\n target: uid,\n private: targetAttribute.private \|\| undefined,\n pluginOptions: targetAttribute.pluginOptions \|\| undefined,\n // Preserve conditions from targetAttribute if they exist\n // This allows each side of the relation to maintain its own conditions\n ...(targetAttribute.conditions && { conditions: targetAttribute.conditions }),\n };\n\n switch (attribute.relation) {\n case 'oneToOne': {\n opts.relation = 'oneToOne';\n\n if (attribute.dominant) {\n opts.mappedBy = key;\n } else {\n opts.inversedBy = key;\n }\n break;\n }\n case 'oneToMany': {\n opts.relation = 'manyToOne';\n opts.inversedBy = key;\n break;\n }\n case 'manyToOne': {\n opts.relation = 'oneToMany';\n opts.mappedBy = key;\n break;\n }\n case 'manyToMany': {\n opts.relation = 'manyToMany';\n\n if (attribute.dominant) {\n opts.mappedBy = key;\n } else {\n opts.inversedBy = key;\n }\n\n break;\n }\n default:\n }\n\n // we do this just to make sure we have the same key order when writing to files\n const { type, relation, target, ...restOptions } = opts;\n\n const result = {\n type,\n relation,\n target,\n ...restOptions,\n };\n\n return result;\n};\n"],"names":["ApplicationError","errors","reuseUnsetPreviousProperties","newAttribute","oldAttribute","_","defaults","omit","createComponentBuilder","setRelation","key","uid","attribute","has","targetCT","contentTypes","get","target","targetAttribute","getAttribute","targetAttributeData","setAttribute","generateRelation","unsetRelation","relationAttribute","targetAttributeName","inversedBy","mappedBy","deleteAttribute","createContentTypeAttributes","attributes","contentType","Object","keys","forEach","setAttributes","convertAttributes","isRelation","includes","relation","undefined","dominant","createContentType","infos","createContentTypeUID","createSchemaHandler","modelName","singularName","dir","path","join","strapi","dirs","app","api","filename","set","setUID","kind","typeKinds","COLLECTION_TYPE","collectionName","strings","nameToCollectionName","pluralName","displayName","description","options","draftAndPublish","pluginOptions","config","editContentType","oldAttributes","schema","newAttributes","omitBy","attr","isConfigurable","newKeys","difference","deletedKeys","remainingKeys","intersection","oldRelationAttribute","oldTargetAttributeName","sameRelation","targetAttributeHasChanged","newAttributeFromInfos","hasNewConditions","conditions","deleteContentType","components","compo","removeContentType","ct","delete","opts","type","private","restOptions","result"],"mappings":"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"}

package/dist/server/services/schema-builder/content-type-builder.mjs CHANGED Viewed

@@ -14,7 +14,8 @@ const reuseUnsetPreviousProperties = (newAttribute, oldAttribute)=>{
         'unique',
         'pluginOptions',
         'inversedBy',
-        'mappedBy'
+        'mappedBy',
+        'conditions'
     ]));
 };
 function createComponentBuilder() {
@@ -31,19 +32,24 @@ function createComponentBuilder() {
             if (!attribute.targetAttribute) {
                 return;
             }
+            // When generating the inverse relation, preserve existing conditions if they exist
+            // If the target attribute already exists and has conditions, preserve them
+            const targetAttributeData = targetAttribute || {};
+            // If the source doesn't have conditions but the target does, preserve target's conditions
             targetCT.setAttribute(attribute.targetAttribute, generateRelation({
                 key,
                 attribute,
                 uid,
-                targetAttribute
+                targetAttribute: targetAttributeData
             }));
         },
         unsetRelation (attribute) {
-            if (!_.has(attribute, 'target')) {
+            if (!('target' in attribute) || !attribute.target) {
                 return;
             }
             const targetCT = this.contentTypes.get(attribute.target);
-            const targetAttributeName = attribute.inversedBy || attribute.mappedBy;
+            const relationAttribute = attribute;
+            const targetAttributeName = relationAttribute.inversedBy || relationAttribute.mappedBy;
             const targetAttribute = targetCT.getAttribute(targetAttributeName);
             if (!targetAttribute) return;
             return targetCT.deleteAttribute(targetAttributeName);
@@ -64,26 +70,27 @@ function createComponentBuilder() {
             Object.keys(attributes).forEach((key)=>{
                 const attribute = attributes[key];
                 if (isRelation(attribute)) {
+                    const relationAttribute = attribute;
                     if ([
                         'manyToMany',
                         'oneToOne'
-                    ].includes(attribute.relation)) {
-                        if (attribute.target === uid && attribute.targetAttribute !== undefined) {
+                    ].includes(relationAttribute.relation)) {
+                        if (relationAttribute.target === uid && relationAttribute.targetAttribute !== undefined) {
                             // self referencing relation
-                            const targetAttribute = attributes[attribute.targetAttribute];
+                            const targetAttribute = attributes[relationAttribute.targetAttribute];
                             if (targetAttribute.dominant === undefined) {
-                                attribute.dominant = true;
+                                relationAttribute.dominant = true;
                             } else {
-                                attribute.dominant = false;
+                                relationAttribute.dominant = false;
                             }
                         } else {
-                            attribute.dominant = true;
+                            relationAttribute.dominant = true;
                         }
                     }
                     this.setRelation({
                         key,
                         uid,
-                        attribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -134,10 +141,13 @@ function createComponentBuilder() {
             // remove old relations
             deletedKeys.forEach((key)=>{
                 const attribute = oldAttributes[key];
-                const targetAttributeName = attribute.inversedBy || attribute.mappedBy;
                 // if the old relation has a target attribute. we need to remove it in the target type
-                if (isConfigurable(attribute) && isRelation(attribute) && !_.isNil(targetAttributeName)) {
-                    this.unsetRelation(attribute);
+                if (isConfigurable(attribute) && isRelation(attribute)) {
+                    const relationAttribute = attribute;
+                    const targetAttributeName = relationAttribute.inversedBy || relationAttribute.mappedBy;
+                    if (targetAttributeName !== null && targetAttributeName !== undefined) {
+                        this.unsetRelation(attribute);
+                    }
                 }
             });
             remainingKeys.forEach((key)=>{
@@ -147,30 +157,47 @@ function createComponentBuilder() {
                     return this.setRelation({
                         key,
                         uid,
-                        attribute: newAttributes[key]
+                        attribute: newAttribute
                     });
                 }
                 if (isRelation(oldAttribute) && !isRelation(newAttribute)) {
                     return this.unsetRelation(oldAttribute);
                 }
                 if (isRelation(oldAttribute) && isRelation(newAttribute)) {
-                    const oldTargetAttributeName = oldAttribute.inversedBy || oldAttribute.mappedBy;
-                    const sameRelation = oldAttribute.relation === newAttribute.relation;
-                    const targetAttributeHasChanged = oldTargetAttributeName !== newAttribute.targetAttribute;
+                    const relationAttribute = newAttribute;
+                    const oldRelationAttribute = oldAttribute;
+                    const oldTargetAttributeName = oldRelationAttribute.inversedBy || oldRelationAttribute.mappedBy;
+                    const sameRelation = oldAttribute.relation === relationAttribute.relation;
+                    const targetAttributeHasChanged = oldTargetAttributeName !== relationAttribute.targetAttribute;
                     if (!sameRelation || targetAttributeHasChanged) {
                         this.unsetRelation(oldAttribute);
                     }
                     // keep extra options that were set manually on oldAttribute
-                    reuseUnsetPreviousProperties(newAttribute, oldAttribute);
-                    if (oldAttribute.inversedBy) {
-                        newAttribute.dominant = true;
-                    } else if (oldAttribute.mappedBy) {
-                        newAttribute.dominant = false;
+                    reuseUnsetPreviousProperties(relationAttribute, oldAttribute);
+                    // Handle conditions explicitly - only preserve if present and not undefined in new attribute
+                    const newAttributeFromInfos = newAttributes[key];
+                    const hasNewConditions = newAttributeFromInfos.conditions !== undefined && newAttributeFromInfos.conditions !== null;
+                    if (oldAttribute.conditions) {
+                        if (hasNewConditions) {
+                            // Conditions are still present, keep them
+                            relationAttribute.conditions = newAttributeFromInfos.conditions;
+                        } else {
+                            // Conditions were removed (undefined or null), ensure they're not preserved
+                            delete relationAttribute.conditions;
+                        }
+                    } else if (hasNewConditions) {
+                        // New conditions added
+                        relationAttribute.conditions = newAttributeFromInfos.conditions;
+                    }
+                    if (oldRelationAttribute.inversedBy) {
+                        relationAttribute.dominant = true;
+                    } else if (oldRelationAttribute.mappedBy) {
+                        relationAttribute.dominant = false;
                     }
                     return this.setRelation({
                         key,
                         uid,
-                        attribute: newAttribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -178,26 +205,27 @@ function createComponentBuilder() {
             newKeys.forEach((key)=>{
                 const attribute = newAttributes[key];
                 if (isRelation(attribute)) {
+                    const relationAttribute = attribute;
                     if ([
                         'manyToMany',
                         'oneToOne'
-                    ].includes(attribute.relation)) {
-                        if (attribute.target === uid && attribute.targetAttribute !== undefined) {
+                    ].includes(relationAttribute.relation)) {
+                        if (relationAttribute.target === uid && relationAttribute.targetAttribute !== undefined) {
                             // self referencing relation
-                            const targetAttribute = newAttributes[attribute.targetAttribute];
+                            const targetAttribute = newAttributes[relationAttribute.targetAttribute];
                             if (targetAttribute.dominant === undefined) {
-                                attribute.dominant = true;
+                                relationAttribute.dominant = true;
                             } else {
-                                attribute.dominant = false;
+                                relationAttribute.dominant = false;
                             }
                         } else {
-                            attribute.dominant = true;
+                            relationAttribute.dominant = true;
                         }
                     }
                     this.setRelation({
                         key,
                         uid,
-                        attribute
+                        attribute: relationAttribute
                     });
                 }
             });
@@ -239,7 +267,12 @@ const generateRelation = ({ key, attribute, uid, targetAttribute = {} })=>{
         type: 'relation',
         target: uid,
         private: targetAttribute.private || undefined,
-        pluginOptions: targetAttribute.pluginOptions || undefined
+        pluginOptions: targetAttribute.pluginOptions || undefined,
+        // Preserve conditions from targetAttribute if they exist
+        // This allows each side of the relation to maintain its own conditions
+        ...targetAttribute.conditions && {
+            conditions: targetAttribute.conditions
+        }
     };
     switch(attribute.relation){
         case 'oneToOne':
@@ -277,12 +310,13 @@ const generateRelation = ({ key, attribute, uid, targetAttribute = {} })=>{
     }
     // we do this just to make sure we have the same key order when writing to files
     const { type, relation, target, ...restOptions } = opts;
-    return {
+    const result = {
         type,
         relation,
         target,
         ...restOptions
     };
+    return result;
 };
 export { createComponentBuilder as default };