yaml 2.8.2 → 3.0.0-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.
Files changed (238) hide show
  1. package/README.md +65 -85
  2. package/{bin.mjs → bin.js} +1 -1
  3. package/dist/chunk-BYypO7fO.js +18 -0
  4. package/dist/cli.d.ts +10 -7
  5. package/dist/cli.js +181 -0
  6. package/dist/directives-CG6n4xSM.js +2856 -0
  7. package/dist/index.d.ts +335 -25
  8. package/dist/index.js +4 -49
  9. package/dist/line-counter-TFl552k_.js +3098 -0
  10. package/dist/public-api-BE74JyVm.js +79 -0
  11. package/dist/stringifyString-S_ITVLTO.d.ts +1306 -0
  12. package/dist/test-events.d.ts +6 -3
  13. package/dist/test-events.js +98 -124
  14. package/dist/util.d.ts +2 -16
  15. package/dist/util.js +2 -27
  16. package/package.json +20 -44
  17. package/browser/dist/compose/compose-collection.js +0 -88
  18. package/browser/dist/compose/compose-doc.js +0 -43
  19. package/browser/dist/compose/compose-node.js +0 -102
  20. package/browser/dist/compose/compose-scalar.js +0 -86
  21. package/browser/dist/compose/composer.js +0 -217
  22. package/browser/dist/compose/resolve-block-map.js +0 -115
  23. package/browser/dist/compose/resolve-block-scalar.js +0 -198
  24. package/browser/dist/compose/resolve-block-seq.js +0 -49
  25. package/browser/dist/compose/resolve-end.js +0 -37
  26. package/browser/dist/compose/resolve-flow-collection.js +0 -207
  27. package/browser/dist/compose/resolve-flow-scalar.js +0 -223
  28. package/browser/dist/compose/resolve-props.js +0 -146
  29. package/browser/dist/compose/util-contains-newline.js +0 -34
  30. package/browser/dist/compose/util-empty-scalar-position.js +0 -26
  31. package/browser/dist/compose/util-flow-indent-check.js +0 -15
  32. package/browser/dist/compose/util-map-includes.js +0 -13
  33. package/browser/dist/doc/Document.js +0 -335
  34. package/browser/dist/doc/anchors.js +0 -71
  35. package/browser/dist/doc/applyReviver.js +0 -55
  36. package/browser/dist/doc/createNode.js +0 -88
  37. package/browser/dist/doc/directives.js +0 -176
  38. package/browser/dist/errors.js +0 -57
  39. package/browser/dist/index.js +0 -17
  40. package/browser/dist/log.js +0 -11
  41. package/browser/dist/nodes/Alias.js +0 -114
  42. package/browser/dist/nodes/Collection.js +0 -147
  43. package/browser/dist/nodes/Node.js +0 -38
  44. package/browser/dist/nodes/Pair.js +0 -36
  45. package/browser/dist/nodes/Scalar.js +0 -24
  46. package/browser/dist/nodes/YAMLMap.js +0 -144
  47. package/browser/dist/nodes/YAMLSeq.js +0 -113
  48. package/browser/dist/nodes/addPairToJSMap.js +0 -63
  49. package/browser/dist/nodes/identity.js +0 -36
  50. package/browser/dist/nodes/toJS.js +0 -37
  51. package/browser/dist/parse/cst-scalar.js +0 -214
  52. package/browser/dist/parse/cst-stringify.js +0 -61
  53. package/browser/dist/parse/cst-visit.js +0 -97
  54. package/browser/dist/parse/cst.js +0 -98
  55. package/browser/dist/parse/lexer.js +0 -717
  56. package/browser/dist/parse/line-counter.js +0 -39
  57. package/browser/dist/parse/parser.js +0 -967
  58. package/browser/dist/public-api.js +0 -102
  59. package/browser/dist/schema/Schema.js +0 -37
  60. package/browser/dist/schema/common/map.js +0 -17
  61. package/browser/dist/schema/common/null.js +0 -15
  62. package/browser/dist/schema/common/seq.js +0 -17
  63. package/browser/dist/schema/common/string.js +0 -14
  64. package/browser/dist/schema/core/bool.js +0 -19
  65. package/browser/dist/schema/core/float.js +0 -43
  66. package/browser/dist/schema/core/int.js +0 -38
  67. package/browser/dist/schema/core/schema.js +0 -23
  68. package/browser/dist/schema/json/schema.js +0 -62
  69. package/browser/dist/schema/tags.js +0 -96
  70. package/browser/dist/schema/yaml-1.1/binary.js +0 -58
  71. package/browser/dist/schema/yaml-1.1/bool.js +0 -26
  72. package/browser/dist/schema/yaml-1.1/float.js +0 -46
  73. package/browser/dist/schema/yaml-1.1/int.js +0 -71
  74. package/browser/dist/schema/yaml-1.1/merge.js +0 -64
  75. package/browser/dist/schema/yaml-1.1/omap.js +0 -74
  76. package/browser/dist/schema/yaml-1.1/pairs.js +0 -78
  77. package/browser/dist/schema/yaml-1.1/schema.js +0 -39
  78. package/browser/dist/schema/yaml-1.1/set.js +0 -93
  79. package/browser/dist/schema/yaml-1.1/timestamp.js +0 -101
  80. package/browser/dist/stringify/foldFlowLines.js +0 -146
  81. package/browser/dist/stringify/stringify.js +0 -128
  82. package/browser/dist/stringify/stringifyCollection.js +0 -143
  83. package/browser/dist/stringify/stringifyComment.js +0 -20
  84. package/browser/dist/stringify/stringifyDocument.js +0 -85
  85. package/browser/dist/stringify/stringifyNumber.js +0 -24
  86. package/browser/dist/stringify/stringifyPair.js +0 -150
  87. package/browser/dist/stringify/stringifyString.js +0 -336
  88. package/browser/dist/util.js +0 -11
  89. package/browser/dist/visit.js +0 -233
  90. package/browser/index.js +0 -5
  91. package/browser/package.json +0 -3
  92. package/dist/cli.mjs +0 -201
  93. package/dist/compose/compose-collection.d.ts +0 -11
  94. package/dist/compose/compose-collection.js +0 -90
  95. package/dist/compose/compose-doc.d.ts +0 -7
  96. package/dist/compose/compose-doc.js +0 -45
  97. package/dist/compose/compose-node.d.ts +0 -29
  98. package/dist/compose/compose-node.js +0 -105
  99. package/dist/compose/compose-scalar.d.ts +0 -5
  100. package/dist/compose/compose-scalar.js +0 -88
  101. package/dist/compose/composer.d.ts +0 -63
  102. package/dist/compose/composer.js +0 -222
  103. package/dist/compose/resolve-block-map.d.ts +0 -6
  104. package/dist/compose/resolve-block-map.js +0 -117
  105. package/dist/compose/resolve-block-scalar.d.ts +0 -11
  106. package/dist/compose/resolve-block-scalar.js +0 -200
  107. package/dist/compose/resolve-block-seq.d.ts +0 -6
  108. package/dist/compose/resolve-block-seq.js +0 -51
  109. package/dist/compose/resolve-end.d.ts +0 -6
  110. package/dist/compose/resolve-end.js +0 -39
  111. package/dist/compose/resolve-flow-collection.d.ts +0 -7
  112. package/dist/compose/resolve-flow-collection.js +0 -209
  113. package/dist/compose/resolve-flow-scalar.d.ts +0 -10
  114. package/dist/compose/resolve-flow-scalar.js +0 -225
  115. package/dist/compose/resolve-props.d.ts +0 -23
  116. package/dist/compose/resolve-props.js +0 -148
  117. package/dist/compose/util-contains-newline.d.ts +0 -2
  118. package/dist/compose/util-contains-newline.js +0 -36
  119. package/dist/compose/util-empty-scalar-position.d.ts +0 -2
  120. package/dist/compose/util-empty-scalar-position.js +0 -28
  121. package/dist/compose/util-flow-indent-check.d.ts +0 -3
  122. package/dist/compose/util-flow-indent-check.js +0 -17
  123. package/dist/compose/util-map-includes.d.ts +0 -4
  124. package/dist/compose/util-map-includes.js +0 -15
  125. package/dist/doc/Document.d.ts +0 -141
  126. package/dist/doc/Document.js +0 -337
  127. package/dist/doc/anchors.d.ts +0 -24
  128. package/dist/doc/anchors.js +0 -76
  129. package/dist/doc/applyReviver.d.ts +0 -9
  130. package/dist/doc/applyReviver.js +0 -57
  131. package/dist/doc/createNode.d.ts +0 -17
  132. package/dist/doc/createNode.js +0 -90
  133. package/dist/doc/directives.d.ts +0 -49
  134. package/dist/doc/directives.js +0 -178
  135. package/dist/errors.d.ts +0 -21
  136. package/dist/errors.js +0 -62
  137. package/dist/log.d.ts +0 -3
  138. package/dist/log.js +0 -19
  139. package/dist/nodes/Alias.d.ts +0 -29
  140. package/dist/nodes/Alias.js +0 -116
  141. package/dist/nodes/Collection.d.ts +0 -73
  142. package/dist/nodes/Collection.js +0 -151
  143. package/dist/nodes/Node.d.ts +0 -53
  144. package/dist/nodes/Node.js +0 -40
  145. package/dist/nodes/Pair.d.ts +0 -22
  146. package/dist/nodes/Pair.js +0 -39
  147. package/dist/nodes/Scalar.d.ts +0 -43
  148. package/dist/nodes/Scalar.js +0 -27
  149. package/dist/nodes/YAMLMap.d.ts +0 -53
  150. package/dist/nodes/YAMLMap.js +0 -147
  151. package/dist/nodes/YAMLSeq.d.ts +0 -60
  152. package/dist/nodes/YAMLSeq.js +0 -115
  153. package/dist/nodes/addPairToJSMap.d.ts +0 -4
  154. package/dist/nodes/addPairToJSMap.js +0 -65
  155. package/dist/nodes/identity.d.ts +0 -23
  156. package/dist/nodes/identity.js +0 -53
  157. package/dist/nodes/toJS.d.ts +0 -29
  158. package/dist/nodes/toJS.js +0 -39
  159. package/dist/options.d.ts +0 -344
  160. package/dist/parse/cst-scalar.d.ts +0 -64
  161. package/dist/parse/cst-scalar.js +0 -218
  162. package/dist/parse/cst-stringify.d.ts +0 -8
  163. package/dist/parse/cst-stringify.js +0 -63
  164. package/dist/parse/cst-visit.d.ts +0 -39
  165. package/dist/parse/cst-visit.js +0 -99
  166. package/dist/parse/cst.d.ts +0 -109
  167. package/dist/parse/cst.js +0 -112
  168. package/dist/parse/lexer.d.ts +0 -87
  169. package/dist/parse/lexer.js +0 -719
  170. package/dist/parse/line-counter.d.ts +0 -22
  171. package/dist/parse/line-counter.js +0 -41
  172. package/dist/parse/parser.d.ts +0 -84
  173. package/dist/parse/parser.js +0 -972
  174. package/dist/public-api.d.ts +0 -44
  175. package/dist/public-api.js +0 -107
  176. package/dist/schema/Schema.d.ts +0 -17
  177. package/dist/schema/Schema.js +0 -39
  178. package/dist/schema/common/map.d.ts +0 -2
  179. package/dist/schema/common/map.js +0 -19
  180. package/dist/schema/common/null.d.ts +0 -4
  181. package/dist/schema/common/null.js +0 -17
  182. package/dist/schema/common/seq.d.ts +0 -2
  183. package/dist/schema/common/seq.js +0 -19
  184. package/dist/schema/common/string.d.ts +0 -2
  185. package/dist/schema/common/string.js +0 -16
  186. package/dist/schema/core/bool.d.ts +0 -4
  187. package/dist/schema/core/bool.js +0 -21
  188. package/dist/schema/core/float.d.ts +0 -4
  189. package/dist/schema/core/float.js +0 -47
  190. package/dist/schema/core/int.d.ts +0 -4
  191. package/dist/schema/core/int.js +0 -42
  192. package/dist/schema/core/schema.d.ts +0 -1
  193. package/dist/schema/core/schema.js +0 -25
  194. package/dist/schema/json/schema.d.ts +0 -2
  195. package/dist/schema/json/schema.js +0 -64
  196. package/dist/schema/json-schema.d.ts +0 -69
  197. package/dist/schema/tags.d.ts +0 -48
  198. package/dist/schema/tags.js +0 -99
  199. package/dist/schema/types.d.ts +0 -92
  200. package/dist/schema/yaml-1.1/binary.d.ts +0 -2
  201. package/dist/schema/yaml-1.1/binary.js +0 -70
  202. package/dist/schema/yaml-1.1/bool.d.ts +0 -7
  203. package/dist/schema/yaml-1.1/bool.js +0 -29
  204. package/dist/schema/yaml-1.1/float.d.ts +0 -4
  205. package/dist/schema/yaml-1.1/float.js +0 -50
  206. package/dist/schema/yaml-1.1/int.d.ts +0 -5
  207. package/dist/schema/yaml-1.1/int.js +0 -76
  208. package/dist/schema/yaml-1.1/merge.d.ts +0 -9
  209. package/dist/schema/yaml-1.1/merge.js +0 -68
  210. package/dist/schema/yaml-1.1/omap.d.ts +0 -22
  211. package/dist/schema/yaml-1.1/omap.js +0 -77
  212. package/dist/schema/yaml-1.1/pairs.d.ts +0 -10
  213. package/dist/schema/yaml-1.1/pairs.js +0 -82
  214. package/dist/schema/yaml-1.1/schema.d.ts +0 -1
  215. package/dist/schema/yaml-1.1/schema.js +0 -41
  216. package/dist/schema/yaml-1.1/set.d.ts +0 -28
  217. package/dist/schema/yaml-1.1/set.js +0 -96
  218. package/dist/schema/yaml-1.1/timestamp.d.ts +0 -6
  219. package/dist/schema/yaml-1.1/timestamp.js +0 -105
  220. package/dist/stringify/foldFlowLines.d.ts +0 -34
  221. package/dist/stringify/foldFlowLines.js +0 -151
  222. package/dist/stringify/stringify.d.ts +0 -21
  223. package/dist/stringify/stringify.js +0 -131
  224. package/dist/stringify/stringifyCollection.d.ts +0 -17
  225. package/dist/stringify/stringifyCollection.js +0 -145
  226. package/dist/stringify/stringifyComment.d.ts +0 -10
  227. package/dist/stringify/stringifyComment.js +0 -24
  228. package/dist/stringify/stringifyDocument.d.ts +0 -4
  229. package/dist/stringify/stringifyDocument.js +0 -87
  230. package/dist/stringify/stringifyNumber.d.ts +0 -2
  231. package/dist/stringify/stringifyNumber.js +0 -26
  232. package/dist/stringify/stringifyPair.d.ts +0 -3
  233. package/dist/stringify/stringifyPair.js +0 -152
  234. package/dist/stringify/stringifyString.d.ts +0 -9
  235. package/dist/stringify/stringifyString.js +0 -338
  236. package/dist/visit.d.ts +0 -102
  237. package/dist/visit.js +0 -236
  238. package/util.js +0 -2
@@ -1,86 +0,0 @@
1
- import { isScalar, SCALAR } from '../nodes/identity.js';
2
- import { Scalar } from '../nodes/Scalar.js';
3
- import { resolveBlockScalar } from './resolve-block-scalar.js';
4
- import { resolveFlowScalar } from './resolve-flow-scalar.js';
5
-
6
- function composeScalar(ctx, token, tagToken, onError) {
7
- const { value, type, comment, range } = token.type === 'block-scalar'
8
- ? resolveBlockScalar(ctx, token, onError)
9
- : resolveFlowScalar(token, ctx.options.strict, onError);
10
- const tagName = tagToken
11
- ? ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg))
12
- : null;
13
- let tag;
14
- if (ctx.options.stringKeys && ctx.atKey) {
15
- tag = ctx.schema[SCALAR];
16
- }
17
- else if (tagName)
18
- tag = findScalarTagByName(ctx.schema, value, tagName, tagToken, onError);
19
- else if (token.type === 'scalar')
20
- tag = findScalarTagByTest(ctx, value, token, onError);
21
- else
22
- tag = ctx.schema[SCALAR];
23
- let scalar;
24
- try {
25
- const res = tag.resolve(value, msg => onError(tagToken ?? token, 'TAG_RESOLVE_FAILED', msg), ctx.options);
26
- scalar = isScalar(res) ? res : new Scalar(res);
27
- }
28
- catch (error) {
29
- const msg = error instanceof Error ? error.message : String(error);
30
- onError(tagToken ?? token, 'TAG_RESOLVE_FAILED', msg);
31
- scalar = new Scalar(value);
32
- }
33
- scalar.range = range;
34
- scalar.source = value;
35
- if (type)
36
- scalar.type = type;
37
- if (tagName)
38
- scalar.tag = tagName;
39
- if (tag.format)
40
- scalar.format = tag.format;
41
- if (comment)
42
- scalar.comment = comment;
43
- return scalar;
44
- }
45
- function findScalarTagByName(schema, value, tagName, tagToken, onError) {
46
- if (tagName === '!')
47
- return schema[SCALAR]; // non-specific tag
48
- const matchWithTest = [];
49
- for (const tag of schema.tags) {
50
- if (!tag.collection && tag.tag === tagName) {
51
- if (tag.default && tag.test)
52
- matchWithTest.push(tag);
53
- else
54
- return tag;
55
- }
56
- }
57
- for (const tag of matchWithTest)
58
- if (tag.test?.test(value))
59
- return tag;
60
- const kt = schema.knownTags[tagName];
61
- if (kt && !kt.collection) {
62
- // Ensure that the known tag is available for stringifying,
63
- // but does not get used by default.
64
- schema.tags.push(Object.assign({}, kt, { default: false, test: undefined }));
65
- return kt;
66
- }
67
- onError(tagToken, 'TAG_RESOLVE_FAILED', `Unresolved tag: ${tagName}`, tagName !== 'tag:yaml.org,2002:str');
68
- return schema[SCALAR];
69
- }
70
- function findScalarTagByTest({ atKey, directives, schema }, value, token, onError) {
71
- const tag = schema.tags.find(tag => (tag.default === true || (atKey && tag.default === 'key')) &&
72
- tag.test?.test(value)) || schema[SCALAR];
73
- if (schema.compat) {
74
- const compat = schema.compat.find(tag => tag.default && tag.test?.test(value)) ??
75
- schema[SCALAR];
76
- if (tag.tag !== compat.tag) {
77
- const ts = directives.tagString(tag.tag);
78
- const cs = directives.tagString(compat.tag);
79
- const msg = `Value may be parsed as either ${ts} or ${cs}`;
80
- onError(token, 'TAG_RESOLVE_FAILED', msg, true);
81
- }
82
- }
83
- return tag;
84
- }
85
-
86
- export { composeScalar };
@@ -1,217 +0,0 @@
1
- import { Directives } from '../doc/directives.js';
2
- import { Document } from '../doc/Document.js';
3
- import { YAMLWarning, YAMLParseError } from '../errors.js';
4
- import { isCollection, isPair } from '../nodes/identity.js';
5
- import { composeDoc } from './compose-doc.js';
6
- import { resolveEnd } from './resolve-end.js';
7
-
8
- function getErrorPos(src) {
9
- if (typeof src === 'number')
10
- return [src, src + 1];
11
- if (Array.isArray(src))
12
- return src.length === 2 ? src : [src[0], src[1]];
13
- const { offset, source } = src;
14
- return [offset, offset + (typeof source === 'string' ? source.length : 1)];
15
- }
16
- function parsePrelude(prelude) {
17
- let comment = '';
18
- let atComment = false;
19
- let afterEmptyLine = false;
20
- for (let i = 0; i < prelude.length; ++i) {
21
- const source = prelude[i];
22
- switch (source[0]) {
23
- case '#':
24
- comment +=
25
- (comment === '' ? '' : afterEmptyLine ? '\n\n' : '\n') +
26
- (source.substring(1) || ' ');
27
- atComment = true;
28
- afterEmptyLine = false;
29
- break;
30
- case '%':
31
- if (prelude[i + 1]?.[0] !== '#')
32
- i += 1;
33
- atComment = false;
34
- break;
35
- default:
36
- // This may be wrong after doc-end, but in that case it doesn't matter
37
- if (!atComment)
38
- afterEmptyLine = true;
39
- atComment = false;
40
- }
41
- }
42
- return { comment, afterEmptyLine };
43
- }
44
- /**
45
- * Compose a stream of CST nodes into a stream of YAML Documents.
46
- *
47
- * ```ts
48
- * import { Composer, Parser } from 'yaml'
49
- *
50
- * const src: string = ...
51
- * const tokens = new Parser().parse(src)
52
- * const docs = new Composer().compose(tokens)
53
- * ```
54
- */
55
- class Composer {
56
- constructor(options = {}) {
57
- this.doc = null;
58
- this.atDirectives = false;
59
- this.prelude = [];
60
- this.errors = [];
61
- this.warnings = [];
62
- this.onError = (source, code, message, warning) => {
63
- const pos = getErrorPos(source);
64
- if (warning)
65
- this.warnings.push(new YAMLWarning(pos, code, message));
66
- else
67
- this.errors.push(new YAMLParseError(pos, code, message));
68
- };
69
- // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
70
- this.directives = new Directives({ version: options.version || '1.2' });
71
- this.options = options;
72
- }
73
- decorate(doc, afterDoc) {
74
- const { comment, afterEmptyLine } = parsePrelude(this.prelude);
75
- //console.log({ dc: doc.comment, prelude, comment })
76
- if (comment) {
77
- const dc = doc.contents;
78
- if (afterDoc) {
79
- doc.comment = doc.comment ? `${doc.comment}\n${comment}` : comment;
80
- }
81
- else if (afterEmptyLine || doc.directives.docStart || !dc) {
82
- doc.commentBefore = comment;
83
- }
84
- else if (isCollection(dc) && !dc.flow && dc.items.length > 0) {
85
- let it = dc.items[0];
86
- if (isPair(it))
87
- it = it.key;
88
- const cb = it.commentBefore;
89
- it.commentBefore = cb ? `${comment}\n${cb}` : comment;
90
- }
91
- else {
92
- const cb = dc.commentBefore;
93
- dc.commentBefore = cb ? `${comment}\n${cb}` : comment;
94
- }
95
- }
96
- if (afterDoc) {
97
- Array.prototype.push.apply(doc.errors, this.errors);
98
- Array.prototype.push.apply(doc.warnings, this.warnings);
99
- }
100
- else {
101
- doc.errors = this.errors;
102
- doc.warnings = this.warnings;
103
- }
104
- this.prelude = [];
105
- this.errors = [];
106
- this.warnings = [];
107
- }
108
- /**
109
- * Current stream status information.
110
- *
111
- * Mostly useful at the end of input for an empty stream.
112
- */
113
- streamInfo() {
114
- return {
115
- comment: parsePrelude(this.prelude).comment,
116
- directives: this.directives,
117
- errors: this.errors,
118
- warnings: this.warnings
119
- };
120
- }
121
- /**
122
- * Compose tokens into documents.
123
- *
124
- * @param forceDoc - If the stream contains no document, still emit a final document including any comments and directives that would be applied to a subsequent document.
125
- * @param endOffset - Should be set if `forceDoc` is also set, to set the document range end and to indicate errors correctly.
126
- */
127
- *compose(tokens, forceDoc = false, endOffset = -1) {
128
- for (const token of tokens)
129
- yield* this.next(token);
130
- yield* this.end(forceDoc, endOffset);
131
- }
132
- /** Advance the composer by one CST token. */
133
- *next(token) {
134
- switch (token.type) {
135
- case 'directive':
136
- this.directives.add(token.source, (offset, message, warning) => {
137
- const pos = getErrorPos(token);
138
- pos[0] += offset;
139
- this.onError(pos, 'BAD_DIRECTIVE', message, warning);
140
- });
141
- this.prelude.push(token.source);
142
- this.atDirectives = true;
143
- break;
144
- case 'document': {
145
- const doc = composeDoc(this.options, this.directives, token, this.onError);
146
- if (this.atDirectives && !doc.directives.docStart)
147
- this.onError(token, 'MISSING_CHAR', 'Missing directives-end/doc-start indicator line');
148
- this.decorate(doc, false);
149
- if (this.doc)
150
- yield this.doc;
151
- this.doc = doc;
152
- this.atDirectives = false;
153
- break;
154
- }
155
- case 'byte-order-mark':
156
- case 'space':
157
- break;
158
- case 'comment':
159
- case 'newline':
160
- this.prelude.push(token.source);
161
- break;
162
- case 'error': {
163
- const msg = token.source
164
- ? `${token.message}: ${JSON.stringify(token.source)}`
165
- : token.message;
166
- const error = new YAMLParseError(getErrorPos(token), 'UNEXPECTED_TOKEN', msg);
167
- if (this.atDirectives || !this.doc)
168
- this.errors.push(error);
169
- else
170
- this.doc.errors.push(error);
171
- break;
172
- }
173
- case 'doc-end': {
174
- if (!this.doc) {
175
- const msg = 'Unexpected doc-end without preceding document';
176
- this.errors.push(new YAMLParseError(getErrorPos(token), 'UNEXPECTED_TOKEN', msg));
177
- break;
178
- }
179
- this.doc.directives.docEnd = true;
180
- const end = resolveEnd(token.end, token.offset + token.source.length, this.doc.options.strict, this.onError);
181
- this.decorate(this.doc, true);
182
- if (end.comment) {
183
- const dc = this.doc.comment;
184
- this.doc.comment = dc ? `${dc}\n${end.comment}` : end.comment;
185
- }
186
- this.doc.range[2] = end.offset;
187
- break;
188
- }
189
- default:
190
- this.errors.push(new YAMLParseError(getErrorPos(token), 'UNEXPECTED_TOKEN', `Unsupported token ${token.type}`));
191
- }
192
- }
193
- /**
194
- * Call at end of input to yield any remaining document.
195
- *
196
- * @param forceDoc - If the stream contains no document, still emit a final document including any comments and directives that would be applied to a subsequent document.
197
- * @param endOffset - Should be set if `forceDoc` is also set, to set the document range end and to indicate errors correctly.
198
- */
199
- *end(forceDoc = false, endOffset = -1) {
200
- if (this.doc) {
201
- this.decorate(this.doc, true);
202
- yield this.doc;
203
- this.doc = null;
204
- }
205
- else if (forceDoc) {
206
- const opts = Object.assign({ _directives: this.directives }, this.options);
207
- const doc = new Document(undefined, opts);
208
- if (this.atDirectives)
209
- this.onError(endOffset, 'MISSING_CHAR', 'Missing directives-end indicator line');
210
- doc.range = [0, endOffset, endOffset];
211
- this.decorate(doc, false);
212
- yield doc;
213
- }
214
- }
215
- }
216
-
217
- export { Composer };
@@ -1,115 +0,0 @@
1
- import { Pair } from '../nodes/Pair.js';
2
- import { YAMLMap } from '../nodes/YAMLMap.js';
3
- import { resolveProps } from './resolve-props.js';
4
- import { containsNewline } from './util-contains-newline.js';
5
- import { flowIndentCheck } from './util-flow-indent-check.js';
6
- import { mapIncludes } from './util-map-includes.js';
7
-
8
- const startColMsg = 'All mapping items must start at the same column';
9
- function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError, tag) {
10
- const NodeClass = tag?.nodeClass ?? YAMLMap;
11
- const map = new NodeClass(ctx.schema);
12
- if (ctx.atRoot)
13
- ctx.atRoot = false;
14
- let offset = bm.offset;
15
- let commentEnd = null;
16
- for (const collItem of bm.items) {
17
- const { start, key, sep, value } = collItem;
18
- // key properties
19
- const keyProps = resolveProps(start, {
20
- indicator: 'explicit-key-ind',
21
- next: key ?? sep?.[0],
22
- offset,
23
- onError,
24
- parentIndent: bm.indent,
25
- startOnNewline: true
26
- });
27
- const implicitKey = !keyProps.found;
28
- if (implicitKey) {
29
- if (key) {
30
- if (key.type === 'block-seq')
31
- onError(offset, 'BLOCK_AS_IMPLICIT_KEY', 'A block sequence may not be used as an implicit map key');
32
- else if ('indent' in key && key.indent !== bm.indent)
33
- onError(offset, 'BAD_INDENT', startColMsg);
34
- }
35
- if (!keyProps.anchor && !keyProps.tag && !sep) {
36
- commentEnd = keyProps.end;
37
- if (keyProps.comment) {
38
- if (map.comment)
39
- map.comment += '\n' + keyProps.comment;
40
- else
41
- map.comment = keyProps.comment;
42
- }
43
- continue;
44
- }
45
- if (keyProps.newlineAfterProp || containsNewline(key)) {
46
- onError(key ?? start[start.length - 1], 'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
47
- }
48
- }
49
- else if (keyProps.found?.indent !== bm.indent) {
50
- onError(offset, 'BAD_INDENT', startColMsg);
51
- }
52
- // key value
53
- ctx.atKey = true;
54
- const keyStart = keyProps.end;
55
- const keyNode = key
56
- ? composeNode(ctx, key, keyProps, onError)
57
- : composeEmptyNode(ctx, keyStart, start, null, keyProps, onError);
58
- if (ctx.schema.compat)
59
- flowIndentCheck(bm.indent, key, onError);
60
- ctx.atKey = false;
61
- if (mapIncludes(ctx, map.items, keyNode))
62
- onError(keyStart, 'DUPLICATE_KEY', 'Map keys must be unique');
63
- // value properties
64
- const valueProps = resolveProps(sep ?? [], {
65
- indicator: 'map-value-ind',
66
- next: value,
67
- offset: keyNode.range[2],
68
- onError,
69
- parentIndent: bm.indent,
70
- startOnNewline: !key || key.type === 'block-scalar'
71
- });
72
- offset = valueProps.end;
73
- if (valueProps.found) {
74
- if (implicitKey) {
75
- if (value?.type === 'block-map' && !valueProps.hasNewline)
76
- onError(offset, 'BLOCK_AS_IMPLICIT_KEY', 'Nested mappings are not allowed in compact mappings');
77
- if (ctx.options.strict &&
78
- keyProps.start < valueProps.found.offset - 1024)
79
- onError(keyNode.range, 'KEY_OVER_1024_CHARS', 'The : indicator must be at most 1024 chars after the start of an implicit block mapping key');
80
- }
81
- // value value
82
- const valueNode = value
83
- ? composeNode(ctx, value, valueProps, onError)
84
- : composeEmptyNode(ctx, offset, sep, null, valueProps, onError);
85
- if (ctx.schema.compat)
86
- flowIndentCheck(bm.indent, value, onError);
87
- offset = valueNode.range[2];
88
- const pair = new Pair(keyNode, valueNode);
89
- if (ctx.options.keepSourceTokens)
90
- pair.srcToken = collItem;
91
- map.items.push(pair);
92
- }
93
- else {
94
- // key with no value
95
- if (implicitKey)
96
- onError(keyNode.range, 'MISSING_CHAR', 'Implicit map keys need to be followed by map values');
97
- if (valueProps.comment) {
98
- if (keyNode.comment)
99
- keyNode.comment += '\n' + valueProps.comment;
100
- else
101
- keyNode.comment = valueProps.comment;
102
- }
103
- const pair = new Pair(keyNode);
104
- if (ctx.options.keepSourceTokens)
105
- pair.srcToken = collItem;
106
- map.items.push(pair);
107
- }
108
- }
109
- if (commentEnd && commentEnd < offset)
110
- onError(commentEnd, 'IMPOSSIBLE', 'Map comment with trailing content');
111
- map.range = [bm.offset, offset, commentEnd ?? offset];
112
- return map;
113
- }
114
-
115
- export { resolveBlockMap };
@@ -1,198 +0,0 @@
1
- import { Scalar } from '../nodes/Scalar.js';
2
-
3
- function resolveBlockScalar(ctx, scalar, onError) {
4
- const start = scalar.offset;
5
- const header = parseBlockScalarHeader(scalar, ctx.options.strict, onError);
6
- if (!header)
7
- return { value: '', type: null, comment: '', range: [start, start, start] };
8
- const type = header.mode === '>' ? Scalar.BLOCK_FOLDED : Scalar.BLOCK_LITERAL;
9
- const lines = scalar.source ? splitLines(scalar.source) : [];
10
- // determine the end of content & start of chomping
11
- let chompStart = lines.length;
12
- for (let i = lines.length - 1; i >= 0; --i) {
13
- const content = lines[i][1];
14
- if (content === '' || content === '\r')
15
- chompStart = i;
16
- else
17
- break;
18
- }
19
- // shortcut for empty contents
20
- if (chompStart === 0) {
21
- const value = header.chomp === '+' && lines.length > 0
22
- ? '\n'.repeat(Math.max(1, lines.length - 1))
23
- : '';
24
- let end = start + header.length;
25
- if (scalar.source)
26
- end += scalar.source.length;
27
- return { value, type, comment: header.comment, range: [start, end, end] };
28
- }
29
- // find the indentation level to trim from start
30
- let trimIndent = scalar.indent + header.indent;
31
- let offset = scalar.offset + header.length;
32
- let contentStart = 0;
33
- for (let i = 0; i < chompStart; ++i) {
34
- const [indent, content] = lines[i];
35
- if (content === '' || content === '\r') {
36
- if (header.indent === 0 && indent.length > trimIndent)
37
- trimIndent = indent.length;
38
- }
39
- else {
40
- if (indent.length < trimIndent) {
41
- const message = 'Block scalars with more-indented leading empty lines must use an explicit indentation indicator';
42
- onError(offset + indent.length, 'MISSING_CHAR', message);
43
- }
44
- if (header.indent === 0)
45
- trimIndent = indent.length;
46
- contentStart = i;
47
- if (trimIndent === 0 && !ctx.atRoot) {
48
- const message = 'Block scalar values in collections must be indented';
49
- onError(offset, 'BAD_INDENT', message);
50
- }
51
- break;
52
- }
53
- offset += indent.length + content.length + 1;
54
- }
55
- // include trailing more-indented empty lines in content
56
- for (let i = lines.length - 1; i >= chompStart; --i) {
57
- if (lines[i][0].length > trimIndent)
58
- chompStart = i + 1;
59
- }
60
- let value = '';
61
- let sep = '';
62
- let prevMoreIndented = false;
63
- // leading whitespace is kept intact
64
- for (let i = 0; i < contentStart; ++i)
65
- value += lines[i][0].slice(trimIndent) + '\n';
66
- for (let i = contentStart; i < chompStart; ++i) {
67
- let [indent, content] = lines[i];
68
- offset += indent.length + content.length + 1;
69
- const crlf = content[content.length - 1] === '\r';
70
- if (crlf)
71
- content = content.slice(0, -1);
72
- /* istanbul ignore if already caught in lexer */
73
- if (content && indent.length < trimIndent) {
74
- const src = header.indent
75
- ? 'explicit indentation indicator'
76
- : 'first line';
77
- const message = `Block scalar lines must not be less indented than their ${src}`;
78
- onError(offset - content.length - (crlf ? 2 : 1), 'BAD_INDENT', message);
79
- indent = '';
80
- }
81
- if (type === Scalar.BLOCK_LITERAL) {
82
- value += sep + indent.slice(trimIndent) + content;
83
- sep = '\n';
84
- }
85
- else if (indent.length > trimIndent || content[0] === '\t') {
86
- // more-indented content within a folded block
87
- if (sep === ' ')
88
- sep = '\n';
89
- else if (!prevMoreIndented && sep === '\n')
90
- sep = '\n\n';
91
- value += sep + indent.slice(trimIndent) + content;
92
- sep = '\n';
93
- prevMoreIndented = true;
94
- }
95
- else if (content === '') {
96
- // empty line
97
- if (sep === '\n')
98
- value += '\n';
99
- else
100
- sep = '\n';
101
- }
102
- else {
103
- value += sep + content;
104
- sep = ' ';
105
- prevMoreIndented = false;
106
- }
107
- }
108
- switch (header.chomp) {
109
- case '-':
110
- break;
111
- case '+':
112
- for (let i = chompStart; i < lines.length; ++i)
113
- value += '\n' + lines[i][0].slice(trimIndent);
114
- if (value[value.length - 1] !== '\n')
115
- value += '\n';
116
- break;
117
- default:
118
- value += '\n';
119
- }
120
- const end = start + header.length + scalar.source.length;
121
- return { value, type, comment: header.comment, range: [start, end, end] };
122
- }
123
- function parseBlockScalarHeader({ offset, props }, strict, onError) {
124
- /* istanbul ignore if should not happen */
125
- if (props[0].type !== 'block-scalar-header') {
126
- onError(props[0], 'IMPOSSIBLE', 'Block scalar header not found');
127
- return null;
128
- }
129
- const { source } = props[0];
130
- const mode = source[0];
131
- let indent = 0;
132
- let chomp = '';
133
- let error = -1;
134
- for (let i = 1; i < source.length; ++i) {
135
- const ch = source[i];
136
- if (!chomp && (ch === '-' || ch === '+'))
137
- chomp = ch;
138
- else {
139
- const n = Number(ch);
140
- if (!indent && n)
141
- indent = n;
142
- else if (error === -1)
143
- error = offset + i;
144
- }
145
- }
146
- if (error !== -1)
147
- onError(error, 'UNEXPECTED_TOKEN', `Block scalar header includes extra characters: ${source}`);
148
- let hasSpace = false;
149
- let comment = '';
150
- let length = source.length;
151
- for (let i = 1; i < props.length; ++i) {
152
- const token = props[i];
153
- switch (token.type) {
154
- case 'space':
155
- hasSpace = true;
156
- // fallthrough
157
- case 'newline':
158
- length += token.source.length;
159
- break;
160
- case 'comment':
161
- if (strict && !hasSpace) {
162
- const message = 'Comments must be separated from other tokens by white space characters';
163
- onError(token, 'MISSING_CHAR', message);
164
- }
165
- length += token.source.length;
166
- comment = token.source.substring(1);
167
- break;
168
- case 'error':
169
- onError(token, 'UNEXPECTED_TOKEN', token.message);
170
- length += token.source.length;
171
- break;
172
- /* istanbul ignore next should not happen */
173
- default: {
174
- const message = `Unexpected token in block scalar header: ${token.type}`;
175
- onError(token, 'UNEXPECTED_TOKEN', message);
176
- const ts = token.source;
177
- if (ts && typeof ts === 'string')
178
- length += ts.length;
179
- }
180
- }
181
- }
182
- return { mode, indent, chomp, comment, length };
183
- }
184
- /** @returns Array of lines split up as `[indent, content]` */
185
- function splitLines(source) {
186
- const split = source.split(/\n( *)/);
187
- const first = split[0];
188
- const m = first.match(/^( *)/);
189
- const line0 = m?.[1]
190
- ? [m[1], first.slice(m[1].length)]
191
- : ['', first];
192
- const lines = [line0];
193
- for (let i = 1; i < split.length; i += 2)
194
- lines.push([split[i], split[i + 1]]);
195
- return lines;
196
- }
197
-
198
- export { resolveBlockScalar };
@@ -1,49 +0,0 @@
1
- import { YAMLSeq } from '../nodes/YAMLSeq.js';
2
- import { resolveProps } from './resolve-props.js';
3
- import { flowIndentCheck } from './util-flow-indent-check.js';
4
-
5
- function resolveBlockSeq({ composeNode, composeEmptyNode }, ctx, bs, onError, tag) {
6
- const NodeClass = tag?.nodeClass ?? YAMLSeq;
7
- const seq = new NodeClass(ctx.schema);
8
- if (ctx.atRoot)
9
- ctx.atRoot = false;
10
- if (ctx.atKey)
11
- ctx.atKey = false;
12
- let offset = bs.offset;
13
- let commentEnd = null;
14
- for (const { start, value } of bs.items) {
15
- const props = resolveProps(start, {
16
- indicator: 'seq-item-ind',
17
- next: value,
18
- offset,
19
- onError,
20
- parentIndent: bs.indent,
21
- startOnNewline: true
22
- });
23
- if (!props.found) {
24
- if (props.anchor || props.tag || value) {
25
- if (value?.type === 'block-seq')
26
- onError(props.end, 'BAD_INDENT', 'All sequence items must start at the same column');
27
- else
28
- onError(offset, 'MISSING_CHAR', 'Sequence item without - indicator');
29
- }
30
- else {
31
- commentEnd = props.end;
32
- if (props.comment)
33
- seq.comment = props.comment;
34
- continue;
35
- }
36
- }
37
- const node = value
38
- ? composeNode(ctx, value, props, onError)
39
- : composeEmptyNode(ctx, props.end, start, null, props, onError);
40
- if (ctx.schema.compat)
41
- flowIndentCheck(bs.indent, value, onError);
42
- offset = node.range[2];
43
- seq.items.push(node);
44
- }
45
- seq.range = [bs.offset, offset, commentEnd ?? offset];
46
- return seq;
47
- }
48
-
49
- export { resolveBlockSeq };