@shoper/cli 0.5.2-5 → 0.5.2-6

package/build/utils/zip/create_zip_utils.js

@@ -6,10 +6,17 @@ import { StreamReadError } from '../fs/errors/stream_read_error.js';
 import { CreateZipError } from './errors/create_zip_error.js';
 import { StreamWriteError } from '../fs/errors/stream_write_error.js';
 import { join } from '../path_utils.js';
-import { AppError } from '../../cli/class/errors/app/app_error.js';
-export const createZip = async ({ files, dist, baseDir = process.cwd() }) => {
+import { AppError } from '../../cli/utilities/features/logger/logs/app_error.js';
+export const createZip = async ({ files, dist, baseDir = process.cwd(), logger }) => {
     const zipfile = new yazl.ZipFile();
     let hasError = false;
+    logger.debug('Starting creation of zip file', {
+        details: {
+            filesCount: files.length,
+            dist,
+            baseDir
+        }
+    });
     try {
         for (let i = 0; i < files.length; ++i) {
             const file = files[i];
@@ -23,56 +30,61 @@ export const createZip = async ({ files, dist, baseDir = process.cwd() }) => {
                     details: { file, baseDir }
                 });
             if (await isDirectory(fullPath)) {
+                logger.debug('Adding empty directory to zip', { details: { directory: file } });
                 zipfile.addEmptyDirectory(file);
             }
             else {
+                logger.debug('Adding file to zip', { details: { file, fullPath } });
                 zipfile.addFile(fullPath, file, {
                     //TODO params
                     compress: true
                 });
             }
         }
+        logger.debug('Finished adding all files to zip object. Finalizing archive.');
         zipfile.end();
     }
-    catch (err) {
+    catch (error) {
         throw new AppError({
             message: 'Error creating zip file',
             code: 'ZIP_CREATION_ERROR',
             details: { files, dist, baseDir },
-            stack: err instanceof Error ? err.stack : undefined
+            error
         });
     }
     return new Promise((resolve, reject) => {
         const zipOutput = createWriteStream(dist);
         zipOutput.on('error', (err) => {
             hasError = true;
+            logger.debug('Write stream error while creating zip file. Cleaning up.', { details: { dist } });
             removeFiles(files).then(() => {
                 reject(new StreamWriteError({
                     filePath: dist,
-                    details: { err },
-                    stack: err.stack
+                    error: err
                 }));
             });
         });
         zipfile.outputStream.pipe(zipOutput).on('close', () => {
             if (hasError) {
+                logger.debug('Zip stream closed with error. Cleaning up.', { details: { dist } });
                 removeFiles(files).then(() => {
                     reject(new CreateZipError({
                         file: dist,
-                        stack: new Error().stack
+                        error: new Error()
                     }));
                 });
                 return;
             }
+            logger.debug('Zip file created successfully.', { details: { dist } });
             resolve();
         });
         zipfile.outputStream.on('error', (err) => {
             hasError = true;
+            logger.debug('Read stream error while creating zip file. Cleaning up.', { details: { dist } });
             removeFiles(files).then(() => {
                 reject(new StreamReadError({
                     filePath: dist,
-                    details: { err },
-                    stack: err.stack
+                    error: err
                 }));
             });
         });

package/build/utils/zip/errors/create_zip_error.js

@@ -1,11 +1,13 @@
-import { AppError } from '../../../cli/class/errors/app/app_error.js';
+import { AppError } from '../../../cli/utilities/features/logger/logs/app_error.js';
 export class CreateZipError extends AppError {
-    constructor({ details, stack, file }) {
+    constructor({ error, file }) {
         super({
             code: 'ZIP_FILE_CREATE_ERROR',
-            message: `Error creating zip file ${file}`,
-            details,
-            stack
+            message: `Error creating zip file`,
+            details: {
+                file
+            },
+            error
         });
     }
 }

package/build/utils/zip/errors/open_zip_error.js

@@ -1,11 +1,13 @@
-import { AppError } from '../../../cli/class/errors/app/app_error.js';
+import { AppError } from '../../../cli/utilities/features/logger/logs/app_error.js';
 export class OpenZipError extends AppError {
-    constructor({ details, stack, file }) {
+    constructor({ error, file }) {
         super({
             code: 'ZIP_FILE_OPEN_ERROR',
-            message: `Error opening zip file ${file}`,
-            details,
-            stack
+            message: `Error opening zip file`,
+            details: {
+                file
+            },
+            error
         });
     }
 }

package/build/utils/zip/extract_zip_utils.js

@@ -6,21 +6,44 @@ import { StreamWriteError } from '../fs/errors/stream_write_error.js';
 import { StreamReadError } from '../fs/errors/stream_read_error.js';
 import { OpenZipError } from './errors/open_zip_error.js';
 import { pipeline } from 'node:stream/promises';
-export const extractZip = async ({ source, dist, getTransforms = () => [] }) => {
+export const extractZip = async ({ source, dist, logger, getTransforms = () => [] }) => {
     let createdDirectory = false;
+    logger.debug('Starting extraction of zip file', {
+        details: {
+            source,
+            dist
+        }
+    });
     if (!(await directoryExists(dist))) {
         createdDirectory = true;
+        logger.debug('Destination directory does not exist. Creating.', {
+            details: {
+                directory: dist
+            }
+        });
         await makeDirectory(dist, { recursive: true });
     }
     return new Promise((resolve, reject) => {
         const processedFilesPath = [];
-        yauzl.open(source, { lazyEntries: true }, (err, zipfile) => {
-            if (err) {
-                createdDirectory && removeDirectorySync(dist, { recursive: true });
+        yauzl.open(source, { lazyEntries: true }, (error, zipfile) => {
+            logger.debug('Zip file opened for extraction', {
+                details: {
+                    source,
+                    dist
+                }
+            });
+            if (error) {
+                if (createdDirectory) {
+                    logger.debug('Removing created directory due to an error.', {
+                        details: {
+                            directory: dist
+                        }
+                    });
+                    removeDirectorySync(dist, { recursive: true });
+                }
                 return reject(new OpenZipError({
                     file: source,
-                    details: { err },
-                    stack: err.stack
+                    error
                 }));
             }
             let activeEntries = 0;
@@ -31,16 +54,26 @@ export const extractZip = async ({ source, dist, getTransforms = () => [] }) =>
                 const filePath = join(dist, entry.fileName);
                 const dirPath = dirname(filePath);
                 processedFilesPath.push(filePath);
+                logger.debug('Extracting zip entry', {
+                    details: {
+                        entryName: entry.fileName,
+                        filePath: filePath
+                    }
+                });
                 if (!filePath.startsWith(dist)) {
                     return reject(new Error(`Invalid entry path: ${entry.fileName}`));
                 }
                 if (looksLikeDirectory(entry.fileName)) {
+                    logger.debug('Entry looks like a directory, skipping file write.', {
+                        details: {
+                            entry: entry.fileName
+                        }
+                    });
                     zipfile.readEntry();
                     return;
                 }
-                if (extractedPaths.has(filePath)) {
+                if (extractedPaths.has(filePath))
                     return reject(new Error(`Duplicate entry path detected: ${filePath}`));
-                }
                 extractedPaths.add(filePath);
                 makeDirectory(dirPath, { recursive: true })
                     .then(() => {
@@ -50,31 +83,58 @@ export const extractZip = async ({ source, dist, getTransforms = () => [] }) =>
                         const writeStream = createWriteStream(filePath);
                         writeStream.on('finish', () => {
                             activeEntries--;
-                            if (activeEntries === 0 && doneReadingEntries)
+                            logger.debug('Finished writing file.', {
+                                details: {
+                                    file: filePath,
+                                    activeEntries
+                                }
+                            });
+                            if (activeEntries === 0 && doneReadingEntries) {
+                                logger.debug('All entries processed and written.');
                                 resolve();
+                            }
                             zipfile.readEntry();
                         });
                         writeStream.on('error', async (err) => {
+                            logger.debug('Write stream error. Removing file.', {
+                                details: {
+                                    file: filePath
+                                }
+                            });
                             await removeFile(filePath);
                             reject(new StreamWriteError({
                                 filePath,
-                                details: { err },
-                                stack: err.stack
+                                error: err
                             }));
                         });
                         readStream.on('error', async (err) => {
+                            logger.debug('Read stream error. Removing file.', {
+                                details: {
+                                    file: filePath
+                                }
+                            });
                             await removeFile(filePath, { force: true });
                             reject(new StreamReadError({
                                 filePath,
-                                details: { err },
-                                stack: err.stack
+                                error: err
                             }));
                         });
                         const transforms = getTransforms(entry.fileName);
                         if (transforms.length) {
+                            logger.debug('Applying transform(s) to entry.', {
+                                details: {
+                                    transformsCount: transforms.length,
+                                    entry: entry.fileName
+                                }
+                            });
                             await pipeline(readStream, ...transforms, writeStream);
                         }
                         else {
+                            logger.debug('No transforms for entry. Piping directly.', {
+                                details: {
+                                    entry: entry.fileName
+                                }
+                            });
                             readStream.pipe(writeStream);
                         }
                     });
@@ -83,19 +143,34 @@ export const extractZip = async ({ source, dist, getTransforms = () => [] }) =>
             });
             zipfile.on('end', () => {
                 doneReadingEntries = true;
-                if (activeEntries === 0)
+                logger.debug('Finished reading all zip entries.');
+                if (activeEntries === 0) {
+                    logger.debug('All entries were processed before zip file "end" event.');
                     resolve();
+                }
             });
             zipfile.on('error', async (err) => {
                 for (const filePath of processedFilesPath) {
                     try {
+                        logger.debug('Cleaning up extracted file due to an error.', {
+                            details: {
+                                file: filePath
+                            }
+                        });
                         await removeFile(filePath, { force: true });
                     }
                     catch (removeErr) {
                         console.error(`Error removing file ${filePath}:`, removeErr);
                     }
                 }
-                createdDirectory && (await removeDirectory(dist, { recursive: true }));
+                if (createdDirectory) {
+                    logger.debug('Cleaning up created directory due to an error.', {
+                        details: {
+                            directory: dist
+                        }
+                    });
+                    await removeDirectory(dist, { recursive: true });
+                }
                 reject(err);
             });
             zipfile.readEntry();

package/oclif.config.js

@@ -21,7 +21,8 @@ export default {
             './build/theme/hooks/ensure_theme_meta_data_untouched_hook.js',
             './build/theme/hooks/theme_checksums/ensure_theme_current_checksums_up_to_date_hook.js',
             './build/theme/hooks/themes_actions/ensure_themes_actions_hook.js'
-        ]
+        ],
+        finally: ['./build/cli/hooks/ensure_logs_flushed_hook.js']
     },
     topicSeparator: ' ',
     topics: {

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.5.2-5",
+    "version": "0.5.2-6",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -39,32 +39,33 @@
         "@oclif/plugin-help": "6.2.27",
         "@oclif/plugin-version": "2.2.27",
         "@oclif/plugin-warn-if-update-available": "3.1.38",
-        "axios": "1.12.0",
+        "axios": "1.13.1",
         "chalk": "5.4.1",
         "conf": "13.1.0",
         "fast-glob": "3.3.3",
+        "figures": "6.1.0",
+        "fs-extra": "11.3.0",
         "fs-tree-diff": "2.0.1",
         "ink": "6.0.1",
+        "ink-link": "4.1.0",
         "inquirer": "12.5.2",
+        "inquirer-select-line": "1.1.3",
         "is-hidden-file": "1.1.2",
         "jsonwebtoken": "9.0.2",
         "klaw": "4.1.0",
         "lodash": "4.17.21",
+        "log-symbols": "7.0.1",
         "memfs": "4.17.0",
         "ora": "8.2.0",
+        "pino": "10.1.0",
+        "pino-pretty": "13.1.2",
         "react": "19.1.0",
         "reflect-metadata": "0.2.2",
         "rxjs": "7.8.2",
         "semver": "7.7.1",
+        "strip-ansi": "7.1.0",
         "tmp-promise": "3.0.3",
         "uuid": "11.1.0",
-        "fs-extra": "11.3.0",
-        "ink-link": "4.1.0",
-        "log-symbols": "7.0.1",
-        "figures": "6.1.0",
-        "strip-ansi": "7.1.0",
-        "inquirer-select-line": "1.1.3",
-        "micromatch": "4.0.8",
         "walk-sync": "3.0.0",
         "yauzl": "3.2.0",
         "yazl": "3.3.1"
@@ -78,18 +79,17 @@
         "@types/fs-extra": "11.0.4",
         "@types/jest": "29.5.14",
         "@types/jsonwebtoken": "9.0.9",
+        "@types/klaw": "3.0.7",
+        "@types/lodash": "4.17.17",
         "@types/node": "18.19.84",
         "@types/react": "19.1.8",
         "@types/semver": "7.7.0",
         "@types/tmp": "0.2.6",
         "@types/yauzl": "2.10.3",
         "@types/yazl": "2.4.6",
-        "@types/klaw": "3.0.7",
-        "@types/lodash": "4.17.17",
-        "@types/micromatch": "4.0.9",
         "@typescript-eslint/eslint-plugin": "8.29.1",
         "babel-jest": "29.7.0",
-        "eslint": "9.24.0",
+        "eslint": "9.39.1",
         "eslint-config-prettier": "10.1.1",
         "eslint-plugin-prettier": "5.2.6",
         "jest": "29.7.0",

package/build/cli/class/errors/app/app_error.js

@@ -1,17 +0,0 @@
-import { APP_ERRORS_LEVELS } from './app_error_constants.js';
-//TODO errory do zaprojektownia
-export class AppError extends Error {
-    code;
-    level;
-    tags;
-    details;
-    stack;
-    constructor({ code, details, message, level = APP_ERRORS_LEVELS.error, tags, stack }) {
-        super(message);
-        this.code = code;
-        this.details = details;
-        this.level = level;
-        this.tags = tags;
-        this.stack = stack;
-    }
-}

package/build/theme/features/theme/utils/archive/theme_archive_utils.js

@@ -1,24 +0,0 @@
-import { createZip } from '../../../../../utils/zip/create_zip_utils.js';
-import { extname, join } from '../../../../../utils/path_utils.js';
-import { formatJSONFile } from '../../../../../utils/fs/fs_utils.js';
-import { ThemeArchiveErrorsFactory } from './theme_archive_utils_errors_factory.js';
-export class ThemeArchiveUtils {
-    static async create({ dist, files, rootDir }) {
-        try {
-            await this._formatJsonFiles(rootDir, files);
-            return createZip({
-                files,
-                baseDir: rootDir,
-                dist
-            });
-        }
-        catch (err) {
-            throw ThemeArchiveErrorsFactory.createErrorWhileCreatingThemeArchive(err);
-        }
-    }
-    static async _formatJsonFiles(themeRootDir, filesToUpload) {
-        await Promise.all(filesToUpload
-            .filter((path) => extname(path).toLowerCase() === '.json')
-            .map((jsonFile) => formatJSONFile(join(themeRootDir, jsonFile))));
-    }
-}

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

@@ -1 +0,0 @@
-export const FILES_LIST_CUSTOM_MODULES_TO_KEEP_IDS = 'customModulesIdsToKeep';

package/build/utils/fs/fs_constants.js

@@ -1,6 +0,0 @@
-export const FILE_STATES = {
-    created: 'created',
-    modified: 'modified',
-    deleted: 'deleted',
-    unchanged: 'unchanged'
-};