Fixing Oclif test branch with development code

packages/contentstack-audit/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.7.2 darwin-arm64 node-v22.2.0
+@contentstack/cli-audit/1.7.3 darwin-arm64 node-v22.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -20,35 +20,35 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
     "@contentstack/cli-utilities": "~1.8.0",
-    "@oclif/plugin-help": "^5",
+    "@oclif/plugin-help": "^5.2.20",
     "@oclif/plugin-plugins": "^5.4.15",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
     "uuid": "^9.0.1",
-    "winston": "^3.15.0"
+    "winston": "^3.17.0"
   },
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "^1.2.4",
-    "@oclif/test": "^4.0.9",
+    "@oclif/test": "^4.1.0",
     "@types/chai": "^4.3.20",
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.9",
-    "@types/node": "^20.16.14",
+    "@types/node": "^20.17.6",
     "@types/uuid": "^9.0.8",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "^3.1.12",
-    "mocha": "^10.7.3",
+    "mocha": "^10.8.2",
     "nyc": "^15.1.0",
-    "oclif": "^3",
+    "oclif": "^3.17.2",
     "shx": "^0.3.4",
     "sinon": "^19.0.2",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "tslib": "^2.8.0",
+    "tslib": "^2.8.1",
     "typescript": "^5.6.3"
   },
   "oclif": {

packages/contentstack-audit/src/modules/entries.ts

@@ -890,24 +890,27 @@ export default class Entries {
   }
 
   /**
-   *
+   * this is called in case the select field has multiple optins to chose from 
    * @param field It contains the value to be searched
    * @param selectOptions It contains the options that were added in CT
    * @returns An Array of entry containing only the values that were present in CT, An array of not present entries
    */
   findNotPresentSelectField(field: any, selectOptions: any) {
+    if(!field){
+      field = []
+    }
     let present = [];
     let notPresent = [];
     const choicesMap = new Map(selectOptions.choices.map((choice: { value: any }) => [choice.value, choice]));
-    for (const value of field) {
-      const choice: any = choicesMap.get(value);
-
-      if (choice) {
-        present.push(choice.value);
-      } else {
-        notPresent.push(value);
+      for (const value of field) {
+        const choice: any = choicesMap.get(value);
+
+        if (choice) {
+          present.push(choice.value);
+        } else {
+          notPresent.push(value);
+        }
       }
-    }
     return { filteredFeild: present, notPresent };
   }
 

packages/contentstack-auth/package.json

@@ -27,12 +27,12 @@
     "chalk": "^4.1.2",
     "debug": "^4.3.7",
     "inquirer": "8.2.6",
-    "winston": "^3.15.0"
+    "winston": "^3.17.0"
   },
   "devDependencies": {
     "@fancy-test/nock": "^0.1.1",
     "@oclif/plugin-help": "^5.2.20",
-    "@oclif/test": "^4.0.8",
+    "@oclif/test": "^4.1.0",
     "@types/chai": "^4.3.20",
     "@types/inquirer": "^9.0.7",
     "@types/mkdirp": "^1.0.2",

packages/contentstack-bootstrap/package.json

@@ -25,7 +25,7 @@
     "tar": "^6.2.1 "
   },
   "devDependencies": {
-    "@oclif/test": "^4.0.9",
+    "@oclif/test": "^4.1.0",
     "@types/inquirer": "^9.0.7",
     "@types/mkdirp": "^1.0.2",
     "@types/node": "^14.18.63",
@@ -35,7 +35,7 @@
     "eslint-config-oclif": "^4.0.0",
     "eslint-config-oclif-typescript": "^3.1.12",
     "globby": "^10.0.2",
-    "mocha": "10.7.3",
+    "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^3.17.2",
     "rimraf": "^2.7.1",

packages/contentstack-branches/package.json

@@ -21,15 +21,15 @@
     "progress-stream": "^2.0.0",
     "promise-limit": "^2.7.0",
     "proxyquire": "^2.1.3",
-    "tslib": "^2.8.0",
-    "winston": "^3.15.0"
+    "tslib": "^2.8.1",
+    "winston": "^3.16.0"
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.22",
     "@contentstack/cli-config": "~1.8.0",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.2.20",
-    "@oclif/test": "^4.0.9",
+    "@oclif/test": "^4.1.0",
     "@types/flat": "^5.0.5",
     "assert": "^2.1.0",
     "chai": "^4.5.0",

packages/contentstack-bulk-publish/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
@@ -14,15 +14,15 @@
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
     "nock": "^13.5.5",
-    "winston": "^3.15.0"
+    "winston": "^3.16.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.0.9",
+    "@oclif/test": "^4.1.0",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^4.0.0",
     "globby": "^10.0.2",
-    "mocha": "^10.7.3",
+    "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^3.17.2",
     "tslib": "^1.14.1"

packages/contentstack-bulk-publish/src/commands/cm/bulk-publish/cross-publish.js

@@ -46,7 +46,7 @@ class CrossPublishCommand extends Command {
           updatedFlags.deliveryToken = await cliux.prompt('Enter delivery token of your source environment');
         }
         updatedFlags.bulkPublish = updatedFlags.bulkPublish === 'false' ? false : true;
-
+        updatedFlags.includeVariants = updatedFlags.includeVariants === false ? false : true;
         stack = await getStack(config);
       }
 
@@ -155,6 +155,10 @@ class CrossPublishCommand extends Command {
       _flags.deliveryToken = _flags['delivery-token'];
       delete _flags['delivery-token'];
     }
+    if ('include-variants' in _flags) {
+      _flags.includeVariants = _flags['include-variants'];
+      delete _flags['include-variants'];
+    }
     return _flags;
   }
 }
@@ -257,6 +261,10 @@ CrossPublishCommand.flags = {
   }),
   onlyAssets: flags.boolean({ description: 'Unpublish only assets', default: false }),
   onlyEntries: flags.boolean({ description: 'Unpublish only entries', default: false }),
+  'include-variants': flags.boolean({
+    description: 'Include Variants flag will publish all associated variant entries.',
+    default: false,
+  }),
 };
 
 CrossPublishCommand.examples = [
@@ -278,8 +286,11 @@ CrossPublishCommand.examples = [
   'Using --stack-api-key flag',
   'csdx cm:bulk-publish:cross-publish --content-type [CONTENT TYPE] --source-env [SOURCE ENV] --environments [DESTINATION ENVIRONMENT] --locales [LOCALE] --stack-api-key [STACK API KEY] --delivery-token [DELIVERY TOKEN]',
   '',
+  'Using --include-variants flag',
+  'csdx cm:bulk-publish:cross-publish --content-type [CONTENT TYPE] --source-env [SOURCE ENV] --environments [DESTINATION ENVIRONMENT] --locales [LOCALE] --stack-api-key [STACK API KEY] --delivery-token [DELIVERY TOKEN] [--include-variants]',
+  '',
 ];
 
-CrossPublishCommand.usage = `cm:bulk-publish:cross-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-type <value>] [--locales <value>] [--source-env <value>] [--environments <value>] [--delivery-token <value>] [-c <value>] [-y] [--branch <value>] [--onlyAssets] [--onlyEntries]`;
+CrossPublishCommand.usage = `cm:bulk-publish:cross-publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--content-type <value>] [--locales <value>] [--source-env <value>] [--environments <value>] [--delivery-token <value>] [-c <value>] [-y] [--branch <value>] [--onlyAssets] [--onlyEntries] [--include-variants]`;
 
 module.exports = CrossPublishCommand;

packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js

@@ -21,11 +21,19 @@ class PublishEntriesCommand extends Command {
     entriesFlags.publishAllContentTypes =
       entriesFlags['publish-all-content-types'] || entriesFlags.publishAllContentTypes || false;
     entriesFlags.apiVersion = entriesFlags['api-version'] || '3';
+    entriesFlags.includeVariants = entriesFlags['include-variants'] || entriesFlags.includeVariants || false;
+    entriesFlags.entryUid = entriesFlags['entry-uid'] || entriesFlags.entryUid;
+
+    if (entriesFlags.entryUid === undefined) {
+      delete entriesFlags['entryUid'];
+    }
     delete entriesFlags['api-version'];
     delete entriesFlags['retry-failed'];
     delete entriesFlags['content-types'];
     delete entriesFlags['bulk-publish'];
     delete entriesFlags['publish-all-content-types'];
+    delete entriesFlags['include-variants'];
+    delete entriesFlags['entry-uid'];
 
     let updatedFlags;
     try {
@@ -243,6 +251,11 @@ PublishEntriesCommand.flags = {
   }),
   'delivery-token': flags.string({ description: 'The delivery token of the source environment.' }),
   'source-env': flags.string({ description: 'Source environment' }),
+  'entry-uid': flags.string({ description: 'Entry Uid for publish all associated variant entries.' }),
+  'include-variants': flags.boolean({
+    default: false, // set the default value to false
+    description: 'Include Variants flag will publish all associated variant entries with base entry.',
+  }),
 };
 
 PublishEntriesCommand.examples = [
@@ -266,11 +279,17 @@ PublishEntriesCommand.examples = [
   '',
   'Using --stack-api-key',
   'csdx cm:entries:publish -e [ENVIRONMENT 1] [ENVIRONMENT 2] --locales [LOCALE 1] [LOCALE 2] --stack-api-key [STACK API KEY] --source-env [SOURCE ENVIRONMENT] --delivery-token [DELIVERY TOKEN]',
+  '',
+  'Using --include-variants',
+  'csdx cm:entries:publish --content-types [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] --locales [LOCALE 1] [LOCALE 2] --stack-api-key [STACK API KEY] --source-env [SOURCE ENVIRONMENT] --delivery-token [DELIVERY TOKEN] [--include-variants]',
+  '',
+  'Using --entry-uid and --include-variants',
+  'csdx cm:entries:publish --content-types [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] --locales [LOCALE 1] [LOCALE 2] --stack-api-key [STACK API KEY] --source-env [SOURCE ENVIRONMENT] --delivery-token [DELIVERY TOKEN] --entry-uid [ENTRY UID] [--include-variants]',
 ];
 
 PublishEntriesCommand.aliases = ['cm:bulk-publish:entries'];
 
 PublishEntriesCommand.usage =
-  'cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>]';
+  'cm:entries:publish [-a <value>] [--retry-failed <value>] [--bulk-publish <value>] [--publish-all-content-types] [--content-types <value>] [--locales <value>] [-e <value>] [-c <value>] [-y] [--branch <value>] [--delivery-token <value>] [--source-env <value>] [--entry-uid <value>] [--include-variants]';
 
 module.exports = PublishEntriesCommand;

packages/contentstack-bulk-publish/src/commands/cm/entries/unpublish.js

@@ -19,11 +19,13 @@ class UnpublishCommand extends Command {
     unpublishFlags.onlyAssets = false;
     unpublishFlags.onlyEntries = true;
     unpublishFlags.apiVersion = unpublishFlags['api-version'] || '3';
+    unpublishFlags.includeVariants = unpublishFlags['include-variants'] || false;
     delete unpublishFlags['api-version'];
     delete unpublishFlags['retry-failed'];
     delete unpublishFlags['bulk-unpublish'];
     delete unpublishFlags['content-type'];
     delete unpublishFlags['delivery-token'];
+    delete unpublishFlags['include-variants'];
 
     let updatedFlags;
     try {
@@ -59,7 +61,6 @@ class UnpublishCommand extends Command {
           updatedFlags.deliveryToken = await cliux.prompt('Enter delivery token of your source environment');
         }
         updatedFlags.bulkUnpublish = updatedFlags.bulkUnpublish === 'false' ? false : true;
-
         stack = await getStack(config);
       }
       if (!updatedFlags.deliveryToken && updatedFlags.deliveryToken.length === 0) {
@@ -176,6 +177,10 @@ UnpublishCommand.flags = {
   'delivery-token': flags.string({
     description: 'The delivery token of the source environment.',
   }),
+  'include-variants': flags.boolean({ 
+    default: false, // set the default value to false
+    description: 'Include Variants flag will unpublish all associated variant entries.' 
+  }),
 };
 
 UnpublishCommand.examples = [
@@ -195,6 +200,9 @@ UnpublishCommand.examples = [
   '',
   'Using --stack-api-key flag',
   'csdx cm:stacks:unpublish --bulk-unpublish --content-type [CONTENT TYPE] --environment [SOURCE ENV] --locale [LOCALE] --stack-api-key [STACK API KEY] --delivery-token [DELIVERY TOKEN]',
+  '',
+  'Using --include-variants flag',
+  'csdx cm:stacks:unpublish --bulk-unpublish --content-type [CONTENT TYPE] --environment [SOURCE ENV] --locale [LOCALE] --stack-api-key [STACK API KEY] --delivery-token [DELIVERY TOKEN] --include-variants',
 ];
 
 module.exports = UnpublishCommand;