@shoper/cli 0.1.0-34 → 0.1.0-35

package/build/cli/features/controls/controls_constants.js

@@ -0,0 +1,12 @@
+export const CONTROLS_DTO_TYPES = {
+    text: 'text',
+    number: 'number',
+    select: 'select',
+    multiSelectDropDown: 'multiSelectDropDown'
+};
+export const CONTROLS_TYPES = {
+    text: 'text',
+    number: 'number',
+    select: 'select',
+    multiSelect: 'multiSelect'
+};

package/build/cli/features/controls/{controls_dto_to_ui_mappers.js → controls_dto_mappers.js}

@@ -1,4 +1,4 @@
-import { CONTROLS_TYPES } from './ui/form_constants.js';
+import { CONTROLS_DTO_TYPES, CONTROLS_TYPES } from './controls_constants.js';
 export const toTextControl = ({ validators, label, isRequired, defaultValue, name }) => {
     return {
         type: CONTROLS_TYPES.text,
@@ -11,7 +11,7 @@ export const toTextControl = ({ validators, label, isRequired, defaultValue, nam
 };
 export const toNumberControl = ({ validators, label, isRequired, name }) => {
     return {
-        type: 'number',
+        type: CONTROLS_TYPES.number,
         name,
         label,
         isRequired,
@@ -20,7 +20,7 @@ export const toNumberControl = ({ validators, label, isRequired, name }) => {
 };
 export const toSelectControl = ({ label, isRequired, name, options }) => {
     return {
-        type: 'list',
+        type: CONTROLS_TYPES.select,
         name,
         label,
         isRequired,
@@ -28,12 +28,28 @@ export const toSelectControl = ({ label, isRequired, name, options }) => {
     };
 };
 export const toMultiSelectControl = ({ label, isRequired, name, options }) => {
-    //TODO multiple checkboxes
     return {
-        type: 'checkbox',
+        type: CONTROLS_TYPES.multiSelect,
         name,
         label,
         isRequired,
         options: options.selectOptions.map(({ label, key }) => ({ label, value: key }))
     };
 };
+export const toControls = (controls) => {
+    return controls.map(toControl);
+};
+export const toControl = (control) => {
+    switch (control.type) {
+        case CONTROLS_DTO_TYPES.text:
+            return toTextControl(control);
+        case CONTROLS_DTO_TYPES.number:
+            return toNumberControl(control);
+        case CONTROLS_DTO_TYPES.select:
+            return toSelectControl(control);
+        case CONTROLS_DTO_TYPES.multiSelectDropDown:
+            return toMultiSelectControl(control);
+        default:
+            throw new Error(`Unknown control type`);
+    }
+};

package/build/cli/features/controls/ui/controls_mappers.js

@@ -1,4 +1,5 @@
-export const toTextControl = ({ validators, label, isRequired, defaultValue, name }) => {
+import { CONTROLS_TYPES } from '../controls_constants.js';
+const toTextControl = ({ validators, label, isRequired, defaultValue, name }) => {
     return {
         type: 'input',
         name,
@@ -7,7 +8,7 @@ export const toTextControl = ({ validators, label, isRequired, defaultValue, nam
         validate: toInquirerValidate(validators)
     };
 };
-export const toNumberControl = ({ validators, label, isRequired, defaultValue, name }) => {
+const toNumberControl = ({ validators, label, isRequired, defaultValue, name }) => {
     return {
         type: 'number',
         name,
@@ -16,7 +17,7 @@ export const toNumberControl = ({ validators, label, isRequired, defaultValue, n
         validate: toInquirerValidate(validators)
     };
 };
-export const toSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
+const toSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
     return {
         type: 'list',
         name,
@@ -26,7 +27,7 @@ export const toSelectControl = ({ validators, label, isRequired, defaultValue, n
         validate: toInquirerValidate(validators)
     };
 };
-export const toMultiSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
+const toMultiSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
     //TODO multiple checkboxes
     return {
         type: 'checkbox',
@@ -37,6 +38,23 @@ export const toMultiSelectControl = ({ validators, label, isRequired, defaultVal
         validate: toInquirerValidate(validators)
     };
 };
+export const toInquirerControls = (controls) => {
+    return controls.map(toInquirerControl);
+};
+export const toInquirerControl = (control) => {
+    switch (control.type) {
+        case CONTROLS_TYPES.text:
+            return toTextControl(control);
+        case CONTROLS_TYPES.number:
+            return toNumberControl(control);
+        case CONTROLS_TYPES.select:
+            return toSelectControl(control);
+        case CONTROLS_TYPES.multiSelect:
+            return toMultiSelectControl(control);
+        default:
+            throw new Error(`Unknown control type`);
+    }
+};
 export const toInquirerValidate = (validators) => {
     return (value) => {
         return validators?.find((v) => !v.isValid(value))?.getErrorMessage() ?? true;

package/build/cli/features/controls/ui/form.js

@@ -1,5 +1,4 @@
 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);
+    inquirer.prompt(controls).then(onSubmit);
 };

package/build/cli/features/controls/ui/form_constants.js

@@ -1,13 +1,7 @@
-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
-};
+export {};
+// export const CONTROL_TYPE_TO_MAPPERS: Record<TControlType, Function> = {
+//     [CONTROLS_TYPES.text]: toTextControl,
+//     [CONTROLS_TYPES.number]: toNumberControl,
+//     [CONTROLS_TYPES.select]: toSelectControl,
+//     [CONTROLS_TYPES.multiSelect]: toMultiSelectControl
+// };

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

@@ -1,7 +1,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 } from '../../features/theme/actions/theme_actions_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, 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';
@@ -11,6 +11,7 @@ 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';
 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).';
@@ -53,9 +54,23 @@ export class ThemePublishCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(MissingThemeIdError, null));
                 return;
             }
+            const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
             const themeSkinstoreApi = this.getApi(THEME_SKINSTORE_API_NAME);
-            const formData = await themeSkinstoreApi.getPublishFormData();
-            console.log('formData', formData);
+            const pushAction = themeActionsApi.getThemeAction({
+                actionType: THEME_ACTIONS_TYPES.publishForm,
+                themeId: _themeId,
+                credentials
+            });
+            const controls = await themeSkinstoreApi.getPublishFormData({
+                actionData: pushAction.data,
+                credentials
+            });
+            Form({
+                controls,
+                onSubmit: (formData) => {
+                    console.log('formData', formData);
+                }
+            });
         }
         catch (err) {
             this._handleError(err, themeId);

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

@@ -6,7 +6,7 @@ export const THEME_ACTIONS_TYPES = {
     push: 'push',
     pull: 'pull',
     delete: 'delete',
-    publish_form: 'publish_form',
+    publishForm: 'publish_form',
     publish: 'publish'
 };
 export const THEME_ACTION_DATA_TYPE = {

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

@@ -25,66 +25,73 @@ export class ThemePushService {
     }
     async push({ pushAction, filesStructure, credentials, executionContext, themeChecksums }) {
         const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
-        if (await themeChecksums.hasThemeFileBeenCreated(ThemePublishUtils.getSkinStoreSettingsFilePath(executionContext.themeRootDir)))
+        const themeRootDir = executionContext.themeRootDir;
+        if (await themeChecksums.hasThemeFileBeenCreated(ThemePublishUtils.getSkinStoreSettingsFilePath(themeRootDir)))
             throw ThemePushErrorsFactory.createErrorWhilePushingUnpublishedThemeWithSkinstoreData(credentials.shopUrl);
-        const { uploadData, localFiles } = await this._getActionDataForFilesToUpload({
-            pushAction,
-            filesStructure,
-            executionContext,
-            themeChecksums
-        });
-        if (uploadData.length) {
-            await this._uploadThemeFiles({
-                filesToUpload: uploadData,
-                credentials,
-                localFiles,
-                themeRootDir: executionContext.themeRootDir
-            });
-        }
-        else {
-            await this._createAFilesListFile(executionContext.themeRootDir, localFiles);
-        }
-        const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
         try {
+            const { uploadData, localFiles } = await this._getActionDataForFilesToUpload({
+                pushAction,
+                filesStructure,
+                executionContext,
+                themeChecksums
+            });
+            if (uploadData.length) {
+                const { newFiles } = await this._uploadThemeFiles({
+                    filesToUpload: uploadData,
+                    credentials,
+                    localFiles,
+                    themeRootDir
+                });
+                await this._createAFilesListFile(themeRootDir, newFiles);
+            }
+            else {
+                await this._createAFilesListFile(themeRootDir, localFiles);
+            }
+            const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
             await this._createThemeArchive({
-                themeRootDir: executionContext.themeRootDir,
+                themeRootDir: themeRootDir,
                 filesToArchive: ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
                     actionType: THEME_ACTIONS_TYPES.push,
                     actionValue: THEME_WILDCARD_ACTION_NAME,
                     filesStructure
                 }),
-                dist: themeArchivePath
+                dist: themeArchivePath,
+                credentials
+            });
+            const { resources, modules } = await this._uploadThemeArchive({
+                themeArchivePath,
+                credentials,
+                pushAction
+            });
+            if (modules)
+                await this._updateDataForNewCreatedModules({ modules, themeRootDir });
+            if (resources) {
+                await removeOldResources(themeRootDir, resources);
+                await this.#themeFetchApi.fetchResources(credentials.shopUrl, themeRootDir, resources);
+            }
+            await themeChecksums.updateAllChecksums();
+        }
+        finally {
+            await removeFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME));
+        }
+    }
+    async _createThemeArchive({ themeRootDir, filesToArchive, dist, credentials }) {
+        try {
+            const filesInThemeDirectory = await globs(filesToArchive, {
+                suppressErrors: true,
+                onlyFiles: true,
+                cwd: themeRootDir
+            });
+            await this._formatJsonFiles(themeRootDir, filesInThemeDirectory);
+            return createZip({
+                files: filesInThemeDirectory,
+                baseDir: themeRootDir,
+                dist
             });
         }
         catch (err) {
             throw ThemePushErrorsFactory.createErrorWhileCreatingThemeArchive(credentials.shopUrl, err);
         }
-        const { resources, modules } = await this._uploadThemeArchive({
-            themeArchivePath,
-            credentials,
-            pushAction
-        });
-        if (modules)
-            await this._updateDataForNewCreatedModules({ modules, themeRootDir: executionContext.themeRootDir });
-        if (resources) {
-            await removeOldResources(executionContext.themeRootDir, resources);
-            await this.#themeFetchApi.fetchResources(credentials.shopUrl, executionContext.themeRootDir, resources);
-        }
-        await removeFile(join(executionContext.themeRootDir, THEME_FILES_LIST_FILE_NAME));
-        await themeChecksums.updateAllChecksums();
-    }
-    async _createThemeArchive({ themeRootDir, filesToArchive, dist }) {
-        const filesInThemeDirectory = await globs(filesToArchive, {
-            suppressErrors: true,
-            onlyFiles: true,
-            cwd: themeRootDir
-        });
-        await this._formatJsonFiles(themeRootDir, filesInThemeDirectory);
-        return createZip({
-            files: filesInThemeDirectory,
-            baseDir: themeRootDir,
-            dist
-        });
     }
     async _uploadThemeArchive({ themeArchivePath, credentials, pushAction }) {
         try {
@@ -116,7 +123,7 @@ export class ThemePushService {
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
             if (rejectedImageData.length)
                 await this._removeUploadedThemeFiles(rejectedImageData, themeRootDir);
-            await this._createAFilesListFile(themeRootDir, newFilesList);
+            return { newFiles: newFilesList };
         }
         catch (err) {
             throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl, err);

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

@@ -7,8 +7,8 @@ export class ThemeSkinstoreApi extends FeatureApi {
         super();
         this.#service = service;
     }
-    async getPublishFormData() {
-        // return this.#service.getPublishFormData();
+    async getPublishFormData(props) {
+        return this.#service.getPublishFormData(props);
     }
     async publish(themeId) {
         // return this.#service.publish(themeId);

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

@@ -1,6 +1,7 @@
 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';
+import { toControls } from '../../../../../cli/features/controls/controls_dto_mappers.js';
 export class ThemeSkinstoreService {
     #httpApi;
     constructor(httpApi) {
@@ -11,8 +12,8 @@ export class ThemeSkinstoreService {
             const { response: request } = this.#httpApi.getPublishFormData({ actionData, shopUrl: credentials.shopUrl });
             const response = await request;
             if (response?.status !== STATUS_CODES.ok)
-                return;
-            return response?.data;
+                throw response;
+            return response?.data ? toControls(response.data) : [];
         }
         catch (err) {
             //TODO to basic class

package/package.json

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