@contentstack/cli-cm-bulk-publish 1.0.3 → 1.1.0

package/package.json

@@ -1,15 +1,13 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.0.3",
-    "@contentstack/cli-utilities": "^1.0.4",
-    "@contentstack/management": "^1.6.0",
-    "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.3",
+    "@contentstack/cli-command": "^1.1.0",
+    "@contentstack/cli-utilities": "^1.1.0",
+    "@contentstack/management": "^1.6.1",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.15",
     "nock": "^13.0.2",
@@ -17,8 +15,7 @@
     "inquirer": "8.2.4"
   },
   "devDependencies": {
-    "@oclif/dev-cli": "^1.22.2",
-    "@oclif/plugin-help": "^5.1.12",
+    "oclif": "^3.1.2",
     "@oclif/test": "^1.2.6",
     "chai": "^4.2.0",
     "eslint": "^8.18.0",
@@ -46,9 +43,6 @@
   "oclif": {
     "commands": "./src/commands",
     "bin": "csdx",
-    "devPlugins": [
-      "@oclif/plugin-help"
-    ],
     "hooks": {
       "validateConfig": "./src/hooks/config.js"
     },
@@ -72,9 +66,9 @@
   "repository": "https://github.com/contentstack/cli",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "oclif-dev manifest && oclif-dev readme",
+    "prepack": "oclif manifest && oclif readme",
     "test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
     "posttest": "eslint .",
-    "version": "oclif-dev readme && git add README.md"
+    "version": "oclif readme && git add README.md"
   }
 }

package/src/commands/cm/assets/publish.js

@@ -10,7 +10,7 @@ let config;
 
 class AssetsPublishCommand extends Command {
   async run() {
-    const assetsFlags = this.parse(AssetsPublishCommand).flags;
+    const { flags: assetsFlags } = await this.parse(AssetsPublishCommand);
     assetsFlags.retryFailed = assetsFlags['retry-failed'] || assetsFlags.retryFailed || false;
     assetsFlags.folderUid = assetsFlags['folder-uid'] || assetsFlags.folderUid;
     assetsFlags.bulkPublish = assetsFlags['bulk-publish'] || assetsFlags.bulkPublish;

package/src/commands/cm/assets/unpublish.js

@@ -11,7 +11,7 @@ let config;
 
 class UnpublishCommand extends Command {
   async run() {
-    const unpublishFlags = this.parse(UnpublishCommand).flags;
+    const { flags: unpublishFlags } = await this.parse(UnpublishCommand);
     unpublishFlags.retryFailed = unpublishFlags['retry-failed'] || unpublishFlags.retryFailed || false;
     unpublishFlags.bulkUnpublish = unpublishFlags['bulk-unpublish'] || unpublishFlags.bulkUnpublish;
     unpublishFlags.deliveryToken = unpublishFlags['delivery-token'] || unpublishFlags.deliveryToken;

package/src/commands/cm/bulk-publish/cross-publish.js

@@ -10,7 +10,8 @@ let config;
 
 class CrossPublishCommand extends Command {
   async run() {
-    const crossPublishFlags = this.flagsAdapter(this.parse(CrossPublishCommand).flags);
+    const { flags: _flags } = await this.parse(CrossPublishCommand);
+    const crossPublishFlags = this.flagsAdapter(_flags || {});
     let updatedFlags;
     try {
       updatedFlags = crossPublishFlags.config ? store.updateMissing(configKey, crossPublishFlags) : crossPublishFlags;
@@ -32,7 +33,10 @@ class CrossPublishCommand extends Command {
         try {
           this.getToken(updatedFlags.alias);
         } catch (error) {
-          this.error(`The configured management token alias ${updatedFlags.alias} has not been added yet. Add it using 'csdx auth:tokens:add -a ${updatedFlags.alias}'`, {exit: 2})
+          this.error(
+            `The configured management token alias ${updatedFlags.alias} has not been added yet. Add it using 'csdx auth:tokens:add -a ${updatedFlags.alias}'`,
+            { exit: 2 },
+          );
         }
         config = {
           alias: updatedFlags.alias,
@@ -212,7 +216,7 @@ CrossPublishCommand.flags = {
     hidden: true,
     parse: printFlagDeprecation(['--destEnv'], ['--environments']),
   }),
-  'environments': flags.string({
+  environments: flags.string({
     description: 'Destination Environments',
     multiple: true,
   }),
@@ -254,6 +258,6 @@ CrossPublishCommand.examples = [
   'csdx cm:bulk-publish:cross-publish --content-type [CONTENT TYPE] --source-env [SOURCE ENV] --environments [DESTINATION ENVIRONMENT] --locales [LOCALE] -a [MANAGEMENT TOKEN ALIAS] --delivery-token [DELIVERY TOKEN] --branch [BRANCH NAME]',
 ];
 
-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]`;
 
 module.exports = CrossPublishCommand;

package/src/commands/cm/bulk-publish/index.js

@@ -1,4 +1,4 @@
-const { Command, flags } = require('@oclif/command');
+const { Command, flags } = require('@contentstack/cli-command');
 
 class HelloCommand extends Command {
   async run() {

package/src/commands/cm/entries/publish-modified.js

@@ -11,7 +11,7 @@ let config;
 
 class PublishModifiedCommand extends Command {
   async run() {
-    const entryEditsFlags = this.parse(PublishModifiedCommand).flags;
+    const { flags: entryEditsFlags } = await this.parse(PublishModifiedCommand);
     entryEditsFlags.retryFailed = entryEditsFlags['retry-failed'] || entryEditsFlags.retryFailed || false;
     entryEditsFlags.contentTypes = entryEditsFlags['content-types'] || entryEditsFlags.contentTypes;
     entryEditsFlags.bulkPublish = entryEditsFlags['bulk-publish'] || entryEditsFlags.bulkPublish;

package/src/commands/cm/entries/publish-non-localized-fields.js

@@ -10,7 +10,7 @@ let config;
 
 class NonlocalizedFieldChangesCommand extends Command {
   async run() {
-    const nonlocalizedFieldChangesFlags = this.parse(NonlocalizedFieldChangesCommand).flags;
+    const { flags: nonlocalizedFieldChangesFlags } = await this.parse(NonlocalizedFieldChangesCommand);
     nonlocalizedFieldChangesFlags.retryFailed =
       nonlocalizedFieldChangesFlags['retry-failed'] || nonlocalizedFieldChangesFlags.retryFailed || false;
     nonlocalizedFieldChangesFlags.bulkPublish =

package/src/commands/cm/entries/publish.js

@@ -14,7 +14,7 @@ let config;
 
 class PublishEntriesCommand extends Command {
   async run() {
-    const entriesFlags = this.parse(PublishEntriesCommand).flags;
+    const { flags: entriesFlags } = await this.parse(PublishEntriesCommand);
     entriesFlags.retryFailed = entriesFlags['retry-failed'] || entriesFlags.retryFailed || false;
     entriesFlags.contentTypes = entriesFlags['content-types'] || entriesFlags.contentTypes;
     entriesFlags.bulkPublish = entriesFlags['bulk-publish'] || entriesFlags.bulkPublish;
@@ -224,7 +224,7 @@ PublishEntriesCommand.flags = {
     parse: printFlagDeprecation(['-B'], ['--branch']),
   }),
   'delivery-token': flags.string({ description: 'Delivery token for source environment' }),
-  'source-env': flags.string({ description: 'Source environment'}),
+  'source-env': flags.string({ description: 'Source environment' }),
 };
 
 PublishEntriesCommand.examples = [

package/src/commands/cm/entries/unpublish.js

@@ -11,7 +11,7 @@ let config;
 
 class UnpublishCommand extends Command {
   async run() {
-    const unpublishFlags = this.parse(UnpublishCommand).flags;
+    const { flags: unpublishFlags } = await this.parse(UnpublishCommand);
     unpublishFlags.retryFailed = unpublishFlags['retry-failed'] || unpublishFlags.retryFailed || false;
     unpublishFlags.bulkUnpublish = unpublishFlags['bulk-unpublish'] || unpublishFlags.bulkUnpublish;
     unpublishFlags.contentType = unpublishFlags['content-type'] || unpublishFlags.contentType || '';

package/src/commands/cm/entries/update-and-publish.js

@@ -11,7 +11,7 @@ const configKey = 'addFields';
 
 class UpdateAndPublishCommand extends Command {
   async run() {
-    const addFieldsFlags = this.parse(UpdateAndPublishCommand).flags;
+    const { flags: addFieldsFlags } = await this.parse(UpdateAndPublishCommand);
     addFieldsFlags.retryFailed = addFieldsFlags['retry-failed'] || addFieldsFlags.retryFailed || false;
     addFieldsFlags.contentTypes = addFieldsFlags['content-types'] || addFieldsFlags.contentTypes;
     addFieldsFlags.bulkPublish = addFieldsFlags['bulk-publish'] || addFieldsFlags.bulkPublish;
@@ -114,34 +114,15 @@ UpdateAndPublishCommand.flags = {
   'retry-failed': flags.string({
     description: 'Retry publishing failed entries from the logfile (optional, overrides all other flags)',
   }),
-  retryFailed: flags.string({
-    char: 'r',
-    description: 'Retry publishing failed entries from the logfile (optional, overrides all other flags)',
-    hidden: true,
-    parse: printFlagDeprecation(['-r', '--retryFailed'], ['--retry-failed']),
-  }),
   'bulk-publish': flags.string({
     description:
       "This flag is set to true by default. It indicates that contentstack's bulkpublish API will be used to publish the entries",
     default: 'true',
   }),
-  bulkPublish: flags.string({
-    char: 'b',
-    description:
-      "This flag is set to true by default. It indicates that contentstack's bulkpublish API will be used to publish the entries",
-    hidden: true,
-    parse: printFlagDeprecation(['-b', '--bulkPublish'], ['--bulk-publish']),
-  }),
   'content-types': flags.string({
     description: 'The Contenttypes from which entries will be published',
     multiple: true,
   }),
-  contentTypes: flags.string({
-    char: 't',
-    description: 'The Contenttypes from which entries will be published',
-    multiple: true,
-    parse: printFlagDeprecation(['-t', '--contentTypes'], ['--content-types']),
-  }),
   environments: flags.string({
     char: 'e',
     description: 'Environments where entries will be published',
@@ -165,6 +146,27 @@ UpdateAndPublishCommand.flags = {
     default: false,
     description: 'Update and publish all entries even if no fields have been added',
   }),
+
+  // To be deprecated
+  retryFailed: flags.string({
+    char: 'r',
+    description: 'Retry publishing failed entries from the logfile (optional, overrides all other flags)',
+    hidden: true,
+    parse: printFlagDeprecation(['-r', '--retryFailed'], ['--retry-failed']),
+  }),
+  bulkPublish: flags.string({
+    char: 'b',
+    description:
+      "This flag is set to true by default. It indicates that contentstack's bulkpublish API will be used to publish the entries",
+    hidden: true,
+    parse: printFlagDeprecation(['-b', '--bulkPublish'], ['--bulk-publish']),
+  }),
+  contentTypes: flags.string({
+    char: 't',
+    description: 'The Contenttypes from which entries will be published',
+    multiple: true,
+    parse: printFlagDeprecation(['-t', '--contentTypes'], ['--content-types']),
+  }),
 };
 
 UpdateAndPublishCommand.examples = [

package/src/commands/cm/stacks/publish-clear-logs.js

@@ -6,7 +6,7 @@ const { getLogsDirPath } = require('../../../util/logger.js');
 
 class ClearCommand extends Command {
   async run() {
-    const clearFlags = this.parse(ClearCommand).flags;
+    const { flags: clearFlags } = await this.parse(ClearCommand);
     let dirPath = getLogsDirPath();
     if (clearFlags['log-files-count'] || clearFlags.list) {
       this.listFiles(dirPath);

package/src/commands/cm/stacks/publish-configure.js

@@ -7,7 +7,7 @@ let config = require('../../../config/index.js');
 
 class ConfigureCommand extends Command {
   async run() {
-    const configureFlags = this.parse(ConfigureCommand).flags;
+    const { flags: configureFlags } = await this.parse(ConfigureCommand);
 
     if (!configureFlags.alias) {
       configureFlags.alias = await cliux.prompt('Please enter the management token alias to be used');

package/src/commands/cm/stacks/publish-revert.js

@@ -10,7 +10,7 @@ const configKey = 'revert';
 
 class RevertCommand extends Command {
   async run() {
-    const revertFlags = this.parse(RevertCommand).flags;
+    const { flags: revertFlags } = await this.parse(RevertCommand);
     revertFlags.retryFailed = revertFlags['retry-failed'] || revertFlags.retryFailed;
     revertFlags.logFile = revertFlags['log-file'] || revertFlags.logFile;
     delete revertFlags['retry-failed'];

package/src/commands/cm/stacks/unpublish.js

@@ -11,7 +11,7 @@ let config;
 
 class UnpublishCommand extends Command {
   async run() {
-    const unpublishFlags = this.parse(UnpublishCommand).flags;
+    const { flags: unpublishFlags } = await this.parse(UnpublishCommand);
     unpublishFlags.retryFailed = unpublishFlags['retry-failed'] || unpublishFlags.retryFailed;
     unpublishFlags.bulkUnpublish = unpublishFlags['bulk-unpublish'] || unpublishFlags.bulkUnpublish;
     unpublishFlags.contentType = unpublishFlags['content-type'] || unpublishFlags.contentType;

package/src/services/publish-only-unpublished.js

@@ -11,7 +11,8 @@ const configKey = 'publish_unpublished_env';
 
 async function publishOnlyUnpublishedService(UnpublishedEntriesCommand) {
   let config;
-  const unpublishedEntriesFlags = flagsAdapter(this.parse(UnpublishedEntriesCommand).flags);
+  const _flags = await this.parse(UnpublishedEntriesCommand)
+  const unpublishedEntriesFlags = flagsAdapter(_flags.flags);
   let updatedFlags;
   try {
     updatedFlags = unpublishedEntriesFlags.config