@shoper/cli 0.5.2-5 → 0.5.2-6

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

@@ -16,6 +16,7 @@ import { ThemeDeletedSuccessfully } from './ui/theme_deleted_successfully.js';
 import { ThemeDeletionWarning } from './ui/theme_deletion_warning.js';
 import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.js';
 import { ThemeError } from '../ui/theme_error.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.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).';
@@ -37,6 +38,7 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
         const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         if (!credentials) {
             renderOnce(React.createElement(MissingCredentialsError, null));
@@ -86,11 +88,10 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
             if (!resp?.isSuccess)
                 return;
             renderOnce(React.createElement(ThemeDeletedSuccessfully, null));
-            return;
         }
         catch (err) {
+            loggerApi.error('Error executing theme delete command', { error: err });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
-            return;
         }
     }
 }

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

@@ -15,6 +15,7 @@ import { ThemeInfoCommandUtils } from './theme_info_command_utils.js';
 import { InvalidThemeIdError } from '../ui/invalid_theme_id.js';
 import { Box } from '../../../ui/box.js';
 import { ThemeError } from '../ui/theme_error.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemeInfoCommand extends BaseThemeCommand {
     static summary = 'View details about the current theme.';
     static description = 'Displays key information about the theme you’re working on — including its ID, name, description (if provided), and status.\n\nYou can run this command from a specific theme directory (ID not needed) or outside any theme directory (theme ID required).';
@@ -36,6 +37,7 @@ export class ThemeInfoCommand extends BaseThemeCommand {
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const themesListApi = this.getApi(THEMES_LIST_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         if (!credentials) {
             renderOnce(React.createElement(MissingCredentialsError, null));
@@ -70,6 +72,7 @@ export class ThemeInfoCommand extends BaseThemeCommand {
             this._displayThemeInfo(theme);
         }
         catch (err) {
+            loggerApi.error('An error occurred while fetching theme info.', { error: err });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }

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

@@ -15,6 +15,7 @@ import { Text } from '../../../ui/text.js';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
 import { Box } from '../../../ui/box.js';
 import { ThemeError } from '../ui/theme_error.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.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.';
@@ -38,6 +39,7 @@ export class ThemeInitCommand extends BaseThemeCommand {
         const themeInitApi = this.getApi(THEME_INIT_API_NAME);
         const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         if (!credentials) {
             renderOnce(React.createElement(MissingCredentialsError, null));
@@ -64,12 +66,19 @@ export class ThemeInitCommand extends BaseThemeCommand {
                 return;
             }
             spinner = ora('Creating theme...').start();
-            const { themeId: createdThemeId, themeName } = await themeInitApi.initTheme({ action: copyAction, credentials });
+            const { themeId: createdThemeId, themeName } = await themeInitApi.initTheme({
+                action: copyAction,
+                credentials,
+                sourceThemeId: themeId
+            });
             spinner.stop();
             renderOnce(React.createElement(ThemeCreatedSuccess, { createdThemeId: createdThemeId, themeName: themeName }));
         }
         catch (err) {
             spinner?.stop();
+            loggerApi.error('Error during theme init command execution', {
+                error: err
+            });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
             //TODO analyze why on nodejs v22 this command does not exit properly, even all promises are resolved
             this.exit();

package/build/theme/commands/list/theme_list_command.js

@@ -4,22 +4,36 @@ import { CLI_AUTH_API_NAME } from '../../../cli/auth/cli_auth_constants.js';
 import { renderOnce } from '../../../ui/ui_utils.js';
 import { Info } from '../../../ui/message_box/info.js';
 import React from 'react';
-import { Table } from '../../../ui/table/table.js';
+import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_credentials_error.js';
+import { ThemeError } from '../ui/theme_error.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 import { ThemeListCommandUtils } from './theme_list_command_utils.js';
+import { Table } from '../../../ui/table/table.js';
 export class ThemeListCommand extends BaseThemeCommand {
     static summary = 'Displays a list of all themes available in your store, including their IDs, names, and statuses (active/inactive).';
     static description = 'Use this to check which theme is now active in your store.';
     async run() {
-        const ThemesListApi = this.getApi(THEMES_LIST_API_NAME);
+        const themesListApi = this.getApi(THEMES_LIST_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const credentials = cliAuthApi.getCredentials();
-        if (!credentials)
-            this.error('Credentials not found. Please authorize first.');
-        const themes = await ThemesListApi.getThemes(credentials);
-        if (!themes?.length) {
-            renderOnce(React.createElement(Info, { header: "No themes found for this store." }));
+        if (!credentials) {
+            renderOnce(React.createElement(MissingCredentialsError, null));
             return;
         }
-        renderOnce(React.createElement(Table, { data: ThemeListCommandUtils.mapThemeListToTableData(themes) }));
+        try {
+            const themes = await themesListApi.getThemes(credentials);
+            if (!themes?.length) {
+                renderOnce(React.createElement(Info, { header: "No themes found for this store." }));
+                return;
+            }
+            renderOnce(React.createElement(Table, { data: ThemeListCommandUtils.mapThemeListToTableData(themes) }));
+        }
+        catch (err) {
+            loggerApi.error('Error while listing themes:', {
+                error: err
+            });
+            renderOnce(React.createElement(ThemeError, { err: err }));
+        }
     }
 }

package/build/theme/commands/publish/theme_publish_command.js

@@ -10,6 +10,7 @@ import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
 import { THEME_SKINSTORE_API_NAME } from '../../features/theme/skinstore/theme_publish_constants.js';
 import { Form } from '../../../cli/features/controls/ui/form.js';
 import { ThemeError } from '../ui/theme_error.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemePublishCommand 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).';
@@ -31,6 +32,7 @@ export class ThemePublishCommand extends BaseThemeCommand {
     async run() {
         const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         if (!credentials) {
@@ -69,8 +71,10 @@ export class ThemePublishCommand extends BaseThemeCommand {
             });
         }
         catch (err) {
+            loggerApi.error('Theme publish command error:', {
+                error: err
+            });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
-            return;
         }
     }
 }

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

@@ -25,7 +25,7 @@ import { directoryExists } from '../../../utils/fs/fs_utils.js';
 import { ThemeMetaDataUtils } from '../../features/theme/utils/meta_data/theme_meta_data_utils.js';
 import { ThemeChecksums } from '../../class/checksums/theme_checksums.js';
 import { ThemeError } from '../ui/theme_error.js';
-import { MODULES_DIRECTORY_NAME } from '../../features/theme/theme_constants.js'; //TODO jak jest error w pullu wowczas usuwamy docelowo pociagniety skin
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 //TODO jak jest error w pullu wowczas usuwamy docelowo pociagniety skin
 export class ThemePullCommand extends BaseThemeCommand {
     static summary = 'Downloads the current version of your theme from the store and overwrites your local theme files.';
@@ -61,6 +61,7 @@ export class ThemePullCommand extends BaseThemeCommand {
         const themeFetchApi = this.getApi(THEME_FETCH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         if (!credentials) {
             renderOnce(React.createElement(MissingCredentialsError, null));
@@ -86,12 +87,19 @@ export class ThemePullCommand extends BaseThemeCommand {
                     themeActionsApi,
                     fetchType: this.flags.type,
                     executionContext,
-                    credentials
+                    credentials,
+                    loggerApi
                 });
             }
         }
         catch (err) {
             this.#spinner?.stop();
+            loggerApi.error('Error occurred during theme pull operation', {
+                error: err,
+                details: {
+                    executionContext
+                }
+            });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }
@@ -125,7 +133,7 @@ export class ThemePullCommand extends BaseThemeCommand {
         this.#spinner.stop();
         renderOnce(React.createElement(ThemePulledSuccess, null));
     }
-    async _pullThemeIntoExistingOne({ themeId, themeFetchApi, themeActionsApi, fetchType, executionContext, credentials }) {
+    async _pullThemeIntoExistingOne({ themeId, themeFetchApi, themeActionsApi, fetchType, executionContext, credentials, loggerApi }) {
         //TODO move these logi somvewhere else?
         await ThemeMetaDataUtils.ensureThemeWorkUrlMatch(executionContext.themeRootDir, credentials.shopUrl);
         const pullAction = themeActionsApi.getThemeAction({
@@ -152,14 +160,17 @@ export class ThemePullCommand extends BaseThemeCommand {
                 dist: tmpDir
             }
         });
-        const localModulesPath = join(executionContext.themeRootDir, MODULES_DIRECTORY_NAME);
+        const localModulesPath = join(executionContext.themeRootDir, 'modules');
         const fetchedThemePath = join(tmpDir, name);
-        const fetchedModulesPath = join(fetchedThemePath, MODULES_DIRECTORY_NAME);
+        const fetchedModulesPath = join(fetchedThemePath, 'modules');
         if ((await directoryExists(localModulesPath)) && (await directoryExists(fetchedModulesPath)))
-            await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localModulesPath, fetchedModulesPath, fetchedThemePath);
+            await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localModulesPath, fetchedModulesPath, fetchedThemePath, loggerApi);
         this.#spinner.stop();
         const changes = await themeMergeApi.getChangesBetweenThemes(fetchedThemePath, executionContext.themeRootDir);
-        const themeChecksums = new ThemeChecksums(executionContext.themeRootDir);
+        const themeChecksums = new ThemeChecksums({
+            themeDir: executionContext.themeRootDir,
+            loggerApi
+        });
         if (changes.length && (await themeChecksums.hasThemeBeenModified())) {
             renderOnce(React.createElement(ThemePullUnpublishedChangesWarning, { changes: changes }));
             const { proceed } = await promptConfirmation('Do you want to continue and overwrite local changes?');

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

@@ -4,6 +4,8 @@ import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/fea
 import { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
 import { 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';
 import { renderOnce } from '../../../ui/ui_utils.js';
 import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
 import React from 'react';
@@ -12,7 +14,7 @@ import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_c
 import { ThemePushedSuccess } from './ui/theme_pushed_success.js';
 import ora from 'ora';
 import { ThemePushSkipInfo } from './ui/theme_push_skip_into.js';
-import { ThemeFilesUtils } from '../../features/theme/utils/files/theme_files_utils.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 { ThemeChecksums } from '../../class/checksums/theme_checksums.js';
 import { ThemeFilesUpload } from '../../class/files_upload/theme_files_upload.js';
@@ -22,10 +24,8 @@ import { MissingThemeFiles } from '../ui/missing_theme_files.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../constants/directory_contstants.js';
 import { THEME_FILES_STRUCTURE_FILE_NAME } from '../../features/theme/theme_constants.js';
 import { ThemeError } from '../ui/theme_error.js';
-import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
-import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
 import { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.js';
-import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.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).';
@@ -37,6 +37,7 @@ export class ThemePushCommand extends BaseThemeCommand {
     ];
     async run() {
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         const themePushApi = this.getApi(THEME_PUSH_API_NAME);
         const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
@@ -52,7 +53,10 @@ export class ThemePushCommand extends BaseThemeCommand {
         }
         let spinner;
         try {
-            const themeChecksums = new ThemeChecksums(executionContext.themeRootDir);
+            const themeChecksums = new ThemeChecksums({
+                themeDir: executionContext.themeRootDir,
+                loggerApi
+            });
             await ThemeMetaDataUtils.ensureThemeWorkUrlMatch(executionContext.themeRootDir, credentials.shopUrl);
             const pushAction = themeActionsApi.getThemeAction({
                 actionType: THEME_ACTIONS_TYPES.push,
@@ -64,7 +68,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 return;
             }
             const initialChecksums = await themeChecksums.getInitialChecksums();
-            const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
+            const permissions = await ThemeFilesStructureUtils.getFilesPermissions(executionContext.themeRootDir);
             const themeFilesUploadApi = new ThemeFilesUpload({
                 themeRootDir: executionContext.themeRootDir,
                 credentials,
@@ -76,7 +80,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemePushSkipInfo, null));
                 return;
             }
-            const validationResult = await ThemeFilesUtils.validateThemeDirectoryStructure({
+            const validationResult = await ThemeFilesStructureUtils.validateThemeDirectoryStructure({
                 //TDO przeniesc do theme checksums
                 checksums: mapChecksumToTree(initialChecksums),
                 permissions: mapToPermissionsTree(permissions),
@@ -88,36 +92,26 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemeUnpermittedActionsError, { unpermittedActions: validationResult.unpermittedActions }));
                 return;
             }
-            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(executionContext.themeRootDir);
             if (!filesStructure) {
                 renderOnce(React.createElement(MissingThemeFiles, { files: `${SHOPER_THEME_METADATA_DIR}/${THEME_FILES_STRUCTURE_FILE_NAME}` }));
                 return;
             }
             spinner = ora('Pushing theme...').start();
-            const partialPushAction = themeActionsApi.getThemeAction({
-                actionType: THEME_ACTIONS_TYPES.partialPush,
-                themeId: executionContext.themeId,
-                credentials
-            });
-            if (!pushAction) {
-                renderOnce(React.createElement(UnpermittedCommandError, { themeId: executionContext.themeId, commandName: "push" }));
-                return;
-            }
-            await themePushApi.partialPush({
+            await themePushApi.push({
                 credentials,
                 filesStructure,
-                action: partialPushAction,
+                pushAction,
                 themeChecksums,
                 executionContext,
                 themeFilesUploadApi
             });
             spinner.stop();
-            await promptConfirmation('press any key to continue...');
             renderOnce(React.createElement(ThemePushedSuccess, { themeName: await ThemeInfoUtils.getThemeName(executionContext.themeRootDir) }));
         }
         catch (err) {
             spinner?.stop();
-            await promptConfirmation('press any key to continue...');
+            loggerApi.error('Error during theme push', { error: err });
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }

package/build/theme/commands/theme_verify_command.js

@@ -1,6 +1,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 { ThemeFilesStructureUtils } from '../features/theme/utils/files_structure/theme_files_structure_utils.js';
 import { ThemeChecksums } from '../class/checksums/theme_checksums.js';
 import { THEME_VERIFY_API_NAME } from '../features/theme/verify/theme_verify_constants.js';
 import { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../features/theme/actions/theme_actions_constants.js';
@@ -17,13 +18,14 @@ import { MissingCredentialsError } from '../../cli/commands/auth/ui/missing_cred
 import { OutsideOfThemeDirectoryContextError } from './ui/ouside_of_theme_directory_context_error.js';
 import ora from 'ora';
 import { ThemeError } from './ui/theme_error.js';
-import { ThemeFilesUtils } from '../features/theme/utils/files/theme_files_utils.js';
+import { LOGGER_API_NAME } from '../../cli/utilities/features/logger/logger_constants.js';
 export class ThemeVerifyCommand extends BaseThemeCommand {
     static description = 'Verify theme files structure';
     async run() {
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const credentials = cliAuthApi.getCredentials();
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
+        const loggerApi = this.getApi(LOGGER_API_NAME);
         if (!credentials) {
             renderOnce(React.createElement(MissingCredentialsError, null));
             return;
@@ -33,8 +35,11 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
             renderOnce(React.createElement(OutsideOfThemeDirectoryContextError, null));
             return;
         }
-        const themeChecksums = new ThemeChecksums(executionContext.themeRootDir);
-        const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
+        const themeChecksums = new ThemeChecksums({
+            themeDir: executionContext.themeRootDir,
+            loggerApi
+        });
+        const permissions = await ThemeFilesStructureUtils.getFilesPermissions(executionContext.themeRootDir);
         if (!themeChecksums || !permissions)
             this.error('Theme checksums or permissions not found. Please ensure you are in the correct theme directory.');
         let spinner;
@@ -51,7 +56,7 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
                 themeId: executionContext.themeId,
                 credentials
             });
-            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(executionContext.themeRootDir);
             if (!filesStructure) {
                 renderOnce(React.createElement(MissingThemeFiles, { files: `${SHOPER_THEME_METADATA_DIR}/${THEME_FILES_STRUCTURE_FILE_NAME}` }));
                 return;

package/build/theme/commands/ui/theme_error.js

@@ -9,7 +9,7 @@ import React from 'react';
 import { ThemeWorkUrlMismatch } from './theme_work_url_mismatch.js';
 import { EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
 export const ThemeError = ({ err, executionContext }) => {
-    if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && executionContext.type === EXECUTION_CONTEXTS.theme) {
+    if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && executionContext?.type === EXECUTION_CONTEXTS.theme) {
         return (React.createElement(UnpermittedCommandError, { themeId: executionContext.themeId, commandName: "verify" }));
     }
     if (err?.code === THEME_ARCHIVE_UPLOAD_ERROR) {
@@ -19,8 +19,8 @@ export const ThemeError = ({ err, executionContext }) => {
         return React.createElement(ThemeWorkUrlMismatch, { command: "verify" });
     }
     if (err?.code === THEME_FILES_UPLOAD_ERROR) {
-        return (React.createElement(Error, { header: "Uploading theme files to the shop failed." },
-            React.createElement(Text, null, "Please ensure that the files are not corrupted and that the file extensions are supported or file size is not too large.")));
+        return (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) {
         return React.createElement(ValidationErrors, { errors: err.message });

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

@@ -1,17 +1,26 @@
 import { STORE_THEMES_ACTIONS_TTL } from './theme_actions_service_constants.js';
-import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
+import { AppError } from '../../../../../cli/utilities/features/logger/logs/app_error.js';
 import { getNMinutesFromNow } from '../../../../../utils/date_utils.js';
 import { computeChecksum } from '../../../../../utils/checksums/checksums_utils.js';
 import { THEME_ACTION_NOT_FOUND_ERROR_CODE, THEME_ACTION_NOTS_FOUND_ERROR_CODE } from '../theme_actions_constants.js';
 export class ThemeActionsService {
     #themesListApi;
     #themesActionsStore;
-    constructor({ themesListApi, themesActionsStore }) {
+    #loggerApi;
+    constructor({ themesListApi, themesActionsStore, loggerApi }) {
         this.#themesListApi = themesListApi;
         this.#themesActionsStore = themesActionsStore;
+        this.#loggerApi = loggerApi;
     }
     getThemeAction({ actionType, themeId, credentials }) {
         const storeActions = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
+        this.#loggerApi.debug('Retrieving theme action', {
+            details: {
+                actionType,
+                themeId,
+                shopUrl: credentials.shopUrl
+            }
+        });
         if (!storeActions)
             throw new AppError({
                 code: THEME_ACTION_NOTS_FOUND_ERROR_CODE,
@@ -27,6 +36,12 @@ export class ThemeActionsService {
     }
     removeThemeActions({ themeId, credentials }) {
         const storeActions = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
+        this.#loggerApi.debug('Removing theme actions', {
+            details: {
+                themeId,
+                shopUrl: credentials.shopUrl
+            }
+        });
         if (!storeActions || !storeActions.actions[themeId]) {
             throw new AppError({
                 code: THEME_ACTION_NOTS_FOUND_ERROR_CODE,
@@ -40,10 +55,17 @@ export class ThemeActionsService {
         if (!themeId)
             return;
         const actionsData = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
+        this.#loggerApi.info('Ensuring theme actions are up to date', {
+            details: {
+                themeId,
+                shopUrl: credentials.shopUrl
+            }
+        });
         if (actionsData &&
             this._isValidThemesActions(actionsData) &&
             actionsData.actions[themeId] &&
             !this._hasThemesActionsExpired(this._getKey(credentials.shopUrl))) {
+            this.#loggerApi.debug('Theme actions are valid and not expired. Skipping fetch.');
             return Promise.resolve();
         }
         this._cleanExpiredActions();
@@ -52,6 +74,7 @@ export class ThemeActionsService {
             actions,
             expires: getNMinutesFromNow(STORE_THEMES_ACTIONS_TTL)
         });
+        this.#loggerApi.info('Fetched and stored new theme actions.');
     }
     _hasThemesActionsExpired(key) {
         const expires = this.#themesActionsStore.get(key)?.expires;
@@ -64,6 +87,11 @@ export class ThemeActionsService {
         return true;
     }
     async _fetchStoreThemesActions(credentials) {
+        this.#loggerApi.info('Fetching themes actions for store', {
+            details: {
+                shopUrl: credentials.shopUrl
+            }
+        });
         const themes = await this.#themesListApi.getThemes(credentials);
         if (!Array.isArray(themes))
             throw new AppError({
@@ -87,6 +115,11 @@ export class ThemeActionsService {
     }
     clearThemesActions({ credentials }) {
         const key = this._getKey(credentials.shopUrl);
+        this.#loggerApi.debug('Clearing themes actions for store', {
+            details: {
+                shopUrl: credentials.shopUrl
+            }
+        });
         this.#themesActionsStore.remove(key);
     }
     _getKey(shopUrl) {
@@ -94,14 +127,21 @@ export class ThemeActionsService {
     }
     _cleanExpiredActions() {
         const keys = this.#themesActionsStore.getKeys();
+        this.#loggerApi.debug('Cleaning expired actions');
         keys.forEach((key) => {
             const actionsData = this.#themesActionsStore.get(key);
             if (!actionsData || this._hasThemesActionsExpired(key)) {
+                this.#loggerApi.debug('Cleaning expired action', {
+                    details: {
+                        key
+                    }
+                });
                 this.#themesActionsStore.remove(key);
             }
         });
     }
     clearAllActions() {
+        this.#loggerApi.debug('Clearing all actions');
         this.#themesActionsStore.clear();
     }
 }

package/build/theme/features/theme/actions/theme_actions_constants.js

@@ -8,8 +8,7 @@ export const THEME_ACTIONS_TYPES = {
     delete: 'delete',
     publishForm: 'publish_form',
     publish: 'publish',
-    verify: 'verify',
-    partialPush: 'partial_push'
+    verify: 'verify'
 };
 export const THEME_ACTION_DATA_TYPE = {
     file: 'file',

package/build/theme/features/theme/actions/theme_actions_initializer.js

@@ -5,10 +5,12 @@ import { CLI_DATA_DIRECTORY_API_NAME } from '../../../../cli/features/data_direc
 import { THEME_ACTIONS_FEATURE_NAME, THEMES_ACTIONS_FILE_NAME } from './theme_actions_constants.js';
 import { ThemeActionsApi } from './api/theme_actions_api.js';
 import { ThemeActionsService } from './service/theme_actions_service.js';
+import { LOGGER_API_NAME } from '../../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemeActionsInitializer extends AsyncFeatureInitializer {
     static featureName = THEME_ACTIONS_FEATURE_NAME;
     async init() {
         const themesListApi = this.getApiSync(THEMES_LIST_API_NAME);
+        const loggerApi = this.getApiSync(LOGGER_API_NAME);
         const cliDataDirectoryApi = this.getApiSync(CLI_DATA_DIRECTORY_API_NAME);
         const themesActionsStore = new JsonCache({
             path: cliDataDirectoryApi.getDataDirectoryFullPath(),
@@ -19,7 +21,7 @@ export class ThemeActionsInitializer extends AsyncFeatureInitializer {
             cores: [
                 {
                     type: FEATURE_CORES_TYPES.api,
-                    instance: new ThemeActionsApi(new ThemeActionsService({ themesListApi, themesActionsStore }))
+                    instance: new ThemeActionsApi(new ThemeActionsService({ themesListApi, themesActionsStore, loggerApi }))
                 }
             ]
         };

package/build/theme/features/theme/actions/theme_actions_utils.js

@@ -3,10 +3,8 @@ import { basename, looksLikeDirectory, toUnixPath } from '../../../../utils/path
 import { THEME_ACTION_DATA_TYPE } from './theme_actions_constants.js';
 import globs from 'fast-glob';
 import { THEME_PUSH_WILDCARD_GLOBS_FOR_FILES } from '../push/service/theme_push_service_constants.js';
-import micromatch from 'micromatch';
-import difference from 'lodash/difference.js';
 export class ThemeActionsUtils {
-    static getFilesGlobsThatMatchesAction({ filesStructure, actionValue, actionType }) {
+    static getFilesGlobsThatMatchesActionName({ filesStructure, actionValue, actionType }) {
         return Object.entries(filesStructure).reduce((acc, [filePath, fileStructureItem]) => {
             if (fileStructureItem._links?.[actionType] && this._doesActionValueMatch(fileStructureItem._links[actionType], actionValue)) {
                 return [...acc, toUnixPath(filePath)];
@@ -14,32 +12,11 @@ export class ThemeActionsUtils {
             return acc;
         }, []);
     }
-    static async getFilesThatMatchesAction({ actionType, actionValue, filesStructure, rootDir }) {
-        return await globs(ThemeActionsUtils.getFilesGlobsThatMatchesAction({
-            actionType,
-            actionValue,
-            filesStructure
-        }), {
-            suppressErrors: true,
-            onlyFiles: true,
-            cwd: rootDir
-        });
-    }
-    static async getDeletedFilesThatMatchesAction({ actionType, actionValue, themeChecksums, filesStructure }) {
-        const deletedFiles = await themeChecksums.getDeletedFiles();
-        const globs = ThemeActionsUtils.getFilesGlobsThatMatchesAction({
-            actionType,
-            actionValue,
-            filesStructure
-        });
-        return deletedFiles.filter((path) => !looksLikeDirectory(path) && micromatch.isMatch(path, globs));
-    }
-    static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure, themeChecksums }) {
+    static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure }) {
         const filesRecords = [];
-        const initialChecksums = await themeChecksums.getInitialChecksums();
         for (const [actionKey, actionData] of Object.entries(themeAction.data)) {
             if (actionData.type === THEME_ACTION_DATA_TYPE.file) {
-                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesAction({
+                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
                     //TODO remove when backend fixed
                     actionType: 'push',
                     // actionType: themeAction.actionType,
@@ -47,7 +24,6 @@ export class ThemeActionsUtils {
                     filesStructure
                 });
                 for (const fileGlob of filesGlobs) {
-                    const checksumMatchedFiles = micromatch(Object.keys(initialChecksums), [fileGlob]);
                     const files = await globs(fileGlob, {
                         suppressErrors: true,
                         onlyFiles: true,
@@ -59,15 +35,13 @@ export class ThemeActionsUtils {
                             ? fileGlob.slice(0, fileGlob.length - 2)
                             : fileGlob;
                     }
-                    const deletedFiles = difference(checksumMatchedFiles, files);
-                    for (const filePath of [...files, ...deletedFiles]) {
+                    for (const filePath of files) {
                         filesRecords.push({
                             actionData,
                             actionKey,
                             path: filePath,
                             fileName: basename(filePath),
-                            fileGlob: processedFileGlob,
-                            state: await themeChecksums.getFileState(filePath)
+                            fileGlob: processedFileGlob
                         });
                     }
                 }