@contentstack/cli-cm-export 1.16.3 → 1.18.0

package/lib/utils/export-config-handler.js

@@ -11,8 +11,12 @@ const basic_login_1 = tslib_1.__importDefault(require("./basic-login"));
 const lodash_1 = require("lodash");
 const setupConfig = async (exportCmdFlags) => {
     let config = (0, merge_1.default)({}, config_1.default);
+    // Track authentication method
+    let authenticationMethod = 'unknown';
+    cli_utilities_1.log.debug('Setting up export configuration');
     // setup the config
     if (exportCmdFlags['config']) {
+        cli_utilities_1.log.debug('Loading external configuration file', { configFile: exportCmdFlags['config'] });
         const externalConfig = await (0, file_helper_1.readFile)(exportCmdFlags['config']);
         config = merge_1.default.recursive(config, externalConfig);
     }
@@ -30,26 +34,46 @@ const setupConfig = async (exportCmdFlags) => {
     config.data = config.exportDir;
     const managementTokenAlias = exportCmdFlags['management-token-alias'] || exportCmdFlags['alias'];
     if (managementTokenAlias) {
+        cli_utilities_1.log.debug('Using management token alias', { alias: managementTokenAlias });
         const { token, apiKey } = cli_utilities_1.configHandler.get(`tokens.${managementTokenAlias}`) || {};
         config.management_token = token;
         config.apiKey = apiKey;
+        authenticationMethod = 'Management Token';
         if (!config.management_token) {
+            cli_utilities_1.log.debug('Management token not found for alias', { alias: managementTokenAlias });
             throw new Error(`No management token found on given alias ${managementTokenAlias}`);
         }
+        cli_utilities_1.log.debug('Management token configuration successful');
     }
     if (!config.management_token) {
         if (!(0, cli_utilities_1.isAuthenticated)()) {
+            cli_utilities_1.log.debug('User not authenticated, checking for basic auth credentials');
             if (config.username && config.password) {
+                cli_utilities_1.log.debug('Using basic authentication with username/password');
                 await (0, basic_login_1.default)(config);
+                authenticationMethod = 'Basic Auth';
+                cli_utilities_1.log.debug('Basic authentication successful');
             }
             else {
+                cli_utilities_1.log.debug('No authentication method available');
                 throw new Error('Please login or provide an alias for the management token');
             }
         }
         else {
+            // Check if user is authenticated via OAuth
+            const isOAuthUser = cli_utilities_1.configHandler.get('authorisationType') === 'OAUTH' || false;
+            if (isOAuthUser) {
+                authenticationMethod = 'OAuth';
+                cli_utilities_1.log.debug('User authenticated via OAuth');
+            }
+            else {
+                authenticationMethod = 'Basic Auth';
+                cli_utilities_1.log.debug('User authenticated via auth token');
+            }
             config.apiKey =
                 exportCmdFlags['stack-uid'] || exportCmdFlags['stack-api-key'] || config.source_stack || (await (0, interactive_1.askAPIKey)());
             if (typeof config.apiKey !== 'string') {
+                cli_utilities_1.log.debug('Invalid API key received', { apiKey: config.apiKey });
                 throw new Error('Invalid API key received');
             }
         }
@@ -75,6 +99,26 @@ const setupConfig = async (exportCmdFlags) => {
     if (Array.isArray(config.filteredModules) && config.filteredModules.length > 0) {
         config.modules.types = (0, lodash_1.filter)(config_1.default.modules.types, (module) => (0, lodash_1.includes)(config.filteredModules, module));
     }
+    // Handle query flag - can be inline JSON or file path
+    if (exportCmdFlags['query']) {
+        try {
+            const queryInput = exportCmdFlags['query'];
+            // Check if it's a file path (contains .json extension or path separators)
+            if (queryInput.includes('.json') || queryInput.includes('/') || queryInput.includes('\\')) {
+                // Try to read as file path
+                config.query = await (0, file_helper_1.readFile)(queryInput);
+            }
+            else {
+                config.query = JSON.parse(queryInput);
+            }
+        }
+        catch (error) {
+            throw new Error(`Invalid query format: ${error.message}`);
+        }
+    }
+    // Add authentication details to config for context tracking
+    config.authenticationMethod = authenticationMethod;
+    cli_utilities_1.log.debug('Export configuration setup completed', Object.assign({}, config));
     return config;
 };
 exports.default = setupConfig;

package/lib/utils/marketplace-app-helper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodeCryptoInstance = exports.getOrgUid = exports.getDeveloperHubUrl = void 0;
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const utils_1 = require("../utils");
 const getDeveloperHubUrl = async (exportConfig) => {
     return (0, cli_utilities_1.createDeveloperHubUrl)(exportConfig.host);
 };
@@ -13,7 +12,7 @@ async function getOrgUid(config) {
         .stack({ api_key: config.source_stack })
         .fetch()
         .catch((error) => {
-        (0, utils_1.log)(config, (0, utils_1.formatError)(error), 'error');
+        (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, config.context));
     });
     return tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid;
 }

package/lib/utils/setup-branches.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
-const file_helper_1 = require("./file-helper");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const file_helper_1 = require("./file-helper");
 const setupBranches = async (config, stackAPIClient) => {
     if (typeof config !== 'object') {
         throw new Error('Invalid config to setup the branch');

package/lib/utils/setup-export-dir.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const file_helper_1 = require("./file-helper");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const file_helper_1 = require("./file-helper");
 async function setupExportDir(exportConfig) {
     (0, file_helper_1.makeDirectory)(exportConfig.exportDir);
     if (exportConfig.branches) {

package/messages/index.json

@@ -1 +1,69 @@
-{}
+{
+"ASSET_EXPORT_COMPLETE": "Asset export process completed successfully",
+"ASSET_FOLDERS_EXPORT_COMPLETE": "Asset folder structure exported successfully",
+"ASSET_METADATA_EXPORT_COMPLETE": "Asset metadata exported successfully",
+"ASSET_VERSIONED_METADATA_EXPORT_COMPLETE": "Versioned asset metadata exported successfully",
+"ASSET_DOWNLOAD_COMPLETE": "Asset download completed successfully",
+"ASSET_DOWNLOAD_SUCCESS": "Asset '%s' (UID: %s) downloaded successfully",
+"ASSET_DOWNLOAD_FAILED": "Failed to download asset '%s' (UID: %s)",
+"ASSET_WRITE_FAILED": "Failed to write asset file '%s' (UID: %s)",
+"ASSET_QUERY_FAILED": "Failed to query asset data from the API",
+"ASSET_VERSIONED_QUERY_FAILED": "Failed to query versioned asset data from the API",
+"ASSET_COUNT_QUERY_FAILED": "Failed to retrieve total asset count",
+
+"CONTENT_TYPE_EXPORT_COMPLETE": "Content types exported successfully",
+"CONTENT_TYPE_NO_TYPES": "No content types found",
+"CONTENT_TYPE_EXPORT_FAILED": "Failed to export content types",
+"CONTENT_TYPE_NO_TYPES_RETURNED": "API returned no content types for the given query",
+
+"ENVIRONMENT_EXPORT_COMPLETE": "Successfully exported %s environment(s)",
+"ENVIRONMENT_EXPORT_SUCCESS": "Environment '%s' exported successfully",
+"ENVIRONMENT_NOT_FOUND": "No environments found in the current stack",
+
+"EXTENSION_EXPORT_COMPLETE": "Successfully exported %s extension(s)",
+"EXTENSION_EXPORT_SUCCESS": "Extension '%s' exported successfully",
+"EXTENSION_NOT_FOUND": "No extensions found in the current stack",
+
+"GLOBAL_FIELDS_EXPORT_COMPLETE": "Successfully exported %s global field(s)",
+
+"LABELS_EXPORT_COMPLETE": "Successfully exported %s label(s)",
+"LABEL_EXPORT_SUCCESS": "Label '%s' exported successfully",
+"LABELS_NOT_FOUND": "No labels found in the current stack",
+
+"LOCALES_EXPORT_COMPLETE": "Successfully exported %s locale(s) including %s master locale(s)",
+
+"TAXONOMY_EXPORT_COMPLETE": "Successfully exported %s taxonomy entries",
+"TAXONOMY_EXPORT_SUCCESS": "Taxonomy '%s' exported successfully",
+"TAXONOMY_NOT_FOUND": "No taxonomies found in the current stack",
+
+"WEBHOOK_EXPORT_COMPLETE": "Successfully exported %s webhook(s)",
+"WEBHOOK_EXPORT_SUCCESS": "Webhook '%s' exported successfully",
+"WEBHOOK_NOT_FOUND": "No webhooks found in the current stack",
+
+"WORKFLOW_EXPORT_COMPLETE": "Successfully exported %s workflow(s)",
+"WORKFLOW_EXPORT_SUCCESS": "Workflow '%s' exported successfully",
+"WORKFLOW_NOT_FOUND": "No workflows found in the current stack",
+
+"PERSONALIZE_URL_NOT_SET": "Cannot export Personalize project: URL not configured",
+"PERSONALIZE_SKIPPING_WITH_MANAGEMENT_TOKEN": "Skipping Personalize project export: Management token not supported",
+"PERSONALIZE_MODULE_NOT_IMPLEMENTED": "Module '%s' implementation not found",
+"PERSONALIZE_NOT_ENABLED": "Personalize feature is not enabled for this organization",
+
+"MARKETPLACE_APPS_EXPORT_COMPLETE": "Successfully exported %s marketplace app(s)",
+"MARKETPLACE_APP_CONFIG_EXPORT": "Exporting configuration for app '%s'",
+"MARKETPLACE_APP_CONFIG_SUCCESS": "Successfully exported configuration for app '%s'",
+"MARKETPLACE_APP_EXPORT_SUCCESS": "Successfully exported app '%s'",
+"MARKETPLACE_APPS_NOT_FOUND": "No marketplace apps found in the current stack",
+"MARKETPLACE_APP_CONFIG_EXPORT_FAILED": "Failed to export configuration for app '%s'",
+"MARKETPLACE_APP_MANIFEST_EXPORT_FAILED": "Failed to export manifest for app '%s'",
+
+"ENTRIES_EXPORT_COMPLETE": "Successfully exported entries (Content Type: %s, Locale: %s)",
+"ENTRIES_EXPORT_SUCCESS": "All entries exported successfully",
+"ENTRIES_VERSIONED_EXPORT_SUCCESS": "Successfully exported versioned entry (Content Type: %s, UID: %s, Locale: %s)",
+"ENTRIES_EXPORT_VERSIONS_FAILED": "Failed to export versions for content type '%s' (UID: %s)",
+
+"BRANCH_EXPORT_FAILED": "Failed to export contents from branch (UID: %s)",
+
+"ROLES_NO_CUSTOM_ROLES": "No custom roles found in the current stack",
+"ROLES_EXPORTING_ROLE": "Exporting role '%s'"
+}

package/oclif.manifest.json

@@ -118,6 +118,14 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
+        },
+        "query": {
+          "description": "[optional] Query object (inline JSON or file path) to filter module exports.",
+          "hidden": true,
+          "name": "query",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -138,5 +146,5 @@
       ]
     }
   },
-  "version": "1.16.3"
+  "version": "1.18.0"
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.16.3",
+  "version": "1.18.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.5.1",
-    "@contentstack/cli-variants": "~1.2.2",
+    "@contentstack/cli-command": "~1.6.0",
+    "@contentstack/cli-variants": "~1.3.0",
     "@oclif/core": "^4.3.3",
-    "@contentstack/cli-utilities": "~1.12.0",
+    "@contentstack/cli-utilities": "~1.13.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",