@shoper/cli 0.7.1-1 → 0.8.1-3

package/README.md

@@ -2,4 +2,14 @@
 
 # Shoper CLI
 
-Learn more in the [commands docs](https://storefront.developers.shoper.pl/cli/)
+Learn more in the [commands docs](https://storefront.developers.shoper.pl/cli/)
+
+## Features
+
+### .shoperignore
+
+Plik `.shoperignore` pozwala na wykluczenie określonych plików i katalogów z pakowania, uploadowania oraz weryfikacji checksum.
+
+Używa tej samej składni co `.gitignore`. Plik jest automatycznie tworzony podczas inicjalizacji lub pobierania motywu.
+
+Więcej informacji: [SHOPERIGNORE.md](docs/SHOPERIGNORE.md)

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

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

package/build/cli/core/cli_setup.js

@@ -29,7 +29,7 @@ export const cliSetup = async () => {
             LoggerInitializer,
             CliAuthTokensInitializer,
             CliAuthInitializer,
-            ...getInitializersBasedOnCommand()
+            ...getCommandBaseInitializers()
         ],
         options: {
             featuresTracking: false,
@@ -37,15 +37,15 @@ export const cliSetup = async () => {
         }
     });
 };
-const getInitializersBasedOnCommand = () => {
-    if (isCommandWithTopic(process.argv[2]))
-        return getInitializersBasedOnCommandWithTopic();
+const getCommandBaseInitializers = () => {
+    if (isCommandsTopic(process.argv[2]))
+        return getCommandWithTopicBaseInitializers();
     return [];
 };
-const isCommandWithTopic = (arg) => {
+const isCommandsTopic = (arg) => {
     return arg === THEME_TOPIC_NAME || arg === CLI_AUTH_TOPIC_NAME;
 };
-const getInitializersBasedOnCommandWithTopic = () => {
+const getCommandWithTopicBaseInitializers = () => {
     const topic = process.argv[2];
     const command = process.argv[3];
     switch (topic) {

package/build/cli/index.js

@@ -6,7 +6,6 @@ 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/logs/app_logs_constants.js

@@ -3,6 +3,5 @@ export const APP_LOGS_TYPES = {
     error: 'error',
     warn: 'warn',
     info: 'info',
-    debug: 'debug',
-    success: 'success'
+    debug: 'debug'
 };

package/build/index.js

@@ -31,7 +31,7 @@ process.on('uncaughtException', (err) => {
     const loggerApi = getApiSync(LOGGER_API_NAME);
     if (loggerApi)
         loggerApi.fatal('Uncaught Exception', { error: err });
-    // process.exit(1);
+    process.exit(1);
 });
 process.on('unhandledRejection', (reason) => {
     console.error('Unhandled Rejection:', reason);
@@ -42,7 +42,7 @@ process.on('unhandledRejection', (reason) => {
                 reason
             }
         });
-    // process.exit(1);
+    process.exit(1);
 });
 const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT'];
 signals.forEach((signal) => {

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

@@ -1 +1,47 @@
-export {};
+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';
+import { filterFiles } from '../../utils/shoperignore/shoperignore_utils.js';
+export class ThemeArchive {
+    #themeRootDir;
+    constructor(themeRootDir) {
+        this.#themeRootDir = themeRootDir;
+    }
+    async createFullArchive({ dist, actionValue, actionType, logger }) {
+        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
+            });
+            const filteredFiles = await filterFiles(filesInThemeDirectory, this.#themeRootDir);
+            await this._formatJsonFiles(this.#themeRootDir, filteredFiles);
+            await createZip({
+                baseDir: this.#themeRootDir,
+                dist,
+                files: filteredFiles,
+                logger
+            });
+        }
+        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/archive/theme_archive_utils_errors_factory.js → class/archive/theme_archive_errors_factory.js}

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

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

@@ -10,7 +10,6 @@ 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;
     #loggerApi;
@@ -34,6 +33,12 @@ 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;
@@ -67,22 +72,10 @@ export class ThemeChecksums {
         const initialChecksum = await this.getInitialChecksumFromPath(path);
         return !initialChecksum && (await fileExists(join(this.#themeDir, path)));
     }
-    async getFileState(path) {
-        const initialChecksum = await this.getInitialChecksumFromPath(path);
+    async hasThemeFileBeenModified(path) {
         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;
-        }
+        const initialChecksum = await this.getInitialChecksumFromPath(path);
+        return !!currentChecksum && !!initialChecksum && currentChecksum !== initialChecksum;
     }
     async verify() {
         const initialChecksumFilePath = this.#initialChecksumsFilePath;
@@ -94,8 +87,6 @@ export class ThemeChecksums {
     async updateAllChecksums() {
         this.#loggerApi?.debug('Updating all checksums.');
         const checksums = await this.computeThemeChecksums();
-        this.#initialChecksums = checksums;
-        this.#currentChecksums = checksums;
         return new Promise((resolve, reject) => {
             const currentChecksumFilePath = this.#currentChecksumsFilePath;
             const initialChecksumFilePath = this.#initialChecksumsFilePath;
@@ -123,7 +114,6 @@ export class ThemeChecksums {
     async updateCurrentChecksums() {
         this.#loggerApi?.debug('Updating current checksums.');
         const checksums = await this.computeThemeChecksums();
-        this.#currentChecksums = checksums;
         return new Promise((resolve, reject) => {
             const currentChecksumFilePath = this.#currentChecksumsFilePath;
             const checksumStream = createWriteStream(currentChecksumFilePath);
@@ -154,7 +144,8 @@ export class ThemeChecksums {
             join(SHOPER_THEME_METADATA_DIR, THEME_INITIAL_CHECKSUMS_FILE_NAME),
             join(SHOPER_THEME_METADATA_DIR, THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME)
         ];
-        const filesToComputeChecksums = (await ThemePushUtils.getAllFilesThatAreSendToRemote(this.#themeDir))
+        const allFiles = await ThemePushUtils.getAllFilesThatAreSendToRemote(this.#themeDir);
+        const filesToComputeChecksums = allFiles
             .filter((path) => !filesToIgnoreInChecksums.some((ignorePath) => normalize(path) === ignorePath))
             .map((relativePath) => join(this.#themeDir, relativePath));
         this.#loggerApi?.debug('Computing checksums from file structure.', { details: { count: filesToComputeChecksums.length } });
@@ -164,37 +155,6 @@ export class ThemeChecksums {
         this.#loggerApi?.debug('Finished computing theme checksums.', { details: { count: Object.keys(allChecksums).length } });
         return allChecksums;
     }
-    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,9 +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 { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 import { ThemeError } from '../ui/theme_error.js';
-import { MODULES_DIRECTORY_NAME } from '../../features/theme/theme_constants.js';
+import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 //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.';
@@ -161,9 +160,9 @@ export class ThemePullCommand extends BaseThemeCommand {
                 dist: tmpDir
             }
         });
-        const localModulesPath = join(executionContext.themeRootDir, MODULES_DIRECTORY_NAME);
+        const localModulesPath = join(executionContext.themeRootDir, 'modules');
         const fetchedThemePath = join(tmpDir, name);
-        const fetchedModulesPath = join(fetchedThemePath, MODULES_DIRECTORY_NAME);
+        const fetchedModulesPath = join(fetchedThemePath, 'modules');
         if ((await directoryExists(localModulesPath)) && (await directoryExists(fetchedModulesPath)))
             await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localModulesPath, fetchedModulesPath, fetchedThemePath, loggerApi);
         this.#spinner.stop();

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

@@ -4,6 +4,8 @@ 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';
@@ -12,7 +14,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 { ThemeFilesUtils } from '../../features/theme/utils/files/theme_files_utils.js';
+import { ThemeFilesStructureUtils } from '../../features/theme/utils/files_structure/theme_files_structure_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';
@@ -22,8 +24,6 @@ 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 { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.js';
 export class ThemePushCommand extends BaseThemeCommand {
@@ -68,7 +68,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 return;
             }
             const initialChecksums = await themeChecksums.getInitialChecksums();
-            const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
+            const permissions = await ThemeFilesStructureUtils.getFilesPermissions(executionContext.themeRootDir);
             const themeFilesUploadApi = new ThemeFilesUpload({
                 themeRootDir: executionContext.themeRootDir,
                 credentials,
@@ -80,7 +80,7 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemePushSkipInfo, null));
                 return;
             }
-            const validationResult = await ThemeFilesUtils.validateThemeDirectoryStructure({
+            const validationResult = await ThemeFilesStructureUtils.validateThemeDirectoryStructure({
                 //TDO przeniesc do theme checksums
                 checksums: mapChecksumToTree(initialChecksums),
                 permissions: mapToPermissionsTree(permissions),
@@ -92,25 +92,16 @@ export class ThemePushCommand extends BaseThemeCommand {
                 renderOnce(React.createElement(ThemeUnpermittedActionsError, { unpermittedActions: validationResult.unpermittedActions }));
                 return;
             }
-            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesStructureUtils.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();
-            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({
+            await themePushApi.push({
                 credentials,
                 filesStructure,
-                action: partialPushAction,
+                pushAction,
                 themeChecksums,
                 executionContext,
                 themeFilesUploadApi

package/build/theme/commands/theme_commands_constants.js

@@ -7,6 +7,5 @@ export const THEME_COMMANDS_NAME = {
     verify: `${THEME_TOPIC_NAME}:verify`,
     info: `${THEME_TOPIC_NAME}:info`,
     delete: `${THEME_TOPIC_NAME}:delete`,
-    publish: `${THEME_TOPIC_NAME}:publish`,
-    watch: `${THEME_TOPIC_NAME}:watch`
+    publish: `${THEME_TOPIC_NAME}:publish`
 };

package/build/theme/commands/theme_verify_command.js

@@ -1,6 +1,7 @@
 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';
@@ -17,7 +18,6 @@ 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';
 import { LOGGER_API_NAME } from '../../cli/utilities/features/logger/logger_constants.js';
 export class ThemeVerifyCommand extends BaseThemeCommand {
     static description = 'Verify theme files structure';
@@ -39,7 +39,7 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
             themeDir: executionContext.themeRootDir,
             loggerApi
         });
-        const permissions = await ThemeFilesUtils.getFilesPermissions(executionContext.themeRootDir);
+        const permissions = await ThemeFilesStructureUtils.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;
@@ -56,7 +56,7 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
                 themeId: executionContext.themeId,
                 credentials
             });
-            const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(executionContext.themeRootDir);
+            const filesStructure = await ThemeFilesStructureUtils.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

@@ -9,18 +9,18 @@ import React from 'react';
 import { ThemeWorkUrlMismatch } from './theme_work_url_mismatch.js';
 import { EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
 export const ThemeError = ({ err, executionContext }) => {
-    if (err?.tags?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && executionContext?.type === EXECUTION_CONTEXTS.theme) {
+    if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && executionContext?.type === EXECUTION_CONTEXTS.theme) {
         return (React.createElement(UnpermittedCommandError, { themeId: executionContext.themeId, commandName: "verify" }));
     }
-    if (err?.tags?.code === THEME_ARCHIVE_UPLOAD_ERROR) {
+    if (err?.code === THEME_ARCHIVE_UPLOAD_ERROR) {
         return React.createElement(ValidationErrors, { errors: err?.details });
     }
-    if (err?.tags?.code === THEME_WORK_URL_MISMATCH_ERROR) {
+    if (err?.code === THEME_WORK_URL_MISMATCH_ERROR) {
         return React.createElement(ThemeWorkUrlMismatch, { command: "verify" });
     }
-    if (err?.tags?.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 or file size is not too large.")));
+    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.")));
     }
     if (err?.message) {
         return React.createElement(ValidationErrors, { errors: err.message });

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

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

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

@@ -3,43 +3,24 @@ 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';
+import { filterFiles, loadShoperIgnore } from '../../../utils/shoperignore/shoperignore_utils.js';
 export class ThemeActionsUtils {
-    static getFilesGlobsThatMatchesAction({ filesStructure, actionValue, actionType }) {
+    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)];
+                const normalizedPath = this._normalizeFileGlob(toUnixPath(filePath));
+                return [...acc, normalizedPath];
             }
             return acc;
         }, []);
     }
-    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 }) {
+    static async getFilesRecordsFromActionData({ themeRootDir, themeAction, filesStructure }) {
         const filesRecords = [];
-        const initialChecksums = await themeChecksums.getInitialChecksums();
+        // Load the ignore instance once before the loops to avoid reading .shoperignore multiple times
+        const ignoreInstance = await loadShoperIgnore(themeRootDir);
         for (const [actionKey, actionData] of Object.entries(themeAction.data)) {
             if (actionData.type === THEME_ACTION_DATA_TYPE.file) {
-                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesAction({
+                const filesGlobs = ThemeActionsUtils.getFilesGlobsThatMatchesActionName({
                     //TODO remove when backend fixed
                     actionType: 'push',
                     // actionType: themeAction.actionType,
@@ -47,27 +28,25 @@ 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,
                         cwd: themeRootDir
                     });
+                    const filteredFiles = await filterFiles(files, themeRootDir, ignoreInstance);
                     let processedFileGlob = fileGlob;
                     if (looksLikeDirectory(fileGlob)) {
                         processedFileGlob = fileGlob.endsWith(THEME_PUSH_WILDCARD_GLOBS_FOR_FILES)
                             ? fileGlob.slice(0, fileGlob.length - 2)
                             : fileGlob;
                     }
-                    const deletedFiles = difference(checksumMatchedFiles, files);
-                    for (const filePath of [...files, ...deletedFiles]) {
+                    for (const filePath of filteredFiles) {
                         filesRecords.push({
                             actionData,
                             actionKey,
                             path: filePath,
                             fileName: basename(filePath),
-                            fileGlob: processedFileGlob,
-                            state: await themeChecksums.getFileState(filePath)
+                            fileGlob: processedFileGlob
                         });
                     }
                 }
@@ -75,35 +54,6 @@ export class ThemeActionsUtils {
         }
         return filesRecords;
     }
-    // static async getFilesRecordsFromFiles({
-    //     files,
-    //     themeRootDir,
-    //     themeAction,
-    //     filesStructure,
-    //     themeChecksums
-    // }: {
-    //     files: string[];
-    //     themeRootDir: string;
-    //     themeAction: TThemeAction;
-    //     filesStructure: TThemeFilesStructure;
-    //     themeChecksums: ThemeChecksums;
-    // }): Promise<TFileRecord[]> {
-    //     const fileRecords: TFileRecord[] = [];
-    //
-    //     for (const file of files) {
-    //         const state = await themeChecksums.getFileState(file);
-    //
-    //         if (state) {
-    //             fileRecords.push({
-    //                 path: file,
-    //                 state,
-    //                 action: themeAction
-    //             });
-    //         }
-    //     }
-    //
-    //     return fileRecords;
-    // }
     static _doesActionValueMatch(currentActionValue, valuesToMatch) {
         if (typeof valuesToMatch === 'string') {
             return currentActionValue === valuesToMatch || valuesToMatch === THEME_ALL_ACTIONS_NAME;
@@ -113,4 +63,10 @@ export class ThemeActionsUtils {
         }
         return false;
     }
+    static _normalizeFileGlob(fileGlob) {
+        if (fileGlob.endsWith('/')) {
+            return `${fileGlob}${THEME_PUSH_WILDCARD_GLOBS_FOR_FILES}`;
+        }
+        return fileGlob;
+    }
 }

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/utilities/features/logger/logs/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;
@@ -55,7 +55,7 @@ export class ThemeFetchService {
         }
         try {
             this.#loggerApi.debug('Updating theme files structure.');
-            await ThemeFilesUtils.updateFilesStructure(themeDir);
+            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
         }
         catch (error) {
             throw new AppError({
@@ -66,6 +66,8 @@ export class ThemeFetchService {
         }
         this.#loggerApi.debug('Creating .gitignore file.');
         await ThemeMetaDataUtils.createGitIgnoreFile(themeDir);
+        this.#loggerApi.debug('Creating .shoperignore file.');
+        await ThemeMetaDataUtils.createShoperIgnoreFile(themeDir);
         this.#loggerApi.debug('Updating metadata file.');
         await ThemeMetaDataUtils.updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
         this.#loggerApi.debug('Updating theme checksums');

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/utilities/features/logger/logs/app_error.js';
-import { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
 export class ThemeInitService {
     #httpApi;
     #loggerApi;
@@ -41,7 +41,7 @@ export class ThemeInitService {
         this.#loggerApi.info('Theme archive extracted.');
         try {
             this.#loggerApi.debug('Updating theme files structure.');
-            await ThemeFilesUtils.updateFilesStructure(themeDir);
+            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
         }
         catch (err) {
             throw new AppError({
@@ -52,6 +52,8 @@ export class ThemeInitService {
         }
         this.#loggerApi.debug('Creating .gitignore file.');
         await ThemeMetaDataUtils.createGitIgnoreFile(themeDir);
+        this.#loggerApi.debug('Creating .shoperignore file.');
+        await ThemeMetaDataUtils.createShoperIgnoreFile(themeDir);
         this.#loggerApi.debug('Updating metadata file.');
         await ThemeMetaDataUtils.updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
         this.#loggerApi.debug('Updating theme checksums.');