@jungvonmatt/contentful-migrations 5.6.1 → 6.0.0

package/README.md

@@ -28,22 +28,26 @@ This initializes migrations and stores the config values in the `package.json` o
 
 The default configuration file name is `.migrationsrc`. But since we use [cosmiconfig](https://github.com/davidtheclark/cosmiconfig#cosmiconfig) you can also use the other supported config file formats and name patterns like `migrationsrc.json` or `migrations.config.js`.
 
-You can also use any config file path by adding the `-f <path/to/confg>` or `--config-file <path/to/config>` command line argument. The extensions `.json`, `.yaml`, `.yml`, `.js`, or `.cjs` are supported.
+You can also use any config file path by adding the `-f <path/to/confg>` or `--config-file <path/to/config>` command line argument. The extensions `.json`, `.yaml`, `.yml`, `.js`, `.ts`, `.mjs`, or `.cjs` are supported.
 
 By specifying the config file path you can use multiple config files for different environments or spaces in your project.
 
 #### Configuration values
 
-| Name                   | Default                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| ---------------------- |---------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| accessToken            | `undefined`               | Contentful Management Token. Just run `npx contentful login` and you're done.                                                                                                                                                                                                                                                                                                                                                                                                        |
-| spaceId                | `undefined`               | Contentful Space id. Will fallback to `process.env.CONTENTFUL_SPACE_ID` if not set.                                                                                                                                                                                                                                                                                                                                                                                                  |
-| environmentId          | `undefined`               | Contentful Environment id. Will fallback to `process.env.CONTENTFUL_ENVIRONMENT_ID` if not set.<br/>If neither `environmentId` nor `CONTENTFUL_ENVIRONMENT_ID` is available we search for environment whose id matches the current git branch                                                                                                                                                                                                                                        |
-| requestBatchSize       | `undefined`               | The batch size used for loading data from contentful. Contentful uses a default of 100. Use a smaller value when you get `Response size too big` errors (for example caused by very large rich text fields). Be aware that contentful migrations might hide the response size error and only print `The provided space does not exist or you do not have access`                                                                                                                     |
-| storage                | `undefined`               | We need to keep a hint to the executed migrations inside Contentful. You can choose between **content* and **tag**. <br/><br/>**Content** will add a new content type to your Contentful environment and stores the state of every migration as content entry (recommended approach) <br/>**tag** Will only store the latest version inside a tag. You need to preserve the right order yourself. When you add a new migration with an older version number it will not be executed. |
-| fieldId                | `'migration'`             | Id of the tag where the migration version is stored (only used with storage `tag`)                                                                                                                                                                                                                                                                                                                                                                                                   |
-| migrationContentTypeId | `'contentful-migrations'` | Id of the migration content-type (only used with storage `content`)                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| directory              | `'./migrations'`          | Directory where the migration files are stored                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+All configuration values can also be set via environment variables
+
+| Name                   | Environment Variable                       | Default                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| ---------------------- | ------------------------------------------ | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| managementToken        | `CONTENTFUL_MANAGEMENT_TOKEN`              | `undefined`               | Contentful Management Token. Just run `npx contentful login` and you're done.                                                                                                                                                                                                                                                                                                                                                                                                           |
+| -accessToken-          |                                            | `undefined`               | Not supported anymore. Please use `managementToken` instead.                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| spaceId                | `CONTENTFUL_SPACE_ID`                      | `undefined`               | Contentful Space id. Will fallback to `process.env.CONTENTFUL_SPACE_ID` if not set.                                                                                                                                                                                                                                                                                                                                                                                                     |
+| environmentId          | `CONTENTFUL_ENVIRONMENT_ID`                | `undefined`               | Contentful Environment id. Will fallback to `process.env.CONTENTFUL_ENVIRONMENT_ID` if not set.<br/>If neither `environmentId` nor `CONTENTFUL_ENVIRONMENT_ID` is available we search for environment whose id matches the current git branch                                                                                                                                                                                                                                           |
+| host                   | `CONTENTFUL_HOST`                          | `undefined`               | Allows configuring the Contentful CLI for EU usage. Will fallback to the global contentful config in your `.contentfulrc.json`                                                                                                                                                                                                                                                                                                                                                          |
+| requestBatchSize       | `CONTENTFUL_MIGRATIONS_REQUEST_BATCH_SIZE` | `undefined`               | The batch size used for loading data from contentful. Contentful uses a default of 100. Use a smaller value when you get `Response size too big` errors (for example caused by very large rich text fields). Be aware that contentful migrations might hide the response size error and only print `The provided space does not exist or you do not have access`                                                                                                                        |
+| storage                | `CONTENTFUL_MIGRATIONS_STORAGE`            | `undefined`               | We need to keep a hint to the executed migrations inside Contentful. You can choose between **content\* and **tag**. <br/><br/>**Content** will add a new content type to your Contentful environment and stores the state of every migration as content entry (recommended approach) <br/>**tag\*\* Will only store the latest version inside a tag. You need to preserve the right order yourself. When you add a new migration with an older version number it will not be executed. |
+| fieldId                | `'CONTENTFUL_MIGRATIONS_FIELD_ID'`         | `'migration'`             | Id of the tag where the migration version is stored (only used with storage `tag`)                                                                                                                                                                                                                                                                                                                                                                                                      |
+| migrationContentTypeId | `CONTENTFUL_MIGRATIONS_CONTENT_TYPE_ID`    | `'contentful-migrations'` | Id of the migration content-type (only used with storage `content`)                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| directory              | `CONTENTFUL_MIGRATIONS_DIRECTORY`          | `'./migrations'`          | Directory where the migration files are stored                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 
 <br/>
 <br/>
@@ -86,7 +90,7 @@ npx migrations generate
 
 Sometimes you may not want to start a migration from scratch. You can create a new Content type in the [contentful web app](https://www.contentful.com/help/content-modelling-basics/) and import it using the `fetch` command.
 
-*When you want to use the contentful web app to configure your content types you should do so in a separate environment because the migration will fail if the content-type is already present at the time you run the migration script*
+_When you want to use the contentful web app to configure your content types you should do so in a separate environment because the migration will fail if the content-type is already present at the time you run the migration script_
 
 ```bash
 # Generate migration scripts for all content types from the current environment
@@ -126,7 +130,7 @@ npx migrations execute <path/to/migration.js> -e <environment-id>
 ## Managing the migration versions stored in contentful
 
 Sometimes you may need to manually mark a migration as migrated or not. You can use the `version` command for this.
-*Use caution when using the version command. If you delete a version from the table and then run the migrate command, that migration version will be executed again.*
+_Use caution when using the version command. If you delete a version from the table and then run the migrate command, that migration version will be executed again._
 
 **This command is only available when using the content storage**
 
@@ -177,8 +181,8 @@ npx migrations doc -e <environment> -p <path/to/docs>
 `--template`: Use a custom template for docs. `.js` with default export or `.mustache` is allowed<br/>
 `--extension`: Use a custom file extension (default is `.md`)<br/>
 
-
 ## Migration helpers
+
 We provide you with a few smaller migration helpers. There aren't many at the moment, but there may be more in the future.
 
 To use the helpers you just need to wrap your migration with the provided `withHelpers` function which makes the helpers available as 3rd parameter
@@ -204,7 +208,7 @@ module.exports = withHelpers(async (migration, context, helpers) => {
 
   // Add or remove values from "in" validations without knowing all the other elements in the array
   await helpers.validation.addInValues('contentTypeId', 'fieldId', ['value']); // add at the end
-  await helpers.validation.addInValues('contentTypeId', 'fieldId', ['value'], { mode: 'sorted'}); // add and sort
+  await helpers.validation.addInValues('contentTypeId', 'fieldId', ['value'], { mode: 'sorted' }); // add and sort
   await helpers.validation.removeInValues('contentTypeId', 'fieldId', ['value']);
   await helpers.validation.modifyInValues('contentTypeId', 'fieldId', (existing) => {
     const result = existing.filter((value) => value.startsWith('prefix')); // keep values with prefix
@@ -212,6 +216,37 @@ module.exports = withHelpers(async (migration, context, helpers) => {
     return result; // possible duplicate values are removed afterwards
   });
 
+  // Add or remove enabled marks for a rich text field without knowing all the active marks
+  // See: https://github.com/contentful/rich-text/blob/master/packages/rich-text-types/src/marks.ts
+  await helpers.validation.richText.addEnabledMarksValues('contentTypeId', 'fieldId', ['bold']);
+  await helpers.validation.richText.removeEnabledMarksValues('contentTypeId', 'fieldId', ['underline']);
+  await helpers.validation.richText.modifyEnabledMarksValues('contentTypeId', 'fieldId', (existing) => {
+    const result = existing.filter((value) => value !== 'code'); // keep values with prefix
+    result.push('italic'); // and add one
+    return result; // possible duplicate values are removed afterwards
+  });
+
+  // Add or remove enabled node types for a rich text field without knowing all the active node types
+  // See https://github.com/contentful/rich-text/blob/master/packages/rich-text-types/src/blocks.ts
+  // and https://github.com/contentful/rich-text/blob/master/packages/rich-text-types/src/inlines.ts
+  await helpers.validation.richText.addEnabledNodeTypeValues('contentTypeId', 'fieldId', ['blockquote']);
+  await helpers.validation.richText.removeEnabledNodeTypeValues('contentTypeId', 'fieldId', ['hyperlink']);
+  await helpers.validation.richText.modifyEnabledNodeTypeValues('contentTypeId', 'fieldId', (existing) => {
+    const result = existing.filter((value) => !value.startsWith('heading-')); // filter out headings like 'heading-1'
+    result.push('quote'); // and add one
+    return result; // possible duplicate values are removed afterwards
+  });
+
+  // Add or remove embedded or linked content types for a rich text field without knowing all the allowed content types
+  // The possible node types are 'entry-hyperlink', 'embedded-entry-block' and 'embedded-entry-inline'.
+  await helpers.validation.richText.addNodeContentTypeValues('contentTypeId', 'fieldId', 'embedded-entry-block', ['a-content-type']);
+  await helpers.validation.richText.removeNodeContentTypeValues('contentTypeId', 'fieldId', 'embedded-entry-inline', ['a-content-type']);
+  await helpers.validation.richText.modifyNodeContentTypeValues('contentTypeId', 'fieldId', 'entry-hyperlink', (existing) => {
+    const result = existing.filter((value) => value.startsWith('t-')); // filter out content types that not start with 't-'
+    result.push('t-article'); // and add one
+    return result; // possible duplicate values are removed afterwards
+  });
+
 });
 ```
 
@@ -221,11 +256,10 @@ Of course. We appreciate all of our [contributors](https://github.com/jungvonmat
 welcome contributions to improve the project further. If you're uncertain whether an addition should be made, feel
 free to open up an issue and we can discuss it.
 
-
-
 ## Contributors
+
 <a href="https://github.com/jungvonmatt/contentful-migrations/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=jungvonmatt/contentful-migrations" />
+  <img alt="Contributor profile pictures" src="https://contrib.rocks/image?repo=jungvonmatt/contentful-migrations" />
 </a>
 
 [npm-url]: https://www.npmjs.com/package/@jungvonmatt/contentful-migrations

package/cli.js

@@ -13,7 +13,7 @@ const { versionDelete, versionAdd } = require('./lib/version');
 const { transferContent } = require('./lib/content');
 const { createOfflineDocs } = require('./lib/doc');
 const { createEnvironment, removeEnvironment, resetEnvironment } = require('./lib/environment');
-const { getConfig, askAll, askMissing, STORAGE_CONTENT, STORAGE_TAG } = require('./lib/config');
+const { getConfig, confirm, STORAGE_CONTENT, STORAGE_TAG } = require('./lib/config');
 const pkg = require('./package.json');
 
 require('dotenv').config();
@@ -23,7 +23,7 @@ const parseArgs = (cmd) => {
   const directory = cmd.path || parent.path;
   return {
     ...cmd,
-    configFile: cmd.configFile,
+    configFile: cmd.config,
     environment: cmd.env || parent.env,
     directory: directory ? path.resolve(directory) : undefined,
     sourceEnvironmentId: cmd.sourceEnvironmentId || parent.sourceEnvironmentId,
@@ -59,36 +59,52 @@ const program = new Command();
 program.version(pkg.version);
 program
   .command('init')
+  .option('-s, --space-id <space-id>', 'Contentful space id')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Initialize contentful-migrations')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askAll(config);
-      const { managementToken, accessToken, environmentId, spaceId, ...rest } = verified;
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'storage',
+        'fieldId',
+        'migrationContentTypeId',
+        'directory',
+      ]);
+
+      const { managementToken, accessToken, environmentId, spaceId, ...rest } = config;
 
-      if (verified.storage === STORAGE_CONTENT) {
-        await initializeContentModel({ ...config, ...verified });
-        await migrateToContentStorage({ ...config, ...verified });
+      if (config.storage === STORAGE_CONTENT) {
+        await initializeContentModel(config);
+        await migrateToContentStorage(config);
       }
-      if (verified.storage === STORAGE_TAG) {
-        await migrateToTagStorage({ ...config, ...verified });
+      if (config.storage === STORAGE_TAG) {
+        await migrateToTagStorage(config);
       }
 
       if (!process.env.CONTENTFUL_SPACE_ID) {
         rest.spaceId = spaceId;
       }
 
-      // try to store in package.json
-      const { pkgUp } = await import('pkg-up');
-      const localPkg = await pkgUp();
-      if (localPkg) {
-        const packageJson = await fs.readJson(localPkg);
-        rest.directory = path.relative(path.dirname(localPkg), rest.directory);
-        packageJson.migrations = rest;
-        await fs.outputJson(localPkg, packageJson, { spaces: 2 });
-      } else {
-        // store in .migrationsrc if no package.json is available
-        await fs.outputJson(path.join(process.cwd(), '.migrationsrc'), rest, { spaces: 2 });
+      const storeConfig = await confirm({ message: 'Do you want to store the configuration?' });
+
+      if (storeConfig) {
+        // try to store in package.json
+        const { pkgUp } = await import('pkg-up');
+        const localPkg = await pkgUp();
+        if (localPkg) {
+          const packageJson = await fs.readJson(localPkg);
+          rest.directory = path.relative(path.dirname(localPkg), rest.directory);
+          packageJson.migrations = rest;
+          await fs.outputJson(localPkg, packageJson, { spaces: 2 });
+        } else {
+          // store in .migrationsrc if no package.json is available
+          await fs.outputJson(path.join(process.cwd(), '.migrationsrc'), rest, { spaces: 2 });
+        }
       }
     })
   );
@@ -99,14 +115,20 @@ program
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
   .option('-c, --content-type <content-type...>', 'Specify content-types')
   .option('-p, --path <path/to/migrations>', 'Change the path where the migrations are saved')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Generate a new Contentful migration from content type')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askMissing(config);
-      await fetchMigration({ ...verified, contentType: cmd.contentType });
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'directory',
+      ]);
+      await fetchMigration({ ...config, contentType: cmd.contentType });
     })
   );
 
@@ -115,14 +137,20 @@ program
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
   .option('-p, --path <path/to/migrations>', 'Change the path where the migrations are saved')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Generate a new Contentful migration')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askMissing(config);
-      await createMigration(verified);
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'directory',
+      ]);
+      await createMigration(config);
     })
   );
 
@@ -131,24 +159,33 @@ program
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
   .option('-p, --path <path/to/migrations>', 'Change the path where the migrations are stored')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
   .option('-y, --yes', 'Assume "yes" as answer to all prompts and run non-interactively.')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .option('--bail', 'Abort execution after first failed migration (default: true)', true)
   .option('--no-bail', 'Ignore failed migrations')
   .description('Execute all unexecuted migrations available.')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askMissing(config);
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'storage',
+        'fieldId',
+        'migrationContentTypeId',
+        'directory',
+      ]);
 
-      const { missingStorageModel } = verified;
+      const { missingStorageModel } = config;
       if (missingStorageModel) {
         console.error(pc.red('\nError:'), `Missing migration content type. Run ${pc.cyan('npx migrations init')}`);
         process.exit(1);
       }
 
-      await runMigrations(verified);
+      await runMigrations(config);
     }, false)
   );
 
@@ -156,22 +193,30 @@ program
   .command('execute <file>')
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
   .option('-y, --yes', 'Assume "yes" as answer to all prompts and run non-interactively.')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Execute a single migration.')
   .action(
     actionRunner(async (file, options) => {
-      const config = await getConfig(parseArgs(options || {}));
-      const verified = await askMissing(config);
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'storage',
+        'fieldId',
+        'migrationContentTypeId',
+        'directory',
+      ]);
 
-      const { missingStorageModel } = verified;
+      const { missingStorageModel } = config;
       if (missingStorageModel) {
         console.error(pc.red('\nError:'), `Missing migration content type. Run ${pc.cyan('npx migrations init')}`);
         process.exit(1);
       }
-
-      await executeMigration(path.resolve(file), verified);
+      await executeMigration(path.resolve(file), config);
     }, false)
   );
 
@@ -179,31 +224,40 @@ program
   .command('version <file>')
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('--add', 'Mark migration as migrated')
   .option('--remove', 'Delete migration entry in Contentful')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Manually mark a migration as migrated or not. (Only available with the Content-model storage)')
   .action(
     actionRunner(async (file, options) => {
       const { remove, add } = options;
-      const config = await getConfig(parseArgs(options || {}));
-      const verified = await askMissing(config);
+      const config = await getConfig(parseArgs(cmd || {}), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+        'storage',
+        'fieldId',
+        'migrationContentTypeId',
+        'directory',
+      ]);
 
-      const { missingStorageModel } = verified;
+      const { missingStorageModel } = config;
       if (missingStorageModel) {
         console.error(pc.red('\nError:'), `Missing migration content type. Run ${pc.cyan('npx migrations init')}`);
         process.exit(1);
       }
 
-      const { storage } = verified || {};
+      const { storage } = config || {};
       if (storage === STORAGE_TAG) {
         throw new Error('The version command is not available for the "tag" storage');
       }
       if (remove) {
-        await versionDelete(file, verified);
+        await versionDelete(file, config);
       } else if (add) {
-        await versionAdd(file, verified);
+        await versionAdd(file, config);
       }
     }, true)
   );
@@ -211,29 +265,34 @@ program
 program
   .command('environment <environment-id>')
   .option('-s, --space-id <space-id>', 'Contentful space id')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('--create', 'Create new contentful environment')
   .option('--remove', 'Delete contentful environment')
   .option('--reset', 'Reset contentful environment')
   .option('--source-environment-id <environment-id>', 'Set the source environment to clone new environment from')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Add or remove a contentful environment for migrations')
   .action(
     actionRunner(async (environmentId, options) => {
       const { remove, create, reset } = options;
-      const config = await getConfig(parseArgs({ ...(options || {}), environmentId }));
-      const verified = await askMissing(config, ['accessToken', 'spaceId', 'environmentId']);
+      const config = await getConfig(parseArgs({ ...(options || {}), environmentId }), [
+        'managementToken',
+        'spaceId',
+        'environmentId',
+      ]);
 
       if (create) {
-        return createEnvironment(environmentId, verified);
+        return createEnvironment(environmentId, config);
       }
 
       if (remove) {
-        return removeEnvironment(environmentId, verified);
+        return removeEnvironment(environmentId, config);
       }
 
       if (reset) {
-        return resetEnvironment(environmentId, verified);
+        return resetEnvironment(environmentId, config);
       }
     }, true)
   );
@@ -243,16 +302,17 @@ program
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-e, --environment-id <environment-id>', 'Change the Contentful environment')
   .option('-p, --path <path/to/docs>', 'Change the path where the docs are stored')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
   .option('-t, --template <path/to/template>', 'Use custom template for docs')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('--extension <file-extension>', 'Use custom file extension (default is `md`)')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .description('Generate offline docs from content-types')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askMissing(config, ['accessToken', 'spaceId', 'environmentId']);
-      await createOfflineDocs(verified);
+      const config = await getConfig(parseArgs(cmd || {}), ['managementToken', 'spaceId', 'environmentId']);
+      await createOfflineDocs(config);
     }, true)
   );
 
@@ -262,20 +322,21 @@ program
   .requiredOption('--dest-environment-id <environment-id>', 'Set the Contentful destination environment (to)')
   .option('-s, --space-id <space-id>', 'Contentful space id')
   .option('-c, --content-type <content-type>', 'Specify content-type')
-  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('-v, --verbose', 'Verbosity')
   .option('-y, --yes', 'Assume "yes" as answer to all prompts and run non-interactively.')
+  .option('--host <host>', 'Management API host')
+  .option('--config <path/to/config>', 'Config file path (disables auto detect)')
   .option('--diff', 'Manually choose skip/overwrite for every conflict')
   .option('--force', 'No manual diffing. Overwrites all conflicting entries/assets')
   .description('Transfer content from source environment to destination environment')
+  .option('--cwd <directory>', 'Working directory. Defaults to process.cwd()')
   .action(
     actionRunner(async (cmd) => {
-      const config = await getConfig(parseArgs(cmd || {}));
-      const verified = await askMissing({ ...config, environmentId: 'not-used' });
+      const config = await getConfig(parseArgs(cmd || {}), ['managementToken', 'spaceId', 'storage']);
 
       // run migrations on destination environment
       await transferContent({
-        ...verified,
+        ...config,
         contentType: cmd.contentType || '',
         forceOverwrite: cmd.force || false,
         diffConflicts: cmd.diff || false,