@shoper/cli 0.1.0-33 → 0.1.0-34

package/build/cli/core/cli_setup.js

@@ -15,6 +15,7 @@ import { ThemeMergeInitializer } from '../../theme/features/theme/merge/theme_me
 import { ThemeActionsInitializer } from '../../theme/features/theme/actions/theme_actions_initializer.js';
 import { ThemePushInitializer } from '../../theme/features/theme/push/theme_push_initializer.js';
 import { ThemeDeleteInitializer } from '../../theme/features/theme/delete/theme_delete_initalizer.js';
+import { ThemeSkinstoreInitializer } from '../../theme/features/theme/skinstore/theme_skinstore_initialzier.js';
 tmp.setGracefulCleanup();
 export const cliSetup = async () => {
     //TODO jakis ładny komuniakt błedu
@@ -36,7 +37,8 @@ export const cliSetup = async () => {
             ThemeMergeInitializer,
             ThemeFetchInitializer,
             ThemePushInitializer,
-            ThemeDeleteInitializer
+            ThemeDeleteInitializer,
+            ThemeSkinstoreInitializer
         ],
         options: {
             featuresTracking: false,

package/build/theme/commands/publish/theme_publish_command.js

@@ -0,0 +1,77 @@
+import { Args } from '@oclif/core';
+import { BaseThemeCommand } from '../../class/base_theme_command.js';
+import { CLI_AUTH_API_NAME } from '../../../cli/auth/cli_auth_constants.js';
+import { THEME_ACTION_NOT_FOUND_ERROR_CODE } from '../../features/theme/actions/theme_actions_constants.js';
+import { EXECUTION_CONTEXT_API_NAME, EXECUTION_CONTEXTS } from '../../../cli/features/execution_context/execution_context_constants.js';
+import { renderOnce } from '../../../ui/ui_utils.js';
+import { MissingCredentialsError } from '../../../cli/commands/auth/ui/missing_credentials_error.js';
+import React from 'react';
+import { UnpermittedCommandError } from '../ui/unpermitted_command_error.js';
+import { Error } from '../../../ui/message_box/error.js';
+import { Text } from '../../../ui/text.js';
+import { MissingThemeIdError } from '../ui/missing_theme_id_error.js';
+import { THEME_SKINSTORE_API_NAME } from '../../features/theme/skinstore/theme_publish_constants.js';
+export class ThemePublishCommand extends BaseThemeCommand {
+    static summary = 'Permanently deletes the specified theme from your store.';
+    static description = 'This action cannot be undone, so make sure you really want to remove this theme.\n\nYou can run this command from a specific theme directory (ID not needed) or outside any theme directory (theme ID required).';
+    static examples = [
+        {
+            description: 'This will delete the theme with ID 123 permanently from your store. Make sure you have a backup if needed.',
+            command: '<%= config.bin %> <%= command.id %> 123'
+        }
+    ];
+    static hidden = true;
+    static args = {
+        id: Args.string({
+            description: 'Theme id',
+            name: 'id',
+            required: false,
+            type: 'string'
+        })
+    };
+    async run() {
+        const data = await this.parse(ThemePublishCommand);
+        const { args } = data;
+        const themeId = args.id;
+        const cliAuthApi = this.getApi(CLI_AUTH_API_NAME);
+        const executionContextApi = this.getApi(EXECUTION_CONTEXT_API_NAME);
+        const credentials = cliAuthApi.getCredentials();
+        if (!credentials) {
+            renderOnce(React.createElement(MissingCredentialsError, null));
+            return;
+        }
+        const executionContext = await executionContextApi.getExecutionContext();
+        try {
+            let _themeId = themeId;
+            if (executionContext.type !== EXECUTION_CONTEXTS.theme && !_themeId) {
+                return;
+            }
+            if (executionContext.type === EXECUTION_CONTEXTS.theme) {
+                _themeId = _themeId ?? executionContext.themeId;
+            }
+            if (!_themeId) {
+                renderOnce(React.createElement(MissingThemeIdError, null));
+                return;
+            }
+            const themeSkinstoreApi = this.getApi(THEME_SKINSTORE_API_NAME);
+            const formData = await themeSkinstoreApi.getPublishFormData();
+            console.log('formData', formData);
+        }
+        catch (err) {
+            this._handleError(err, themeId);
+            return;
+        }
+    }
+    _handleError(err, themeId) {
+        if (err?.code === THEME_ACTION_NOT_FOUND_ERROR_CODE && themeId) {
+            renderOnce(React.createElement(UnpermittedCommandError, { themeId: themeId, commandName: "delete" }));
+            return;
+        }
+        if (err?.message) {
+            renderOnce(React.createElement(Error, null,
+                React.createElement(Text, null, err.message)));
+            return;
+        }
+        this.error(String(err));
+    }
+}

package/build/theme/commands/pull/theme_pull_command.js

@@ -171,11 +171,13 @@ export class ThemePullCommand extends BaseThemeCommand {
                 dist: tmpDir
             }
         });
-        const themeModulesPath = join(executionContext.themeRootDir, 'modules');
-        if (await directoryExists(themeModulesPath))
-            await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(themeModulesPath, join(tmpDir, name, 'modules'), join(tmpDir, name));
+        const localModulesPath = join(executionContext.themeRootDir, 'modules');
+        const fetchedThemePath = join(tmpDir, name);
+        const fetchedModulesPath = join(fetchedThemePath, 'modules');
+        if ((await directoryExists(localModulesPath)) && (await directoryExists(fetchedModulesPath)))
+            await ThemeResourcesWithIdDirectoryUtils.updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localModulesPath, fetchedModulesPath, fetchedThemePath);
         this.#spinner.stop();
-        const changes = await themeMergeApi.getChangesBetweenThemes(join(tmpDir, name), executionContext.themeRootDir);
+        const changes = await themeMergeApi.getChangesBetweenThemes(fetchedThemePath, executionContext.themeRootDir);
         const themeChecksums = new ThemeChecksums(executionContext.themeRootDir);
         if (changes.length && (await themeChecksums.hasThemeBeenModified())) {
             renderOnce(React.createElement(ThemePullUnpublishedChangesWarning, { changes: changes }));

package/build/theme/commands/theme_commands_constants.js

@@ -6,5 +6,6 @@ export const THEME_COMMANDS_NAME = {
     showChanges: 'theme:show-changes',
     verify: 'theme:verify',
     info: 'theme:info',
-    delete: 'theme:delete'
+    delete: 'theme:delete',
+    publish: 'theme:publish'
 };

package/build/theme/features/theme/merge/service/theme_merge_service.js

@@ -1,8 +1,10 @@
 import FSTree from 'fs-tree-diff';
 import { copyFileSync, getAllDirectoriesNamesInside } from '../../../../../utils/fs/fs_utils.js';
 import walkSync from 'walk-sync';
-import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
 import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
+import { ThemeFilesStructureUtils } from '../../utils/files_structure/theme_files_structure_utils.js';
+import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
+import { join, platformSeparator } from '../../../../../utils/path_utils.js';
 export class ThemeMergeService {
     async applyChanges(fromTheme, toTheme, changes) {
         FSTree.applyPatch(fromTheme, toTheme, changes, {
@@ -24,10 +26,7 @@ export class ThemeMergeService {
         });
         const theme1Checksums = new ThemeChecksums(theme1);
         const theme2Checksums = new ThemeChecksums(theme2);
-        const rootDirectories = await getAllDirectoriesNamesInside(theme1, {
-            recursive: false,
-            hidden: true
-        });
+        const userDirectories = await this._getUserRootDirectories(theme2);
         return theme2Tree
             .calculatePatch(theme1Tree, (entryA, entryB) => {
             if (entryA.isDirectory() && entryB.isDirectory())
@@ -36,7 +35,14 @@ export class ThemeMergeService {
                 theme2Checksums.getCurrentChecksumFromPathSync(entryB.relativePath));
         })
             .filter(([_, name]) => {
-            return !name.startsWith(SHOPER_THEME_METADATA_DIR) && rootDirectories.some((rootDir) => name.startsWith(rootDir));
+            return !name.startsWith(SHOPER_THEME_METADATA_DIR) && !userDirectories.some((userDir) => name.startsWith(userDir));
         });
     }
+    async _getUserRootDirectories(themeDir) {
+        const filesStructure = await ThemeFilesStructureUtils.getThemeRootDirectories(themeDir);
+        return (await getAllDirectoriesNamesInside(themeDir, {
+            recursive: false,
+            hidden: true
+        })).filter((directory) => !filesStructure.includes(join(directory, platformSeparator)));
+    }
 }

package/build/theme/features/theme/skinstore/api/theme_skinstore_api.js

@@ -1,5 +1,7 @@
 import { FeatureApi } from '@dreamcommerce/star_core';
+import { THEME_SKINSTORE_API_NAME } from '../theme_publish_constants.js';
 export class ThemeSkinstoreApi extends FeatureApi {
+    moduleName = THEME_SKINSTORE_API_NAME;
     #service;
     constructor(service) {
         super();

package/build/theme/features/theme/skinstore/theme_publish_constants.js

@@ -1,2 +1,4 @@
 export const THEME_SKINSTORE_LOCATION = 'skinstore';
 export const THEME_SKINSTORE_SETTINGS_FILE_NAME = 'settings.json';
+export const THEME_SKINSTORE_API_NAME = 'ThemeSkinstoreApi';
+export const THEME_SKINSTORE_FEATURE_NAME = 'ThemeSkinstore';

package/build/theme/features/theme/skinstore/theme_skinstore_initialzier.js

@@ -0,0 +1,20 @@
+import { FEATURE_CORES_TYPES, HTTP_REQUESTER_API_NAME, SyncFeatureInitializer } from '@dreamcommerce/star_core';
+import { THEME_SKINSTORE_FEATURE_NAME } from './theme_publish_constants.js';
+import { ThemeSkinstoreService } from './service/theme_skinstore_service.js';
+import { ThemeSkinstoreHttpApi } from './http/theme_skinstore_http_api.js';
+import { ThemeSkinstoreApi } from './api/theme_skinstore_api.js';
+export class ThemeSkinstoreInitializer extends SyncFeatureInitializer {
+    static featureName = THEME_SKINSTORE_FEATURE_NAME;
+    init() {
+        const httpApi = this.getApiSync(HTTP_REQUESTER_API_NAME);
+        const service = new ThemeSkinstoreService(new ThemeSkinstoreHttpApi(httpApi));
+        return {
+            cores: [
+                {
+                    type: FEATURE_CORES_TYPES.api,
+                    instance: new ThemeSkinstoreApi(service)
+                }
+            ]
+        };
+    }
+}

package/build/theme/features/theme/utils/files_structure/theme_files_structure_utils.js

@@ -1,5 +1,5 @@
 import { readJSONFile, writeJSONFile } from '../../../../../utils/fs/fs_utils.js';
-import { join, mapKeysPathsToWindowPlatform } from '../../../../../utils/path_utils.js';
+import { join, looksLikeDirectory, mapKeysPathsToWindowPlatform } from '../../../../../utils/path_utils.js';
 import { SHOPER_THEME_METADATA_DIR } from '../../../../constants/directory_contstants.js';
 import { THEME_FILES_STRUCTURE_FILE_NAME } from '../../theme_constants.js';
 import { isWindowsOs } from '../../../../../utils/platform_utils.js';
@@ -31,4 +31,10 @@ export class ThemeFilesStructureUtils {
             rootDirectory
         });
     }
+    static async getThemeRootDirectories(themeDirectory) {
+        const filesStructure = await ThemeFilesStructureUtils.getThemeFilesStructure(themeDirectory);
+        return Object.keys(filesStructure).filter((path) => {
+            return looksLikeDirectory(path);
+        });
+    }
 }

package/build/theme/features/theme/utils/resources/theme_resources_with_id_directory_utils.js

@@ -3,7 +3,7 @@ import walkSync from 'walk-sync';
 import { THEME_FILES_OPERATIONS } from '../../merge/theme_merge_constants.js';
 import { fileExists, readJSONFile, renameFile } from '../../../../../utils/fs/fs_utils.js';
 import { join } from '../../../../../utils/path_utils.js';
-import { ThemeChecksums } from '../../../../../theme/class/checksums/theme_checksums.js';
+import { ThemeChecksums } from '../../../../class/checksums/theme_checksums.js';
 export class ThemeResourcesWithIdDirectoryUtils {
     static async updateDirectoryNamesOfResourcesWithIdAccordingToLocalThemeNames(localResourcesDir, remoteResourcesDir, remoteThemeDir) {
         const localThemeTree = new FSTree({

package/build/theme/index.js

@@ -7,6 +7,7 @@ import { ThemeShowChangesCommand } from './commands/theme_show_changes_command.j
 import { ThemeVerifyCommand } from './commands/theme_verify_command.js';
 import { ThemeInfoCommand } from './commands/info/theme_info_command.js';
 import { ThemeDeleteCommand } from './commands/delete/theme_delete_command.js';
+import { ThemePublishCommand } from './commands/publish/theme_publish_command.js';
 export const COMMANDS = {
     [THEME_COMMANDS_NAME.list]: ThemeListCommand,
     [THEME_COMMANDS_NAME.pull]: ThemePullCommand,
@@ -15,5 +16,6 @@ export const COMMANDS = {
     [THEME_COMMANDS_NAME.showChanges]: ThemeShowChangesCommand,
     [THEME_COMMANDS_NAME.verify]: ThemeVerifyCommand,
     [THEME_COMMANDS_NAME.info]: ThemeInfoCommand,
-    [THEME_COMMANDS_NAME.delete]: ThemeDeleteCommand
+    [THEME_COMMANDS_NAME.delete]: ThemeDeleteCommand,
+    [THEME_COMMANDS_NAME.publish]: ThemePublishCommand
 };

package/package.json

@@ -2,7 +2,7 @@
     "name": "@shoper/cli",
     "packageManager": "yarn@3.2.0",
     "sideEffects": false,
-    "version": "0.1.0-33",
+    "version": "0.1.0-34",
     "description": "CLI tool for Shoper",
     "author": "Joanna Firek",
     "license": "MIT",
@@ -30,7 +30,7 @@
         "deploy:beta": "npm run build && npm version prerelease --no-git-tag-version && npm publish --tag beta --access public"
     },
     "dependencies": {
-        "@dreamcommerce/star_core": "1.8.2-3",
+        "@dreamcommerce/star_core": "1.8.5",
         "@oclif/core": "4.2.10",
         "@oclif/plugin-autocomplete": "3.2.27",
         "@oclif/plugin-help": "6.2.27",