@shoper/cli 0.7.1-1 → 0.8.1-3

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 {
     #loggerApi;
     constructor({ loggerApi }) {
@@ -73,7 +73,7 @@ export class ThemeMergeService {
         return patch;
     }
     async _getUserRootDirectories(themeDir) {
-        const filesStructure = await ThemeFilesUtils.getThemeRootDirectories(themeDir);
+        const filesStructure = await ThemeFilesStructureUtils.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 partialPush(props) {
-        return this.#service.partialPush(props);
+    async push(props) {
+        return this.#service.push(props);
     }
 }

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

@@ -1,21 +1,19 @@
 import tmp from 'tmp-promise';
 import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
-import { dirname, join } from '../../../../../utils/path_utils.js';
+import { 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_FILES_LIST_FILE_NAME, THEME_MODULE_SETTINGS_FILE_NAME } from '../theme_push_constants.js';
+import { 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 { fileExists, getAllDirectoriesNamesInside, readJSONFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
+import { 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 { ThemeFilesUtils } from '../../utils/files/theme_files_utils.js';
+import { ThemeArchive } from '../../../../class/archive/theme_archive.js';
+import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
 import { ThemeActionsUtils } from '../../actions/theme_actions_utils.js';
-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';
+import { ArrayUtils } from '@dreamcommerce/utilities';
 export class ThemePushService {
     #themeFetchApi;
     #loggerApi;
@@ -23,7 +21,8 @@ export class ThemePushService {
         this.#themeFetchApi = themeFetchApi;
         this.#loggerApi = loggerApi;
     }
-    async partialPush({ action, filesStructure, executionContext, themeChecksums, themeFilesUploadApi, credentials }) {
+    async push({ pushAction, credentials, filesStructure, executionContext, themeChecksums, themeFilesUploadApi }) {
+        this.#loggerApi.info('Pushing theme changes.');
         const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
         this.#loggerApi.debug('Temporary directory created.', { details: { path: tmpDir } });
         const themeRootDir = executionContext.themeRootDir;
@@ -31,73 +30,48 @@ export class ThemePushService {
             throw ThemePushErrorsFactory.createErrorWhilePushingUnpublishedThemeWithSkinstoreData(credentials.shopUrl);
         try {
             this.#loggerApi.debug('Getting file records from action data.');
-            //TODO to do api?
             const filesRecords = await ThemeActionsUtils.getFilesRecordsFromActionData({
                 themeRootDir,
-                themeAction: action,
-                filesStructure,
-                themeChecksums
+                themeAction: pushAction,
+                filesStructure
             });
             this.#loggerApi.debug('Filtering for created or modified files to upload.');
-            const filesToUpload = filesRecords.filter(({ state }) => [FILE_STATES.modified, FILE_STATES.created].includes(state));
-            let localFileNameToUploaded;
+            const filesToUpload = await ArrayUtils.asyncFilter(filesRecords, async ({ path }) => (await themeChecksums.hasThemeFileBeenCreated(path)) || (await themeChecksums.hasThemeFileBeenModified(path)));
             this.#loggerApi.debug('Files to upload determined.', { details: { count: filesToUpload.length } });
             if (filesToUpload.length) {
                 this.#loggerApi.info(`Uploading ${filesToUpload.length} theme files.`);
-                const uploadData = await this._uploadThemeFiles({
+                const { localFileNameToUploaded } = await this._uploadThemeFiles({
                     filesToUpload,
                     credentials,
                     themeRootDir,
                     themeFilesUploadApi
                 });
-                if (!uploadData.isSuccess)
-                    throw ThemePushErrorsFactory.createErrorWhileUploadingThemeFiles(credentials.shopUrl);
                 this.#loggerApi.info('Theme files uploaded.');
-                localFileNameToUploaded = uploadData.localFileNameToUploadedMap;
+                await this._createFilesList(themeRootDir, filesRecords, localFileNameToUploaded);
+            }
+            else {
+                this.#loggerApi.info('No new or modified files to upload. Creating files list for archive.');
+                await this._createFilesList(themeRootDir, filesRecords);
             }
             const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
-            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,
-                themeChecksums,
-                filesStructure,
-                rootDir: themeRootDir
-            });
-            await this._createFilesList({
-                themeRootDir,
-                filesRecords,
-                localFileNameToUploaded,
-                deletedFiles,
-                //TODO catch error on settings failure
-                allCustomModulesIds: await this._getAllModulesIds(themeRootDir)
-            });
             this.#loggerApi.info('Creating theme archive.');
-            const filestToArchive = [
-                ...(await this._appendSettingsIfNeeded([...groupedFiles.modified, ...groupedFiles.created])),
-                (await fileExists(ThemeFilesUtils.getFilesListFilePath(themeRootDir))) ? THEME_FILES_LIST_FILE_NAME : undefined
-            ].filter(Boolean);
-            await ThemeArchiveUtils.create({
+            await new ThemeArchive(themeRootDir).createFullArchive({
                 dist: themeArchivePath,
-                rootDir: themeRootDir,
-                logger: this.#loggerApi,
-                files: filestToArchive
+                actionValue: THEME_WILDCARD_ACTION_NAME,
+                actionType: THEME_ACTIONS_TYPES.push,
+                logger: this.#loggerApi
             });
             this.#loggerApi.info('Theme archive created.');
-            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
             const { resources, modules } = await themeFilesUploadApi.uploadArchive({
-                action,
+                action: pushAction,
                 themeArchivePath,
                 credentials
             });
-            if (modules)
+            this.#loggerApi.info('Theme archive uploaded.');
+            if (modules) {
+                this.#loggerApi.debug('Updating data for new modules.');
                 await this._updateDataForNewCreatedModules({ modules, themeRootDir });
+            }
             if (resources) {
                 this.#loggerApi.debug('Removing old resources.');
                 await removeOldResources(themeRootDir, resources);
@@ -106,12 +80,12 @@ export class ThemePushService {
                 this.#loggerApi.info('New resources fetched.');
             }
             this.#loggerApi.debug('Updating theme checksums.');
-            //TODO only changed files checksum
             await themeChecksums.updateAllChecksums();
+            this.#loggerApi.info('Push completed successfully.');
         }
-        catch (err) {
-            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
-            throw err;
+        finally {
+            this.#loggerApi.debug('Cleaning up files list.');
+            await ThemeFilesStructureUtils.removeAFilesListFile(themeRootDir);
         }
     }
     async _uploadThemeFiles({ filesToUpload, themeRootDir, credentials, themeFilesUploadApi }) {
@@ -129,9 +103,7 @@ export class ThemePushService {
                 await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
             }
             return {
-                isSuccess: rejectedImageData.length === 0,
-                rejectedImageData,
-                localFileNameToUploadedMap: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
+                localFileNameToUploaded: uploadedImageData.reduce((acc, { originalFilename, uploadedFilename }) => {
                     return {
                         ...acc,
                         [originalFilename]: uploadedFilename ?? originalFilename
@@ -149,40 +121,8 @@ export class ThemePushService {
             await writeJSONFile(join(themeRootDir, MODULES_DIRECTORY_NAME, moduleDirectoryName, THEME_MODULE_SETTINGS_FILE_NAME), JSON.parse(metaData[THEME_MODULE_SETTINGS_FILE_NAME]));
         }
     }
-    async _createFilesList({ deletedFiles, localFileNameToUploaded, filesRecords, themeRootDir, allCustomModulesIds }) {
+    async _createFilesList(themeRootDir, filesRecords, localFileNameToUploaded = {}) {
         this.#loggerApi.debug('Creating filesList.json for the archive.');
-        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 _appendSettingsIfNeeded(files) {
-        const withSettingsFiles = [...files];
-        for (const filePath of files) {
-            const settingsFilePath = join(dirname(filePath), 'settings.json');
-            const settingsExist = await fileExists(settingsFilePath);
-            if (settingsExist && !!(await readJSONFile(settingsFilePath))?.id) {
-                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;
+        await ThemeFilesStructureUtils.createAFilesListFile(themeRootDir, ThemeFilesStructureUtils.mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded));
     }
 }

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

@@ -1,10 +1,12 @@
 import globs from 'fast-glob';
 import { AppError } from '../../../../cli/utilities/features/logger/logs/app_error.js';
 import { toUnixPath } from '../../../../utils/path_utils.js';
-import { ThemeFilesUtils } from '../utils/files/theme_files_utils.js';
+import { ThemeFilesStructureUtils } from '../utils/files_structure/theme_files_structure_utils.js';
+import { filterFiles } from '../../../utils/shoperignore/shoperignore_utils.js';
+import { THEME_PUSH_WILDCARD_GLOBS_FOR_FILES } from './service/theme_push_service_constants.js';
 export class ThemePushUtils {
     static async getAllFilesThatAreSendToRemote(themeDir) {
-        const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDir);
+        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDir);
         if (!filesStructure)
             throw new AppError({
                 message: `Files structure not found in theme directory: ${themeDir}`,
@@ -12,14 +14,22 @@ export class ThemePushUtils {
             });
         //need unix styles globs
         const filesToArchive = Object.keys(filesStructure)
-            .map((path) => toUnixPath(path))
+            .map((path) => ThemePushUtils._normalizeFileGlob(toUnixPath(path)))
             .filter((path) => path !== '*');
         //need unix styles globs
         filesToArchive.push('styles/src/**/*');
-        return await globs(filesToArchive, {
-            suppressErrors: true,
+        const allFiles = await globs(filesToArchive, {
             onlyFiles: true,
-            cwd: themeDir
-        }).then((files) => files.sort());
+            cwd: themeDir,
+            suppressErrors: true
+        });
+        const filteredFiles = await filterFiles(allFiles, themeDir);
+        return filteredFiles.sort();
+    }
+    static _normalizeFileGlob(fileGlob) {
+        if (fileGlob.endsWith('/')) {
+            return `${fileGlob}${THEME_PUSH_WILDCARD_GLOBS_FOR_FILES}`;
+        }
+        return fileGlob;
     }
 }

package/build/theme/features/theme/utils/files_structure/theme_file_structure_errors_factory.js

@@ -1 +1,9 @@
-export {};
+import { AppError } from '../../../../../cli/utilities/features/logger/logs/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.'
+        });
+    }
+}

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

@@ -1,4 +1,4 @@
-import { fileExists, isDirectory, readJSONFile, removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
+import { 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,8 +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';
-import { FILE_STATES } from '../../../../../utils/fs/fs_constants.js';
-export class ThemeFilesUtils {
+import { loadShoperIgnore } from '../../../../utils/shoperignore/shoperignore_utils.js';
+export class ThemeFilesStructureUtils {
     static async getThemeFilesStructure(themeDirectory) {
         const filesStructure = await readJSONFile(join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME));
         if (!isWindowsOs())
@@ -20,7 +20,7 @@ export class ThemeFilesUtils {
         await writeJSONFile(filePath, filesStructure);
     }
     static async getFilesPermissions(themeDirectory) {
-        const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);
+        const fileStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDirectory);
         return Object.entries(fileStructure).reduce((acc, [key, value]) => {
             return {
                 ...acc,
@@ -29,32 +29,23 @@ export class ThemeFilesUtils {
         }, {});
     }
     static async validateThemeDirectoryStructure({ checksums, permissions, rootDirectory }) {
+        const ignoreInstance = await loadShoperIgnore(rootDirectory);
         return await validateDirectory({
             permissions,
             checksums,
-            rootDirectory
+            rootDirectory,
+            ignoreInstance
         });
     }
     static async getThemeRootDirectories(themeDirectory) {
-        const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDirectory);
+        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDirectory);
         return Object.keys(filesStructure).filter((path) => {
             return looksLikeDirectory(path);
         });
     }
     static mapFilesRecordsToFilesList(filesRecords, localFileNameToUploaded = {}) {
-        let areAllSkinstoreFilesUnchanged = true;
-        const filesList = filesRecords.reduce((acc, { fileGlob, fileName, state, actionKey }) => {
+        const mappedFilesRecords = filesRecords.reduce((acc, { fileGlob, fileName }) => {
             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 {
@@ -69,31 +60,32 @@ export class ThemeFilesUtils {
                 };
             }
         }, {});
-        if (areAllSkinstoreFilesUnchanged)
-            delete filesList['skinstore/files'];
-        return filesList;
+        /*
+         * Brzydki fix, poprawione w partial push na ładniej
+         */
+        if (!mappedFilesRecords['settings/thumbnail.jpg']) {
+            mappedFilesRecords['settings/thumbnail.jpg'] = null;
+        }
+        return mappedFilesRecords;
     }
     static async createAFilesListFile(themeRootDir, filesList) {
         if (!filesList || !Object.keys(filesList).length)
             return;
-        const toUnixStyleFilesList = {};
-        for (const [filePath, value] of Object.entries(filesList)) {
+        const toUnixStyleFilesList = Object.entries(filesList).reduce((acc, [filePath, value]) => {
             const unixPath = toUnixPath(filePath);
-            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);
+            const finalPath = looksLikeDirectory(unixPath) ? `${unixPath}${path.posix.sep}` : unixPath;
+            return {
+                ...acc,
+                [finalPath]: value
+            };
+        }, {});
+        await writeJSONFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME), toUnixStyleFilesList);
     }
     static async removeAFilesListFile(themeRootDir) {
-        await removeFile(this.getFilesListFilePath(themeRootDir));
+        await removeFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME));
     }
     static async updateFilesStructure(themeDir) {
-        const fileStructure = await ThemeFilesUtils.getThemeFilesStructure(themeDir);
+        const fileStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDir);
         const checksumsFiles = [
             `${SHOPER_THEME_METADATA_DIR}/${THEME_INITIAL_CHECKSUMS_FILE_NAME}`,
             `${SHOPER_THEME_METADATA_DIR}/${THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME}`,
@@ -117,7 +109,7 @@ export class ThemeFilesUtils {
             },
             _links: { [THEME_ACTIONS_TYPES.push]: '*' }
         };
-        ['.gitignore'].forEach((fileName) => {
+        ['.gitignore', '.shoperignore'].forEach((fileName) => {
             fileStructure[fileName] = {
                 permissions: {
                     canAdd: true,
@@ -126,6 +118,6 @@ export class ThemeFilesUtils {
                 }
             };
         });
-        await ThemeFilesUtils.writeThemeFilesStructure(themeDir, fileStructure);
+        await ThemeFilesStructureUtils.writeThemeFilesStructure(themeDir, fileStructure);
     }
 }

package/build/theme/features/theme/utils/meta_data/theme_meta_data_utils.js

@@ -58,4 +58,32 @@ export class ThemeMetaDataUtils {
             });
         });
     }
+    static async createShoperIgnoreFile(themeDir) {
+        return new Promise((resolve, reject) => {
+            const shoperIgnoreContent = `# .shoperignore
+# Pliki i katalogi wymienione tutaj będą wykluczane z:
+# - pakowania do archiwum podczas publikacji
+# - uploadowania na serwer
+# - weryfikacji checksum
+
+# Przykłady:
+# node_modules/
+# .env
+# .env.*
+# *.log
+# temp/
+# .vscode/
+# .idea/
+`;
+            const writeStream = createWriteStream(join(themeDir, '.shoperignore'));
+            writeStream.write(shoperIgnoreContent);
+            writeStream.end();
+            writeStream.on('error', (err) => {
+                reject(err);
+            });
+            writeStream.on('finish', () => {
+                resolve();
+            });
+        });
+    }
 }

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 { 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 { ThemeArchive } from '../../../../class/archive/theme_archive.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 { FILE_STATES } from '../../../../../utils/fs/fs_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';
 export class ThemeVerifyService {
     #loggerApi;
     constructor({ loggerApi }) {
@@ -23,15 +23,13 @@ export class ThemeVerifyService {
             throw ThemePushErrorsFactory.createErrorWhilePushingUnpublishedThemeWithSkinstoreData(credentials.shopUrl);
         try {
             this.#loggerApi.debug('Getting file records from action data.');
-            //TODO to do api?
             const filesRecords = await ThemeActionsUtils.getFilesRecordsFromActionData({
                 themeRootDir,
                 themeAction: verifyAction,
-                filesStructure,
-                themeChecksums
+                filesStructure
             });
             this.#loggerApi.debug('Filtering for modified or not created files to verify.');
-            const filesToVerify = filesRecords.filter(({ state }) => [FILE_STATES.modified, FILE_STATES.created].includes(state));
+            const filesToVerify = await ArrayUtils.asyncFilter(filesRecords, async ({ path }) => (await themeChecksums.hasThemeFileBeenModified(path)) || !(await themeChecksums.hasThemeFileBeenCreated(path)));
             this.#loggerApi.debug('Files to verify determined.', { details: { count: filesToVerify.length } });
             if (filesToVerify.length) {
                 this.#loggerApi.info(`Verifying ${filesToVerify.length} theme files.`);
@@ -48,16 +46,11 @@ export class ThemeVerifyService {
             await this._createFilesList(themeRootDir, filesToVerify);
             const themeArchivePath = join(tmpDir, `${uuid()}.zip`);
             this.#loggerApi.info('Creating theme archive for verification.');
-            await ThemeArchiveUtils.create({
+            await new ThemeArchive(themeRootDir).createFullArchive({
                 dist: themeArchivePath,
-                rootDir: themeRootDir,
-                logger: this.#loggerApi,
-                files: await ThemeActionsUtils.getFilesThatMatchesAction({
-                    actionValue: THEME_WILDCARD_ACTION_NAME,
-                    actionType: THEME_ACTIONS_TYPES.push,
-                    filesStructure,
-                    rootDir: themeRootDir
-                })
+                actionValue: THEME_WILDCARD_ACTION_NAME,
+                actionType: THEME_ACTIONS_TYPES.push,
+                logger: this.#loggerApi
             });
             this.#loggerApi.info('Theme archive created.');
             const { isSuccess, messages } = await themeFilesUploadApi.uploadArchive({
@@ -70,11 +63,11 @@ export class ThemeVerifyService {
         }
         finally {
             this.#loggerApi.debug('Cleaning up files list.');
-            await ThemeFilesUtils.removeAFilesListFile(themeRootDir);
+            await ThemeFilesStructureUtils.removeAFilesListFile(themeRootDir);
         }
     }
     async _createFilesList(themeRootDir, filesRecords) {
         this.#loggerApi.debug('Creating filesList.json for the archive.');
-        await ThemeFilesUtils.createAFilesListFile(themeRootDir, ThemeFilesUtils.mapFilesRecordsToFilesList(filesRecords));
+        await ThemeFilesStructureUtils.createAFilesListFile(themeRootDir, ThemeFilesStructureUtils.mapFilesRecordsToFilesList(filesRecords));
     }
 }

package/build/theme/index.js

@@ -15,8 +15,6 @@ import { ThemePushInitializer } from './features/theme/push/theme_push_initializ
 import { ThemeVerifyInitializer } from './features/theme/verify/theme_verify_initializer.js';
 import { ThemeDeleteInitializer } from './features/theme/delete/theme_delete_initalizer.js';
 import { ThemeActionsInitializer } from './features/theme/actions/theme_actions_initializer.js';
-import { ThemeWatchCommand } from './commands/watch/theme_watch_command.js';
-import { ThemeWatchInitializer } from './features/theme/watch/theme_watch_initializer.js';
 export const COMMANDS = {
     [THEME_COMMANDS_NAME.list]: ThemeListCommand,
     [THEME_COMMANDS_NAME.pull]: ThemePullCommand,
@@ -25,16 +23,14 @@ export const COMMANDS = {
     [THEME_COMMANDS_NAME.verify]: ThemeVerifyCommand,
     [THEME_COMMANDS_NAME.info]: ThemeInfoCommand,
     [THEME_COMMANDS_NAME.delete]: ThemeDeleteCommand,
-    [THEME_COMMANDS_NAME.publish]: ThemePublishCommand,
-    [THEME_COMMANDS_NAME.watch]: ThemeWatchCommand
+    [THEME_COMMANDS_NAME.publish]: ThemePublishCommand
 };
 export const COMMAND_TO_FEATURES_MAP = {
     [THEME_COMMANDS_NAME.pull]: [ThemeMergeInitializer, ThemeFetchInitializer],
     [THEME_COMMANDS_NAME.init]: ThemeInitInitializer,
     [THEME_COMMANDS_NAME.push]: [ThemeFetchInitializer, ThemePushInitializer],
     [THEME_COMMANDS_NAME.verify]: ThemeVerifyInitializer,
-    [THEME_COMMANDS_NAME.delete]: ThemeDeleteInitializer,
-    [THEME_COMMANDS_NAME.watch]: [ThemeFetchInitializer, ThemePushInitializer, ThemeWatchInitializer]
+    [THEME_COMMANDS_NAME.delete]: ThemeDeleteInitializer
 };
 export const getThemeInitializersForCommand = (commandName) => {
     if (!commandName)

package/build/theme/utils/directory_validator/directory_validator_utils.js

@@ -5,7 +5,7 @@ import { computeFileChecksum } from '../../../utils/checksums/checksums_utils.js
 import { DEFAULT_PERMISSION_FOR_ALL_FILES_KEY, DEFAULT_PERMISSION_FOR_DIRECTORY_KEY, FILES_MODIFICATION_TYPES, PERMISSION_KEY } from './directory_validator_constants.js';
 import { CHECKSUM_KEY } from '../../../utils/checksums/checksums_utils_constants.js';
 import _ from 'lodash';
-export const validateDirectory = async ({ rootDirectory, permissions, checksums }) => {
+export const validateDirectory = async ({ rootDirectory, permissions, checksums, ignoreInstance }) => {
     const unpermittedActions = [];
     await _checkPermissions({
         permissions,
@@ -14,14 +14,15 @@ export const validateDirectory = async ({ rootDirectory, permissions, checksums
         parts: [],
         checksumsPart: checksums,
         rootDirectory,
-        unpermittedActions
+        unpermittedActions,
+        ignoreInstance
     });
     return {
         isValid: !unpermittedActions.length,
         unpermittedActions
     };
 };
-const _checkPermissions = async ({ permissionPart, permissionParts, parts = [], checksumsPart, rootDirectory, unpermittedActions, permissions }) => {
+const _checkPermissions = async ({ permissionPart, permissionParts, parts = [], checksumsPart, rootDirectory, unpermittedActions, permissions, ignoreInstance }) => {
     if (!permissionPart)
         return;
     //TODO required files in a custom module directory
@@ -40,6 +41,11 @@ const _checkPermissions = async ({ permissionPart, permissionParts, parts = [],
         filesInsideCurrentDirectoryObject[path] = true;
     });
     for (const file of files) {
+        const relativePath = join(parentPath, file);
+        // Skip files that are in .shoperignore
+        if (ignoreInstance && ignoreInstance.ignores(relativePath)) {
+            continue;
+        }
         const { permission, permissionKey } = _getPermission({
             path: file,
             fullPath: join(fullPath, file),
@@ -65,7 +71,8 @@ const _checkPermissions = async ({ permissionPart, permissionParts, parts = [],
                 checksumsPart: checksumsPart?.[file] ?? {},
                 rootDirectory,
                 unpermittedActions,
-                permissions
+                permissions,
+                ignoreInstance
             });
         }
     }

package/build/theme/utils/shoperignore/shoperignore_utils.js

@@ -0,0 +1,36 @@
+import { readFile } from 'node:fs/promises';
+import { join } from '../../../utils/path_utils.js';
+import { fileExists } from '../../../utils/fs/fs_utils.js';
+import ignore from 'ignore';
+export const SHOPER_IGNORE_FILE_NAME = '.shoperignore';
+export async function loadShoperIgnore(themeRootDir) {
+    const shoperIgnorePath = join(themeRootDir, SHOPER_IGNORE_FILE_NAME);
+    if (!(await fileExists(shoperIgnorePath))) {
+        return null;
+    }
+    try {
+        const content = await readFile(shoperIgnorePath, 'utf-8');
+        const ig = ignore();
+        ig.add('.shoperignore');
+        ig.add('.gitignore');
+        ig.add(content);
+        return ig;
+    }
+    catch {
+        return null;
+    }
+}
+export async function filterFiles(files, themeRootDir, ignoreInstance) {
+    const ig = ignoreInstance !== undefined ? ignoreInstance : await loadShoperIgnore(themeRootDir);
+    if (!ig) {
+        return files;
+    }
+    return files.filter((file) => !ig.ignores(file));
+}
+export async function isIgnored(filePath, themeRootDir, ignoreInstance) {
+    const ig = ignoreInstance !== undefined ? ignoreInstance : await loadShoperIgnore(themeRootDir);
+    if (!ig) {
+        return false;
+    }
+    return ig.ignores(filePath);
+}