@trayai/tray-sync-cli 1.0.6 → 1.0.8

package/dist/commands/promote.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { readdir as fsReaddir, readFile as fsReadFile, rm as fsRm } from "node:fs/promises";
-import { Command, InvalidArgumentError } from "commander";
+import { Command, InvalidArgumentError, Option } from "commander";
 import { createTrayClientForRegion } from "../api/trayClient.js";
 import { readCredentials } from "../config/credentials.js";
 import { readEnvironments } from "../config/environments.js";
@@ -12,14 +12,15 @@ import { readTrayYaml } from "../config/trayYaml.js";
 import { resolveContainedSafe } from "../lib/pathContainment.js";
 import { entityDisplayName } from "../lib/exportStructure.js";
 import { importProject, previewImport } from "../lib/promoteExecute.js";
-import { toProjectImportImpact } from "../lib/promoteReport.js";
-import { isFullyResolved, resolveProjectRequirements, scaffoldUnresolvedAuthentications, } from "../lib/promoteTarget.js";
+import { summarizeImpactForVersionDescription, toProjectImportImpact, } from "../lib/promoteReport.js";
+import { computeNextVersionNumber, createProjectVersion, getLatestProjectVersion, isFullyResolved, resolveProjectRequirements, scaffoldUnresolvedAuthentications, } from "../lib/promoteTarget.js";
 import { resolveToken } from "../lib/tokenResolution.js";
 import { isUuid } from "../lib/uuid.js";
 import { OutputFormats, parseFormat } from "../lib/outputFormat.js";
 import { checkProjectDrift, DriftStatuses } from "./status.js";
-import { printError, printInvalidAuthMappings, printLocalDrift, printMutuallyExclusiveResumeAndProject, printNoTargetProjectMapped, printProjectError, printProjectImportImpact, printProjectNoStateFile, printProjectNotPulledLocally, printPromoted, printTargetEnvNotFound, printTrayYamlNotFound, printUnresolvedRequirements, printWouldBePromoted, } from "../views/promote/promote.v2.js";
+import { printError, printInvalidAuthMappings, printLocalDrift, printMutuallyExclusiveMajorAndVersion, printMutuallyExclusiveResumeAndProject, printNoTargetProjectMapped, printProjectError, printProjectImportImpact, printProjectNoStateFile, printProjectNotPulledLocally, printPromoted, printTargetEnvNotFound, printTrayYamlNotFound, printUnresolvedRequirements, printVersionCreationFailed, printWouldBePromoted, } from "../views/promote/promote.v2.js";
 import { printPromoteResultJson } from "../views/promote/shared.js";
+const DEFAULT_VERSION_TITLE = "Promoted via tray-sync-cli";
 function findProjectDir(existingDirs, projectId) {
     return existingDirs.find((name) => name.split("--")[0] === projectId);
 }
@@ -50,6 +51,12 @@ export async function runPromote(deps, options) {
         printMutuallyExclusiveResumeAndProject(stderr);
         return 1;
     }
+    if (options.major && options.versionNumber) {
+        if (asJson)
+            return fail({ reason: "mutually_exclusive_major_and_version" });
+        printMutuallyExclusiveMajorAndVersion(stderr);
+        return 1;
+    }
     const trayYaml = await readTrayYaml(cwd);
     if (!trayYaml) {
         if (asJson)
@@ -208,6 +215,34 @@ export async function runPromote(deps, options) {
                 continue;
             }
             await importProject(targetClient, targetProjectId, payload);
+            if (options.version ?? true) {
+                try {
+                    const mode = options.major ? "major" : "minor";
+                    const versionNumber = options.versionNumber ??
+                        computeNextVersionNumber(await getLatestProjectVersion(targetClient, targetProjectId), mode);
+                    const title = options.versionTitle ?? DEFAULT_VERSION_TITLE;
+                    const description = options.versionDescription ?? summarizeImpactForVersionDescription(impact);
+                    const created = await createProjectVersion(targetClient, targetProjectId, versionNumber, title, description);
+                    impact.createdVersion = {
+                        versionNumber: created.versionNumber,
+                        title: created.title,
+                        description: created.description,
+                    };
+                }
+                catch (err) {
+                    if (asJson) {
+                        return fail({
+                            reason: "version_creation_failed",
+                            project_id: projectId,
+                            source_project_name: sourceProjectName,
+                            message: err.message,
+                            target_project_id: targetProjectId,
+                        });
+                    }
+                    printVersionCreationFailed(stderr, projectId, sourceProjectName, err.message, targetProjectId);
+                    return 1;
+                }
+            }
             if (!asJson) {
                 printPromoted(stdout, projectId, sourceProjectName, options.to);
                 printProjectImportImpact(stdout, impact);
@@ -252,6 +287,11 @@ export const promoteCommand = new Command("promote")
     .option("--resume", "resume a previously interrupted promote")
     .option("--dry-run", "report what would change without creating projects or importing")
     .option("--auto-create-projects", "create the target project when no mapping exists yet")
+    .addOption(new Option("--no-version", "skip creating a target project version after import").helpGroup("Version options:"))
+    .addOption(new Option("--major", "bump the major version instead of minor").helpGroup("Version options:"))
+    .addOption(new Option("--version-number <major.minor>", "explicit target version number (overrides --major)").helpGroup("Version options:"))
+    .addOption(new Option("--version-title <title>", "title for the created version").helpGroup("Version options:"))
+    .addOption(new Option("--version-description <description>", "description for the created version (auto-generated from promotion impact if omitted)").helpGroup("Version options:"))
     .option("-t, --token <token>", "Tray API token (used for both source and target)")
     .option("--format <format>", "human or json", parseFormat, OutputFormats.HUMAN)
     .action(async (opts) => {
@@ -274,6 +314,11 @@ export const promoteCommand = new Command("promote")
         dryRun: Boolean(opts.dryRun),
         autoCreateProjects: Boolean(opts.autoCreateProjects),
         format: opts.format,
+        version: opts.version,
+        major: Boolean(opts.major),
+        versionNumber: opts.versionNumber,
+        versionTitle: opts.versionTitle,
+        versionDescription: opts.versionDescription,
     });
     process.exitCode = exitCode;
 });

package/dist/commands/pull.js

@@ -59,6 +59,25 @@ export async function listProjectIds(client, workspaceId) {
     const result = (await client.request("GET", `/v2/projects/workspaces/${workspaceId}`));
     return result.projects.map((p) => requireUuid(p.id, "listProjects: projects[].id"));
 }
+async function removeOrphanedEntityDirs(projectDirPath, entityParentDir, currentIds) {
+    await assertNoSymlinkInPath(projectDirPath, entityParentDir);
+    let existingDirNames;
+    try {
+        existingDirNames = await fsReaddir(entityParentDir);
+    }
+    catch {
+        existingDirNames = [];
+    }
+    for (const dirName_ of existingDirNames) {
+        const prefix = dirName_.split("--")[0];
+        if (!isUuid(prefix) || currentIds.has(prefix)) {
+            continue;
+        }
+        const staleDir = resolveContained(entityParentDir, dirName_);
+        await assertNoSymlinkInPath(projectDirPath, staleDir);
+        await fsRm(staleDir, { recursive: true, force: true });
+    }
+}
 export async function writeExportedProject(projectDirPath, exportStructure, stdout) {
     const project = exportStructure.projects[0];
     const projectJsonPath = path.join(projectDirPath, "project.json");
@@ -75,6 +94,7 @@ export async function writeExportedProject(projectDirPath, exportStructure, stdo
     for (const { field, dirName, fileName, trayType } of ASSET_DIRS) {
         const entities = exportStructure[field] ?? [];
         const entityParentDir = path.join(projectDirPath, dirName);
+        const currentIds = new Set(entities.map((entity) => entity.id));
         for (const entity of entities) {
             const entityId = requireUuid(entity.id, `exportProject: ${field}[].id`);
             const entityDirName_ = entityDirName(entityId, entityDisplayName(entity));
@@ -113,6 +133,7 @@ export async function writeExportedProject(projectDirPath, exportStructure, stdo
                 }
             }
         }
+        await removeOrphanedEntityDirs(projectDirPath, entityParentDir, currentIds);
     }
     const solutionDropped = Boolean(exportStructure.solution);
     if (solutionDropped) {
@@ -252,6 +273,10 @@ export async function runPull(deps, options) {
             }
         }
         if (unchanged) {
+            for (const { field, dirName } of ASSET_DIRS) {
+                const entities = exportStructure[field] ?? [];
+                await removeOrphanedEntityDirs(dir, path.join(dir, dirName), new Set(entities.map((e) => e.id)));
+            }
             await writeProjectState(dir, { ...existingState, last_sync: new Date().toISOString() });
             if (asJson) {
                 events.push({ project_id: projectId, project_name: projectName, action: "pulled_unchanged", renamed_dir: renamedDir });

package/dist/lib/promoteReport.js

@@ -20,4 +20,22 @@ export function toProjectImportImpact(projectName, projectId, impact) {
         ],
     };
 }
+export function summarizeImpactForVersionDescription(impact) {
+    function countsByKind(entities) {
+        const counts = { created: 0, updated: 0, removed: 0 };
+        for (const entity of entities)
+            counts[entity.kind]++;
+        return Object.entries(counts)
+            .filter(([, count]) => count > 0)
+            .map(([kind, count]) => `${count} ${kind}`);
+    }
+    const parts = [];
+    const workflowCounts = countsByKind(impact.workflows);
+    if (workflowCounts.length > 0)
+        parts.push(`${workflowCounts.join(", ")} workflows`);
+    const configCounts = countsByKind(impact.config);
+    if (configCounts.length > 0)
+        parts.push(`${configCounts.join(", ")} config keys`);
+    return parts.length > 0 ? parts.join("; ") : "No changes detected";
+}
 //# sourceMappingURL=promoteReport.js.map

package/dist/lib/promoteTarget.js

@@ -96,6 +96,30 @@ export function validateAuthenticationMappings(mapping) {
         .filter(([, authenticationId]) => !isUuid(authenticationId))
         .map(([authExportId, value]) => ({ authExportId, value }));
 }
+export async function getLatestProjectVersion(client, targetProjectId) {
+    const result = (await client.request("GET", `/v1/projects/${targetProjectId}/versions?last=1`));
+    const latest = result.elements?.[0];
+    if (!latest)
+        return null;
+    const [major, minor] = latest.versionNumber.split(".").map(Number);
+    return { major, minor };
+}
+export function computeNextVersionNumber(current, mode) {
+    if (!current)
+        return "1.0";
+    if (mode === "major")
+        return `${current.major + 1}.0`;
+    return `${current.major}.${current.minor + 1}`;
+}
+export async function createProjectVersion(client, targetProjectId, versionNumber, title, description) {
+    const result = (await client.request("POST", `/v1/projects/${targetProjectId}/versions/${versionNumber}`, { title, description }));
+    return {
+        versionNumber: result.versionNumber,
+        title: result.title,
+        description: result.description,
+        created: result.created,
+    };
+}
 export async function resolveProjectRequirements(client, deps, options) {
     const targetResolution = await resolveTargetProjectId(client, {
         projectDirPath: options.projectDirPath,

package/dist/views/promote/promote.v2.js

@@ -4,6 +4,9 @@ import { printIssueBlock } from "../shared.js";
 export function printMutuallyExclusiveResumeAndProject(stderr) {
     stderr(`${FAILURE_ICON} ${ansis.bold("--resume")} and ${ansis.bold("--project")} are mutually exclusive.`);
 }
+export function printMutuallyExclusiveMajorAndVersion(stderr) {
+    stderr(`${FAILURE_ICON} ${ansis.bold("--major")} and ${ansis.bold("--version")} are mutually exclusive.`);
+}
 export function printTrayYamlNotFound(stderr) {
     stderr(`${FAILURE_ICON} tray.yaml not found. Run \`${ansis.bold("tray init")}\` first.`);
 }
@@ -73,6 +76,12 @@ export function printProjectImportImpact(stdout, impact) {
             stdout(`    ${ansis.bold(c.kind)}: ${c.name}`);
         }
     }
+    if (impact.createdVersion) {
+        stdout(`  version: ${ansis.bold(impact.createdVersion.versionNumber)} — ${impact.createdVersion.title}`);
+    }
     stdout("");
 }
+export function printVersionCreationFailed(stderr, projectId, sourceProjectName, message, targetProjectId) {
+    stderr(`${FAILURE_ICON} Project ${ansis.bold(`${projectId} (${sourceProjectName})`)} was promoted to target project ${targetProjectId}, but creating a version failed: ${message}`);
+}
 //# sourceMappingURL=promote.v2.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayai/tray-sync-cli",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "CLI tool to clone Tray projects and related assets to a local directory, and promote them between Tray environments",
   "bin": {
     "tray": "dist/cli.js"