@shoper/cli 0.5.2-3 → 0.5.2-5

package/build/cli/class/errors/http/http_errors_factory.js

@@ -15,7 +15,7 @@ export class HttpErrorsFactory {
     }
     static createNotFoundError() {
         return new AppError({
-            message: 'Not found',
+            message: '404 Not found',
             code: HTTP_NOT_FOUND_ERROR_CODE
         });
     }

package/build/cli/core/cli_setup.js

@@ -26,7 +26,7 @@ export const cliSetup = async () => {
             ExecutionContextInitializer,
             CliAuthTokensInitializer,
             CliAuthInitializer,
-            ...getCommandBaseInitializers()
+            ...getInitializersBasedOnCommand()
         ],
         options: {
             featuresTracking: false,
@@ -34,16 +34,15 @@ export const cliSetup = async () => {
         }
     });
 };
-const getCommandBaseInitializers = () => {
-    // console.log('process.argv', process.argv);
-    if (isCommandsTopic(process.argv[2]))
-        return getCommandWithTopicBaseInitializers();
+const getInitializersBasedOnCommand = () => {
+    if (isCommandWithTopic(process.argv[2]))
+        return getInitializersBasedOnCommandWithTopic();
     return getCommandWithoutTopicBaseInitializers();
 };
-const isCommandsTopic = (arg) => {
+const isCommandWithTopic = (arg) => {
     return arg === THEME_TOPIC_NAME || arg === CLI_AUTH_TOPIC_NAME;
 };
-const getCommandWithTopicBaseInitializers = () => {
+const getInitializersBasedOnCommandWithTopic = () => {
     const topic = process.argv[2];
     const command = process.argv[3];
     switch (topic) {

package/build/cli/index.js

@@ -6,6 +6,7 @@ export const runCLI = async () => {
         await execute({ dir: import.meta.url });
     }
     catch (error) {
+        console.log('Error executing CLI command:', error);
         // TODO handle error
     }
 };

package/build/cli/utilities/features/logger/transports/log_object_map_transport.js

@@ -0,0 +1,22 @@
+// import { Writable } from 'node:stream';
+//
+// export default async function (opts) {
+//     console.log('opts', opts);
+//
+//     return new Writable({
+//         objectMode: true,
+//         write(chunk, enc, cb) {
+//             const mapped = mapLog(chunk);
+//
+//             cb();
+//
+//             return mapped;
+//         }
+//     });
+// }
+//
+// function mapLog(obj) {
+//     //TODO map for backend structure
+//     return obj;
+// }
+export {};

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

@@ -10,6 +10,7 @@ import { normalize } from 'node:path';
 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';
+import { FILE_STATES } from '../../../utils/fs/fs_constants.js';
 export class ThemeChecksums {
     #themeDir;
     #currentChecksumsFilePath;
@@ -31,12 +32,6 @@ export class ThemeChecksums {
         this.#initialChecksums = await this._getChecksums(this.#initialChecksumsFilePath);
         return this.#initialChecksums;
     }
-    getInitialChecksumsSync() {
-        if (this.#initialChecksums)
-            return this.#initialChecksums;
-        this.#initialChecksums = this._getChecksumsSync(this.#initialChecksumsFilePath);
-        return this.#initialChecksums;
-    }
     async getCurrentChecksums() {
         if (this.#currentChecksums)
             return this.#currentChecksums;
@@ -70,10 +65,22 @@ export class ThemeChecksums {
         const initialChecksum = await this.getInitialChecksumFromPath(path);
         return !initialChecksum && (await fileExists(join(this.#themeDir, path)));
     }
-    async hasThemeFileBeenModified(path) {
-        const currentChecksum = await this.getCurrentChecksumFromPath(path);
+    async getFileState(path) {
         const initialChecksum = await this.getInitialChecksumFromPath(path);
-        return !!currentChecksum && !!initialChecksum && currentChecksum !== initialChecksum;
+        const currentChecksum = await this.getCurrentChecksumFromPath(path);
+        const fileExistsInFs = await fileExists(join(this.#themeDir, path));
+        if (!initialChecksum && fileExistsInFs) {
+            return FILE_STATES.created;
+        }
+        else if (initialChecksum && !fileExistsInFs) {
+            return FILE_STATES.deleted;
+        }
+        else if (initialChecksum && currentChecksum && initialChecksum !== currentChecksum) {
+            return FILE_STATES.modified;
+        }
+        else {
+            return FILE_STATES.unchanged;
+        }
     }
     async verify() {
         const initialChecksumFilePath = this.#initialChecksumsFilePath;
@@ -138,6 +145,37 @@ export class ThemeChecksums {
         const directoriesChecksums = computeDirectoriesChecksums(filesChecksumsInDirectories);
         return { ...filesChecksums, ...directoriesChecksums };
     }
+    async groupFilesByStatus(files) {
+        const initialChecksums = await this.getInitialChecksums();
+        const currentChecksums = await this.getCurrentChecksums();
+        return files.reduce((acc, filePath) => {
+            const initialChecksum = initialChecksums[toCurrentPlatformPath(filePath)];
+            const currentChecksum = currentChecksums[toCurrentPlatformPath(filePath)];
+            if (!initialChecksum) {
+                acc.created.push(filePath);
+            }
+            else if (currentChecksum && initialChecksum !== currentChecksum) {
+                acc.modified.push(filePath);
+            }
+            else if (initialChecksum && !currentChecksum) {
+                acc.deleted.push(filePath);
+            }
+            else {
+                acc.unchanged.push(filePath);
+            }
+            return acc;
+        }, {
+            created: [],
+            modified: [],
+            unchanged: [],
+            deleted: []
+        });
+    }
+    async getDeletedFiles() {
+        const initialChecksums = await this.getInitialChecksums();
+        const currentChecksums = await this.getCurrentChecksums();
+        return Object.keys(initialChecksums).filter((filePath) => !currentChecksums[filePath]);
+    }
     async _getInitialChecksumsVerification() {
         return await readJSONFile(this.#initialChecksumsVerificationFilePath);
     }

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

@@ -24,7 +24,8 @@ import { Info } from '../../../ui/message_box/info.js';
 import { directoryExists } from '../../../utils/fs/fs_utils.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
+import { ThemeError } from '../ui/theme_error.js';
+import { MODULES_DIRECTORY_NAME } from '../../features/theme/theme_constants.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.';
@@ -151,9 +152,9 @@ export class ThemePullCommand extends BaseThemeCommand {
                 dist: tmpDir
             }
         });
-        const localModulesPath = join(executionContext.themeRootDir, 'modules');
+        const localModulesPath = join(executionContext.themeRootDir, MODULES_DIRECTORY_NAME);
         const fetchedThemePath = join(tmpDir, name);
-        const fetchedModulesPath = join(fetchedThemePath, 'modules');
+        const fetchedModulesPath = join(fetchedThemePath, MODULES_DIRECTORY_NAME);
         if ((await directoryExists(localModulesPath)) && (await directoryExists(fetchedModulesPath)))
             await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localModulesPath, fetchedModulesPath, fetchedThemePath);
         this.#spinner.stop();

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

@@ -4,8 +4,6 @@ import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/fea
 import { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../../features/theme/actions/theme_actions_constants.js';
 import { THEME_PUSH_API_NAME } from '../../features/theme/push/theme_push_constants.js';
 import { ThemeMetaDataUtils } from '../../features/theme/utils/meta_data/theme_meta_data_utils.js';
-import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
-import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
 import { renderOnce } from '../../../ui/ui_utils.js';
 import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
 import React from 'react';
@@ -14,7 +12,7 @@ import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_c
 import { ThemePushedSuccess } from './ui/theme_pushed_success.js';
 import ora from 'ora';
 import { ThemePushSkipInfo } from './ui/theme_push_skip_into.js';
-import { ThemeFilesStructureUtils } from '../../features/theme/utils/files_structure/theme_files_structure_utils.js';
+import { ThemeFilesUtils } from '../../features/theme/utils/files/theme_files_utils.js';
 import { ThemeInfoUtils } from '../../features/theme/info/theme_info_utils.js';
 import { ThemeChecksums } from '../../class/checksums/theme_checksums.js';
 import { ThemeFilesUpload } from '../../class/files_upload/theme_files_upload.js';
@@ -24,7 +22,10 @@ import { MissingThemeFiles } from '../ui/missing_theme_files.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../constants/directory_contstants.js';
 import { THEME_FILES_STRUCTURE_FILE_NAME } from '../../features/theme/theme_constants.js';
 import { ThemeError } from '../ui/theme_error.js';
+import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
+import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
 import { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.js';
+import { promptConfirmation } from '../../../ui/prompts/prompt_confirmation.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.';
     static description = 'Check your local changes before pushing.\n\nYou must run this command from a specific theme directory (ID not needed).';
@@ -63,7 +64,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 return;
             }
             const initialChecksums = await themeChecksums.getInitialChecksums();
-            const permissions = await ThemeFilesStructureUtils.getFilesPermissions(executionContext.themeRootDir);
+            const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
             const themeFilesUploadApi = new ThemeFilesUpload({
                 themeRootDir: executionContext.themeRootDir,
                 credentials,
@@ -75,7 +76,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemePushSkipInfo, null));
                 return;
             }
-            const validationResult = await ThemeFilesStructureUtils.validateThemeDirectoryStructure({
+            const validationResult = await ThemeFilesUtils.validateThemeDirectoryStructure({
                 //TDO przeniesc do theme checksums
                 checksums: mapChecksumToTree(initialChecksums),
                 permissions: mapToPermissionsTree(permissions),
@@ -87,25 +88,36 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemeUnpermittedActionsError, { unpermittedActions: validationResult.unpermittedActions }));
                 return;
             }
-            const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
             if (!filesStructure) {
                 renderOnce(React.createElement(MissingThemeFiles, { files: `${SHOPER_THEME_METADATA_DIR}/${THEME_FILES_STRUCTURE_FILE_NAME}` }));
                 return;
             }
             spinner = ora('Pushing theme...').start();
-            await themePushApi.push({
+            const partialPushAction = themeActionsApi.getThemeAction({
+                actionType: THEME_ACTIONS_TYPES.partialPush,
+                themeId: executionContext.themeId,
+                credentials
+            });
+            if (!pushAction) {
+                renderOnce(React.createElement(UnpermittedCommandError, { themeId: executionContext.themeId, commandName: "push" }));
+                return;
+            }
+            await themePushApi.partialPush({
                 credentials,
                 filesStructure,
-                pushAction,
+                action: partialPushAction,
                 themeChecksums,
                 executionContext,
                 themeFilesUploadApi
             });
             spinner.stop();
+            await promptConfirmation('press any key to continue...');
             renderOnce(React.createElement(ThemePushedSuccess, { themeName: await ThemeInfoUtils.getThemeName(executionContext.themeRootDir) }));
         }
         catch (err) {
             spinner?.stop();
+            await promptConfirmation('press any key to continue...');
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }

package/build/theme/commands/theme_verify_command.js

@@ -1,7 +1,6 @@
 import { BaseThemeCommand } from '../class/base_theme_command.js';
 import { CLI_AUTH_API_NAME } from '../../cli/auth/cli_auth_constants.js';
 import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../cli/features/execution_context/execution_context_constants.js';
-import { ThemeFilesStructureUtils } from '../features/theme/utils/files_structure/theme_files_structure_utils.js';
 import { ThemeChecksums } from '../class/checksums/theme_checksums.js';
 import { THEME_VERIFY_API_NAME } from '../features/theme/verify/theme_verify_constants.js';
 import { THEME_ACTIONS_API_NAME, THEME_ACTIONS_TYPES } from '../features/theme/actions/theme_actions_constants.js';
@@ -18,6 +17,7 @@ import { MissingCredentialsError } from '../../cli/commands/auth/ui/missing_cred
 import { OutsideOfThemeDirectoryContextError } from './ui/ouside_of_theme_directory_context_error.js';
 import ora from 'ora';
 import { ThemeError } from './ui/theme_error.js';
+import { ThemeFilesUtils } from '../features/theme/utils/files/theme_files_utils.js';
 export class ThemeVerifyCommand extends BaseThemeCommand {
     static description = 'Verify theme files structure';
     async run() {
@@ -34,7 +34,7 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
             return;
         }
         const themeChecksums = new ThemeChecksums(executionContext.themeRootDir);
-        const permissions = await ThemeFilesStructureUtils.getFilesPermissions(executionContext.themeRootDir);
+        const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
         if (!themeChecksums || !permissions)
             this.error('Theme checksums or permissions not found. Please ensure you are in the correct theme directory.');
         let spinner;
@@ -51,7 +51,7 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
                 themeId: executionContext.themeId,
                 credentials
             });
-            const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
             if (!filesStructure) {
                 renderOnce(React.createElement(MissingThemeFiles, { files: `${SHOPER_THEME_METADATA_DIR}/${THEME_FILES_STRUCTURE_FILE_NAME}` }));
                 return;

package/build/theme/commands/ui/theme_error.js

@@ -19,8 +19,8 @@ export const ThemeError = ({ err, executionContext }) => {
         return React.createElement(ThemeWorkUrlMismatch, { command: "verify" });
     }
     if (err?.code === THEME_FILES_UPLOAD_ERROR) {
-        return (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 (React.createElement(Error, { header: "Uploading theme files to the shop failed." },
+            React.createElement(Text, null, "Please ensure that the files are not corrupted and that the file extensions are supported or file size is not too large.")));
     }
     if (err?.message) {
         return React.createElement(ValidationErrors, { errors: err.message });

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

@@ -8,7 +8,8 @@ export const THEME_ACTIONS_TYPES = {
     delete: 'delete',
     publishForm: 'publish_form',
     publish: 'publish',
-    verify: 'verify'
+    verify: 'verify',
+    partialPush: 'partial_push'
 };
 export const THEME_ACTION_DATA_TYPE = {
     file: 'file',

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

@@ -3,8 +3,10 @@ import { basename, looksLikeDirectory, toUnixPath } from '../../../../utils/path
 import { THEME_ACTION_DATA_TYPE } from './theme_actions_constants.js';
 import globs from 'fast-glob';
 import { THEME_PUSH_WILDCARD_GLOBS_FOR_FILES } from '../push/service/theme_push_service_constants.js';
+import micromatch from 'micromatch';
+import difference from 'lodash/difference.js';
 export class ThemeActionsUtils {
-    static getFilesGlobsThatMatchesActionName({ filesStructure, actionValue, actionType }) {
+    static getFilesGlobsThatMatchesAction({ 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)];
@@ -12,11 +14,32 @@ export class ThemeActionsUtils {
             return acc;
         }, []);
     }
-    static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure }) {
+    static async getFilesThatMatchesAction({ actionType, actionValue, filesStructure, rootDir }) {
+        return await globs(ThemeActionsUtils.getFilesGlobsThatMatchesAction({
+            actionType,
+            actionValue,
+            filesStructure
+        }), {
+            suppressErrors: true,
+            onlyFiles: true,
+            cwd: rootDir
+        });
+    }
+    static async getDeletedFilesThatMatchesAction({ actionType, actionValue, themeChecksums, filesStructure }) {
+        const deletedFiles = await themeChecksums.getDeletedFiles();
+        const globs = ThemeActionsUtils.getFilesGlobsThatMatchesAction({
+            actionType,
+            actionValue,
+            filesStructure
+        });
+        return deletedFiles.filter((path) => !looksLikeDirectory(path) && micromatch.isMatch(path, globs));
+    }
+    static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure, themeChecksums }) {
         const filesRecords = [];
+        const initialChecksums = await themeChecksums.getInitialChecksums();
         for (const [actionKey, actionData] of Object.entries(themeAction.data)) {
             if (actionData.type === THEME_ACTION_DATA_TYPE.file) {
-                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
+                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesAction({
                     //TODO remove when backend fixed
                     actionType: 'push',
                     // actionType: themeAction.actionType,
@@ -24,6 +47,7 @@ export class ThemeActionsUtils {
                     filesStructure
                 });
                 for (const fileGlob of filesGlobs) {
+                    const checksumMatchedFiles = micromatch(Object.keys(initialChecksums), [fileGlob]);
                     const files = await globs(fileGlob, {
                         suppressErrors: true,
                         onlyFiles: true,
@@ -35,13 +59,15 @@ export class ThemeActionsUtils {
                             ? fileGlob.slice(0, fileGlob.length - 2)
                             : fileGlob;
                     }
-                    for (const filePath of files) {
+                    const deletedFiles = difference(checksumMatchedFiles, files);
+                    for (const filePath of [...files, ...deletedFiles]) {
                         filesRecords.push({
                             actionData,
                             actionKey,
                             path: filePath,
                             fileName: basename(filePath),
-                            fileGlob: processedFileGlob
+                            fileGlob: processedFileGlob,
+                            state: await themeChecksums.getFileState(filePath)
                         });
                     }
                 }

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

@@ -8,9 +8,9 @@ import { FetchResources } from '../../../../class/fetch_resources/fetch_resource
 import { jsonIndentTransform } from '../../../../../utils/stream_transforms/json_indent_transform.js';
 import { JSON_FILE_INDENT } from '../../../../../cli/cli_constants.js';
 import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
-import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
 import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
 import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
+import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 export class ThemeFetchService {
     #themeHttpApi;
     #httpApi;
@@ -39,7 +39,7 @@ export class ThemeFetchService {
             await this.fetchResources(shopUrl, themeDir, resources);
         }
         try {
-            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
+            await ThemeFilesUtils.updateFilesStructure(themeDir);
         }
         catch (err) {
             throw new AppError({

package/build/theme/features/theme/init/service/theme_init_service.js

@@ -6,8 +6,8 @@ import { extractZip } from '../../../../../utils/zip/extract_zip_utils.js';
 import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
 import { ThemeInfoUtils } from '../../info/theme_info_utils.js';
 import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
-import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
 import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
+import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 export class ThemeInitService {
     #httpApi;
     constructor({ httpApi }) {
@@ -26,7 +26,7 @@ export class ThemeInitService {
             dist: themeDir
         });
         try {
-            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
+            await ThemeFilesUtils.updateFilesStructure(themeDir);
         }
         catch (err) {
             throw new AppError({

package/build/theme/features/theme/merge/service/theme_merge_service.js

@@ -2,9 +2,9 @@ import FSTree from 'fs-tree-diff';
 import { copyFileSync, getAllDirectoriesNamesInside } from '../../../../../utils/fs/fs_utils.js';
 import walkSync from 'walk-sync';
 import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
-import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
 import { join, platformSeparator } from '../../../../../utils/path_utils.js';
+import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 export class ThemeMergeService {
     async applyChanges(fromTheme, toTheme, changes) {
         FSTree.applyPatch(fromTheme, toTheme, changes, {
@@ -39,7 +39,7 @@ export class ThemeMergeService {
         });
     }
     async _getUserRootDirectories(themeDir) {
-        const filesStructure = await ThemeFilesStructureUtils.getThemeRootDirectories(themeDir);
+        const filesStructure = await ThemeFilesUtils.getThemeRootDirectories(themeDir);
         return (await getAllDirectoriesNamesInside(themeDir, {
             recursive: false,
             hidden: true

package/build/theme/features/theme/push/api/theme_push_api.js

@@ -7,7 +7,7 @@ export class ThemePushApi extends FeatureApi {
         super();
         this.#service = service;
     }
-    async push(props) {
-        return this.#service.push(props);
+    async partialPush(props) {
+        return this.#service.partialPush(props);
     }
 }

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

@@ -1,25 +1,27 @@
 import tmp from 'tmp-promise';
 import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
-import { join } from '../../../../../utils/path_utils.js';
+import { dirname, join } from '../../../../../utils/path_utils.js';
 import { v4 as uuid } from 'uuid';
 import { THEME_WILDCARD_ACTION_NAME } from '../../actions/service/theme_actions_service_constants.js';
-import { THEME_MODULE_SETTINGS_FILE_NAME } from '../theme_push_constants.js';
+import { THEME_FILES_LIST_FILE_NAME, THEME_MODULE_SETTINGS_FILE_NAME } from '../theme_push_constants.js';
 import { ThemePushErrorsFactory } from '../theme_push_errors_factory.js';
 import { ThemeImagesUtils } from '../../utils/theme_images_utils.js';
 import { ThemePublishUtils } from '../../skinstore/theme_publish_utils.js';
-import { removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
+import { fileExists, getAllDirectoriesNamesInside, readJSONFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
 import { MODULES_DIRECTORY_NAME } from '../../theme_constants.js';
 import { removeOldResources } from '../../../../class/fetch_resources/fetch_resources_utils.js';
-import { ThemeArchive } from '../../../../class/archive/theme_archive.js';
-import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
+import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 import { ThemeActionsUtils } from '../../actions/theme_actions_utils.js';
-import { ArrayUtils } from '@dreamcommerce/utilities';
+import { ThemeArchiveUtils } from '../../utils/archive/theme_archive_utils.js';
+import { FILE_STATES } from '../../../../../utils/fs/fs_constants.js';
+import uniq from 'lodash/uniq.js';
+import { FILES_LIST_CUSTOM_MODULES_TO_KEEP_IDS } from '../../utils/files/them_files_constants.js';
 export class ThemePushService {
     #themeFetchApi;
     constructor({ themeFetchApi }) {
         this.#themeFetchApi = themeFetchApi;
     }
-    async push({ pushAction, credentials, filesStructure, executionContext, themeChecksums, themeFilesUploadApi }) {
+    async partialPush({ action, filesStructure, executionContext, themeChecksums, themeFilesUploadApi, credentials }) {
         const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
         const themeRootDir = executionContext.themeRootDir;
         if (await themeChecksums.hasThemeFileBeenCreated(ThemePublishUtils.getSkinStoreSettingsFilePath(themeRootDir)))
@@ -28,30 +30,57 @@ export class ThemePushService {
             //TODO to do api?
             const filesRecords = await ThemeActionsUtils.getFilesRecordsFromActionData({
                 themeRootDir,
-                themeAction: pushAction,
-                filesStructure
+                themeAction: action,
+                filesStructure,
+                themeChecksums
             });
-            const filesToUpload = await ArrayUtils.asyncFilter(filesRecords, async ({ path }) => (await themeChecksums.hasThemeFileBeenCreated(path)) || (await themeChecksums.hasThemeFileBeenModified(path)));
+            const filesToUpload = filesRecords.filter(({ state }) => [FILE_STATES.modified, FILE_STATES.created].includes(state));
+            let localFileNameToUploaded;
             if (filesToUpload.length) {
-                const { localFileNameToUploaded } = await this._uploadThemeFiles({
+                const uploadData = await this._uploadThemeFiles({
                     filesToUpload,
                     credentials,
                     themeRootDir,
                     themeFilesUploadApi
                 });
-                await this._createFilesList(themeRootDir, filesRecords, localFileNameToUploaded);
-            }
-            else {
-                await this._createFilesList(themeRootDir, filesRecords);
+                if (!uploadData.isSuccess)
+                    throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl);
+                localFileNameToUploaded = uploadData.localFileNameToUploadedMap;
             }
             const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
-            await new ThemeArchive(themeRootDir).createFullArchive({
-                dist: themeArchivePath,
+            const filesInArchive = await ThemeActionsUtils.getFilesThatMatchesAction({
+                actionValue: THEME_WILDCARD_ACTION_NAME,
+                actionType: THEME_ACTIONS_TYPES.push,
+                filesStructure,
+                rootDir: themeRootDir
+            });
+            const groupedFiles = await themeChecksums.groupFilesByStatus(filesInArchive);
+            const deletedFiles = await ThemeActionsUtils.getDeletedFilesThatMatchesAction({
+                actionType: THEME_ACTIONS_TYPES.push,
                 actionValue: THEME_WILDCARD_ACTION_NAME,
-                actionType: THEME_ACTIONS_TYPES.push
+                themeChecksums,
+                filesStructure,
+                rootDir: themeRootDir
+            });
+            await this._createFilesList({
+                themeRootDir,
+                filesRecords,
+                localFileNameToUploaded,
+                deletedFiles,
+                allCustomModulesIds: await this._getAllModulesIds(themeRootDir)
+            });
+            await ThemeArchiveUtils.create({
+                dist: themeArchivePath,
+                rootDir: themeRootDir,
+                files: [
+                    ...(await this._appendSettingsIfModifiedFileFromFolderThatContainsOne(groupedFiles.modified)),
+                    ...groupedFiles.created,
+                    (await fileExists(ThemeFilesUtils.getFilesListFilePath(themeRootDir))) ? THEME_FILES_LIST_FILE_NAME : undefined
+                ].filter(Boolean)
             });
+            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
             const { resources, modules } = await themeFilesUploadApi.uploadArchive({
-                action: pushAction,
+                action,
                 themeArchivePath,
                 credentials
             });
@@ -61,10 +90,12 @@ export class ThemePushService {
                 await removeOldResources(themeRootDir, resources);
                 await this.#themeFetchApi.fetchResources(credentials.shopUrl, themeRootDir, resources);
             }
+            //TODO only changed files checksum
             await themeChecksums.updateAllChecksums();
         }
-        finally {
-            await ThemeFilesStructureUtils.removeAFilesListFile(themeRootDir);
+        catch (err) {
+            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
+            throw err;
         }
     }
     async _uploadThemeFiles({ filesToUpload, themeRootDir, credentials, themeFilesUploadApi }) {
@@ -72,9 +103,10 @@ export class ThemePushService {
             const { uploadedImageData, rejectedImageData } = await themeFilesUploadApi.uploadFiles(filesToUpload);
             if (uploadedImageData.length)
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
-            // if (rejectedImageData.length) await this._removeUploadedThemeFiles(rejectedImageData, themeRootDir);
             return {
-                localFileNameToUploaded: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
+                isSuccess: rejectedImageData.length === 0,
+                rejectedImageData,
+                localFileNameToUploadedMap: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
                     return {
                         ...acc,
                         [originalFilename]: uploadedFilename ?? originalFilename
@@ -86,15 +118,42 @@ export class ThemePushService {
             throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl, err);
         }
     }
-    async _removeUploadedThemeFiles(uploadedImageData, themeRootDir) {
-        await Promise.all(uploadedImageData.map(({ location, originalFilename }) => removeFile(join(themeRootDir, location, originalFilename))));
-    }
     async _updateDataForNewCreatedModules({ modules, themeRootDir }) {
         for (const [moduleDirectoryName, metaData] of Object.entries(modules)) {
             await writeJSONFile(join(themeRootDir, MODULES_DIRECTORY_NAME, moduleDirectoryName, THEME_MODULE_SETTINGS_FILE_NAME), JSON.parse(metaData[THEME_MODULE_SETTINGS_FILE_NAME]));
         }
     }
-    async _createFilesList(themeRootDir, filesRecords, localFileNameToUploaded = {}) {
-        await ThemeFilesStructureUtils.createAFilesListFile(themeRootDir, ThemeFilesStructureUtils.mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded));
+    async _createFilesList({ deletedFiles, localFileNameToUploaded, filesRecords, themeRootDir, allCustomModulesIds }) {
+        const filesListContent = ThemeFilesUtils.mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded);
+        if (deletedFiles?.length)
+            filesListContent.removed = deletedFiles;
+        if (allCustomModulesIds?.length)
+            filesListContent[FILES_LIST_CUSTOM_MODULES_TO_KEEP_IDS] = allCustomModulesIds;
+        await ThemeFilesUtils.createAFilesListFile(themeRootDir, filesListContent);
+    }
+    async _appendSettingsIfModifiedFileFromFolderThatContainsOne(modifiedFiles) {
+        const withSettingsFiles = [...modifiedFiles];
+        for (const filePath of modifiedFiles) {
+            if (await fileExists(join(dirname(filePath), 'settings.json'))) {
+                withSettingsFiles.push(join(dirname(filePath), 'settings.json'));
+            }
+        }
+        return uniq(withSettingsFiles);
+    }
+    async _getAllModulesIds(themeRootDir) {
+        const modulesPath = join(themeRootDir, MODULES_DIRECTORY_NAME);
+        if (!(await fileExists(modulesPath)))
+            return [];
+        const moduleDirs = await getAllDirectoriesNamesInside(modulesPath);
+        const modulesIds = [];
+        for (const moduleDir of moduleDirs) {
+            const moduleSettingsPath = join(themeRootDir, MODULES_DIRECTORY_NAME, moduleDir, THEME_MODULE_SETTINGS_FILE_NAME);
+            if (await fileExists(moduleSettingsPath)) {
+                const settingsContent = await readJSONFile(moduleSettingsPath);
+                if (settingsContent.id && Number.isInteger(settingsContent.id))
+                    modulesIds.push(settingsContent.id);
+            }
+        }
+        return modulesIds;
     }
 }

package/build/theme/features/theme/push/theme_push_utils.js

@@ -1,10 +1,10 @@
 import globs from 'fast-glob';
 import { AppError } from '../../../../cli/class/errors/app/app_error.js';
 import { toUnixPath } from '../../../../utils/path_utils.js';
-import { ThemeFilesStructureUtils } from '../utils/files_structure/theme_files_structure_utils.js';
+import { ThemeFilesUtils } from '../utils/files/theme_files_utils.js';
 export class ThemePushUtils {
     static async getAllFilesThatAreSendToRemote(themeDir) {
-        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDir);
+        const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDir);
         if (!filesStructure)
             throw new AppError({
                 message: `Files structure not found in theme directory: ${themeDir}`,

package/build/theme/features/theme/utils/archive/theme_archive_utils.js

@@ -0,0 +1,24 @@
+import { createZip } from '../../../../../utils/zip/create_zip_utils.js';
+import { extname, join } from '../../../../../utils/path_utils.js';
+import { formatJSONFile } from '../../../../../utils/fs/fs_utils.js';
+import { ThemeArchiveErrorsFactory } from './theme_archive_utils_errors_factory.js';
+export class ThemeArchiveUtils {
+    static async create({ dist, files, rootDir }) {
+        try {
+            await this._formatJsonFiles(rootDir, files);
+            return createZip({
+                files,
+                baseDir: rootDir,
+                dist
+            });
+        }
+        catch (err) {
+            throw ThemeArchiveErrorsFactory.createErrorWhileCreatingThemeArchive(err);
+        }
+    }
+    static 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 → features/theme/utils/archive/theme_archive_utils_errors_factory.js}

@@ -1,4 +1,4 @@
-import { AppError } from '../../../cli/class/errors/app/app_error.js';
+import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
 export class ThemeArchiveErrorsFactory {
     static createErrorWhileCreatingThemeArchive(error) {
         return new AppError({

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

@@ -0,0 +1 @@
+export const FILES_LIST_CUSTOM_MODULES_TO_KEEP_IDS = 'customModulesIdsToKeep';

package/build/theme/features/theme/utils/{files_structure/theme_files_structure_utils.js → files/theme_files_utils.js}

@@ -1,4 +1,4 @@
-import { readJSONFile, removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
+import { fileExists, isDirectory, readJSONFile, removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
 import { join, looksLikeDirectory, mapKeysPathsToWindowPlatform, toUnixPath } from '../../../../../utils/path_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_FILES_STRUCTURE_FILE_NAME, THEME_INITIAL_CHECKSUMS_FILE_NAME, THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME } from '../../theme_constants.js';
@@ -7,7 +7,8 @@ import { validateDirectory } from '../../../../utils/directory_validator/directo
 import path from 'node:path';
 import { THEME_FILES_LIST_FILE_NAME } from '../../push/theme_push_constants.js';
 import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
-export class ThemeFilesStructureUtils {
+import { FILE_STATES } from '../../../../../utils/fs/fs_constants.js';
+export class ThemeFilesUtils {
     static async getThemeFilesStructure(themeDirectory) {
         const filesStructure = await readJSONFile(join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME));
         if (!isWindowsOs())
@@ -19,7 +20,7 @@ export class ThemeFilesStructureUtils {
         await writeJSONFile(filePath, filesStructure);
     }
     static async getFilesPermissions(themeDirectory) {
-        const fileStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDirectory);
+        const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);
         return Object.entries(fileStructure).reduce((acc, [key, value]) => {
             return {
                 ...acc,
@@ -35,14 +36,25 @@ export class ThemeFilesStructureUtils {
         });
     }
     static async getThemeRootDirectories(themeDirectory) {
-        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDirectory);
+        const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);
         return Object.keys(filesStructure).filter((path) => {
             return looksLikeDirectory(path);
         });
     }
     static mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded = {}) {
-        const mappedFilesRecords = filesRecords.reduce((acc, { fileGlob, fileName }) => {
+        let areAllSkinstoreFilesUnchanged = true;
+        const filesList = filesRecords.reduce((acc, { fileGlob, fileName, state, actionKey }) => {
             const name = localFileNameToUploaded[fileName] ?? fileName;
+            if (state === FILE_STATES.deleted && actionKey === 'thumbnail') {
+                return {
+                    ...acc,
+                    [fileGlob]: null
+                };
+            }
+            if (actionKey === 'skinstore_files' && state !== FILE_STATES.unchanged)
+                areAllSkinstoreFilesUnchanged = false;
+            if (state === FILE_STATES.deleted || (state === FILE_STATES.unchanged && actionKey !== 'skinstore_files'))
+                return acc;
             if (looksLikeDirectory(fileGlob)) {
                 const existingFiles = acc[fileGlob] || [];
                 return {
@@ -57,32 +69,31 @@ export class ThemeFilesStructureUtils {
                 };
             }
         }, {});
-        /*
-         * Brzydki fix, poprawione w partial push na ładniej
-         */
-        if (!mappedFilesRecords['settings/thumbnail.jpg']) {
-            mappedFilesRecords['settings/thumbnail.jpg'] = null;
-        }
-        return mappedFilesRecords;
+        if (areAllSkinstoreFilesUnchanged)
+            delete filesList['skinstore/files'];
+        return filesList;
     }
     static async createAFilesListFile(themeRootDir, filesList) {
         if (!filesList || !Object.keys(filesList).length)
             return;
-        const toUnixStyleFilesList = Object.entries(filesList).reduce((acc, [filePath, value]) => {
+        const toUnixStyleFilesList = {};
+        for (const [filePath, value] of Object.entries(filesList)) {
             const unixPath = toUnixPath(filePath);
-            const finalPath = looksLikeDirectory(unixPath) ? `${unixPath}${path.posix.sep}` : unixPath;
-            return {
-                ...acc,
-                [finalPath]: value
-            };
-        }, {});
-        await writeJSONFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME), toUnixStyleFilesList);
+            const finalPath = (await fileExists(join(themeRootDir, filePath))) && (await isDirectory(join(themeRootDir, filePath)))
+                ? `${unixPath}${path.posix.sep}`
+                : unixPath;
+            toUnixStyleFilesList[finalPath] = value;
+        }
+        await writeJSONFile(this.getFilesListFilePath(themeRootDir), toUnixStyleFilesList);
+    }
+    static getFilesListFilePath(themeRootDir) {
+        return join(themeRootDir, THEME_FILES_LIST_FILE_NAME);
     }
     static async removeAFilesListFile(themeRootDir) {
-        await removeFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME));
+        await removeFile(this.getFilesListFilePath(themeRootDir));
     }
     static async updateFilesStructure(themeDir) {
-        const fileStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDir);
+        const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDir);
         const checksumsFiles = [
             `${SHOPER_THEME_METADATA_DIR}/${THEME_INITIAL_CHECKSUMS_FILE_NAME}`,
             `${SHOPER_THEME_METADATA_DIR}/${THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME}`,
@@ -115,6 +126,6 @@ export class ThemeFilesStructureUtils {
                 }
             };
         });
-        await ThemeFilesStructureUtils.writeThemeFilesStructure(themeDir, fileStructure);
+        await ThemeFilesUtils.writeThemeFilesStructure(themeDir, fileStructure);
     }
 }

package/build/theme/features/theme/verify/verify/theme_verify_service.js

@@ -3,12 +3,12 @@ import { ThemePublishUtils } from '../../skinstore/theme_publish_utils.js';
 import { ThemePushErrorsFactory } from '../../push/theme_push_errors_factory.js';
 import { join } from '../../../../../utils/path_utils.js';
 import { v4 as uuid } from 'uuid';
-import { ThemeArchive } from '../../../../class/archive/theme_archive.js';
+import { ThemeArchiveUtils } from '../../utils/archive/theme_archive_utils.js';
+import { ThemeActionsUtils } from '../../actions/theme_actions_utils.js';
+import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 import { THEME_WILDCARD_ACTION_NAME } from '../../actions/service/theme_actions_service_constants.js';
 import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
-import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
-import { ThemeActionsUtils } from '../../actions/theme_actions_utils.js';
-import { ArrayUtils } from '@dreamcommerce/utilities';
+import { FILE_STATES } from '../../../../../utils/fs/fs_constants.js';
 export class ThemeVerifyService {
     async verifyTheme({ verifyAction, executionContext, credentials, themeChecksums, filesStructure, themeFilesUploadApi }) {
         const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
@@ -20,9 +20,10 @@ export class ThemeVerifyService {
             const filesRecords = await ThemeActionsUtils.getFilesRecordsFromActionData({
                 themeRootDir,
                 themeAction: verifyAction,
-                filesStructure
+                filesStructure,
+                themeChecksums
             });
-            const filesToVerify = await ArrayUtils.asyncFilter(filesRecords, async ({ path }) => (await themeChecksums.hasThemeFileBeenModified(path)) || !(await themeChecksums.hasThemeFileBeenCreated(path)));
+            const filesToVerify = filesRecords.filter(({ state }) => [FILE_STATES.modified, FILE_STATES.created].includes(state));
             if (filesToVerify.length) {
                 const { rejectedImageData } = await themeFilesUploadApi.uploadFiles(filesToVerify);
                 if (rejectedImageData.length)
@@ -33,10 +34,15 @@ export class ThemeVerifyService {
             }
             await this._createFilesList(themeRootDir, filesToVerify);
             const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
-            await new ThemeArchive(themeRootDir).createFullArchive({
+            await ThemeArchiveUtils.create({
                 dist: themeArchivePath,
-                actionValue: THEME_WILDCARD_ACTION_NAME,
-                actionType: THEME_ACTIONS_TYPES.push
+                rootDir: themeRootDir,
+                files: await ThemeActionsUtils.getFilesThatMatchesAction({
+                    actionValue: THEME_WILDCARD_ACTION_NAME,
+                    actionType: THEME_ACTIONS_TYPES.push,
+                    filesStructure,
+                    rootDir: themeRootDir
+                })
             });
             const { isSuccess, messages } = await themeFilesUploadApi.uploadArchive({
                 action: verifyAction,
@@ -46,10 +52,10 @@ export class ThemeVerifyService {
             return { isSuccess, messages };
         }
         finally {
-            await ThemeFilesStructureUtils.removeAFilesListFile(themeRootDir);
+            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
         }
     }
     async _createFilesList(themeRootDir, filesRecords) {
-        await ThemeFilesStructureUtils.createAFilesListFile(themeRootDir, ThemeFilesStructureUtils.mapFilesRecordsToFilesList(filesRecords));
+        await ThemeFilesUtils.createAFilesListFile(themeRootDir, ThemeFilesUtils.mapFilesRecordsToFilesList(filesRecords));
     }
 }

package/build/utils/array_utils.js

@@ -4,3 +4,6 @@ export const asyncFilter = async (array, callback) => {
         return array.filter((_v, index) => results[index]);
     });
 };
+export const asyncMap = async (array, callback) => {
+    return Promise.all(array.map(callback));
+};

package/build/utils/fs/fs_constants.js

@@ -0,0 +1,6 @@
+export const FILE_STATES = {
+    created: 'created',
+    modified: 'modified',
+    deleted: 'deleted',
+    unchanged: 'unchanged'
+};

package/build/utils/fs/fs_utils.js

@@ -100,7 +100,7 @@ export const getAllFilesAndDirectoriesInside = async (path, options) => {
         withFileTypes
     });
 };
-export const getAllDirectoriesNamesInside = async (path, options) => {
+export const getAllDirectoriesNamesInside = async (path, options = { recursive: false, hidden: false }) => {
     const { recursive = true, hidden = true } = options;
     const files = await fsPromises.readdir(path, {
         recursive,

package/build/utils/stream_transforms/json_indent_transform.js

@@ -12,14 +12,9 @@ export const jsonIndentTransform = (space = JSON_FILE_INDENT) => {
             if (!data) {
                 return callback();
             }
-            // 1. Escape backslashes to preserve literal '\u' during parsing
-            const escapedJsonString = data.replace(/\\u/g, '\\\\u');
-            const json = JSON.parse(escapedJsonString);
-            // 2. Stringify the object, which will re-escape the backslashes (e.g., '\\u' -> '\\\\u')
+            const json = JSON.parse(data);
             const pretty = JSON.stringify(json, null, space);
-            // 3. Un-escape the double backslashes to get the desired literal '\u'
-            const finalString = pretty.replace(/\\\\u/g, '\\u');
-            this.push(finalString);
+            this.push(pretty);
             callback();
         }
     });

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.5.2-3",
+    "version": "0.5.2-5",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -39,31 +39,32 @@
         "@oclif/plugin-help": "6.2.27",
         "@oclif/plugin-version": "2.2.27",
         "@oclif/plugin-warn-if-update-available": "3.1.38",
-        "axios": "1.8.4",
+        "axios": "1.12.0",
         "chalk": "5.4.1",
         "conf": "13.1.0",
         "fast-glob": "3.3.3",
-        "figures": "6.1.0",
-        "fs-extra": "11.3.0",
         "fs-tree-diff": "2.0.1",
         "ink": "6.0.1",
-        "ink-link": "4.1.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",
-        "log-symbols": "7.0.1",
         "memfs": "4.17.0",
         "ora": "8.2.0",
         "react": "19.1.0",
         "reflect-metadata": "0.2.2",
         "rxjs": "7.8.2",
         "semver": "7.7.1",
-        "strip-ansi": "7.1.0",
         "tmp-promise": "3.0.3",
         "uuid": "11.1.0",
+        "fs-extra": "11.3.0",
+        "ink-link": "4.1.0",
+        "log-symbols": "7.0.1",
+        "figures": "6.1.0",
+        "strip-ansi": "7.1.0",
+        "inquirer-select-line": "1.1.3",
+        "micromatch": "4.0.8",
         "walk-sync": "3.0.0",
         "yauzl": "3.2.0",
         "yazl": "3.3.1"
@@ -77,14 +78,15 @@
         "@types/fs-extra": "11.0.4",
         "@types/jest": "29.5.14",
         "@types/jsonwebtoken": "9.0.9",
-        "@types/klaw": "3.0.7",
-        "@types/lodash": "4.17.17",
         "@types/node": "18.19.84",
         "@types/react": "19.1.8",
         "@types/semver": "7.7.0",
         "@types/tmp": "0.2.6",
         "@types/yauzl": "2.10.3",
         "@types/yazl": "2.4.6",
+        "@types/klaw": "3.0.7",
+        "@types/lodash": "4.17.17",
+        "@types/micromatch": "4.0.9",
         "@typescript-eslint/eslint-plugin": "8.29.1",
         "babel-jest": "29.7.0",
         "eslint": "9.24.0",

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

@@ -1,44 +0,0 @@
-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/features/theme/utils/files_structure/theme_file_structure_errors_factory.js

@@ -1,10 +0,0 @@
-import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
-export class ThemeFileStructureErrorsFactory {
-    static createNoFilesStructureError() {
-        return new AppError({
-            code: 'theme.file_structure.no_files_structure',
-            message: 'No files structure found for the theme.',
-            level: 'error'
-        });
-    }
-}