Merge pull request #1447 from contentstack/staging

DX | 03-07-2024 | Release

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.6.2 darwin-arm64 node-v21.6.2
+@contentstack/cli-audit/1.6.3 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -267,7 +267,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -292,7 +292,7 @@ GLOBAL FLAGS
 DESCRIPTION
   Installs a plugin into csdx.
 
-  Uses bundled npm executable to install plugins into /Users/raj.pandey/.local/share/@contentstack/cli-audit
+  Uses npm to install plugins.
 
   Installation of a user-installed plugin will override a core plugin.
 
@@ -341,7 +341,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -366,7 +366,7 @@ GLOBAL FLAGS
 DESCRIPTION
   Installs a plugin into csdx.
 
-  Uses bundled npm executable to install plugins into /Users/raj.pandey/.local/share/@contentstack/cli-audit
+  Uses npm to install plugins.
 
   Installation of a user-installed plugin will override a core plugin.
 
@@ -390,7 +390,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -420,7 +420,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -461,7 +461,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -489,7 +489,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -533,5 +533,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.0.21/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.3.3/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
+    "@contentstack/cli-utilities": "~1.6.3",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^5.0.0",
     "chalk": "^4.1.2",

packages/contentstack-audit/src/messages/index.ts

@@ -46,8 +46,8 @@ const auditFixMsg = {
   EMPTY_FIX_MSG: 'Successfully removed the empty field/block found at {path} from the schema.',
   AUDIT_FIX_CMD_DESCRIPTION: 'Perform audits and fix possible errors in the exported Contentstack data.',
   WF_FIX_MSG: 'Successfully removed the workflow {uid} named {name}.',
-  ENTRY_MANDATORY_FIELD_FIX: `Removing the publish details from entry uid '{uid}' from locale '{locale}'`,
-  ENTRY_SELECT_FIELD_FIX: `Adding the value '{value}' in select field of uid '{uid}'`
+  ENTRY_MANDATORY_FIELD_FIX: `Removing the publish details from the entry with UID '{uid}' in Locale '{locale}'...`,
+  ENTRY_SELECT_FIELD_FIX: `Adding the value '{value}' in the select field of entry UID '{uid}'...`
 };
 
 const messages: typeof errors &

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

@@ -59,7 +59,6 @@ export default class Entries {
   protected missingMandatoryFields: Record<string, any> = {};
   public entryMetaData: Record<string, any>[] = [];
   public moduleName: keyof typeof auditConfig.moduleConfig = 'entries';
-  public isEntryWithoutTitleField: boolean = false;
 
   constructor({ log, fix, config, moduleName, ctSchema, gfSchema }: ModuleConstructorParam & CtConstructorParam) {
     this.log = log;
@@ -128,7 +127,7 @@ export default class Entries {
             this.lookForReference([{ locale: code, uid, name: title }], ctSchema, this.entries[entryUid]);
 
             const fields = this.missingMandatoryFields[uid];
-            const isPublished = entry.publish_details.length > 0;
+            const isPublished = entry.publish_details?.length > 0;
             if ((this.fix && fields.length && isPublished) || (!this.fix && fields)) {
               const fixStatus = this.fix ? 'Fixed' : '';
               fields?.forEach((field: { isPublished: boolean; fixStatus?: string }) => {
@@ -1262,15 +1261,13 @@ export default class Entries {
             let { title } = entries[entryUid];
 
             if (entries[entryUid].hasOwnProperty('title') && !title) {
-              this.isEntryWithoutTitleField = true;
               this.log(
                 `The 'title' field in Entry with UID '${entryUid}' of Content Type '${uid}' in Locale '${code}' is empty.`,
                 `error`,
               );
             } else if (!title) {
-              this.isEntryWithoutTitleField = true;
               this.log(
-                `Entry with UID '${entryUid}' of Content Type '${uid}' in Locale '${code}' does not have a 'title' field.`,
+                `The 'title' field in Entry with UID '${entryUid}' of Content Type '${uid}' in Locale '${code}' is empty.`,
                 `error`,
               );
             }
@@ -1279,8 +1276,5 @@ export default class Entries {
         }
       }
     }
-    if (this.isEntryWithoutTitleField) {
-      // throw Error(`Entries found with missing 'title' field! Please make the data corrections and re-run the audit.`);
-    }
   }
 }

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

@@ -68,8 +68,8 @@ export default class Extensions {
 
       if (ctNotPresent?.length && ext.scope) {
         ext.content_types = ctNotPresent;
-        ctNotPresent.forEach((ct) => this.missingCts.add(ct));
-        this.missingCtInExtensions.push(cloneDeep(ext));
+        ctNotPresent.forEach((ct) => this.missingCts?.add(ct));
+        this.missingCtInExtensions?.push(cloneDeep(ext));
       }
 
       this.log(

packages/contentstack-auth/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.18 darwin-arm64 node-v21.6.2
+@contentstack/cli-auth/1.3.19 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-auth/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
+    "@contentstack/cli-utilities": "~1.6.3",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",
     "inquirer": "8.2.4",

packages/contentstack-auth/test/config.json

@@ -1,5 +1,8 @@
 {
   "IS_TS": true,
   "UNIT_EXECUTION_ORDER": [],
-  "INTEGRATION_EXECUTION_ORDER": []
+  "INTEGRATION_EXECUTION_ORDER": [],
+  "password": "testpassword",
+  "invalidPassowrd": "invalidpassword",
+  "validAPIKey": "adasdfagsf"
 }

packages/contentstack-auth/test/integration/auth.test.ts

@@ -3,14 +3,14 @@ import { expect, test } from '@oclif/test';
 // @ts-ignore
 import { Helper } from './helper';
 // @ts-ignore
-import { PRINT_LOGS } from './config.json';
+import { PRINT_LOGS, encryptionKey } from './config.json';
 import { cliux as CliUx, messageHandler, NodeCrypto } from '@contentstack/cli-utilities';
 
 const messageFilePath = path.join(__dirname, '..', '..', '..', 'contentstack-utilities', 'messages/auth.json');
 const crypto = new NodeCrypto({
   typeIdentifier: '◈',
   algorithm: 'aes-192-cbc',
-  encryptionKey: process.env.ENCRYPTION_KEY || '***REMOVED***'
+  encryptionKey: process.env.ENCRYPTION_KEY || encryptionKey
 });
 const username = process.env.ENCRYPTION_KEY ? crypto.decrypt(process.env.USERNAME) : process.env.USERNAME
 const password = process.env.ENCRYPTION_KEY ? crypto.decrypt(process.env.PASSWORD) : process.env.PASSWORD

packages/contentstack-auth/test/integration/config.json

@@ -1,3 +1,4 @@
 {
-  "PRINT_LOGS": false
+  "PRINT_LOGS": false,
+  "encryptionKey": "***REMOVED***"
 }

packages/contentstack-auth/test/unit/auth-handler.test.ts

@@ -3,10 +3,11 @@ import * as sinon from 'sinon';
 import { authHandler, interactive } from '../../src/utils';
 import { CLIError, cliux } from '@contentstack/cli-utilities';
 import { User } from '../../src/interfaces';
+import * as config from '../config.json';
 
 const user: User = { email: '***REMOVED***', authtoken: 'testtoken' };
-const credentials = { email: '***REMOVED***', password: 'testpassword' };
-const invalidCredentials = { email: '***REMOVED***', password: 'invalidpassword' };
+const credentials = { email: '***REMOVED***', password: config.password };
+const invalidCredentials = { email: '***REMOVED***', password: config.invalidPassowrd };
 let TFAEnabled = false;
 let TFAChannel = 'authy';
 const TFATestToken = '24563992';

packages/contentstack-auth/test/unit/commands/login.test.ts

@@ -3,12 +3,13 @@ import * as sinon from 'sinon';
 import LoginCommand from '../../../src/commands/auth/login';
 import { authHandler, interactive } from '../../../src/utils';
 import { configHandler, cliux } from '@contentstack/cli-utilities';
+import * as conf from '../../config.json';
 
 const config = configHandler;
 
 const user = { email: '***REMOVED***', authtoken: 'testtoken' };
-const credentials = { email: '***REMOVED***', password: 'testpassword' };
-const invalidCredentials = { email: '***REMOVED***', password: 'invalidpassword' };
+const credentials = { email: '***REMOVED***', password: conf.password };
+const invalidCredentials = { email: '***REMOVED***', password: conf.invalidPassowrd };
 const TFATestToken = '24563992';
 
 describe('Login Command', () => {

packages/contentstack-auth/test/unit/commands/tokens-add.test.ts

@@ -5,6 +5,7 @@ import TokensAddCommand from '../../../src/commands/auth/tokens/add';
 import { tokenValidation } from '../../../src/utils';
 import { stub, assert } from 'sinon';
 import { config as dotenvConfig } from 'dotenv';
+import * as conf from '../../config.json';
 
 dotenvConfig();
 
@@ -24,7 +25,7 @@ describe('Tokens Add Command', () => {
   let managementTokenValidationStub;
   let environmentTokenValidationStub;
   let printStub;
-  const validAPIKey = 'adasdfagsf';
+  const validAPIKey = conf.validAPIKey;
   const validDeliveryToken = '***REMOVED***';
   const validmanagementToken = 'cmajhsd98939482';
   const validEnvironment = 'textenv';

packages/contentstack-auth/test/unit/interactive.test.ts

@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { interactive } from '../../src/utils';
 import { cliux } from '@contentstack/cli-utilities';
+import * as config from '../config.json'
 
 describe('Interactive', () => {
   let inquireStub;
@@ -31,7 +32,7 @@ describe('Interactive', () => {
   });
 
   it('ask password', async function () {
-    const password = 'testpassword';
+    const password = config.password
     inquireStub.callsFake(function () {
       return Promise.resolve(password);
     });

packages/contentstack-bootstrap/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.9.3 darwin-arm64 node-v21.6.2
+@contentstack/cli-cm-bootstrap/1.9.3 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/package.json

@@ -17,9 +17,9 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.7.5",
+    "@contentstack/cli-cm-seed": "~1.7.6",
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
+    "@contentstack/cli-utilities": "~1.6.3",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
     "tar": "^6.2.1 "

packages/contentstack-branches/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.26 darwin-arm64 node-v21.6.2
+@contentstack/cli-cm-branches/1.1.1 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-branches/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
+    "@contentstack/cli-utilities": "~1.6.3",
     "@oclif/core": "^3.26.5",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -25,7 +25,7 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.3.18",
+    "@contentstack/cli-auth": "~1.3.19",
     "@contentstack/cli-config": "~1.6.4",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",

packages/contentstack-branches/src/utils/create-merge-scripts.ts

@@ -7,8 +7,9 @@ import { assetFolderCreateScript } from './asset-folder-create-script';
 
 type CreateMergeScriptsProps = {
   uid: string;
-  entry_merge_strategy: string;
+  entry_merge_strategy?: string;
   type?: string;
+  status?: string;
 };
 
 export function generateMergeScripts(mergeSummary, mergeJobUID) {
@@ -43,11 +44,8 @@ export function generateMergeScripts(mergeSummary, mergeJobUID) {
         cliux.print(`Info: Entries of ${messageType} content types selected for the migration`, { color: 'blue' });
       }
     };
-
-    processContentType(
-      { type: 'assets', uid: '', entry_merge_strategy: '' },
-      mergeStrategies['asset_create_folder'],
-    );
+
+    processContentType({ type: 'assets', uid: '', entry_merge_strategy: '' }, mergeStrategies['asset_create_folder']);
     processContentTypes(mergeSummary.modified, 'Modified');
     processContentTypes(mergeSummary.added, 'New');
 
@@ -92,13 +90,13 @@ export function createMergeScripts(contentType: CreateMergeScriptsProps, mergeJo
         fs.mkdirSync(fullPath);
       }
       let filePath: string;
-      let milliSeconds = date.getMilliseconds().toString().padStart(3, '0')
+      let milliSeconds = date.getMilliseconds().toString().padStart(3, '0');
       if (contentType.type === 'assets') {
         filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_create_assets_folder.js`;
       } else {
-        filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${
-          contentType.uid
-        }.js`;
+        filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(
+          contentType.entry_merge_strategy,
+        )}_${contentType.uid}.js`;
       }
       fs.writeFileSync(filePath, content, 'utf-8');
     }