projen 0.84.7 → 0.84.9

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

@@ -23,10 +23,23 @@ function resolveCollection(CN, ctx, token, onError, tagName, tag) {
         coll.tag = tagName;
     return coll;
 }
-function composeCollection(CN, ctx, token, tagToken, onError) {
+function composeCollection(CN, ctx, token, props, onError) {
+    const tagToken = props.tag;
     const tagName = !tagToken
         ? null
         : ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg));
+    if (token.type === 'block-seq') {
+        const { anchor, newlineAfterProp: nl } = props;
+        const lastProp = anchor && tagToken
+            ? anchor.offset > tagToken.offset
+                ? anchor
+                : tagToken
+            : (anchor ?? tagToken);
+        if (lastProp && (!nl || nl.offset < lastProp.offset)) {
+            const message = 'Missing newline after block sequence props';
+            onError(lastProp, 'MISSING_CHAR', message);
+        }
+    }
     const expType = token.type === 'block-map'
         ? 'map'
         : token.type === 'block-seq'
@@ -40,8 +53,7 @@ function composeCollection(CN, ctx, token, tagToken, onError) {
         !tagName ||
         tagName === '!' ||
         (tagName === YAMLMap.tagName && expType === 'map') ||
-        (tagName === YAMLSeq.tagName && expType === 'seq') ||
-        !expType) {
+        (tagName === YAMLSeq.tagName && expType === 'seq')) {
         return resolveCollection(CN, ctx, token, onError, tagName);
     }
     let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);

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

@@ -26,7 +26,7 @@ function composeNode(ctx, token, props, onError) {
         case 'block-map':
         case 'block-seq':
         case 'flow-collection':
-            node = composeCollection(CN, ctx, token, tag, onError);
+            node = composeCollection(CN, ctx, token, props, onError);
             if (anchor)
                 node.anchor = anchor.source.substring(1);
             break;

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

@@ -42,7 +42,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError, ta
                 }
                 continue;
             }
-            if (keyProps.hasNewlineAfterProp || containsNewline(key)) {
+            if (keyProps.newlineAfterProp || containsNewline(key)) {
                 onError(key ?? start[start.length - 1], 'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
             }
         }

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

@@ -5,11 +5,11 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
     let comment = '';
     let commentSep = '';
     let hasNewline = false;
-    let hasNewlineAfterProp = false;
     let reqSpace = false;
     let tab = null;
     let anchor = null;
     let tag = null;
+    let newlineAfterProp = null;
     let comma = null;
     let found = null;
     let start = null;
@@ -63,7 +63,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
                 atNewline = true;
                 hasNewline = true;
                 if (anchor || tag)
-                    hasNewlineAfterProp = true;
+                    newlineAfterProp = token;
                 hasSpace = true;
                 break;
             case 'anchor':
@@ -137,9 +137,9 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
         spaceBefore,
         comment,
         hasNewline,
-        hasNewlineAfterProp,
         anchor,
         tag,
+        newlineAfterProp,
         end,
         start: start ?? end
     };

package/node_modules/yaml/browser/dist/nodes/Collection.js

@@ -143,6 +143,5 @@ class Collection extends NodeBase {
         }
     }
 }
-Collection.maxFlowStringSingleLineLength = 60;
 
 export { Collection, collectionFromPath, isEmptyPath };

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

@@ -290,15 +290,11 @@ class Lexer {
             if (!this.atEnd && !this.hasChars(4))
                 return this.setNext('line-start');
             const s = this.peek(3);
-            if (s === '---' && isEmpty(this.charAt(3))) {
+            if ((s === '---' || s === '...') && isEmpty(this.charAt(3))) {
                 yield* this.pushCount(3);
                 this.indentValue = 0;
                 this.indentNext = 0;
-                return 'doc';
-            }
-            else if (s === '...' && isEmpty(this.charAt(3))) {
-                yield* this.pushCount(3);
-                return 'stream';
+                return s === '---' ? 'doc' : 'stream';
             }
         }
         this.indentValue = yield* this.pushSpaces(false);

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

@@ -9,6 +9,8 @@ const FOLD_QUOTED = 'quoted';
 function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
     if (!lineWidth || lineWidth < 0)
         return text;
+    if (lineWidth < minContentWidth)
+        minContentWidth = 0;
     const endStep = Math.max(1 + minContentWidth, 1 + lineWidth - indent.length);
     if (text.length <= endStep)
         return text;

package/node_modules/yaml/dist/cli.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n  yaml          Process a YAML stream, outputting it as YAML\n  yaml cst      Parse the CST of a YAML stream\n  yaml lex      Parse the lexical tokens of a YAML stream\n  yaml valid    Validate a YAML stream, returning 0 on success\n\nOptions:\n  --help, -h    Show this message.\n  --json, -j    Output JSON.\n\nAdditional options for bare \"yaml\" command:\n  --doc, -d     Output pretty-printed JS Document objects.\n  --single, -1  Require the input to consist of a single YAML document.\n  --strict, -s  Stop on errors.\n  --visit, -v   Apply a visitor to each document (requires a path to import)\n  --yaml 1.1    Set the YAML version. (default: 1.2)";
+export declare const help = "yaml: A command-line YAML processor and inspector\n\nReads stdin and writes output to stdout and errors & warnings to stderr.\n\nUsage:\n  yaml          Process a YAML stream, outputting it as YAML\n  yaml cst      Parse the CST of a YAML stream\n  yaml lex      Parse the lexical tokens of a YAML stream\n  yaml valid    Validate a YAML stream, returning 0 on success\n\nOptions:\n  --help, -h    Show this message.\n  --json, -j    Output JSON.\n  --indent 2    Output pretty-printed data, indented by the given number of spaces.\n\nAdditional options for bare \"yaml\" command:\n  --doc, -d     Output pretty-printed JS Document objects.\n  --single, -1  Require the input to consist of a single YAML document.\n  --strict, -s  Stop on errors.\n  --visit, -v   Apply a visitor to each document (requires a path to import)\n  --yaml 1.1    Set the YAML version. (default: 1.2)";
 export declare class UserError extends Error {
     static ARGS: number;
     static SINGLE: number;

package/node_modules/yaml/dist/cli.mjs

@@ -22,6 +22,7 @@ Usage:
 Options:
   --help, -h    Show this message.
   --json, -j    Output JSON.
+  --indent 2    Output pretty-printed data, indented by the given number of spaces.
 
 Additional options for bare "yaml" command:
   --doc, -d     Output pretty-printed JS Document objects.
@@ -46,6 +47,7 @@ async function cli(stdin, done, argv) {
             options: {
                 doc: { type: 'boolean', short: 'd' },
                 help: { type: 'boolean', short: 'h' },
+                indent: { type: 'string', short: 'i' },
                 json: { type: 'boolean', short: 'j' },
                 single: { type: 'boolean', short: '1' },
                 strict: { type: 'boolean', short: 's' },
@@ -58,6 +60,7 @@ async function cli(stdin, done, argv) {
         return done(new UserError(UserError.ARGS, error.message));
     }
     const { positionals: [mode], values: opt } = args;
+    let indent = Number(opt.indent);
     stdin.setEncoding('utf-8');
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     switch (opt.help || mode) {
@@ -82,7 +85,7 @@ async function cli(stdin, done, argv) {
                 for (const tok of lexer.lex('', false))
                     add(tok);
                 if (opt.json)
-                    console.log(JSON.stringify(data));
+                    console.log(JSON.stringify(data, null, indent));
                 done();
             });
             break;
@@ -104,7 +107,7 @@ async function cli(stdin, done, argv) {
                 for (const tok of parser.parse('', false))
                     add(tok);
                 if (opt.json)
-                    console.log(JSON.stringify(data));
+                    console.log(JSON.stringify(data, null, indent));
                 done();
             });
             break;
@@ -153,7 +156,8 @@ async function cli(stdin, done, argv) {
                     if (reqDocEnd)
                         console.log('...');
                     try {
-                        const str = String(doc);
+                        indent || (indent = 2);
+                        const str = doc.toString({ indent });
                         console.log(str.endsWith('\n') ? str.slice(0, -1) : str);
                     }
                     catch (error) {
@@ -181,7 +185,7 @@ async function cli(stdin, done, argv) {
                     return done(new UserError(UserError.SINGLE, 'Input stream contained no documents'));
                 }
                 if (mode !== 'valid' && opt.json) {
-                    console.log(JSON.stringify(opt.single ? data[0] : data));
+                    console.log(JSON.stringify(opt.single ? data[0] : data, null, indent));
                 }
                 done();
             });

package/node_modules/yaml/dist/compose/compose-collection.d.ts

@@ -2,4 +2,10 @@ import type { ParsedNode } from '../nodes/Node.js';
 import type { BlockMap, BlockSequence, FlowCollection, SourceToken } from '../parse/cst.js';
 import type { ComposeContext, ComposeNode } from './compose-node.js';
 import type { ComposeErrorHandler } from './composer.js';
-export declare function composeCollection(CN: ComposeNode, ctx: ComposeContext, token: BlockMap | BlockSequence | FlowCollection, tagToken: SourceToken | null, onError: ComposeErrorHandler): ParsedNode;
+interface Props {
+    anchor: SourceToken | null;
+    tag: SourceToken | null;
+    newlineAfterProp: SourceToken | null;
+}
+export declare function composeCollection(CN: ComposeNode, ctx: ComposeContext, token: BlockMap | BlockSequence | FlowCollection, props: Props, onError: ComposeErrorHandler): ParsedNode;
+export {};

package/node_modules/yaml/dist/compose/compose-collection.js

@@ -25,10 +25,23 @@ function resolveCollection(CN, ctx, token, onError, tagName, tag) {
         coll.tag = tagName;
     return coll;
 }
-function composeCollection(CN, ctx, token, tagToken, onError) {
+function composeCollection(CN, ctx, token, props, onError) {
+    const tagToken = props.tag;
     const tagName = !tagToken
         ? null
         : ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg));
+    if (token.type === 'block-seq') {
+        const { anchor, newlineAfterProp: nl } = props;
+        const lastProp = anchor && tagToken
+            ? anchor.offset > tagToken.offset
+                ? anchor
+                : tagToken
+            : (anchor ?? tagToken);
+        if (lastProp && (!nl || nl.offset < lastProp.offset)) {
+            const message = 'Missing newline after block sequence props';
+            onError(lastProp, 'MISSING_CHAR', message);
+        }
+    }
     const expType = token.type === 'block-map'
         ? 'map'
         : token.type === 'block-seq'
@@ -42,8 +55,7 @@ function composeCollection(CN, ctx, token, tagToken, onError) {
         !tagName ||
         tagName === '!' ||
         (tagName === YAMLMap.YAMLMap.tagName && expType === 'map') ||
-        (tagName === YAMLSeq.YAMLSeq.tagName && expType === 'seq') ||
-        !expType) {
+        (tagName === YAMLSeq.YAMLSeq.tagName && expType === 'seq')) {
         return resolveCollection(CN, ctx, token, onError, tagName);
     }
     let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);

package/node_modules/yaml/dist/compose/compose-node.d.ts

@@ -15,6 +15,7 @@ interface Props {
     comment: string;
     anchor: SourceToken | null;
     tag: SourceToken | null;
+    newlineAfterProp: SourceToken | null;
     end: number;
 }
 declare const CN: {

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

@@ -28,7 +28,7 @@ function composeNode(ctx, token, props, onError) {
         case 'block-map':
         case 'block-seq':
         case 'flow-collection':
-            node = composeCollection.composeCollection(CN, ctx, token, tag, onError);
+            node = composeCollection.composeCollection(CN, ctx, token, props, onError);
             if (anchor)
                 node.anchor = anchor.source.substring(1);
             break;

package/node_modules/yaml/dist/compose/resolve-block-map.d.ts

@@ -1,7 +1,6 @@
-import type { ParsedNode } from '../nodes/Node.js';
 import { YAMLMap } from '../nodes/YAMLMap.js';
 import type { BlockMap } from '../parse/cst.js';
 import { CollectionTag } from '../schema/types.js';
 import type { ComposeContext, ComposeNode } from './compose-node.js';
 import type { ComposeErrorHandler } from './composer.js';
-export declare function resolveBlockMap({ composeNode, composeEmptyNode }: ComposeNode, ctx: ComposeContext, bm: BlockMap, onError: ComposeErrorHandler, tag?: CollectionTag): YAMLMap.Parsed<ParsedNode, ParsedNode | null>;
+export declare function resolveBlockMap({ composeNode, composeEmptyNode }: ComposeNode, ctx: ComposeContext, bm: BlockMap, onError: ComposeErrorHandler, tag?: CollectionTag): YAMLMap.Parsed;

package/node_modules/yaml/dist/compose/resolve-block-map.js

@@ -44,7 +44,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError, ta
                 }
                 continue;
             }
-            if (keyProps.hasNewlineAfterProp || utilContainsNewline.containsNewline(key)) {
+            if (keyProps.newlineAfterProp || utilContainsNewline.containsNewline(key)) {
                 onError(key ?? start[start.length - 1], 'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
             }
         }

package/node_modules/yaml/dist/compose/resolve-block-seq.d.ts

@@ -3,4 +3,4 @@ import type { BlockSequence } from '../parse/cst.js';
 import { CollectionTag } from '../schema/types.js';
 import type { ComposeContext, ComposeNode } from './compose-node.js';
 import type { ComposeErrorHandler } from './composer.js';
-export declare function resolveBlockSeq({ composeNode, composeEmptyNode }: ComposeNode, ctx: ComposeContext, bs: BlockSequence, onError: ComposeErrorHandler, tag?: CollectionTag): YAMLSeq.Parsed<import("../index.js").ParsedNode>;
+export declare function resolveBlockSeq({ composeNode, composeEmptyNode }: ComposeNode, ctx: ComposeContext, bs: BlockSequence, onError: ComposeErrorHandler, tag?: CollectionTag): YAMLSeq.Parsed;

package/node_modules/yaml/dist/compose/resolve-props.d.ts

@@ -15,9 +15,9 @@ export declare function resolveProps(tokens: SourceToken[], { flow, indicator, n
     spaceBefore: boolean;
     comment: string;
     hasNewline: boolean;
-    hasNewlineAfterProp: boolean;
     anchor: SourceToken | null;
     tag: SourceToken | null;
+    newlineAfterProp: SourceToken | null;
     end: number;
     start: number;
 };

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

@@ -7,11 +7,11 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
     let comment = '';
     let commentSep = '';
     let hasNewline = false;
-    let hasNewlineAfterProp = false;
     let reqSpace = false;
     let tab = null;
     let anchor = null;
     let tag = null;
+    let newlineAfterProp = null;
     let comma = null;
     let found = null;
     let start = null;
@@ -65,7 +65,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
                 atNewline = true;
                 hasNewline = true;
                 if (anchor || tag)
-                    hasNewlineAfterProp = true;
+                    newlineAfterProp = token;
                 hasSpace = true;
                 break;
             case 'anchor':
@@ -139,9 +139,9 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
         spaceBefore,
         comment,
         hasNewline,
-        hasNewlineAfterProp,
         anchor,
         tag,
+        newlineAfterProp,
         end,
         start: start ?? end
     };

package/node_modules/yaml/dist/nodes/Collection.d.ts

@@ -4,7 +4,6 @@ import { NodeBase } from './Node.js';
 export declare function collectionFromPath(schema: Schema, path: unknown[], value: unknown): import("./Node.js").Node;
 export declare const isEmptyPath: (path: Iterable<unknown> | null | undefined) => path is null | undefined;
 export declare abstract class Collection extends NodeBase {
-    static maxFlowStringSingleLineLength: number;
     schema: Schema | undefined;
     [NODE_TYPE]: symbol;
     items: unknown[];

package/node_modules/yaml/dist/nodes/Collection.js

@@ -145,7 +145,6 @@ class Collection extends Node.NodeBase {
         }
     }
 }
-Collection.maxFlowStringSingleLineLength = 60;
 
 exports.Collection = Collection;
 exports.collectionFromPath = collectionFromPath;

package/node_modules/yaml/dist/nodes/identity.d.ts

@@ -13,7 +13,7 @@ export declare const SCALAR: unique symbol;
 export declare const SEQ: unique symbol;
 export declare const NODE_TYPE: unique symbol;
 export declare const isAlias: (node: any) => node is Alias;
-export declare const isDocument: <T extends Node = Node>(node: any) => node is Document<T, true>;
+export declare const isDocument: <T extends Node = Node>(node: any) => node is Document<T>;
 export declare const isMap: <K = unknown, V = unknown>(node: any) => node is YAMLMap<K, V>;
 export declare const isPair: <K = unknown, V = unknown>(node: any) => node is Pair<K, V>;
 export declare const isScalar: <T = unknown>(node: any) => node is Scalar<T>;

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

@@ -292,15 +292,11 @@ class Lexer {
             if (!this.atEnd && !this.hasChars(4))
                 return this.setNext('line-start');
             const s = this.peek(3);
-            if (s === '---' && isEmpty(this.charAt(3))) {
+            if ((s === '---' || s === '...') && isEmpty(this.charAt(3))) {
                 yield* this.pushCount(3);
                 this.indentValue = 0;
                 this.indentNext = 0;
-                return 'doc';
-            }
-            else if (s === '...' && isEmpty(this.charAt(3))) {
-                yield* this.pushCount(3);
-                return 'stream';
+                return s === '---' ? 'doc' : 'stream';
             }
         }
         this.indentValue = yield* this.pushSpaces(false);

package/node_modules/yaml/dist/schema/yaml-1.1/omap.d.ts

@@ -9,12 +9,12 @@ export declare class YAMLOMap extends YAMLSeq {
     add: (pair: import("../../index.js").Pair<any, any> | {
         key: any;
         value: any;
-    }, overwrite?: boolean | undefined) => void;
+    }, overwrite?: boolean) => void;
     delete: (key: unknown) => boolean;
     get: {
         (key: unknown, keepScalar: true): import("../../index.js").Scalar<any> | undefined;
-        (key: unknown, keepScalar?: false | undefined): any;
-        (key: unknown, keepScalar?: boolean | undefined): any;
+        (key: unknown, keepScalar?: false): any;
+        (key: unknown, keepScalar?: boolean): any;
     };
     has: (key: unknown) => boolean;
     set: (key: any, value: any) => void;

package/node_modules/yaml/dist/stringify/foldFlowLines.js

@@ -11,6 +11,8 @@ const FOLD_QUOTED = 'quoted';
 function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
     if (!lineWidth || lineWidth < 0)
         return text;
+    if (lineWidth < minContentWidth)
+        minContentWidth = 0;
     const endStep = Math.max(1 + minContentWidth, 1 + lineWidth - indent.length);
     if (text.length <= endStep)
         return text;

package/node_modules/yaml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.4.5",
+  "version": "2.5.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",

package/package.json

@@ -130,7 +130,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.84.7",
+  "version": "0.84.9",
   "jest": {
     "coverageProvider": "v8",
     "coverageReporters": [