@shoper/cli 0.1.0-8 → 0.2.0

package/build/theme/commands/push/ui/theme_push_skip_into.js

@@ -0,0 +1,7 @@
+import React from 'react';
+import { Info } from '../../../../ui/message_box/info.js';
+import { Text } from '../../../../ui/text.js';
+export const ThemePushSkipInfo = () => {
+    return (React.createElement(Info, null,
+        React.createElement(Text, null, "Nothing to push, skipped.")));
+};

package/build/theme/commands/push/ui/theme_pushed_success.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import { Success } from '../../../../ui/message_box/success.js';
+export const ThemePushedSuccess = ({ themeName }) => {
+    return React.createElement(Success, { header: `Success: Theme "${themeName}" was pushed` });
+};

package/build/theme/commands/push/ui/theme_unpermitted_actions_error.js

@@ -0,0 +1,12 @@
+import { List } from '../../../../ui/list/list.js';
+import { Error } from '../../../../ui/message_box/error.js';
+import { Text } from '../../../../ui/text.js';
+import React from 'react';
+export const ThemeUnpermittedActionsError = ({ unpermittedActions }) => {
+    const items = unpermittedActions.map((action) => ({
+        content: `${action.type} - ${action.relativePath}`
+    }));
+    return (React.createElement(Error, { header: "Theme validation error" },
+        React.createElement(Text, null, "Theme file structure is not valid. The following actions are not permitted:"),
+        React.createElement(List, { items: items })));
+};

package/build/theme/commands/theme_commands_constants.js

@@ -4,5 +4,8 @@ export const THEME_COMMANDS_NAME = {
     init: 'theme:init',
     push: 'theme:push',
     showChanges: 'theme:show-changes',
-    verify: 'theme:verify'
+    verify: 'theme:verify',
+    info: 'theme:info',
+    delete: 'theme:delete',
+    publish: 'theme:publish'
 };

package/build/theme/commands/theme_show_changes_command.js

@@ -9,6 +9,7 @@ import { join } from '../../utils/path_utils.js';
 import ora from 'ora';
 export class ThemeShowChangesCommand extends BaseThemeCommand {
     static description = 'Show local theme changes';
+    static hidden = true;
     async run() {
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const credentials = cliAuthApi.getCredentials();

package/build/theme/commands/theme_verify_command.js

@@ -1,12 +1,13 @@
 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 { ThemeDirectoryUtils } from '../features/theme/directory/theme_directory_utils.js';
 import { mapToPermissionsTree } from '../utils/directory_validator/directory_validator_utils.js';
 import { mapChecksumToTree } from '../../utils/checksums/checksums_utils.js';
-import { ThemeChecksumsUtils } from '../features/theme/utils/checksums/theme_checksums_utils.js';
+import { ThemeFilesStructureUtils } from '../features/theme/utils/files_structure/theme_files_structure_utils.js';
+import { ThemeChecksums } from '../class/checksums/theme_checksums.js';
 export class ThemeVerifyCommand extends BaseThemeCommand {
     static description = 'Verify theme files structure';
+    static hidden = true;
     async run() {
         const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
         const credentials = cliAuthApi.getCredentials();
@@ -16,13 +17,13 @@ export class ThemeVerifyCommand extends BaseThemeCommand {
         const executionContext = await executionContextApi.getExecutionContext();
         if (executionContext.type !== EXECUTION_CONTEXTS.theme)
             this.error('You cannot run this command outside theme context.');
-        const checksums = await ThemeChecksumsUtils.getThemeInitialChecksums(executionContext.themeRootDir);
-        const permissions = await ThemeDirectoryUtils.getFilesPermissions(executionContext.themeRootDir);
-        if (!checksums || !permissions)
+        const themeChecksums = new ThemeChecksums(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.');
         try {
-            const validationResult = await ThemeDirectoryUtils.validateThemeDirectoryStructure({
-                checksums: mapChecksumToTree(checksums),
+            const validationResult = await ThemeFilesStructureUtils.validateThemeDirectoryStructure({
+                checksums: mapChecksumToTree(await themeChecksums.getInitialChecksums()),
                 permissions: mapToPermissionsTree(permissions),
                 rootDirectory: executionContext.themeRootDir
             });

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

@@ -0,0 +1,11 @@
+import { Error } from '../../../ui/message_box/error.js';
+import { Tip } from '../../../ui/tip.js';
+import { Command } from '../../../ui/command.js';
+import React from 'react';
+export const InvalidThemeIdError = ({ themeId }) => {
+    return (React.createElement(Error, { header: `Error: Invalid theme ID: ${themeId}` },
+        React.createElement(Tip, null,
+            "Run ",
+            React.createElement(Command, null, "shoper theme list"),
+            " to see available theme IDs.")));
+};

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

@@ -0,0 +1,15 @@
+import React from 'react';
+import { Error } from '../../../ui/message_box/error.js';
+import { Text } from '../../../ui/text.js';
+import { List } from '../../../ui/list/list.js';
+import { Command } from '../../../ui/command.js';
+export const MissingThemeFiles = ({ files }) => {
+    return (React.createElement(Error, { header: `Error: Detected local changes in: ${Array.isArray(files) ? '' : files}` },
+        Array.isArray(files) ? (React.createElement(List, { items: files.map((file) => ({
+                content: file
+            })) })) : null,
+        React.createElement(Text, null,
+            "This file is managed by the system and should not be modified locally. Please revert it to its original version manually or run",
+            React.createElement(Command, null, "shoper theme pull"),
+            " to download the correct version from the server.")));
+};

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import { Error } from '../../../ui/message_box/error.js';
+import { Box } from '../../../ui/box.js';
+import { Tip } from '../../../ui/tip.js';
+import { Command } from '../../../ui/command.js';
+export const MissingThemeIdError = ({ children }) => {
+    return (React.createElement(Error, { header: "Error: Missing theme ID." },
+        React.createElement(Box, null, children),
+        React.createElement(Tip, null,
+            "Run ",
+            React.createElement(Command, null, "shoper theme list"),
+            " to see available themes and their IDs.")));
+};

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

@@ -0,0 +1,7 @@
+import { Error } from '../../../ui/message_box/error.js';
+import { Text } from '../../../ui/text.js';
+import React from 'react';
+export const OutsideOfThemeDirectoryContextError = () => {
+    return (React.createElement(Error, null,
+        React.createElement(Text, null, "Error: Cannot run this command outside of a theme directory. Please run it inside a theme directory.")));
+};

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import { Error } from '../../../ui/message_box/error.js';
+import { Text } from '../../../ui/text.js';
+export const ThemeDirectoryContextError = () => {
+    return (React.createElement(Error, null,
+        React.createElement(Text, null, "Error: Cannot run this command inside a theme directory. Please run it outside of a theme directory.")));
+};

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Error } from '../../../ui/message_box/error.js';
+import { Command } from '../../../ui/command.js';
+import { Tip } from '../../../ui/tip.js';
+import { Text } from '../../../ui/text.js';
+export const ThemeWorkUrlMismatch = ({ command }) => {
+    return (React.createElement(Error, { header: `Error: This theme belongs to a different store.` },
+        React.createElement(Text, null,
+            "Switch to the correct token to ",
+            command,
+            " this theme."),
+        React.createElement(Tip, null,
+            React.createElement(Text, null,
+                "Run ",
+                React.createElement(Command, null, "shoper theme auth token switch"),
+                " to change your token"))));
+};

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

@@ -0,0 +1,18 @@
+import { Text } from '../../../ui/text.js';
+import { Tip } from '../../../ui/tip.js';
+import { Command } from '../../../ui/command.js';
+import { Error } from '../../../ui/message_box/error.js';
+import React from 'react';
+export const UnpermittedCommandError = ({ commandName, themeId }) => {
+    return (React.createElement(Error, null,
+        React.createElement(Text, null,
+            "You cannot ",
+            commandName,
+            " theme with id ",
+            themeId,
+            ". Please check if the theme exists or if you have the necessary permissions."),
+        React.createElement(Tip, null,
+            "Run ",
+            React.createElement(Command, null, "shoper auth list-tokens"),
+            " to see available token index values.")));
+};

package/build/theme/features/theme/actions/api/theme_actions_api.js

@@ -16,4 +16,7 @@ export class ThemeActionsApi extends FeatureApi {
     clearThemesActions(props) {
         return this.#service.clearThemesActions(props);
     }
+    removeThemeActions(props) {
+        return this.#service.removeThemeActions(props);
+    }
 }

package/build/theme/features/theme/actions/service/theme_actions_service.js

@@ -1,7 +1,8 @@
 import { STORE_THEMES_ACTIONS_TTL } from './theme_actions_service_constants.js';
-import { AppError } from '../../../../../cli/class/errors/app_error/app_error.js';
+import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
 import { getNMinutesFromNow } from '../../../../../utils/date_utils.js';
 import { computeChecksum } from '../../../../../utils/checksums/checksums_utils.js';
+import { THEME_ACTION_NOT_FOUND_ERROR_CODE, THEME_ACTION_NOTS_FOUND_ERROR_CODE } from '../theme_actions_constants.js';
 export class ThemeActionsService {
     #themesListApi;
     #themesActionsStore;
@@ -13,17 +14,28 @@ export class ThemeActionsService {
         const storeActions = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
         if (!storeActions)
             throw new AppError({
-                code: 'theme_actions_not_found',
+                code: THEME_ACTION_NOTS_FOUND_ERROR_CODE,
                 message: `Theme actions for store ${credentials.shopUrl} not found.`
             });
         const actions = storeActions.actions[themeId];
         if (!actions)
             throw new AppError({
-                code: 'theme_action_not_found',
+                code: THEME_ACTION_NOT_FOUND_ERROR_CODE,
                 message: `Theme action for theme ${themeId} not found.`
             });
         return actions[actionType];
     }
+    removeThemeActions({ themeId, credentials }) {
+        const storeActions = this.#themesActionsStore.get(this._getKey(credentials.shopUrl));
+        if (!storeActions || !storeActions.actions[themeId]) {
+            throw new AppError({
+                code: THEME_ACTION_NOTS_FOUND_ERROR_CODE,
+                message: `Theme actions for store ${credentials.shopUrl} not found.`
+            });
+        }
+        delete storeActions.actions[themeId];
+        this.#themesActionsStore.set(this._getKey(credentials.shopUrl), storeActions);
+    }
     async ensureThemesActions({ credentials, themeId }) {
         if (!themeId)
             return;

package/build/theme/features/theme/actions/service/theme_actions_service_constants.js

@@ -1,2 +1,3 @@
 export const STORE_THEMES_ACTIONS_TTL = 10;
 export const THEME_WILDCARD_ACTION_NAME = '*';
+export const THEME_ALL_ACTIONS_NAME = 'all';

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

@@ -6,10 +6,12 @@ export const THEME_ACTIONS_TYPES = {
     push: 'push',
     pull: 'pull',
     delete: 'delete',
-    publish_form: 'publish_form',
+    publishForm: 'publish_form',
     publish: 'publish'
 };
 export const THEME_ACTION_DATA_TYPE = {
     file: 'file',
     zip: 'zip'
 };
+export const THEME_ACTION_NOT_FOUND_ERROR_CODE = 'theme_action_not_found';
+export const THEME_ACTION_NOTS_FOUND_ERROR_CODE = 'theme_actions_not_found';

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

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

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

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

package/build/theme/features/theme/delete/api/theme_delete_api.js

@@ -0,0 +1,13 @@
+import { FeatureApi } from '@dreamcommerce/star_core';
+import { THEME_DELETE_API_NAME } from '../theme_delete_constants.js';
+export class ThemeDeleteApi extends FeatureApi {
+    moduleName = THEME_DELETE_API_NAME;
+    #service;
+    constructor(service) {
+        super();
+        this.#service = service;
+    }
+    async deleteTheme(props) {
+        return this.#service.deleteTheme(props);
+    }
+}

package/build/theme/features/theme/delete/http/theme_delete_http_api.js

@@ -0,0 +1,17 @@
+export class ThemeDeleteHttpApi {
+    #httpApi;
+    constructor(httpApi) {
+        this.#httpApi = httpApi;
+    }
+    deleteTheme({ shopUrl, actionData }) {
+        const { method, url } = actionData;
+        return this.#httpApi.fetch({
+            url: `${shopUrl}${url}`,
+            method,
+            sanitizeOptions: {
+                disable: true
+            },
+            isPrivate: true
+        });
+    }
+}

package/build/theme/features/theme/delete/service/theme_delete_service.js

@@ -0,0 +1,31 @@
+import { HttpErrorsFactory } from '../../../../../cli/class/errors/http/http_errors_factory.js';
+import { DownloadFileErrorsFactory } from '../../../../../utils/download_file/download_file_errors_factory.js';
+import { STATUS_CODES } from '@dreamcommerce/star_core';
+export class ThemeDeleteService {
+    #httpApi;
+    constructor(httpApi) {
+        this.#httpApi = httpApi;
+    }
+    async deleteTheme({ actionData, credentials }) {
+        try {
+            const { response: request } = this.#httpApi.deleteTheme({ actionData, shopUrl: credentials.shopUrl });
+            const response = await request;
+            if (response?.status !== STATUS_CODES.ok)
+                return;
+            return response?.data;
+        }
+        catch (err) {
+            //TODO to basic class
+            switch (err.response?.status) {
+                case 403:
+                    throw HttpErrorsFactory.createForbiddenError();
+                case 401:
+                    throw HttpErrorsFactory.createUnauthorizedError();
+                case 404:
+                    throw HttpErrorsFactory.createNotFoundError();
+                default:
+                    throw DownloadFileErrorsFactory.downloadError(err.response.status);
+            }
+        }
+    }
+}

package/build/theme/features/theme/delete/theme_delete_constants.js

@@ -0,0 +1,2 @@
+export const THEME_DELETE_FEATURE_NAME = 'ThemeDelete';
+export const THEME_DELETE_API_NAME = 'ThemeDeleteApi';

package/build/theme/features/theme/delete/theme_delete_initalizer.js

@@ -0,0 +1,20 @@
+import { FEATURE_CORES_TYPES, HTTP_REQUESTER_API_NAME, SyncFeatureInitializer } from '@dreamcommerce/star_core';
+import { ThemeDeleteApi } from './api/theme_delete_api.js';
+import { ThemeDeleteService } from './service/theme_delete_service.js';
+import { ThemeDeleteHttpApi } from './http/theme_delete_http_api.js';
+import { THEME_DELETE_FEATURE_NAME } from './theme_delete_constants.js';
+export class ThemeDeleteInitializer extends SyncFeatureInitializer {
+    static featureName = THEME_DELETE_FEATURE_NAME;
+    init() {
+        const httpApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
+        const service = new ThemeDeleteService(new ThemeDeleteHttpApi(httpApi));
+        return {
+            cores: [
+                {
+                    type: FEATURE_CORES_TYPES.api,
+                    instance: new ThemeDeleteApi(service)
+                }
+            ]
+        };
+    }
+}

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

@@ -4,17 +4,18 @@ import { downloadFile } from '../../../../../utils/download_file/download_file_u
 import { extractZip } from '../../../../../utils/zip/extract_zip_utils.js';
 import { join } from '../../../../../utils/path_utils.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
-import { getResources, mapResourcesToTree } from '../../../../class/fetch_resources/fetch_resources_utils.js';
+import { getResources, mapResourcesToTree, removeOldResources } from '../../../../class/fetch_resources/fetch_resources_utils.js';
 import { FetchResources } from '../../../../class/fetch_resources/fetch_resources.js';
 import { jsonIndentTransform } from '../../../../../utils/stream_transforms/json_indent_transform.js';
-import { ThemeDirectoryUtils } from '../../directory/theme_directory_utils.js';
 import { THEME_CURRENT_CHECKSUMS_FILE_NAME, THEME_CURRENT_CHECKSUMS_VERITY_FILE_NAME, THEME_INITIAL_CHECKSUMS_FILE_NAME, THEME_INITIAL_CHECKSUMS_VERITY_FILE_NAME } from '../../theme_constants.js';
 import { THEME_FILES_LIST_FILE_NAME } from '../../push/theme_push_constants.js';
 import { JSON_FILE_INDENT } from '../../../../../cli/cli_constants.js';
-import { computeChecksumsFromSource } from '../../../../../utils/checksums/checksums_utils.js';
-import { ThemeChecksumsUtils } from '../../utils/checksums/theme_checksums_utils.js';
 import { createWriteStream } from 'node:fs';
-import { AppError } from '../../../../../cli/class/errors/app_error/app_error.js';
+import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
+import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
+import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
+import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
+import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
 export class ThemeFetchService {
     #themeHttpApi;
     #httpApi;
@@ -53,14 +54,17 @@ export class ThemeFetchService {
             });
         }
         await this._createGitIgnoreFile(themeDir);
-        const checksums = await computeChecksumsFromSource(themeDir);
-        await ThemeChecksumsUtils.createThemeChecksumsFiles(themeDir, checksums);
+        await this._updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
+        /**
+         * moze to nie powinno lezec tutaj :?
+         */
+        await new ThemeChecksums(themeDir).updateAllChecksums();
         return {
             name: basename
         };
     }
     async _updateFilesStructure(themeDir) {
-        const fileStructure = await ThemeDirectoryUtils.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}`,
@@ -76,7 +80,15 @@ export class ThemeFetchService {
                 }
             };
         });
-        [THEME_FILES_LIST_FILE_NAME, '.gitignore'].forEach((fileName) => {
+        fileStructure[THEME_FILES_LIST_FILE_NAME] = {
+            permissions: {
+                canAdd: true,
+                canEdit: true,
+                canDelete: true
+            },
+            _links: { [THEME_ACTIONS_TYPES.push]: '*' }
+        };
+        ['.gitignore'].forEach((fileName) => {
             fileStructure[fileName] = {
                 permissions: {
                     canAdd: true,
@@ -85,9 +97,17 @@ export class ThemeFetchService {
                 }
             };
         });
-        await ThemeDirectoryUtils.writeThemeFilesStructure(themeDir, fileStructure);
+        await ThemeFilesStructureUtils.writeThemeFilesStructure(themeDir, fileStructure);
+    }
+    async _updateMetadataFileWithWorkUrl(themeDir, workUrl) {
+        const shopMetadata = await ThemeMetaDataUtils.getThemeMetadata(themeDir);
+        await ThemeMetaDataUtils.updateThemeMetadata(themeDir, {
+            ...shopMetadata,
+            workUrl
+        });
     }
     async fetchResources(shopUrl, dist, resources) {
+        await removeOldResources(dist, resources);
         const resourcesTree = mapResourcesToTree(resources);
         await Promise.all(Object.keys(resourcesTree).map((resource) => new FetchResources(this.#httpApi).fetchResources({
             resourcesPart: resourcesTree[resource],

package/build/theme/features/theme/info/theme_info_utils.js

@@ -0,0 +1,9 @@
+import { readJSONFile } from '../../../../utils/fs/fs_utils.js';
+import { join } from '../../../../utils/path_utils.js';
+export class ThemeInfoUtils {
+    static async getThemeName(themeDir) {
+        //TODO - wziasc z themeList a to wywalic
+        const themeDetails = await readJSONFile(join(themeDir, 'settings', 'details.json'));
+        return themeDetails.name ?? 'Storefront';
+    }
+}

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

@@ -3,8 +3,9 @@ import process from 'process';
 import tmp from 'tmp-promise';
 import { downloadFile } from '../../../../../utils/download_file/download_file_utils.js';
 import { extractZip } from '../../../../../utils/zip/extract_zip_utils.js';
-import { ThemeChecksumsUtils } from '../../utils/checksums/theme_checksums_utils.js';
-import { computeChecksumsFromSource } from '../../../../../utils/checksums/checksums_utils.js';
+import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
+import { ThemeInfoUtils } from '../../info/theme_info_utils.js';
+import { ThemeChecksums } from '../../../../../theme/class/checksums/theme_checksums.js';
 export class ThemeInitService {
     #httpApi;
     constructor({ httpApi }) {
@@ -22,7 +23,11 @@ export class ThemeInitService {
             source: join(tmpDir, filename),
             dist: distDir
         });
-        const checksums = await computeChecksumsFromSource(distDir);
-        await ThemeChecksumsUtils.createThemeChecksumsFiles(join(process.cwd(), basename), checksums);
+        new ThemeChecksums(distDir).updateAllChecksums();
+        const themeMetaData = await ThemeMetaDataUtils.getThemeMetadata(distDir);
+        return {
+            themeId: themeMetaData.themeId,
+            themeName: await ThemeInfoUtils.getThemeName(distDir)
+        };
     }
 }

package/build/theme/features/theme/merge/api/theme_merge_api.js

@@ -7,22 +7,10 @@ export class ThemeMergeApi extends FeatureApi {
         super();
         this.#service = service;
     }
-    hasThemeBeenModified(themeRootDir) {
-        return this.#service.hasThemeBeenModified(themeRootDir);
-    }
     getChangesBetweenThemes(theme1, theme2) {
         return this.#service.getChangesBetweenThemes(theme1, theme2);
     }
     applyChanges(fromTheme, toTheme, changes) {
         return this.#service.applyChanges(fromTheme, toTheme, changes);
     }
-    hasFileBeenCreated(path, executionContext) {
-        return this.#service.hasFileBeenCreated(path, executionContext);
-    }
-    hasFileBeenRemoved(path, executionContext) {
-        return this.#service.hasFileBeenRemoved(path, executionContext);
-    }
-    hasFileBeenModified(path, executionContext) {
-        return this.#service.hasFileBeenModified(path, executionContext);
-    }
 }

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

@@ -1,22 +1,21 @@
 import FSTree from 'fs-tree-diff';
-import { join } from '../../../../../utils/path_utils.js';
-import { computeChecksumsFromSource, computeFileChecksum } from '../../../../../utils/checksums/checksums_utils.js';
-import { copyFile, copyFileSync, fileExists } from '../../../../../utils/fs/fs_utils.js';
-import { ThemeChecksumsUtils } from '../../utils/checksums/theme_checksums_utils.js';
+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';
 export class ThemeMergeService {
     async applyChanges(fromTheme, toTheme, changes) {
         FSTree.applyPatch(fromTheme, toTheme, changes, {
             create(inputPath, outputPath) {
-                copyFile(inputPath, outputPath);
+                copyFileSync(inputPath, outputPath);
             },
             change(inputPath, outputPath) {
                 copyFileSync(inputPath, outputPath);
             }
         });
-        const checksums = await computeChecksumsFromSource(toTheme);
-        await ThemeChecksumsUtils.createThemeChecksumsFiles(toTheme, checksums);
+        new ThemeChecksums(toTheme).updateAllChecksums();
     }
     async getChangesBetweenThemes(theme1, theme2) {
         const theme1Tree = new FSTree({
@@ -25,32 +24,25 @@ export class ThemeMergeService {
         const theme2Tree = new FSTree({
             entries: walkSync.entries(theme2)
         });
-        const theme1Checksums = await ThemeChecksumsUtils.getThemeCurrentChecksums(theme1);
-        const theme2Checksums = await ThemeChecksumsUtils.getThemeCurrentChecksums(theme2);
+        const theme1Checksums = new ThemeChecksums(theme1);
+        const theme2Checksums = new ThemeChecksums(theme2);
+        const userDirectories = await this._getUserRootDirectories(theme2);
         return theme2Tree
             .calculatePatch(theme1Tree, (entryA, entryB) => {
             if (entryA.isDirectory() && entryB.isDirectory())
                 return true;
-            return theme1Checksums[entryA.relativePath] === theme2Checksums[entryB.relativePath];
+            return (theme1Checksums.getCurrentChecksumFromPathSync(entryA.relativePath) ===
+                theme2Checksums.getCurrentChecksumFromPathSync(entryB.relativePath));
         })
-            .filter(([, name]) => !name.startsWith(SHOPER_THEME_METADATA_DIR));
-    }
-    async hasThemeBeenModified(themeRootDir) {
-        const initialChecksums = await ThemeChecksumsUtils.getInitialChecksumsVerification(themeRootDir);
-        const currentChecksums = await ThemeChecksumsUtils.getThemeCurrentChecksumsVerification(themeRootDir);
-        return initialChecksums !== currentChecksums;
-    }
-    async hasFileBeenCreated(path, executionContext) {
-        const checksums = await ThemeChecksumsUtils.getThemeCurrentChecksums(executionContext.themeRootDir);
-        return checksums[path] === undefined && (await fileExists(join(executionContext.themeRootDir, path)));
-    }
-    async hasFileBeenRemoved(path, executionContext) {
-        const checksums = await ThemeChecksumsUtils.getThemeCurrentChecksums(executionContext.themeRootDir);
-        return !(await fileExists(join(executionContext.themeRootDir, path))) && !!checksums[path];
+            .filter(([_, name]) => {
+            return !name.startsWith(SHOPER_THEME_METADATA_DIR) && !userDirectories.some((userDir) => name.startsWith(userDir));
+        });
     }
-    async hasFileBeenModified(path, executionContext) {
-        const checksums = await ThemeChecksumsUtils.getThemeCurrentChecksums(executionContext.themeRootDir);
-        const currentChecksum = await computeFileChecksum(join(executionContext.themeRootDir, path));
-        return !!checksums[path] && checksums[path] !== currentChecksum;
+    async _getUserRootDirectories(themeDir) {
+        const filesStructure = await ThemeFilesStructureUtils.getThemeRootDirectories(themeDir);
+        return (await getAllDirectoriesNamesInside(themeDir, {
+            recursive: false,
+            hidden: true
+        })).filter((directory) => !filesStructure.includes(join(directory, platformSeparator)));
     }
 }