@uniformdev/transformer 1.1.54 → 1.1.56

package/dist/index.d.ts

@@ -234,6 +234,9 @@ declare class SlotNotFoundError extends TransformError {
 declare class SlotAlreadyExistsError extends TransformError {
     constructor(slotId: string, componentType: string);
 }
+declare class ContentTypeFieldConflictError extends TransformError {
+    constructor(contentTypeId: string, fieldId: string, existingType: string, newType: string);
+}
 
 declare class FileSystemService {
     private isJsonFile;
@@ -534,6 +537,7 @@ interface FlattenedInstance {
 }
 interface ConvertResult {
     contentTypesWritten: number;
+    contentTypesMerged: number;
     entriesFromCompositions: number;
     entriesFromReferences: number;
     entriesReused: number;
@@ -548,6 +552,7 @@ declare class CompositionConverterService {
     convert(options: ConvertCompositionsToEntriesInternalOptions): Promise<ConvertResult>;
     generateContentType(component: ComponentDefinition): ContentTypeDefinition;
     private parameterToField;
+    private mergeWithExistingContentType;
     generateEntryFromComposition(composition: Composition): EntryDefinition;
     generateEntryFromFlattenedInstance(inst: FlattenedInstance): EntryDefinition;
     findFlattenTargets(slots: Record<string, ComponentInstance[]>, targetType: string, compositionId: string, compositionName: string, strict: boolean): FlattenedInstance[];
@@ -660,4 +665,4 @@ declare class FieldRemoverService {
     private removeKeysFromMap;
 }
 
-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 };
+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, ContentTypeFieldConflictError, 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

@@ -56,6 +56,14 @@ var SlotAlreadyExistsError = class extends TransformError {
     this.name = "SlotAlreadyExistsError";
   }
 };
+var ContentTypeFieldConflictError = class extends TransformError {
+  constructor(contentTypeId, fieldId, existingType, newType) {
+    super(
+      `Content type "${contentTypeId}" field "${fieldId}" type conflict: existing type "${existingType}" differs from generated type "${newType}"`
+    );
+    this.name = "ContentTypeFieldConflictError";
+  }
+};
 
 // src/core/services/file-system.service.ts
 import * as fs from "fs";
@@ -611,6 +619,7 @@ var CompositionConverterService = class {
     const contentTypesDirFull = this.fileSystem.resolvePath(rootDir, contentTypesDir);
     const entriesDirFull = this.fileSystem.resolvePath(rootDir, entriesDir);
     let contentTypesWritten = 0;
+    let contentTypesMerged = 0;
     let entriesFromCompositions = 0;
     let entriesFromReferences = 0;
     let entriesReused = 0;
@@ -640,7 +649,7 @@ var CompositionConverterService = class {
     );
     if (compositionResults.length === 0) {
       this.logger.warn("No compositions found matching the specified types");
-      return { contentTypesWritten: 0, entriesFromCompositions: 0, entriesFromReferences: 0, entriesReused: 0, blocksEmbedded: 0 };
+      return { contentTypesWritten: 0, contentTypesMerged: 0, entriesFromCompositions: 0, entriesFromReferences: 0, entriesReused: 0, blocksEmbedded: 0 };
     }
     this.logger.info(`Found ${compositionResults.length} composition(s)`);
     const componentsToReferences = this.expandWildcardTypes(compositionResults, initialComponentsToReferences, strict);
@@ -1154,37 +1163,49 @@ var CompositionConverterService = class {
     }
     for (const [typeName, contentType] of contentTypeMap) {
       const filePath = this.fileSystem.joinPath(contentTypesDirFull, `${typeName}.json`);
-      const baseFieldCount = contentType.fields.filter((f) => f.type !== "contentReference" && f.type !== "$block").length;
-      const refCount = contentType.fields.filter((f) => f.type === "contentReference").length;
-      const blockCount = contentType.fields.filter((f) => f.type === "$block").length;
+      const merged = await this.mergeWithExistingContentType(filePath, contentType);
+      const baseFieldCount = merged.fields.filter((f) => f.type !== "contentReference" && f.type !== "$block").length;
+      const refCount = merged.fields.filter((f) => f.type === "contentReference").length;
+      const blockCount = merged.fields.filter((f) => f.type === "$block").length;
       const extras = [
         refCount > 0 ? `${refCount} reference(s)` : "",
         blockCount > 0 ? `${blockCount} block(s)` : ""
       ].filter(Boolean).join(", ");
       const extrasInfo = extras ? ` + ${extras}` : "";
+      const isMerged = merged !== contentType;
       this.logger.action(
         whatIf,
-        "WRITE",
+        isMerged ? "MERGE" : "WRITE",
         `${contentTypesDir}/${typeName}.json (${baseFieldCount} fields${extrasInfo})`
       );
-      this.logger.debug(`Content type "${typeName}" fields: ${contentType.fields.map((f) => `${f.id}:${f.type}`).join(", ")}`);
+      this.logger.debug(`Content type "${typeName}" fields: ${merged.fields.map((f) => `${f.id}:${f.type}`).join(", ")}`);
       if (!whatIf) {
-        await this.fileSystem.writeFile(filePath, contentType);
+        await this.fileSystem.writeFile(filePath, merged);
+      }
+      if (isMerged) {
+        contentTypesMerged++;
+      } else {
+        contentTypesWritten++;
       }
-      contentTypesWritten++;
     }
     for (const [typeName, contentType] of targetContentTypeMap) {
       const filePath = this.fileSystem.joinPath(contentTypesDirFull, `${typeName}.json`);
+      const merged = await this.mergeWithExistingContentType(filePath, contentType);
+      const isMerged = merged !== contentType;
       this.logger.action(
         whatIf,
-        "WRITE",
-        `${contentTypesDir}/${typeName}.json (${contentType.fields.length} fields)`
+        isMerged ? "MERGE" : "WRITE",
+        `${contentTypesDir}/${typeName}.json (${merged.fields.length} fields)`
       );
-      this.logger.debug(`Content type "${typeName}" fields: ${contentType.fields.map((f) => `${f.id}:${f.type}`).join(", ")}`);
+      this.logger.debug(`Content type "${typeName}" fields: ${merged.fields.map((f) => `${f.id}:${f.type}`).join(", ")}`);
       if (!whatIf) {
-        await this.fileSystem.writeFile(filePath, contentType);
+        await this.fileSystem.writeFile(filePath, merged);
+      }
+      if (isMerged) {
+        contentTypesMerged++;
+      } else {
+        contentTypesWritten++;
       }
-      contentTypesWritten++;
     }
     const neverFoundMissingTypes = missingTargetTypes.filter(
       (type) => !foundMissingTargetTypes.has(type)
@@ -1194,7 +1215,7 @@ var CompositionConverterService = class {
         `Component type(s) not found in any composition: ${neverFoundMissingTypes.join(", ")}`
       );
     }
-    return { contentTypesWritten, entriesFromCompositions, entriesFromReferences, entriesReused, blocksEmbedded };
+    return { contentTypesWritten, contentTypesMerged, entriesFromCompositions, entriesFromReferences, entriesReused, blocksEmbedded };
   }
   // --- Content Type Generation ---
   generateContentType(component) {
@@ -1227,6 +1248,37 @@ var CompositionConverterService = class {
     }
     return field;
   }
+  async mergeWithExistingContentType(filePath, generated) {
+    const exists = await this.fileSystem.fileExists(filePath);
+    if (!exists) {
+      return generated;
+    }
+    const existing = await this.fileSystem.readFile(filePath);
+    const existingFieldMap = /* @__PURE__ */ new Map();
+    for (const field of existing.fields) {
+      existingFieldMap.set(field.id, field);
+    }
+    for (const newField of generated.fields) {
+      const existingField = existingFieldMap.get(newField.id);
+      if (existingField && existingField.type !== newField.type) {
+        throw new ContentTypeFieldConflictError(
+          generated.id,
+          newField.id,
+          existingField.type,
+          newField.type
+        );
+      }
+    }
+    const generatedFieldIds = new Set(generated.fields.map((f) => f.id));
+    const extraFields = existing.fields.filter((f) => !generatedFieldIds.has(f.id));
+    if (extraFields.length === 0) {
+      return generated;
+    }
+    return {
+      ...generated,
+      fields: [...generated.fields, ...extraFields]
+    };
+  }
   // --- Entry Generation ---
   generateEntryFromComposition(composition) {
     const comp = composition.composition;
@@ -2430,7 +2482,7 @@ var ComponentAdderService = class {
     const newInstance = this.createComponentInstance(newComponentType, parsedParams);
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2439,7 +2491,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2448,7 +2500,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2566,7 +2618,7 @@ var ComponentAdderService = class {
     };
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2576,7 +2628,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2586,7 +2638,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -3451,6 +3503,7 @@ export {
   ComponentService,
   CompositionConverterService,
   CompositionService,
+  ContentTypeFieldConflictError,
   DuplicateIdError,
   FieldRemoverService,
   FileNotFoundError,