yaml 2.6.0 → 2.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/browser/dist/compose/resolve-props.js +1 -1
- package/browser/dist/log.js +1 -4
- package/browser/dist/schema/json/schema.js +1 -1
- package/browser/dist/schema/yaml-1.1/binary.js +2 -11
- package/browser/dist/schema/yaml-1.1/timestamp.js +1 -1
- package/browser/dist/stringify/stringifyString.js +20 -11
- package/browser/dist/util.js +1 -1
- package/dist/compose/compose-collection.d.ts +4 -4
- package/dist/compose/compose-doc.d.ts +6 -6
- package/dist/compose/compose-node.d.ts +7 -7
- package/dist/compose/compose-scalar.d.ts +4 -4
- package/dist/compose/composer.d.ts +7 -6
- package/dist/compose/composer.js +2 -1
- package/dist/compose/resolve-block-map.d.ts +5 -5
- package/dist/compose/resolve-block-scalar.d.ts +5 -5
- package/dist/compose/resolve-block-seq.d.ts +5 -5
- package/dist/compose/resolve-end.d.ts +2 -2
- package/dist/compose/resolve-flow-collection.d.ts +7 -7
- package/dist/compose/resolve-flow-scalar.d.ts +4 -4
- package/dist/compose/resolve-props.d.ts +2 -2
- package/dist/compose/resolve-props.js +1 -1
- package/dist/compose/util-contains-newline.d.ts +1 -1
- package/dist/compose/util-empty-scalar-position.d.ts +1 -1
- package/dist/compose/util-flow-indent-check.d.ts +2 -2
- package/dist/compose/util-map-includes.d.ts +3 -3
- package/dist/doc/Document.d.ts +11 -11
- package/dist/doc/anchors.d.ts +2 -2
- package/dist/doc/createNode.d.ts +4 -4
- package/dist/doc/directives.d.ts +1 -1
- package/dist/index.d.ts +21 -18
- package/dist/log.js +4 -2
- package/dist/nodes/Alias.d.ts +9 -8
- package/dist/nodes/Collection.d.ts +4 -4
- package/dist/nodes/Node.d.ts +10 -10
- package/dist/nodes/Pair.d.ts +9 -8
- package/dist/nodes/Scalar.d.ts +4 -3
- package/dist/nodes/YAMLMap.d.ts +10 -10
- package/dist/nodes/YAMLSeq.d.ts +10 -10
- package/dist/nodes/addPairToJSMap.d.ts +3 -3
- package/dist/nodes/identity.d.ts +7 -7
- package/dist/nodes/toJS.d.ts +2 -2
- package/dist/options.d.ts +10 -10
- package/dist/parse/cst-scalar.d.ts +4 -4
- package/dist/parse/cst-stringify.d.ts +1 -1
- package/dist/parse/cst-visit.d.ts +2 -2
- package/dist/parse/cst.d.ts +4 -3
- package/dist/parse/lexer.d.ts +1 -1
- package/dist/parse/parser.d.ts +4 -4
- package/dist/parse/parser.js +2 -1
- package/dist/public-api.d.ts +6 -5
- package/dist/schema/Schema.d.ts +4 -4
- package/dist/schema/common/map.d.ts +1 -1
- package/dist/schema/common/null.d.ts +1 -1
- package/dist/schema/common/seq.d.ts +1 -1
- package/dist/schema/common/string.d.ts +1 -1
- package/dist/schema/core/bool.d.ts +1 -1
- package/dist/schema/core/float.d.ts +1 -1
- package/dist/schema/core/int.d.ts +1 -1
- package/dist/schema/core/schema.d.ts +1 -1
- package/dist/schema/json/schema.d.ts +1 -1
- package/dist/schema/json/schema.js +1 -1
- package/dist/schema/tags.d.ts +2 -2
- package/dist/schema/types.d.ts +8 -8
- package/dist/schema/yaml-1.1/binary.d.ts +1 -1
- package/dist/schema/yaml-1.1/binary.js +6 -5
- package/dist/schema/yaml-1.1/bool.d.ts +1 -1
- package/dist/schema/yaml-1.1/float.d.ts +1 -1
- package/dist/schema/yaml-1.1/int.d.ts +1 -1
- package/dist/schema/yaml-1.1/merge.d.ts +3 -3
- package/dist/schema/yaml-1.1/omap.d.ts +11 -17
- package/dist/schema/yaml-1.1/pairs.d.ts +7 -7
- package/dist/schema/yaml-1.1/schema.d.ts +1 -1
- package/dist/schema/yaml-1.1/set.d.ts +9 -9
- package/dist/schema/yaml-1.1/timestamp.d.ts +1 -1
- package/dist/schema/yaml-1.1/timestamp.js +1 -1
- package/dist/stringify/stringify.d.ts +3 -3
- package/dist/stringify/stringifyCollection.d.ts +2 -2
- package/dist/stringify/stringifyDocument.d.ts +3 -3
- package/dist/stringify/stringifyNumber.d.ts +1 -1
- package/dist/stringify/stringifyPair.d.ts +2 -2
- package/dist/stringify/stringifyString.d.ts +2 -2
- package/dist/stringify/stringifyString.js +20 -11
- package/dist/util.d.ts +16 -12
- package/dist/util.js +2 -2
- package/dist/visit.d.ts +7 -7
- package/package.json +4 -4
|
@@ -221,23 +221,32 @@ function blockString({ comment, type, value }, ctx, onComment, onChompKeep) {
|
|
|
221
221
|
start = start.replace(/\n+/g, `$&${indent}`);
|
|
222
222
|
}
|
|
223
223
|
const indentSize = indent ? '2' : '1'; // root is at -1
|
|
224
|
-
|
|
224
|
+
// Leading | or > is added later
|
|
225
|
+
let header = (startWithSpace ? indentSize : '') + chomp;
|
|
225
226
|
if (comment) {
|
|
226
227
|
header += ' ' + commentString(comment.replace(/ ?[\r\n]+/g, ' '));
|
|
227
228
|
if (onComment)
|
|
228
229
|
onComment();
|
|
229
230
|
}
|
|
230
|
-
if (literal) {
|
|
231
|
-
|
|
232
|
-
|
|
231
|
+
if (!literal) {
|
|
232
|
+
const foldedValue = value
|
|
233
|
+
.replace(/\n+/g, '\n$&')
|
|
234
|
+
.replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
|
|
235
|
+
// ^ more-ind. ^ empty ^ capture next empty lines only at end of indent
|
|
236
|
+
.replace(/\n+/g, `$&${indent}`);
|
|
237
|
+
let literalFallback = false;
|
|
238
|
+
const foldOptions = getFoldOptions(ctx, true);
|
|
239
|
+
if (blockQuote !== 'folded' && type !== Scalar.Scalar.BLOCK_FOLDED) {
|
|
240
|
+
foldOptions.onOverflow = () => {
|
|
241
|
+
literalFallback = true;
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
const body = foldFlowLines.foldFlowLines(`${start}${foldedValue}${end}`, indent, foldFlowLines.FOLD_BLOCK, foldOptions);
|
|
245
|
+
if (!literalFallback)
|
|
246
|
+
return `>${header}\n${indent}${body}`;
|
|
233
247
|
}
|
|
234
|
-
value = value
|
|
235
|
-
|
|
236
|
-
.replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
|
|
237
|
-
// ^ more-ind. ^ empty ^ capture next empty lines only at end of indent
|
|
238
|
-
.replace(/\n+/g, `$&${indent}`);
|
|
239
|
-
const body = foldFlowLines.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx, true));
|
|
240
|
-
return `${header}\n${indent}${body}`;
|
|
248
|
+
value = value.replace(/\n+/g, `$&${indent}`);
|
|
249
|
+
return `|${header}\n${indent}${start}${value}${end}`;
|
|
241
250
|
}
|
|
242
251
|
function plainString(item, ctx, onComment, onChompKeep) {
|
|
243
252
|
const { type, value } = item;
|
package/dist/util.d.ts
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
export { createNode
|
|
2
|
-
export {
|
|
3
|
-
export {
|
|
4
|
-
export {
|
|
5
|
-
export {
|
|
6
|
-
export {
|
|
7
|
-
export {
|
|
8
|
-
export {
|
|
9
|
-
export {
|
|
10
|
-
export {
|
|
11
|
-
export {
|
|
12
|
-
export {
|
|
1
|
+
export { createNode } from './doc/createNode';
|
|
2
|
+
export type { CreateNodeContext } from './doc/createNode';
|
|
3
|
+
export { debug, warn } from './log';
|
|
4
|
+
export type { LogLevelId } from './log';
|
|
5
|
+
export { createPair } from './nodes/Pair';
|
|
6
|
+
export { toJS } from './nodes/toJS';
|
|
7
|
+
export type { ToJSContext } from './nodes/toJS';
|
|
8
|
+
export { findPair } from './nodes/YAMLMap';
|
|
9
|
+
export { map as mapTag } from './schema/common/map';
|
|
10
|
+
export { seq as seqTag } from './schema/common/seq';
|
|
11
|
+
export { string as stringTag } from './schema/common/string';
|
|
12
|
+
export { foldFlowLines } from './stringify/foldFlowLines';
|
|
13
|
+
export type { FoldOptions } from './stringify/foldFlowLines';
|
|
14
|
+
export type { StringifyContext } from './stringify/stringify';
|
|
15
|
+
export { stringifyNumber } from './stringify/stringifyNumber';
|
|
16
|
+
export { stringifyString } from './stringify/stringifyString';
|
package/dist/util.js
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
var createNode = require('./doc/createNode.js');
|
|
4
4
|
var log = require('./log.js');
|
|
5
5
|
var Pair = require('./nodes/Pair.js');
|
|
6
|
-
var YAMLMap = require('./nodes/YAMLMap.js');
|
|
7
6
|
var toJS = require('./nodes/toJS.js');
|
|
7
|
+
var YAMLMap = require('./nodes/YAMLMap.js');
|
|
8
8
|
var map = require('./schema/common/map.js');
|
|
9
9
|
var seq = require('./schema/common/seq.js');
|
|
10
10
|
var string = require('./schema/common/string.js');
|
|
@@ -18,8 +18,8 @@ exports.createNode = createNode.createNode;
|
|
|
18
18
|
exports.debug = log.debug;
|
|
19
19
|
exports.warn = log.warn;
|
|
20
20
|
exports.createPair = Pair.createPair;
|
|
21
|
-
exports.findPair = YAMLMap.findPair;
|
|
22
21
|
exports.toJS = toJS.toJS;
|
|
22
|
+
exports.findPair = YAMLMap.findPair;
|
|
23
23
|
exports.mapTag = map.map;
|
|
24
24
|
exports.seqTag = seq.seq;
|
|
25
25
|
exports.stringTag = string.string;
|
package/dist/visit.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { Document } from './doc/Document
|
|
2
|
-
import type { Alias } from './nodes/Alias
|
|
3
|
-
import { Node } from './nodes/Node
|
|
4
|
-
import type { Pair } from './nodes/Pair
|
|
5
|
-
import type { Scalar } from './nodes/Scalar
|
|
6
|
-
import type { YAMLMap } from './nodes/YAMLMap
|
|
7
|
-
import type { YAMLSeq } from './nodes/YAMLSeq
|
|
1
|
+
import type { Document } from './doc/Document';
|
|
2
|
+
import type { Alias } from './nodes/Alias';
|
|
3
|
+
import type { Node } from './nodes/Node';
|
|
4
|
+
import type { Pair } from './nodes/Pair';
|
|
5
|
+
import type { Scalar } from './nodes/Scalar';
|
|
6
|
+
import type { YAMLMap } from './nodes/YAMLMap';
|
|
7
|
+
import type { YAMLSeq } from './nodes/YAMLSeq';
|
|
8
8
|
export type visitorFn<T> = (key: number | 'key' | 'value' | null, node: T, path: readonly (Document | Node | Pair)[]) => void | symbol | number | Node | Pair;
|
|
9
9
|
export type visitor = visitorFn<unknown> | {
|
|
10
10
|
Alias?: visitorFn<Alias>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yaml",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.0",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"author": "Eemeli Aro <eemeli@gmail.com>",
|
|
6
6
|
"repository": "github:eemeli/yaml",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@eslint/js": "^9.9.1",
|
|
75
75
|
"@rollup/plugin-babel": "^6.0.3",
|
|
76
76
|
"@rollup/plugin-replace": "^5.0.2",
|
|
77
|
-
"@rollup/plugin-typescript": "^
|
|
77
|
+
"@rollup/plugin-typescript": "^12.1.1",
|
|
78
78
|
"@types/jest": "^29.2.4",
|
|
79
79
|
"@types/node": "^20.11.20",
|
|
80
80
|
"babel-jest": "^29.0.1",
|
|
@@ -86,8 +86,8 @@
|
|
|
86
86
|
"jest-ts-webcompat-resolver": "^1.0.0",
|
|
87
87
|
"prettier": "^3.0.2",
|
|
88
88
|
"rollup": "^4.12.0",
|
|
89
|
-
"tslib": "^2.1
|
|
90
|
-
"typescript": "^5.
|
|
89
|
+
"tslib": "^2.8.1",
|
|
90
|
+
"typescript": "^5.7.2",
|
|
91
91
|
"typescript-eslint": "^8.4.0"
|
|
92
92
|
},
|
|
93
93
|
"engines": {
|