projen 0.53.10 → 0.53.13

package/node_modules/yaml/browser/dist/compose/compose-node.js

@@ -8,6 +8,7 @@ const CN = { composeNode, composeEmptyNode };
 function composeNode(ctx, token, props, onError) {
     const { spaceBefore, comment, anchor, tag } = props;
     let node;
+    let isSrcToken = true;
     switch (token.type) {
         case 'alias':
             node = composeAlias(ctx, token, onError);
@@ -29,9 +30,14 @@ function composeNode(ctx, token, props, onError) {
             if (anchor)
                 node.anchor = anchor.source.substring(1);
             break;
-        default:
-            console.log(token);
-            throw new Error(`Unsupporten token type: ${token.type}`);
+        default: {
+            const message = token.type === 'error'
+                ? token.message
+                : `Unsupported token (type: ${token.type})`;
+            onError(token, 'UNEXPECTED_TOKEN', message);
+            node = composeEmptyNode(ctx, token.offset, undefined, null, props, onError);
+            isSrcToken = false;
+        }
     }
     if (anchor && node.anchor === '')
         onError(anchor, 'BAD_ALIAS', 'Anchor cannot be an empty string');
@@ -43,7 +49,8 @@ function composeNode(ctx, token, props, onError) {
         else
             node.commentBefore = comment;
     }
-    if (ctx.options.keepSourceTokens)
+    // @ts-expect-error Type checking misses meaning of isSrcToken
+    if (ctx.options.keepSourceTokens && isSrcToken)
         node.srcToken = token;
     return node;
 }
@@ -70,6 +77,8 @@ function composeAlias({ options }, { offset, source, end }, onError) {
     const alias = new Alias(source.substring(1));
     if (alias.source === '')
         onError(offset, 'BAD_ALIAS', 'Alias cannot be an empty string');
+    if (alias.source.endsWith(':'))
+        onError(offset + source.length - 1, 'BAD_ALIAS', 'Alias ending in : is ambiguous', true);
     const valueEnd = offset + source.length;
     const re = resolveEnd(end, valueEnd, options.strict, onError);
     alias.range = [offset, valueEnd, re.offset];

package/node_modules/yaml/browser/dist/compose/composer.js

@@ -2,7 +2,6 @@ import { Directives } from '../doc/directives.js';
 import { Document } from '../doc/Document.js';
 import { YAMLWarning, YAMLParseError } from '../errors.js';
 import { isCollection, isPair } from '../nodes/Node.js';
-import { defaultOptions } from '../options.js';
 import { composeDoc } from './compose-doc.js';
 import { resolveEnd } from './resolve-end.js';
 
@@ -68,9 +67,7 @@ class Composer {
             else
                 this.errors.push(new YAMLParseError(pos, code, message));
         };
-        this.directives = new Directives({
-            version: options.version || defaultOptions.version
-        });
+        this.directives = new Directives({ version: options.version || '1.2' });
         this.options = options;
     }
     decorate(doc, afterDoc) {
@@ -81,7 +78,7 @@ class Composer {
             if (afterDoc) {
                 doc.comment = doc.comment ? `${doc.comment}\n${comment}` : comment;
             }
-            else if (afterEmptyLine || doc.directives.marker || !dc) {
+            else if (afterEmptyLine || doc.directives.docStart || !dc) {
                 doc.commentBefore = comment;
             }
             else if (isCollection(dc) && !dc.flow && dc.items.length > 0) {
@@ -146,8 +143,8 @@ class Composer {
                 break;
             case 'document': {
                 const doc = composeDoc(this.options, this.directives, token, this.onError);
-                if (this.atDirectives && !doc.directives.marker)
-                    this.onError(token, 'MISSING_CHAR', 'Missing directives-end indicator line');
+                if (this.atDirectives && !doc.directives.docStart)
+                    this.onError(token, 'MISSING_CHAR', 'Missing directives-end/doc-start indicator line');
                 this.decorate(doc, false);
                 if (this.doc)
                     yield this.doc;
@@ -179,6 +176,7 @@ class Composer {
                     this.errors.push(new YAMLParseError(getErrorPos(token), 'UNEXPECTED_TOKEN', msg));
                     break;
                 }
+                this.doc.directives.docEnd = true;
                 const end = resolveEnd(token.end, token.offset + token.source.length, this.doc.options.strict, this.onError);
                 this.decorate(this.doc, true);
                 if (end.comment) {

package/node_modules/yaml/browser/dist/compose/resolve-block-scalar.js

@@ -17,8 +17,10 @@ function resolveBlockScalar(scalar, strict, onError) {
             break;
     }
     // shortcut for empty contents
-    if (!scalar.source || chompStart === 0) {
-        const value = header.chomp === '+' ? '\n'.repeat(Math.max(0, lines.length - 1)) : '';
+    if (chompStart === 0) {
+        const value = header.chomp === '+' && lines.length > 0
+            ? '\n'.repeat(Math.max(1, lines.length - 1))
+            : '';
         let end = start + header.length;
         if (scalar.source)
             end += scalar.source.length;
@@ -46,6 +48,11 @@ function resolveBlockScalar(scalar, strict, onError) {
         }
         offset += indent.length + content.length + 1;
     }
+    // include trailing more-indented empty lines in content
+    for (let i = lines.length - 1; i >= chompStart; --i) {
+        if (lines[i][0].length > trimIndent)
+            chompStart = i + 1;
+    }
     let value = '';
     let sep = '';
     let prevMoreIndented = false;

package/node_modules/yaml/browser/dist/compose/resolve-props.js

@@ -59,6 +59,8 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, startOnN
             case 'anchor':
                 if (anchor)
                     onError(token, 'MULTIPLE_ANCHORS', 'A node can have at most one anchor');
+                if (token.source.endsWith(':'))
+                    onError(token.offset + token.source.length - 1, 'BAD_ALIAS', 'Anchor ending in : is ambiguous', true);
                 anchor = token;
                 if (start === null)
                     start = token.offset;

package/node_modules/yaml/browser/dist/doc/Document.js

@@ -3,7 +3,6 @@ import { isEmptyPath, collectionFromPath } from '../nodes/Collection.js';
 import { NODE_TYPE, DOC, isNode, isCollection, isScalar } from '../nodes/Node.js';
 import { Pair } from '../nodes/Pair.js';
 import { toJS } from '../nodes/toJS.js';
-import { defaultOptions } from '../options.js';
 import { Schema } from '../schema/Schema.js';
 import { stringify } from '../stringify/stringify.js';
 import { stringifyDocument } from '../stringify/stringifyDocument.js';
@@ -31,7 +30,15 @@ class Document {
             options = replacer;
             replacer = undefined;
         }
-        const opt = Object.assign({}, defaultOptions, options);
+        const opt = Object.assign({
+            intAsBigInt: false,
+            keepSourceTokens: false,
+            logLevel: 'warn',
+            prettyErrors: true,
+            strict: true,
+            uniqueKeys: true,
+            version: '1.2'
+        }, options);
         this.options = opt;
         let { version } = opt;
         if (options === null || options === void 0 ? void 0 : options.directives) {

package/node_modules/yaml/browser/dist/doc/directives.js

@@ -16,13 +16,15 @@ class Directives {
          * The directives-end/doc-start marker `---`. If `null`, a marker may still be
          * included in the document's stringified representation.
          */
-        this.marker = null;
+        this.docStart = null;
+        /** The doc-end marker `...`.  */
+        this.docEnd = false;
         this.yaml = Object.assign({}, Directives.defaultYaml, yaml);
         this.tags = Object.assign({}, Directives.defaultTags, tags);
     }
     clone() {
         const copy = new Directives(this.yaml, this.tags);
-        copy.marker = this.marker;
+        copy.docStart = this.docStart;
         return copy;
     }
     /**
@@ -71,7 +73,7 @@ class Directives {
             }
             case '%YAML': {
                 this.yaml.explicit = true;
-                if (parts.length < 1) {
+                if (parts.length !== 1) {
                     onError(0, '%YAML directive should contain exactly one part');
                     return false;
                 }
@@ -81,7 +83,8 @@ class Directives {
                     return true;
                 }
                 else {
-                    onError(6, `Unsupported YAML version ${version}`, true);
+                    const isValid = /^\d+\.\d+$/.test(version);
+                    onError(6, `Unsupported YAML version ${version}`, isValid);
                     return false;
                 }
             }

package/node_modules/yaml/browser/dist/index.js

@@ -8,11 +8,10 @@ export { Pair } from './nodes/Pair.js';
 export { Scalar } from './nodes/Scalar.js';
 export { YAMLMap } from './nodes/YAMLMap.js';
 export { YAMLSeq } from './nodes/YAMLSeq.js';
-export { defaultOptions } from './options.js';
 import * as cst from './parse/cst.js';
 export { cst as CST };
 export { Lexer } from './parse/lexer.js';
 export { LineCounter } from './parse/line-counter.js';
 export { Parser } from './parse/parser.js';
 export { parse, parseAllDocuments, parseDocument, stringify } from './public-api.js';
-export { visit } from './visit.js';
+export { visit, visitAsync } from './visit.js';

package/node_modules/yaml/browser/dist/parse/lexer.js

@@ -357,9 +357,14 @@ class Lexer {
         let indent = -1;
         do {
             nl = yield* this.pushNewline();
-            sp = yield* this.pushSpaces(true);
-            if (nl > 0)
+            if (nl > 0) {
+                sp = yield* this.pushSpaces(false);
                 this.indentValue = indent = sp;
+            }
+            else {
+                sp = 0;
+            }
+            sp += yield* this.pushSpaces(true);
         } while (nl + sp > 0);
         const line = this.getLine();
         if (line === null)
@@ -533,9 +538,10 @@ class Lexer {
                 let ch = this.buffer[i];
                 if (ch === '\r')
                     ch = this.buffer[--i];
+                const lastChar = i; // Drop the line if last char not more indented
                 while (ch === ' ' || ch === '\t')
                     ch = this.buffer[--i];
-                if (ch === '\n' && i >= this.pos)
+                if (ch === '\n' && i >= this.pos && i + 1 + indent > lastChar)
                     nl = i;
                 else
                     break;
@@ -618,11 +624,13 @@ class Lexer {
                 return ((yield* this.pushUntil(isNotAnchorChar)) +
                     (yield* this.pushSpaces(true)) +
                     (yield* this.pushIndicators()));
-            case ':':
-            case '?': // this is an error outside flow collections
             case '-': // this is an error
-                if (isEmpty(this.charAt(1))) {
-                    if (this.flowLevel === 0)
+            case '?': // this is an error outside flow collections
+            case ':': {
+                const inFlow = this.flowLevel > 0;
+                const ch1 = this.charAt(1);
+                if (isEmpty(ch1) || (inFlow && invalidFlowScalarChars.includes(ch1))) {
+                    if (!inFlow)
                         this.indentNext = this.indentValue + 1;
                     else if (this.flowKey)
                         this.flowKey = false;
@@ -630,6 +638,7 @@ class Lexer {
                         (yield* this.pushSpaces(true)) +
                         (yield* this.pushIndicators()));
                 }
+            }
         }
         return 0;
     }

package/node_modules/yaml/browser/dist/parse/parser.js

@@ -541,36 +541,70 @@ class Parser {
                     this.onKeyLine = true;
                     return;
                 case 'map-value-ind':
-                    if (!it.sep)
-                        Object.assign(it, { key: null, sep: [this.sourceToken] });
-                    else if (it.value ||
-                        (atNextItem && !includesToken(it.start, 'explicit-key-ind')))
-                        map.items.push({ start: [], key: null, sep: [this.sourceToken] });
-                    else if (includesToken(it.sep, 'map-value-ind'))
-                        this.stack.push({
-                            type: 'block-map',
-                            offset: this.offset,
-                            indent: this.indent,
-                            items: [{ start: [], key: null, sep: [this.sourceToken] }]
-                        });
-                    else if (includesToken(it.start, 'explicit-key-ind') &&
-                        isFlowToken(it.key) &&
-                        !includesToken(it.sep, 'newline')) {
-                        const start = getFirstKeyStartProps(it.start);
-                        const key = it.key;
-                        const sep = it.sep;
-                        sep.push(this.sourceToken);
-                        // @ts-ignore type guard is wrong here
-                        delete it.key, delete it.sep;
-                        this.stack.push({
-                            type: 'block-map',
-                            offset: this.offset,
-                            indent: this.indent,
-                            items: [{ start, key, sep }]
-                        });
+                    if (includesToken(it.start, 'explicit-key-ind')) {
+                        if (!it.sep) {
+                            if (includesToken(it.start, 'newline')) {
+                                Object.assign(it, { key: null, sep: [this.sourceToken] });
+                            }
+                            else {
+                                const start = getFirstKeyStartProps(it.start);
+                                this.stack.push({
+                                    type: 'block-map',
+                                    offset: this.offset,
+                                    indent: this.indent,
+                                    items: [{ start, key: null, sep: [this.sourceToken] }]
+                                });
+                            }
+                        }
+                        else if (it.value) {
+                            map.items.push({ start: [], key: null, sep: [this.sourceToken] });
+                        }
+                        else if (includesToken(it.sep, 'map-value-ind')) {
+                            this.stack.push({
+                                type: 'block-map',
+                                offset: this.offset,
+                                indent: this.indent,
+                                items: [{ start: [], key: null, sep: [this.sourceToken] }]
+                            });
+                        }
+                        else if (isFlowToken(it.key) &&
+                            !includesToken(it.sep, 'newline')) {
+                            const start = getFirstKeyStartProps(it.start);
+                            const key = it.key;
+                            const sep = it.sep;
+                            sep.push(this.sourceToken);
+                            // @ts-expect-error type guard is wrong here
+                            delete it.key, delete it.sep;
+                            this.stack.push({
+                                type: 'block-map',
+                                offset: this.offset,
+                                indent: this.indent,
+                                items: [{ start, key, sep }]
+                            });
+                        }
+                        else {
+                            it.sep.push(this.sourceToken);
+                        }
+                    }
+                    else {
+                        if (!it.sep) {
+                            Object.assign(it, { key: null, sep: [this.sourceToken] });
+                        }
+                        else if (it.value || atNextItem) {
+                            map.items.push({ start: [], key: null, sep: [this.sourceToken] });
+                        }
+                        else if (includesToken(it.sep, 'map-value-ind')) {
+                            this.stack.push({
+                                type: 'block-map',
+                                offset: this.offset,
+                                indent: this.indent,
+                                items: [{ start: [], key: null, sep: [this.sourceToken] }]
+                            });
+                        }
+                        else {
+                            it.sep.push(this.sourceToken);
+                        }
                     }
-                    else
-                        it.sep.push(this.sourceToken);
                     this.onKeyLine = true;
                     return;
                 case 'alias':
@@ -734,7 +768,7 @@ class Parser {
         else {
             const parent = this.peek(2);
             if (parent.type === 'block-map' &&
-                (this.type === 'map-value-ind' ||
+                ((this.type === 'map-value-ind' && parent.indent === fc.indent) ||
                     (this.type === 'newline' &&
                         !parent.items[parent.items.length - 1].sep))) {
                 yield* this.pop();

package/node_modules/yaml/browser/dist/schema/common/null.js

@@ -7,7 +7,9 @@ const nullTag = {
     tag: 'tag:yaml.org,2002:null',
     test: /^(?:~|[Nn]ull|NULL)?$/,
     resolve: () => new Scalar(null),
-    stringify: ({ source }, ctx) => source && nullTag.test.test(source) ? source : ctx.options.nullStr
+    stringify: ({ source }, ctx) => typeof source === 'string' && nullTag.test.test(source)
+        ? source
+        : ctx.options.nullStr
 };
 
 export { nullTag };

package/node_modules/yaml/browser/dist/stringify/stringifyDocument.js

@@ -3,6 +3,7 @@ import { createStringifyContext, stringify } from './stringify.js';
 import { indentComment, lineComment } from './stringifyComment.js';
 
 function stringifyDocument(doc, options) {
+    var _a;
     const lines = [];
     let hasDirectives = options.directives === true;
     if (options.directives !== false && doc.directives) {
@@ -11,7 +12,7 @@ function stringifyDocument(doc, options) {
             lines.push(dir);
             hasDirectives = true;
         }
-        else if (doc.directives.marker)
+        else if (doc.directives.docStart)
             hasDirectives = true;
     }
     if (hasDirectives)
@@ -54,13 +55,30 @@ function stringifyDocument(doc, options) {
     else {
         lines.push(stringify(doc.contents, ctx));
     }
-    let dc = doc.comment;
-    if (dc && chompKeep)
-        dc = dc.replace(/^\n+/, '');
-    if (dc) {
-        if ((!chompKeep || contentComment) && lines[lines.length - 1] !== '')
-            lines.push('');
-        lines.push(indentComment(commentString(dc), ''));
+    if ((_a = doc.directives) === null || _a === void 0 ? void 0 : _a.docEnd) {
+        if (doc.comment) {
+            const cs = commentString(doc.comment);
+            if (cs.includes('\n')) {
+                lines.push('...');
+                lines.push(indentComment(cs, ''));
+            }
+            else {
+                lines.push(`... ${cs}`);
+            }
+        }
+        else {
+            lines.push('...');
+        }
+    }
+    else {
+        let dc = doc.comment;
+        if (dc && chompKeep)
+            dc = dc.replace(/^\n+/, '');
+        if (dc) {
+            if ((!chompKeep || contentComment) && lines[lines.length - 1] !== '')
+                lines.push('');
+            lines.push(indentComment(commentString(dc), ''));
+        }
     }
     return lines.join('\n') + '\n';
 }

package/node_modules/yaml/browser/dist/stringify/stringifyPair.js

@@ -39,7 +39,7 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
         if (allNullValues || value == null) {
             if (keyCommentDone && onComment)
                 onComment();
-            return explicitKey ? `? ${str}` : str;
+            return str === '' ? '?' : explicitKey ? `? ${str}` : str;
         }
     }
     else if ((allNullValues && !simpleKeys) || (value == null && explicitKey)) {