@shoper/cli 0.1.0-25 → 0.1.0-26

package/build/cli/ui/error_item.js

@@ -0,0 +1,7 @@
+import { Error } from '../../ui/message_box/error.js';
+import { Text } from '../../ui/text.js';
+import React from 'react';
+export const ErrorItem = ({ error, title }) => {
+    return (React.createElement(Error, { header: title },
+        React.createElement(Text, null, error)));
+};

package/build/cli/ui/errors_list.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ErrorItem } from './error_item.js';
+import { Error } from '../../ui/message_box/error.js';
+import { Text } from '../../ui/text.js';
+import { Box } from '../../ui/box.js';
+export const ErrorsList = ({ errors }) => {
+    if (typeof errors === 'string') {
+        return React.createElement(ErrorItem, { error: errors });
+    }
+    if (Array.isArray(errors)) {
+        return errors.map((error, index) => (React.createElement(ErrorItem, { key: index, error: error })));
+    }
+    return (React.createElement(React.Fragment, null, Object.entries(errors).map(([title, errorMessages], index) => (React.createElement(Error, { key: index, header: title },
+        React.createElement(Box, { flexDirection: "column" }, errorMessages.map((message, index) => (React.createElement(Text, { key: index }, message)))))))));
+};

package/build/theme/commands/init/theme_init_command.js

@@ -12,9 +12,9 @@ import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
 import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_credentials_error.js';
 import { ThemeCreatedSuccess } from './ui/theme_created_success.js';
 import { Text } from '../../../ui/text.js';
-import { Error } from '../../../ui/message_box/error.js';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
 import { Box } from '../../../ui/box.js';
+import { ErrorsList } from '../../../cli/ui/errors_list.js';
 export class ThemeInitCommand extends BaseThemeCommand {
     static summary = 'Creates a copy of an existing theme by duplicating it.';
     static description = 'The new theme will be named after the source theme with a "Copy" suffix and an incremental number.\n\nYou must run this command from the root directory (not inside any theme folder) and provide the ID of the theme you want to duplicate.';
@@ -73,6 +73,8 @@ export class ThemeInitCommand extends BaseThemeCommand {
         catch (err) {
             spinner?.stop();
             this._handleError(err, themeId);
+            //TODO analyze why on nodejs v22 this command does not exit properly, even all promises are resolved
+            this.exit();
         }
     }
     _handleError(err, themeId) {
@@ -81,8 +83,7 @@ export class ThemeInitCommand extends BaseThemeCommand {
             return;
         }
         if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
+            renderOnce(React.createElement(ErrorsList, { errors: err.message }));
             return;
         }
         this.error(String(err));

package/build/theme/commands/push/theme_push_command.js

@@ -2,7 +2,7 @@ import { BaseThemeCommand } from '../../class/base_theme_command.js';
 import { CLI_AUTH_API_NAME } from '../../../cli/auth/cli_auth_constants.js';
 import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
 import { THEME_ACTION_NOT_FOUND_ERROR_CODE, THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
-import { THEME_ARCHIVE_UPLOAD_ERROR, THEME_PUSH_API_NAME } from '../../features/theme/push/theme_push_constants.js';
+import { THEME_ARCHIVE_UPLOAD_ERROR, THEME_FILES_UPLOAD_ERROR, THEME_PUSH_API_NAME } from '../../features/theme/push/theme_push_constants.js';
 import { ThemeMetaDataUtils } from '../../features/theme/utils/meta_data/theme_meta_data_utils.js';
 import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
 import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
@@ -26,6 +26,7 @@ import { ThemeWorkUrlMismatch } from '../ui/theme_work_url_mismatch.js';
 import { THEME_WORK_URL_MISMATCH_ERROR } from '../../features/theme/utils/meta_data/theme_meta_data_constants.js';
 import { ThemeFilesStructureUtils } from '../../features/theme/utils/files_structure/theme_files_structure_utils.js';
 import { ThemeInfoUtils } from '../../features/theme/info/theme_info_utils.js';
+import { ErrorsList } from '../../../cli/ui/errors_list.js';
 export class ThemePushCommand extends BaseThemeCommand {
     static summary = 'Uploads your local theme files to the store and overwrites the current version of the theme in your store.';
     static description = 'Check your local changes before pushing.\n\nYou must run this command from a specific theme directory (ID not needed).';
@@ -110,16 +111,20 @@ export class ThemePushCommand extends BaseThemeCommand {
             return;
         }
         if (err?.code === THEME_ARCHIVE_UPLOAD_ERROR) {
-            // renderOnce(<ThemeValidationErrors errors={err?.details} />);
+            renderOnce(React.createElement(ErrorsList, { errors: err?.details }));
             return;
         }
         if (err?.code === THEME_WORK_URL_MISMATCH_ERROR) {
             this._renderUrlMismatchError();
             return;
         }
+        if (err?.code === THEME_FILES_UPLOAD_ERROR) {
+            return renderOnce(React.createElement(Error, { header: "Uploading theme files to the shop failed.\n" },
+                React.createElement(Text, null, "The rejected files have been removed locally. Please ensure that the files are not corrupted and that the file extensions are supported.")));
+        }
         if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
+            console.log('error message', err.message);
+            renderOnce(React.createElement(ErrorsList, { errors: err.message }));
             return;
         }
         this.error(String(err));

package/build/theme/features/theme/push/service/theme_push_service.js

@@ -105,18 +105,24 @@ export class ThemePushService {
     }
     async _uploadThemeFiles({ filesToUpload, themeRootDir, localFiles, credentials }) {
         try {
-            const uploadedImageData = await this._uploadFiles(filesToUpload, credentials);
+            const { uploadedImageData, rejectedImageData } = await this._uploadFiles(filesToUpload, credentials);
             const newFilesList = ThemeImagesUtils.updateOriginalFilenameToUploadedFilename(localFiles, uploadedImageData);
             if (uploadedImageData.length)
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
+            if (rejectedImageData.length)
+                await this._removeUploadedThemeFiles(rejectedImageData, themeRootDir);
             await this._createAFilesListFile(themeRootDir, newFilesList);
         }
         catch (err) {
             throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl, err);
         }
     }
+    async _removeUploadedThemeFiles(uploadedImageData, themeRootDir) {
+        await Promise.all(uploadedImageData.map(({ location, originalFilename }) => removeFile(join(themeRootDir, location, originalFilename))));
+    }
     async _uploadFiles(uploadData, credentials) {
         const uploadedImageData = [];
+        const rejectedImageData = [];
         await Promise.all(uploadData.map(({ actionData, path }) => this.#themePushHttpApi
             .pushThemeData({
             actionData,
@@ -124,15 +130,22 @@ export class ThemePushService {
             shopUrl: credentials.shopUrl
         })
             .response.then((response) => {
-            if (response.status !== 200 || !response.data.isSuccess)
-                throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl, response.data?.messages ?? []);
             uploadedImageData.push({
                 location: dirname(path),
                 originalFilename: basename(path),
                 uploadedFilename: response.data.imageId
             });
+        })
+            .catch(() => {
+            rejectedImageData.push({
+                location: dirname(path),
+                originalFilename: basename(path)
+            });
         })));
-        return uploadedImageData;
+        return {
+            uploadedImageData,
+            rejectedImageData
+        };
     }
     async _getActionDataForFilesToUpload({ pushAction, filesStructure, executionContext }) {
         const uploadData = [];

package/build/theme/features/theme/push/theme_push_constants.js

@@ -3,3 +3,4 @@ export const THEME_PUSH_API_NAME = 'ThemePushApi';
 export const THEME_FILES_LIST_FILE_NAME = 'filesList.json';
 export const THEME_MODULE_SETTINGS_FILE_NAME = 'settings.json';
 export const THEME_ARCHIVE_UPLOAD_ERROR = 'theme.push.error_uploading_theme_archive';
+export const THEME_FILES_UPLOAD_ERROR = 'theme.push.error_uploading_theme_files';

package/build/theme/features/theme/push/theme_push_errors_factory.js

@@ -1,12 +1,14 @@
 import { AppError } from '../../../../cli/class/errors/app/app_error.js';
-import { THEME_ARCHIVE_UPLOAD_ERROR } from './theme_push_constants.js';
+import { THEME_ARCHIVE_UPLOAD_ERROR, THEME_FILES_UPLOAD_ERROR } from './theme_push_constants.js';
 export class ThemePushErrorsFactory {
     static createErrorWhileUploadingThemeFiles(shopUrl, messages) {
         return new AppError({
-            code: 'theme.push.error_uploading_theme_files',
+            code: THEME_FILES_UPLOAD_ERROR,
             message: `Error while uploading theme files to shop "${shopUrl}"`,
             level: 'error',
-            details: messages
+            details: {
+                messages
+            }
         });
     }
     static createErrorWhileCreatingThemeArchive(shopUrl, error) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.1.0-25",
+    "version": "0.1.0-26",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",