@uniformdev/transformer 1.1.4 → 1.1.6

package/dist/cli/index.js

@@ -372,13 +372,22 @@ var CompositionService = class {
     await this.fileSystem.writeFile(filePath, composition);
   }
   async findCompositionsByType(compositionsDir, compositionType, options = {}) {
+    return this.findCompositionsByTypes(compositionsDir, [compositionType], options);
+  }
+  async findCompositionsByTypes(compositionsDir, compositionTypes, options = {}) {
     const { strict = false } = options;
+    const normalizedTypes = this.normalizeCompositionTypes(compositionTypes, strict);
+    if (normalizedTypes.length === 0) {
+      return [];
+    }
     const files = await this.fileSystem.findFiles(compositionsDir, "**/*.{json,yaml,yml}");
     const results = [];
     for (const filePath of files) {
       try {
         const composition = await this.loadComposition(filePath);
-        if (composition.composition?.type && this.compareTypes(composition.composition.type, compositionType, strict)) {
+        if (composition.composition?.type && normalizedTypes.some(
+          (type) => this.compareTypes(composition.composition.type, type, strict)
+        )) {
           results.push({ composition, filePath });
         }
       } catch {
@@ -386,6 +395,22 @@ var CompositionService = class {
     }
     return results;
   }
+  normalizeCompositionTypes(compositionTypes, strict) {
+    const normalized = [];
+    for (const type of compositionTypes) {
+      const trimmed = type.trim();
+      if (!trimmed) {
+        continue;
+      }
+      const exists = normalized.some(
+        (existing) => strict ? existing === trimmed : existing.toLowerCase() === trimmed.toLowerCase()
+      );
+      if (!exists) {
+        normalized.push(trimmed);
+      }
+    }
+    return normalized;
+  }
   findComponentInstances(composition, componentType, options = {}) {
     const { strict = false } = options;
     const results = [];
@@ -510,26 +535,52 @@ var PropertyPropagatorService = class {
       deleteSourceParameter
     } = options;
     const findOptions = { strict };
+    const compositionTypes = this.parsePipeSeparatedValues(compositionType, strict);
     const fullComponentsDir = this.fileSystem.resolvePath(rootDir, componentsDir);
     const fullCompositionsDir = this.fileSystem.resolvePath(rootDir, compositionsDir);
-    this.logger.info(`Loading component: ${compositionType}`);
-    const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, compositionType, findOptions);
+    const sourceComponents = [];
+    for (const sourceType of compositionTypes) {
+      this.logger.info(`Loading component: ${sourceType}`);
+      const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
+      sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+    }
     this.logger.info(`Loading component: ${targetComponentType}`);
     const { component: targetComponent, filePath: targetFilePath } = await this.componentService.loadComponent(fullComponentsDir, targetComponentType, findOptions);
-    const propertyNames = property.split("|").map((p) => p.trim());
-    const { parameters: resolvedParams, notFound } = this.componentService.resolveProperties(
-      sourceComponent,
-      propertyNames,
-      findOptions
-    );
-    if (notFound.length > 0) {
-      throw new PropertyNotFoundError(notFound.join(", "), compositionType);
+    const propertyNames = property.split("|").map((p) => p.trim()).filter((p) => p.length > 0);
+    const resolvedParams = [];
+    const resolvedNames = [];
+    for (const { sourceType, sourceComponent } of sourceComponents) {
+      const { parameters: sourceParams, notFound } = this.componentService.resolveProperties(
+        sourceComponent,
+        propertyNames,
+        findOptions
+      );
+      if (notFound.length > 0) {
+        this.logger.warn(`Property "${notFound.join(", ")}" not found on component "${sourceType}"`);
+        continue;
+      }
+      for (const param of sourceParams) {
+        const exists = resolvedParams.some(
+          (existing) => strict ? existing.id === param.id : existing.id.toLowerCase() === param.id.toLowerCase()
+        );
+        if (!exists) {
+          resolvedParams.push(param);
+          resolvedNames.push(param.id);
+        }
+      }
+    }
+    const groupSources = [];
+    for (const { sourceType, sourceComponent } of sourceComponents) {
+      for (const name of propertyNames) {
+        const param = this.componentService.findParameter(sourceComponent, name, findOptions);
+        if (param && this.componentService.isGroupParameter(param)) {
+          const groupSource = `${sourceType}.${name}`;
+          if (!groupSources.includes(groupSource)) {
+            groupSources.push(groupSource);
+          }
+        }
+      }
     }
-    const resolvedNames = resolvedParams.map((p) => p.id);
-    const groupSources = propertyNames.filter((name) => {
-      const param = this.componentService.findParameter(sourceComponent, name, findOptions);
-      return param && this.componentService.isGroupParameter(param);
-    });
     if (groupSources.length > 0) {
       this.logger.info(
         `Resolved properties: ${resolvedNames.join(", ")} (from ${groupSources.join(", ")})`
@@ -604,9 +655,9 @@ var PropertyPropagatorService = class {
     if (componentModified && !whatIf) {
       await this.componentService.saveComponent(targetFilePath, modifiedComponent);
     }
-    const compositions = await this.compositionService.findCompositionsByType(
+    const compositions = await this.compositionService.findCompositionsByTypes(
       fullCompositionsDir,
-      compositionType,
+      compositionTypes,
       findOptions
     );
     let modifiedCompositions = 0;
@@ -653,31 +704,41 @@ var PropertyPropagatorService = class {
         modifiedCompositions++;
       }
     }
-    let sourceComponentModified = false;
+    let modifiedSourceComponents = 0;
     if (deleteSourceParameter) {
-      let modifiedSource = { ...sourceComponent };
-      for (const param of resolvedParams) {
-        this.logger.action(whatIf, "DELETE", `Parameter "${param.id}" from ${compositionType}`);
-        modifiedSource = this.componentService.removeParameter(modifiedSource, param.id, findOptions);
-        sourceComponentModified = true;
-      }
-      const beforeGroupCount = modifiedSource.parameters?.filter(
-        (p) => this.componentService.isGroupParameter(p)
-      ).length ?? 0;
-      modifiedSource = this.componentService.removeEmptyGroups(modifiedSource);
-      const afterGroupCount = modifiedSource.parameters?.filter(
-        (p) => this.componentService.isGroupParameter(p)
-      ).length ?? 0;
-      if (afterGroupCount < beforeGroupCount) {
-        const removedCount = beforeGroupCount - afterGroupCount;
-        this.logger.action(
-          whatIf,
-          "DELETE",
-          `${removedCount} empty group(s) from ${compositionType}`
-        );
-      }
-      if (sourceComponentModified && !whatIf) {
-        await this.componentService.saveComponent(sourceFilePath, modifiedSource);
+      for (const { sourceType, sourceFilePath, sourceComponent } of sourceComponents) {
+        let modifiedSource = { ...sourceComponent };
+        let sourceComponentModified = false;
+        for (const param of resolvedParams) {
+          const exists = this.componentService.findParameter(modifiedSource, param.id, findOptions);
+          if (exists) {
+            this.logger.action(whatIf, "DELETE", `Parameter "${param.id}" from ${sourceType}`);
+            modifiedSource = this.componentService.removeParameter(modifiedSource, param.id, findOptions);
+            sourceComponentModified = true;
+          }
+        }
+        const beforeGroupCount = modifiedSource.parameters?.filter(
+          (p) => this.componentService.isGroupParameter(p)
+        ).length ?? 0;
+        modifiedSource = this.componentService.removeEmptyGroups(modifiedSource);
+        const afterGroupCount = modifiedSource.parameters?.filter(
+          (p) => this.componentService.isGroupParameter(p)
+        ).length ?? 0;
+        if (afterGroupCount < beforeGroupCount) {
+          const removedCount = beforeGroupCount - afterGroupCount;
+          this.logger.action(
+            whatIf,
+            "DELETE",
+            `${removedCount} empty group(s) from ${sourceType}`
+          );
+          sourceComponentModified = true;
+        }
+        if (sourceComponentModified) {
+          modifiedSourceComponents++;
+        }
+        if (sourceComponentModified && !whatIf) {
+          await this.componentService.saveComponent(sourceFilePath, modifiedSource);
+        }
       }
       for (const { composition, filePath } of compositions) {
         const relativePath = filePath.replace(fullCompositionsDir, "").replace(/^[/\\]/, "");
@@ -696,11 +757,24 @@ var PropertyPropagatorService = class {
       }
     }
     return {
-      modifiedComponents: (componentModified ? 1 : 0) + (sourceComponentModified ? 1 : 0),
+      modifiedComponents: (componentModified ? 1 : 0) + modifiedSourceComponents,
       modifiedCompositions,
       propagatedInstances
     };
   }
+  parsePipeSeparatedValues(value, strict) {
+    const entries = value.split("|").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+    const normalized = [];
+    for (const entry of entries) {
+      const exists = normalized.some(
+        (existing) => strict ? existing === entry : existing.toLowerCase() === entry.toLowerCase()
+      );
+      if (!exists) {
+        normalized.push(entry);
+      }
+    }
+    return normalized;
+  }
 };
 
 // src/cli/logger.ts
@@ -732,7 +806,10 @@ function createPropagateRootComponentPropertyCommand() {
   const command = new Command("propagate-root-component-property");
   command.description(
     "Copies property definitions from a composition type's root component to a target component type, then propagates the actual values across all matching compositions."
-  ).option("--compositionType <type>", "The composition type to process (e.g., HomePage)").option("--property <properties>", "Pipe-separated list of properties and/or groups to copy").option(
+  ).option(
+    "--compositionType <type>",
+    "The composition type(s) to process. Supports pipe-separated lists (e.g., HomePage|LandingPage)"
+  ).option("--property <properties>", "Pipe-separated list of properties and/or groups to copy").option(
     "--targetComponentType <type>",
     "The component type that will receive the copied properties"
   ).option(
@@ -3007,27 +3084,40 @@ var SlotPropagatorService = class {
       deleteSourceSlot
     } = options;
     const findOptions = { strict };
+    const compositionTypes = this.parsePipeSeparatedValues(compositionType, strict);
     const fullComponentsDir = this.fileSystem.resolvePath(rootDir, componentsDir);
     const fullCompositionsDir = this.fileSystem.resolvePath(rootDir, compositionsDir);
-    this.logger.info(`Loading component: ${compositionType}`);
-    const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, compositionType, findOptions);
+    const sourceComponents = [];
+    for (const sourceType of compositionTypes) {
+      this.logger.info(`Loading component: ${sourceType}`);
+      const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
+      sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+    }
     this.logger.info(`Loading component: ${targetComponentType}`);
     const { component: targetComponent, filePath: targetFilePath } = await this.componentService.loadComponent(fullComponentsDir, targetComponentType, findOptions);
-    const slotNames = slot.split("|").map((s) => s.trim());
+    const slotNames = slot.split("|").map((s) => s.trim()).filter((s) => s.length > 0);
     const resolvedSlots = [];
-    const notFound = [];
-    for (const slotName of slotNames) {
-      const slotDef = this.componentService.findSlot(sourceComponent, slotName, findOptions);
-      if (slotDef) {
-        resolvedSlots.push(slotDef);
-      } else {
-        notFound.push(slotName);
+    const resolvedSlotIds = [];
+    for (const { sourceType, sourceComponent } of sourceComponents) {
+      const notFound = [];
+      for (const slotName of slotNames) {
+        const slotDef = this.componentService.findSlot(sourceComponent, slotName, findOptions);
+        if (!slotDef) {
+          notFound.push(slotName);
+          continue;
+        }
+        const exists = resolvedSlots.some(
+          (existing) => strict ? existing.id === slotDef.id : existing.id.toLowerCase() === slotDef.id.toLowerCase()
+        );
+        if (!exists) {
+          resolvedSlots.push(slotDef);
+          resolvedSlotIds.push(slotDef.id);
+        }
+      }
+      if (notFound.length > 0) {
+        throw new PropertyNotFoundError(`Slot "${notFound.join(", ")}"`, sourceType);
       }
     }
-    if (notFound.length > 0) {
-      throw new PropertyNotFoundError(`Slot "${notFound.join(", ")}"`, compositionType);
-    }
-    const resolvedSlotIds = resolvedSlots.map((s) => s.id);
     this.logger.info(`Resolved slots: ${resolvedSlotIds.join(", ")}`);
     let modifiedComponent = { ...targetComponent };
     let componentModified = false;
@@ -3064,9 +3154,9 @@ var SlotPropagatorService = class {
     if (componentModified && !whatIf) {
       await this.componentService.saveComponent(targetFilePath, modifiedComponent);
     }
-    const compositions = await this.compositionService.findCompositionsByType(
+    const compositions = await this.compositionService.findCompositionsByTypes(
       fullCompositionsDir,
-      compositionType,
+      compositionTypes,
       findOptions
     );
     let modifiedCompositions = 0;
@@ -3113,16 +3203,26 @@ var SlotPropagatorService = class {
         modifiedCompositions++;
       }
     }
-    let sourceComponentModified = false;
+    let modifiedSourceComponents = 0;
     if (deleteSourceSlot) {
-      let modifiedSource = { ...sourceComponent };
-      for (const slotDef of resolvedSlots) {
-        this.logger.action(whatIf, "DELETE", `Slot "${slotDef.id}" from ${compositionType}`);
-        modifiedSource = this.componentService.removeSlot(modifiedSource, slotDef.id, findOptions);
-        sourceComponentModified = true;
-      }
-      if (sourceComponentModified && !whatIf) {
-        await this.componentService.saveComponent(sourceFilePath, modifiedSource);
+      for (const { sourceType, sourceFilePath, sourceComponent } of sourceComponents) {
+        let modifiedSource = { ...sourceComponent };
+        let sourceComponentModified = false;
+        for (const slotDef of resolvedSlots) {
+          const slotToDelete = this.componentService.findSlot(modifiedSource, slotDef.id, findOptions);
+          if (!slotToDelete) {
+            continue;
+          }
+          this.logger.action(whatIf, "DELETE", `Slot "${slotDef.id}" from ${sourceType}`);
+          modifiedSource = this.componentService.removeSlot(modifiedSource, slotDef.id, findOptions);
+          sourceComponentModified = true;
+        }
+        if (sourceComponentModified) {
+          modifiedSourceComponents++;
+        }
+        if (sourceComponentModified && !whatIf) {
+          await this.componentService.saveComponent(sourceFilePath, modifiedSource);
+        }
       }
       for (const { composition, filePath } of compositions) {
         const relativePath = filePath.replace(fullCompositionsDir, "").replace(/^[/\\]/, "");
@@ -3143,7 +3243,7 @@ var SlotPropagatorService = class {
       }
     }
     return {
-      modifiedComponents: (componentModified ? 1 : 0) + (sourceComponentModified ? 1 : 0),
+      modifiedComponents: (componentModified ? 1 : 0) + modifiedSourceComponents,
       modifiedCompositions,
       propagatedInstances
     };
@@ -3169,6 +3269,19 @@ var SlotPropagatorService = class {
     }
     instance.slots[slotName].push(...components);
   }
+  parsePipeSeparatedValues(value, strict) {
+    const entries = value.split("|").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+    const normalized = [];
+    for (const entry of entries) {
+      const exists = normalized.some(
+        (existing) => strict ? existing === entry : existing.toLowerCase() === entry.toLowerCase()
+      );
+      if (!exists) {
+        normalized.push(entry);
+      }
+    }
+    return normalized;
+  }
 };
 
 // src/cli/commands/propagate-root-component-slot.ts
@@ -3176,7 +3289,10 @@ function createPropagateRootComponentSlotCommand() {
   const command = new Command9("propagate-root-component-slot");
   command.description(
     "Copies slot definitions from a composition type's root component to a target component type, then moves all component instances from that slot across all matching compositions."
-  ).option("--compositionType <type>", "The composition type to process (e.g., HomePage)").option("--slot <slots>", "Pipe-separated list of slot names to copy from the source component").option(
+  ).option(
+    "--compositionType <type>",
+    "The composition type(s) to process. Supports pipe-separated lists (e.g., HomePage|LandingPage)"
+  ).option("--slot <slots>", "Pipe-separated list of slot names to copy from the source component").option(
     "--targetComponentType <type>",
     "The component type that will receive the copied slots"
   ).option(
@@ -3245,9 +3361,82 @@ function createPropagateRootComponentSlotCommand() {
   return command;
 }
 
+// package.json
+var package_default = {
+  name: "@uniformdev/transformer",
+  version: "1.1.6",
+  description: "CLI tool for transforming Uniform.dev serialization files offline",
+  type: "module",
+  bin: {
+    "uniform-transform": "./dist/cli/index.js"
+  },
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      import: "./dist/index.js",
+      types: "./dist/index.d.ts"
+    }
+  },
+  files: [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ],
+  scripts: {
+    build: "tsup",
+    dev: "tsx src/cli/index.ts",
+    test: "vitest run",
+    "test:watch": "vitest",
+    "test:e2e": "vitest run --config vitest.e2e.config.ts",
+    "test:coverage": "vitest run --coverage",
+    lint: "eslint --ext .ts src tests",
+    format: "prettier --write .",
+    prepublishOnly: "npm run build"
+  },
+  keywords: [
+    "uniform",
+    "uniform.dev",
+    "cli",
+    "transform",
+    "content",
+    "cms"
+  ],
+  author: "Uniform <https://uniform.dev>",
+  license: "MIT",
+  repository: {
+    type: "git",
+    url: "https://github.com/uniform-collab/transformer.git"
+  },
+  dependencies: {
+    chalk: "^5.3.0",
+    commander: "^12.1.0",
+    glob: "^10.3.10",
+    yaml: "^2.4.1",
+    zod: "^3.22.4"
+  },
+  devDependencies: {
+    "@types/node": "^20.11.24",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitest/coverage-v8": "^1.3.1",
+    eslint: "^8.57.0",
+    prettier: "^3.2.5",
+    tsup: "^8.0.2",
+    tsx: "^4.7.1",
+    typescript: "^5.4.2",
+    vitest: "^1.3.1"
+  },
+  engines: {
+    node: ">=18"
+  }
+};
+
 // src/cli/index.ts
 var program = new Command10();
-program.name("uniform-transform").description("CLI tool for transforming Uniform.dev serialization files offline").version("1.0.0");
+var appVersion = package_default.version;
+console.error(`uniform-transform v${appVersion}`);
+program.name("uniform-transform").description("CLI tool for transforming Uniform.dev serialization files offline").version(appVersion);
 program.requiredOption("--rootDir <path>", "Path to the serialization project root").option("--what-if", "Dry run mode - preview changes without modifying files", false).option("--strict", "Enable strict mode for case-sensitive matching", false).option("--compositionsDir <dir>", "Compositions directory name", "composition").option("--componentsDir <dir>", "Components directory name", "component").option("--contentTypesDir <dir>", "Content types directory name", "contentType").option("--assetsDir <dir>", "Assets directory name", "asset").option("--categoriesDir <dir>", "Categories directory name", "category").option("--componentPatternsDir <dir>", "Component patterns directory name", "componentPattern").option(
   "--compositionPatternsDir <dir>",
   "Composition patterns directory name",