Account for initial indentation when stringifying values (Fixes #133)

Author: eemeli

src/schema/Pair.js

@@ -117,6 +117,8 @@ export default class Pair extends Node {
       value = doc.schema.createNode(value, true)
     }
     ctx.implicitKey = false
+    if (!explicitKey && !this.comment && value instanceof Scalar)
+      ctx.indentAtStart = str.length + 1
     chompKeep = false
     const valueStr = doc.schema.stringify(
       value,

src/schema/index.js

@@ -264,6 +264,8 @@ export default class Schema {
     if (item instanceof Pair) return item.toString(ctx, onComment, onChompKeep)
     if (!tagObj) tagObj = this.getTagObject(item)
     const props = this.stringifyProps(item, tagObj, ctx)
+    if (props.length > 0)
+      ctx.indentAtStart = (ctx.indentAtStart || 0) + props.length + 1
     const str =
       typeof tagObj.stringify === 'function'
         ? tagObj.stringify(item, ctx, onComment, onChompKeep)

src/stringify.js

@@ -7,6 +7,11 @@ import foldFlowLines, {
 } from './foldFlowLines'
 import { strOptions } from './tags/options'
 
+const getFoldOptions = ({ indentAtStart }) =>
+  indentAtStart
+    ? Object.assign({ indentAtStart }, strOptions.fold)
+    : strOptions.fold
+
 export function stringifyNumber({ format, minFractionDigits, tag, value }) {
   if (!isFinite(value))
     return isNaN(value) ? '.nan' : value < 0 ? '-.inf' : '.inf'
@@ -41,7 +46,8 @@ function lineLengthOverLimit(str, limit) {
   return true
 }
 
-function doubleQuotedString(value, { implicitKey, indent }) {
+function doubleQuotedString(value, ctx) {
+  const { implicitKey, indent } = ctx
   const { jsonEncoding, minMultiLineLength } = strOptions.doubleQuoted
   const json = JSON.stringify(value)
   if (jsonEncoding) return json
@@ -126,7 +132,7 @@ function doubleQuotedString(value, { implicitKey, indent }) {
   str = start ? str + json.slice(start) : json
   return implicitKey
     ? str
-    : foldFlowLines(str, indent, FOLD_QUOTED, strOptions.fold)
+    : foldFlowLines(str, indent, FOLD_QUOTED, getFoldOptions(ctx))
 }
 
 function singleQuotedString(value, ctx) {
@@ -141,7 +147,7 @@ function singleQuotedString(value, ctx) {
     "'" + value.replace(/'/g, "''").replace(/\n+/g, `$&\n${indent}`) + "'"
   return implicitKey
     ? res
-    : foldFlowLines(res, indent, FOLD_FLOW, strOptions.fold)
+    : foldFlowLines(res, indent, FOLD_FLOW, getFoldOptions(ctx))
 }
 
 function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
@@ -255,7 +261,7 @@ function plainString(item, ctx, onComment, onChompKeep) {
   }
   const body = implicitKey
     ? str
-    : foldFlowLines(str, indent, FOLD_FLOW, strOptions.fold)
+    : foldFlowLines(str, indent, FOLD_FLOW, getFoldOptions(ctx))
   if (
     comment &&
     !inFlow &&

tests/doc/stringify.js

@@ -1,6 +1,7 @@
 import { source } from 'common-tags'
 import YAML from '../../src/index'
 import Pair from '../../src/schema/Pair'
+import { Type } from '../../src/constants'
 import { stringifyString } from '../../src/stringify'
 import { strOptions } from '../../src/tags/options'
 
@@ -89,6 +90,43 @@ blah blah blah blah
 blah blah blah blah
 blah blah\n`)
   })
+
+  test('long line in map', () => {
+    const foo = 'fuzz'.repeat(16)
+    const doc = new YAML.Document()
+    doc.contents = YAML.createNode({ foo })
+    for (const node of doc.contents.items) node.value.type = Type.QUOTE_DOUBLE
+    expect(
+      String(doc)
+        .split('\n')
+        .map(line => line.length)
+    ).toMatchObject([20, 20, 20, 20, 0])
+  })
+
+  test('long line in sequence', () => {
+    const foo = 'fuzz'.repeat(16)
+    const doc = new YAML.Document()
+    doc.contents = YAML.createNode([foo])
+    for (const node of doc.contents.items) node.type = Type.QUOTE_DOUBLE
+    expect(
+      String(doc)
+        .split('\n')
+        .map(line => line.length)
+    ).toMatchObject([20, 20, 20, 17, 0])
+  })
+
+  test('long line in sequence in map', () => {
+    const foo = 'fuzz'.repeat(16)
+    const doc = new YAML.Document()
+    doc.contents = YAML.createNode({ foo: [foo] })
+    const seq = doc.contents.items[0].value
+    for (const node of seq.items) node.type = Type.QUOTE_DOUBLE
+    expect(
+      String(doc)
+        .split('\n')
+        .map(line => line.length)
+    ).toMatchObject([4, 20, 20, 20, 20, 10, 0])
+  })
 })
 
 describe('timestamp-like string (YAML 1.1)', () => {

tests/doc/types.js

@@ -224,10 +224,10 @@ description:
     expect(canonicalStr.substr(0, 5)).toBe('GIF89')
     strOptions.fold.lineWidth = 80
     expect(String(doc))
-      .toBe(`canonical: !!binary "R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlp\\
-  aWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++SH+Dk1hZ\\
-  GUgd2l0aCBHSU1QACwAAAAADAAMAAAFLCAgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG8\\
-  4BwwEeECcgggoBADs="
+      .toBe(`canonical: !!binary "R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J\\
+  +fn5OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/\\
+  ++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLCAgjoEwnuNAFOhpEMTRiggcz4BN\\
+  JHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
 generic: !!binary |-
   R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlp
   aWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++SH+Dk1h