@shoper/cli 0.1.0-26 → 0.1.0-28

package/build/cli/ui/validation_errors/validation_error_content.js

@@ -0,0 +1,19 @@
+import { Text } from '../../../ui/text.js';
+import { List } from '../../../ui/list/list.js';
+import { ValidationErrorsUtils } from './validation_errors_utils.js';
+import React from 'react';
+export const ValidationErrorContent = ({ errors }) => {
+    if (typeof errors === 'string') {
+        return React.createElement(Text, null, errors);
+    }
+    if (Array.isArray(errors)) {
+        return (React.createElement(List, { items: errors.map((error) => ({
+                content: error
+            })) }));
+    }
+    return (React.createElement(List, { items: Object.entries(errors).map(([title, errorMessages]) => {
+            return {
+                content: `${title} - ${ValidationErrorsUtils.getErrorContent(errorMessages)}`
+            };
+        }) }));
+};

package/build/cli/ui/validation_errors/validation_errors.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Error } from '../../../ui/message_box/error.js';
+import { Text } from '../../../ui/text.js';
+import { List } from '../../../ui/list/list.js';
+import { ValidationErrorContent } from './validation_error_content.js';
+export const ValidationErrors = ({ errors }) => {
+    if (typeof errors === 'string') {
+        return (React.createElement(Error, null,
+            React.createElement(Text, null, errors)));
+    }
+    if (Array.isArray(errors)) {
+        return (React.createElement(Error, null,
+            React.createElement(List, { items: errors.map((error) => ({
+                    content: error
+                })) })));
+    }
+    return (React.createElement(React.Fragment, null, Object.entries(errors).map(([title, errorMessages], index) => {
+        return (React.createElement(Error, { key: index, header: title },
+            React.createElement(ValidationErrorContent, { errors: errorMessages })));
+    })));
+};

package/build/cli/ui/validation_errors/validation_errors_utils.js

@@ -0,0 +1,17 @@
+export class ValidationErrorsUtils {
+    static getErrorContent(errors) {
+        if (typeof errors === 'string') {
+            return errors;
+        }
+        if (Array.isArray(errors)) {
+            return errors.join(', ');
+        }
+        if (errors?.errors && Array.isArray(errors?.errors)) {
+            return errors.errors.join(', ');
+        }
+        if (typeof errors === 'object') {
+            return Object.values(errors).join(', ');
+        }
+        throw new Error('Not supported validation errors', errors);
+    }
+}

package/build/index.js

@@ -47,7 +47,3 @@ export const COMMANDS = {
     ...THEME_COMMANDS
 };
 export { runCLI } from './cli/index.js';
-/**
- * TODO:
- * Windows - zwłąszcza w kejsie z git grzie push i pull jest na dwóch platformach
- */

package/build/theme/commands/delete/theme_delete_command.js

@@ -2,7 +2,7 @@ import { Args } from '@oclif/core';
 import { BaseThemeCommand } from '../../class/base_theme_command.js';
 import { CLI_AUTH_API_NAME } from '../../../cli/auth/cli_auth_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 { EXECUTION_CONTEXT_API_NAME } from '../../../cli/features/execution_context/execution_context_constants.js';
+import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
 import { renderOnce } from '../../../ui/ui_utils.js';
 import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_credentials_error.js';
 import React from 'react';
@@ -10,9 +10,12 @@ import { THEME_DELETE_API_NAME } from '../../features/theme/delete/theme_delete_
 import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
 import { Error } from '../../../ui/message_box/error.js';
 import { Text } from '../../../ui/text.js';
-import { promptInput } from '../../../ui/prompts/prompt_input.js';
-import { Warning } from '../../../ui/message_box/warning.js';
 import { Info } from '../../../ui/message_box/info.js';
+import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
+import { Box } from '../../../ui/box.js';
+import { ThemeDeletedSuccessfully } from './ui/theme_deleted_successfully.js';
+import { ThemeDeletionWarning } from './ui/theme_deletion_warning.js';
+import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.js';
 export class ThemeDeleteCommand extends BaseThemeCommand {
     static summary = 'Permanently deletes the specified theme from your store.';
     static description = 'This action cannot be undone, so make sure you really want to remove this theme.\n\nYou can run this command from a specific theme directory (ID not needed) or outside any theme directory (theme ID required).';
@@ -42,43 +45,51 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
             renderOnce(React.createElement(MissingCredentialsError, null));
             return;
         }
-        //
-        // if (!themeId) {
-        //     renderOnce(<MissingThemeIdError />);
-        //
-        //     return;
-        // }
-        // const executionContext = await executionContextApi.getExecutionContext();
-        //
-        // if (executionContext.type === EXECUTION_CONTEXTS.theme) {
-        //     renderOnce(<ThemeDirectoryContextError />);
-        //
-        //     return;
-        // }
-        renderOnce(React.createElement(Warning, { header: `Warning: This will permanently delete the theme {Theme_name} (ID: {theme_ID}) and cannot be undone.` }));
-        const { input: procced } = await promptInput('Proceed?');
-        if (!procced) {
-            renderOnce(React.createElement(Info, { header: "Theme deletion was cancelled." }));
-            return;
-        }
-        if (!themeId)
-            return;
-        const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
-        const deleteAction = themeActionsApi.getThemeAction({
-            actionType: THEME_ACTIONS_TYPES.delete,
-            themeId,
-            credentials
-        });
-        if (!deleteAction) {
-            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "delete" }));
-            return;
-        }
-        const themeDeleteApi = this.getApi(THEME_DELETE_API_NAME);
+        const executionContext = await executionContextApi.getExecutionContext();
         try {
-            await themeDeleteApi.deleteTheme({
+            let _themeId = themeId;
+            if (executionContext.type !== EXECUTION_CONTEXTS.theme && !_themeId) {
+                renderOnce(React.createElement(MissingThemeIdError, null,
+                    React.createElement(Box, { flexDirection: "column", gap: 1 },
+                        React.createElement(Text, null, "Usage: shoper theme delete [ID]"),
+                        React.createElement(Text, null, "Please run this command inside a theme directory or provide a theme ID."))));
+                return;
+            }
+            if (executionContext.type === EXECUTION_CONTEXTS.theme)
+                _themeId = _themeId ?? executionContext.themeId;
+            if (!_themeId) {
+                renderOnce(React.createElement(MissingThemeIdError, null));
+                return;
+            }
+            const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
+            const deleteAction = themeActionsApi.getThemeAction({
+                actionType: THEME_ACTIONS_TYPES.delete,
+                themeId: _themeId,
+                credentials
+            });
+            if (!deleteAction) {
+                renderOnce(React.createElement(UnpermittedCommandError, { themeId: _themeId, commandName: "delete" }));
+                return;
+            }
+            renderOnce(React.createElement(ThemeDeletionWarning, { themeId: _themeId }));
+            const { proceed } = await promptConfirmation('Proceed?');
+            if (!proceed) {
+                renderOnce(React.createElement(Info, { header: "Theme deletion was cancelled." }));
+                return;
+            }
+            const themeDeleteApi = this.getApi(THEME_DELETE_API_NAME);
+            const { isSuccess } = await themeDeleteApi.deleteTheme({
                 actionData: deleteAction.data,
                 credentials
             });
+            themeActionsApi.removeThemeActions({
+                themeId: _themeId,
+                credentials
+            });
+            if (!isSuccess)
+                return;
+            renderOnce(React.createElement(ThemeDeletedSuccessfully, null));
+            return;
         }
         catch (err) {
             this._handleError(err, themeId);
@@ -87,7 +98,8 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
     }
     _handleError(err, themeId) {
         if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && themeId) {
-            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "init" }));
+            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "delete" }));
+            return;
         }
         if (err?.message) {
             renderOnce(React.createElement(Error, null,

package/build/theme/commands/delete/ui/theme_deleted_successfully.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { Text } from '../../../../ui/text.js';
+import { List } from '../../../../ui/list/list.js';
+import { Tip } from '../../../../ui/tip.js';
+import { Success } from '../../../../ui/message_box/success.js';
+export const ThemeDeletedSuccessfully = () => {
+    return (React.createElement(Success, { header: "Success: Theme was deleted from the store." },
+        React.createElement(Text, null, "The theme is no longer available in your store panel, but its files remain locally."),
+        React.createElement(Tip, null, "If you want to reuse this theme:"),
+        React.createElement(List, { items: [
+                'create a new theme using shoper theme init [id]',
+                'copy the local files into the new theme folder',
+                'and push it using shoper theme push'
+            ] })));
+};

package/build/theme/commands/delete/ui/theme_deletion_warning.js

@@ -0,0 +1,10 @@
+import { Warning } from '../../../../ui/message_box/warning.js';
+import { Text } from '../../../../ui/text.js';
+import React from 'react';
+export const ThemeDeletionWarning = ({ themeId }) => {
+    return (React.createElement(Warning, { header: `Warning: This will permanently delete the theme (ID: ${themeId}) from your store and cannot be undone.` },
+        React.createElement(Text, null,
+            "Your local files ",
+            React.createElement(Text, { bold: true }, "will not be removed"),
+            ". You\u2019ll still be able to access and modify them.")));
+};

package/build/theme/commands/info/theme_info_command.js

@@ -45,30 +45,27 @@ export class ThemeInfoCommand extends BaseThemeCommand {
             return;
         }
         const executionContext = await executionContextApi.getExecutionContext();
-        let theme;
-        let _themeId = themeId;
         try {
+            let _themeId = themeId;
+            if (executionContext.type !== EXECUTION_CONTEXTS.theme && !_themeId) {
+                renderOnce(React.createElement(MissingThemeIdError, null,
+                    React.createElement(Box, { flexDirection: "column", gap: 1 },
+                        React.createElement(Text, null, "Usage: shoper theme info [ID]"),
+                        React.createElement(Text, null, "Please run this command inside a theme directory or provide a theme ID."))));
+                return;
+            }
             if (executionContext.type === EXECUTION_CONTEXTS.theme) {
                 await ThemeMetaDataUtils.ensureThemeWorkUrlMatch(executionContext.themeRootDir, credentials.shopUrl);
                 _themeId = themeId ?? executionContext.themeId;
-                theme = await themesListApi.getTheme({
-                    themeId: _themeId,
-                    shopUrl: credentials.shopUrl
-                });
             }
-            if (executionContext.type !== EXECUTION_CONTEXTS.theme) {
-                if (_themeId === undefined) {
-                    renderOnce(React.createElement(MissingThemeIdError, null,
-                        React.createElement(Box, { flexDirection: "column", gap: 1 },
-                            React.createElement(Text, null, "Usage: shoper theme info [ID]"),
-                            React.createElement(Text, null, "Please run this command inside a theme directory or provide a theme ID."))));
-                    return;
-                }
-                theme = await themesListApi.getTheme({
-                    themeId: _themeId,
-                    shopUrl: credentials.shopUrl
-                });
+            if (!_themeId) {
+                renderOnce(React.createElement(MissingThemeIdError, null));
+                return;
             }
+            const theme = await themesListApi.getTheme({
+                themeId: _themeId,
+                shopUrl: credentials.shopUrl
+            });
             if (!theme) {
                 renderOnce(_themeId ? React.createElement(InvalidThemeIdError, { themeId: _themeId }) : React.createElement(Error, { header: "Error: Theme information is not available." }));
                 return;

package/build/theme/commands/info/theme_info_command_utils.js

@@ -30,7 +30,7 @@ export class ThemeInfoCommandUtils {
                 [
                     React.createElement(Text, null,
                         React.createElement(Text, { bold: true }, "Status: "),
-                        ": $",
+                        ": ",
                         theme.isActive ? 'Active' : 'Inactive')
                 ]
             ]

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

@@ -14,7 +14,7 @@ import { ThemeCreatedSuccess } from './ui/theme_created_success.js';
 import { Text } from '../../../ui/text.js';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
 import { Box } from '../../../ui/box.js';
-import { ErrorsList } from '../../../cli/ui/errors_list.js';
+import { ValidationErrors } from '../../../cli/ui/validation_errors/validation_errors.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.';
@@ -83,7 +83,7 @@ export class ThemeInitCommand extends BaseThemeCommand {
             return;
         }
         if (err?.message) {
-            renderOnce(React.createElement(ErrorsList, { errors: err.message }));
+            renderOnce(React.createElement(ValidationErrors, { errors: err.message }));
             return;
         }
         this.error(String(err));

package/build/theme/commands/pull/theme_pull_command.js

@@ -94,7 +94,6 @@ export class ThemePullCommand extends BaseThemeCommand {
         }
         catch (err) {
             this.#spinner?.stop();
-            console.log('err', err);
             this._handleError(err, _themeId);
         }
     }
@@ -145,7 +144,7 @@ export class ThemePullCommand extends BaseThemeCommand {
         renderOnce(React.createElement(ThemePulledSuccess, null));
     }
     async _pullThemeIntoExistingOne({ themeId, themeFetchApi, themeActionsApi, fetchType, executionContext, credentials }) {
-        //TODO move these logis somvewhere else?
+        //TODO move these logi somvewhere else?
         await ThemeMetaDataUtils.ensureThemeWorkUrlMatch(executionContext.themeRootDir, credentials.shopUrl);
         const pullAction = themeActionsApi.getThemeAction({
             actionType: THEME_ACTIONS_TYPES.pull,

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

@@ -26,7 +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';
+import { ValidationErrors } from '../../../cli/ui/validation_errors/validation_errors.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).';
@@ -111,7 +111,7 @@ export class ThemePushCommand extends BaseThemeCommand {
             return;
         }
         if (err?.code === THEME_ARCHIVE_UPLOAD_ERROR) {
-            renderOnce(React.createElement(ErrorsList, { errors: err?.details }));
+            renderOnce(React.createElement(ValidationErrors, { errors: err?.details }));
             return;
         }
         if (err?.code === THEME_WORK_URL_MISMATCH_ERROR) {
@@ -123,8 +123,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 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) {
-            console.log('error message', err.message);
-            renderOnce(React.createElement(ErrorsList, { errors: err.message }));
+            renderOnce(React.createElement(ValidationErrors, { errors: err.message }));
             return;
         }
         this.error(String(err));

package/build/theme/features/theme/actions/api/theme_actions_api.js

@@ -16,4 +16,7 @@ export class ThemeActionsApi extends FeatureApi {
     clearThemesActions(props) {
         return this.#service.clearThemesActions(props);
     }
+    removeThemeActions(props) {
+        return this.#service.removeThemeActions(props);
+    }
 }

package/build/theme/features/theme/actions/service/theme_actions_service.js

@@ -25,6 +25,17 @@ export class ThemeActionsService {
             });
         return actions[actionType];
     }
+    removeThemeActions({ themeId, credentials }) {
+        const storeActions = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
+        if (!storeActions || !storeActions.actions[themeId]) {
+            throw new AppError({
+                code: THEME_ACTION_NOTS_FOUND_ERROR_CODE,
+                message: `Theme actions for store ${credentials.shopUrl} not found.`
+            });
+        }
+        delete storeActions.actions[themeId];
+        this.#themesActionsStore.set(this._getKey(credentials.shopUrl), storeActions);
+    }
     async ensureThemesActions({ credentials, themeId }) {
         if (!themeId)
             return;

package/build/theme/features/theme/delete/service/theme_delete_service.js

@@ -1,4 +1,3 @@
-import { STATUS_CODES } from '@dreamcommerce/star_core';
 import { HttpErrorsFactory } from '../../../../../cli/class/errors/http/http_errors_factory.js';
 import { DownloadFileErrorsFactory } from '../../../../../utils/download_file/download_file_errors_factory.js';
 export class ThemeDeleteService {
@@ -9,10 +8,7 @@ export class ThemeDeleteService {
     async deleteTheme({ actionData, credentials }) {
         try {
             const { response } = this.#httpApi.deleteTheme({ actionData, shopUrl: credentials.shopUrl });
-            const { data, status } = await response;
-            if (status !== STATUS_CODES.ok)
-                return;
-            //TODO if is success remove theme directory
+            const { data } = await response;
             return data;
         }
         catch (err) {
@@ -25,9 +21,7 @@ export class ThemeDeleteService {
                 case 404:
                     throw HttpErrorsFactory.createNotFoundError();
                 default:
-                    if (err.response?.status !== 200) {
-                        throw DownloadFileErrorsFactory.downloadError(err.response.status);
-                    }
+                    throw DownloadFileErrorsFactory.downloadError(err.response.status);
             }
         }
     }

package/build/theme/features/theme/merge/api/theme_merge_api.js

@@ -16,10 +16,10 @@ export class ThemeMergeApi extends FeatureApi {
     applyChanges(fromTheme, toTheme, changes) {
         return this.#service.applyChanges(fromTheme, toTheme, changes);
     }
-    hasFileBeenCreated(path, executionContext) {
-        return this.#service.hasFileBeenCreated(path, executionContext);
+    hasFileBeenCreated(path, themeDir) {
+        return this.#service.hasFileBeenCreated(path, themeDir);
     }
-    hasFileBeenModified(path, executionContext) {
-        return this.#service.hasFileBeenModified(path, executionContext);
+    hasFileBeenModified(path, themeDir) {
+        return this.#service.hasFileBeenModified(path, themeDir);
     }
 }

package/build/theme/features/theme/merge/service/theme_merge_service.js

@@ -1,10 +1,9 @@
 import FSTree from 'fs-tree-diff';
-import { join } from '../../../../../utils/path_utils.js';
-import { computeFileChecksum } from '../../../../../utils/checksums/checksums_utils.js';
 import { copyFileSync, fileExists, getAllDirectoriesNamesInside } from '../../../../../utils/fs/fs_utils.js';
 import { ThemeChecksumsUtils } from '../../utils/checksums/theme_checksums_utils.js';
 import walkSync from 'walk-sync';
 import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
+import { join } from '../../../../../utils/path_utils.js';
 export class ThemeMergeService {
     async applyChanges(fromTheme, toTheme, changes) {
         FSTree.applyPatch(fromTheme, toTheme, changes, {
@@ -46,13 +45,13 @@ export class ThemeMergeService {
         const currentChecksums = await ThemeChecksumsUtils.getThemeCurrentChecksumsVerification(themeRootDir);
         return initialChecksums !== currentChecksums;
     }
-    async hasFileBeenCreated(path, executionContext) {
-        const checksums = await ThemeChecksumsUtils.getThemeInitialChecksums(executionContext.themeRootDir);
-        return checksums[path] === undefined && (await fileExists(join(executionContext.themeRootDir, path)));
+    async hasFileBeenCreated(path, themeDir) {
+        const initialChecksum = await ThemeChecksumsUtils.getInitialChecksumFromPath(path, themeDir);
+        return !initialChecksum && (await fileExists(join(themeDir, path)));
     }
-    async hasFileBeenModified(path, executionContext) {
-        const checksums = await ThemeChecksumsUtils.getThemeInitialChecksums(executionContext.themeRootDir);
-        const currentChecksum = await computeFileChecksum(join(executionContext.themeRootDir, path));
-        return !!checksums[path] && checksums[path] !== currentChecksum;
+    async hasFileBeenModified(path, themeDir) {
+        const currentChecksum = await ThemeChecksumsUtils.getCurrentChecksumFromPath(path, themeDir);
+        const initialChecksum = await ThemeChecksumsUtils.getInitialChecksumFromPath(path, themeDir);
+        return !!currentChecksum && !!initialChecksum && currentChecksum !== initialChecksum;
     }
 }

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

@@ -2,7 +2,7 @@ import tmp from 'tmp-promise';
 import { THEME_ACTION_DATA_TYPE, THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
 import { createZip } from '../../../../../utils/zip/create_zip_utils.js';
 import { basename, dirname, extname, join, looksLikeDirectory, toUnixPath } from '../../../../../utils/path_utils.js';
-import { createReadStream } from 'node:fs';
+import fs, { createReadStream } from 'node:fs';
 import { v4 as uuid } from 'uuid';
 import globs from 'fast-glob';
 import { THEME_WILDCARD_ACTION_NAME } from '../../actions/service/theme_actions_service_constants.js';
@@ -27,13 +27,14 @@ export class ThemePushService {
     }
     async push({ pushAction, filesStructure, credentials, executionContext }) {
         const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
-        if (await this.#themeMergeApi.hasFileBeenCreated(ThemePublishUtils.getSkinStoreSettingsFilePath(executionContext.themeRootDir), executionContext))
+        if (await this.#themeMergeApi.hasFileBeenCreated(ThemePublishUtils.getSkinStoreSettingsFilePath(executionContext.themeRootDir), executionContext.themeRootDir))
             throw ThemePushErrorsFactory.createErrorWhilePushingUnpublishedThemeWithSkinstoreData(credentials.shopUrl);
         const { uploadData, localFiles } = await this._getActionDataForFilesToUpload({
             pushAction,
             filesStructure,
             executionContext
         });
+        console.log('uploadData', uploadData);
         if (uploadData.length) {
             await this._uploadThemeFiles({
                 filesToUpload: uploadData,
@@ -123,25 +124,30 @@ export class ThemePushService {
     async _uploadFiles(uploadData, credentials) {
         const uploadedImageData = [];
         const rejectedImageData = [];
-        await Promise.all(uploadData.map(({ actionData, path }) => this.#themePushHttpApi
-            .pushThemeData({
-            actionData,
-            stream: createReadStream(path),
-            shopUrl: credentials.shopUrl
-        })
-            .response.then((response) => {
-            uploadedImageData.push({
-                location: dirname(path),
-                originalFilename: basename(path),
-                uploadedFilename: response.data.imageId
-            });
-        })
-            .catch(() => {
-            rejectedImageData.push({
-                location: dirname(path),
-                originalFilename: basename(path)
+        console.log('uploadData', uploadData);
+        await Promise.all(uploadData.map(({ actionData, path }) => {
+            const fstat = fs.lstatSync(path);
+            console.log('fstat', fstat);
+            return this.#themePushHttpApi
+                .pushThemeData({
+                actionData,
+                stream: createReadStream(path),
+                shopUrl: credentials.shopUrl
+            })
+                .response.then((response) => {
+                uploadedImageData.push({
+                    location: dirname(path),
+                    originalFilename: basename(path),
+                    uploadedFilename: response.data.imageId
+                });
+            })
+                .catch(() => {
+                rejectedImageData.push({
+                    location: dirname(path),
+                    originalFilename: basename(path)
+                });
             });
-        })));
+        }));
         return {
             uploadedImageData,
             rejectedImageData
@@ -169,8 +175,8 @@ export class ThemePushService {
                         localFiles[fileGlob] = files.length ? basename(files[0]) : null;
                     }
                     for (const filePath of files) {
-                        if ((await this.#themeMergeApi.hasFileBeenCreated(filePath, executionContext)) ||
-                            (await this.#themeMergeApi.hasFileBeenModified(filePath, executionContext))) {
+                        if ((await this.#themeMergeApi.hasFileBeenCreated(filePath, executionContext.themeRootDir)) ||
+                            (await this.#themeMergeApi.hasFileBeenModified(filePath, executionContext.themeRootDir))) {
                             uploadData.push({
                                 actionData,
                                 actionKey,

package/build/theme/features/theme/utils/checksums/theme_checksums_utils.js

@@ -1,4 +1,4 @@
-import { join, mapKeysPathsToWindowPlatform } from '../../../../../utils/path_utils.js';
+import { join, mapKeysPathsToWindowPlatform, toUnixPath, toWinowsPath } from '../../../../../utils/path_utils.js';
 import { THEME_CURRENT_CHECKSUMS_FILE_NAME, THEME_CURRENT_CHECKSUMS_VERITY_FILE_NAME, THEME_INITIAL_CHECKSUMS_FILE_NAME, THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME } from '../../theme_constants.js';
 import { createWriteStream } from 'fs';
 import { copyFile, readJSONFile, removeFile } from '../../../../../utils/fs/fs_utils.js';
@@ -126,4 +126,12 @@ export class ThemeChecksumsUtils {
         const directoriesChecksums = computeDirectoriesChecksums(filesChecksumsInDirectories);
         return { ...filesChecksums, ...directoriesChecksums };
     }
+    static async getCurrentChecksumFromPath(path, themeDir) {
+        const checksums = await this.getThemeCurrentChecksums(themeDir);
+        return checksums[isWindowsOs() ? toWinowsPath(path) : toUnixPath(path)];
+    }
+    static async getInitialChecksumFromPath(path, themeDir) {
+        const checksums = await this.getThemeInitialChecksums(themeDir);
+        return checksums[isWindowsOs() ? toWinowsPath(path) : toUnixPath(path)];
+    }
 }

package/build/ui/list/list.js

@@ -3,5 +3,8 @@ import { Box } from '../box.js';
 import React from 'react';
 import { ListItem } from './list_item.js';
 export const List = ({ type = LIST_TYPES.unordered, items }) => {
-    return (React.createElement(Box, { flexDirection: "column", gap: 1, width: "100%", marginLeft: 2 }, items.map(({ content }, index) => (React.createElement(ListItem, { key: index, index: index, type: type }, content)))));
+    return (React.createElement(Box, { flexDirection: "column", gap: 1, width: "100%", marginLeft: 2 }, items.map((item, index) => {
+        const itemContent = typeof item === 'string' ? item : item.content;
+        return (React.createElement(ListItem, { key: index, index: index, type: type }, itemContent));
+    })));
 };

package/package.json

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

package/build/cli/ui/error_item.js

@@ -1,7 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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)))))))));
-};