@shoper/cli 0.2.1-3 → 0.2.1-5

package/build/cli/auth/api/cli_auth_api.js

@@ -13,4 +13,7 @@ export class CliAuthApi extends FeatureApi {
     hasCredentialsExpired() {
         return this.#cliAuthService.hasCredentialsExpired();
     }
+    clearCredentials() {
+        return this.#cliAuthService.clearCredentials();
+    }
 }

package/build/cli/auth/service/cli_auth_service.js

@@ -31,4 +31,8 @@ export class CliAuthService {
             return true;
         return this.#cliAuthTokensApi.hasTokenExpired(defaultTokenIndex);
     }
+    clearCredentials() {
+        this.#credentials = null;
+        this.#cliAuthTokensApi.clearTokens();
+    }
 }

package/build/cli/auth/tokens/api/cli_auth_tokens_api.js

@@ -43,4 +43,7 @@ export class CliAuthTokensApi extends FeatureApi {
     validateToken(token) {
         return this.#service.validateToken(token);
     }
+    clearTokens() {
+        this.#service.clearTokens();
+    }
 }

package/build/cli/auth/tokens/cli_auth_tokens_utils.js

@@ -1,4 +1,5 @@
 import jwt from 'jsonwebtoken';
+import differenceBy from 'lodash/differenceBy.js';
 export class CLiAuthTokensUtils {
     static getTokenPayload(token) {
         try {
@@ -33,13 +34,15 @@ export class CLiAuthTokensUtils {
             if (!decoded) {
                 return { isValid: false, message: 'Failed to decode token.' };
             }
-            const { header } = decoded;
             const payload = decoded.payload;
-            const expectedPayloadKeys = ['sub', 'exp', 'iat', 'iss', 'nbf', 'scope', 'id', 'name', 'key'];
-            for (const key of Object.keys(payload)) {
-                if (!expectedPayloadKeys.includes(key)) {
-                    return { isValid: false, message: `Unexpected key in payload: ${key}` };
-                }
+            const expectedPayloadKeys = ['exp', 'iat', 'iss', 'nbf', 'scope', 'id', 'name', 'key'];
+            const missingKeys = differenceBy(expectedPayloadKeys, Object.keys(payload));
+            if (missingKeys.length > 0) {
+                return { isValid: false, message: `Missing keys in payload: ${missingKeys.join(', ')}` };
+            }
+            const unexpectedKeys = differenceBy(Object.keys(payload), expectedPayloadKeys);
+            if (unexpectedKeys.length > 0) {
+                return { isValid: false, message: `Unexpected keys in payload: ${unexpectedKeys.join(', ')}` };
             }
             // Check if the token has expired
             const now = Math.floor(Date.now() / 1000); // Current time in seconds

package/build/cli/auth/tokens/service/cli_auth_tokens_service.js

@@ -86,4 +86,7 @@ export class CLiAuthTokensService {
         const tokens = this._getTokenItems();
         return tokens.map((tokenItem) => CLiAuthTokensUtils.getTokenPayload(tokenItem.token));
     }
+    clearTokens() {
+        this.#tokensStore.clear();
+    }
 }

package/build/cli/class/caches/json_cache/json_cache.js

@@ -8,6 +8,7 @@ export class JsonCache extends FeatureCore {
         this.#cache = new Conf({
             cwd: path,
             configName: name,
+            clearInvalidConfig: true,
             configFileMode,
             ...rest
         });

package/build/cli/commands/cli_clean_cache.js

@@ -0,0 +1,26 @@
+import { BaseCliCommand } from '../class/base_cli_command.js';
+import { THEME_ACTIONS_API_NAME } from '../../theme/features/theme/actions/theme_actions_constants.js';
+import { CLI_AUTH_API_NAME } from '../auth/cli_auth_constants.js';
+import { renderOnce } from '../../ui/ui_utils.js';
+import { Success } from '../../ui/message_box/success.js';
+import React from 'react';
+import { Error } from '../../ui/message_box/error.js';
+import { Box } from '../../ui/box.js';
+import { Text } from '../../ui/text.js';
+export class CliCleanCache extends BaseCliCommand {
+    static summary = 'Clears all cached data';
+    async run() {
+        const themeActionsApi = this.getApi(THEME_ACTIONS_API_NAME);
+        const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
+        try {
+            themeActionsApi.clearAllActions();
+            cliAuthApi.clearCredentials();
+            renderOnce(React.createElement(Success, { header: "Cache cleared" }));
+        }
+        catch (err) {
+            renderOnce(React.createElement(Error, { header: "Error during cache cleaning" },
+                React.createElement(Box, null,
+                    React.createElement(Text, null, err.toString()))));
+        }
+    }
+}

package/build/cli/commands/commands_constants.js

@@ -7,5 +7,6 @@ export const CLI_COMMANDS_NAMES = {
     authAddToken: `${CLI_AUTH_TOPIC_NAME}:add-token`,
     authRemoveToken: `${CLI_AUTH_TOPIC_NAME}:remove-token`,
     switchToken: `${CLI_AUTH_TOPIC_NAME}:switch-token`,
-    uiDump: 'ui-dump'
+    uiDump: 'ui-dump',
+    cleanCache: 'clean-cache'
 };

package/build/cli/core/cli_setup.js

@@ -11,6 +11,8 @@ import { CliAuthInitializer } from '../auth/cli_auth_initializer.js';
 import { THEME_TOPIC_NAME } from '../../theme/commands/theme_commands_constants.js';
 import { getThemeInitializersForCommand } from '../../theme/index.js';
 import { CLI_AUTH_TOPIC_NAME, CLI_COMMANDS_NAMES } from '../commands/commands_constants.js';
+import { ThemeActionsInitializer } from '../../theme/features/theme/actions/theme_actions_initializer.js';
+import { ThemesListInitializer } from '../../theme/features/themes/list/themes_list_initializer.js';
 tmp.setGracefulCleanup();
 export const cliSetup = async () => {
     //TODO jakis ładny komuniakt błedu
@@ -52,12 +54,15 @@ const getCommandWithTopicBaseInitializers = () => {
     return [];
 };
 const getCommandWithoutTopicBaseInitializers = () => {
-    const command = process.argv[3];
+    const command = process.argv[2];
     switch (command) {
         case CLI_COMMANDS_NAMES.version:
         case CLI_COMMANDS_NAMES.update: {
             return [CliVersionInitializer];
         }
+        case CLI_COMMANDS_NAMES.cleanCache: {
+            return [ThemesListInitializer, ThemeActionsInitializer];
+        }
     }
     return [];
 };

package/build/index.js

@@ -8,6 +8,7 @@ import { CliAuthAddTokenCommand } from './cli/commands/auth/cli_auth_add_token_c
 import { CliAuthRemoveTokenCommand } from './cli/commands/auth/cli_auth_remove_token_command.js';
 import { CliAuthSwitchTokenCommand } from './cli/commands/auth/cli_auth_switch_token_command.js';
 import { CliUIDumpCommand } from './cli/commands/cli_ui_dump_command.js';
+import { CliCleanCache } from './cli/commands/cli_clean_cache.js';
 //TODO
 //@ts-ignore
 if (typeof global.crypto !== 'object') {
@@ -44,43 +45,7 @@ export const COMMANDS = {
     [CLI_COMMANDS_NAMES.authRemoveToken]: CliAuthRemoveTokenCommand,
     [CLI_COMMANDS_NAMES.switchToken]: CliAuthSwitchTokenCommand,
     [CLI_COMMANDS_NAMES.uiDump]: CliUIDumpCommand,
+    [CLI_COMMANDS_NAMES.cleanCache]: CliCleanCache,
     ...THEME_COMMANDS
 };
 export { runCLI } from './cli/index.js';
-/**
- * Przetestowane na win
- * oglne
- * moduly:
- *   - stworzony w admince
- *      - pull w cli - v
- *      - updejt modulu w adminc i pull w cli - v
- *      - zmiana nazwy katalogu w cli, modzenie w admince i pull - v
- *      - kopiowanie stworzonego modulu w admince i push (usuniety id i code) - v
- *      - zminaa w cli i push - v
- *   - tworzenie modulu w cli, min plikow i push
- *      - aktualizowanie js/twig/settings/schema
- *      - zmiana w adminc i pull
- *   - usuwanie modulu z cli - v
- *   - usuwanie modulu z adminki - v
- *   - dodanie niedozwolonego pliku do folderu modulu
- *   - dodanie niedozwolonego pliku do folderu modules/
- *   - translacje - v
- * macro:
- *   - dodawanie pliku do macros - v
- *   - usuniecie macro - v
- *   - modzneie makro - v
- *   - dodawanie customowego macro - v
- *   - push customowego macro - v
- *   - modzenie w admince i pull - v
- * settingsy:
- *   - uzupelniania schemy w admince, pull w cli
- *   - uzupelnianie wartosci a admince i pull
- *   - modzenie w cli
- *   - usuniecie pliku w cli
- * styles:
- *   - modzenie stylu w src - niedozwolone - v
- *   - modzenie custom - v
- *   - usuniecie custom - v
- *   - modzenie schema i settings - v
- * dodanie czegos w .shoper
- */

package/build/theme/features/theme/actions/api/theme_actions_api.js

@@ -19,4 +19,7 @@ export class ThemeActionsApi extends FeatureApi {
     removeThemeActions(props) {
         return this.#service.removeThemeActions(props);
     }
+    clearAllActions() {
+        return this.#service.clearAllActions();
+    }
 }

package/build/theme/features/theme/actions/service/theme_actions_service.js

@@ -101,4 +101,7 @@ export class ThemeActionsService {
             }
         });
     }
+    clearAllActions() {
+        this.#themesActionsStore.clear();
+    }
 }

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.2.1-3",
+    "version": "0.2.1-5",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -40,31 +40,31 @@
         "axios": "1.8.4",
         "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",
         "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",
-        "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",
-        "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"
+        "walk-sync": "3.0.0",
+        "yauzl": "3.2.0",
+        "yazl": "3.3.1"
     },
     "devDependencies": {
         "@babel/core": "7.27.1",
@@ -72,29 +72,29 @@
         "@babel/preset-typescript": "7.27.1",
         "@oclif/test": "4.1.12",
         "@tsconfig/node20": "20.1.6",
-        "@types/jest": "29.5.14",
         "@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",
         "@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",
+        "jest-extended": "4.0.2",
         "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",
-        "jest-extended": "4.0.2"
+        "typescript": "5.8.3"
     }
 }