@mondaydotcomorg/z2h-cli 0.11.5 → 0.11.6

package/dist/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C7F"}

package/dist/commands/create-workspace.js

@@ -22,7 +22,11 @@ async function createWorkspaceCommand(opts = {}) {
     if (await fs.pathExists(home)) {
         const entries = await fs.readdir(home);
         if (entries.length > 0) {
-            throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+            util_logger.output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+                ok: true,
+                workspace: home,
+            });
+            return;
         }
     }
     else {

package/dist/esm/commands/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7F"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../../../src/commands/create-workspace.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAAC,IAAI,GAAE,sBAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C7F"}

package/dist/esm/commands/create-workspace.mjs

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { pathExists, readdir, ensureDir, writeFile, copy } from 'fs-extra';
-import { setOutputMode, info, output } from '../util/logger.mjs';
+import { setOutputMode, output, info } from '../util/logger.mjs';
 import { getWorkspaceHome } from '../util/workspace.mjs';
 import { getTemplatesDir } from '../util/templates.mjs';
 import { runYarnInstall } from '../util/npm/install.mjs';
@@ -16,7 +16,11 @@ async function createWorkspaceCommand(opts = {}) {
     if (await pathExists(home)) {
         const entries = await readdir(home);
         if (entries.length > 0) {
-            throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+            output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+                ok: true,
+                workspace: home,
+            });
+            return;
         }
     }
     else {

package/dist/esm/index.mjs

@@ -232,5 +232,8 @@ void main()
     process.exit(0);
 })
     .catch(async (err) => {
-    await fail(`main failed: ${err.message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+        command: 'cli-main',
+    });
 });

package/dist/esm/util/git/repo.mjs

@@ -81,7 +81,7 @@ async function pullAndResolve(dir, env) {
         }
         await safeBackupIfDirty(dir);
         const info = await gatherConflictInfo(dir, gitEnv);
-        throw new GitConflictError(JSON.stringify(info));
+        throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
 }
 /**
@@ -109,7 +109,7 @@ async function pushToRemote(dir, env) {
         }
         if (isRejected) {
             const info = await gatherConflictInfo(dir, gitEnv);
-            throw new GitConflictError(JSON.stringify(info));
+            throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
         }
         throw err;
     }

package/dist/index.js

@@ -238,5 +238,8 @@ void main()
     process.exit(0);
 })
     .catch(async (err) => {
-    await util_logger.fail(`main failed: ${err.message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await util_logger.fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+        command: 'cli-main',
+    });
 });

package/dist/util/git/repo.js

@@ -88,7 +88,7 @@ async function pullAndResolve(dir, env) {
         }
         await safeBackupIfDirty(dir);
         const info = await gatherConflictInfo(dir, gitEnv);
-        throw new GitConflictError(JSON.stringify(info));
+        throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
 }
 /**
@@ -116,7 +116,7 @@ async function pushToRemote(dir, env) {
         }
         if (isRejected) {
             const info = await gatherConflictInfo(dir, gitEnv);
-            throw new GitConflictError(JSON.stringify(info));
+            throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
         }
         throw err;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mondaydotcomorg/z2h-cli",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "bin": "./bin/z2h-cli.js",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/commands/__tests__/create-workspace.test.ts

@@ -51,11 +51,11 @@ describe('create-workspace', () => {
     expect(runYarnInstall).toHaveBeenCalledWith(expect.objectContaining({ cwd: tmp }));
   });
 
-  it('refuses if the target dir is non-empty', async () => {
+  it('skips gracefully if the target dir is non-empty', async () => {
     await ensureDir(tmp);
     await writeJson(path.join(tmp, 'somefile.json'), { hello: 'world' });
 
-    await expect(createWorkspaceCommand()).rejects.toThrow(/Workspace already exists/);
+    await expect(createWorkspaceCommand()).resolves.toBeUndefined();
     expect(runYarnInstall).not.toHaveBeenCalled();
   });
 

package/src/commands/create-workspace.ts

@@ -22,7 +22,11 @@ export async function createWorkspaceCommand(opts: CreateWorkspaceOptions = {}):
   if (await pathExists(home)) {
     const entries = await readdir(home);
     if (entries.length > 0) {
-      throw new Error(`Workspace already exists at ${home}. Remove it and try again.`);
+      output(`[z2h-cli] workspace already exists at ${home} — skipping`, {
+        ok: true,
+        workspace: home,
+      });
+      return;
     }
   } else {
     await ensureDir(home);

package/src/index.ts

@@ -258,5 +258,8 @@ void main()
     process.exit(0);
   })
   .catch(async (err: unknown) => {
-    await fail(`main failed: ${(err as Error).message}`, { command: 'cli-main' });
+    const errorMsg = err instanceof Error ? err.message : String(err);
+    await fail(`main failed, check you are on latest version.\nerror: ${errorMsg}`, {
+      command: 'cli-main',
+    });
   });

package/src/util/git/__tests__/repo.test.ts

@@ -196,7 +196,7 @@ describe('pullAndResolve', () => {
     const err = await pullAndResolve(DIR).catch(e => e);
 
     expect(err).toBeInstanceOf(GitConflictError);
-    const info = JSON.parse(err.message);
+    const info = JSON.parse(err.message.split('Git conflict detected: ')[1]);
     expect(info.localCommits).toEqual(['abc local commit']);
     expect(info.remoteCommits).toEqual(['def remote commit']);
     expect(info.conflictingFiles).toEqual(['src/index.ts']);
@@ -225,7 +225,7 @@ describe('pushToRemote', () => {
     const err = await pushToRemote(DIR).catch(e => e);
 
     expect(err).toBeInstanceOf(GitConflictError);
-    const info = JSON.parse(err.message);
+    const info = JSON.parse(err.message.split('Git conflict detected: ')[1]);
     expect(info.localCommits).toEqual(['abc local']);
     expect(info.remoteCommits).toEqual(['def remote']);
     expect(info.conflictingFiles).toEqual(['file.ts']);

package/src/util/git/repo.ts

@@ -97,7 +97,7 @@ export async function pullAndResolve(dir: string, env?: Record<string, string>):
     }
     await safeBackupIfDirty(dir);
     const info = await gatherConflictInfo(dir, gitEnv);
-    throw new GitConflictError(JSON.stringify(info));
+    throw new GitConflictError(`Pull rejected: Git conflict detected: ${JSON.stringify(info)}`);
   }
 }
 
@@ -125,7 +125,7 @@ export async function pushToRemote(dir: string, env?: Record<string, string>): P
     }
     if (isRejected) {
       const info = await gatherConflictInfo(dir, gitEnv);
-      throw new GitConflictError(JSON.stringify(info));
+      throw new GitConflictError(`Push rejected: Git conflict detected: ${JSON.stringify(info)}`);
     }
     throw err;
   }