Fixed PR comments

Author: sunil-lakshman

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

@@ -83,6 +83,7 @@ export default class ExportQueryCommand extends Command {
       }
 
       this.exportDir = sanitizePath(exportQueryConfig.exportDir);
+      // Create base context without module name - module field is set dynamically during each module export
       exportQueryConfig.context = createLogContext(exportQueryConfig);
       log.debug('Export configuration setup completed', exportQueryConfig.context);
 

src/types/index.ts

@@ -174,6 +174,20 @@ export interface DefaultConfig {
   maxCTReferenceDepth: number;
 }
 
+/**
+ * Log context interface for centralized logging
+ */
+export interface LogContext {
+  command: string;
+  module: string;
+  email: string;
+  sessionId: string;
+  apiKey: string;
+  orgId: string;
+  authenticationMethod: string;
+  [key: string]: unknown;
+}
+
 export interface QueryExportConfig extends DefaultConfig {
   query: string;
   skipReferences: boolean;
@@ -189,7 +203,7 @@ export interface QueryExportConfig extends DefaultConfig {
   batchDelayMs?: number;
   assetBatchSize?: number;
   assetBatchDelayMs?: number;
-  context?: any; // Log context for centralized logging
+  context?: LogContext; // Log context for centralized logging
 }
 
 export interface QueryMetadata {

src/utils/branch-helper.ts

@@ -1,7 +1,6 @@
 
-import { getBranchFromAlias, log, formatError, handleAndLogError } from '@contentstack/cli-utilities';
+import { getBranchFromAlias, log, handleAndLogError } from '@contentstack/cli-utilities';
 import { QueryExportConfig } from '../types';
-import { createLogContext } from './logger';
 
 /**
  * Validates and sets up branch configuration for the stack
@@ -15,7 +14,7 @@ export const setupBranches = async (config: QueryExportConfig, stackAPIClient: a
     throw new Error('The branch configuration is invalid.');
   }
 
-  const context = createLogContext(config);
+  const context = config.context;
 
   try {
     if (config.branchAlias) {
@@ -30,7 +29,7 @@ export const setupBranches = async (config: QueryExportConfig, stackAPIClient: a
         .branch(config.branchName)
         .fetch()
         .catch((err: unknown): any => {
-          log.error(`Error fetching branch: ${formatError(err)}`, context);
+          handleAndLogError(err, context, 'Error fetching branch');
           return null;
         });
 
@@ -63,7 +62,7 @@ export const setupBranches = async (config: QueryExportConfig, stackAPIClient: a
     }
     config.branchEnabled = true;
   } catch (error) {
-    handleAndLogError(error, context as any, 'Error setting up branches');
+    handleAndLogError(error, context, 'Error setting up branches');
     throw error;
   }
 };

src/utils/index.ts

@@ -1,6 +1,7 @@
 export * as fileHelper from './file-helper';
 export { fsUtil } from './file-helper';
-export { log, unlinkFileLogger, createLogContext, LogContext } from './logger';
+export { log, unlinkFileLogger, createLogContext } from './logger';
+export { LogContext } from '../types';
 export * from './common-helper';
 export * from './config-handler';
 export * from './content-type-helper';

src/utils/logger.ts

@@ -7,7 +7,7 @@
 import * as winston from 'winston';
 import * as path from 'path';
 import mkdirp from 'mkdirp';
-import { QueryExportConfig } from '../types';
+import { QueryExportConfig, LogContext } from '../types';
 import { sanitizePath, redactObject, configHandler } from '@contentstack/cli-utilities';
 const slice = Array.prototype.slice;
 
@@ -167,19 +167,6 @@ export const unlinkFileLogger = () => {
   }
 };
 
-/**
- * Log context interface for centralized logging
- */
-export interface LogContext {
-  command: string;
-  module: string;
-  email: string;
-  sessionId: string;
-  apiKey: string;
-  orgId: string;
-  authenticationMethod: string;
-}
-
 /**
  * Creates a context object for logging from QueryExportConfig
  */

src/utils/query-parser.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import { CLIError, formatError } from '@contentstack/cli-utilities';
+import { CLIError, handleAndLogError } from '@contentstack/cli-utilities';
 import { QueryExportConfig } from '../types';
 
 export class QueryParser {
@@ -28,15 +28,15 @@ export class QueryParser {
       const content = fs.readFileSync(filePath, 'utf-8');
       return JSON.parse(content);
     } catch (error) {
-      throw new CLIError(`Failed to parse the query file: ${formatError(error)}`);
+      handleAndLogError(error, this.config.context, 'Failed to parse the query file');
     }
   }
 
   private parseFromString(queryString: string): any {
     try {
       return JSON.parse(queryString);
     } catch (error) {
-      throw new CLIError(`Invalid JSON query: ${formatError(error)}`);
+      handleAndLogError(error, this.config.context, 'Invalid JSON query');
     }
   }
 

src/utils/referenced-asset-handler.ts

@@ -51,7 +51,7 @@ export class AssetReferenceHandler {
       return result;
     } catch (error) {
       handleAndLogError(error, this.exportQueryConfig.context, 'Failed to extract assets');
-      throw error;
+      return [];
     }
   }