@uniformdev/transformer 1.1.50 → 1.1.52

package/dist/index.d.ts

@@ -199,6 +199,11 @@ interface SplitContentTypeOptions extends GlobalOptions {
     fieldId: string;
     fieldContains: string;
 }
+interface ClearSlotOptions extends GlobalOptions {
+    slot: string;
+    parentComponentType?: string;
+    compositionIds?: string;
+}
 
 declare class TransformError extends Error {
     constructor(message: string);
@@ -615,6 +620,7 @@ interface RemoveFieldInternalOptions {
     compositionsDir: string;
     compositionPatternsDir: string;
     componentPatternsDir: string;
+    contentTypesDir: string;
     componentType: string;
     parameterId: string;
     whatIf: boolean;
@@ -624,6 +630,7 @@ interface RemoveFieldResult {
     compositionsModified: number;
     compositionPatternsModified: number;
     componentPatternsModified: number;
+    contentTypesModified: number;
     instancesUpdated: number;
 }
 declare class FieldRemoverService {
@@ -633,6 +640,7 @@ declare class FieldRemoverService {
     constructor(fileSystem: FileSystemService, componentService: ComponentService, logger: Logger);
     private compareIds;
     remove(options: RemoveFieldInternalOptions): Promise<RemoveFieldResult>;
+    private removeFieldFromContentTypes;
     private removeFieldInDirectory;
     private removeFieldFromTree;
     private removeFieldFromOverrides;
@@ -640,4 +648,4 @@ declare class FieldRemoverService {
     private removeKeysFromMap;
 }
 
-export { type AddComponentOptions, type AddComponentParameterOptions, type AddComponentPatternOptions, type AddContentTypeFieldOptions, ComponentAdderService, ComponentAlreadyExistsError, type ComponentDefinition, type ComponentInstance, ComponentNotFoundError, ComponentRenamerService, ComponentService, type Composition, CompositionConverterService, type CompositionOverrides, type CompositionPatternCandidatesOptions, type CompositionRoot, CompositionService, type ContentTypeDefinition$1 as ContentTypeDefinition, type ContentTypeField$1 as ContentTypeField, type ConvertCompositionsToEntriesOptions, DuplicateIdError, FieldRemoverService, FileNotFoundError, FileSystemService, type FlattenBlockFieldOptions, type GenerateMissingProjectMapNodesOptions, type GlobalOptions, InvalidYamlError, Logger, type PackSerializationOptions, type Parameter, ParameterRemoverService, type ParameterValue, type PropagateRootComponentPropertyOptions, type PropagateRootComponentSlotOptions, type PropagateRootSlotOptions, PropertyNotFoundError, PropertyPropagatorService, type RemoveFieldOptions, type RemoveOrphanEntriesOptions, type RemoveParameterOptions, type RemoveUnusedComponentTypesOptions, type RemoveUnusedContentTypesOptions, type RenameComponentOptions, type RenameSlotOptions, SlotAlreadyExistsError, type SlotDefinition, SlotNotFoundError, SlotRenamerService, type SplitContentTypeOptions, TransformError, type UnpackSerializationOptions, computeGuidHash, regenerateIds };
+export { type AddComponentOptions, type AddComponentParameterOptions, type AddComponentPatternOptions, type AddContentTypeFieldOptions, type ClearSlotOptions, ComponentAdderService, ComponentAlreadyExistsError, type ComponentDefinition, type ComponentInstance, ComponentNotFoundError, ComponentRenamerService, ComponentService, type Composition, CompositionConverterService, type CompositionOverrides, type CompositionPatternCandidatesOptions, type CompositionRoot, CompositionService, type ContentTypeDefinition$1 as ContentTypeDefinition, type ContentTypeField$1 as ContentTypeField, type ConvertCompositionsToEntriesOptions, DuplicateIdError, FieldRemoverService, FileNotFoundError, FileSystemService, type FlattenBlockFieldOptions, type GenerateMissingProjectMapNodesOptions, type GlobalOptions, InvalidYamlError, Logger, type PackSerializationOptions, type Parameter, ParameterRemoverService, type ParameterValue, type PropagateRootComponentPropertyOptions, type PropagateRootComponentSlotOptions, type PropagateRootSlotOptions, PropertyNotFoundError, PropertyPropagatorService, type RemoveFieldOptions, type RemoveOrphanEntriesOptions, type RemoveParameterOptions, type RemoveUnusedComponentTypesOptions, type RemoveUnusedContentTypesOptions, type RenameComponentOptions, type RenameSlotOptions, SlotAlreadyExistsError, type SlotDefinition, SlotNotFoundError, SlotRenamerService, type SplitContentTypeOptions, TransformError, type UnpackSerializationOptions, computeGuidHash, regenerateIds };

package/dist/index.js

@@ -3076,6 +3076,7 @@ var FieldRemoverService = class {
       compositionsDir,
       compositionPatternsDir,
       componentPatternsDir,
+      contentTypesDir,
       componentType,
       parameterId,
       whatIf,
@@ -3086,6 +3087,7 @@ var FieldRemoverService = class {
     const fullCompositionsDir = this.fileSystem.resolvePath(rootDir, compositionsDir);
     const fullCompositionPatternsDir = this.fileSystem.resolvePath(rootDir, compositionPatternsDir);
     const fullComponentPatternsDir = this.fileSystem.resolvePath(rootDir, componentPatternsDir);
+    const fullContentTypesDir = this.fileSystem.resolvePath(rootDir, contentTypesDir);
     let allIdsToRemove = [parameterId];
     try {
       const { component } = await this.componentService.loadComponent(fullComponentsDir, componentType, findOptions);
@@ -3100,6 +3102,13 @@ var FieldRemoverService = class {
       this.logger.info(`Cascade-removing ${childIds.length} child field(s) [${childIds.join(", ")}] along with "${parameterId}"`);
     }
     this.logger.info(`Removing field "${parameterId}" from instances of ${componentType}`);
+    const contentTypesModified = await this.removeFieldFromContentTypes(
+      fullContentTypesDir,
+      componentType,
+      allIdsToRemove,
+      whatIf,
+      strict
+    );
     const compositionsResult = await this.removeFieldInDirectory(
       fullCompositionsDir,
       componentType,
@@ -3128,15 +3137,70 @@ var FieldRemoverService = class {
     const totalInstances = compositionsResult.instancesUpdated + compositionPatternsResult.instancesUpdated + componentPatternsResult.instancesUpdated;
     this.logger.info("");
     this.logger.info(
-      `Summary: ${totalFiles} file(s) (${totalInstances} instance(s)) updated.`
+      `Summary: ${contentTypesModified} content type(s), ${totalFiles} file(s) (${totalInstances} instance(s)) updated.`
     );
     return {
       compositionsModified: compositionsResult.filesModified,
       compositionPatternsModified: compositionPatternsResult.filesModified,
       componentPatternsModified: componentPatternsResult.filesModified,
+      contentTypesModified,
       instancesUpdated: totalInstances
     };
   }
+  async removeFieldFromContentTypes(contentTypesDir, componentType, fieldIds, whatIf, strict) {
+    let files;
+    try {
+      files = await this.fileSystem.findFiles(contentTypesDir, "**/*.{json,yaml,yml}");
+    } catch {
+      return 0;
+    }
+    if (files.length === 0) {
+      return 0;
+    }
+    const isWildcard = componentType === "*";
+    let contentTypesModified = 0;
+    for (const filePath of files) {
+      let contentType;
+      try {
+        contentType = await this.fileSystem.readFile(filePath);
+      } catch {
+        continue;
+      }
+      if (!contentType?.id || !contentType.fields) {
+        continue;
+      }
+      if (!isWildcard && !this.compareIds(contentType.id, componentType, strict)) {
+        continue;
+      }
+      const removedFieldIds = [];
+      contentType.fields = contentType.fields.filter((field) => {
+        const shouldRemove = fieldIds.some((id) => this.compareIds(field.id, id, strict));
+        if (shouldRemove) {
+          removedFieldIds.push(field.id);
+        }
+        return !shouldRemove;
+      });
+      if (removedFieldIds.length === 0) {
+        continue;
+      }
+      const entryName = contentType.entryName;
+      if (entryName && removedFieldIds.some((id) => this.compareIds(id, entryName, strict))) {
+        this.logger.info(`Clearing entryName "${entryName}" on content type "${contentType.id}" (field was removed)`);
+        contentType.entryName = "";
+      }
+      const relativePath = this.fileSystem.getBasename(filePath);
+      this.logger.action(
+        whatIf,
+        "UPDATE",
+        `contentType/${relativePath} (removed ${removedFieldIds.length} field(s): ${removedFieldIds.join(", ")})`
+      );
+      if (!whatIf) {
+        await this.fileSystem.writeFile(filePath, contentType);
+      }
+      contentTypesModified++;
+    }
+    return contentTypesModified;
+  }
   async removeFieldInDirectory(directory, componentType, parameterIds, whatIf, strict, label) {
     let files;
     try {