@uniformdev/transformer 1.1.39 → 1.1.41

package/dist/index.d.ts

@@ -182,6 +182,12 @@ interface RemoveOrphanEntriesOptions extends GlobalOptions {
 }
 interface RemoveUnusedContentTypesOptions extends GlobalOptions {
 }
+interface RemoveUnusedComponentTypesOptions extends GlobalOptions {
+    excludeComponentTypes?: string;
+}
+interface GenerateMissingProjectMapNodesOptions extends GlobalOptions {
+    rootContentTypes: string;
+}
 
 declare class TransformError extends Error {
     constructor(message: string);
@@ -622,4 +628,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 GlobalOptions, InvalidYamlError, Logger, type PackSerializationOptions, type Parameter, ParameterRemoverService, type ParameterValue, type PropagateRootComponentPropertyOptions, type PropagateRootComponentSlotOptions, PropertyNotFoundError, PropertyPropagatorService, type RemoveFieldOptions, type RemoveOrphanEntriesOptions, type RemoveParameterOptions, type RemoveUnusedContentTypesOptions, type RenameComponentOptions, type RenameSlotOptions, SlotAlreadyExistsError, type SlotDefinition, SlotNotFoundError, SlotRenamerService, TransformError, type UnpackSerializationOptions, computeGuidHash, regenerateIds };
+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, PropertyNotFoundError, PropertyPropagatorService, type RemoveFieldOptions, type RemoveOrphanEntriesOptions, type RemoveParameterOptions, type RemoveUnusedComponentTypesOptions, type RemoveUnusedContentTypesOptions, type RenameComponentOptions, type RenameSlotOptions, SlotAlreadyExistsError, type SlotDefinition, SlotNotFoundError, SlotRenamerService, TransformError, type UnpackSerializationOptions, computeGuidHash, regenerateIds };

package/dist/index.js

@@ -1601,6 +1601,11 @@ function walkAndRegenerate(value, currentPath) {
   return value;
 }
 
+// src/core/utils.ts
+function splitList(value) {
+  return value.split(/[,;|]/).map((s) => s.trim()).filter((s) => s.length > 0);
+}
+
 // src/core/services/property-propagator.service.ts
 var PropertyPropagatorService = class {
   constructor(fileSystem, componentService, compositionService, logger) {
@@ -1644,7 +1649,7 @@ var PropertyPropagatorService = class {
     this.logger.info(`Loading component: ${targetComponentType}`);
     const { component: targetComponent, filePath: targetFilePath } = await this.componentService.loadComponent(fullComponentsDir, targetComponentType, findOptions);
     this.logger.debug(`Loaded target component "${targetComponentType}" from ${targetFilePath}`);
-    const propertyNames = property.split("|").map((p) => p.trim()).filter((p) => p.length > 0);
+    const propertyNames = splitList(property);
     const resolvedParams = [];
     const resolvedNames = [];
     for (const { sourceType, sourceComponent } of sourceComponents) {
@@ -1882,7 +1887,7 @@ var PropertyPropagatorService = class {
     };
   }
   parsePipeSeparatedValues(value, strict) {
-    const entries = value.split("|").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+    const entries = splitList(value);
     const normalized = [];
     for (const entry of entries) {
       const exists = normalized.some(
@@ -2318,7 +2323,7 @@ var ComponentAdderService = class {
     return id1.toLowerCase() === id2.toLowerCase();
   }
   parseParentComponentTypes(parentComponentType) {
-    return parentComponentType.split("|").map((t) => t.trim()).filter((t) => t.length > 0);
+    return splitList(parentComponentType);
   }
   matchesAnyParentType(instanceType, parentTypes, strict) {
     return parentTypes.some((pt) => this.compareIds(instanceType, pt, strict));
@@ -2591,8 +2596,7 @@ var ComponentAdderService = class {
     }
     const newInstance = {
       type: componentTypeInPattern,
-      _pattern: pattern.componentPatternId,
-      _id: randomUUID()
+      _pattern: pattern.componentPatternId
     };
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
@@ -2706,13 +2710,19 @@ var ComponentAdderService = class {
           continue;
         }
         const rootInstance = composition.composition;
+        const rootPath = `${rootInstance._id ?? ""}${rootInstance.type}`;
         let modified = false;
         if (this.matchesAnyParentType(rootInstance.type, parentTypes, strict)) {
           if (!rootInstance.slots) {
             rootInstance.slots = {};
           }
           const instanceCopy = JSON.parse(JSON.stringify(newInstance));
-          this.regenerateInstanceIds(instanceCopy);
+          if (instanceCopy._pattern !== void 0) {
+            const slotIndex = rootInstance.slots[slot]?.length ?? 0;
+            instanceCopy._id = computeGuidHash(`${rootPath}.${slot}[${slotIndex}]${instanceCopy.type}`);
+          } else {
+            this.regenerateInstanceIds(instanceCopy);
+          }
           this.addComponentToSlot(rootInstance.slots, slot, instanceCopy);
           modified = true;
         }
@@ -2722,7 +2732,8 @@ var ComponentAdderService = class {
             parentTypes,
             slot,
             newInstance,
-            strict
+            strict,
+            rootPath
           );
           if (nestedModified) {
             modified = true;
@@ -2753,17 +2764,24 @@ var ComponentAdderService = class {
     }
     return filesModified;
   }
-  addComponentToNestedSlots(slots, parentTypes, slot, newInstance, strict) {
+  addComponentToNestedSlots(slots, parentTypes, slot, newInstance, strict, pathPrefix) {
     let modified = false;
-    for (const slotInstances of Object.values(slots)) {
+    for (const [slotName, slotInstances] of Object.entries(slots)) {
       if (!Array.isArray(slotInstances)) continue;
-      for (const instance of slotInstances) {
+      for (let i = 0; i < slotInstances.length; i++) {
+        const instance = slotInstances[i];
+        const instancePath = `${pathPrefix}.${slotName}[${i}]${instance.type}`;
         if (this.matchesAnyParentType(instance.type, parentTypes, strict)) {
           if (!instance.slots) {
             instance.slots = {};
           }
           const instanceCopy = JSON.parse(JSON.stringify(newInstance));
-          this.regenerateInstanceIds(instanceCopy);
+          if (instanceCopy._pattern !== void 0) {
+            const slotIndex = instance.slots[slot]?.length ?? 0;
+            instanceCopy._id = computeGuidHash(`${instancePath}.${slot}[${slotIndex}]${instanceCopy.type}`);
+          } else {
+            this.regenerateInstanceIds(instanceCopy);
+          }
           this.addComponentToSlot(instance.slots, slot, instanceCopy);
           modified = true;
         }
@@ -2773,7 +2791,8 @@ var ComponentAdderService = class {
             parentTypes,
             slot,
             newInstance,
-            strict
+            strict,
+            instancePath
           );
           if (nestedModified) {
             modified = true;