Add YAML.scalarOptions (#146)

src/index.js

@@ -2,6 +2,13 @@ import { parse as parseCST } from './cst/parse'
 import { Document as YAMLDocument } from './Document'
 import { YAMLSemanticError } from './errors'
 import { Schema } from './schema'
+import {
+  binaryOptions,
+  boolOptions,
+  intOptions,
+  nullOptions,
+  strOptions
+} from './tags/options'
 import { warn } from './warnings'
 
 const defaultOptions = {
@@ -17,6 +24,39 @@ const defaultOptions = {
   version: '1.2'
 }
 
+const scalarOptions = {
+  get binary() {
+    return binaryOptions
+  },
+  set binary(opt) {
+    Object.assign(binaryOptions, opt)
+  },
+  get bool() {
+    return boolOptions
+  },
+  set bool(opt) {
+    Object.assign(boolOptions, opt)
+  },
+  get int() {
+    return intOptions
+  },
+  set int(opt) {
+    Object.assign(intOptions, opt)
+  },
+  get null() {
+    return nullOptions
+  },
+  set null(opt) {
+    Object.assign(nullOptions, opt)
+  },
+  get str() {
+    return strOptions
+  },
+  set str(opt) {
+    Object.assign(strOptions, opt)
+  }
+}
+
 function createNode(value, wrapScalars = true, tag) {
   if (tag === undefined && typeof wrapScalars === 'string') {
     tag = wrapScalars
@@ -81,5 +121,6 @@ export const YAML = {
   parseAllDocuments,
   parseCST,
   parseDocument,
+  scalarOptions,
   stringify
 }

tests/doc/YAML-1.2.spec.js

@@ -1,5 +1,4 @@
 import { YAML } from '../../src/index'
-import { strOptions } from '../../src/tags/options'
 
 const collectionKeyWarning =
   'Keys with collection values will be stringified as YAML due to JS Object restrictions. Use mapAsMap: true to avoid this.'
@@ -1840,15 +1839,15 @@ matches %: 20`,
 let origFoldOptions
 
 beforeAll(() => {
-  origFoldOptions = strOptions.fold
-  strOptions.fold = {
+  origFoldOptions = YAML.scalarOptions.str.fold
+  YAML.scalarOptions.str.fold = {
     lineWidth: 20,
     minContentWidth: 0
   }
 })
 
 afterAll(() => {
-  strOptions.fold = origFoldOptions
+  YAML.scalarOptions.str.fold = origFoldOptions
 })
 
 for (const section in spec) {

tests/doc/foldFlowLines.js

@@ -4,7 +4,6 @@ import {
   FOLD_QUOTED
 } from '../../src/foldFlowLines'
 import { YAML } from '../../src/index'
-import { strOptions } from '../../src/tags/options'
 
 describe('plain', () => {
   const src = 'abc def ghi jkl mno pqr stu vwx yz\n'
@@ -195,15 +194,15 @@ describe('end-to-end', () => {
   let origFoldOptions
 
   beforeAll(() => {
-    origFoldOptions = strOptions.fold
-    strOptions.fold = {
+    origFoldOptions = YAML.scalarOptions.str.fold
+    YAML.scalarOptions.str.fold = {
       lineWidth: 20,
       minContentWidth: 0
     }
   })
 
   afterAll(() => {
-    strOptions.fold = origFoldOptions
+    YAML.scalarOptions.str.fold = origFoldOptions
   })
 
   test('more-indented folded block', () => {

tests/doc/parse.js

@@ -1,7 +1,6 @@
 import fs from 'fs'
 import path from 'path'
 import { YAML } from '../../src/index'
-import { intOptions } from '../../src/tags/options'
 
 describe('tags', () => {
   describe('implicit tags', () => {
@@ -142,11 +141,11 @@ describe('number types', () => {
   describe('asBigInt: true', () => {
     let prevAsBigInt
     beforeAll(() => {
-      prevAsBigInt = intOptions.asBigInt
-      intOptions.asBigInt = true
+      prevAsBigInt = YAML.scalarOptions.int.asBigInt
+      YAML.scalarOptions.int.asBigInt = true
     })
     afterAll(() => {
-      intOptions.asBigInt = prevAsBigInt
+      YAML.scalarOptions.int.asBigInt = prevAsBigInt
     })
 
     test('Version 1.1', () => {

tests/doc/stringify.js

@@ -5,7 +5,6 @@ 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'
 
 for (const [name, version] of [
   ['YAML 1.1', '1.1'],
@@ -114,14 +113,14 @@ for (const [name, version] of [
     describe('string', () => {
       let origFoldOptions
       beforeAll(() => {
-        origFoldOptions = strOptions.fold
-        strOptions.fold = {
+        origFoldOptions = YAML.scalarOptions.str.fold
+        YAML.scalarOptions.str.fold = {
           lineWidth: 20,
           minContentWidth: 0
         }
       })
       afterAll(() => {
-        strOptions.fold = origFoldOptions
+        YAML.scalarOptions.str.fold = origFoldOptions
       })
 
       test('plain', () => {

tests/doc/types.js

@@ -1,23 +1,22 @@
 import { YAML } from '../../src/index'
 import { Scalar } from '../../src/schema/Scalar'
 import { YAMLSeq } from '../../src/schema/Seq'
-import { strOptions } from '../../src/tags/options'
 import { binary } from '../../src/tags/yaml-1.1/binary'
 import { YAMLOMap } from '../../src/tags/yaml-1.1/omap'
 import { YAMLSet } from '../../src/tags/yaml-1.1/set'
 
 let origFoldOptions
 
 beforeAll(() => {
-  origFoldOptions = strOptions.fold
-  strOptions.fold = {
+  origFoldOptions = YAML.scalarOptions.str.fold
+  YAML.scalarOptions.str.fold = {
     lineWidth: 20,
     minContentWidth: 0
   }
 })
 
 afterAll(() => {
-  strOptions.fold = origFoldOptions
+  YAML.scalarOptions.str.fold = origFoldOptions
 })
 
 describe('json schema', () => {
@@ -259,7 +258,7 @@ description:
       genericStr += String.fromCharCode(generic[i])
     expect(canonicalStr).toBe(genericStr)
     expect(canonicalStr.substr(0, 5)).toBe('GIF89')
-    strOptions.fold.lineWidth = 80
+    YAML.scalarOptions.str.fold.lineWidth = 80
     expect(String(doc))
       .toBe(`canonical: !!binary "R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J\\
   +fn5OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/++f/\\
@@ -271,7 +270,7 @@ generic: !!binary |-
   ZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLCAgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYN
   G84BwwEeECcgggoBADs=
 description: The binary value above is a tiny arrow encoded as a gif image.\n`)
-    strOptions.fold.lineWidth = 20
+    YAML.scalarOptions.str.fold.lineWidth = 20
   })
 
   test('!!bool', () => {

tests/yaml-test-suite.js

@@ -2,7 +2,6 @@ import fs from 'fs'
 import path from 'path'
 
 import { YAML } from '../src/index'
-import { strOptions } from '../src/tags/options'
 import { testEvents } from '../src/test-events'
 
 const testDirs = fs
@@ -29,15 +28,15 @@ const matchJson = (docs, json) => {
 let origFoldOptions
 
 beforeAll(() => {
-  origFoldOptions = strOptions.fold
-  strOptions.fold = {
+  origFoldOptions = YAML.scalarOptions.str.fold
+  YAML.scalarOptions.str.fold = {
     lineWidth: 20,
     minContentWidth: 0
   }
 })
 
 afterAll(() => {
-  strOptions.fold = origFoldOptions
+  YAML.scalarOptions.str.fold = origFoldOptions
 })
 
 testDirs.forEach(dir => {