@shoper/cli 0.1.0-7 → 0.1.0-8

package/build/utils/stream_transforms/json_indent_transform.js

@@ -0,0 +1,21 @@
+import { Transform } from 'node:stream';
+import { JSON_FILE_INDENT } from '../../cli/cli_constants.js';
+export const jsonIndentTransform = (space = JSON_FILE_INDENT) => {
+    let data = '';
+    return new Transform({
+        writableObjectMode: true,
+        transform(chunk, _, callback) {
+            data += chunk.toString();
+            callback();
+        },
+        flush(callback) {
+            if (!data) {
+                return callback();
+            }
+            const json = JSON.parse(data);
+            const pretty = JSON.stringify(json, null, space);
+            this.push(pretty);
+            callback();
+        }
+    });
+};

package/build/utils/url_utils.js

@@ -0,0 +1,9 @@
+export const isRelativeUrl = (url) => {
+    try {
+        const test = new URL(url, 'http://example.com');
+        return test.origin === 'http://example.com' && !url.startsWith('//');
+    }
+    catch {
+        return true;
+    }
+};

package/build/utils/zip/create_zip_utils.js

@@ -0,0 +1,80 @@
+import process from 'process';
+import { fileExists, isDirectory, removeFiles } from '../fs/fs_utils.js';
+import yazl from 'yazl';
+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 { AppError } from '../../cli/class/errors/app_error/app_error.js';
+export const createZip = async ({ files, dist, baseDir = process.cwd() }) => {
+    const zipfile = new yazl.ZipFile();
+    let hasError = false;
+    try {
+        for (let i = 0; i < files.length; ++i) {
+            const file = files[i];
+            if (!file)
+                continue;
+            const fullPath = join(baseDir, file);
+            if (!(await fileExists(fullPath)))
+                throw new AppError({
+                    message: `File does not exist: ${fullPath}`,
+                    code: 'FILE_NOT_FOUND',
+                    details: { file, baseDir }
+                });
+            if (await isDirectory(fullPath)) {
+                zipfile.addEmptyDirectory(file);
+            }
+            else {
+                zipfile.addFile(fullPath, file, {
+                    //TODO params
+                    compress: true
+                });
+            }
+        }
+        zipfile.end();
+    }
+    catch (err) {
+        throw new AppError({
+            message: 'Error creating zip file',
+            code: 'ZIP_CREATION_ERROR',
+            details: { files, dist, baseDir },
+            stack: err instanceof Error ? err.stack : undefined
+        });
+    }
+    return new Promise((resolve, reject) => {
+        const zipOutput = createWriteStream(dist);
+        zipOutput.on('error', (err) => {
+            hasError = true;
+            removeFiles(files).then(() => {
+                reject(new StreamWriteError({
+                    filePath: dist,
+                    details: { err },
+                    stack: err.stack
+                }));
+            });
+        });
+        zipfile.outputStream.pipe(zipOutput).on('close', () => {
+            if (hasError) {
+                removeFiles(files).then(() => {
+                    reject(new CreateZipError({
+                        file: dist,
+                        stack: new Error().stack
+                    }));
+                });
+                return;
+            }
+            resolve();
+        });
+        zipfile.outputStream.on('error', (err) => {
+            hasError = true;
+            removeFiles(files).then(() => {
+                reject(new StreamReadError({
+                    filePath: dist,
+                    details: { err },
+                    stack: err.stack
+                }));
+            });
+        });
+    });
+};

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

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

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

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

package/build/utils/zip/extract_zip_utils.js

@@ -0,0 +1,104 @@
+import yauzl from 'yauzl';
+import { directoryExists, makeDirectory, removeDirectory, removeDirectorySync, removeFile } from '../fs/fs_utils.js';
+import { dirname, join, looksLikeDirectory } from '../path_utils.js';
+import { createWriteStream } from 'node:fs';
+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 = () => [] }) => {
+    let createdDirectory = false;
+    if (!(await directoryExists(dist))) {
+        createdDirectory = true;
+        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 });
+                return reject(new OpenZipError({
+                    file: source,
+                    details: { err },
+                    stack: err.stack
+                }));
+            }
+            let activeEntries = 0;
+            let doneReadingEntries = false;
+            const extractedPaths = new Set();
+            zipfile.on('entry', (entry) => {
+                activeEntries++;
+                const filePath = join(dist, entry.fileName);
+                const dirPath = dirname(filePath);
+                processedFilesPath.push(filePath);
+                if (!filePath.startsWith(dist)) {
+                    return reject(new Error(`Invalid entry path: ${entry.fileName}`));
+                }
+                if (looksLikeDirectory(entry.fileName)) {
+                    zipfile.readEntry();
+                    return;
+                }
+                if (extractedPaths.has(filePath)) {
+                    return reject(new Error(`Duplicate entry path detected: ${filePath}`));
+                }
+                extractedPaths.add(filePath);
+                makeDirectory(dirPath, { recursive: true })
+                    .then(() => {
+                    zipfile.openReadStream(entry, async (err, readStream) => {
+                        if (err)
+                            return reject(err);
+                        const writeStream = createWriteStream(filePath);
+                        writeStream.on('finish', () => {
+                            activeEntries--;
+                            if (activeEntries === 0 && doneReadingEntries)
+                                resolve();
+                            zipfile.readEntry();
+                        });
+                        writeStream.on('error', async (err) => {
+                            await removeFile(filePath);
+                            reject(new StreamWriteError({
+                                filePath,
+                                details: { err },
+                                stack: err.stack
+                            }));
+                        });
+                        readStream.on('error', async (err) => {
+                            await removeFile(filePath, { force: true });
+                            reject(new StreamReadError({
+                                filePath,
+                                details: { err },
+                                stack: err.stack
+                            }));
+                        });
+                        const transforms = getTransforms(entry.fileName);
+                        if (transforms.length) {
+                            await pipeline(readStream, ...transforms, writeStream);
+                        }
+                        else {
+                            readStream.pipe(writeStream);
+                        }
+                    });
+                })
+                    .catch(reject);
+            });
+            zipfile.on('end', () => {
+                doneReadingEntries = true;
+                if (activeEntries === 0)
+                    resolve();
+            });
+            zipfile.on('error', async (err) => {
+                for (const filePath of processedFilesPath) {
+                    try {
+                        await removeFile(filePath, { force: true });
+                    }
+                    catch (removeErr) {
+                        console.error(`Error removing file ${filePath}:`, removeErr);
+                    }
+                }
+                createdDirectory && (await removeDirectory(dist, { recursive: true }));
+                reject(err);
+            });
+            zipfile.readEntry();
+        });
+    });
+};

package/oclif.config.js

@@ -17,8 +17,10 @@ export default {
     hooks: {
         prerun: [
             './build/cli/hooks/authorization/ensure_authorization_hook.js',
-            './build/cli/hooks/migration/migration_hook.js',
-            './build/cli/hooks/ensure_cli_initialized_hook.js'
+            './build/cli/hooks/ensure_cli_initialized_hook.js',
+            './build/theme/hooks/ensure_theme_meta_data_untouched.js',
+            './build/theme/hooks/ensure_theme_current_checksums_up_to_date.js',
+            './build/theme/hooks/themes_actions/ensure_themes_actions_hook.js'
         ]
     },
     topicSeparator: ' ',

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.1.0-7",
+    "version": "0.1.0-8",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -24,13 +24,13 @@
     "scripts": {
         "build": "rimraf ./build/ && tsc --project tsconfig.json",
         "watch": "rimraf ./build/ && tsc --watch --project tsconfig.json",
-        "test": "vitest --config config/vitest/vitest.config.ts --watch=false",
-        "test:watch": "vitest --config config/vitest/vitest.config.ts --watch=true",
+        "test": "jest --config config/jest/jest.config.mjs",
+        "test:watch": "jest --config config/jest/jest.config.mjs --no-cache --watch",
         "deploy:latest": "npm run build && npm publish --tag latest --access public",
         "deploy:beta": "npm run build && npm publish --tag beta --access public"
     },
     "dependencies": {
-        "@dreamcommerce/star_core": "1.7.7",
+        "@dreamcommerce/star_core": "1.8.1",
         "@oclif/core": "4.2.10",
         "@oclif/plugin-autocomplete": "3.2.27",
         "@oclif/plugin-help": "6.2.27",
@@ -38,29 +38,56 @@
         "@oclif/plugin-version": "2.2.27",
         "@oclif/plugin-warn-if-update-available": "3.1.38",
         "axios": "1.8.4",
+        "chalk": "5.4.1",
+        "conf": "13.1.0",
+        "ink": "5.2.1",
+        "inquirer": "12.5.2",
         "is-hidden-file": "1.1.2",
+        "jsonwebtoken": "9.0.2",
         "memfs": "4.17.0",
+        "ora": "8.2.0",
+        "react": "18.3.1",
         "reflect-metadata": "0.2.2",
         "rxjs": "7.8.2",
         "semver": "7.7.1",
         "tmp-promise": "3.0.3",
-        "unzipper": "0.12.3"
+        "yauzl": "3.2.0",
+        "yazl": "3.3.1",
+        "fs-tree-diff": "2.0.1",
+        "fast-glob": "3.3.3",
+        "klaw": "4.1.0",
+        "walk-sync": "3.0.0",
+        "lodash": "4.17.21",
+        "uuid": "11.1.0"
     },
     "devDependencies": {
+        "@babel/core": "7.27.1",
+        "@babel/preset-env": "7.27.2",
+        "@babel/preset-typescript": "7.27.1",
         "@oclif/test": "4.1.12",
         "@tsconfig/node18": "18.2.4",
+        "@types/jest": "29.5.14",
+        "@types/jsonwebtoken": "9.0.9",
         "@types/node": "18.19.84",
+        "@types/react": "19.1.3",
         "@types/semver": "7.7.0",
         "@types/tmp": "0.2.6",
-        "@types/unzipper": "0.10.11",
+        "@types/yauzl": "2.10.3",
+        "@types/yazl": "2.4.6",
+        "@types/klaw": "3.0.7",
+        "@types/lodash": "4.17.17",
         "@typescript-eslint/eslint-plugin": "8.29.1",
+        "babel-jest": "29.7.0",
         "eslint": "9.24.0",
         "eslint-config-prettier": "10.1.1",
         "eslint-plugin-prettier": "5.2.6",
+        "jest": "29.7.0",
         "module-alias": "2.2.3",
         "prettier": "3.5.3",
         "rimraf": "5.0.10",
+        "ts-jest": "29.3.2",
+        "ts-toolbelt": "9.6.0",
         "typescript": "5.8.3",
-        "vitest": "3.1.1"
+        "jest-extended": "4.0.2"
     }
 }

package/build/cli/hooks/migration/migration_hook.js

@@ -1,4 +0,0 @@
-const migrationHook = async () => {
-    //TODO
-};
-export default migrationHook;

package/build/theme/commands/list_command.js

@@ -1,12 +0,0 @@
-import { BaseThemeCommand } from '../class/base_theme_command.js';
-import { SHOPER_THEMES_API_NAME } from '../features/themes/shoper_themes_constants.js';
-export class ThemeListCommand extends BaseThemeCommand {
-    static description = 'List all shop themes';
-    async run() {
-        const themesApi = this.getApi(SHOPER_THEMES_API_NAME);
-        // TODO get credentials from api
-        const themes = await themesApi.getThemes('https://shoper.docker.shoper.tech');
-        //TODO UI
-        this.log('themes', themes);
-    }
-}

package/build/theme/commands/pull_command.js

@@ -1,24 +0,0 @@
-import { Args } from '@oclif/core';
-import { BaseThemeCommand } from '../class/base_theme_command.js';
-export class ThemePullCommand extends BaseThemeCommand {
-    static description = 'Pull theme from shop';
-    static args = {
-        id: Args.string({
-            description: 'Theme id',
-            name: 'id',
-            required: true,
-            type: 'string'
-        })
-    };
-    async run() {
-        const data = await this.parse(ThemePullCommand);
-        const { args } = data;
-        //TODO sprawdamy z lista sików przed pullem?
-        //TDOO jezeli nie ma id, pobierz z kontekstu jezeli jest w theme
-        const themeId = args.id;
-        // TODO some automation
-        // const themePullApi = new ShoperThemePullInitializer().init();
-        // TODO get credentials from api
-        // await themePullApi.pullTheme('https://shoper.docker.shoper.tech', themeId);
-    }
-}

package/build/theme/features/theme/directory/theme_directories_utils.js

@@ -1,10 +0,0 @@
-import { getAllDirectoriesInside } from '../../../../utils/fs.js';
-import { join } from '../../../../utils/path.js';
-import { ThemeDirectoryUtils } from './theme_directory_utils.js';
-import { asyncFilter } from '../../../../utils/array_utils.js';
-export class ThemeDirectoriesUtils {
-    static async getAllThemesDirectories(path) {
-        const directories = await getAllDirectoriesInside(path);
-        return asyncFilter(directories, async (directory) => ThemeDirectoryUtils.isThemeRootDirectory(join(path, directory)));
-    }
-}

package/build/theme/features/theme/pull/api/shoper_theme_pull_api.js

@@ -1,9 +0,0 @@
-export class ShoperThemePullApi {
-    #service;
-    constructor(service) {
-        this.#service = service;
-    }
-    async pullTheme(shopUrl, id) {
-        return this.#service.pullTheme(shopUrl, id);
-    }
-}

package/build/theme/features/theme/pull/http/shoper_theme_pull_http_api.js

@@ -1,14 +0,0 @@
-//TODO
-export class ShoperThemePullHttpApi {
-    #httpApi;
-    constructor(httpApi) {
-        this.#httpApi = httpApi;
-    }
-    pullTheme(shopUrl, id) {
-        const controller = new AbortController();
-        const resp = fetch(`${shopUrl}/webapi/cli/themes/${id}`, {
-            signal: controller.signal
-        });
-        return { response: resp, controller };
-    }
-}

package/build/theme/features/theme/pull/service/shoper_theme_pull_service.js

@@ -1,68 +0,0 @@
-import { createWriteStream } from 'fs';
-import { basename, extname } from '../../../../../utils/path.js';
-import unzipper from 'unzipper';
-import tmp from 'tmp-promise';
-import { EXECUTION_CONTEXTS } from '../../../../../cli/features/execution_context/execution_context_constants.js';
-//TODO fix
-let currentRequest;
-export class ShoperThemePullService {
-    #httpApi;
-    #executionContext;
-    constructor({ httpApi, executionContext }) {
-        this.#httpApi = httpApi;
-        this.#executionContext = executionContext;
-    }
-    async pullTheme(shopUrl, id) {
-        if (currentRequest)
-            currentRequest.abort();
-        //TODO error handling
-        const { response, controller } = this.#httpApi.pullTheme(shopUrl, id);
-        currentRequest = controller;
-        const resp = await response;
-        if (resp.status === 405) {
-            //TODO not authenticated
-            throw new Error('Theme not found');
-        }
-        if (resp.status !== 200) {
-            //TODO handle error
-            throw new Error('Theme not found');
-        }
-        const { path, cleanup } = await tmp.dir({
-            unsafeCleanup: true
-        });
-        const filename = /filename="([^"]+)"/.exec(resp.headers.get('content-disposition') ?? '')?.[1];
-        if (!filename) {
-            //TODO handle error
-            throw new Error(`Missing Filename in a content-disposition header ${resp.headers.get('content-disposition') ?? ''}`);
-        }
-        const file = createWriteStream(`${path}/${filename}`);
-        file.on('finish', async () => {
-            file.close();
-            await this._extractToSpecificDirectory(file.path, path);
-            await cleanup();
-        });
-        file.on('error', (err) => {
-            console.log('err', err);
-            //TODO
-        });
-        //@ts-ignore
-        resp.body?.pipe(file);
-    }
-    async _extractToSpecificDirectory(archivePath, tmpDir) {
-        console.log('executionContext', this.#executionContext);
-        const filenameWithoutExtension = basename(archivePath, extname(archivePath));
-        const directory = await unzipper.Open.file(archivePath);
-        await directory.extract({ path: `${tmpDir}/${filenameWithoutExtension}` });
-        //TODO check if theme exist
-        if (this.#executionContext.type === EXECUTION_CONTEXTS.global) {
-            //czek if folder exist
-            //czek if theme + shop exist
-            //if folder not exist create
-            // if folder exist clear images file
-            // fetch images while copying theme
-        }
-        if (this.#executionContext.type === EXECUTION_CONTEXTS.theme) {
-            //TODO save in storage
-        }
-    }
-}

package/build/theme/features/theme/pull/shoper_theme_pull_initializer.js

@@ -1,22 +0,0 @@
-import { ShoperThemePullService } from './service/shoper_theme_pull_service.js';
-import { ShoperThemePullHttpApi } from './http/shoper_theme_pull_http_api.js';
-import { ShoperThemePullApi } from './api/shoper_theme_pull_api.js';
-import { AsyncFeatureInitializer, FEATURE_CORES_TYPES, HTTP_REQUESTER_API_NAME } from '@dreamcommerce/star_core';
-export class ShoperThemePullInitializer extends AsyncFeatureInitializer {
-    async init() {
-        const httpApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
-        const executionContextApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
-        const service = new ShoperThemePullService({
-            httpApi: new ShoperThemePullHttpApi(httpApi),
-            executionContext: await executionContextApi.getExecutionContext()
-        });
-        return {
-            cores: [
-                {
-                    type: FEATURE_CORES_TYPES.api,
-                    instance: new ShoperThemePullApi(service)
-                }
-            ]
-        };
-    }
-}

package/build/theme/features/themes/api/shoper_themes_api.js

@@ -1,14 +0,0 @@
-import { FeatureApi } from '@dreamcommerce/star_core';
-import { SHOPER_THEMES_API_NAME } from '../shoper_themes_constants.js';
-export class ShoperThemesApi extends FeatureApi {
-    moduleName = SHOPER_THEMES_API_NAME;
-    #service;
-    constructor(service) {
-        super();
-        this.#service = service;
-    }
-    //credentialObject
-    async getThemes(shopUrl) {
-        return this.#service.getThemes(shopUrl);
-    }
-}

package/build/theme/features/themes/services/shoper_themes_service.js

@@ -1,15 +0,0 @@
-import { STATUS_CODES } from '@dreamcommerce/star_core';
-export class ShoperThemesService {
-    httpApi;
-    constructor(httpApi) {
-        this.httpApi = httpApi;
-    }
-    async getThemes(shopUrl) {
-        //TODO error handling
-        const { response } = this.httpApi.getThemes(shopUrl);
-        const { data, status } = await response;
-        if (status !== STATUS_CODES.ok)
-            return;
-        return data;
-    }
-}

package/build/theme/features/themes/shoper_themes_constants.js

@@ -1,2 +0,0 @@
-export const SHOPER_THEMES_FEATURE_NAME = 'ShoperThemes';
-export const SHOPER_THEMES_API_NAME = 'ShoperThemesApi';

package/build/theme/features/themes/shoper_themes_initalizer.js

@@ -1,20 +0,0 @@
-import { ShoperThemesService } from './services/shoper_themes_service.js';
-import { ShoperThemesApi } from './api/shoper_themes_api.js';
-import { ShoperThemesHttpApi } from './http/shoper_themes_http_api.js';
-import { FEATURE_CORES_TYPES, HTTP_REQUESTER_API_NAME, SyncFeatureInitializer } from '@dreamcommerce/star_core';
-import { SHOPER_THEMES_FEATURE_NAME } from './shoper_themes_constants.js';
-export class ShoperThemesInitializer extends SyncFeatureInitializer {
-    static featureName = SHOPER_THEMES_FEATURE_NAME;
-    init() {
-        const httpApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
-        const service = new ShoperThemesService(new ShoperThemesHttpApi(httpApi));
-        return {
-            cores: [
-                {
-                    type: FEATURE_CORES_TYPES.api,
-                    instance: new ShoperThemesApi(service)
-                }
-            ]
-        };
-    }
-}

package/build/utils/fs.js

@@ -1,44 +0,0 @@
-import fsPromises from 'fs/promises';
-import { isHiddenFile } from 'is-hidden-file';
-import process from 'process';
-import { resolve } from './path.js';
-import { parse as parsePath } from 'path';
-export const fileExists = async (path) => {
-    try {
-        await fsPromises.access(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-};
-export const directoryExists = async (path) => {
-    return fileExists(path);
-};
-export const readFile = async (path, options) => {
-    return fsPromises.readFile(path, options);
-};
-export const makeDirectory = async (path, options = {}) => {
-    return await fsPromises.mkdir(path, { recursive: false, ...options });
-};
-export const getAllDirectoriesInside = async (path, { hidden } = { hidden: true }) => {
-    const files = await fsPromises.readdir(path, {
-        recursive: true,
-        withFileTypes: true
-    });
-    return files.filter((file) => file.isDirectory() && (hidden ? true : !isHiddenFile(file.name))).map((file) => file.name);
-};
-export const closestFile = async (fileToFind, path = process.cwd()) => {
-    let currPath = path;
-    const rootDir = getOSRootDirectory();
-    while (currPath !== rootDir) {
-        const exists = await fileExists(resolve(currPath, fileToFind));
-        if (exists)
-            return currPath;
-        currPath = resolve(currPath, '..');
-    }
-};
-export const closestDirectory = async (path) => {
-    return closestFile(path);
-};
-export const getOSRootDirectory = () => parsePath(process.cwd()).root;

package/build/utils/path.js

@@ -1,13 +0,0 @@
-import { resolve as resolvePath, parse as parsePath, join as pathJoin, basename as pathBaseName, dirname as pathDirname, extname as pathExtname } from 'path';
-export const resolve = (...paths) => {
-    return resolvePath(...paths);
-};
-export const parse = (path) => {
-    return parsePath(path);
-};
-export const join = (...paths) => {
-    return pathJoin(...paths);
-};
-export const basename = (path, ext) => pathBaseName(path, ext);
-export const dirname = (path) => pathDirname(path);
-export const extname = (path) => pathExtname(path);