@shoper/cli 0.9.6-0 → 0.9.6-1

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

@@ -1,7 +1,6 @@
 import { copyFile, fileExists, readJSONFile, readJSONFileSync, removeFile } from '../../../utils/fs/fs_utils.js';
 import { ThemeChecksumsUtils } from './theme_checksums_utils.js';
-import { isWindowsOs } from '../../../utils/platform_utils.js';
-import { join, mapKeysPathsToWindowPlatform, toCurrentPlatformPath } from '../../../utils/path_utils.js';
+import { join, normalizeObjectPathKeys, toCurrentPlatformPath } from '../../../utils/path_utils.js';
 import { createWriteStream } from 'node:fs';
 import { JSON_FILE_INDENT } from '../../../cli/cli_constants.js';
 import { ThemeChecksumsErrorFactory } from './theme_checksums_error_factory.js';
@@ -204,15 +203,11 @@ export class ThemeChecksums {
     }
     async _getChecksums(path) {
         const checksums = await readJSONFile(path);
-        if (!isWindowsOs())
-            return checksums;
-        return mapKeysPathsToWindowPlatform(checksums);
+        return normalizeObjectPathKeys(checksums);
     }
     _getChecksumsSync(path) {
         const checksums = readJSONFileSync(path);
-        if (!isWindowsOs())
-            return checksums;
-        return mapKeysPathsToWindowPlatform(checksums);
+        return normalizeObjectPathKeys(checksums);
     }
     async _createThemeChecksumVerifyFile(checksumFilePath, checksumVerifyFullPath) {
         this.#loggerApi?.debug('Creating checksum verification file.', { details: { path: checksumVerifyFullPath } });

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

@@ -1,8 +1,7 @@
 import { fileExists, isDirectory, readJSONFile, removeFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
-import { join, looksLikeDirectory, mapKeysPathsToWindowPlatform, toUnixPath } from '../../../../../utils/path_utils.js';
+import { join, looksLikeDirectory, normalizeObjectPathKeys, 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';
-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';
@@ -12,9 +11,7 @@ import { loadShoperIgnore } from '../../../../utils/shoperignore/shoperignore_ut
 export class ThemeFilesUtils {
     static async getThemeFilesStructure(themeDirectory) {
         const filesStructure = await readJSONFile(join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME));
-        if (!isWindowsOs())
-            return filesStructure;
-        return mapKeysPathsToWindowPlatform(filesStructure);
+        return normalizeObjectPathKeys(filesStructure);
     }
     static async writeThemeFilesStructure(themeDirectory, filesStructure) {
         const filePath = join(themeDirectory, SHOPER_THEME_METADATA_DIR, THEME_FILES_STRUCTURE_FILE_NAME);

package/build/utils/path_utils.js

@@ -51,12 +51,12 @@ export const isUnixPath = (path) => {
     return !path.includes('\\') && (path.startsWith('/') || path.includes('/'));
 };
 export const platformSeparator = sep;
-export const mapKeysPathsToWindowPlatform = (paths) => {
-    return Object.entries(paths).reduce((acc, [path, value]) => {
-        return {
-            ...acc,
-            [toWinowsPath(path)]: value
-        };
+export const normalizeObjectPathKeys = (obj) => {
+    if (!obj)
+        return {};
+    return Object.entries(obj).reduce((acc, [key, value]) => {
+        acc[key.replace(/[\\/]/g, sep)] = value;
+        return acc;
     }, {});
 };
 export const toCurrentPlatformPath = (path) => (isWindowsOs() ? toWinowsPath(path) : toUnixPath(path));

package/package.json

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