@shoper/cli 0.9.4-3 → 0.9.4-7

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

@@ -1,4 +1,4 @@
-import { Args, Flags } from '@oclif/core';
+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_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
@@ -7,41 +7,20 @@ import { renderOnce } from '../../../ui/ui_utils.js';
 import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_credentials_error.js';
 import React from 'react';
 import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
-import { THEME_SKINSTORE_API_NAME, RELEASE_TYPE_TEST, RELEASE_TYPE_STABLE, IMAGE_MAX_SIZE, IMAGE_ALLOWED_EXTENSIONS } from '../../features/theme/skinstore/theme_publish_constants.js';
+import { THEME_SKINSTORE_API_NAME } from '../../features/theme/skinstore/theme_publish_constants.js';
 import { Form } from '../../../cli/features/controls/ui/form.js';
-import { toInquirerControls } from '../../../cli/features/controls/ui/controls_mappers.js';
 import { ThemeError } from '../ui/theme_error.js';
 import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
-import { Text } from '../../../ui/text.js';
-import { Box } from '../../../ui/box.js';
-import { Success } from '../../../ui/message_box/success.js';
-import { Info } from '../../../ui/message_box/info.js';
-import { Error as ErrorBox } from '../../../ui/message_box/error.js';
-import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
-import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.js';
-import fs from 'fs';
-import path from 'path';
 export class ThemePublishCommand extends BaseThemeCommand {
-    static summary = 'Publish theme to SkinStore.';
-    static description = 'Publishes a theme to the Shoper SkinStore marketplace.\n\nFor first-time publication, you will be prompted to fill in theme details.\nFor already published themes, this performs an upgrade (new version).';
+    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).';
     static examples = [
         {
-            description: 'Publish current theme (from theme directory)',
-            command: '<%= config.bin %> <%= command.id %>'
-        },
-        {
-            description: 'Publish specific theme by ID',
+            description: 'This will delete the theme with ID 123 permanently from your store. Make sure you have a backup if needed.',
             command: '<%= config.bin %> <%= command.id %> 123'
-        },
-        {
-            description: 'Publish as test release',
-            command: '<%= config.bin %> <%= command.id %> --release test'
-        },
-        {
-            description: 'Publish with screenshots from directory',
-            command: '<%= config.bin %> <%= command.id %> --images ./screenshots'
         }
     ];
+    static hidden = true;
     static args = {
         id: Args.string({
             description: 'Theme id',
@@ -50,18 +29,6 @@ export class ThemePublishCommand extends BaseThemeCommand {
             type: 'string'
         })
     };
-    static flags = {
-        release: Flags.string({
-            char: 'r',
-            description: 'Release type',
-            options: ['test', 'stable'],
-            default: 'stable'
-        }),
-        images: Flags.string({
-            char: 'i',
-            description: 'Path to directory with screenshots'
-        })
-    };
     async run() {
         const themeId = this.args.id;
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
@@ -76,59 +43,32 @@ export class ThemePublishCommand extends BaseThemeCommand {
         try {
             let _themeId = themeId;
             if (executionContext.type !== EXECUTION_CONTEXTS.theme && !_themeId) {
-                renderOnce(React.createElement(MissingThemeIdError, null,
-                    React.createElement(Box, { flexDirection: "column", gap: 1 },
-                        React.createElement(Text, null, "Usage: shoper theme publish [ID]"),
-                        React.createElement(Text, null, "Please run this command inside a theme directory or provide a theme ID."))));
                 return;
             }
-            if (executionContext.type === EXECUTION_CONTEXTS.theme)
+            if (executionContext.type === EXECUTION_CONTEXTS.theme) {
                 _themeId = _themeId ?? executionContext.themeId;
+            }
             if (!_themeId) {
                 renderOnce(React.createElement(MissingThemeIdError, null));
                 return;
             }
             const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
             const themeSkinstoreApi = this.getApi(THEME_SKINSTORE_API_NAME);
-            const publishAction = themeActionsApi.getThemeAction({
-                actionType: THEME_ACTIONS_TYPES.publish,
+            const pushAction = themeActionsApi.getThemeAction({
+                actionType: THEME_ACTIONS_TYPES.publishForm,
                 themeId: _themeId,
                 credentials
             });
-            if (!publishAction) {
-                renderOnce(React.createElement(UnpermittedCommandError, { themeId: _themeId, commandName: "publish" }));
-                return;
-            }
-            const publishFormAction = themeActionsApi.getThemeAction({
-                actionType: THEME_ACTIONS_TYPES.publishForm,
-                themeId: _themeId,
+            const controls = await themeSkinstoreApi.getPublishFormData({
+                actionData: pushAction.data,
                 credentials
             });
-            const releaseType = this.flags.release === 'test' ? RELEASE_TYPE_TEST : RELEASE_TYPE_STABLE;
-            const isUpgrade = !publishFormAction;
-            if (isUpgrade) {
-                await this.#handleUpgrade({
-                    themeSkinstoreApi,
-                    themeActionsApi,
-                    publishAction,
-                    credentials,
-                    releaseType,
-                    themeId: _themeId,
-                    loggerApi
-                });
-            }
-            else {
-                await this.#handleFirstPublish({
-                    themeSkinstoreApi,
-                    themeActionsApi,
-                    publishFormAction,
-                    publishAction,
-                    credentials,
-                    releaseType,
-                    themeId: _themeId,
-                    loggerApi
-                });
-            }
+            Form({
+                controls,
+                onSubmit: (formData) => {
+                    console.log('formData', formData);
+                }
+            });
         }
         catch (err) {
             loggerApi.error('Theme publish command error:', {
@@ -137,127 +77,4 @@ export class ThemePublishCommand extends BaseThemeCommand {
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }
-    async #handleUpgrade({ themeSkinstoreApi, themeActionsApi, publishAction, credentials, releaseType, themeId, loggerApi }) {
-        renderOnce(React.createElement(Info, { header: `Upgrading published theme (ID: ${themeId})` },
-            React.createElement(Text, null,
-                "Release type: ",
-                this.flags.release)));
-        const { proceed } = await promptConfirmation('Proceed with upgrade?');
-        if (!proceed) {
-            renderOnce(React.createElement(Info, { header: "Theme publish was cancelled." }));
-            return;
-        }
-        const result = await themeSkinstoreApi.publishTheme({
-            actionData: publishAction.data,
-            credentials,
-            payload: { release: releaseType }
-        });
-        if (result?.isSuccess) {
-            themeActionsApi.removeThemeActions({ themeId, credentials });
-            renderOnce(React.createElement(Success, { header: "Theme upgraded successfully!" },
-                React.createElement(Text, null,
-                    "Release type: ",
-                    this.flags.release)));
-        }
-        else {
-            this.#renderPublishErrors(result?.messages);
-        }
-    }
-    async #handleFirstPublish({ themeSkinstoreApi, themeActionsApi, publishFormAction, publishAction, credentials, releaseType, themeId, loggerApi }) {
-        const controls = await themeSkinstoreApi.getPublishFormData({
-            actionData: publishFormAction.data,
-            credentials
-        });
-        if (!controls || controls.length === 0) {
-            renderOnce(React.createElement(ErrorBox, { header: "Could not fetch publish form." },
-                React.createElement(Text, null, "Check if SkinStore SDK feature is enabled for your store.")));
-            return;
-        }
-        const inquirerControls = toInquirerControls(controls.filter((c) => c.name !== 'release'));
-        const formData = await new Promise((resolve) => {
-            Form({
-                controls: inquirerControls,
-                onSubmit: resolve
-            });
-        });
-        let uploadedImageIds = [];
-        if (this.flags.images) {
-            uploadedImageIds = await this.#uploadImages({
-                themeSkinstoreApi,
-                credentials,
-                imagesDir: this.flags.images,
-                skinId: themeId,
-                loggerApi
-            });
-        }
-        const payload = {
-            name: formData.name,
-            desc: formData.desc ?? '',
-            description: formData.description,
-            categories: Array.isArray(formData.categories) ? formData.categories : [formData.categories],
-            colors: Array.isArray(formData.colors) ? formData.colors : [formData.colors],
-            price: Number(formData.price) || 0,
-            release: releaseType,
-            ...(uploadedImageIds.length > 0 ? { filesList: uploadedImageIds } : {})
-        };
-        const result = await themeSkinstoreApi.publishTheme({
-            actionData: publishAction.data,
-            credentials,
-            payload
-        });
-        if (result?.isSuccess) {
-            themeActionsApi.removeThemeActions({ themeId, credentials });
-            renderOnce(React.createElement(Success, { header: "Theme published successfully!" },
-                React.createElement(Text, null, "Your theme is now available on SkinStore.")));
-        }
-        else {
-            this.#renderPublishErrors(result?.messages);
-        }
-    }
-    async #uploadImages({ themeSkinstoreApi, credentials, imagesDir, skinId, loggerApi }) {
-        const imageIds = [];
-        if (!fs.existsSync(imagesDir)) {
-            renderOnce(React.createElement(ErrorBox, { header: "Images directory not found." },
-                React.createElement(Text, null,
-                    "Path: ",
-                    imagesDir)));
-            return imageIds;
-        }
-        const files = fs.readdirSync(imagesDir).filter((file) => {
-            const ext = path.extname(file).toLowerCase().replace('.', '');
-            return IMAGE_ALLOWED_EXTENSIONS.includes(ext);
-        });
-        for (const file of files) {
-            const filePath = path.join(imagesDir, file);
-            const stat = fs.statSync(filePath);
-            if (stat.size > IMAGE_MAX_SIZE) {
-                loggerApi.warn(`Skipping ${file}: exceeds ${IMAGE_MAX_SIZE} bytes limit`);
-                continue;
-            }
-            const uploadUrl = `/webapi/cli/themes/${skinId}/skinstore/files`;
-            const result = await themeSkinstoreApi.uploadImage({
-                credentials,
-                uploadUrl,
-                imagePath: filePath
-            });
-            if (result?.isSuccess && result?.imageId) {
-                imageIds.push(result.imageId);
-            }
-            else {
-                loggerApi.warn(`Failed to upload ${file}`, { details: result?.messages });
-            }
-        }
-        return imageIds;
-    }
-    #renderPublishErrors(messages) {
-        if (!messages) {
-            renderOnce(React.createElement(ErrorBox, { header: "Publishing failed." },
-                React.createElement(Text, null, "An unknown error occurred.")));
-            return;
-        }
-        renderOnce(React.createElement(ErrorBox, { header: "Publishing failed. Validation errors:" }, Object.entries(messages).map(([field, msg]) => (React.createElement(Text, { key: field },
-            field,
-            ": ",
-            typeof msg === 'string' ? msg : Object.values(msg).join(', '))))));
-    }
 }

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

@@ -10,10 +10,10 @@ export class ThemeSkinstoreApi extends FeatureApi {
     async getPublishFormData(props) {
         return this.#service.getPublishFormData(props);
     }
-    async publishTheme(props) {
-        return this.#service.publishTheme(props);
+    async publish(themeId) {
+        // return this.#service.publish(themeId);
     }
-    async uploadImage(props) {
-        return this.#service.uploadImage(props);
+    async update() {
+        // return this.#service.update();
     }
 }

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

@@ -14,30 +14,4 @@ export class ThemeSkinstoreHttpApi {
             isPrivate: true
         });
     }
-    publishTheme({ actionData, shopUrl, payload }) {
-        const { method, url } = actionData;
-        return this.#httpApi.fetch({
-            url: `${shopUrl}${url}`,
-            method,
-            data: payload,
-            sanitizeOptions: {
-                disable: true
-            },
-            isPrivate: true
-        });
-    }
-    uploadImage({ shopUrl, url, imageBuffer }) {
-        return this.#httpApi.fetch({
-            url: `${shopUrl}${url}`,
-            method: 'post',
-            data: imageBuffer,
-            headers: {
-                'Content-Type': 'application/octet-stream'
-            },
-            sanitizeOptions: {
-                disable: true
-            },
-            isPrivate: true
-        });
-    }
 }

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

@@ -2,18 +2,13 @@ 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';
-import fs from 'fs';
-const PUBLISH_RESPONSE_STATUSES = [STATUS_CODES.ok, STATUS_CODES.badRequest];
 export class ThemeSkinstoreService {
     #httpApi;
-    #logger;
-    constructor({ httpApi, logger }) {
+    constructor(httpApi) {
         this.#httpApi = httpApi;
-        this.#logger = logger;
     }
     async getPublishFormData({ credentials, actionData }) {
         try {
-            this.#logger.info('Fetching publish form data');
             const { response: request } = this.#httpApi.getPublishFormData({ actionData, shopUrl: credentials.shopUrl });
             const response = await request;
             if (response?.status !== STATUS_CODES.ok)
@@ -21,64 +16,17 @@ export class ThemeSkinstoreService {
             return response?.data ? toControls(response.data) : [];
         }
         catch (err) {
-            this.#logger.error('Error fetching publish form data', { error: err });
-            this.#handleHttpError(err);
-        }
-    }
-    async publishTheme({ credentials, actionData, payload }) {
-        try {
-            this.#logger.info('Publishing theme', {
-                details: { actionData }
-            });
-            const { response: request } = this.#httpApi.publishTheme({
-                actionData,
-                shopUrl: credentials.shopUrl,
-                payload
-            });
-            const response = await request;
-            if (!PUBLISH_RESPONSE_STATUSES.includes(response?.status))
-                return;
-            this.#logger.info('Successfully published theme');
-            return response?.data;
-        }
-        catch (err) {
-            this.#logger.error('Error publishing theme', { error: err });
-            this.#handleHttpError(err);
-        }
-    }
-    async uploadImage({ credentials, uploadUrl, imagePath }) {
-        try {
-            this.#logger.info('Uploading image', {
-                details: { uploadUrl, imagePath }
-            });
-            const imageBuffer = fs.readFileSync(imagePath);
-            const { response: request } = this.#httpApi.uploadImage({
-                shopUrl: credentials.shopUrl,
-                url: uploadUrl,
-                imageBuffer
-            });
-            const response = await request;
-            if (response?.status !== STATUS_CODES.ok)
-                return;
-            this.#logger.info('Successfully uploaded image');
-            return response?.data;
-        }
-        catch (err) {
-            this.#logger.error('Error uploading image', { error: err });
-            this.#handleHttpError(err);
-        }
-    }
-    #handleHttpError(err) {
-        //TODO to basic class
-        switch (err.response?.status) {
-            case 403:
-                throw HttpErrorsFactory.createForbiddenError();
-            case 401:
-                throw HttpErrorsFactory.createUnauthorizedError();
-            case 404:
-                throw HttpErrorsFactory.createNotFoundError();
-            default:
-                throw DownloadFileErrorsFactory.downloadError(err.response?.status);
+            //TODO to basic class
+            switch (err.response?.status) {
+                case 403:
+                    throw HttpErrorsFactory.createForbiddenError();
+                case 401:
+                    throw HttpErrorsFactory.createUnauthorizedError();
+                case 404:
+                    throw HttpErrorsFactory.createNotFoundError();
+                default:
+                    throw DownloadFileErrorsFactory.downloadError(err.response.status);
+            }
         }
     }
 }

package/build/theme/features/theme/skinstore/theme_publish_constants.js

@@ -2,7 +2,3 @@ export const THEME_SKINSTORE_LOCATION = 'skinstore';
 export const THEME_SKINSTORE_SETTINGS_FILE_NAME = 'settings.json';
 export const THEME_SKINSTORE_API_NAME = 'ThemeSkinstoreApi';
 export const THEME_SKINSTORE_FEATURE_NAME = 'ThemeSkinstore';
-export const RELEASE_TYPE_TEST = 0;
-export const RELEASE_TYPE_STABLE = 1;
-export const IMAGE_MAX_SIZE = 5242880;
-export const IMAGE_ALLOWED_EXTENSIONS = ['gif', 'jpeg', 'jpg', 'png', 'webp'];

package/build/theme/features/theme/skinstore/theme_skinstore_initialzier.js

@@ -3,16 +3,11 @@ import { THEME_SKINSTORE_FEATURE_NAME } from './theme_publish_constants.js';
 import { ThemeSkinstoreService } from './service/theme_skinstore_service.js';
 import { ThemeSkinstoreHttpApi } from './http/theme_skinstore_http_api.js';
 import { ThemeSkinstoreApi } from './api/theme_skinstore_api.js';
-import { LOGGER_API_NAME } from '../../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemeSkinstoreInitializer extends SyncFeatureInitializer {
     static featureName = THEME_SKINSTORE_FEATURE_NAME;
     init() {
         const httpApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
-        const loggerApi = this.getApiSync(LOGGER_API_NAME);
-        const service = new ThemeSkinstoreService({
-            httpApi: new ThemeSkinstoreHttpApi(httpApi),
-            logger: loggerApi
-        });
+        const service = new ThemeSkinstoreService(new ThemeSkinstoreHttpApi(httpApi));
         return {
             cores: [
                 {

package/build/theme/features/theme/utils/files/theme_files_utils.js

@@ -18,7 +18,18 @@ export class ThemeFilesUtils {
     }
     static async writeThemeFilesStructure(themeDirectory, filesStructure) {
         const filePath = join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME);
-        await writeJSONFile(filePath, filesStructure);
+        const normalizedStructure = {};
+        for (const [key, value] of Object.entries(filesStructure)) {
+            let unixKey = toUnixPath(key);
+            if (!unixKey.endsWith('/')) {
+                const fullPath = join(themeDirectory, unixKey);
+                if ((await fileExists(fullPath)) && (await isDirectory(fullPath))) {
+                    unixKey = `${unixKey}/`;
+                }
+            }
+            normalizedStructure[unixKey] = value;
+        }
+        await writeJSONFile(filePath, normalizedStructure);
     }
     static async getFilesPermissions(themeDirectory) {
         const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);

package/build/theme/index.js

@@ -17,7 +17,6 @@ import { ThemeDeleteInitializer } from './features/theme/delete/theme_delete_ini
 import { ThemeActionsInitializer } from './features/theme/actions/theme_actions_initializer.js';
 import { ThemeWatchCommand } from './commands/watch/theme_watch_command.js';
 import { ThemeWatchInitializer } from './features/theme/watch/theme_watch_initializer.js';
-import { ThemeSkinstoreInitializer } from './features/theme/skinstore/theme_skinstore_initialzier.js';
 export const COMMANDS = {
     [THEME_COMMANDS_NAME.list]: ThemeListCommand,
     [THEME_COMMANDS_NAME.pull]: ThemePullCommand,
@@ -35,7 +34,6 @@ export const COMMAND_TO_FEATURES_MAP = {
     [THEME_COMMANDS_NAME.push]: [ThemeFetchInitializer, ThemePushInitializer],
     [THEME_COMMANDS_NAME.verify]: ThemeVerifyInitializer,
     [THEME_COMMANDS_NAME.delete]: ThemeDeleteInitializer,
-    [THEME_COMMANDS_NAME.publish]: ThemeSkinstoreInitializer,
     [THEME_COMMANDS_NAME.watch]: [ThemeFetchInitializer, ThemePushInitializer, ThemeWatchInitializer]
 };
 export const getThemeInitializersForCommand = (commandName) => {

package/build/utils/fs/fs_utils.js

@@ -1,6 +1,6 @@
 import fsPromises from 'node:fs/promises';
 import fs, { createReadStream, readFileSync } from 'node:fs';
-import { isHiddenFile } from 'is-hidden-file';
+const isHiddenFile = (filename) => /(?:^|[/\\])\./.test(filename);
 import process from 'node:process';
 import { basename, join, resolve } from '../path_utils.js';
 import { parse as parsePath } from 'node:path';

package/build/utils/path_utils.js

@@ -21,22 +21,31 @@ export const hasParentDirectory = (path) => {
 };
 export const looksLikeDirectory = (path) => {
     const normalized = normalize(path);
-    if (normalized.endsWith(sep))
+    if (normalized.endsWith(sep) || path.endsWith('/') || path.endsWith('\\'))
         return true;
     const base = basename(normalized);
     const isHidden = base.startsWith('.') && !base.slice(1).includes('.');
     const hasExtension = base.slice(1).includes('.');
     if (isHidden) {
-        const stat = fs.lstatSync(path);
-        return stat.isDirectory();
+        try {
+            const stat = fs.lstatSync(normalized);
+            return stat.isDirectory();
+        }
+        catch {
+            return false;
+        }
     }
     return isHidden || !hasExtension;
 };
 export const toUnixPath = (filePath) => {
-    return normalize(filePath).split(sep).join(path.posix.sep);
+    const endsWithSep = filePath.endsWith('/') || filePath.endsWith('\\');
+    const result = normalize(filePath).split(sep).join(path.posix.sep);
+    return endsWithSep && !result.endsWith('/') ? `${result}/` : result;
 };
 export const toWinowsPath = (filePath) => {
-    return normalize(filePath).split(sep).join(path.win32.sep);
+    const endsWithSep = filePath.endsWith('/') || filePath.endsWith('\\');
+    const result = normalize(filePath).split(sep).join(path.win32.sep);
+    return endsWithSep && !result.endsWith('\\') ? `${result}\\` : result;
 };
 export const isUnixPath = (path) => {
     return !path.includes('\\') && (path.startsWith('/') || path.includes('/'));

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.9.4-3",
+    "version": "0.9.4-7",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -48,16 +48,17 @@
         "chalk": "5.4.1",
         "conf": "13.1.0",
         "fast-glob": "3.3.3",
+        "figlet": "1.9.4",
         "figures": "6.1.0",
         "fs-extra": "11.3.0",
         "fs-tree-diff": "2.0.1",
+        "ignore": "7.0.5",
         "ink": "6.0.1",
         "ink-link": "4.1.0",
         "ink-gradient": "3.0.0",
         "ink-text-input": "6.0.0",
         "inquirer": "12.5.2",
         "inquirer-select-line": "1.1.3",
-        "is-hidden-file": "1.1.2",
         "jsonwebtoken": "9.0.2",
         "klaw": "4.1.0",
         "lodash": "4.17.21",
@@ -77,7 +78,6 @@
         "micromatch": "4.0.8",
         "walk-sync": "3.0.0",
         "yauzl": "3.2.0",
-        "figlet": "1.9.4",
         "yazl": "3.3.1",
         "puppeteer": "24.31.0",
         "gradient-string": "3.0.0"