@shoper/cli 0.5.2-2 → 0.5.2-4

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/commands/push/theme_push_command.js

@@ -25,7 +25,6 @@ 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).';
@@ -112,12 +111,10 @@ export class ThemePushCommand extends BaseThemeCommand {
                 themeFilesUploadApi
             });
             spinner.stop();
-            await promptConfirmation('Confirm');
             renderOnce(React.createElement(ThemePushedSuccess, { themeName: await ThemeInfoUtils.getThemeName(executionContext.themeRootDir) }));
         }
         catch (err) {
             spinner?.stop();
-            await promptConfirmation('Confirm');
             renderOnce(React.createElement(ThemeError, { err: err, executionContext: executionContext }));
         }
     }

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

@@ -20,7 +20,7 @@ export const ThemeError = ({ err, executionContext }) => {
     }
     if (err?.code === THEME_FILES_UPLOAD_ERROR) {
         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.")));
+            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_utils.js

@@ -32,7 +32,7 @@ export class ThemeActionsUtils {
             actionValue,
             filesStructure
         });
-        return deletedFiles.filter((path) => micromatch.isMatch(path, globs));
+        return deletedFiles.filter((path) => !looksLikeDirectory(path) && micromatch.isMatch(path, globs));
     }
     static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure, themeChecksums }) {
         const filesRecords = [];

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

@@ -59,7 +59,8 @@ export class ThemePushService {
                 actionType: THEME_ACTIONS_TYPES.push,
                 actionValue: THEME_WILDCARD_ACTION_NAME,
                 themeChecksums,
-                filesStructure
+                filesStructure,
+                rootDir: themeRootDir
             });
             await this._createFilesList({
                 themeRootDir,

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

@@ -42,7 +42,8 @@ export class ThemeFilesUtils {
         });
     }
     static mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded = {}) {
-        return filesRecords.reduce((acc, { fileGlob, fileName, state, actionKey }) => {
+        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 {
@@ -50,7 +51,9 @@ export class ThemeFilesUtils {
                     [fileGlob]: null
                 };
             }
-            if (state === FILE_STATES.deleted)
+            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] || [];
@@ -66,6 +69,9 @@ export class ThemeFilesUtils {
                 };
             }
         }, {});
+        if (areAllSkinstoreFilesUnchanged)
+            delete filesList['skinstore/files'];
+        return filesList;
     }
     static async createAFilesListFile(themeRootDir, filesList) {
         if (!filesList || !Object.keys(filesList).length)

package/package.json

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