@strapi/content-type-builder 5.54.0 → 5.55.1

package/dist/server/services/schema.js

@@ -3,6 +3,7 @@
 var utils = require('@strapi/utils');
 var fp = require('lodash/fp');
 var index = require('./schema-builder/index.js');
+var schemaMutation = require('./schema-mutation.js');
 var index$1 = require('../utils/index.js');
 var contentTypes = require('./content-types.js');
 
@@ -104,7 +105,10 @@ const getSchema = async ()=>{
             attributes: formatAttributes(component)
         };
     }, strapi.components);
+    const coreContentStructure = strapi.get('content-structure');
+    const contentStructure = await coreContentStructure.getCleanedFile();
     return {
+        contentStructure,
         contentTypes: contentTypes$1,
         components
     };
@@ -112,105 +116,156 @@ const getSchema = async ()=>{
 const updateSchema = async (schema)=>{
     const builder = index();
     const apiHandler = index$1.getService('api-handler');
-    const { components, contentTypes } = schema;
+    const { components, contentTypes: contentTypes$1, contentStructure } = schema;
+    // Reject protected/plugin deletes before builders, API backups, or folder reconciliation can
+    // mutate anything. This is the server-side invariant for crafted update requests.
+    contentTypes$1.filter((contentType)=>contentType.action === 'delete').forEach((contentType)=>contentTypes.assertCTBOwnedApplicationContentType(contentType.uid));
     // pre-process data
     removeEmptyDefaultsOnUpdates(schema);
     removeDeletedUIDTargetFieldsOnUpdates(schema);
-    // we pre create empty typesk
-    for (const contentType of contentTypes){
-        if (contentType.action === 'create') {
-            builder.createContentType({
-                ...contentType,
-                attributes: {}
-            });
+    const upsertedUids = new Map();
+    const deletedUids = new Set();
+    const generatedApiNames = [];
+    const backedUpApiUids = [];
+    let schemaAlreadyRolledBack = false;
+    const APIsToDelete = contentTypes$1.filter((contentType)=>contentType.action === 'delete').map((contentType)=>contentType.uid);
+    try {
+        for (const contentType of contentTypes$1){
+            if (contentType.action === 'create') {
+                upsertedUids.set(contentType.uid, contentType.kind ?? 'collectionType');
+            } else if (contentType.action === 'update' && contentType.kind) {
+                // A kind switch in the same save must override the registry's stale kind,
+                // otherwise a folder assignment into the new section fails validation.
+                upsertedUids.set(contentType.uid, contentType.kind);
+            } else if (contentType.action === 'delete') {
+                deletedUids.add(contentType.uid);
+            }
         }
-    }
-    // we pre create empty types
-    for (const component of components){
-        if (component.action === 'create') {
-            builder.createComponent({
-                ...component,
-                attributes: {}
-            });
+        // Validate folder references before anything is written. This will throw if invalid.
+        index$1.getService('content-structure').validateFromUpdate({
+            incomingStructure: contentStructure,
+            upsertedUids,
+            deletedUids
+        });
+        // we pre create empty typesk
+        for (const contentType of contentTypes$1){
+            if (contentType.action === 'create') {
+                builder.createContentType({
+                    ...contentType,
+                    attributes: {}
+                });
+            }
         }
-    }
-    for (const contentType of contentTypes){
-        const { action, uid } = contentType;
-        if (action === 'create') {
-            builder.createContentTypeAttributes(uid, contentType.attributes.reduce((acc, attr)=>{
-                acc[attr.name] = attr.properties;
-                return acc;
-            }, {}));
-            if (!contentType.plugin) {
-                await index$1.getService('content-types').generateAPI({
-                    displayName: contentType.displayName,
-                    singularName: contentType.singularName,
-                    pluralName: contentType.pluralName,
-                    kind: contentType.kind
+        // we pre create empty types
+        for (const component of components){
+            if (component.action === 'create') {
+                builder.createComponent({
+                    ...component,
+                    attributes: {}
                 });
             }
         }
-        if (action === 'update') {
-            builder.editContentType({
-                ...contentType,
-                attributes: contentType.attributes.reduce((acc, attr)=>{
-                    // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name
-                    if (attr.action === 'delete') {
-                        return acc;
-                    }
+        for (const contentType of contentTypes$1){
+            const { action, uid } = contentType;
+            if (action === 'create') {
+                builder.createContentTypeAttributes(uid, contentType.attributes.reduce((acc, attr)=>{
                     acc[attr.name] = attr.properties;
                     return acc;
-                }, {})
-            });
-        }
-        if (action === 'delete') {
-            builder.deleteContentType(uid);
-            await apiHandler.backup(uid);
-        }
-    }
-    for (const component of components){
-        const { action, uid } = component;
-        if (action === 'create') {
-            builder.createComponentAttributes(uid, component.attributes.reduce((acc, attr)=>{
-                acc[attr.name] = attr.properties;
-                return acc;
-            }, {}));
-        }
-        if (action === 'update') {
-            builder.editComponent({
-                ...component,
-                attributes: component.attributes.reduce((acc, attr)=>{
-                    if (attr.action === 'delete') {
+                }, {}));
+                if (!contentType.plugin) {
+                    // Track before generation because a generator failure can leave a partial skeleton.
+                    generatedApiNames.push(contentType.singularName);
+                    await index$1.getService('content-types').generateAPI({
+                        displayName: contentType.displayName,
+                        singularName: contentType.singularName,
+                        pluralName: contentType.pluralName,
+                        kind: contentType.kind
+                    });
+                }
+            }
+            if (action === 'update') {
+                builder.editContentType({
+                    ...contentType,
+                    attributes: contentType.attributes.reduce((acc, attr)=>{
+                        // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name
+                        if (attr.action === 'delete') {
+                            return acc;
+                        }
+                        acc[attr.name] = attr.properties;
                         return acc;
-                    }
+                    }, {})
+                });
+            }
+            if (action === 'delete') {
+                builder.deleteContentType(uid);
+                await apiHandler.backup(uid);
+                backedUpApiUids.push(uid);
+            }
+        }
+        for (const component of components){
+            const { action, uid } = component;
+            if (action === 'create') {
+                builder.createComponentAttributes(uid, component.attributes.reduce((acc, attr)=>{
                     acc[attr.name] = attr.properties;
                     return acc;
-                }, {})
-            });
+                }, {}));
+            }
+            if (action === 'update') {
+                builder.editComponent({
+                    ...component,
+                    attributes: component.attributes.reduce((acc, attr)=>{
+                        if (attr.action === 'delete') {
+                            return acc;
+                        }
+                        acc[attr.name] = attr.properties;
+                        return acc;
+                    }, {})
+                });
+            }
+            if (action === 'delete') {
+                builder.deleteComponent(uid);
+            }
         }
-        if (action === 'delete') {
-            builder.deleteComponent(uid);
+        // run sanity checks on the schema
+        // Relations target existing types
+        // Bidirectional relation have their counterpart in the schema
+        // Components target existing components
+        // Nested components target existing components
+        // Dynamic zones target existing components
+        const schemaFilesWritten = await builder.writeFiles();
+        if (!schemaFilesWritten) {
+            schemaAlreadyRolledBack = true;
+            throw new utils.errors.ApplicationError('Invalid schema edition');
         }
-    }
-    // run sanity checks on the schema
-    // Relations target existing types
-    // Bidirectional relation have their counterpart in the schema
-    // Components target existing components
-    // Nested components target existing components
-    // Dynamic zones target existing components
-    const APIsToDelete = contentTypes.filter((ct)=>ct.action === 'delete').map((ct)=>ct.uid);
-    await builder.writeFiles();
-    try {
         for (const uid of APIsToDelete){
-            await apiHandler.clear(uid);
+            await apiHandler.clear(uid, {
+                preserveBackup: true
+            });
         }
+        // Commit the single folder file last. Every preceding filesystem mutation can be restored.
+        await index$1.getService('content-structure').commitFromUpdate({
+            incomingStructure: contentStructure,
+            deletedUids
+        });
     } catch (error) {
+        await schemaMutation.rollbackSchemaMutation({
+            builder,
+            apiHandler,
+            backedUpApiUids,
+            generatedApiNames,
+            schemaAlreadyRolledBack
+        });
+        throw error;
+    }
+    // Backup cleanup is deliberately outside the compensating boundary: at this point all
+    // user-visible artifacts, including groups.json, have committed.
+    for (const error of (await schemaMutation.finalizeSchemaMutation({
+        apiHandler,
+        backedUpApiUids
+    }))){
         strapi.log.error(error);
-        for (const uid of APIsToDelete){
-            await apiHandler.rollback(uid);
-        }
     }
-    for (const contentType of contentTypes){
+    for (const contentType of contentTypes$1){
         if (contentType.action === 'delete') {
             strapi.eventHub.emit('content-type.delete', {
                 contentType: builder.contentTypes.get(contentType.uid)

package/dist/server/services/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sources":["../../../server/src/services/schema.ts"],"sourcesContent":["import { contentTypes as contentTypesUtils } from '@strapi/utils';\nimport { mapValues } from 'lodash/fp';\n\nimport type { Schema } from '@strapi/types';\n\nimport createBuilder from './schema-builder';\nimport { getService } from '../utils';\nimport type { Schema as CTBSchema } from '../controllers/validation/schema';\nimport { getRestrictRelationsTo, isContentTypeVisible } from './content-types';\n\nconst removeEmptyDefaultsOnUpdates = (schema: CTBSchema) => {\n  schema.components.forEach((component) => {\n    if (component.action === 'delete') {\n      return;\n    }\n\n    component.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if ('default' in properties && properties.default === '') {\n          properties.default = undefined;\n        }\n      }\n    });\n  });\n\n  schema.contentTypes.forEach((contentType) => {\n    if (contentType.action === 'delete') {\n      return;\n    }\n\n    contentType.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if ('default' in properties && properties.default === '') {\n          properties.default = undefined;\n        }\n      }\n    });\n  });\n};\n\nconst removeDeletedUIDTargetFieldsOnUpdates = (schema: CTBSchema) => {\n  schema.contentTypes.forEach((contentType) => {\n    if (contentType.action === 'delete') {\n      return;\n    }\n\n    contentType.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if (\n          properties.type === 'uid' &&\n          properties.targetField &&\n          !contentType.attributes.find((attr) => attr.name === properties.targetField)\n        ) {\n          properties.targetField = undefined;\n        }\n      }\n    });\n  });\n};\n\nconst formatAttributes = (model: any) => {\n  const { getVisibleAttributes } = contentTypesUtils;\n\n  // only get attributes that can be seen in the CTB\n  return getVisibleAttributes(model).map((key) => {\n    return { ...formatAttribute(model.attributes[key]), name: key };\n  });\n};\n\nexport const formatAttribute = (attribute: Schema.Attribute.AnyAttribute & Record<string, any>) => {\n  if (attribute.type === 'relation') {\n    return {\n      ...attribute,\n      targetAttribute: attribute.inversedBy || attribute.mappedBy || null,\n      // Explicitly preserve conditions if they exist\n      ...(attribute.conditions && { conditions: attribute.conditions }),\n    };\n  }\n\n  return attribute;\n};\n\nexport const getSchema = async () => {\n  const contentTypes = mapValues((contentType) => {\n    const {\n      uid,\n      options,\n      globalId,\n      pluginOptions,\n      kind,\n      modelName,\n      plugin,\n      collectionName,\n      info,\n      modelType,\n    } = contentType;\n\n    return {\n      uid,\n      modelName,\n      kind,\n      globalId,\n      options,\n      pluginOptions,\n      plugin,\n      collectionName,\n      info,\n      modelType,\n      attributes: formatAttributes(contentType),\n      visible: isContentTypeVisible(contentType),\n      restrictRelationsTo: getRestrictRelationsTo(contentType),\n    };\n  }, strapi.contentTypes);\n\n  const components = mapValues((component) => {\n    const { uid, globalId, modelName, collectionName, info, category, modelType } = component;\n\n    return {\n      uid,\n      modelName,\n      globalId,\n      modelType,\n      collectionName,\n      category,\n      info,\n      attributes: formatAttributes(component),\n    };\n  }, strapi.components);\n\n  return {\n    contentTypes,\n    components,\n  };\n};\n\nexport const updateSchema = async (schema: CTBSchema) => {\n  const builder = createBuilder();\n  const apiHandler = getService('api-handler');\n\n  const { components, contentTypes } = schema;\n\n  // pre-process data\n  removeEmptyDefaultsOnUpdates(schema);\n  removeDeletedUIDTargetFieldsOnUpdates(schema);\n\n  // we pre create empty typesk\n  for (const contentType of contentTypes) {\n    if (contentType.action === 'create') {\n      builder.createContentType({\n        ...contentType,\n        attributes: {},\n      });\n    }\n  }\n\n  // we pre create empty types\n  for (const component of components) {\n    if (component.action === 'create') {\n      builder.createComponent({\n        ...component,\n        attributes: {},\n      });\n    }\n  }\n\n  for (const contentType of contentTypes) {\n    const { action, uid } = contentType;\n\n    if (action === 'create') {\n      builder.createContentTypeAttributes(\n        uid,\n        contentType.attributes.reduce((acc: any, attr: any) => {\n          acc[attr.name] = attr.properties;\n          return acc;\n        }, {})\n      );\n\n      if (!contentType.plugin) {\n        await getService('content-types').generateAPI({\n          displayName: contentType!.displayName,\n          singularName: contentType!.singularName,\n          pluralName: contentType!.pluralName,\n          kind: contentType!.kind,\n        });\n      }\n    }\n\n    if (action === 'update') {\n      builder.editContentType({\n        ...contentType,\n        attributes: contentType.attributes.reduce((acc: any, attr: any) => {\n          // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name\n\n          if (attr.action === 'delete') {\n            return acc;\n          }\n\n          acc[attr.name] = attr.properties;\n          return acc;\n        }, {}),\n      });\n    }\n\n    if (action === 'delete') {\n      builder.deleteContentType(uid);\n      await apiHandler.backup(uid);\n    }\n  }\n\n  for (const component of components) {\n    const { action, uid } = component;\n\n    if (action === 'create') {\n      builder.createComponentAttributes(\n        uid,\n        component.attributes.reduce((acc: any, attr: any) => {\n          acc[attr.name] = attr.properties;\n          return acc;\n        }, {})\n      );\n    }\n\n    if (action === 'update') {\n      builder.editComponent({\n        ...component,\n        attributes: component.attributes.reduce((acc: any, attr: any) => {\n          if (attr.action === 'delete') {\n            return acc;\n          }\n\n          acc[attr.name] = attr.properties;\n          return acc;\n        }, {}),\n      });\n    }\n\n    if (action === 'delete') {\n      builder.deleteComponent(uid);\n    }\n  }\n\n  // run sanity checks on the schema\n  // Relations target existing types\n  // Bidirectional relation have their counterpart in the schema\n  // Components target existing components\n  // Nested components target existing components\n  // Dynamic zones target existing components\n\n  const APIsToDelete = contentTypes\n    .filter((ct: any) => ct.action === 'delete')\n    .map((ct: any) => ct.uid);\n\n  await builder.writeFiles();\n\n  try {\n    for (const uid of APIsToDelete) {\n      await apiHandler.clear(uid);\n    }\n  } catch (error) {\n    strapi.log.error(error);\n    for (const uid of APIsToDelete) {\n      await apiHandler.rollback(uid);\n    }\n  }\n\n  for (const contentType of contentTypes) {\n    if (contentType.action === 'delete') {\n      strapi.eventHub.emit('content-type.delete', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n\n    if (contentType.action === 'update') {\n      strapi.eventHub.emit('content-type.update', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n\n    if (contentType.action === 'create') {\n      strapi.eventHub.emit('content-type.create', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n  }\n\n  for (const component of components) {\n    if (component.action === 'delete') {\n      strapi.eventHub.emit('component.delete', {\n        component: builder.components.get(component.uid),\n      });\n    }\n\n    if (component.action === 'update') {\n      strapi.eventHub.emit('component.update', {\n        component: builder.components.get(component.uid),\n      });\n    }\n\n    if (component.action === 'create') {\n      strapi.eventHub.emit('component.create', {\n        component: builder.components.get(component.uid),\n      });\n    }\n  }\n};\n"],"names":["removeEmptyDefaultsOnUpdates","schema","components","forEach","component","action","attributes","attribute","properties","default","undefined","contentTypes","contentType","removeDeletedUIDTargetFieldsOnUpdates","type","targetField","find","attr","name","formatAttributes","model","getVisibleAttributes","contentTypesUtils","map","key","formatAttribute","targetAttribute","inversedBy","mappedBy","conditions","getSchema","mapValues","uid","options","globalId","pluginOptions","kind","modelName","plugin","collectionName","info","modelType","visible","isContentTypeVisible","restrictRelationsTo","getRestrictRelationsTo","strapi","category","updateSchema","builder","createBuilder","apiHandler","getService","createContentType","createComponent","createContentTypeAttributes","reduce","acc","generateAPI","displayName","singularName","pluralName","editContentType","deleteContentType","backup","createComponentAttributes","editComponent","deleteComponent","APIsToDelete","filter","ct","writeFiles","clear","error","log","rollback","eventHub","emit","get"],"mappings":"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"}
+{"version":3,"file":"schema.js","sources":["../../../server/src/services/schema.ts"],"sourcesContent":["import { contentTypes as contentTypesUtils, errors } from '@strapi/utils';\nimport { mapValues } from 'lodash/fp';\n\nimport type { Schema } from '@strapi/types';\n\nimport createBuilder from './schema-builder';\nimport { finalizeSchemaMutation, rollbackSchemaMutation } from './schema-mutation';\nimport { getService } from '../utils';\nimport type { Schema as CTBSchema } from '../controllers/validation/schema';\nimport {\n  assertCTBOwnedApplicationContentType,\n  getRestrictRelationsTo,\n  isContentTypeVisible,\n} from './content-types';\nimport type { CoreContentStructureService } from './content-structure';\n\ntype ContentTypeKind = 'collectionType' | 'singleType';\n\nconst removeEmptyDefaultsOnUpdates = (schema: CTBSchema) => {\n  schema.components.forEach((component) => {\n    if (component.action === 'delete') {\n      return;\n    }\n\n    component.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if ('default' in properties && properties.default === '') {\n          properties.default = undefined;\n        }\n      }\n    });\n  });\n\n  schema.contentTypes.forEach((contentType) => {\n    if (contentType.action === 'delete') {\n      return;\n    }\n\n    contentType.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if ('default' in properties && properties.default === '') {\n          properties.default = undefined;\n        }\n      }\n    });\n  });\n};\n\nconst removeDeletedUIDTargetFieldsOnUpdates = (schema: CTBSchema) => {\n  schema.contentTypes.forEach((contentType) => {\n    if (contentType.action === 'delete') {\n      return;\n    }\n\n    contentType.attributes.forEach((attribute) => {\n      if (attribute.action === 'update') {\n        const { properties } = attribute;\n\n        if (\n          properties.type === 'uid' &&\n          properties.targetField &&\n          !contentType.attributes.find((attr) => attr.name === properties.targetField)\n        ) {\n          properties.targetField = undefined;\n        }\n      }\n    });\n  });\n};\n\nconst formatAttributes = (model: any) => {\n  const { getVisibleAttributes } = contentTypesUtils;\n\n  // only get attributes that can be seen in the CTB\n  return getVisibleAttributes(model).map((key) => {\n    return { ...formatAttribute(model.attributes[key]), name: key };\n  });\n};\n\nexport const formatAttribute = (attribute: Schema.Attribute.AnyAttribute & Record<string, any>) => {\n  if (attribute.type === 'relation') {\n    return {\n      ...attribute,\n      targetAttribute: attribute.inversedBy || attribute.mappedBy || null,\n      // Explicitly preserve conditions if they exist\n      ...(attribute.conditions && { conditions: attribute.conditions }),\n    };\n  }\n\n  return attribute;\n};\n\nexport const getSchema = async () => {\n  const contentTypes = mapValues((contentType) => {\n    const {\n      uid,\n      options,\n      globalId,\n      pluginOptions,\n      kind,\n      modelName,\n      plugin,\n      collectionName,\n      info,\n      modelType,\n    } = contentType;\n\n    return {\n      uid,\n      modelName,\n      kind,\n      globalId,\n      options,\n      pluginOptions,\n      plugin,\n      collectionName,\n      info,\n      modelType,\n      attributes: formatAttributes(contentType),\n      visible: isContentTypeVisible(contentType),\n      restrictRelationsTo: getRestrictRelationsTo(contentType),\n    };\n  }, strapi.contentTypes);\n\n  const components = mapValues((component) => {\n    const { uid, globalId, modelName, collectionName, info, category, modelType } = component;\n\n    return {\n      uid,\n      modelName,\n      globalId,\n      modelType,\n      collectionName,\n      category,\n      info,\n      attributes: formatAttributes(component),\n    };\n  }, strapi.components);\n\n  const coreContentStructure: CoreContentStructureService = strapi.get('content-structure');\n  const contentStructure = await coreContentStructure.getCleanedFile();\n\n  return {\n    contentStructure,\n    contentTypes,\n    components,\n  };\n};\n\nexport const updateSchema = async (schema: CTBSchema) => {\n  const builder = createBuilder();\n  const apiHandler = getService('api-handler') as typeof import('./api-handler');\n\n  const { components, contentTypes, contentStructure } = schema;\n\n  // Reject protected/plugin deletes before builders, API backups, or folder reconciliation can\n  // mutate anything. This is the server-side invariant for crafted update requests.\n  contentTypes\n    .filter((contentType) => contentType.action === 'delete')\n    .forEach((contentType) => assertCTBOwnedApplicationContentType(contentType.uid));\n\n  // pre-process data\n  removeEmptyDefaultsOnUpdates(schema);\n  removeDeletedUIDTargetFieldsOnUpdates(schema);\n\n  const upsertedUids = new Map<string, ContentTypeKind>();\n  const deletedUids = new Set<string>();\n  const generatedApiNames: string[] = [];\n  const backedUpApiUids: string[] = [];\n  let schemaAlreadyRolledBack = false;\n  const APIsToDelete = contentTypes\n    .filter((contentType) => contentType.action === 'delete')\n    .map((contentType) => contentType.uid);\n\n  try {\n    for (const contentType of contentTypes) {\n      if (contentType.action === 'create') {\n        upsertedUids.set(contentType.uid, contentType.kind ?? 'collectionType');\n      } else if (contentType.action === 'update' && contentType.kind) {\n        // A kind switch in the same save must override the registry's stale kind,\n        // otherwise a folder assignment into the new section fails validation.\n        upsertedUids.set(contentType.uid, contentType.kind);\n      } else if (contentType.action === 'delete') {\n        deletedUids.add(contentType.uid);\n      }\n    }\n\n    // Validate folder references before anything is written. This will throw if invalid.\n    getService('content-structure').validateFromUpdate({\n      incomingStructure: contentStructure,\n      upsertedUids,\n      deletedUids,\n    });\n\n    // we pre create empty typesk\n    for (const contentType of contentTypes) {\n      if (contentType.action === 'create') {\n        builder.createContentType({\n          ...contentType,\n          attributes: {},\n        });\n      }\n    }\n\n    // we pre create empty types\n    for (const component of components) {\n      if (component.action === 'create') {\n        builder.createComponent({\n          ...component,\n          attributes: {},\n        });\n      }\n    }\n\n    for (const contentType of contentTypes) {\n      const { action, uid } = contentType;\n\n      if (action === 'create') {\n        builder.createContentTypeAttributes(\n          uid,\n          contentType.attributes.reduce((acc: any, attr: any) => {\n            acc[attr.name] = attr.properties;\n            return acc;\n          }, {})\n        );\n\n        if (!contentType.plugin) {\n          // Track before generation because a generator failure can leave a partial skeleton.\n          generatedApiNames.push(contentType.singularName);\n          await getService('content-types').generateAPI({\n            displayName: contentType!.displayName,\n            singularName: contentType!.singularName,\n            pluralName: contentType!.pluralName,\n            kind: contentType!.kind,\n          });\n        }\n      }\n\n      if (action === 'update') {\n        builder.editContentType({\n          ...contentType,\n          attributes: contentType.attributes.reduce((acc: any, attr: any) => {\n            // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name\n\n            if (attr.action === 'delete') {\n              return acc;\n            }\n\n            acc[attr.name] = attr.properties;\n            return acc;\n          }, {}),\n        });\n      }\n\n      if (action === 'delete') {\n        builder.deleteContentType(uid);\n        await apiHandler.backup(uid);\n        backedUpApiUids.push(uid);\n      }\n    }\n\n    for (const component of components) {\n      const { action, uid } = component;\n\n      if (action === 'create') {\n        builder.createComponentAttributes(\n          uid,\n          component.attributes.reduce((acc: any, attr: any) => {\n            acc[attr.name] = attr.properties;\n            return acc;\n          }, {})\n        );\n      }\n\n      if (action === 'update') {\n        builder.editComponent({\n          ...component,\n          attributes: component.attributes.reduce((acc: any, attr: any) => {\n            if (attr.action === 'delete') {\n              return acc;\n            }\n\n            acc[attr.name] = attr.properties;\n            return acc;\n          }, {}),\n        });\n      }\n\n      if (action === 'delete') {\n        builder.deleteComponent(uid);\n      }\n    }\n\n    // run sanity checks on the schema\n    // Relations target existing types\n    // Bidirectional relation have their counterpart in the schema\n    // Components target existing components\n    // Nested components target existing components\n    // Dynamic zones target existing components\n\n    const schemaFilesWritten = await builder.writeFiles();\n\n    if (!schemaFilesWritten) {\n      schemaAlreadyRolledBack = true;\n      throw new errors.ApplicationError('Invalid schema edition');\n    }\n\n    for (const uid of APIsToDelete) {\n      await apiHandler.clear(uid, { preserveBackup: true });\n    }\n\n    // Commit the single folder file last. Every preceding filesystem mutation can be restored.\n    await getService('content-structure').commitFromUpdate({\n      incomingStructure: contentStructure,\n      deletedUids,\n    });\n  } catch (error) {\n    await rollbackSchemaMutation({\n      builder,\n      apiHandler,\n      backedUpApiUids,\n      generatedApiNames,\n      schemaAlreadyRolledBack,\n    });\n\n    throw error;\n  }\n\n  // Backup cleanup is deliberately outside the compensating boundary: at this point all\n  // user-visible artifacts, including groups.json, have committed.\n  for (const error of await finalizeSchemaMutation({ apiHandler, backedUpApiUids })) {\n    strapi.log.error(error);\n  }\n\n  for (const contentType of contentTypes) {\n    if (contentType.action === 'delete') {\n      strapi.eventHub.emit('content-type.delete', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n\n    if (contentType.action === 'update') {\n      strapi.eventHub.emit('content-type.update', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n\n    if (contentType.action === 'create') {\n      strapi.eventHub.emit('content-type.create', {\n        contentType: builder.contentTypes.get(contentType.uid),\n      });\n    }\n  }\n\n  for (const component of components) {\n    if (component.action === 'delete') {\n      strapi.eventHub.emit('component.delete', {\n        component: builder.components.get(component.uid),\n      });\n    }\n\n    if (component.action === 'update') {\n      strapi.eventHub.emit('component.update', {\n        component: builder.components.get(component.uid),\n      });\n    }\n\n    if (component.action === 'create') {\n      strapi.eventHub.emit('component.create', {\n        component: builder.components.get(component.uid),\n      });\n    }\n  }\n};\n"],"names":["removeEmptyDefaultsOnUpdates","schema","components","forEach","component","action","attributes","attribute","properties","default","undefined","contentTypes","contentType","removeDeletedUIDTargetFieldsOnUpdates","type","targetField","find","attr","name","formatAttributes","model","getVisibleAttributes","contentTypesUtils","map","key","formatAttribute","targetAttribute","inversedBy","mappedBy","conditions","getSchema","mapValues","uid","options","globalId","pluginOptions","kind","modelName","plugin","collectionName","info","modelType","visible","isContentTypeVisible","restrictRelationsTo","getRestrictRelationsTo","strapi","category","coreContentStructure","get","contentStructure","getCleanedFile","updateSchema","builder","createBuilder","apiHandler","getService","filter","assertCTBOwnedApplicationContentType","upsertedUids","Map","deletedUids","Set","generatedApiNames","backedUpApiUids","schemaAlreadyRolledBack","APIsToDelete","set","add","validateFromUpdate","incomingStructure","createContentType","createComponent","createContentTypeAttributes","reduce","acc","push","singularName","generateAPI","displayName","pluralName","editContentType","deleteContentType","backup","createComponentAttributes","editComponent","deleteComponent","schemaFilesWritten","writeFiles","errors","ApplicationError","clear","preserveBackup","commitFromUpdate","error","rollbackSchemaMutation","finalizeSchemaMutation","log","eventHub","emit"],"mappings":"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"}

package/dist/server/services/schema.mjs

@@ -1,8 +1,9 @@
-import { contentTypes } from '@strapi/utils';
+import { errors, contentTypes } from '@strapi/utils';
 import { mapValues } from 'lodash/fp';
 import createBuilder from './schema-builder/index.mjs';
+import { rollbackSchemaMutation, finalizeSchemaMutation } from './schema-mutation.mjs';
 import { getService } from '../utils/index.mjs';
-import { getRestrictRelationsTo, isContentTypeVisible } from './content-types.mjs';
+import { getRestrictRelationsTo, isContentTypeVisible, assertCTBOwnedApplicationContentType } from './content-types.mjs';
 
 const removeEmptyDefaultsOnUpdates = (schema)=>{
     schema.components.forEach((component)=>{
@@ -102,7 +103,10 @@ const getSchema = async ()=>{
             attributes: formatAttributes(component)
         };
     }, strapi.components);
+    const coreContentStructure = strapi.get('content-structure');
+    const contentStructure = await coreContentStructure.getCleanedFile();
     return {
+        contentStructure,
         contentTypes,
         components
     };
@@ -110,103 +114,154 @@ const getSchema = async ()=>{
 const updateSchema = async (schema)=>{
     const builder = createBuilder();
     const apiHandler = getService('api-handler');
-    const { components, contentTypes } = schema;
+    const { components, contentTypes, contentStructure } = schema;
+    // Reject protected/plugin deletes before builders, API backups, or folder reconciliation can
+    // mutate anything. This is the server-side invariant for crafted update requests.
+    contentTypes.filter((contentType)=>contentType.action === 'delete').forEach((contentType)=>assertCTBOwnedApplicationContentType(contentType.uid));
     // pre-process data
     removeEmptyDefaultsOnUpdates(schema);
     removeDeletedUIDTargetFieldsOnUpdates(schema);
-    // we pre create empty typesk
-    for (const contentType of contentTypes){
-        if (contentType.action === 'create') {
-            builder.createContentType({
-                ...contentType,
-                attributes: {}
-            });
+    const upsertedUids = new Map();
+    const deletedUids = new Set();
+    const generatedApiNames = [];
+    const backedUpApiUids = [];
+    let schemaAlreadyRolledBack = false;
+    const APIsToDelete = contentTypes.filter((contentType)=>contentType.action === 'delete').map((contentType)=>contentType.uid);
+    try {
+        for (const contentType of contentTypes){
+            if (contentType.action === 'create') {
+                upsertedUids.set(contentType.uid, contentType.kind ?? 'collectionType');
+            } else if (contentType.action === 'update' && contentType.kind) {
+                // A kind switch in the same save must override the registry's stale kind,
+                // otherwise a folder assignment into the new section fails validation.
+                upsertedUids.set(contentType.uid, contentType.kind);
+            } else if (contentType.action === 'delete') {
+                deletedUids.add(contentType.uid);
+            }
         }
-    }
-    // we pre create empty types
-    for (const component of components){
-        if (component.action === 'create') {
-            builder.createComponent({
-                ...component,
-                attributes: {}
-            });
+        // Validate folder references before anything is written. This will throw if invalid.
+        getService('content-structure').validateFromUpdate({
+            incomingStructure: contentStructure,
+            upsertedUids,
+            deletedUids
+        });
+        // we pre create empty typesk
+        for (const contentType of contentTypes){
+            if (contentType.action === 'create') {
+                builder.createContentType({
+                    ...contentType,
+                    attributes: {}
+                });
+            }
         }
-    }
-    for (const contentType of contentTypes){
-        const { action, uid } = contentType;
-        if (action === 'create') {
-            builder.createContentTypeAttributes(uid, contentType.attributes.reduce((acc, attr)=>{
-                acc[attr.name] = attr.properties;
-                return acc;
-            }, {}));
-            if (!contentType.plugin) {
-                await getService('content-types').generateAPI({
-                    displayName: contentType.displayName,
-                    singularName: contentType.singularName,
-                    pluralName: contentType.pluralName,
-                    kind: contentType.kind
+        // we pre create empty types
+        for (const component of components){
+            if (component.action === 'create') {
+                builder.createComponent({
+                    ...component,
+                    attributes: {}
                 });
             }
         }
-        if (action === 'update') {
-            builder.editContentType({
-                ...contentType,
-                attributes: contentType.attributes.reduce((acc, attr)=>{
-                    // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name
-                    if (attr.action === 'delete') {
-                        return acc;
-                    }
+        for (const contentType of contentTypes){
+            const { action, uid } = contentType;
+            if (action === 'create') {
+                builder.createContentTypeAttributes(uid, contentType.attributes.reduce((acc, attr)=>{
                     acc[attr.name] = attr.properties;
                     return acc;
-                }, {})
-            });
-        }
-        if (action === 'delete') {
-            builder.deleteContentType(uid);
-            await apiHandler.backup(uid);
-        }
-    }
-    for (const component of components){
-        const { action, uid } = component;
-        if (action === 'create') {
-            builder.createComponentAttributes(uid, component.attributes.reduce((acc, attr)=>{
-                acc[attr.name] = attr.properties;
-                return acc;
-            }, {}));
-        }
-        if (action === 'update') {
-            builder.editComponent({
-                ...component,
-                attributes: component.attributes.reduce((acc, attr)=>{
-                    if (attr.action === 'delete') {
+                }, {}));
+                if (!contentType.plugin) {
+                    // Track before generation because a generator failure can leave a partial skeleton.
+                    generatedApiNames.push(contentType.singularName);
+                    await getService('content-types').generateAPI({
+                        displayName: contentType.displayName,
+                        singularName: contentType.singularName,
+                        pluralName: contentType.pluralName,
+                        kind: contentType.kind
+                    });
+                }
+            }
+            if (action === 'update') {
+                builder.editContentType({
+                    ...contentType,
+                    attributes: contentType.attributes.reduce((acc, attr)=>{
+                        // NOTE: handle renaming migrations here by comparing attr name & attr.properties.name
+                        if (attr.action === 'delete') {
+                            return acc;
+                        }
+                        acc[attr.name] = attr.properties;
                         return acc;
-                    }
+                    }, {})
+                });
+            }
+            if (action === 'delete') {
+                builder.deleteContentType(uid);
+                await apiHandler.backup(uid);
+                backedUpApiUids.push(uid);
+            }
+        }
+        for (const component of components){
+            const { action, uid } = component;
+            if (action === 'create') {
+                builder.createComponentAttributes(uid, component.attributes.reduce((acc, attr)=>{
                     acc[attr.name] = attr.properties;
                     return acc;
-                }, {})
-            });
+                }, {}));
+            }
+            if (action === 'update') {
+                builder.editComponent({
+                    ...component,
+                    attributes: component.attributes.reduce((acc, attr)=>{
+                        if (attr.action === 'delete') {
+                            return acc;
+                        }
+                        acc[attr.name] = attr.properties;
+                        return acc;
+                    }, {})
+                });
+            }
+            if (action === 'delete') {
+                builder.deleteComponent(uid);
+            }
         }
-        if (action === 'delete') {
-            builder.deleteComponent(uid);
+        // run sanity checks on the schema
+        // Relations target existing types
+        // Bidirectional relation have their counterpart in the schema
+        // Components target existing components
+        // Nested components target existing components
+        // Dynamic zones target existing components
+        const schemaFilesWritten = await builder.writeFiles();
+        if (!schemaFilesWritten) {
+            schemaAlreadyRolledBack = true;
+            throw new errors.ApplicationError('Invalid schema edition');
         }
-    }
-    // run sanity checks on the schema
-    // Relations target existing types
-    // Bidirectional relation have their counterpart in the schema
-    // Components target existing components
-    // Nested components target existing components
-    // Dynamic zones target existing components
-    const APIsToDelete = contentTypes.filter((ct)=>ct.action === 'delete').map((ct)=>ct.uid);
-    await builder.writeFiles();
-    try {
         for (const uid of APIsToDelete){
-            await apiHandler.clear(uid);
+            await apiHandler.clear(uid, {
+                preserveBackup: true
+            });
         }
+        // Commit the single folder file last. Every preceding filesystem mutation can be restored.
+        await getService('content-structure').commitFromUpdate({
+            incomingStructure: contentStructure,
+            deletedUids
+        });
     } catch (error) {
+        await rollbackSchemaMutation({
+            builder,
+            apiHandler,
+            backedUpApiUids,
+            generatedApiNames,
+            schemaAlreadyRolledBack
+        });
+        throw error;
+    }
+    // Backup cleanup is deliberately outside the compensating boundary: at this point all
+    // user-visible artifacts, including groups.json, have committed.
+    for (const error of (await finalizeSchemaMutation({
+        apiHandler,
+        backedUpApiUids
+    }))){
         strapi.log.error(error);
-        for (const uid of APIsToDelete){
-            await apiHandler.rollback(uid);
-        }
     }
     for (const contentType of contentTypes){
         if (contentType.action === 'delete') {