@squiz/dxp-cli-next 5.33.0-develop.2 → 5.33.0-develop.4

package/lib/migration/utils/nextStage.d.ts

@@ -1,2 +1,3 @@
-import { NextStageApiResponse, NextStageParsedOptions } from '../types';
+import { NextStageApiResponse, NextStageParsedOptions, BatchNextStageApiResponse, BatchNextStageParsedOptions } from '../types';
 export declare function nextStage(options: NextStageParsedOptions): Promise<NextStageApiResponse>;
+export declare function batchNextStage(options: BatchNextStageParsedOptions): Promise<BatchNextStageApiResponse>;

package/lib/migration/utils/nextStage.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextStage = void 0;
+exports.batchNextStage = exports.nextStage = void 0;
 const ApiService_1 = require("../../ApiService");
 const _1 = require(".");
 function nextStage(options) {
@@ -18,28 +18,38 @@ function nextStage(options) {
             validateStatus: _1.validateAxiosStatus,
         });
         const migrationUrl = yield (0, _1.buildMigrationUrl)(options.tenant, options.overrideUrl);
-        try {
-            const payload = Object.assign({}, (options.stageOptions && { stageOptions: options.stageOptions }));
-            const response = yield apiService.client.post(`${migrationUrl}/${options.migrationId}/assets/${options.assetId}/next`, payload, {
-                headers: yield (0, _1.getMigrationHeaders)(options.tenant),
-            });
-            if (response.status !== 202) {
-                throw new Error(`Next stage failed with status: ${response.status}`);
-            }
-            const { message } = response.data || {};
-            if (!message) {
-                throw new Error('Invalid response format from next stage');
-            }
-            return {
-                message,
-            };
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                throw error;
-            }
-            throw new Error(`Failed to start next stage: ${error}`);
+        const payload = Object.assign({}, (options.stageOptions && { stageOptions: options.stageOptions }));
+        const response = yield apiService.client.post(`${migrationUrl}/${options.migrationId}/assets/${options.assetId}/next`, payload, {
+            headers: yield (0, _1.getMigrationHeaders)(options.tenant),
+        });
+        const { message } = response.data || {};
+        if (!message) {
+            throw new Error('Invalid response format from next stage');
         }
+        return {
+            message,
+        };
     });
 }
 exports.nextStage = nextStage;
+function batchNextStage(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const apiService = new ApiService_1.ApiService({
+            validateStatus: _1.validateAxiosStatus,
+        });
+        const migrationUrl = yield (0, _1.buildMigrationUrl)(options.tenant, options.overrideUrl);
+        const payload = Object.assign(Object.assign({}, (options.stageOptions && { stageOptions: options.stageOptions })), { currentStage: options.stage });
+        const response = yield apiService.client.post(`${migrationUrl}/${options.migrationId}/next`, payload, {
+            headers: yield (0, _1.getMigrationHeaders)(options.tenant),
+        });
+        const { success, failed } = response.data || {};
+        if (!success && !failed) {
+            throw new Error('Invalid response format from batch next stage');
+        }
+        return {
+            success: success || [],
+            failed: failed || [],
+        };
+    });
+}
+exports.batchNextStage = batchNextStage;

package/lib/migration/utils/nextStage.spec.js

@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const ApiService_1 = require("../../ApiService");
 const nextStage_1 = require("./nextStage");
+const types_1 = require("../types");
 const utils = __importStar(require("."));
 jest.mock('../../ApiService');
 jest.mock('.');
@@ -83,13 +84,16 @@ describe('nextStage', () => {
             },
         });
     }));
-    it('handles non-202 status codes', () => __awaiter(void 0, void 0, void 0, function* () {
-        const mockResponse = {
+    it('handles API errors (4xx/5xx status codes)', () => __awaiter(void 0, void 0, void 0, function* () {
+        // In production, Axios throws AxiosError for 4xx/5xx status codes
+        const axiosError = new Error('Request failed with status code 400');
+        axiosError.isAxiosError = true;
+        axiosError.response = {
             status: 400,
-            data: {},
+            data: { message: 'Bad Request' },
         };
-        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
-        yield expect((0, nextStage_1.nextStage)(mockOptions)).rejects.toThrow('Next stage failed with status: 400');
+        mockApiServiceInstance.client.post.mockRejectedValue(axiosError);
+        yield expect((0, nextStage_1.nextStage)(mockOptions)).rejects.toThrow('Request failed with status code 400');
     }));
     it('handles missing message in response', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockResponse = {
@@ -104,9 +108,10 @@ describe('nextStage', () => {
         mockApiServiceInstance.client.post.mockRejectedValue(error);
         yield expect((0, nextStage_1.nextStage)(mockOptions)).rejects.toThrow('Network error');
     }));
-    it('handles unknown errors', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('propagates rejected values as-is', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Non-Error values are propagated without wrapping
         mockApiServiceInstance.client.post.mockRejectedValue('Unknown error');
-        yield expect((0, nextStage_1.nextStage)(mockOptions)).rejects.toThrow('Failed to start next stage: Unknown error');
+        yield expect((0, nextStage_1.nextStage)(mockOptions)).rejects.toBe('Unknown error');
     }));
     it('uses override URL when provided', () => __awaiter(void 0, void 0, void 0, function* () {
         const optionsWithOverride = Object.assign(Object.assign({}, mockOptions), { overrideUrl: 'https://custom.migration.url' });
@@ -149,3 +154,170 @@ describe('nextStage', () => {
         });
     }));
 });
+describe('batchNextStage', () => {
+    let mockApiServiceInstance;
+    let mockOptions;
+    beforeEach(() => {
+        mockApiServiceInstance = {
+            client: {
+                post: jest.fn(),
+            },
+        };
+        mockApiService.mockImplementation(() => mockApiServiceInstance);
+        mockOptions = {
+            migrationId: 'migration-123',
+            stage: types_1.MigrationStage.preview,
+            tenant: 'test-tenant',
+        };
+        mockUtils.buildMigrationUrl.mockResolvedValue('https://example.com/__dxp/service/aiapps/migration/migrations');
+        mockUtils.getMigrationHeaders.mockResolvedValue({
+            'Content-Type': 'application/json',
+            'x-dxp-tenant': 'test-tenant',
+        });
+        mockUtils.validateAxiosStatus.mockImplementation(status => status >= 200 && status < 300);
+    });
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    it('triggers batch next stage successfully', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [
+                    { assetIds: ['asset-1', 'asset-2'], message: 'Stage completed' },
+                ],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, nextStage_1.batchNextStage)(mockOptions);
+        expect(result).toEqual({
+            success: [
+                { assetIds: ['asset-1', 'asset-2'], message: 'Stage completed' },
+            ],
+            failed: [],
+        });
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://example.com/__dxp/service/aiapps/migration/migrations/migration-123/next', { currentStage: types_1.MigrationStage.preview }, {
+            headers: {
+                'Content-Type': 'application/json',
+                'x-dxp-tenant': 'test-tenant',
+            },
+        });
+    }));
+    it('handles mixed success and failure response', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [{ assetIds: ['asset-1'], message: 'Stage completed' }],
+                failed: [{ assetIds: ['asset-2'], error: 'Asset not ready' }],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, nextStage_1.batchNextStage)(mockOptions);
+        expect(result).toEqual({
+            success: [{ assetIds: ['asset-1'], message: 'Stage completed' }],
+            failed: [{ assetIds: ['asset-2'], error: 'Asset not ready' }],
+        });
+    }));
+    it('handles API errors (4xx/5xx status codes)', () => __awaiter(void 0, void 0, void 0, function* () {
+        const axiosError = new Error('Request failed with status code 400');
+        axiosError.isAxiosError = true;
+        axiosError.response = {
+            status: 400,
+            data: { message: 'Bad Request' },
+        };
+        mockApiServiceInstance.client.post.mockRejectedValue(axiosError);
+        yield expect((0, nextStage_1.batchNextStage)(mockOptions)).rejects.toThrow('Request failed with status code 400');
+    }));
+    it('handles missing success and failed in response', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {},
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield expect((0, nextStage_1.batchNextStage)(mockOptions)).rejects.toThrow('Invalid response format from batch next stage');
+    }));
+    it('handles API service errors', () => __awaiter(void 0, void 0, void 0, function* () {
+        const error = new Error('Network error');
+        mockApiServiceInstance.client.post.mockRejectedValue(error);
+        yield expect((0, nextStage_1.batchNextStage)(mockOptions)).rejects.toThrow('Network error');
+    }));
+    it('propagates rejected values as-is', () => __awaiter(void 0, void 0, void 0, function* () {
+        mockApiServiceInstance.client.post.mockRejectedValue('Unknown error');
+        yield expect((0, nextStage_1.batchNextStage)(mockOptions)).rejects.toBe('Unknown error');
+    }));
+    it('uses override URL when provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const optionsWithOverride = Object.assign(Object.assign({}, mockOptions), { overrideUrl: 'https://custom.migration.url' });
+        mockUtils.buildMigrationUrl.mockResolvedValue('https://custom.migration.url/migrations');
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield (0, nextStage_1.batchNextStage)(optionsWithOverride);
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://custom.migration.url/migrations/migration-123/next', expect.any(Object), expect.any(Object));
+    }));
+    it('constructs correct URL path without assetId', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield (0, nextStage_1.batchNextStage)(mockOptions);
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://example.com/__dxp/service/aiapps/migration/migrations/migration-123/next', expect.any(Object), expect.any(Object));
+    }));
+    it('uses correct headers', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield (0, nextStage_1.batchNextStage)(mockOptions);
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith(expect.any(String), expect.any(Object), {
+            headers: {
+                'Content-Type': 'application/json',
+                'x-dxp-tenant': 'test-tenant',
+            },
+        });
+    }));
+    it('includes stageOptions in payload when provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const optionsWithStageOptions = Object.assign(Object.assign({}, mockOptions), { stageOptions: { skipValidation: true } });
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield (0, nextStage_1.batchNextStage)(optionsWithStageOptions);
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith(expect.any(String), {
+            stageOptions: { skipValidation: true },
+            currentStage: types_1.MigrationStage.preview,
+        }, expect.any(Object));
+    }));
+    it('returns empty arrays when response has empty success and failed', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 202,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, nextStage_1.batchNextStage)(mockOptions);
+        expect(result).toEqual({
+            success: [],
+            failed: [],
+        });
+    }));
+});

package/lib/migration/utils/options.d.ts

@@ -1,6 +1,7 @@
 import { Command, Option } from 'commander';
 export declare enum OptionName {
     ASSET_ID = "asset-id",
+    ASSET_IDS = "asset-ids",
     PREVIEW_ASSET_ID = "preview-asset-id",
     MATRIX_URL = "matrix-url",
     TENANT = "tenant",
@@ -8,8 +9,10 @@ export declare enum OptionName {
     MATRIX_IDENTIFIER = "matrix-identifier",
     MATRIX_KEY = "matrix-key",
     CONTENT_API_KEY = "content-api-key",
+    STAGE = "stage",
     STAGE_OPTIONS = "stage-options",
-    CCT_IDS = "cct-ids"
+    CCT_IDS = "cct-ids",
+    TRIGGER_NEXT_STAGE = "trigger-next-stage"
 }
 export declare const getParamOption: (param: OptionName, makeOptionMandatory?: boolean) => Option;
 export declare const addOverrideUrlOption: (command: Command) => void;

package/lib/migration/utils/options.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addOverrideUrlOption = exports.getParamOption = exports.OptionName = void 0;
 const commander_1 = require("commander");
+const types_1 = require("../types");
 var OptionName;
 (function (OptionName) {
     OptionName["ASSET_ID"] = "asset-id";
+    OptionName["ASSET_IDS"] = "asset-ids";
     OptionName["PREVIEW_ASSET_ID"] = "preview-asset-id";
     OptionName["MATRIX_URL"] = "matrix-url";
     OptionName["TENANT"] = "tenant";
@@ -12,8 +14,10 @@ var OptionName;
     OptionName["MATRIX_IDENTIFIER"] = "matrix-identifier";
     OptionName["MATRIX_KEY"] = "matrix-key";
     OptionName["CONTENT_API_KEY"] = "content-api-key";
+    OptionName["STAGE"] = "stage";
     OptionName["STAGE_OPTIONS"] = "stage-options";
     OptionName["CCT_IDS"] = "cct-ids";
+    OptionName["TRIGGER_NEXT_STAGE"] = "trigger-next-stage";
 })(OptionName = exports.OptionName || (exports.OptionName = {}));
 const params = new Map([
     [
@@ -23,6 +27,13 @@ const params = new Map([
             description: 'The ID of the asset to be migrated',
         },
     ],
+    [
+        OptionName.ASSET_IDS,
+        {
+            flags: '--asset-ids <string[]>',
+            description: 'Path to a JSON file containing the IDs of the assets to be migrated',
+        },
+    ],
     [
         OptionName.PREVIEW_ASSET_ID,
         {
@@ -72,6 +83,14 @@ const params = new Map([
             description: 'The Content API key for the Migrator API to interact with Content API',
         },
     ],
+    [
+        OptionName.STAGE,
+        {
+            flags: '--stage <string>',
+            description: 'The current stage of the migrations to trigger the next stage for',
+            choices: Object.values(types_1.MigrationStage),
+        },
+    ],
     [
         OptionName.STAGE_OPTIONS,
         {
@@ -83,7 +102,14 @@ const params = new Map([
         OptionName.CCT_IDS,
         {
             flags: '--cct-ids <string>',
-            description: 'The IDs of the CCTs to be converted in a pre-migration, or to be skipped in a migration (already converted)',
+            description: 'Path to a JSON file containing the CCT IDs to be converted in a pre-migration, or to be skipped in a migration (already converted)',
+        },
+    ],
+    [
+        OptionName.TRIGGER_NEXT_STAGE,
+        {
+            flags: '--trigger-next-stage <boolean>',
+            description: 'Whether to trigger the next stage of the migration automatically. This will automatically be set to true for pre and bulk migrations.',
         },
     ],
 ]);
@@ -92,7 +118,11 @@ const getParamOption = (param, makeOptionMandatory = true) => {
     if (!paramInfo) {
         throw new Error(`Param ${param} not found`);
     }
-    return new commander_1.Option(paramInfo.flags, paramInfo.description).makeOptionMandatory(makeOptionMandatory);
+    const option = new commander_1.Option(paramInfo.flags, paramInfo.description).makeOptionMandatory(makeOptionMandatory);
+    if (paramInfo.choices) {
+        option.choices(paramInfo.choices);
+    }
+    return option;
 };
 exports.getParamOption = getParamOption;
 const addOverrideUrlOption = (command) => {

package/lib/migration/utils/revertMigration.d.ts

@@ -1,2 +1,3 @@
-import { RevertMigrationOptions, RevertMigrationApiResponse } from '../types';
+import { RevertMigrationOptions, RevertMigrationApiResponse, BatchRevertMigrationOptions, BatchRevertMigrationApiResponse } from '../types';
 export declare function revertMigration(options: RevertMigrationOptions): Promise<RevertMigrationApiResponse>;
+export declare function batchRevertMigration(options: BatchRevertMigrationOptions): Promise<BatchRevertMigrationApiResponse>;

package/lib/migration/utils/revertMigration.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.revertMigration = void 0;
+exports.batchRevertMigration = exports.revertMigration = void 0;
 const ApiService_1 = require("../../ApiService");
 const _1 = require(".");
 function revertMigration(options) {
@@ -36,3 +36,23 @@ function revertMigration(options) {
     });
 }
 exports.revertMigration = revertMigration;
+function batchRevertMigration(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const apiService = new ApiService_1.ApiService({
+            validateStatus: _1.validateAxiosStatus,
+        });
+        const migrationUrl = yield (0, _1.buildMigrationUrl)(options.tenant, options.overrideUrl);
+        const response = yield apiService.client.post(`${migrationUrl}/${options.migrationId}/rollback`, {}, {
+            headers: yield (0, _1.getMigrationHeaders)(options.tenant),
+        });
+        const { success, failed } = response.data || {};
+        if (!success && !failed) {
+            throw new Error('Invalid response format from batch revert');
+        }
+        return {
+            success: success || [],
+            failed: failed || [],
+        };
+    });
+}
+exports.batchRevertMigration = batchRevertMigration;

package/lib/migration/utils/revertMigration.spec.js

@@ -93,3 +93,118 @@ describe('revertMigration', () => {
         });
     }));
 });
+describe('batchRevertMigration', () => {
+    const mockOptions = {
+        migrationId: 'migration-123',
+        tenant: 'test-tenant',
+    };
+    const mockApiServiceInstance = {
+        client: {
+            post: jest.fn(),
+        },
+    };
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockApiService.mockImplementation(() => mockApiServiceInstance);
+        mockBuildMigrationUrl.mockResolvedValue('https://migration.example.com');
+        mockGetMigrationHeaders.mockResolvedValue({
+            'Content-Type': 'application/json',
+            'x-dxp-tenant': 'test-tenant',
+        });
+    });
+    it('should batch revert migration successfully', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {
+                success: [{ assetIds: ['asset-1', 'asset-2'], message: 'Reverted' }],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, revertMigration_1.batchRevertMigration)(mockOptions);
+        expect(result).toEqual({
+            success: [{ assetIds: ['asset-1', 'asset-2'], message: 'Reverted' }],
+            failed: [],
+        });
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://migration.example.com/migration-123/rollback', {}, {
+            headers: {
+                'Content-Type': 'application/json',
+                'x-dxp-tenant': 'test-tenant',
+            },
+        });
+    }));
+    it('should handle mixed success and failure response', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {
+                success: [{ assetIds: ['asset-1'], message: 'Reverted' }],
+                failed: [{ assetIds: ['asset-2'], error: 'Cannot revert' }],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, revertMigration_1.batchRevertMigration)(mockOptions);
+        expect(result).toEqual({
+            success: [{ assetIds: ['asset-1'], message: 'Reverted' }],
+            failed: [{ assetIds: ['asset-2'], error: 'Cannot revert' }],
+        });
+    }));
+    it('should handle missing success and failed in response', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {},
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield expect((0, revertMigration_1.batchRevertMigration)(mockOptions)).rejects.toThrow('Invalid response format from batch revert');
+    }));
+    it('should handle API service errors', () => __awaiter(void 0, void 0, void 0, function* () {
+        const error = new Error('Network error');
+        mockApiServiceInstance.client.post.mockRejectedValue(error);
+        yield expect((0, revertMigration_1.batchRevertMigration)(mockOptions)).rejects.toThrow('Network error');
+    }));
+    it('should propagate rejected values as-is', () => __awaiter(void 0, void 0, void 0, function* () {
+        mockApiServiceInstance.client.post.mockRejectedValue('Unknown error');
+        yield expect((0, revertMigration_1.batchRevertMigration)(mockOptions)).rejects.toBe('Unknown error');
+    }));
+    it('should use override URL when provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        mockBuildMigrationUrl.mockResolvedValue('https://custom.migration.url');
+        const optionsWithOverride = Object.assign(Object.assign({}, mockOptions), { overrideUrl: 'https://custom.migration.url' });
+        yield (0, revertMigration_1.batchRevertMigration)(optionsWithOverride);
+        expect(mockBuildMigrationUrl).toHaveBeenCalledWith(mockOptions.tenant, 'https://custom.migration.url');
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://custom.migration.url/migration-123/rollback', {}, expect.any(Object));
+    }));
+    it('should construct correct URL path without assetId', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        yield (0, revertMigration_1.batchRevertMigration)(mockOptions);
+        expect(mockApiServiceInstance.client.post).toHaveBeenCalledWith('https://migration.example.com/migration-123/rollback', {}, expect.any(Object));
+    }));
+    it('should return empty arrays when response has empty success and failed', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockResponse = {
+            status: 200,
+            data: {
+                success: [],
+                failed: [],
+            },
+        };
+        mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
+        const result = yield (0, revertMigration_1.batchRevertMigration)(mockOptions);
+        expect(result).toEqual({
+            success: [],
+            failed: [],
+        });
+    }));
+});

package/lib/page/utils/definitions.js

@@ -82,7 +82,7 @@ function loadLayoutFromFile(layoutFile) {
             encoding: 'utf-8',
         });
         try {
-            const layout = (0, yaml_1.parse)(content);
+            const layout = fileType === 'json' ? JSON.parse(content) : (0, yaml_1.parse)(content);
             const fileName = path.basename(layoutFile);
             if (fileName === exports.LAYOUT_MANIFEST_FILE) {
                 exports.InputLayoutDefinitionV2.parse(layout);

package/lib/page/utils/definitions.spec.js

@@ -198,14 +198,25 @@ entry: template.hbs
             }
             throw new Error('File not found');
         });
-        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects
-            .toThrowErrorMatchingInlineSnapshot(`
-      "Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Flow map must end with a } at line 1, column 15:
-
-      {invalid: json
-                    ^
-      "
-    `);
+        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects.toThrowErrorMatchingInlineSnapshot('"Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Expected property name or \'}\' in JSON at position 1 (line 1 column 2)"');
+    }));
+    it('should throw an error if JSON layout file uses single quotes instead of double quotes', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('manifest.json')) {
+                // Single quotes are not valid JSON - only double quotes are allowed for string values
+                return `{
+        "name": 'test-layout',
+        "displayName": "Test Layout",
+        "entry": "template.hbs",
+        "zones": []
+        }`;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects.toThrowErrorMatchingInlineSnapshot('"Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Unexpected token \'\'\', ..."  "name": \'test-layo"... is not valid JSON"');
     }));
     it('should throw an error if layout file do not have valid extension', () => __awaiter(void 0, void 0, void 0, function* () {
         yield expect((0, definitions_1.loadLayoutDefinition)('/foo/manifest.html')).rejects.toThrow('Layout file must have a valid extension: [yaml|json]');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.33.0-develop.2",
+  "version": "5.33.0-develop.4",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },

package/lib/migration/utils/loadCctIdsFromFile.d.ts

@@ -1 +0,0 @@
-export declare const loadCctIdsFromFile: (filePath?: string) => string[] | undefined;

package/lib/migration/utils/loadCctIdsFromFile.js

@@ -1,32 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadCctIdsFromFile = void 0;
-const fs_1 = __importDefault(require("fs"));
-const loadCctIdsFromFile = (filePath) => {
-    if (!filePath) {
-        return undefined;
-    }
-    try {
-        if (!fs_1.default.existsSync(filePath)) {
-            throw new Error(`CCT IDs file not found: ${filePath}`);
-        }
-        const fileContent = fs_1.default.readFileSync(filePath, 'utf8');
-        const cctIds = JSON.parse(fileContent);
-        if (!Array.isArray(cctIds) ||
-            cctIds.some(id => typeof id !== 'string' || !id.trim()) ||
-            cctIds.length === 0) {
-            throw new Error('CCT IDs file must contain a valid array of strings representing CCT IDs with at least one CCT ID');
-        }
-        return cctIds;
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new Error(`Failed to load CCT IDs from file: ${error.message}`);
-        }
-        throw new Error(`Failed to load CCT IDs from file: ${error}`);
-    }
-};
-exports.loadCctIdsFromFile = loadCctIdsFromFile;