@contentstack/cli-cm-export 1.3.0 → 1.4.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Contentstack
+Copyright (c) 2023 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -38,7 +38,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.3.0 linux-x64 node-v16.19.0
+@contentstack/cli-cm-export/1.4.0 linux-x64 node-v16.19.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "commands": {
     "cm:stacks:export": {
       "id": "cm:stacks:export",

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.1.0",
-    "@contentstack/cli-utilities": "^1.1.0",
+    "@contentstack/cli-command": "^1.2.0",
+    "@contentstack/cli-utilities": "^1.2.0",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
+    "chalk": "^4.1.2",
     "is-valid-path": "^0.1.1",
     "lodash": "^4.17.20",
     "mkdirp": "^1.0.4",
@@ -22,10 +23,9 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "^1.0.6",
-    "@contentstack/cli-config": "^1.0.4",
-    "@contentstack/cli-dev-dependencies": "^1.0.0",
-    "@oclif/dev-cli": "^1.26.10",
+    "@contentstack/cli-auth": "^1.2.0",
+    "@contentstack/cli-config": "^1.2.0",
+    "@contentstack/cli-dev-dependencies": "^1.2.0",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
     "assert": "^2.0.0",
@@ -33,14 +33,15 @@
     "dotenv": "^16.0.1",
     "dotenv-expand": "^9.0.0",
     "eslint": "^8.18.0",
-    "eslint-config-oclif": "^3.1.0",
+    "eslint-config-oclif": "^4.0.0",
     "globby": "^10.0.2",
     "mocha": "10.1.0",
     "nyc": "^15.1.0",
-    "sinon": "^15.0.1"
+    "sinon": "^15.0.1",
+    "oclif": "^3.1.2"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/npm-shrinkwrap.json",
@@ -60,6 +61,7 @@
     "prepack": "oclif manifest && oclif readme",
     "test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
     "version": "oclif readme && git add README.md",
+    "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo",
     "test:integration": "mocha --forbid-only \"test/run.test.js\" --integration-test",
     "test:unit": "mocha --forbid-only \"test/unit/*.test.js\" --unit-test"
   },

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

@@ -1,7 +1,5 @@
 /* eslint-disable complexity */
-const { Command, flags } = require('@contentstack/cli-command');
-const { printFlagDeprecation } = require('@contentstack/cli-utilities');
-
+const { Command } = require('@contentstack/cli-command');
 const {
   configWithMToken,
   parameterWithMToken,
@@ -11,7 +9,7 @@ const {
   withoutParametersWithAuthToken,
 } = require('../../../lib/util/export-flags');
 const config = require('../../../config/default');
-const { configHandler } = require('@contentstack/cli-utilities');
+const { configHandler, printFlagDeprecation, flags } = require('@contentstack/cli-utilities');
 
 class ExportCommand extends Command {
   async run() {

package/src/config/default.js

@@ -33,6 +33,11 @@ module.exports = {
       fileName: 'locales.json',
       requiredKeys: ['code', 'uid', 'name', 'fallback_locale'],
     },
+    masterLocale: {
+      dirName: 'locales',
+      fileName: 'master-locale.json',
+      requiredKeys: ['code', 'uid', 'name'],
+    },
     customRoles: {
       dirName: 'custom-roles',
       fileName: 'custom-roles.json',

package/src/lib/export/locales.js

@@ -7,14 +7,10 @@ class LocaleExport {
     this.stackAPIClient = stackAPIClient;
     this.exportConfig = exportConfig;
     this.localeConfig = exportConfig.modules.locales;
+    this.masterLocaleConfig = exportConfig.modules.masterLocale;
     this.qs = {
       include_count: true,
       asc: 'updated_at',
-      query: {
-        code: {
-          $nin: [exportConfig.master_locale.code],
-        },
-      },
       only: {
         BASE: this.localeConfig.requiredKeys,
       },
@@ -22,6 +18,7 @@ class LocaleExport {
 
     this.localesPath = path.resolve(exportConfig.data, exportConfig.branchName || '', this.localeConfig.dirName);
     this.locales = {};
+    this.masterLocale = {};
     this.fetchConcurrency = this.localeConfig.fetchConcurrency || this.exportConfig.fetchConcurrency;
     this.writeConcurrency = this.localeConfig.writeConcurrency || this.exportConfig.writeConcurrency;
   }
@@ -32,6 +29,7 @@ class LocaleExport {
       await fileHelper.makeDirectory(this.localesPath);
       await this.getLocales();
       await fileHelper.writeFile(path.join(this.localesPath, this.localeConfig.fileName), this.locales);
+      await fileHelper.writeFile(path.join(this.localesPath, this.masterLocaleConfig.fileName), this.masterLocale);
       addlogs(this.exportConfig, 'Completed locale export', 'success');
     } catch (error) {
       addlogs(this.exportConfig, chalk.red(`Failed to export locales ${formatError(error)}`), 'error');
@@ -61,7 +59,11 @@ class LocaleExport {
           delete locale[key];
         }
       }
-      this.locales[locale.uid] = locale;
+      if(locale.code === this.exportConfig.master_locale.code){
+        this.masterLocale[locale.uid] = locale;
+      }else{
+        this.locales[locale.uid] = locale;
+      }
     });
   }
 }

package/src/lib/export/marketplace-apps.js

@@ -29,8 +29,6 @@ module.exports = class ExportMarketplaceApps {
   }
 
   async start() {
-    this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl());
-
     if (!this.config.auth_token) {
       cliux.print(
         'WARNING!!! To export Marketplace apps, you must be logged in. Please check csdx auth:login --help to log in',
@@ -39,6 +37,8 @@ module.exports = class ExportMarketplaceApps {
       return Promise.resolve();
     }
 
+    this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl());
+
     await this.getOrgUid();
 
     this.httpClient = new HttpClient().headers({