@shoper/cli 0.5.1-0 → 0.5.1-1

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

@@ -14,7 +14,6 @@ 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 { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.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';
@@ -25,6 +24,7 @@ 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 { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.js';
 export class ThemePushCommand extends BaseThemeCommand {
     static summary = 'Uploads your local theme files to the store and overwrites the current version of the theme in your store.';
     static description = 'Check your local changes before pushing.\n\nYou must run this command from a specific theme directory (ID not needed).';

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

@@ -3,19 +3,14 @@ import { THEME_FETCH_TYPES } from '../theme_fetch_constants.js';
 import { downloadFile } from '../../../../../utils/download_file/download_file_utils.js';
 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, 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 { 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 { createWriteStream } from 'node:fs';
 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';
+import { ThemeMetaDataUtils } from '../../utils/meta_data/theme_meta_data_utils.js';
 export class ThemeFetchService {
     #themeHttpApi;
     #httpApi;
@@ -44,7 +39,7 @@ export class ThemeFetchService {
             await this.fetchResources(shopUrl, themeDir, resources);
         }
         try {
-            await this._updateFilesStructure(themeDir);
+            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
         }
         catch (err) {
             throw new AppError({
@@ -53,8 +48,8 @@ export class ThemeFetchService {
                 stack: err.stack
             });
         }
-        await this._createGitIgnoreFile(themeDir);
-        await this._updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
+        await ThemeMetaDataUtils.createGitIgnoreFile(themeDir);
+        await ThemeMetaDataUtils.updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
         /**
          * moze to nie powinno lezec tutaj :?
          */
@@ -63,49 +58,6 @@ export class ThemeFetchService {
             name: basename
         };
     }
-    async _updateFilesStructure(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}`,
-            `${SHOPER_THEME_METADATA_DIR}/${THEME_CURRENT_CHECKSUMS_FILE_NAME}`,
-            `${SHOPER_THEME_METADATA_DIR}/${THEME_CURRENT_CHECKSUMS_VERITY_FILE_NAME}`
-        ];
-        checksumsFiles.forEach((file) => {
-            fileStructure[file] = {
-                permissions: {
-                    canAdd: true,
-                    canEdit: true,
-                    canDelete: false
-                }
-            };
-        });
-        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,
-                    canEdit: true,
-                    canDelete: true
-                }
-            };
-        });
-        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);
@@ -116,18 +68,4 @@ export class ThemeFetchService {
             shopUrl
         })));
     }
-    _createGitIgnoreFile(themeDir) {
-        return new Promise((resolve, reject) => {
-            const gitIgnoreContent = `styles/src/`;
-            const writeStream = createWriteStream(join(themeDir, '.gitignore'));
-            writeStream.write(gitIgnoreContent);
-            writeStream.end();
-            writeStream.on('error', (err) => {
-                reject(err);
-            });
-            writeStream.on('finish', () => {
-                resolve();
-            });
-        });
-    }
 }

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

@@ -5,7 +5,9 @@ import { downloadFile } from '../../../../../utils/download_file/download_file_u
 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 '../../../../../theme/class/checksums/theme_checksums.js';
+import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
+import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
+import { AppError } from '../../../../../cli/class/errors/app/app_error.js';
 export class ThemeInitService {
     #httpApi;
     constructor({ httpApi }) {
@@ -18,16 +20,28 @@ export class ThemeInitService {
             dist: tmpDir,
             request: this.#httpApi.initTheme(credentials.shopUrl, action.data).response
         });
-        const distDir = join(process.cwd(), basename);
+        const themeDir = join(process.cwd(), basename);
         await extractZip({
             source: join(tmpDir, filename),
-            dist: distDir
+            dist: themeDir
         });
-        new ThemeChecksums(distDir).updateAllChecksums();
-        const themeMetaData = await ThemeMetaDataUtils.getThemeMetadata(distDir);
+        try {
+            await ThemeFilesStructureUtils.updateFilesStructure(themeDir);
+        }
+        catch (err) {
+            throw new AppError({
+                message: `Failed to update files structure in theme directory: ${themeDir}`,
+                code: 'theme_files_structure_update_error',
+                stack: err.stack
+            });
+        }
+        await ThemeMetaDataUtils.createGitIgnoreFile(themeDir);
+        await ThemeMetaDataUtils.updateMetadataFileWithWorkUrl(themeDir, credentials.shopUrl);
+        await new ThemeChecksums(themeDir).updateAllChecksums();
+        const themeMetaData = await ThemeMetaDataUtils.getThemeMetadata(themeDir);
         return {
             themeId: themeMetaData.themeId,
-            themeName: await ThemeInfoUtils.getThemeName(distDir)
+            themeName: await ThemeInfoUtils.getThemeName(themeDir)
         };
     }
 }

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

@@ -1,11 +1,12 @@
 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_FILES_STRUCTURE_FILE_NAME } from '../../theme_constants.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';
 import { isWindowsOs } from '../../../../../utils/platform_utils.js';
 import { validateDirectory } from '../../../../utils/directory_validator/directory_validator_utils.js';
 import path from 'node:path';
 import { THEME_FILES_LIST_FILE_NAME } from '../../push/theme_push_constants.js';
+import { THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
 export class ThemeFilesStructureUtils {
     static async getThemeFilesStructure(themeDirectory) {
         const filesStructure = await readJSONFile(join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME));
@@ -80,4 +81,40 @@ export class ThemeFilesStructureUtils {
     static async removeAFilesListFile(themeRootDir) {
         await removeFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME));
     }
+    static async updateFilesStructure(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}`,
+            `${SHOPER_THEME_METADATA_DIR}/${THEME_CURRENT_CHECKSUMS_FILE_NAME}`,
+            `${SHOPER_THEME_METADATA_DIR}/${THEME_CURRENT_CHECKSUMS_VERITY_FILE_NAME}`
+        ];
+        checksumsFiles.forEach((file) => {
+            fileStructure[file] = {
+                permissions: {
+                    canAdd: true,
+                    canEdit: true,
+                    canDelete: false
+                }
+            };
+        });
+        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,
+                    canEdit: true,
+                    canDelete: true
+                }
+            };
+        });
+        await ThemeFilesStructureUtils.writeThemeFilesStructure(themeDir, fileStructure);
+    }
 }

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

@@ -3,6 +3,7 @@ import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_conts
 import { join } from '../../../../../utils/path_utils.js';
 import { HiddenDirectoryUtils } from '../hidden_directory/hidden_directory_utils.js';
 import { ThemeMetaDataErrorFactory } from './theme_meta_data_error_factory.js';
+import { createWriteStream } from 'node:fs';
 export class ThemeMetaDataUtils {
     static async closestThemeRootDirectory(path) {
         return closestFile(SHOPER_THEME_METADATA_DIR, path);
@@ -36,4 +37,25 @@ export class ThemeMetaDataUtils {
         if (metadataWorkUrl !== executionWorkUrl)
             throw ThemeMetaDataErrorFactory.createThemeWorkUrlMismatchError(executionWorkUrl, metadataWorkUrl);
     }
+    static async updateMetadataFileWithWorkUrl(themeDir, workUrl) {
+        const shopMetadata = await ThemeMetaDataUtils.getThemeMetadata(themeDir);
+        await ThemeMetaDataUtils.updateThemeMetadata(themeDir, {
+            ...shopMetadata,
+            workUrl
+        });
+    }
+    static async createGitIgnoreFile(themeDir) {
+        return new Promise((resolve, reject) => {
+            const gitIgnoreContent = `styles/src/`;
+            const writeStream = createWriteStream(join(themeDir, '.gitignore'));
+            writeStream.write(gitIgnoreContent);
+            writeStream.end();
+            writeStream.on('error', (err) => {
+                reject(err);
+            });
+            writeStream.on('finish', () => {
+                resolve();
+            });
+        });
+    }
 }

package/build/theme/hooks/theme_checksums/ensure_theme_current_checksums_up_to_date_hook.js

@@ -1,7 +1,7 @@
 import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
 import { useApi } from '../../../cli/hooks/ensure_cli_initialized_hook.js';
 import { THEME_COMMANDS_THAT_REQUIRES_UP_TO_DATE_CHECKSUMS } from './ensure_theme_current_checksums_up_to_date_constants.js';
-import { ThemeChecksums } from '../../../theme/class/checksums/theme_checksums.js';
+import { ThemeChecksums } from '../../class/checksums/theme_checksums.js';
 export const ensureThemeChecksumsUpToDate = async ({ Command }) => {
     if (!THEME_COMMANDS_THAT_REQUIRES_UP_TO_DATE_CHECKSUMS.includes(Command.id))
         return;

package/package.json

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