@trayai/tray-sync-cli 1.0.6 → 1.0.7

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayai/tray-sync-cli",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "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"