@squiz/component-cli-lib 1.3.4-alpha.2 → 1.5.1-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.3.4-alpha.2",
+  "version": "1.5.1-alpha.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,12 +13,12 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@squiz/component-lib": "1.3.4-alpha.2",
-    "@squiz/component-web-api-lib": "1.3.4-alpha.2",
-    "@squiz/dx-common-lib": "1.3.4-alpha.2",
-    "@squiz/dx-json-schema-lib": "1.3.4-alpha.2",
-    "@squiz/dx-logger-lib": "1.3.4-alpha.2",
-    "@squiz/virus-scanner-lib": "1.3.4-alpha.2",
+    "@squiz/component-lib": "1.5.1-alpha.1",
+    "@squiz/component-web-api-lib": "1.5.1-alpha.1",
+    "@squiz/dx-common-lib": "1.5.1-alpha.1",
+    "@squiz/dx-json-schema-lib": "1.5.1-alpha.1",
+    "@squiz/dx-logger-lib": "1.5.1-alpha.1",
+    "@squiz/virus-scanner-lib": "1.5.1-alpha.1",
     "@types/cli-color": "2.0.2",
     "@types/express": "4.17.14",
     "@types/jest": "28.1.8",
@@ -31,10 +31,10 @@
     "ts-jest": "28.0.8",
     "ts-loader": "9.3.1",
     "ts-node": "10.9.1",
-    "typescript": "4.9.3"
+    "typescript": "4.9.4"
   },
   "dependencies": {
-    "@squiz/render-runtime-lib": "1.3.4-alpha.2",
+    "@squiz/render-runtime-lib": "1.5.1-alpha.1",
     "archiver": "5.3.1",
     "axios": "0.27.2",
     "cli-color": "^2.0.2",
@@ -42,5 +42,5 @@
     "open": "^8.4.0",
     "supertest": "^6.2.3"
   },
-  "gitHead": "4f9e34a5a5c1bd225abc38a430fb8483acb594c6"
+  "gitHead": "c13280d14eb309774d081880dcd4d062e39d7c40"
 }

package/src/integration-tests/upload-and-render-component.integration.spec.ts

@@ -12,7 +12,7 @@ import configObj, {
   managementServiceRoot,
   contentService,
 } from './helper';
-import color from 'cli-color';
+
 import path from 'path';
 import supertest from 'supertest';
 import { logger } from '../upload-component-folder';
@@ -20,10 +20,6 @@ import { ComponentSetWebModelForCreate } from '@squiz/component-lib';
 import fsp from 'fs/promises';
 import { randomUUID } from 'crypto';
 
-const mockConsoleError = jest.fn();
-const mockConsoleLog = jest.fn();
-
-const orgConsoleError = console.error;
 const webPath = 'set-' + randomUUID();
 const contentItemId = randomUUID();
 const testFilesDir = path.resolve(__dirname, 'test-files');
@@ -57,49 +53,48 @@ describe('uploading a component', () => {
 
   describe('Test isolated test cases', () => {
     beforeEach(() => {
-      jest.spyOn(logger, 'error').mockImplementation(mockConsoleError);
-      jest.spyOn(logger, 'info').mockImplementation(mockConsoleLog);
+      // jest.spyOn(logger, 'error').mockImplementation(mockConsoleError);
+      // jest.spyOn(logger, 'info').mockImplementation(mockConsoleLog);
     });
 
     it('Should fail uploading a component without manifest.json', async () => {
-      mockConsoleError.mockClear();
       const componentPath = path.join(__dirname, '/__components__/invalid-upload');
-      await uploadComponentFolder(managementServiceRoot, configObj.managementServiceUrl, componentPath, testFilesDir);
-      expect(mockConsoleError.mock.calls[0][0]).toEqual(color.red('manifest could not be found'));
+      await expect(
+        uploadComponentFolder(managementServiceRoot, configObj.managementServiceUrl, componentPath, testFilesDir),
+      ).rejects.toThrowError(new Error('manifest could not be found'));
     });
 
     it('Should fail uploading a component that has invalid manifest.json', async () => {
-      mockConsoleError.mockClear();
       const componentPath = path.join(__dirname, '/__components__/invalid-manifest');
-      await uploadComponentFolder(
-        managementServiceRoot,
-        configObj.managementServiceUrl,
-        componentPath,
+      await expect(
+        uploadComponentFolder(
+          managementServiceRoot,
+          configObj.managementServiceUrl,
+          componentPath,
 
-        testFilesDir,
-      );
-      expect(mockConsoleError.mock.calls[0][0]).toEqual(
-        color.red(
+          testFilesDir,
+        ),
+      ).rejects.toThrowError(
+        new Error(
           'failed validation: Value in `#/name` should match `^[a-zA-Z0-9_\\-]+$`, but received `invalid-manifes@t`',
         ),
       );
     });
 
     it('Should fail uploading the component that has size more than 100MB', async () => {
-      mockConsoleError.mockClear();
       const componentPath = path.join(__dirname, '/__components__/big-package');
       const filePath = `${componentPath}/105mb-file`;
       await createFile(filePath, 105); // Higher limit has been used because compression reduces the size if you use closer to 100MB
-      await uploadComponentFolder(
-        managementServiceRoot,
-        configObj.managementServiceUrl,
-        componentPath,
+      await expect(
+        uploadComponentFolder(
+          managementServiceRoot,
+          configObj.managementServiceUrl,
+          componentPath,
+
+          testFilesDir,
+        ),
+      ).rejects.toThrowError(new Error('File size exceeds the maximum limit of 100MB'));
 
-        testFilesDir,
-      );
-      expect(mockConsoleError.mock.calls[0][0]).toEqual(
-        color.red(['File size exceeds the maximum limit of 100MB'].join('')),
-      );
       removeFile(filePath);
     });
   });
@@ -120,15 +115,6 @@ describe('uploading a component', () => {
       }
     });
 
-    beforeEach(() => {
-      console.error = mockConsoleError;
-      console.log = mockConsoleLog;
-    });
-
-    afterEach(() => {
-      console.error = orgConsoleError;
-    });
-
     it('Should upload the component and return a valid url to preview', async () => {
       const componentPath = path.join(__dirname, '/__components__/cmp-format-string');
       await uploadComponentFolder(managementServiceRoot, configObj.managementServiceUrl, componentPath, testFilesDir);
@@ -186,15 +172,6 @@ describe('uploading a component', () => {
       }
     });
 
-    beforeEach(() => {
-      console.error = mockConsoleError;
-      console.log = mockConsoleLog;
-    });
-
-    afterEach(() => {
-      console.error = orgConsoleError;
-    });
-
     it('Should upload the component and return a valid url to preview', async () => {
       await uploadComponentFolder(
         managementServiceRoot,
@@ -211,16 +188,16 @@ describe('uploading a component', () => {
     });
 
     it('Should fail upload the component with same version', async () => {
-      mockConsoleError.mockClear();
-      await uploadComponentFolder(
-        managementServiceRoot,
-        configObj.managementServiceUrl,
-        componentPath,
+      await expect(
+        uploadComponentFolder(
+          managementServiceRoot,
+          configObj.managementServiceUrl,
+          componentPath,
 
-        testFilesDir,
-      );
-      expect(mockConsoleError.mock.calls[0][0]).toEqual(
-        color.red('Cannot upload component version, smoke-test-components/cmp-static-file-test 1.0.0 already exists'),
+          testFilesDir,
+        ),
+      ).rejects.toThrowError(
+        new Error('Cannot upload component version, smoke-test-components/cmp-static-file-test 1.0.0 already exists'),
       );
     });
 

package/src/upload-component-folder.ts

@@ -49,11 +49,7 @@ export async function uploadComponentFolder(
   } catch (e) {
     await fsp.rm(tmpDir, { force: true, recursive: true });
 
-    if (e instanceof Error) {
-      logger.error(color.red(e.message));
-    } else {
-      throw e;
-    }
+    throw e;
   }
 }
 
@@ -70,16 +66,30 @@ async function preUploadChecks(apiClient: AxiosInstance, managementURL: string,
 }
 
 async function checkIfVersionExists(apiClient: AxiosInstance, managementURL: string, inputManifest: Manifest) {
-  const response = await apiClient.get(`/v1/component/${inputManifest.getName()}/${inputManifest.getVersion()}`, {
-    validateStatus: null,
-    baseURL: managementURL,
-  });
-  if (response.status === 200) {
-    return true;
-  } else if (response.status === 404) {
-    return false;
+  try {
+    const response = await apiClient.get(`/v1/component/${inputManifest.getName()}/${inputManifest.getVersion()}`, {
+      validateStatus: null,
+      baseURL: managementURL,
+    });
+
+    if (response.status === 200) {
+      return true;
+    } else if (response.status === 404) {
+      return false;
+    }
+
+    const error = new AxiosError(
+      response?.data?.message || response.statusText,
+      response.status.toString(),
+      undefined,
+      undefined,
+      response,
+    );
+
+    throw handleError(error);
+  } catch (error) {
+    throw handleError(error);
   }
-  throw new Error(`Unexpected response code ${response.status}`);
 }
 
 async function watchAndWaitForUploadAndScanComplete(
@@ -121,15 +131,20 @@ async function handleResponse<T>(axiosInstance: Promise<AxiosResponse<T>>): Prom
 
 function handleError(error: any): Error {
   const { response } = error;
-  if (!response || !isAxiosError(error)) {
-    return error;
-  }
-  const message = (response.data as any).message;
-  if (message) {
-    return new Error(`Unexpected response code ${response.status}. message: ${message}`);
-  } else {
-    return new Error(`Unexpected response code ${response.status}.`);
+  const errorMessage = error.message;
+  const newError = new Error(errorMessage || 'An error has occurred');
+
+  if (isAxiosError(error)) {
+    if (response?.data?.message) {
+      newError.message = `${errorMessage} (code: ${response.status})`;
+    } else {
+      newError.message = `Unexpected response code ${response.status}. ${errorMessage}`.trim();
+    }
   }
+
+  newError.stack = error.stack;
+
+  return newError;
 }
 
 function isAxiosError(error: any): error is AxiosError {