@shoper/cli 0.1.0-8 → 0.1.0-9

package/build/theme/class/fetch_resources/fetch_resources.js

@@ -4,10 +4,11 @@ import { extractZip } from '../../../utils/zip/extract_zip_utils.js';
 import { join } from '../../../utils/path_utils.js';
 import tmp from 'tmp-promise';
 import { copyFile, fileExists, readJSONFile } from '../../../utils/fs/fs_utils.js';
-import { getResourcesPath, isResourceObject } from './fetch_resources_utils.js';
+import { getResourcesPath, isResourceObject, mapResourcesToTree } from './fetch_resources_utils.js';
 import { MAX_REQUEST_FOR_RESOURCES } from './fetch_resources_constants.js';
 import { isRelativeUrl } from '../../../utils/url_utils.js';
 import { FetchResourcesErrorsFactory } from './fetch_resources_errors_factory.js';
+import { move } from 'fs-extra';
 export class FetchResources {
     #urlsAttempts = {};
     #httpApi;
@@ -59,7 +60,7 @@ export class FetchResources {
         }
     }
     async _getResourcesFileContent(resourcePath) {
-        return await readJSONFile(resourcePath);
+        return mapResourcesToTree(await readJSONFile(resourcePath));
     }
     _getResourcesPart(resources, parts) {
         return parts.reduce((acc, part) => acc[part] ?? {}, resources);
@@ -96,7 +97,7 @@ export class FetchResources {
                 });
             }
             else {
-                await copyFile(join(tmpDir, filename), join(dist, this._getFilepathFromParts(parts), filename));
+                await move(join(tmpDir, filename), join(dist, this._getFilepathFromParts(parts), filename), { overwrite: true });
             }
         }
         catch (err) {

package/build/theme/commands/theme_pull_command.js

@@ -89,6 +89,8 @@ export class ThemePullCommand extends BaseThemeCommand {
             });
             this.log('\n');
             const changes = await themeMergeApi.getChangesBetweenThemes(join(tmpDir, name), executionContext.themeRootDir);
+            console.log('changes', changes);
+            console.log('is modified', await themeMergeApi.hasThemeBeenModified(executionContext.themeRootDir));
             if (await themeMergeApi.hasThemeBeenModified(executionContext.themeRootDir)) {
                 console.log('changes', changes);
                 this.log('You have unpublished changes in your theme...\n');

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

@@ -1,7 +1,7 @@
 import tmp from 'tmp-promise';
 import { THEME_ACTION_DATA_TYPE, THEME_ACTIONS_TYPES } from '../../actions/theme_actions_constants.js';
 import { createZip } from '../../../../../utils/zip/create_zip_utils.js';
-import { basename, dirname, extname, join, looksLikeDirectory } from '../../../../../utils/path_utils.js';
+import { basename, dirname, extname, join, looksLikeDirectory, toUnixPath } from '../../../../../utils/path_utils.js';
 import { createReadStream } from 'node:fs';
 import { v4 as uuid } from 'uuid';
 import globs from 'fast-glob';
@@ -34,7 +34,6 @@ export class ThemePushService {
             filesStructure,
             executionContext
         });
-        console.log('uploadData', uploadData);
         if (uploadData.length) {
             await this._uploadThemeFiles({
                 filesToUpload: uploadData,
@@ -68,7 +67,7 @@ export class ThemePushService {
         });
         if (modules)
             await this._updateDataForNewCreatedModules({ modules, themeRootDir: executionContext.themeRootDir });
-        console.log('resources', resources);
+        console.log(JSON.stringify(resources));
         if (resources)
             await this.#themeFetchApi.fetchResources(credentials.shopUrl, executionContext.themeRootDir, resources);
         await removeFile(join(executionContext.themeRootDir, THEME_FILES_LIST_FILE_NAME));
@@ -115,7 +114,7 @@ export class ThemePushService {
             const uploadedImageData = await this._uploadFiles(filesToUpload, credentials);
             const newFilesList = ThemeImagesUtils.updateOriginalFilenameToUploadedFilename(localFiles, uploadedImageData);
             if (uploadedImageData.length)
-                await ThemeImagesUtils.renameOriginalFilenameToUploadedFilename(themeRootDir, uploadedImageData);
+                await ThemeImagesUtils.removeUploadedOriginalFiles(themeRootDir, uploadedImageData);
             await this._createAFilesListFile(themeRootDir, newFilesList);
         }
         catch (err) {
@@ -186,9 +185,16 @@ export class ThemePushService {
         }
     }
     async _createAFilesListFile(themeRootDir, filesList) {
-        console.log('filesList', filesList);
-        //TODO replace pathSeparator to unix style if platform windows
-        if (Object.keys(filesList))
-            await writeJSONFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME), filesList);
+        if (!filesList || !Object.keys(filesList).length)
+            return;
+        const toUnixStyleFilesList = Object.entries(filesList).reduce((acc, [path, value]) => {
+            const unixPath = toUnixPath(path);
+            const finalPath = looksLikeDirectory(path) ? `${unixPath}/` : unixPath;
+            return {
+                ...acc,
+                [finalPath]: value
+            };
+        }, {});
+        await writeJSONFile(join(themeRootDir, THEME_FILES_LIST_FILE_NAME), toUnixStyleFilesList);
     }
 }

package/build/theme/features/theme/utils/theme_images_utils.js

@@ -1,5 +1,5 @@
 import { join } from '../../../../utils/path_utils.js';
-import { renameFile } from '../../../../utils/fs/fs_utils.js';
+import { removeFile } from '../../../../utils/fs/fs_utils.js';
 export class ThemeImagesUtils {
     static updateOriginalFilenameToUploadedFilename(filesList, uploadedImageData) {
         const newFilesList = { ...filesList };
@@ -19,13 +19,12 @@ export class ThemeImagesUtils {
         });
         return newFilesList;
     }
-    static async renameOriginalFilenameToUploadedFilename(themeRootDir, uploadedImagesData) {
+    static async removeUploadedOriginalFiles(themeRootDir, uploadedImagesData) {
         await Promise.all(uploadedImagesData
             .filter(({ originalFilename }) => Boolean(originalFilename))
-            .map(({ uploadedFilename, originalFilename, location }) => {
+            .map(({ originalFilename, location }) => {
             const originalFilePath = join(themeRootDir, location, originalFilename);
-            const newFilePath = join(themeRootDir, location, uploadedFilename ?? originalFilename);
-            return renameFile(originalFilePath, newFilePath);
+            return removeFile(originalFilePath);
         }));
     }
 }

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

@@ -67,18 +67,16 @@ const _checkPermissions = async ({ permissionPart, permissionParts, parts = [],
         });
         if (action)
             unpermittedActions.push(action);
-        if (await isDirectory(join(fullPath, file))) {
-            if (await fileExists(join(rootDirectory, join(...parts, file)))) {
-                await _checkPermissions({
-                    permissionPart: permission,
-                    parts: [...parts, file],
-                    permissionParts: permissionKey ? [...permissionParts, permissionKey] : permissionParts,
-                    checksumsPart: checksumsPart?.[file] ?? {},
-                    rootDirectory,
-                    unpermittedActions,
-                    permissions
-                });
-            }
+        if ((await fileExists(join(rootDirectory, join(...parts, file)))) && (await isDirectory(join(fullPath, file)))) {
+            await _checkPermissions({
+                permissionPart: permission,
+                parts: [...parts, file],
+                permissionParts: permissionKey ? [...permissionParts, permissionKey] : permissionParts,
+                checksumsPart: checksumsPart?.[file] ?? {},
+                rootDirectory,
+                unpermittedActions,
+                permissions
+            });
         }
     }
     return;
@@ -122,7 +120,7 @@ const _checkPermission = async ({ permission, path, checksumsPart, filesInDirect
             relativePath
         };
     }
-    if (!looksLikeDirectory(join(rootDirectory, path)) && !permission.canEdit && checksumsPart[path] && (await fileExists(fullPath))) {
+    if ((await fileExists(fullPath)) && !looksLikeDirectory(join(rootDirectory, path)) && !permission.canEdit && checksumsPart[path]) {
         const currentChecksum = await computeFileChecksum(fullPath);
         if (currentChecksum !== checksumsPart[path][CHECKSUM_KEY]) {
             return {

package/build/utils/fs/fs_utils.js

@@ -9,6 +9,7 @@ import { JSON_FILE_INDENT } from '../../cli/cli_constants.js';
 import tmp from 'tmp-promise';
 import { pipeline } from 'node:stream/promises';
 import { jsonIndentTransform } from '../stream_transforms/json_indent_transform.js';
+import { move } from 'fs-extra';
 export const fileExists = async (path) => {
     try {
         await fsPromises.access(path);
@@ -50,13 +51,15 @@ export const writeJSONFile = async (path, data) => {
     }
 };
 export const formatJSONFile = async (path, indent = JSON_FILE_INDENT) => {
-    const { path: tmpDir } = await tmp.dir({ unsafeCleanup: true });
+    const { path: tmpDir, cleanup } = await tmp.dir({ unsafeCleanup: true });
     const fileName = basename(path);
     const formattedTmpFilePath = join(tmpDir, fileName);
     const readStream = createReadStream(path);
     const writeStream = fs.createWriteStream(formattedTmpFilePath);
     await pipeline(readStream, jsonIndentTransform(indent), writeStream);
-    await copyFile(formattedTmpFilePath, path, { force: true });
+    // await copyFile(formattedTmpFilePath, path, { force: true });
+    await move(formattedTmpFilePath, path, { overwrite: true });
+    await cleanup();
 };
 export const openFile = async (path, flags, mode) => {
     return fsPromises.open(path, flags, mode);

package/build/utils/path_utils.js

@@ -31,4 +31,7 @@ export const looksLikeDirectory = (path) => {
     }
     return isHidden || !hasExtension;
 };
+export const toUnixPath = (filePath) => {
+    return normalize(filePath).replace(/\\/g, '/');
+};
 export const platformSeparator = sep;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.1.0-8",
+    "version": "0.1.0-9",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -58,7 +58,8 @@
         "klaw": "4.1.0",
         "walk-sync": "3.0.0",
         "lodash": "4.17.21",
-        "uuid": "11.1.0"
+        "uuid": "11.1.0",
+        "fs-extra": "11.3.0"
     },
     "devDependencies": {
         "@babel/core": "7.27.1",
@@ -67,6 +68,7 @@
         "@oclif/test": "4.1.12",
         "@tsconfig/node18": "18.2.4",
         "@types/jest": "29.5.14",
+        "@types/fs-extra": "11.0.4",
         "@types/jsonwebtoken": "9.0.9",
         "@types/node": "18.19.84",
         "@types/react": "19.1.3",