@shoper/cli 0.1.0-32 → 0.1.0-33

package/build/cli/auth/tokens/cli_auth_tokens_initalizer.js

@@ -3,7 +3,7 @@ import { CliAuthTokensApi } from './api/cli_auth_tokens_api.js';
 import { CLiAuthTokensService } from './service/cli_auth_tokens_service.js';
 import { CLI_AUTH_TOKENS_FEATURE_NAME, CLI_AUTH_TOKENS_FILE_NAME } from './cli_auth_tokens_constants.js';
 import { CLI_DATA_DIRECTORY_API_NAME } from '../../features/data_directory/cli_data_directory_constants.js';
-import { JsonCache } from '../../features/caches/json_cache/json_cache.js';
+import { JsonCache } from '../../class/caches/json_cache/json_cache.js';
 // schema
 // {
 //     default: string;

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

@@ -0,0 +1,39 @@
+import { CONTROLS_TYPES } from './ui/form_constants.js';
+export const toTextControl = ({ validators, label, isRequired, defaultValue, name }) => {
+    return {
+        type: CONTROLS_TYPES.text,
+        name,
+        label,
+        isRequired,
+        defaultValue,
+        validators
+    };
+};
+export const toNumberControl = ({ validators, label, isRequired, name }) => {
+    return {
+        type: 'number',
+        name,
+        label,
+        isRequired,
+        validators
+    };
+};
+export const toSelectControl = ({ label, isRequired, name, options }) => {
+    return {
+        type: 'list',
+        name,
+        label,
+        isRequired,
+        options: options.selectOptions.map(({ label, key }) => ({ label, value: key }))
+    };
+};
+export const toMultiSelectControl = ({ label, isRequired, name, options }) => {
+    //TODO multiple checkboxes
+    return {
+        type: 'checkbox',
+        name,
+        label,
+        isRequired,
+        options: options.selectOptions.map(({ label, key }) => ({ label, value: key }))
+    };
+};

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

@@ -0,0 +1,44 @@
+export const toTextControl = ({ validators, label, isRequired, defaultValue, name }) => {
+    return {
+        type: 'input',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        default: defaultValue,
+        validate: toInquirerValidate(validators)
+    };
+};
+export const toNumberControl = ({ validators, label, isRequired, defaultValue, name }) => {
+    return {
+        type: 'number',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        default: defaultValue,
+        validate: toInquirerValidate(validators)
+    };
+};
+export const toSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
+    return {
+        type: 'list',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        choices: options,
+        default: defaultValue,
+        validate: toInquirerValidate(validators)
+    };
+};
+export const toMultiSelectControl = ({ validators, label, isRequired, defaultValue, name, options }) => {
+    //TODO multiple checkboxes
+    return {
+        type: 'checkbox',
+        name,
+        message: isRequired ? `${label} (required)` : label,
+        choices: options,
+        default: defaultValue,
+        validate: toInquirerValidate(validators)
+    };
+};
+export const toInquirerValidate = (validators) => {
+    return (value) => {
+        return validators?.find((v) => !v.isValid(value))?.getErrorMessage() ?? true;
+    };
+};

package/build/cli/features/controls/validators/greater_eq_than_validator.js

@@ -0,0 +1,5 @@
+export class GreaterEqThanValidator {
+    isValid(value, { min }) {
+        return value >= min;
+    }
+}

package/build/cli/features/controls/validators/length_validator.js

@@ -0,0 +1,6 @@
+export class LengthValidator {
+    isValid(value, { min, max }) {
+        const length = value.length;
+        return length >= min && length <= max;
+    }
+}

package/build/cli/features/controls/validators/required_validator.js

@@ -0,0 +1,5 @@
+export class RequiredValidator {
+    isValid(value) {
+        return value !== null && value !== undefined && value !== '';
+    }
+}

package/build/cli/features/controls/validators/validator_constants.js

@@ -0,0 +1,13 @@
+import { RequiredValidator } from './required_validator.js';
+import { GreaterEqThanValidator } from './greater_eq_than_validator.js';
+import { LengthValidator } from './length_validator.js';
+export const VALIDATORS_TYPES = {
+    required: 'required',
+    greaterEqThan: 'greaterEqThan',
+    length: 'length'
+};
+export const VALIDATOR_TYPE_TO_VALIDATOR = {
+    [VALIDATORS_TYPES.required]: new RequiredValidator(),
+    [VALIDATORS_TYPES.greaterEqThan]: new GreaterEqThanValidator(),
+    [VALIDATORS_TYPES.length]: new LengthValidator()
+};

package/build/cli/features/http_requester/http_requester_initializer.js

@@ -1,6 +1,6 @@
 import { CACHE_TYPES, CacheService, DEFAULT_REQUESTER_CACHE_NAMESPACE, FEATURE_CORES_TYPES, HTTP_REQUESTER_FEATURE_NAME, HTTPRequesterApi, HTTPRequesterBalancer, REQUEST_SOURCE, Requester, RequesterCacheServiceKeySerializer, SANITIZER_API_NAME, StrategiesContainer, SyncFeatureInitializer } from '@dreamcommerce/star_core';
 import { HttpClient } from './http_client.js';
-import { CacheFactory } from '../caches/cache_factory.js';
+import { CacheFactory } from '../../class/caches/cache_factory.js';
 export class HTTPRequesterInitializer extends SyncFeatureInitializer {
     static featureName = HTTP_REQUESTER_FEATURE_NAME;
     init() {

package/build/theme/class/fetch_resources/fetch_resources.js

@@ -58,6 +58,7 @@ export class FetchResources {
                 });
             }));
         }
+        return;
     }
     async _getResourcesFileContent(resourcePath) {
         return mapResourcesToTree(await readJSONFile(resourcePath));

package/build/theme/class/fetch_resources/fetch_resources_utils.js

@@ -1,7 +1,7 @@
 import { join } from '../../../utils/path_utils.js';
 import { RESOURCES_FILE_NAME } from './fetch_resources_constants.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../constants/directory_contstants.js';
-import { fileExists, readJSONFile } from '../../../utils/fs/fs_utils.js';
+import { fileExists, readJSONFile, removeFiles } from '../../../utils/fs/fs_utils.js';
 export const isResourceObject = (resource) => {
     return typeof resource === 'object' && resource !== null && 'url' in resource && typeof resource.url === 'string';
 };
@@ -15,6 +15,9 @@ export const getResources = async (root) => {
     }
     return await readJSONFile(resourcesPath);
 };
+export const removeOldResources = async (rootDir, resources) => {
+    await removeFiles(Object.keys(resources).map((path) => join(rootDir, path)));
+};
 export const mapResourcesToTree = (resources, separator = '/') => {
     const tree = {};
     Object.entries(resources).forEach(([path, value]) => {

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

@@ -1,6 +1,6 @@
 import { AsyncFeatureInitializer, FEATURE_CORES_TYPES } from '@dreamcommerce/star_core';
 import { THEMES_LIST_API_NAME } from '../../themes/list/themes_list_constants.js';
-import { JsonCache } from '../../../../cli/features/caches/json_cache/json_cache.js';
+import { JsonCache } from '../../../../cli/class/caches/json_cache/json_cache.js';
 import { CLI_DATA_DIRECTORY_API_NAME } from '../../../../cli/features/data_directory/cli_data_directory_constants.js';
 import { THEME_ACTIONS_FEATURE_NAME, THEMES_ACTIONS_FILE_NAME } from './theme_actions_constants.js';
 import { ThemeActionsApi } from './api/theme_actions_api.js';

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

@@ -1,11 +1,21 @@
 import { THEME_ALL_ACTIONS_NAME } from './service/theme_actions_service_constants.js';
 import { toUnixPath } from '../../../../utils/path_utils.js';
-export const getFilesGlobsThatMatchesActionName = (actionType, actionValue, filesStructure) => {
-    return Object.entries(filesStructure).reduce((acc, [filePath, fileStructureItem]) => {
-        if (fileStructureItem._links?.[actionType] &&
-            (fileStructureItem._links[actionType] === actionValue || actionValue === THEME_ALL_ACTIONS_NAME)) {
-            return [...acc, toUnixPath(filePath)];
+export class ThemeActionsUtils {
+    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)];
+            }
+            return acc;
+        }, []);
+    }
+    static _doesActionValueMatch(currentActionValue, valuesToMatch) {
+        if (typeof valuesToMatch === 'string') {
+            return currentActionValue === valuesToMatch || valuesToMatch === THEME_ALL_ACTIONS_NAME;
         }
-        return acc;
-    }, []);
-};
+        if (Array.isArray(valuesToMatch)) {
+            return valuesToMatch.includes(currentActionValue) || valuesToMatch.includes(THEME_ALL_ACTIONS_NAME);
+        }
+        return false;
+    }
+}

package/build/theme/features/theme/fetch/service/theme_fetch_service.js

@@ -4,7 +4,7 @@ import { downloadFile } from '../../../../../utils/download_file/download_file_u
 import { extractZip } from '../../../../../utils/zip/extract_zip_utils.js';
 import { join } from '../../../../../utils/path_utils.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
-import { getResources, mapResourcesToTree } from '../../../../class/fetch_resources/fetch_resources_utils.js';
+import { getResources, mapResourcesToTree, removeOldResources } from '../../../../class/fetch_resources/fetch_resources_utils.js';
 import { FetchResources } from '../../../../class/fetch_resources/fetch_resources.js';
 import { jsonIndentTransform } from '../../../../../utils/stream_transforms/json_indent_transform.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 '../../theme_constants.js';
@@ -15,7 +15,7 @@ import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
 import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
 import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
 import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
-import { ThemeChecksums } from '../../../../../theme/class/checksums/theme_checksums.js';
+import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
 export class ThemeFetchService {
     #themeHttpApi;
     #httpApi;
@@ -107,6 +107,7 @@ export class ThemeFetchService {
         });
     }
     async fetchResources(shopUrl, dist, resources) {
+        await removeOldResources(dist, resources);
         const resourcesTree = mapResourcesToTree(resources);
         await Promise.all(Object.keys(resourcesTree).map((resource) => new FetchResources(this.#httpApi).fetchResources({
             resourcesPart: resourcesTree[resource],

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

@@ -6,7 +6,7 @@ import { createReadStream } from 'node:fs';
 import { v4 as uuid } from 'uuid';
 import globs from 'fast-glob';
 import { THEME_WILDCARD_ACTION_NAME } from '../../actions/service/theme_actions_service_constants.js';
-import { getFilesGlobsThatMatchesActionName } from '../../actions/theme_actions_utils.js';
+import { ThemeActionsUtils } from '../../actions/theme_actions_utils.js';
 import { THEME_FILES_LIST_FILE_NAME, THEME_MODULE_SETTINGS_FILE_NAME } from '../theme_push_constants.js';
 import { THEME_PUSH_WILDCARD_GLOBS_FOR_FILES } from './theme_push_service_constants.js';
 import { ThemePushErrorsFactory } from '../theme_push_errors_factory.js';
@@ -15,6 +15,7 @@ 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';
+import { removeOldResources } from '../../../../class/fetch_resources/fetch_resources_utils.js';
 export class ThemePushService {
     #themePushHttpApi;
     #themeFetchApi;
@@ -47,7 +48,11 @@ export class ThemePushService {
         try {
             await this._createThemeArchive({
                 themeRootDir: executionContext.themeRootDir,
-                filesToArchive: getFilesGlobsThatMatchesActionName(THEME_ACTIONS_TYPES.push, THEME_WILDCARD_ACTION_NAME, filesStructure),
+                filesToArchive: ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
+                    actionType: THEME_ACTIONS_TYPES.push,
+                    actionValue: THEME_WILDCARD_ACTION_NAME,
+                    filesStructure
+                }),
                 dist: themeArchivePath
             });
         }
@@ -61,8 +66,10 @@ export class ThemePushService {
         });
         if (modules)
             await this._updateDataForNewCreatedModules({ modules, themeRootDir: executionContext.themeRootDir });
-        if (resources)
+        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();
     }
@@ -150,7 +157,11 @@ export class ThemePushService {
         const localFiles = {};
         for (const [actionKey, actionData] of Object.entries(pushAction.data)) {
             if (actionData.type === THEME_ACTION_DATA_TYPE.file) {
-                const filesGlobs = getFilesGlobsThatMatchesActionName(THEME_ACTIONS_TYPES.push, actionKey, filesStructure);
+                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
+                    actionType: THEME_ACTIONS_TYPES.push,
+                    actionValue: actionKey,
+                    filesStructure
+                });
                 for (const fileGlob of filesGlobs) {
                     const files = await globs(fileGlob, {
                         suppressErrors: true,

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

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

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

@@ -3,5 +3,15 @@ export class ThemeSkinstoreHttpApi {
     constructor(httpApi) {
         this.#httpApi = httpApi;
     }
-    async getPublishFormData() { }
+    getPublishFormData({ actionData, shopUrl }) {
+        const { method, url } = actionData;
+        return this.#httpApi.fetch({
+            url: `${shopUrl}${url}`,
+            method,
+            sanitizeOptions: {
+                disable: true
+            },
+            isPrivate: true
+        });
+    }
 }

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

@@ -1,3 +1,31 @@
+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';
 export class ThemeSkinstoreService {
-    async getPublishFormData() { }
+    #httpApi;
+    constructor(httpApi) {
+        this.#httpApi = httpApi;
+    }
+    async getPublishFormData({ credentials, actionData }) {
+        try {
+            const { response: request } = this.#httpApi.getPublishFormData({ actionData, shopUrl: credentials.shopUrl });
+            const response = await request;
+            if (response?.status !== STATUS_CODES.ok)
+                return;
+            return response?.data;
+        }
+        catch (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);
+            }
+        }
+    }
 }

package/build/theme/features/theme/utils/theme_images_utils.js

@@ -21,7 +21,7 @@ export class ThemeImagesUtils {
     }
     static async removeUploadedOriginalFiles(themeRootDir, uploadedImagesData) {
         await Promise.all(uploadedImagesData
-            .filter(({ originalFilename }) => Boolean(originalFilename))
+            .filter(({ originalFilename, uploadedFilename }) => Boolean(originalFilename) && Boolean(uploadedFilename))
             .map(({ originalFilename, location }) => {
             const originalFilePath = join(themeRootDir, location, originalFilename);
             return removeFile(originalFilePath);

package/package.json

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

package/build/ui/form/controls_mappers.js

@@ -1,39 +0,0 @@
-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
-    };
-};