@contentstack/cli-cm-export-query 1.0.0-beta.1 → 1.0.0-beta.2

package/lib/commands/cm/stacks/export-query.d.ts

@@ -6,6 +6,5 @@ export default class ExportQueryCommand extends Command {
     static examples: string[];
     static usage: string;
     static flags: FlagInput;
-    static aliases: string[];
     run(): Promise<void>;
 }

package/lib/commands/cm/stacks/export-query.js

@@ -16,8 +16,16 @@ class ExportQueryCommand extends cli_command_1.Command {
                 exportQueryConfig.developerHubBaseUrl = this.developerHubUrl;
             }
             this.exportDir = (0, cli_utilities_1.sanitizePath)(exportQueryConfig.exportDir);
-            // Initialize and run query export
+            // Initialize management API client
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(exportQueryConfig);
+            // Setup and validate branch configuration
+            const stackAPIClient = managementAPIClient.stack({
+                api_key: exportQueryConfig.stackApiKey,
+                management_token: exportQueryConfig.managementToken,
+            });
+            // Setup branches (validate branch or set default to 'main')
+            await (0, utils_1.setupBranches)(exportQueryConfig, stackAPIClient);
+            // Initialize and run query export
             const queryExporter = new query_executor_1.QueryExporter(managementAPIClient, exportQueryConfig);
             await queryExporter.execute();
             (0, utils_1.log)(exportQueryConfig, 'Query-based export completed successfully!', 'success');
@@ -76,4 +84,3 @@ ExportQueryCommand.flags = {
         description: 'Skip confirmation prompts',
     }),
 };
-ExportQueryCommand.aliases = ['cm:export-query'];

package/lib/core/module-exporter.js

@@ -15,7 +15,6 @@ class ModuleExporter {
             (0, logger_1.log)(this.exportQueryConfig, `Exporting module: ${moduleName}`, 'info');
             // Build command arguments
             const cmd = this.buildExportCommand(moduleName, options);
-            (0, logger_1.log)(this.exportQueryConfig, `Running export command: ${cmd.join(' ')}`, 'debug');
             // Configurable delay
             const delay = this.exportQueryConfig.exportDelayMs || 2000;
             await new Promise((resolve) => setTimeout(resolve, delay));

package/lib/utils/branch-helper.d.ts

@@ -0,0 +1,10 @@
+import { QueryExportConfig } from '../types';
+/**
+ * Validates and sets up branch configuration for the stack
+ *
+ * @param config The export configuration
+ * @param stackAPIClient The stack API client
+ * @returns Promise that resolves when branch setup is complete
+ */
+export declare const setupBranches: (config: QueryExportConfig, stackAPIClient: any) => Promise<void>;
+export default setupBranches;

package/lib/utils/branch-helper.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBranches = void 0;
+const logger_1 = require("./logger");
+/**
+ * Validates and sets up branch configuration for the stack
+ *
+ * @param config The export configuration
+ * @param stackAPIClient The stack API client
+ * @returns Promise that resolves when branch setup is complete
+ */
+const setupBranches = async (config, stackAPIClient) => {
+    if (typeof config !== 'object') {
+        throw new Error('Invalid config to setup the branch');
+    }
+    try {
+        if (config.branchName) {
+            // Check if the specified branch exists
+            (0, logger_1.log)(config, `Validating branch: ${config.branchName}`, 'info');
+            const result = await stackAPIClient
+                .branch(config.branchName)
+                .fetch()
+                .catch((err) => {
+                (0, logger_1.log)(config, `Error fetching branch: ${err.message}`, 'error');
+                return null;
+            });
+            if (result && typeof result === 'object') {
+                (0, logger_1.log)(config, `Branch '${config.branchName}' found`, 'success');
+            }
+            else {
+                throw new Error(`No branch found with the name '${config.branchName}'`);
+            }
+        }
+        else {
+            // If no branch name provided, check if the stack has branches
+            (0, logger_1.log)(config, 'No branch specified, checking if stack has branches', 'info');
+            const result = await stackAPIClient
+                .branch()
+                .query()
+                .find()
+                .catch(() => {
+                (0, logger_1.log)(config, 'Stack does not have branches', 'info');
+                return null;
+            });
+            if (result && result.items && Array.isArray(result.items) && result.items.length > 0) {
+                // Set default branch to 'main' if it exists
+                config.branchName = 'main';
+            }
+            else {
+                // Stack doesn't have branches
+                (0, logger_1.log)(config, 'Stack does not have branches', 'info');
+                return;
+            }
+        }
+        config.branchEnabled = true;
+    }
+    catch (error) {
+        (0, logger_1.log)(config, `Error setting up branches: ${error.message}`, 'error');
+        throw error;
+    }
+};
+exports.setupBranches = setupBranches;
+exports.default = exports.setupBranches;

package/lib/utils/config-handler.js

@@ -15,19 +15,19 @@ async function setupQueryExportConfig(flags) {
     // Handle authentication
     if (flags.alias) {
         const { token, apiKey } = cli_utilities_1.configHandler.get(`tokens.${flags.alias}`) || {};
-        config_1.default.managementToken = token;
-        config_1.default.stackApiKey = apiKey;
-        if (!config_1.default.managementToken) {
+        exportQueryConfig.managementToken = token;
+        exportQueryConfig.stackApiKey = apiKey;
+        if (!exportQueryConfig.managementToken) {
             throw new Error(`No management token found on given alias ${flags.alias}`);
         }
     }
-    if (!config_1.default.managementToken) {
+    if (!exportQueryConfig.managementToken) {
         if (!(0, cli_utilities_1.isAuthenticated)()) {
             throw new Error('Please login or provide an alias for the management token');
         }
         else {
-            config_1.default.stackApiKey = flags['stack-api-key'] || (await (0, common_helper_1.askAPIKey)());
-            if (typeof config_1.default.stackApiKey !== 'string') {
+            exportQueryConfig.stackApiKey = flags['stack-api-key'] || (await (0, common_helper_1.askAPIKey)());
+            if (typeof exportQueryConfig.stackApiKey !== 'string') {
                 throw new Error('Invalid API key received');
             }
         }

package/lib/utils/index.d.ts

@@ -6,3 +6,4 @@ export * from './config-handler';
 export * from './content-type-helper';
 export * from './dependency-resolver';
 export * from './referenced-asset-handler';
+export { setupBranches } from './branch-helper';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unlinkFileLogger = exports.log = exports.fsUtil = exports.fileHelper = void 0;
+exports.setupBranches = exports.unlinkFileLogger = exports.log = exports.fsUtil = exports.fileHelper = void 0;
 const tslib_1 = require("tslib");
 exports.fileHelper = tslib_1.__importStar(require("./file-helper"));
 var file_helper_1 = require("./file-helper");
@@ -13,3 +13,5 @@ tslib_1.__exportStar(require("./config-handler"), exports);
 tslib_1.__exportStar(require("./content-type-helper"), exports);
 tslib_1.__exportStar(require("./dependency-resolver"), exports);
 tslib_1.__exportStar(require("./referenced-asset-handler"), exports);
+var branch_helper_1 = require("./branch-helper");
+Object.defineProperty(exports, "setupBranches", { enumerable: true, get: function () { return branch_helper_1.setupBranches; } });

package/lib/utils/referenced-asset-handler.js

@@ -83,10 +83,21 @@ class AssetReferenceHandler {
                 assetUIDs.add(match[1]);
             }
         }
+        let assetUrlRegex = '';
+        let assetUIDMatchIndex;
+        if (process.env.ENVIRONMENT === 'NON_PROD') {
+            assetUrlRegex = '(https://.*?/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))';
+            assetUIDMatchIndex = 3;
+        }
+        else {
+            assetUrlRegex =
+                '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))';
+            assetUIDMatchIndex = 6;
+        }
         // Pattern 2: Contentstack asset URLs
-        const urlRegex = new RegExp('(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))', 'g');
+        const urlRegex = new RegExp(assetUrlRegex, 'g');
         while ((match = urlRegex.exec(content)) !== null) {
-            const assetUID = match[6]; // The asset UID is in the 6th capture group
+            const assetUID = match[assetUIDMatchIndex]; // The asset UID is in the 6th capture group
             if (assetUID) {
                 assetUIDs.add(assetUID);
             }

package/oclif.manifest.json

@@ -1,9 +1,7 @@
 {
   "commands": {
     "cm:stacks:export-query": {
-      "aliases": [
-        "cm:export-query"
-      ],
+      "aliases": [],
       "args": {},
       "description": "Export content from a stack using query-based filtering",
       "examples": [
@@ -104,5 +102,5 @@
       ]
     }
   },
-  "version": "1.0.0-beta.1"
+  "version": "1.0.0-beta.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export-query",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {