@contentstack/cli-migration 1.0.0 → 1.0.1

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-migration/1.0.0 linux-x64 node-v16.14.2
+@contentstack/cli-migration/1.0.1 darwin-arm64 node-v16.17.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -67,7 +67,7 @@ EXAMPLES
   $ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>
 ```
 
-_See code: [src/commands/cm/stacks/migration.js](https://github.com/contentstack/cli-migration/blob/v1.0.0/src/commands/cm/stacks/migration.js)_
+_See code: [src/commands/cm/stacks/migration.js](https://github.com/contentstack/cli-migration/blob/v1.0.1/src/commands/cm/stacks/migration.js)_
 <!-- commandsstop -->
 
 ### Points to remember

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.0.0","commands":{"cm:stacks:migration":{"id":"cm:stacks:migration","description":"Contentstack migration script.","usage":"cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]","pluginName":"@contentstack/cli-migration","pluginType":"core","aliases":["cm:migration"],"examples":["$ csdx cm:migration --file-path <migration/script/file/path> -k <api-key>","$ csdx cm:migration --file-path <migration/script/file/path> -k <api-key> --branch <target branch name>","$ csdx cm:migration --config <key1>:<value1> <key2>:<value2> ... --file-path <migration/script/file/path>","$ csdx cm:migration --config-file <path/to/json/config/file> --file-path <migration/script/file/path>","$ csdx cm:migration --multiple --file-path <migration/scripts/dir/path> ","$ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>"],"flags":{"api-key":{"name":"api-key","type":"option","char":"k","description":"With this flag add the API key of your stack.","hidden":true},"stack-api-key":{"name":"stack-api-key","type":"option","char":"k","description":"With this flag add the API key of your stack."},"authtoken":{"name":"authtoken","type":"boolean","char":"A","description":"Use this flag to use the auth token of the current session. After logging in CLI, an auth token is generated for each new session.","hidden":true,"allowNo":false},"alias":{"name":"alias","type":"option","char":"a","description":"Use this flag to add the management token alias."},"management-token-alias":{"name":"management-token-alias","type":"option","description":"alias of the management token","hidden":true},"filePath":{"name":"filePath","type":"option","char":"n","description":"Use this flag to provide the path of the file of the migration script provided by the user.","hidden":true},"file-path":{"name":"file-path","type":"option","description":"Use this flag to provide the path of the file of the migration script provided by the user."},"branch":{"name":"branch","type":"option","char":"B","description":"Use this flag to add the branch name where you want to perform the migration."},"config-file":{"name":"config-file","type":"option","description":"[optional] Path of the JSON configuration file"},"config":{"name":"config","type":"option","description":"[optional] inline configuration, <key1>:<value1>"},"multi":{"name":"multi","type":"boolean","description":"This flag helps you to migrate multiple content files in a single instance.","hidden":true,"allowNo":false},"multiple":{"name":"multiple","type":"boolean","description":"This flag helps you to migrate multiple content files in a single instance.","allowNo":false}},"args":[]}}}
+{"version":"1.0.1","commands":{"cm:stacks:migration":{"id":"cm:stacks:migration","description":"Contentstack migration script.","usage":"cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]","pluginName":"@contentstack/cli-migration","pluginType":"core","aliases":["cm:migration"],"examples":["$ csdx cm:migration --file-path <migration/script/file/path> -k <api-key>","$ csdx cm:migration --file-path <migration/script/file/path> -k <api-key> --branch <target branch name>","$ csdx cm:migration --config <key1>:<value1> <key2>:<value2> ... --file-path <migration/script/file/path>","$ csdx cm:migration --config-file <path/to/json/config/file> --file-path <migration/script/file/path>","$ csdx cm:migration --multiple --file-path <migration/scripts/dir/path> ","$ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>"],"flags":{"api-key":{"name":"api-key","type":"option","char":"k","description":"With this flag add the API key of your stack.","hidden":true},"stack-api-key":{"name":"stack-api-key","type":"option","char":"k","description":"With this flag add the API key of your stack."},"authtoken":{"name":"authtoken","type":"boolean","char":"A","description":"Use this flag to use the auth token of the current session. After logging in CLI, an auth token is generated for each new session.","hidden":true,"allowNo":false},"alias":{"name":"alias","type":"option","char":"a","description":"Use this flag to add the management token alias."},"management-token-alias":{"name":"management-token-alias","type":"option","description":"alias of the management token","hidden":true},"filePath":{"name":"filePath","type":"option","char":"n","description":"Use this flag to provide the path of the file of the migration script provided by the user.","hidden":true},"file-path":{"name":"file-path","type":"option","description":"Use this flag to provide the path of the file of the migration script provided by the user."},"branch":{"name":"branch","type":"option","char":"B","description":"Use this flag to add the branch name where you want to perform the migration."},"config-file":{"name":"config-file","type":"option","description":"[optional] Path of the JSON configuration file"},"config":{"name":"config","type":"option","description":"[optional] inline configuration, <key1>:<value1>"},"multi":{"name":"multi","type":"boolean","description":"This flag helps you to migrate multiple content files in a single instance.","hidden":true,"allowNo":false},"multiple":{"name":"multiple","type":"boolean","description":"This flag helps you to migrate multiple content files in a single instance.","allowNo":false}},"args":[]}}}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-migration",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "@contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.0.0",
+    "@contentstack/cli-command": "^1.0.1",
     "@contentstack/management": "^1.3.0",
-    "@contentstack/cli-utilities": "^1.0.0",
+    "@contentstack/cli-utilities": "^1.0.2",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "async": "^3.2.4",

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

@@ -187,24 +187,30 @@ class MigrationCommand extends Command {
     const _tasks = [];
     const results = [];
 
+    const taskFn = (reqObj) => {
+      const { failedTitle, successTitle, tasks } = reqObj;
+
+      return async (ctx, task) => {
+        const [err, result] = await safePromise(waterfall(tasks));
+        if (err) {
+          ctx.error = true;
+          task.title = failedTitle;
+          throw err;
+        }
+        result && results.push(result);
+        task.title = successTitle;
+        return result;
+      }
+    }
+
     for (const element of requests) {
       let reqObj = element;
-      const { title, failedTitle, successTitle, tasks } = reqObj;
-      const task = {
+      const { title } = reqObj;
+      const taskObj = {
         title: title,
-        task: async (ctx, task) => {
-          const [err, result] = await safePromise(waterfall(tasks));
-          if (err) {
-            ctx.error = true;
-            task.title = failedTitle;
-            throw err;
-          }
-          result && results.push(result);
-          task.title = successTitle;
-          return result;
-        },
+        task: taskFn(reqObj)
       };
-      _tasks.push(task);
+      _tasks.push(taskObj);
     }
     return _tasks;
   }

package/src/modules/migration.js

@@ -79,25 +79,32 @@ class Migration extends _Migration(ContentType) {
   async getTasks(_requests) {
     const _tasks = [];
     const results = [];
-    for (let i = 0; i < _requests.length; i++) {
-      let reqObj = _requests[i];
-      const { title, failedTitle, successTitle, tasks } = reqObj;
+    const taskFn = (reqObj) => {
+      const { failedTitle, successTitle, tasks } = reqObj;
+
+      return async (ctx, _task) => {
+        const [err, result] = await safePromise(waterfall(tasks));
+        if (err) {
+          ctx.error = true;
+          _task.title = failedTitle;
+          throw err;
+        }
+        result && results.push(result);
+        _task.title = successTitle;
+        return result;
+      }
+    }
+
+    for (const element of _requests) {
+      let reqObj = element;
+      const { title } = reqObj;
       const task = {
         title: title,
-        task: async (ctx, _task) => {
-          const [err, result] = await safePromise(waterfall(tasks));
-          if (err) {
-            ctx.error = true;
-            _task.title = failedTitle;
-            throw err;
-          }
-          result && results.push(result);
-          _task.title = successTitle;
-          return result;
-        },
+        task: taskFn(reqObj)
       };
       _tasks.push(task);
     }
+
     return _tasks;
   }
 }

package/src/services/content-types.js

@@ -301,15 +301,12 @@ class ContentTypeService {
     // TODO: Need a better way to handle this
     missingField = uids.includes(fieldToMove) ? null : fieldToMove;
 
-    // against && (missingField = !uids.includes(against) ? against : null);
     if (!missingField && against) {
       missingField = uids.includes(against) ? null : against;
     }
 
     // Handling both the scenarios
-    if (found === 0) {
-      isValid = false;
-    } else if (against && found === 1) {
+    if ((found === 0) || (against && (found === 1))) {
       isValid = false;
     }
 

package/src/services/locales.js

@@ -5,7 +5,6 @@ const { safePromise, constants, map: _map } = require('../utils');
 const { MANAGEMENT_SDK } = constants;
 const { get, getMapInstance } = _map;
 const mapInstance = getMapInstance();
-this.stackSDKInstance = get(MANAGEMENT_SDK, mapInstance);
 
 class LocaleService {
   constructor() {

package/src/utils/map.js

@@ -10,10 +10,10 @@ exports.get = (id, mapInstance, data = []) => {
   // Create key if does not exist
   let __data = mapInstance.get(id)
 
-  !__data && (
-    mapInstance.set(id, data),
+  if (!__data) {
+    mapInstance.set(id, data)
     __data = mapInstance.get(id)
-  )
+  }
 
   return __data
 }