@contentstack/cli-cm-seed 1.4.11 → 1.4.12

package/lib/commands/cm/stacks/seed.js

@@ -31,6 +31,11 @@ class SeedCommand extends cli_command_1.Command {
         }
         catch (error) {
             let errorObj = error;
+            if (errorObj.message !== undefined) {
+                cli_utilities_1.cliux.loader();
+                cli_utilities_1.cliux.print(`Error: ${errorObj.message}`, { color: 'red' });
+                this.exit(1);
+            }
             this.error(errorObj, { exit: 1, suggestions: errorObj.suggestions });
         }
     }

package/lib/seed/contentstack/client.d.ts

@@ -23,6 +23,7 @@ export default class ContentstackClient {
     constructor(cmaHost: string, limit: number);
     getOrganization(org_uid: string): Promise<Organization>;
     getOrganizations(skip?: number, organizations?: Organization[]): Promise<Organization[]>;
+    private mapOrganization;
     getStack(stackUID: string): Promise<Stack>;
     getStacks(org_uid: string, skip?: number, stacks?: Stack[]): Promise<Stack[]>;
     getContentTypeCount(api_key: string): Promise<number>;

package/lib/seed/contentstack/client.js

@@ -24,16 +24,20 @@ class ContentstackClient {
     async getOrganizations(skip = 0, organizations = []) {
         try {
             const client = await this.instance;
-            const response = await client.organization().fetchAll({ limit: this.limit, asc: 'name', include_count: true, skip: skip });
-            organizations = organizations.concat(response.items.map((o) => {
-                return {
-                    uid: o.uid,
-                    name: o.name,
-                    enabled: o.enabled,
-                };
-            }));
-            if (organizations.length < response.count) {
-                organizations = await this.getOrganizations(skip + this.limit);
+            const configOrgUid = cli_utilities_1.configHandler.get('oauthOrgUid');
+            if (configOrgUid) {
+                const response = await client.organization(configOrgUid).fetch();
+                const mappedOrganization = this.mapOrganization(response);
+                organizations.push(mappedOrganization);
+            }
+            else {
+                const response = await client
+                    .organization()
+                    .fetchAll({ limit: this.limit, asc: 'name', include_count: true, skip });
+                organizations.push(...response.items.map(this.mapOrganization));
+                if (organizations.length < response.count) {
+                    organizations = await this.getOrganizations(skip + this.limit, organizations);
+                }
             }
             return organizations;
         }
@@ -41,6 +45,13 @@ class ContentstackClient {
             throw this.buildError(error);
         }
     }
+    mapOrganization(o) {
+        return {
+            uid: o.uid,
+            name: o.name,
+            enabled: o.enabled,
+        };
+    }
     async getStack(stackUID) {
         try {
             const client = await this.instance;
@@ -66,7 +77,7 @@ class ContentstackClient {
                 limit: this.limit,
                 include_count: true,
                 skip: skip,
-                query: {}
+                query: {},
             })
                 .find();
             stacks = stacks.concat(response.items.map((s) => {
@@ -122,8 +133,8 @@ class ContentstackClient {
     }
     buildError(error) {
         var _a;
-        const message = ((_a = error.response.data) === null || _a === void 0 ? void 0 : _a.error_message) || error.response.statusText;
-        const status = error.response.status;
+        const message = error.errorMessage || ((_a = error.response.data) === null || _a === void 0 ? void 0 : _a.errorMessage) || error.response.statusText;
+        const status = error.status;
         return new error_1.default(message, status);
     }
 }

package/lib/seed/importer.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const process = require("process");
 const path = require("path");
+const cli_cm_import_1 = require("@contentstack/cli-cm-import");
 const STACK_FOLDER = 'stack';
 async function run(options) {
     const importPath = path.resolve(options.tmpPath, STACK_FOLDER);
     process.chdir(options.tmpPath);
-    // moving here to fix jest testing bug
-    const { parametersWithAuthToken } = require('@contentstack/cli-cm-import/src/lib/util/import-flags');
-    await parametersWithAuthToken(options.api_key, importPath, '', options.cmaHost, '', {});
+    await cli_cm_import_1.default.run(['-k', options.api_key, '-d', importPath]);
 }
 exports.run = run;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.11",
+  "version": "1.4.12",
   "commands": {
     "cm:stacks:seed": {
       "id": "cm:stacks:seed",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "^1.5.11",
-    "@contentstack/cli-command": "^1.2.9",
-    "@contentstack/cli-utilities": "^1.4.5",
+    "@contentstack/cli-cm-import": "^1.6.0",
+    "@contentstack/cli-command": "^1.2.10",
+    "@contentstack/cli-utilities": "^1.5.0",
     "axios": "1.3.4",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
@@ -41,6 +41,7 @@
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
+  "types": "./types/index.d.ts",
   "homepage": "https://github.com/contentstack/cli",
   "keywords": [
     "contentstack",
@@ -72,4 +73,4 @@
     "version": "oclif readme && git add README.md",
     "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo"
   }
-}
+}