feat(cli): specify indentation as option

Closes #12
JamieMason · Oct 28, 2018 · 8b408bd · 8b408bd
1 parent 51054b3
commit 8b408bd
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ Options:
   -p, --prod              include dependencies
   -d, --dev               include devDependencies
   -P, --peer              include peerDependencies
+  -i, --indent [value]    override indentation. defaults to "  "
   -h, --help              output usage information
 ```
 
@@ -63,6 +64,7 @@ Usage: syncpack format [options]
 Options:
 
   -s, --source [pattern]  glob pattern for package.json files to read from
+  -i, --indent [value]    override indentation. defaults to "  "
   -h, --help              output usage information
 ```
 
@@ -112,5 +114,6 @@ Options:
   -p, --prod                  include dependencies
   -d, --dev                   include devDependencies
   -P, --peer                  include peerDependencies
+  -i, --indent [value]    override indentation. defaults to "  "
   -h, --help                  output usage information
 ```
diff --git a/src/constants.ts b/src/constants.ts
@@ -5,6 +5,7 @@ export const DEPENDENCY_TYPES: IManifestKey[] = [
   'devDependencies',
   'peerDependencies'
 ];
+
 export const SORT_AZ = [
   'contributors',
   'dependencies',
@@ -14,6 +15,7 @@ export const SORT_AZ = [
   'peerDependencies',
   'scripts'
 ];
+
 export const SORT_FIRST = ['name', 'description', 'version', 'author'];
 export const VERSION = require('../package.json').version;
 export const GREATER = 1;
@@ -40,6 +42,7 @@ export const SEMVER_ORDER = [
   RANGE_ANY
 ];
 
+const DEFAULT_INDENT = '  ';
 const DEFAULT_SEMVER_RANGE = RANGE_EXACT;
 const MONOREPO_PATTERN = './package.json';
 const PACKAGES_PATTERN = './packages/*/package.json';
@@ -100,3 +103,9 @@ export const OPTIONS_PEER = {
   description: 'include peerDependencies',
   spec: '-P, --peer'
 };
+
+export const OPTION_INDENT = {
+  default: DEFAULT_INDENT,
+  description: `override indentation. defaults to "${DEFAULT_INDENT}"`,
+  spec: '-i, --indent [value]'
+};
diff --git a/src/fix-mismatches.ts b/src/fix-mismatches.ts
@@ -3,13 +3,15 @@ import { writeJson } from 'fs-extra';
 import _ = require('lodash');
 import { relative } from 'path';
 import {
+  OPTION_INDENT,
   OPTION_SOURCES,
   OPTIONS_DEV,
   OPTIONS_PEER,
   OPTIONS_PROD
 } from './constants';
 import { collect } from './lib/collect';
 import { getDependencyTypes } from './lib/get-dependency-types';
+import { getIndent } from './lib/get-indent';
 import { getPackages } from './lib/get-packages';
 import { getMismatchedVersionsByName } from './lib/get-versions-by-name';
 import { getNewest } from './lib/version';
@@ -21,10 +23,12 @@ export const run = async (program: CommanderApi) => {
     .option(OPTIONS_PROD.spec, OPTIONS_PROD.description)
     .option(OPTIONS_DEV.spec, OPTIONS_DEV.description)
     .option(OPTIONS_PEER.spec, OPTIONS_PEER.description)
+    .option(OPTION_INDENT.spec, OPTION_INDENT.description)
     .parse(process.argv);
 
-  const dependencyTypes = getDependencyTypes(program);
   const pkgs = await getPackages(program);
+  const dependencyTypes = getDependencyTypes(program);
+  const indent = getIndent(program);
   const mismatchedVersionsByName = getMismatchedVersionsByName(
     dependencyTypes,
     pkgs
@@ -49,7 +53,7 @@ export const run = async (program: CommanderApi) => {
   });
 
   await Promise.all(
-    pkgs.map(({ data, path }) => writeJson(path, data, { spaces: 2 }))
+    pkgs.map(({ data, path }) => writeJson(path, data, { spaces: indent }))
   );
 
   _.each(pkgs, (pkg) => {

diff --git a/src/format.ts b/src/format.ts
@@ -2,8 +2,14 @@ import chalk from 'chalk';
 import { writeJson } from 'fs-extra';
 import _ = require('lodash');
 import { relative } from 'path';
-import { OPTION_SOURCES, SORT_AZ, SORT_FIRST } from './constants';
+import {
+  OPTION_INDENT,
+  OPTION_SOURCES,
+  SORT_AZ,
+  SORT_FIRST
+} from './constants';
 import { collect } from './lib/collect';
+import { getIndent } from './lib/get-indent';
 import { getPackages } from './lib/get-packages';
 import { CommanderApi, IManifest } from './typings';
 
@@ -59,15 +65,17 @@ export const run = async (program: CommanderApi) => {
 
   program
     .option(OPTION_SOURCES.spec, OPTION_SOURCES.description, collect)
+    .option(OPTION_INDENT.spec, OPTION_INDENT.description)
     .parse(process.argv);
 
   const pkgs = await getPackages(program);
+  const indent = getIndent(program);
 
   await Promise.all(
     pkgs.map(({ data, path }) => {
       console.log(chalk.blue(`./${relative('.', path)}`));
       const nextData = sortManifest(shortenBugs(shortenRepository(data)));
-      return writeJson(path, nextData, { spaces: 2 });
+      return writeJson(path, nextData, { spaces: indent });
     })
   );
 };
diff --git a/src/lib/get-indent.ts b/src/lib/get-indent.ts
@@ -0,0 +1,7 @@
+import { OPTION_INDENT } from '../constants';
+import { CommanderApi } from '../typings';
+
+export type GetIndent = (program: CommanderApi) => string;
+
+export const getIndent: GetIndent = (program) =>
+  program.indent || OPTION_INDENT.default;
diff --git a/src/set-semver-ranges.ts b/src/set-semver-ranges.ts
@@ -4,6 +4,7 @@ import _ = require('lodash');
 import { relative } from 'path';
 import semver = require('semver');
 import {
+  OPTION_INDENT,
   OPTION_SEMVER_RANGE,
   OPTION_SOURCES,
   OPTIONS_DEV,
@@ -14,6 +15,7 @@ import {
 } from './constants';
 import { collect } from './lib/collect';
 import { getDependencyTypes } from './lib/get-dependency-types';
+import { getIndent } from './lib/get-indent';
 import { getPackages } from './lib/get-packages';
 import { getVersionNumber } from './lib/version';
 import { CommanderApi } from './typings';
@@ -25,13 +27,15 @@ export const run = async (program: CommanderApi) => {
     .option(OPTIONS_PROD.spec, OPTIONS_PROD.description)
     .option(OPTIONS_DEV.spec, OPTIONS_DEV.description)
     .option(OPTIONS_PEER.spec, OPTIONS_PEER.description)
+    .option(OPTION_INDENT.spec, OPTION_INDENT.description)
     .parse(process.argv);
 
   const semverRange: string =
     program.semverRange || OPTION_SEMVER_RANGE.default;
 
-  const dependencyTypes = getDependencyTypes(program);
   const pkgs = await getPackages(program);
+  const dependencyTypes = getDependencyTypes(program);
+  const indent = getIndent(program);
 
   _(pkgs).each((pkg) =>
     _(dependencyTypes)
@@ -61,7 +65,7 @@ export const run = async (program: CommanderApi) => {
   );
 
   await Promise.all(
-    pkgs.map(({ data, path }) => writeJson(path, data, { spaces: 2 }))
+    pkgs.map(({ data, path }) => writeJson(path, data, { spaces: indent }))
   );
 
   _.each(pkgs, (pkg) => {