@uniformdev/transformer 1.1.53 → 1.1.55

package/dist/index.js

@@ -700,32 +700,12 @@ var CompositionConverterService = class {
           this.logger.debug(`Generated reference content type "${targetType}" with ${contentType.fields.length} field(s): ${contentType.fields.map((f) => f.id).join(", ")}`);
         }
         if (isBlockType) {
-          let blockId = targetType;
-          let needsRename = false;
-          if (isRefType) {
-            needsRename = true;
-          }
-          if (!needsRename) {
-            const existingPath = this.fileSystem.joinPath(contentTypesDirFull, `${targetType}.json`);
-            if (await this.fileSystem.fileExists(existingPath)) {
-              try {
-                const existing = await this.fileSystem.readFile(existingPath);
-                if (existing?.type !== "block") {
-                  needsRename = true;
-                }
-              } catch {
-              }
-            }
-          }
-          if (needsRename) {
-            blockId = `${targetType}Block`;
-            this.logger.info(`Content type "${targetType}" already exists as non-block, using "${blockId}" for block`);
-          }
+          const blockId = `${targetType}Block`;
           blockTypeIdMap.set(targetType, blockId);
           const blockContentType = this.generateContentType(component);
           blockContentType.type = "block";
           blockContentType.id = blockId;
-          blockContentType.name = needsRename ? `${blockContentType.name} Block` : blockContentType.name;
+          blockContentType.name = `${blockContentType.name} Block`;
           targetContentTypeMap.set(blockId, blockContentType);
           this.logger.debug(`Generated block content type "${blockId}" with ${blockContentType.fields.length} field(s): ${blockContentType.fields.map((f) => f.id).join(", ")}`);
         }
@@ -740,7 +720,7 @@ var CompositionConverterService = class {
           this.logger.info(`Component type not found: ${targetType}`);
           missingTargetTypes.push(targetType);
           if (isBlockType) {
-            blockTypeIdMap.set(targetType, targetType);
+            blockTypeIdMap.set(targetType, `${targetType}Block`);
           }
           continue;
         }
@@ -791,34 +771,19 @@ var CompositionConverterService = class {
           this.logger.debug(`Generated slot reference content type "${targetType}" with ${contentType.fields.length} field(s)`);
         }
         if (isSlotBlockType && !blockTypeIdMap.has(targetType)) {
-          let blockId = targetType;
-          let needsRename = isSlotRefType;
-          if (!needsRename) {
-            const existingPath = this.fileSystem.joinPath(contentTypesDirFull, `${targetType}.json`);
-            if (await this.fileSystem.fileExists(existingPath)) {
-              try {
-                const existing = await this.fileSystem.readFile(existingPath);
-                if (existing?.type !== "block") needsRename = true;
-              } catch {
-              }
-            }
-          }
-          if (needsRename) {
-            blockId = `${targetType}Block`;
-            this.logger.info(`Content type "${targetType}" already exists as non-block, using "${blockId}" for block`);
-          }
+          const blockId = `${targetType}Block`;
           blockTypeIdMap.set(targetType, blockId);
           const blockContentType = this.generateContentType(component);
           blockContentType.type = "block";
           blockContentType.id = blockId;
-          blockContentType.name = needsRename ? `${blockContentType.name} Block` : blockContentType.name;
+          blockContentType.name = `${blockContentType.name} Block`;
           targetContentTypeMap.set(blockId, blockContentType);
           this.logger.debug(`Generated slot block content type "${blockId}" with ${blockContentType.fields.length} field(s)`);
         }
       } catch (error) {
         if (error instanceof ComponentNotFoundError) {
           this.logger.info(`Component type not found: ${targetType}`);
-          if (isSlotBlockType && !blockTypeIdMap.has(targetType)) blockTypeIdMap.set(targetType, targetType);
+          if (isSlotBlockType && !blockTypeIdMap.has(targetType)) blockTypeIdMap.set(targetType, `${targetType}Block`);
           continue;
         }
         throw error;
@@ -2465,7 +2430,7 @@ var ComponentAdderService = class {
     const newInstance = this.createComponentInstance(newComponentType, parsedParams);
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2474,7 +2439,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2483,7 +2448,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2601,7 +2566,7 @@ var ComponentAdderService = class {
     };
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2611,7 +2576,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,
@@ -2621,7 +2586,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentTypes,
+      resolvedParentTypes,
       slot,
       newInstance,
       whatIf,