@trayai/tray-sync-cli 1.0.3 → 1.0.5

package/README.md

@@ -43,7 +43,8 @@ Decide which workspace you're pulling *from* (the source) and which one you're p
 - Source: `DEV_ORG`
 - Target: `PROD_ORG`
 
-You'll need each workspace's ID and region, and a Tray API token with access to it.
+
+You'll need each workspace's ID and region, and a Tray API token with access to it. 📚 Learn how to create tokens for your [workspace (recommended)](https://tray.ai/documentation/platform/enterprise-core/organisation-management/api-users-tokens#enabling-workspace-admins-to-generate-tokens) / [account](https://tray.ai/documentation/platform/enterprise-core/organisation-management/api-users-tokens) here.
 
 ### 2. Create a local directory for this project
 

package/dist/commands/pull.js

@@ -9,7 +9,7 @@ import { readPullProgress, writePullProgress } from "../config/pullProgress.js";
 import { readProjectState, writeProjectState } from "../config/state.js";
 import { readTrayYaml, writeTrayYaml } from "../config/trayYaml.js";
 import { Scopes, TrayTypes, } from "../config/types.js";
-import { entityDirName } from "../lib/slug.js";
+import { entityDirName, findDirsWithStaleSlug } from "../lib/slug.js";
 import { entityDisplayName, parseExportStructure, } from "../lib/exportStructure.js";
 import { extractScripts } from "../lib/scriptExtraction.js";
 import { sha256 } from "../lib/checksum.js";
@@ -74,10 +74,22 @@ export async function writeExportedProject(projectDirPath, exportStructure, stdo
     const resources = {};
     for (const { field, dirName, fileName, trayType } of ASSET_DIRS) {
         const entities = exportStructure[field] ?? [];
+        const entityParentDir = path.join(projectDirPath, dirName);
         for (const entity of entities) {
             const entityId = requireUuid(entity.id, `exportProject: ${field}[].id`);
             const entityDirName_ = entityDirName(entityId, entityDisplayName(entity));
-            const entityDir = resolveContained(path.join(projectDirPath, dirName), entityDirName_);
+            const entityDir = resolveContained(entityParentDir, entityDirName_);
+            let staleDirNames;
+            try {
+                staleDirNames = findDirsWithStaleSlug(await fsReaddir(entityParentDir), entityId, entityDirName_);
+            }
+            catch {
+                staleDirNames = [];
+            }
+            for (const staleDirName of staleDirNames) {
+                const staleDir = await resolveContainedSafe(entityParentDir, staleDirName);
+                await fsRm(staleDir, { recursive: true, force: true });
+            }
             const entityJsonPath = path.join(entityDir, fileName);
             await assertNoSymlinkInPath(projectDirPath, entityJsonPath);
             await writeJson(entityJsonPath, entity);
@@ -195,7 +207,7 @@ export async function runPull(deps, options) {
         const dir = await resolveContainedSafe(projectsRoot, newDirName);
         let existingDirName;
         try {
-            existingDirName = (await readdir(projectsRoot)).find((name) => name.split("--")[0] === validatedProjectId && name !== newDirName);
+            existingDirName = findDirsWithStaleSlug(await readdir(projectsRoot), validatedProjectId, newDirName)[0];
         }
         catch {
             existingDirName = undefined;

package/dist/lib/slug.js

@@ -11,4 +11,7 @@ export function slugify(name) {
 export function entityDirName(uuid, name) {
     return `${uuid}--${slugify(name)}`;
 }
+export function findDirsWithStaleSlug(dirNames, uuid, currentDirName) {
+    return dirNames.filter((name) => name.split("--")[0] === uuid && name !== currentDirName);
+}
 //# sourceMappingURL=slug.js.map

package/package.json

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