@contentstack/cli-cm-seed 1.15.0-beta.0 → 1.15.0-beta.1

package/README.md

@@ -10,17 +10,17 @@ To import content to your stack, you can choose from the following two sources:
 <!-- usagestop -->
 ## Commands
 <!-- commands -->
-* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
-* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
 
-## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
+## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
 
 Create a stack from existing content types, entries, assets, etc
 
 ```
 USAGE
-  $ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s
-    <value>] [--locale <value>]
+  $ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>]
+    [--locale <value>]
 
 FLAGS
   -a, --alias=<value>          Alias of the management token
@@ -29,7 +29,7 @@ FLAGS
   -o, --org=<value>            Provide Organization UID to create a new stack
   -r, --repo=<value>           GitHub organization name or GitHub user name/repository name.
   -s, --stack=<value>          Provide the stack UID to seed content.
-  -y, --yes=<value>            [Optional] Skip the stack confirmation.
+  -y, --yes                    [Optional] Skip the stack confirmation.
 
 DESCRIPTION
   Create a stack from existing content types, entries, assets, etc
@@ -49,14 +49,14 @@ EXAMPLES
   $ csdx cm:stacks:seed --repo "account/repository" --org "your-org-uid" --stack-name "stack-name" //create a new stack in given org uid
 ```
 
-## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
+## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
 
 Create a stack from existing content types, entries, assets, etc
 
 ```
 USAGE
-  $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]
-    [--locale <value>]
+  $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale
+    <value>]
 
 FLAGS
   -a, --alias=<value>          Alias of the management token
@@ -65,7 +65,7 @@ FLAGS
   -o, --org=<value>            Provide Organization UID to create a new stack
   -r, --repo=<value>           GitHub organization name or GitHub user name/repository name.
   -s, --stack=<value>          Provide the stack UID to seed content.
-  -y, --yes=<value>            [Optional] Skip the stack confirmation.
+  -y, --yes                    [Optional] Skip the stack confirmation.
 
 DESCRIPTION
   Create a stack from existing content types, entries, assets, etc

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

@@ -23,7 +23,7 @@ class SeedCommand extends cli_command_1.Command {
                 stackUid: seedFlags['stack-api-key'] || seedFlags.stack,
                 stackName: seedFlags['stack-name'],
                 fetchLimit: seedFlags['fetch-limit'],
-                skipStackConfirmation: seedFlags['yes'],
+                skipStackConfirmation: seedFlags.yes,
                 isAuthenticated: (0, cli_utilities_1.isAuthenticated)(),
                 alias: managementTokenAlias,
                 master_locale: seedFlags['locale'],
@@ -57,7 +57,7 @@ SeedCommand.examples = [
     '$ csdx cm:stacks:seed --repo "account/repository" --stack-api-key "stack-api-key" //seed content into specific stack',
     '$ csdx cm:stacks:seed --repo "account/repository" --org "your-org-uid" --stack-name "stack-name" //create a new stack in given org uid',
 ];
-SeedCommand.usage = 'cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]';
+SeedCommand.usage = 'cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]';
 SeedCommand.flags = {
     repo: cli_utilities_1.flags.string({
         char: 'r',
@@ -95,7 +95,7 @@ SeedCommand.flags = {
         required: false,
         hidden: true,
     }),
-    yes: cli_utilities_1.flags.string({
+    yes: cli_utilities_1.flags.boolean({
         char: 'y',
         required: false,
         description: '[Optional] Skip the stack confirmation.',
@@ -115,6 +115,7 @@ SeedCommand.flags = {
     }),
     locale: cli_utilities_1.flags.string({
         description: 'Master Locale of the stack',
+        default: 'en-us',
         hidden: true,
     }),
 };

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

@@ -15,6 +15,7 @@ export default class GitHubClient {
     makeHeadApiCall(repo: string): Promise<any>;
     makeGetApiCall(repo: string): Promise<any>;
     checkIfRepoExists(repo: string): Promise<boolean>;
+    getMasterLocaleFromRepo(repo: string): Promise<string | null>;
     getLatestTarballUrl(repo: string): Promise<any>;
     streamRelease(url: string): Promise<Stream>;
     extract(destination: string, stream: Stream): Promise<void>;

package/lib/seed/github/client.js

@@ -100,6 +100,23 @@ class GitHubClient {
         }
         return false;
     }
+    async getMasterLocaleFromRepo(repo) {
+        var _a;
+        try {
+            const response = await this.httpClient.get(`https://raw.githubusercontent.com/${this.username}/${repo}/main/stack/locales/master-locale.json`);
+            if (response.data) {
+                const localeData = response.data;
+                const localeKey = Object.keys(localeData)[0];
+                if (localeKey && ((_a = localeData[localeKey]) === null || _a === void 0 ? void 0 : _a.code)) {
+                    return localeData[localeKey].code;
+                }
+            }
+        }
+        catch (error) {
+            console.log('Could not fetch master locale from repository', error);
+        }
+        return null;
+    }
     async getLatestTarballUrl(repo) {
         try {
             const response = await this.httpClient.get(`${this.gitHubRepoUrl}/${repo}/releases/latest`);

package/lib/seed/importer.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
+const fs = require("fs");
 const process = require("process");
 const path = require("path");
 const cli_cm_import_1 = require("@contentstack/cli-cm-import");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const STACK_FOLDER = 'stack';
 async function run(options) {
-    const importPath = (0, cli_utilities_1.pathValidator)(path.resolve((0, cli_utilities_1.sanitizePath)(options.tmpPath), STACK_FOLDER));
+    const tmpPathResolved = path.resolve((0, cli_utilities_1.sanitizePath)(options.tmpPath));
+    const stackPath = path.join(tmpPathResolved, STACK_FOLDER);
+    // Support both structures: repo with stack/ folder (per docs) or content at root
+    const importPath = fs.existsSync(stackPath)
+        ? (0, cli_utilities_1.pathValidator)(stackPath)
+        : (0, cli_utilities_1.pathValidator)(tmpPathResolved);
     const args = options.alias
         ? ['-k', options.api_key, '-d', importPath, '--alias', options.alias]
         : ['-k', options.api_key, '-d', importPath];

package/lib/seed/index.d.ts

@@ -10,7 +10,7 @@ export interface ContentModelSeederOptions {
     stackUid: string | undefined;
     stackName: string | undefined;
     fetchLimit: string | undefined;
-    skipStackConfirmation: string | undefined;
+    skipStackConfirmation: boolean | undefined;
     isAuthenticated: boolean | false;
     managementToken?: string | undefined;
     alias?: string | undefined;

package/lib/seed/index.js

@@ -127,48 +127,18 @@ class ContentModelSeeder {
         return newStack.api_key;
     }
     async shouldProceed(api_key) {
-        let count;
         const stack_details = await this.csClient.getStack(api_key);
-        if (this.options.master_locale != stack_details.master_locale) {
-            cli_utilities_1.cliux.print(`Compass app requires the master locale to be set to English (en).`, {
-                color: "yellow",
+        const repoMasterLocale = await this.ghClient.getMasterLocaleFromRepo(this.ghRepo);
+        const expectedLocale = repoMasterLocale || this.options.master_locale || exports.ENGLISH_LOCALE;
+        if (stack_details.master_locale !== expectedLocale) {
+            cli_utilities_1.cliux.print(`Repository '${this.ghRepo}' requires the master locale to be set to '${expectedLocale}', but your stack has '${stack_details.master_locale}'.`, {
+                color: 'yellow',
                 bold: true,
             });
             return false;
         }
-        const managementBody = {
-            "name": "Checking roles for creating management token",
-            "description": "This is a compass app management token.",
-            "scope": [
-                {
-                    "module": "content_type",
-                    "acl": {
-                        "read": true,
-                        "write": true
-                    }
-                },
-                {
-                    "module": "branch",
-                    "branches": [
-                        "main"
-                    ],
-                    "acl": {
-                        "read": true
-                    }
-                }
-            ],
-            "expires_on": "3000-01-01",
-            "is_email_notification_enabled": false
-        };
-        let managementTokenResult = await this.csClient.createManagementToken(api_key, this.managementToken, managementBody);
-        if ((managementTokenResult === null || managementTokenResult === void 0 ? void 0 : managementTokenResult.response_code) == "161" || (managementTokenResult === null || managementTokenResult === void 0 ? void 0 : managementTokenResult.response_code) == "401") {
-            cli_utilities_1.cliux.print(`Info: Failed to generate a management token.\nNote: Management token is not available in your plan. Please contact the admin for support.`, {
-                color: 'red',
-            });
-            return false;
-        }
-        count = await this.csClient.getContentTypeCount(api_key, this.managementToken);
-        if (count > 0 && this._options.skipStackConfirmation !== 'yes') {
+        const count = await this.csClient.getContentTypeCount(api_key, this.managementToken);
+        if (count > 0 && !this._options.skipStackConfirmation) {
             const proceed = await (0, interactive_1.inquireProceed)();
             if (!proceed) {
                 return false;

package/oclif.manifest.json

@@ -74,9 +74,8 @@
           "description": "[Optional] Skip the stack confirmation.",
           "name": "yes",
           "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "allowNo": false,
+          "type": "boolean"
         },
         "stack": {
           "char": "s",
@@ -103,6 +102,7 @@
           "description": "Master Locale of the stack",
           "hidden": true,
           "name": "locale",
+          "default": "en-us",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -115,7 +115,7 @@
       "pluginName": "@contentstack/cli-cm-seed",
       "pluginType": "core",
       "strict": true,
-      "usage": "cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]",
+      "usage": "cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]",
       "isESM": false,
       "relativePath": [
         "lib",
@@ -126,5 +126,5 @@
       ]
     }
   },
-  "version": "1.15.0-beta.0"
+  "version": "1.15.0-beta.1"
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.15.0-beta.0",
+  "version": "1.15.0-beta.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.32.0-beta.0",
-    "@contentstack/cli-command": "~1.8.0-beta.0",
-    "@contentstack/cli-utilities": "~1.18.0-beta.0",
+    "@contentstack/cli-cm-import": "~1.32.0-beta.1",
+    "@contentstack/cli-command": "~1.8.0-beta.1",
+    "@contentstack/cli-utilities": "~1.19.0-beta.0",
     "inquirer": "8.2.7",
     "mkdirp": "^1.0.4",
-    "tar": "^7.5.10",
+    "tar": "^7.5.11",
     "tmp": "^0.2.5"
   },
   "devDependencies": {
@@ -71,4 +71,4 @@
     "compile": "tsc -b tsconfig.json",
     "build": "pnpm compile && oclif manifest && oclif readme"
   }
-}
+}