fix: preserve whitespace in wrapped words

imhoffd · imhoffd · commit 6dc4cd26cc3f · 2017-08-11T17:42:10.000-05:00
diff --git a/packages/@ionic/cli-utils/package.json b/packages/@ionic/cli-utils/package.json
@@ -85,7 +85,6 @@
     "@types/semver": "^5.3.33",
     "@types/tar": "^1.0.29",
     "@types/uuid": "^3.4.0",
-    "@types/wrap-ansi": "^2.0.14",
     "rxjs": "^5.4.2"
   },
   "jest": {
diff --git a/packages/@ionic/cli-utils/src/lib/utils/format.ts b/packages/@ionic/cli-utils/src/lib/utils/format.ts
@@ -48,7 +48,7 @@ export function indent(n: number = 4): string {
 }
 
 export function wordWrap(msg: string, { indentation = 0, append = '' }: { indentation?: number, append?: string }) {
-  return wrapAnsi(msg, TTY_WIDTH - indentation - append.length).split('\n').join(`${append}\n${indent(indentation)}`);
+  return wrapAnsi(msg, TTY_WIDTH - indentation - append.length, { trim: false }).split('\n').join(`${append}\n${indent(indentation)}`);
 }
 
 export function generateFillSpaceStringList(list: string[], optimalLength: number = 1, fillCharacter: string = ' '): string[] {
diff --git a/packages/@ionic/cli-utils/tsconfig.json b/packages/@ionic/cli-utils/tsconfig.json
@@ -38,6 +38,7 @@
     "../../../types/strip-ansi.d.ts",
     "../../../types/superagent.d.ts",
     "../../../types/tiny-lr.d.ts",
+    "../../../types/wrap-ansi.d.ts",
     "src/**/*.ts"
   ],
   "exclude": [
diff --git a/types/wrap-ansi.d.ts b/types/wrap-ansi.d.ts
@@ -0,0 +1,7 @@
+declare module 'wrap-ansi' {
+  function wrapAnsi(input: string, columns: number, options?: { hard?: boolean; trim?: boolean; wordWrap?: boolean }): string;
+
+  namespace wrapAnsi {}
+
+  export = wrapAnsi;
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export function indent(n: number = 4): string {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`export function wordWrap(msg: string, { indentation = 0, append = '' }: { indentation?: number, append?: string }) {`
`51`		- return wrapAnsi(msg, TTY_WIDTH - indentation - append.length).split('\n').join(`${append}\n${indent(indentation)}`);
	`51`	+ return wrapAnsi(msg, TTY_WIDTH - indentation - append.length, { trim: false }).split('\n').join(`${append}\n${indent(indentation)}`);
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`export function generateFillSpaceStringList(list: string[], optimalLength: number = 1, fillCharacter: string = ' '): string[] {`