@shoper/cli 0.2.0 → 0.2.1-1

package/build/cli/class/base_command.js

@@ -5,6 +5,8 @@ export class BaseCommand extends Command {
     commandBus;
     eventBus;
     globalCoresContainersRegistry;
+    flags;
+    args;
     constructor(argv, config) {
         super(argv, config);
         const { queryBus, commandBus, eventBus, globalCoresContainersRegistry } = getStarCoreEnvironment();
@@ -22,4 +24,16 @@ export class BaseCommand extends Command {
     _createApiDuplicationError(apiName) {
         return new AppError(`${apiName} hasn't been registered`);
     }
+    async init() {
+        await super.init();
+        const { args, flags } = await this.parse({
+            flags: this.ctor.flags,
+            baseFlags: super.ctor.baseFlags,
+            enableJsonFlag: this.ctor.enableJsonFlag,
+            args: this.ctor.args,
+            strict: this.ctor.strict
+        });
+        this.flags = flags;
+        this.args = args;
+    }
 }

package/build/cli/commands/auth/cli_auth_remove_token_command.js

@@ -30,9 +30,7 @@ export class CliAuthRemoveTokenCommand extends BaseCliCommand {
     };
     async run() {
         const cliAuthTokensApi = this.getApi(CLI_AUTH_TOKENS_API_NAME);
-        const data = await this.parse(CliAuthRemoveTokenCommand);
-        const { args } = data;
-        const { index } = args;
+        const { index } = this.args;
         if (!index || !cliAuthTokensApi.hasToken(index)) {
             renderOnce(React.createElement(MissingTokenIndexError, { command: React.createElement(Command, null, "shoper auth remove-token [TOKEN_INDEX]") }));
             return;

package/build/cli/commands/auth/cli_auth_switch_token_command.js

@@ -26,8 +26,7 @@ export class CliAuthSwitchTokenCommand extends BaseCliCommand {
     };
     async run() {
         const cliAuthTokensApi = this.getApi(CLI_AUTH_TOKENS_API_NAME);
-        const { args } = await this.parse(CliAuthSwitchTokenCommand);
-        const { index } = args;
+        const { index } = this.args;
         if (!index || !cliAuthTokensApi.hasToken(index)) {
             renderOnce(React.createElement(MissingTokenIndexError, { command: React.createElement(Command, null, "shoper auth switch-token [TOKEN_INDEX]") }));
             return;

package/build/cli/commands/commands_constants.js

@@ -1,10 +1,11 @@
+export const CLI_AUTH_TOPIC_NAME = 'auth';
 export const CLI_COMMANDS_NAMES = {
     help: 'help',
     version: 'version',
     update: 'update',
-    authListTokens: 'auth:list-tokens',
-    authAddToken: 'auth:add-token',
-    authRemoveToken: 'auth:remove-token',
-    switchToken: 'auth:switch-token',
+    authListTokens: `${CLI_AUTH_TOPIC_NAME}:list-tokens`,
+    authAddToken: `${CLI_AUTH_TOPIC_NAME}:add-token`,
+    authRemoveToken: `${CLI_AUTH_TOPIC_NAME}:remove-token`,
+    switchToken: `${CLI_AUTH_TOPIC_NAME}:switch-token`,
     uiDump: 'ui-dump'
 };

package/build/cli/core/cli_setup.js

@@ -8,14 +8,9 @@ import { ExecutionContextInitializer } from '../features/execution_context/execu
 import { CliVersionInitializer } from '../features/version/cli_version_initializer.js';
 import { CliAuthTokensInitializer } from '../auth/tokens/cli_auth_tokens_initalizer.js';
 import { CliAuthInitializer } from '../auth/cli_auth_initializer.js';
-import { ThemesListInitializer } from '../../theme/features/themes/list/themes_list_initializer.js';
-import { ThemeInitInitializer } from '../../theme/features/theme/init/theme_init_initializer.js';
-import { ThemeFetchInitializer } from '../../theme/features/theme/fetch/theme_fetch_initializer.js';
-import { ThemeMergeInitializer } from '../../theme/features/theme/merge/theme_merge_initializer.js';
-import { ThemeActionsInitializer } from '../../theme/features/theme/actions/theme_actions_initializer.js';
-import { ThemePushInitializer } from '../../theme/features/theme/push/theme_push_initializer.js';
-import { ThemeDeleteInitializer } from '../../theme/features/theme/delete/theme_delete_initalizer.js';
-import { ThemeSkinstoreInitializer } from '../../theme/features/theme/skinstore/theme_skinstore_initialzier.js';
+import { THEME_TOPIC_NAME } from '../../theme/commands/theme_commands_constants.js';
+import { getThemeInitializersForCommand } from '../../theme/index.js';
+import { CLI_AUTH_TOPIC_NAME, CLI_COMMANDS_NAMES } from '../commands/commands_constants.js';
 tmp.setGracefulCleanup();
 export const cliSetup = async () => {
     //TODO jakis ładny komuniakt błedu
@@ -27,18 +22,9 @@ export const cliSetup = async () => {
             HTTPRequesterInitializer,
             CliDataDirectoryInitializer,
             ExecutionContextInitializer,
-            CliVersionInitializer,
             CliAuthTokensInitializer,
             CliAuthInitializer,
-            ThemesListInitializer,
-            ThemeActionsInitializer,
-            //TODO dnamicznie inicjalizowanie ficzurów wykorzystywanych w poszczególnych komendach
-            ThemeInitInitializer,
-            ThemeMergeInitializer,
-            ThemeFetchInitializer,
-            ThemePushInitializer,
-            ThemeDeleteInitializer,
-            ThemeSkinstoreInitializer
+            ...getCommandBaseInitializers()
         ],
         options: {
             featuresTracking: false,
@@ -46,3 +32,32 @@ export const cliSetup = async () => {
         }
     });
 };
+const getCommandBaseInitializers = () => {
+    // console.log('process.argv', process.argv);
+    if (isCommandsTopic(process.argv[2]))
+        return getCommandWithTopicBaseInitializers();
+    return getCommandWithoutTopicBaseInitializers();
+};
+const isCommandsTopic = (arg) => {
+    return arg === THEME_TOPIC_NAME || arg === CLI_AUTH_TOPIC_NAME;
+};
+const getCommandWithTopicBaseInitializers = () => {
+    const topic = process.argv[2];
+    const command = process.argv[3];
+    switch (topic) {
+        case THEME_TOPIC_NAME: {
+            return getThemeInitializersForCommand(command);
+        }
+    }
+    return [];
+};
+const getCommandWithoutTopicBaseInitializers = () => {
+    const command = process.argv[3];
+    switch (command) {
+        case CLI_COMMANDS_NAMES.version:
+        case CLI_COMMANDS_NAMES.update: {
+            return [CliVersionInitializer];
+        }
+    }
+    return [];
+};

package/build/cli/hooks/authorization/ensure_authorization_hook_constants.js

@@ -4,6 +4,5 @@ export const COMMANDS_THAT_REQUIRE_AUTHORIZATION = [
     THEME_COMMANDS_NAME.pull,
     THEME_COMMANDS_NAME.list,
     THEME_COMMANDS_NAME.init,
-    THEME_COMMANDS_NAME.showChanges,
     THEME_COMMANDS_NAME.verify
 ];

package/build/theme/class/archive/theme_archive.js

@@ -0,0 +1,44 @@
+import globs from 'fast-glob';
+import { createZip } from '../../../utils/zip/create_zip_utils.js';
+import { ThemeFilesStructureUtils } from '../../features/theme/utils/files_structure/theme_files_structure_utils.js';
+import { extname, join } from '../../../utils/path_utils.js';
+import { formatJSONFile } from '../../../utils/fs/fs_utils.js';
+import { ThemeArchiveErrorsFactory } from './theme_archive_errors_factory.js';
+import { ThemeFileStructureErrorsFactory } from '../../features/theme/utils/files_structure/theme_file_structure_errors_factory.js';
+import { ThemeActionsUtils } from '../../features/theme/actions/theme_actions_utils.js';
+export class ThemeArchive {
+    #themeRootDir;
+    constructor(themeRootDir) {
+        this.#themeRootDir = themeRootDir;
+    }
+    async createFullArchive({ dist, actionValue, actionType }) {
+        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(this.#themeRootDir);
+        if (!filesStructure)
+            throw ThemeFileStructureErrorsFactory.createNoFilesStructureError();
+        try {
+            const filesInThemeDirectory = await globs(ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
+                actionType,
+                actionValue,
+                filesStructure
+            }), {
+                suppressErrors: true,
+                onlyFiles: true,
+                cwd: this.#themeRootDir
+            });
+            await this._formatJsonFiles(this.#themeRootDir, filesInThemeDirectory);
+            return createZip({
+                files: filesInThemeDirectory,
+                baseDir: this.#themeRootDir,
+                dist
+            });
+        }
+        catch (err) {
+            throw ThemeArchiveErrorsFactory.createErrorWhileCreatingThemeArchive(err);
+        }
+    }
+    async _formatJsonFiles(themeRootDir, filesToUpload) {
+        await Promise.all(filesToUpload
+            .filter((path) => extname(path).toLowerCase() === '.json')
+            .map((jsonFile) => formatJSONFile(join(themeRootDir, jsonFile))));
+    }
+}

package/build/theme/class/archive/theme_archive_errors_factory.js

@@ -0,0 +1,11 @@
+import { AppError } from '../../../cli/class/errors/app/app_error.js';
+export class ThemeArchiveErrorsFactory {
+    static createErrorWhileCreatingThemeArchive(error) {
+        return new AppError({
+            code: 'theme_archive.error_creating_archive',
+            message: `Error while creating theme archive`,
+            level: 'error',
+            stack: error.stack
+        });
+    }
+}

package/build/theme/class/checksums/theme_checksums.js

@@ -7,9 +7,9 @@ import { JSON_FILE_INDENT } from '../../../cli/cli_constants.js';
 import { ThemeChecksumsErrorFactory } from './theme_checksums_error_factory.js';
 import { computeChecksumsFromFilesStructure, computeDirectoriesChecksums, computeFileChecksum } from '../../../utils/checksums/checksums_utils.js';
 import { normalize } from 'node:path';
-import { ThemePushUtils } from '../../../theme/features/theme/push/theme_push_utils.js';
-import { SHOPER_THEME_METADATA_DIR } from '../../../theme/constants/directory_contstants.js';
-import { THEME_CURRENT_CHECKSUMS_VERITY_FILE_NAME, THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME, THEME_CURRENT_CHECKSUMS_FILE_NAME, THEME_INITIAL_CHECKSUMS_FILE_NAME } from '../../../theme/features/theme/theme_constants.js';
+import { ThemePushUtils } from '../../features/theme/push/theme_push_utils.js';
+import { SHOPER_THEME_METADATA_DIR } from '../../constants/directory_contstants.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 '../../features/theme/theme_constants.js';
 export class ThemeChecksums {
     #themeDir;
     #currentChecksumsFilePath;
@@ -61,10 +61,6 @@ export class ThemeChecksums {
         const checksums = await this.getInitialChecksums();
         return checksums[toCurrentPlatformPath(path)];
     }
-    getInitialChecksumFromPathSync(path) {
-        const checksums = this.getInitialChecksumsSync();
-        return checksums[toCurrentPlatformPath(path)];
-    }
     async hasThemeBeenModified() {
         const initialChecksums = await this._getInitialChecksumsVerification();
         const currentChecksums = await this._getCurrentChecksumsVerification();

package/build/theme/class/files_upload/theme_files_upload.js

@@ -0,0 +1,61 @@
+import { basename, dirname } from '../../../utils/path_utils.js';
+import { createReadStream } from 'node:fs';
+import { THEME_WILDCARD_ACTION_NAME } from '../../features/theme/actions/service/theme_actions_service_constants.js';
+import { ThemePushErrorsFactory } from '../../features/theme/push/theme_push_errors_factory.js';
+export class ThemeFilesUpload {
+    #credentials;
+    #themeFilesUploadHttpApi;
+    constructor({ credentials, themeFilesUploadHttpApi }) {
+        this.#themeFilesUploadHttpApi = themeFilesUploadHttpApi;
+        this.#credentials = credentials;
+    }
+    async uploadArchive({ action, themeArchivePath, credentials }) {
+        try {
+            const request = this.#themeFilesUploadHttpApi.uploadFiles({
+                actionData: action.data[THEME_WILDCARD_ACTION_NAME],
+                stream: createReadStream(themeArchivePath),
+                shopUrl: credentials.shopUrl
+            });
+            const response = await request.response;
+            if (response.status !== 200 || !response.data.isSuccess)
+                throw response;
+            return response.data;
+        }
+        catch (err) {
+            throw ThemePushErrorsFactory.createErrorWhileUploadingTheme(credentials.shopUrl, err.response.data.messages);
+        }
+    }
+    async uploadFiles(uploadData) {
+        const uploadedImageData = [];
+        const rejectedImageData = [];
+        await Promise.all(uploadData.map(({ actionData, path }) => this.#themeFilesUploadHttpApi
+            //TODO tajpings
+            .uploadFiles({
+            actionData,
+            stream: createReadStream(path),
+            shopUrl: this.#credentials.shopUrl
+        })
+            .response.then((response) => {
+            const { imageId, messages, isSuccess } = response.data;
+            uploadedImageData.push({
+                isSuccess,
+                messages,
+                location: dirname(path),
+                originalFilename: basename(path),
+                uploadedFilename: imageId
+            });
+        })
+            .catch((err) => {
+            rejectedImageData.push({
+                isSuccess: err?.response?.data?.isSuccess ?? false,
+                messages: err?.response?.data?.messages ?? [],
+                location: dirname(path),
+                originalFilename: basename(path)
+            });
+        })));
+        return {
+            uploadedImageData,
+            rejectedImageData
+        };
+    }
+}

package/build/theme/class/files_upload/theme_files_upload_http_api.js

@@ -0,0 +1,23 @@
+export class ThemeFilesUploadHttpApi {
+    #httpApi;
+    constructor(httpApi) {
+        this.#httpApi = httpApi;
+    }
+    uploadFiles({ actionData, shopUrl, stream }) {
+        const { method, url } = actionData;
+        return this.#httpApi.fetch({
+            url: `${shopUrl}${url}`,
+            method,
+            //TODO Remove after fix
+            // method: 'POST',
+            data: stream,
+            sanitizeOptions: {
+                disable: true
+            },
+            headers: {
+                'Content-Type': 'application/octet-stream'
+            },
+            isPrivate: true
+        });
+    }
+}

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

@@ -1,14 +1,13 @@
 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 { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_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';
 import { THEME_DELETE_API_NAME } from '../../features/theme/delete/theme_delete_constants.js';
 import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
-import { Error } from '../../../ui/message_box/error.js';
 import { Text } from '../../../ui/text.js';
 import { Info } from '../../../ui/message_box/info.js';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
@@ -16,6 +15,7 @@ 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';
+import { ThemeError } from '../ui/theme_error.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).';
@@ -25,7 +25,6 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
             command: '<%= config.bin %> <%= command.id %> 123'
         }
     ];
-    static hidden = true;
     static args = {
         id: Args.string({
             description: 'Theme id',
@@ -35,9 +34,7 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
         })
     };
     async run() {
-        const data = await this.parse(ThemeDeleteCommand);
-        const { args } = data;
-        const themeId = args.id;
+        const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const credentials = cliAuthApi.getCredentials();
@@ -92,20 +89,8 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
             return;
         }
         catch (err) {
-            this._handleError(err, themeId);
+            renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
             return;
         }
     }
-    _handleError(err, themeId) {
-        if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && themeId) {
-            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "delete" }));
-            return;
-        }
-        if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
-            return;
-        }
-        this.error(String(err));
-    }
 }

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

@@ -9,13 +9,12 @@ import { Args } from '@oclif/core';
 import { ThemeMetaDataUtils } from '../../features/theme/utils/meta_data/theme_meta_data_utils.js';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
 import { Text } from '../../../ui/text.js';
-import { THEME_WORK_URL_MISMATCH_ERROR } from '../../features/theme/utils/meta_data/theme_meta_data_constants.js';
 import { Error } from '../../../ui/message_box/error.js';
-import { ThemeWorkUrlMismatch } from '../ui/theme_work_url_mismatch.js';
 import { Table } from '../../../ui/table/table.js';
 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';
 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).';
@@ -33,9 +32,7 @@ export class ThemeInfoCommand extends BaseThemeCommand {
         })
     };
     async run() {
-        const data = await this.parse(ThemeInfoCommand);
-        const { args } = data;
-        const themeId = args.id;
+        const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const themesListApi = this.getApi(THEMES_LIST_API_NAME);
@@ -73,21 +70,9 @@ export class ThemeInfoCommand extends BaseThemeCommand {
             this._displayThemeInfo(theme);
         }
         catch (err) {
-            this._handleError(err);
+            renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }
-    _handleError(err) {
-        if (err?.code === THEME_WORK_URL_MISMATCH_ERROR) {
-            renderOnce(React.createElement(ThemeWorkUrlMismatch, { command: "info" }));
-            return;
-        }
-        if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
-            return;
-        }
-        this.error(String(err));
-    }
     _displayThemeInfo(theme) {
         renderOnce(React.createElement(Table, { data: ThemeInfoCommandUtils.mapThemeMetaDataToTableData(theme) }));
     }

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

@@ -4,7 +4,7 @@ import { THEME_INIT_API_NAME } from '../../features/theme/init/theme_init_consta
 import { CLI_AUTH_API_NAME } from '../../../cli/auth/cli_auth_constants.js';
 import ora from 'ora';
 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_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
 import { renderOnce } from '../../../ui/ui_utils.js';
 import { ThemeDirectoryContextError } from '../ui/theme_directory_context_error.js';
 import React from 'react';
@@ -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 { ValidationErrors } from '../../../ui/validation_errors/validation_errors.js';
+import { ThemeError } from '../ui/theme_error.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.';
@@ -33,9 +33,7 @@ export class ThemeInitCommand extends BaseThemeCommand {
         })
     };
     async run() {
-        const data = await this.parse(ThemeInitCommand);
-        const { args } = data;
-        const themeId = args.id;
+        const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const themeInitApi = this.getApi(THEME_INIT_API_NAME);
         const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
@@ -72,22 +70,11 @@ export class ThemeInitCommand extends BaseThemeCommand {
         }
         catch (err) {
             spinner?.stop();
-            this._handleError(err, themeId);
+            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();
         }
     }
-    _handleError(err, themeId) {
-        if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && themeId) {
-            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "init" }));
-            return;
-        }
-        if (err?.message) {
-            renderOnce(React.createElement(ValidationErrors, { errors: err.message }));
-            return;
-        }
-        this.error(String(err));
-    }
     _renderMissingThemeIdError() {
         renderOnce(React.createElement(MissingThemeIdError, null,
             React.createElement(Box, { flexDirection: "column", gap: 1 },

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

@@ -1,17 +1,15 @@
 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 { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_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';
-import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
-import { Error } from '../../../ui/message_box/error.js';
-import { Text } from '../../../ui/text.js';
 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';
 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,9 +29,7 @@ export class ThemePublishCommand extends BaseThemeCommand {
         })
     };
     async run() {
-        const data = await this.parse(ThemePublishCommand);
-        const { args } = data;
-        const themeId = args.id;
+        const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
         const credentials = cliAuthApi.getCredentials();
@@ -73,20 +69,8 @@ export class ThemePublishCommand extends BaseThemeCommand {
             });
         }
         catch (err) {
-            this._handleError(err, themeId);
+            renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
             return;
         }
     }
-    _handleError(err, themeId) {
-        if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && themeId) {
-            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "delete" }));
-            return;
-        }
-        if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
-            return;
-        }
-        this.error(String(err));
-    }
 }

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

@@ -7,7 +7,7 @@ import ora from 'ora';
 import { THEME_MERGE_API_NAME } from '../../features/theme/merge/theme_merge_constants.js';
 import tmp from 'tmp-promise';
 import { join } from '../../../utils/path_utils.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_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
 import process from 'node:process';
 import { ThemeResourcesWithIdDirectoryUtils } from '../../features/theme/utils/resources/theme_resources_with_id_directory_utils.js';
 import { renderOnce } from '../../../ui/ui_utils.js';
@@ -22,11 +22,9 @@ import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.js';
 import { ThemePulledSuccess } from './ui/theme_pulled_success.js';
 import { Info } from '../../../ui/message_box/info.js';
 import { directoryExists } from '../../../utils/fs/fs_utils.js';
-import { THEME_WORK_URL_MISMATCH_ERROR } from '../../features/theme/utils/meta_data/theme_meta_data_constants.js';
-import { ThemeWorkUrlMismatch } from '../ui/theme_work_url_mismatch.js';
-import { Error } from '../../../ui/message_box/error.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'; //TODO jak jest error w pullu wowczas usuwamy docelowo pociagniety skin
 //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.';
@@ -57,9 +55,7 @@ export class ThemePullCommand extends BaseThemeCommand {
     };
     #spinner;
     async run() {
-        const data = await this.parse(ThemePullCommand);
-        const { args, flags } = data;
-        const themeId = args.id;
+        const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const themeFetchApi = this.getApi(THEME_FETCH_API_NAME);
         const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
@@ -78,7 +74,7 @@ export class ThemePullCommand extends BaseThemeCommand {
                     themeFetchApi,
                     themeActionsApi,
                     credentials,
-                    fetchType: flags.type
+                    fetchType: this.flags.type
                 });
             }
             if (executionContext.type === EXECUTION_CONTEXTS.theme) {
@@ -87,7 +83,7 @@ export class ThemePullCommand extends BaseThemeCommand {
                     themeId: _themeId,
                     themeFetchApi,
                     themeActionsApi,
-                    fetchType: flags.type,
+                    fetchType: this.flags.type,
                     executionContext,
                     credentials
                 });
@@ -95,25 +91,9 @@ export class ThemePullCommand extends BaseThemeCommand {
         }
         catch (err) {
             this.#spinner?.stop();
-            this._handleError(err, _themeId);
+            renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }
-    _handleError(err, _themeId) {
-        if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && _themeId) {
-            this._renderUnpermittedCommandError(_themeId);
-            return;
-        }
-        if (err?.code === THEME_WORK_URL_MISMATCH_ERROR) {
-            renderOnce(React.createElement(ThemeWorkUrlMismatch, { command: "pull" }));
-            return;
-        }
-        if (err?.message) {
-            renderOnce(React.createElement(Error, null,
-                React.createElement(Text, null, err.message)));
-            return;
-        }
-        this.error(String(err));
-    }
     _renderUnpermittedCommandError(themeId) {
         renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "pull" }));
     }