Merge pull request #26 from contentstack/staging

DX | 29-09-2025 | Release

Author: harshithad0703

.talismanrc

@@ -1,4 +1,6 @@
 fileignoreconfig:
   - filename: src/core/query-executor.ts
     checksum: 3d0b5cf07f5a87256f132f85a5556d193ce5a1fa6d92df2c7c50514071d592b7
+  - filename: package-lock.json
+    checksum: 37a33f085b6df7ee03b326885bc38957b84fdb17984a3b03de04fd6921b42fee
 version: '1.0'

package-lock.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-export-query",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "~1.18.0",
-    "@contentstack/cli-command": "~1.6.0",
-    "@contentstack/cli-utilities": "~1.13.0",
+    "@contentstack/cli-cm-export": "~1.20.2",
+    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-utilities": "~1.14.1",
     "@oclif/core": "^4.3.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
@@ -21,21 +21,21 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@contentstack/cli-dev-dependencies": "~1.3.0",
-    "@oclif/plugin-help": "^6.2.28",
-    "@oclif/test": "^4.1.13",
+    "@contentstack/cli-dev-dependencies": "~1.3.1",
+    "@oclif/plugin-help": "^6.2.33",
+    "@oclif/test": "^4.1.14",
     "@types/big-json": "^3.2.5",
     "@types/chai": "^4.3.20",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.19.8",
+    "@types/node": "^20.19.17",
     "@types/progress-stream": "^2.0.5",
     "@types/sinon": "^17.0.4",
     "chai": "^4.5.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "dotenv-expand": "^9.0.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.62",
+    "eslint-config-oclif": "^6.0.104",
     "husky": "^9.1.7",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",

package.json

@@ -43,6 +43,11 @@ export default class ExportQueryCommand extends Command {
     }),
     branch: flags.string({
       description: 'Branch name to export from',
+      exclusive: ['branch-alias'],
+    }),
+    'branch-alias': flags.string({
+      description: 'Alias of Branch to export from',
+      exclusive: ['branch'],
     }),
     query: flags.string({
       required: true,

src/commands/cm/stacks/export-query.ts

@@ -2,8 +2,7 @@ import { formatError } from '@contentstack/cli-utilities';
 import ExportCommand from '@contentstack/cli-cm-export';
 import { QueryExportConfig, Modules, ExportOptions } from '../types';
 import { log } from '../utils/logger';
-import config from '../config';
-import * as path from 'path';
+
 
 export class ModuleExporter {
   private exportQueryConfig: QueryExportConfig;

src/core/module-exporter.ts

@@ -181,6 +181,7 @@ export interface QueryExportConfig extends DefaultConfig {
   stackApiKey: string;
   managementToken?: string;
   branchName: string;
+  branchAlias?: string;
   securedAssets: boolean;
   logsPath: string;
   dataPath: string;

src/types/index.ts

@@ -1,7 +1,6 @@
-import * as path from 'path';
-import { sanitizePath } from '@contentstack/cli-utilities';
+
+import { getBranchFromAlias} from '@contentstack/cli-utilities';
 import { QueryExportConfig } from '../types';
-import { fsUtil } from './file-helper';
 import { log } from './logger';
 
 /**
@@ -17,6 +16,10 @@ export const setupBranches = async (config: QueryExportConfig, stackAPIClient: a
   }
 
   try {
+    if (config.branchAlias) {
+      config.branchName = await getBranchFromAlias(stackAPIClient, config.branchAlias);
+      return;
+    }
     if (config.branchName) {
       // Check if the specified branch exists
       log(config, `Validating branch: ${config.branchName}`, 'info');

src/utils/branch-helper.ts

@@ -24,6 +24,9 @@ export async function setupQueryExportConfig(flags: any): Promise<QueryExportCon
     externalConfigPath: path.join(__dirname, '../config/export-config.json'),
   };
 
+  if (flags['branch-alias']) {
+    exportQueryConfig.branchAlias = flags['branch-alias'];
+  }
   // override the external config path if the user provides a config file
   if (flags.config) {
     exportQueryConfig.externalConfigPath = sanitizePath(flags['config']);