@shoper/cli 0.1.0-30 → 0.1.0-32

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

@@ -78,7 +78,7 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
                 return;
             }
             const themeDeleteApi = this.getApi(THEME_DELETE_API_NAME);
-            const { isSuccess } = await themeDeleteApi.deleteTheme({
+            const resp = await themeDeleteApi.deleteTheme({
                 actionData: deleteAction.data,
                 credentials
             });
@@ -86,7 +86,7 @@ export class ThemeDeleteCommand extends BaseThemeCommand {
                 themeId: _themeId,
                 credentials
             });
-            if (!isSuccess)
+            if (!resp?.isSuccess)
                 return;
             renderOnce(React.createElement(ThemeDeletedSuccessfully, null));
             return;

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 { ValidationErrors } from '../../../cli/ui/validation_errors/validation_errors.js';
+import { ValidationErrors } from '../../../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.';

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

@@ -17,8 +17,8 @@ export class ThemeListCommandUtils {
                     width: 10
                 }
             ],
-            rows: themes.map((theme, index) => [
-                React.createElement(Text, null, index),
+            rows: themes.map((theme) => [
+                React.createElement(Text, null, theme.skinId),
                 React.createElement(Text, null, theme.title),
                 React.createElement(Text, null, theme.isActive ? 'active' : 'inactive')
             ])

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

@@ -24,7 +24,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 { ValidationErrors } from '../../../cli/ui/validation_errors/validation_errors.js';
+import { ValidationErrors } from '../../../ui/validation_errors/validation_errors.js';
 import { ThemeChecksums } from '../../class/checksums/theme_checksums.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.';
@@ -118,8 +118,9 @@ export class ThemePushCommand extends BaseThemeCommand {
             return;
         }
         if (err?.code === THEME_FILES_UPLOAD_ERROR) {
-            return renderOnce(React.createElement(Error, { header: "Uploading theme files to the shop failed.\n" },
+            renderOnce(React.createElement(Error, { header: "Uploading theme files to the shop failed.\n" },
                 React.createElement(Text, null, "The rejected files have been removed locally. Please ensure that the files are not corrupted and that the file extensions are supported.")));
+            return;
         }
         if (err?.message) {
             renderOnce(React.createElement(ValidationErrors, { errors: err.message }));

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

@@ -1,5 +1,6 @@
 import { HttpErrorsFactory } from '../../../../../cli/class/errors/http/http_errors_factory.js';
 import { DownloadFileErrorsFactory } from '../../../../../utils/download_file/download_file_errors_factory.js';
+import { STATUS_CODES } from '@dreamcommerce/star_core';
 export class ThemeDeleteService {
     #httpApi;
     constructor(httpApi) {
@@ -7,9 +8,11 @@ export class ThemeDeleteService {
     }
     async deleteTheme({ actionData, credentials }) {
         try {
-            const { response } = this.#httpApi.deleteTheme({ actionData, shopUrl: credentials.shopUrl });
-            const { data } = await response;
-            return data;
+            const { response: request } = this.#httpApi.deleteTheme({ actionData, shopUrl: credentials.shopUrl });
+            const response = await request;
+            if (response?.status !== STATUS_CODES.ok)
+                return;
+            return response?.data;
         }
         catch (err) {
             //TODO to basic class

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

@@ -11,7 +11,7 @@ import { THEME_FILES_LIST_FILE_NAME, THEME_MODULE_SETTINGS_FILE_NAME } from '../
 import { THEME_PUSH_WILDCARD_GLOBS_FOR_FILES } from './theme_push_service_constants.js';
 import { ThemePushErrorsFactory } from '../theme_push_errors_factory.js';
 import { ThemeImagesUtils } from '../../utils/theme_images_utils.js';
-import { ThemePublishUtils } from '../../publish/theme_publish_utils.js';
+import { ThemePublishUtils } from '../../skinstore/theme_publish_utils.js';
 import { formatJSONFile, removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
 import { MODULES_DIRECTORY_NAME } from '../../theme_constants.js';
 import path from 'node:path';
@@ -100,6 +100,7 @@ export class ThemePushService {
             .filter((path) => extname(path).toLowerCase() === '.json')
             .map((jsonFile) => formatJSONFile(join(themeRootDir, jsonFile))));
     }
+    //TODO osobna klasa do uploadu
     async _uploadThemeFiles({ filesToUpload, themeRootDir, localFiles, credentials }) {
         try {
             const { uploadedImageData, rejectedImageData } = await this._uploadFiles(filesToUpload, credentials);

package/build/theme/features/theme/skinstore/api/theme_skinstore_api.js

@@ -0,0 +1,17 @@
+import { FeatureApi } from '@dreamcommerce/star_core';
+export class ThemeSkinstoreApi extends FeatureApi {
+    #service;
+    constructor(service) {
+        super();
+        this.#service = service;
+    }
+    async getPublishFormData() {
+        return this.#service.getPublishFormData();
+    }
+    async publish(themeId) {
+        // return this.#service.publish(themeId);
+    }
+    async update() {
+        // return this.#service.update();
+    }
+}

package/build/theme/features/theme/skinstore/http/theme_skinstore_http_api.js

@@ -0,0 +1,7 @@
+export class ThemeSkinstoreHttpApi {
+    #httpApi;
+    constructor(httpApi) {
+        this.#httpApi = httpApi;
+    }
+    async getPublishFormData() { }
+}

package/build/theme/features/theme/skinstore/service/theme_skinstore_service.js

@@ -0,0 +1,3 @@
+export class ThemeSkinstoreService {
+    async getPublishFormData() { }
+}

package/build/theme/features/themes/list/services/themes_list_service.js

@@ -9,18 +9,17 @@ export class ThemesListService {
     }
     async getThemes({ shopUrl }) {
         try {
-            const { response } = this.#httpApi.getThemes(shopUrl);
-            const { data, status } = await response;
-            if (status !== STATUS_CODES.ok)
+            const { response: request } = this.#httpApi.getThemes(shopUrl);
+            const response = await request;
+            if (response?.status !== STATUS_CODES.ok)
                 return;
             //TODO baseHttpApi + model mapper
-            return data.map(({ _links, ...rest }) => new ThemeMetaData({
+            return response?.data.map(({ _links, ...rest }) => new ThemeMetaData({
                 ...rest,
                 links: _links
             }));
         }
         catch (err) {
-            //TODO to basic class
             switch (err.response?.status) {
                 case 403:
                     throw HttpErrorsFactory.createForbiddenError();

package/build/theme/hooks/themes_actions/ensure_themes_actions_hook_constants.js

@@ -3,5 +3,6 @@ export const THEME_COMMANDS_THAT_REQUIRED_ACTIONS_LIST = [
     THEME_COMMANDS_NAME.pull,
     THEME_COMMANDS_NAME.init,
     THEME_COMMANDS_NAME.push,
+    THEME_COMMANDS_NAME.delete,
     THEME_COMMANDS_NAME.showChanges
 ];

package/build/ui/form/controls_mappers.js

@@ -0,0 +1,39 @@
+export const toTextControl = ({ type, validate, label, isRequired, defaultValue, name }) => {
+    return {
+        type: 'input',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        default: defaultValue,
+        validate
+    };
+};
+export const toNumberControl = ({ type, validate, label, isRequired, defaultValue, name }) => {
+    return {
+        type: 'number',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        default: defaultValue,
+        validate
+    };
+};
+export const toSelectControl = ({ type, validate, label, isRequired, defaultValue, name, choices }) => {
+    return {
+        type: 'list',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        choices,
+        default: defaultValue,
+        validate
+    };
+};
+export const toMultiSelectControl = ({ type, validate, label, isRequired, defaultValue, name, choices }) => {
+    //TODO multiple checkboxes
+    return {
+        type: 'checkbox',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        choices,
+        default: defaultValue,
+        validate
+    };
+};

package/build/ui/form/form.js

@@ -0,0 +1,5 @@
+import inquirer from 'inquirer';
+import { CONTROL_TYPE_TO_MAPPERS } from './form_constants.js';
+export const Form = ({ controls, onSubmit }) => {
+    inquirer.prompt(controls.map((control) => CONTROL_TYPE_TO_MAPPERS[control.type]?.(control))).then(onSubmit);
+};

package/build/ui/form/form_constants.js

@@ -0,0 +1,13 @@
+import { toMultiSelectControl, toNumberControl, toSelectControl, toTextControl } from './controls_mappers.js';
+export const CONTROLS_TYPES = {
+    text: 'text',
+    number: 'number',
+    select: 'select',
+    multiSelect: 'multiSelect'
+};
+export const CONTROL_TYPE_TO_MAPPERS = {
+    [CONTROLS_TYPES.text]: toTextControl,
+    [CONTROLS_TYPES.number]: toNumberControl,
+    [CONTROLS_TYPES.select]: toSelectControl,
+    [CONTROLS_TYPES.multiSelect]: toMultiSelectControl
+};

package/build/{cli/ui → ui}/validation_errors/validation_error_content.js

@@ -1,5 +1,5 @@
-import { Text } from '../../../ui/text.js';
-import { List } from '../../../ui/list/list.js';
+import { Text } from '../text.js';
+import { List } from '../list/list.js';
 import { ValidationErrorsUtils } from './validation_errors_utils.js';
 import React from 'react';
 export const ValidationErrorContent = ({ errors }) => {

package/build/{cli/ui → ui}/validation_errors/validation_errors.js

@@ -1,7 +1,7 @@
 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 { Error } from '../message_box/error.js';
+import { Text } from '../text.js';
+import { List } from '../list/list.js';
 import { ValidationErrorContent } from './validation_error_content.js';
 export const ValidationErrors = ({ errors }) => {
     if (typeof errors === 'string') {

package/build/utils/download_file/download_file_utils.js

@@ -8,6 +8,8 @@ import { DownloadFileErrorsFactory } from './download_file_errors_factory.js';
 export const downloadFile = async ({ dist, request }) => {
     try {
         const resp = (await request);
+        if (!resp)
+            throw resp;
         const headers = resp.headers;
         const url = new URL(resp.config.url);
         const filename = getFileNameFromHeaders(headers) ?? basename(url.pathname);

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.1.0-30",
+    "version": "0.1.0-32",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -63,7 +63,8 @@
         "ink-link": "4.1.0",
         "log-symbols": "7.0.1",
         "figures": "6.1.0",
-        "strip-ansi": "7.1.0"
+        "strip-ansi": "7.1.0",
+        "inquirer-select-line": "1.1.3"
     },
     "devDependencies": {
         "@babel/core": "7.27.1",