@mondaydotcomorg/z2h-cli 0.23.1 → 0.24.0

package/dist/commands/__tests__/migrate.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrate.test.d.ts.map

package/dist/commands/__tests__/migrate.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/migrate.test.ts"],"names":[],"mappings":""}

package/dist/commands/migrate.d.ts

@@ -1,3 +1,4 @@
+export declare function baseVersion(version: string): string;
 export interface MigrateOptions {
     dryRun?: boolean;
 }

package/dist/commands/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AA6CA,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkGjG"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AA4BA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMnD;AAqBD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGjG"}

package/dist/commands/migrate.js

@@ -16,6 +16,15 @@ const semver__default = /*#__PURE__*/_interopDefault(semver);
 
 const STATE_FILE = '.z2h-migrations-state.json';
 // ─── Helpers ───
+// A prerelease sorts BELOW its own release under plain semver ordering, so
+// comparing raw beta versions here would skip migrations the beta introduced.
+function baseVersion(version) {
+    const parsed = semver__default.default.parse(version);
+    if (!parsed) {
+        throw new Error(`invalid semver version: ${version}`);
+    }
+    return `${parsed.major}.${parsed.minor}.${parsed.patch}`;
+}
 async function readMigrationState(workspaceHome) {
     const statePath = path__default.default.join(workspaceHome, STATE_FILE);
     if (!(await fs.pathExists(statePath))) {
@@ -40,11 +49,12 @@ async function migrateCommand(cliVersion, opts = {}) {
     }
     const state = await readMigrationState(workspaceHome);
     const lastVersion = state?.lastMigratedVersion ?? '0.0.0';
-    if (!semver__default.default.gt(cliVersion, lastVersion)) {
+    const targetVersion = baseVersion(cliVersion);
+    if (!semver__default.default.gt(targetVersion, lastVersion)) {
         util_logger.info('workspace is up to date — no migrations pending');
         return;
     }
-    util_logger.info(`migrating workspace from v${lastVersion} → v${cliVersion}...`);
+    util_logger.info(`migrating workspace from v${lastVersion} → v${targetVersion}...`);
     // migrations.json is at the package root — two dirs up from dist/migrations/
     const thisDir = path__default.default.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('commands/migrate.js', document.baseURI).href))));
     const migrationsJsonPath = path__default.default.resolve(thisDir, '..', '..', 'migrations.json');
@@ -53,12 +63,12 @@ async function migrateCommand(cliVersion, opts = {}) {
         return;
     }
     const migrationsJson = (await fs.readJson(migrationsJsonPath));
-    // Filter to pending migrations (version > lastVersion AND <= cliVersion).
+    // Filter to pending migrations (version > lastVersion AND <= targetVersion).
     // CONVENTION: a migration's `version` field must equal the CLI release it
     // ships with (not the feature branch version). This ensures the `gt` check
     // always catches a migration on the exact upgrade that introduces it.
     const pending = Object.entries(migrationsJson.migrations)
-        .filter(([, entry]) => semver__default.default.gt(entry.version, lastVersion) && semver__default.default.lte(entry.version, cliVersion))
+        .filter(([, entry]) => semver__default.default.gt(entry.version, lastVersion) && semver__default.default.lte(entry.version, targetVersion))
         .sort(([, a], [, b]) => semver__default.default.compare(a.version, b.version));
     if (opts.dryRun) {
         util_logger.info(`${pending.length} pending migration(s) (dry-run — no changes will be applied):`);
@@ -68,7 +78,7 @@ async function migrateCommand(cliVersion, opts = {}) {
         return;
     }
     if (pending.length === 0) {
-        await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+        await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
         return;
     }
     const nxReady = await util_workspace.ensureWorkspaceNx(workspaceHome);
@@ -108,8 +118,9 @@ async function migrateCommand(cliVersion, opts = {}) {
     if (needsInstall) {
         await util_workspace.runYarnInstall(workspaceHome, 'package.json changed');
     }
-    await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+    await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
     util_logger.info('workspace migrations complete.');
 }
 
+exports.baseVersion = baseVersion;
 exports.migrateCommand = migrateCommand;

package/dist/esm/commands/__tests__/migrate.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrate.test.d.ts.map

package/dist/esm/commands/__tests__/migrate.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/__tests__/migrate.test.ts"],"names":[],"mappings":""}

package/dist/esm/commands/migrate.d.ts

@@ -1,3 +1,4 @@
+export declare function baseVersion(version: string): string;
 export interface MigrateOptions {
     dryRun?: boolean;
 }

package/dist/esm/commands/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate.ts"],"names":[],"mappings":"AA6CA,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkGjG"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate.ts"],"names":[],"mappings":"AA4BA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMnD;AAqBD,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGjG"}

package/dist/esm/commands/migrate.mjs

@@ -8,6 +8,15 @@ import { getWorkspaceHome, isZ2hWorkspace, ensureWorkspaceNx, runYarnInstall } f
 
 const STATE_FILE = '.z2h-migrations-state.json';
 // ─── Helpers ───
+// A prerelease sorts BELOW its own release under plain semver ordering, so
+// comparing raw beta versions here would skip migrations the beta introduced.
+function baseVersion(version) {
+    const parsed = semver.parse(version);
+    if (!parsed) {
+        throw new Error(`invalid semver version: ${version}`);
+    }
+    return `${parsed.major}.${parsed.minor}.${parsed.patch}`;
+}
 async function readMigrationState(workspaceHome) {
     const statePath = path.join(workspaceHome, STATE_FILE);
     if (!(await pathExists(statePath))) {
@@ -32,11 +41,12 @@ async function migrateCommand(cliVersion, opts = {}) {
     }
     const state = await readMigrationState(workspaceHome);
     const lastVersion = state?.lastMigratedVersion ?? '0.0.0';
-    if (!semver.gt(cliVersion, lastVersion)) {
+    const targetVersion = baseVersion(cliVersion);
+    if (!semver.gt(targetVersion, lastVersion)) {
         info('workspace is up to date — no migrations pending');
         return;
     }
-    info(`migrating workspace from v${lastVersion} → v${cliVersion}...`);
+    info(`migrating workspace from v${lastVersion} → v${targetVersion}...`);
     // migrations.json is at the package root — two dirs up from dist/migrations/
     const thisDir = path.dirname(fileURLToPath(import.meta.url));
     const migrationsJsonPath = path.resolve(thisDir, '..', '..', 'migrations.json');
@@ -45,12 +55,12 @@ async function migrateCommand(cliVersion, opts = {}) {
         return;
     }
     const migrationsJson = (await readJson(migrationsJsonPath));
-    // Filter to pending migrations (version > lastVersion AND <= cliVersion).
+    // Filter to pending migrations (version > lastVersion AND <= targetVersion).
     // CONVENTION: a migration's `version` field must equal the CLI release it
     // ships with (not the feature branch version). This ensures the `gt` check
     // always catches a migration on the exact upgrade that introduces it.
     const pending = Object.entries(migrationsJson.migrations)
-        .filter(([, entry]) => semver.gt(entry.version, lastVersion) && semver.lte(entry.version, cliVersion))
+        .filter(([, entry]) => semver.gt(entry.version, lastVersion) && semver.lte(entry.version, targetVersion))
         .sort(([, a], [, b]) => semver.compare(a.version, b.version));
     if (opts.dryRun) {
         info(`${pending.length} pending migration(s) (dry-run — no changes will be applied):`);
@@ -60,7 +70,7 @@ async function migrateCommand(cliVersion, opts = {}) {
         return;
     }
     if (pending.length === 0) {
-        await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+        await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
         return;
     }
     const nxReady = await ensureWorkspaceNx(workspaceHome);
@@ -100,8 +110,8 @@ async function migrateCommand(cliVersion, opts = {}) {
     if (needsInstall) {
         await runYarnInstall(workspaceHome, 'package.json changed');
     }
-    await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+    await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
     info('workspace migrations complete.');
 }
 
-export { migrateCommand };
+export { baseVersion, migrateCommand };

package/package.json

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

package/src/commands/__tests__/migrate.test.ts

@@ -0,0 +1,34 @@
+import { describe, it, expect } from 'vitest';
+import semver from 'semver';
+import { baseVersion } from '../migrate';
+
+describe('baseVersion', () => {
+  it('strips prerelease + build metadata down to major.minor.patch', () => {
+    expect(baseVersion('0.23.0-feat-faster-deploy-abc1234')).toBe('0.23.0');
+  });
+
+  it('is a no-op on an already-plain release version', () => {
+    expect(baseVersion('0.23.0')).toBe('0.23.0');
+  });
+
+  it('throws on an invalid version string rather than silently misbehaving', () => {
+    expect(() => baseVersion('not-a-version')).toThrow(/invalid semver/);
+  });
+});
+
+describe('prerelease migration gating (regression for the bug baseVersion fixes)', () => {
+  const MIGRATION_VERSION = '0.23.0';
+  const BETA_CLI_VERSION = '0.23.0-feat-faster-deploy-abc1234';
+
+  it('demonstrates the bug: a prerelease sorts BELOW its own release under plain semver.lte', () => {
+    expect(semver.lte(MIGRATION_VERSION, BETA_CLI_VERSION)).toBe(false);
+  });
+
+  it('the fix: comparing against the coerced base version includes it correctly', () => {
+    expect(semver.lte(MIGRATION_VERSION, baseVersion(BETA_CLI_VERSION))).toBe(true);
+  });
+
+  it('a migration registered at a later version than the beta build is still correctly excluded', () => {
+    expect(semver.lte('0.24.0', baseVersion(BETA_CLI_VERSION))).toBe(false);
+  });
+});

package/src/commands/migrate.ts

@@ -24,6 +24,16 @@ interface MigrationsJson {
 
 // ─── Helpers ───
 
+// A prerelease sorts BELOW its own release under plain semver ordering, so
+// comparing raw beta versions here would skip migrations the beta introduced.
+export function baseVersion(version: string): string {
+  const parsed = semver.parse(version);
+  if (!parsed) {
+    throw new Error(`invalid semver version: ${version}`);
+  }
+  return `${parsed.major}.${parsed.minor}.${parsed.patch}`;
+}
+
 async function readMigrationState(workspaceHome: string): Promise<MigrationState | null> {
   const statePath = path.join(workspaceHome, STATE_FILE);
   if (!(await pathExists(statePath))) {
@@ -56,13 +66,14 @@ export async function migrateCommand(cliVersion: string, opts: MigrateOptions =
 
   const state = await readMigrationState(workspaceHome);
   const lastVersion = state?.lastMigratedVersion ?? '0.0.0';
+  const targetVersion = baseVersion(cliVersion);
 
-  if (!semver.gt(cliVersion, lastVersion)) {
+  if (!semver.gt(targetVersion, lastVersion)) {
     info('workspace is up to date — no migrations pending');
     return;
   }
 
-  info(`migrating workspace from v${lastVersion} → v${cliVersion}...`);
+  info(`migrating workspace from v${lastVersion} → v${targetVersion}...`);
 
   // migrations.json is at the package root — two dirs up from dist/migrations/
   const thisDir = path.dirname(fileURLToPath(import.meta.url));
@@ -75,12 +86,12 @@ export async function migrateCommand(cliVersion: string, opts: MigrateOptions =
 
   const migrationsJson = (await readJson(migrationsJsonPath)) as MigrationsJson;
 
-  // Filter to pending migrations (version > lastVersion AND <= cliVersion).
+  // Filter to pending migrations (version > lastVersion AND <= targetVersion).
   // CONVENTION: a migration's `version` field must equal the CLI release it
   // ships with (not the feature branch version). This ensures the `gt` check
   // always catches a migration on the exact upgrade that introduces it.
   const pending = Object.entries(migrationsJson.migrations)
-    .filter(([, entry]) => semver.gt(entry.version, lastVersion) && semver.lte(entry.version, cliVersion))
+    .filter(([, entry]) => semver.gt(entry.version, lastVersion) && semver.lte(entry.version, targetVersion))
     .sort(([, a], [, b]) => semver.compare(a.version, b.version));
 
   if (opts.dryRun) {
@@ -92,7 +103,7 @@ export async function migrateCommand(cliVersion: string, opts: MigrateOptions =
   }
 
   if (pending.length === 0) {
-    await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+    await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
     return;
   }
 
@@ -143,6 +154,6 @@ export async function migrateCommand(cliVersion: string, opts: MigrateOptions =
     await runYarnInstall(workspaceHome, 'package.json changed');
   }
 
-  await writeMigrationState(workspaceHome, { lastMigratedVersion: cliVersion });
+  await writeMigrationState(workspaceHome, { lastMigratedVersion: targetVersion });
   info('workspace migrations complete.');
 }