@shoper/cli 0.9.2 → 0.9.4-1

package/build/theme/class/archive/theme_archive.js

@@ -1 +1,47 @@
-export {};
+import globs from 'fast-glob';
+import { createZip } from '../../../utils/zip/create_zip_utils.js';
+import { ThemeFilesUtils } from '../../features/theme/utils/files/theme_files_utils.js';
+import { extname, join } from '../../../utils/path_utils.js';
+import { formatJSONFile } from '../../../utils/fs/fs_utils.js';
+import { ThemeArchiveErrorsFactory } from './theme_archive_errors_factory.js';
+import { ThemeActionsUtils } from '../../features/theme/actions/theme_actions_utils.js';
+import { filterFiles } from '../../utils/shoperignore/shoperignore_utils.js';
+export class ThemeArchive {
+    #themeRootDir;
+    constructor(themeRootDir) {
+        this.#themeRootDir = themeRootDir;
+    }
+    async createFullArchive({ dist, actionValue, actionType, logger }) {
+        const filesStructure = await ThemeFilesUtils.getThemeFilesStructure(this.#themeRootDir);
+        if (!filesStructure) {
+            throw new Error('Files structure not found');
+        }
+        try {
+            const filesInThemeDirectory = await globs(ThemeActionsUtils.getFilesGlobsThatMatchesAction({
+                actionType,
+                actionValue,
+                filesStructure
+            }), {
+                suppressErrors: true,
+                onlyFiles: true,
+                cwd: this.#themeRootDir
+            });
+            const filteredFiles = await filterFiles(filesInThemeDirectory, this.#themeRootDir);
+            await this._formatJsonFiles(this.#themeRootDir, filteredFiles);
+            await createZip({
+                baseDir: this.#themeRootDir,
+                dist,
+                files: filteredFiles,
+                logger
+            });
+        }
+        catch (err) {
+            throw ThemeArchiveErrorsFactory.createErrorWhileCreatingThemeArchive(err);
+        }
+    }
+    async _formatJsonFiles(themeRootDir, filesToUpload) {
+        await Promise.all(filesToUpload
+            .filter((path) => extname(path).toLowerCase() === '.json')
+            .map((jsonFile) => formatJSONFile(join(themeRootDir, jsonFile))));
+    }
+}

package/build/theme/class/archive/theme_archive_errors_factory.js

@@ -0,0 +1,11 @@
+import { AppError } from '../../../cli/utilities/features/logger/logs/app_error.js';
+export class ThemeArchiveErrorsFactory {
+    static createErrorWhileCreatingThemeArchive(error) {
+        return new AppError({
+            code: 'theme_archive.error_creating_archive',
+            message: `Error while creating theme archive`,
+            level: 'error',
+            error
+        });
+    }
+}

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

@@ -25,6 +25,8 @@ import { ThemeError } from '../ui/theme_error.js';
 import { mapToPermissionsTree } from '../../utils/directory_validator/directory_validator_utils.js';
 import { mapChecksumToTree } from '../../../utils/checksums/checksums_utils.js';
 import { ThemeUnpermittedActionsError } from './ui/theme_unpermitted_actions_error.js';
+import { validateThemeFolderStructure } from '../../utils/push_validators/push_path_validator_utils.js';
+import { ThemeInvalidFoldersError } from './ui/theme_invalid_folders_error.js';
 import { LOGGER_API_NAME } from '../../../cli/utilities/features/logger/logger_constants.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.';
@@ -86,8 +88,11 @@ export class ThemePushCommand extends BaseThemeCommand {
                 permissions: mapToPermissionsTree(permissions),
                 rootDirectory: executionContext.themeRootDir
             });
-            //TODO jak wysyla folder z nazwa posiadajaco \ na windows, wychodzimy
-            //TODO validacja folderów przed pushem
+            const folderStructureValidation = await validateThemeFolderStructure(executionContext.themeRootDir);
+            if (!folderStructureValidation.isValid) {
+                renderOnce(React.createElement(ThemeInvalidFoldersError, { invalidDirectories: folderStructureValidation.invalidDirectories }));
+                return;
+            }
             if (!validationResult.isValid) {
                 renderOnce(React.createElement(ThemeUnpermittedActionsError, { unpermittedActions: validationResult.unpermittedActions }));
                 return;

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

@@ -0,0 +1,16 @@
+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';
+import { ALLOWED_THEME_TOP_LEVEL_DIRECTORIES } from '../../../utils/push_validators/push_validator_constants.js';
+export const ThemeInvalidFoldersError = ({ invalidDirectories }) => {
+    const items = invalidDirectories.map((dir) => ({
+        content: dir
+    }));
+    return (React.createElement(Error, { header: "Invalid theme folder structure" },
+        React.createElement(Text, null, "The following directories are not allowed in the theme root:"),
+        React.createElement(List, { items: items }),
+        React.createElement(Text, null,
+            "Allowed top-level directories: ",
+            ALLOWED_THEME_TOP_LEVEL_DIRECTORIES.join(', '))));
+};

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

@@ -63,7 +63,7 @@ export class ThemeActionsUtils {
                             ? fileGlob.slice(0, fileGlob.length - 2)
                             : fileGlob;
                     }
-                    const deletedFiles = difference(checksumMatchedFiles, filteredFiles);
+                    const deletedFiles = difference(checksumMatchedFiles, files);
                     for (const filePath of [...filteredFiles, ...deletedFiles]) {
                         filesRecords.push({
                             actionData,

package/build/theme/utils/push_validators/push_path_validator_utils.js

@@ -0,0 +1,16 @@
+import { getAllDirectoriesNamesInside } from '../../../utils/fs/fs_utils.js';
+import { ALLOWED_THEME_TOP_LEVEL_DIRECTORIES } from './push_validator_constants.js';
+export const validateThemeFolderStructure = async (themeRootDir) => {
+    const directories = await getAllDirectoriesNamesInside(themeRootDir, { recursive: false, hidden: true });
+    const allowedSet = new Set(ALLOWED_THEME_TOP_LEVEL_DIRECTORIES);
+    const invalidDirectories = directories.filter((dir) => {
+        if (dir.startsWith('.') && !allowedSet.has(dir)) {
+            return false;
+        }
+        return !allowedSet.has(dir);
+    });
+    return {
+        isValid: invalidDirectories.length === 0,
+        invalidDirectories
+    };
+};

package/build/theme/utils/push_validators/push_validator_constants.js

@@ -0,0 +1,8 @@
+export const ALLOWED_THEME_TOP_LEVEL_DIRECTORIES = [
+    '.shoper',
+    'settings',
+    'styles',
+    'macros',
+    'modules',
+    'skinstore'
+];

package/build/theme/utils/shoperignore/shoperignore_utils.js

@@ -1,8 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import { join } from '../../../utils/path_utils.js';
 import { fileExists } from '../../../utils/fs/fs_utils.js';
-import ignoreModule from 'ignore';
-const ignore = ignoreModule;
+import ignore from 'ignore';
 export const SHOPER_IGNORE_FILE_NAME = '.shoperignore';
 export async function loadShoperIgnore(themeRootDir) {
     const shoperIgnorePath = join(themeRootDir, SHOPER_IGNORE_FILE_NAME);

package/build/utils/zip/create_zip_utils.js

@@ -5,7 +5,7 @@ import { createWriteStream } from 'node:fs';
 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 { join, toUnixPath } from '../path_utils.js';
 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();
@@ -29,14 +29,14 @@ export const createZip = async ({ files, dist, baseDir = process.cwd(), logger }
                     code: 'FILE_NOT_FOUND',
                     details: { file, baseDir }
                 });
+            const zipEntryName = toUnixPath(file);
             if (await isDirectory(fullPath)) {
-                logger.debug('Adding empty directory to zip', { details: { directory: file } });
-                zipfile.addEmptyDirectory(file);
+                logger.debug('Adding empty directory to zip', { details: { directory: zipEntryName } });
+                zipfile.addEmptyDirectory(zipEntryName);
             }
             else {
-                logger.debug('Adding file to zip', { details: { file, fullPath } });
-                zipfile.addFile(fullPath, file, {
-                    //TODO params
+                logger.debug('Adding file to zip', { details: { file: zipEntryName, fullPath } });
+                zipfile.addFile(fullPath, zipEntryName, {
                     compress: true
                 });
             }

package/package.json

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