projen 0.54.58 → 0.55.2

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

@@ -9,7 +9,7 @@ function includesToken(list, type) {
             return true;
     return false;
 }
-function includesNonEmpty(list) {
+function findNonEmptyIndex(list) {
     for (let i = 0; i < list.length; ++i) {
         switch (list[i].type) {
             case 'space':
@@ -17,10 +17,10 @@ function includesNonEmpty(list) {
             case 'newline':
                 break;
             default:
-                return true;
+                return i;
         }
     }
-    return false;
+    return -1;
 }
 function isFlowToken(token) {
     switch (token === null || token === void 0 ? void 0 : token.type) {
@@ -35,12 +35,13 @@ function isFlowToken(token) {
     }
 }
 function getPrevProps(parent) {
+    var _a;
     switch (parent.type) {
         case 'document':
             return parent.start;
         case 'block-map': {
             const it = parent.items[parent.items.length - 1];
-            return it.sep || it.start;
+            return (_a = it.sep) !== null && _a !== void 0 ? _a : it.start;
         }
         case 'block-seq':
             return parent.items[parent.items.length - 1].start;
@@ -269,7 +270,7 @@ class Parser {
         return this.stack[this.stack.length - n];
     }
     *pop(error) {
-        const token = error || this.stack.pop();
+        const token = error !== null && error !== void 0 ? error : this.stack.pop();
         /* istanbul ignore if should not happen */
         if (!token) {
             const message = 'Tried to pop an empty stack';
@@ -346,7 +347,7 @@ class Parser {
                     !last.sep &&
                     !last.value &&
                     last.start.length > 0 &&
-                    !includesNonEmpty(last.start) &&
+                    findNonEmptyIndex(last.start) === -1 &&
                     (token.indent === 0 ||
                         last.start.every(st => st.type !== 'comment' || st.indent < token.indent))) {
                     if (top.type === 'document')
@@ -394,7 +395,7 @@ class Parser {
             return yield* this.lineEnd(doc);
         switch (this.type) {
             case 'doc-start': {
-                if (includesNonEmpty(doc.start)) {
+                if (findNonEmptyIndex(doc.start) !== -1) {
                     yield* this.pop();
                     yield* this.step();
                 }
@@ -488,17 +489,21 @@ class Parser {
                     else
                         map.items.push({ start: [this.sourceToken] });
                 }
-                else if (it.sep)
+                else if (it.sep) {
                     it.sep.push(this.sourceToken);
-                else
+                }
+                else {
                     it.start.push(this.sourceToken);
+                }
                 return;
             case 'space':
             case 'comment':
-                if (it.value)
+                if (it.value) {
                     map.items.push({ start: [this.sourceToken] });
-                else if (it.sep)
+                }
+                else if (it.sep) {
                     it.sep.push(this.sourceToken);
+                }
                 else {
                     if (this.atIndentedComment(it.start, map.indent)) {
                         const prev = map.items[map.items.length - 2];
@@ -515,33 +520,61 @@ class Parser {
                 return;
         }
         if (this.indent >= map.indent) {
-            const atNextItem = !this.onKeyLine &&
-                this.indent === map.indent &&
-                (it.sep || includesNonEmpty(it.start));
+            const atNextItem = !this.onKeyLine && this.indent === map.indent && it.sep;
+            // For empty nodes, assign newline-separated not indented empty tokens to following node
+            let start = [];
+            if (atNextItem && it.sep && !it.value) {
+                const nl = [];
+                for (let i = 0; i < it.sep.length; ++i) {
+                    const st = it.sep[i];
+                    switch (st.type) {
+                        case 'newline':
+                            nl.push(i);
+                            break;
+                        case 'space':
+                            break;
+                        case 'comment':
+                            if (st.indent > map.indent)
+                                nl.length = 0;
+                            break;
+                        default:
+                            nl.length = 0;
+                    }
+                }
+                if (nl.length >= 2)
+                    start = it.sep.splice(nl[1]);
+            }
             switch (this.type) {
                 case 'anchor':
                 case 'tag':
                     if (atNextItem || it.value) {
-                        map.items.push({ start: [this.sourceToken] });
+                        start.push(this.sourceToken);
+                        map.items.push({ start });
                         this.onKeyLine = true;
                     }
-                    else if (it.sep)
+                    else if (it.sep) {
                         it.sep.push(this.sourceToken);
-                    else
+                    }
+                    else {
                         it.start.push(this.sourceToken);
+                    }
                     return;
                 case 'explicit-key-ind':
-                    if (!it.sep && !includesToken(it.start, 'explicit-key-ind'))
+                    if (!it.sep && !includesToken(it.start, 'explicit-key-ind')) {
                         it.start.push(this.sourceToken);
-                    else if (atNextItem || it.value)
-                        map.items.push({ start: [this.sourceToken] });
-                    else
+                    }
+                    else if (atNextItem || it.value) {
+                        start.push(this.sourceToken);
+                        map.items.push({ start });
+                    }
+                    else {
                         this.stack.push({
                             type: 'block-map',
                             offset: this.offset,
                             indent: this.indent,
                             items: [{ start: [this.sourceToken] }]
                         });
+                    }
                     this.onKeyLine = true;
                     return;
                 case 'map-value-ind':
@@ -568,7 +601,7 @@ class Parser {
                                 type: 'block-map',
                                 offset: this.offset,
                                 indent: this.indent,
-                                items: [{ start: [], key: null, sep: [this.sourceToken] }]
+                                items: [{ start, key: null, sep: [this.sourceToken] }]
                             });
                         }
                         else if (isFlowToken(it.key) &&
@@ -586,6 +619,10 @@ class Parser {
                                 items: [{ start, key, sep }]
                             });
                         }
+                        else if (start.length > 0) {
+                            // Not actually at next item
+                            it.sep = it.sep.concat(start, this.sourceToken);
+                        }
                         else {
                             it.sep.push(this.sourceToken);
                         }
@@ -595,7 +632,7 @@ class Parser {
                             Object.assign(it, { key: null, sep: [this.sourceToken] });
                         }
                         else if (it.value || atNextItem) {
-                            map.items.push({ start: [], key: null, sep: [this.sourceToken] });
+                            map.items.push({ start, key: null, sep: [this.sourceToken] });
                         }
                         else if (includesToken(it.sep, 'map-value-ind')) {
                             this.stack.push({
@@ -617,7 +654,7 @@ class Parser {
                 case 'double-quoted-scalar': {
                     const fs = this.flowScalar(this.type);
                     if (atNextItem || it.value) {
-                        map.items.push({ start: [], key: fs, sep: [] });
+                        map.items.push({ start, key: fs, sep: [] });
                         this.onKeyLine = true;
                     }
                     else if (it.sep) {
@@ -634,8 +671,9 @@ class Parser {
                     if (bv) {
                         if (atNextItem &&
                             bv.type !== 'block-seq' &&
-                            includesToken(it.start, 'explicit-key-ind'))
-                            map.items.push({ start: [] });
+                            includesToken(it.start, 'explicit-key-ind')) {
+                            map.items.push({ start });
+                        }
                         this.stack.push(bv);
                         return;
                     }

package/node_modules/yaml/dist/public-api.js

@@ -77,6 +77,7 @@ function parse(src, reviver, options) {
     return doc.toJS(Object.assign({ reviver: _reviver }, options));
 }
 function stringify(value, replacer, options) {
+    var _a;
     let _replacer = null;
     if (typeof replacer === 'function' || Array.isArray(replacer)) {
         _replacer = replacer;
@@ -91,7 +92,7 @@ function stringify(value, replacer, options) {
         options = indent < 1 ? undefined : indent > 8 ? { indent: 8 } : { indent };
     }
     if (value === undefined) {
-        const { keepUndefined } = options || replacer || {};
+        const { keepUndefined } = (_a = options !== null && options !== void 0 ? options : replacer) !== null && _a !== void 0 ? _a : {};
         if (!keepUndefined)
             return undefined;
     }

package/node_modules/yaml/dist/schema/Schema.js

@@ -18,13 +18,17 @@ class Schema {
         this.name = (typeof schema === 'string' && schema) || 'core';
         this.knownTags = resolveKnownTags ? tags.coreKnownTags : {};
         this.tags = tags.getTags(customTags, this.name);
-        this.toStringOptions = toStringDefaults || null;
+        this.toStringOptions = toStringDefaults !== null && toStringDefaults !== void 0 ? toStringDefaults : null;
         Object.defineProperty(this, Node.MAP, { value: map.map });
         Object.defineProperty(this, Node.SCALAR, { value: string.string });
         Object.defineProperty(this, Node.SEQ, { value: seq.seq });
         // Used by createMap()
         this.sortMapEntries =
-            sortMapEntries === true ? sortMapEntriesByKey : sortMapEntries || null;
+            typeof sortMapEntries === 'function'
+                ? sortMapEntries
+                : sortMapEntries === true
+                    ? sortMapEntriesByKey
+                    : null;
     }
     clone() {
         const copy = Object.create(Schema.prototype, Object.getOwnPropertyDescriptors(this));

package/node_modules/yaml/dist/schema/yaml-1.1/omap.js

@@ -24,7 +24,7 @@ class YAMLOMap extends YAMLSeq.YAMLSeq {
         if (!ctx)
             return super.toJSON(_);
         const map = new Map();
-        if (ctx && ctx.onCreate)
+        if (ctx === null || ctx === void 0 ? void 0 : ctx.onCreate)
             ctx.onCreate(map);
         for (const pair of this.items) {
             let key, value;

package/node_modules/yaml/dist/schema/yaml-1.1/pairs.js

@@ -6,6 +6,7 @@ var Scalar = require('../../nodes/Scalar.js');
 var YAMLSeq = require('../../nodes/YAMLSeq.js');
 
 function resolvePairs(seq, onError) {
+    var _a;
     if (Node.isSeq(seq)) {
         for (let i = 0; i < seq.items.length; ++i) {
             let item = seq.items[i];
@@ -20,7 +21,7 @@ function resolvePairs(seq, onError) {
                         ? `${item.commentBefore}\n${pair.key.commentBefore}`
                         : item.commentBefore;
                 if (item.comment) {
-                    const cn = pair.value || pair.key;
+                    const cn = (_a = pair.value) !== null && _a !== void 0 ? _a : pair.key;
                     cn.comment = cn.comment
                         ? `${item.comment}\n${cn.comment}`
                         : item.comment;

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

@@ -45,26 +45,26 @@ function createStringifyContext(doc, options) {
     };
 }
 function getTagObject(tags, item) {
+    var _a, _b, _c, _d;
     if (item.tag) {
         const match = tags.filter(t => t.tag === item.tag);
         if (match.length > 0)
-            return match.find(t => t.format === item.format) || match[0];
+            return (_a = match.find(t => t.format === item.format)) !== null && _a !== void 0 ? _a : match[0];
     }
     let tagObj = undefined;
     let obj;
     if (Node.isScalar(item)) {
         obj = item.value;
-        const match = tags.filter(t => t.identify && t.identify(obj));
+        const match = tags.filter(t => { var _a; return (_a = t.identify) === null || _a === void 0 ? void 0 : _a.call(t, obj); });
         tagObj =
-            match.find(t => t.format === item.format) || match.find(t => !t.format);
+            (_b = match.find(t => t.format === item.format)) !== null && _b !== void 0 ? _b : match.find(t => !t.format);
     }
     else {
         obj = item;
         tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
     }
     if (!tagObj) {
-        // @ts-ignore
-        const name = obj && obj.constructor ? obj.constructor.name : typeof obj;
+        const name = (_d = (_c = obj === null || obj === void 0 ? void 0 : obj.constructor) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : typeof obj;
         throw new Error(`Tag not resolved for ${name} value`);
     }
     return tagObj;
@@ -79,13 +79,13 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
         anchors$1.add(anchor);
         props.push(`&${anchor}`);
     }
-    const tag = node.tag || (tagObj.default ? null : tagObj.tag);
+    const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
     if (tag)
         props.push(doc.directives.tagString(tag));
     return props.join(' ');
 }
 function stringify(item, ctx, onComment, onChompKeep) {
-    var _a;
+    var _a, _b;
     if (Node.isPair(item))
         return item.toString(ctx, onComment, onChompKeep);
     if (Node.isAlias(item)) {
@@ -110,7 +110,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
         tagObj = getTagObject(ctx.doc.schema.tags, node);
     const props = stringifyProps(node, tagObj, ctx);
     if (props.length > 0)
-        ctx.indentAtStart = (ctx.indentAtStart || 0) + props.length + 1;
+        ctx.indentAtStart = ((_b = ctx.indentAtStart) !== null && _b !== void 0 ? _b : 0) + props.length + 1;
     const str = typeof tagObj.stringify === 'function'
         ? tagObj.stringify(node, ctx, onComment, onChompKeep)
         : Node.isScalar(node)

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

@@ -13,9 +13,11 @@ function indentComment(comment, indent) {
         return comment.substring(1);
     return indent ? comment.replace(/^(?! *$)/gm, indent) : comment;
 }
-const lineComment = (str, indent, comment) => comment.includes('\n')
-    ? '\n' + indentComment(comment, indent)
-    : (str.endsWith(' ') ? '' : ' ') + comment;
+const lineComment = (str, indent, comment) => str.endsWith('\n')
+    ? indentComment(comment, indent)
+    : comment.includes('\n')
+        ? '\n' + indentComment(comment, indent)
+        : (str.endsWith(' ') ? '' : ' ') + comment;
 
 exports.indentComment = indentComment;
 exports.lineComment = lineComment;

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

@@ -98,7 +98,10 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
     const valueStr = stringify.stringify(value, ctx, () => (valueCommentDone = true), () => (chompKeep = true));
     let ws = ' ';
     if (vcb || keyComment) {
-        ws = valueStr === '' && !ctx.inFlow ? vcb : `${vcb}\n${ctx.indent}`;
+        if (valueStr === '' && !ctx.inFlow)
+            ws = vcb === '\n' ? '\n\n' : vcb;
+        else
+            ws = `${vcb}\n${ctx.indent}`;
     }
     else if (!explicitKey && Node.isCollection(value)) {
         const flow = valueStr[0] === '[' || valueStr[0] === '{';

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

@@ -245,14 +245,14 @@ function plainString(item, ctx, onComment, onChompKeep) {
         // - '\n ', ': ' or ' \n' anywhere
         // - '#' not preceded by a non-space char
         // - end with ' ' or ':'
-        return implicitKey || inFlow || value.indexOf('\n') === -1
+        return implicitKey || inFlow || !value.includes('\n')
             ? quotedString(value, ctx)
             : blockString(item, ctx, onComment, onChompKeep);
     }
     if (!implicitKey &&
         !inFlow &&
         type !== Scalar.Scalar.PLAIN &&
-        value.indexOf('\n') !== -1) {
+        value.includes('\n')) {
         // Where allowed & type not set explicitly, prefer block style for multiline strings
         return blockString(item, ctx, onComment, onChompKeep);
     }

package/node_modules/yaml/dist/test-events.js

@@ -57,7 +57,7 @@ function testEvents(src) {
         }
     }
     catch (e) {
-        return { events, error: error || e };
+        return { events, error: error !== null && error !== void 0 ? error : e };
     }
     events.push('-STR');
     return { events, error };

package/node_modules/yaml/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "2.0.0-11",
+  "version": "2.0.1",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -89,6 +89,6 @@
     "typescript": "^4.3.5"
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 14"
   }
 }

package/package.json

@@ -52,8 +52,8 @@
     "@types/fs-extra": "^8",
     "@types/glob": "^7.2.0",
     "@types/ini": "^1.3.31",
-    "@types/jest": "^27.4.1",
-    "@types/node": "^12",
+    "@types/jest": "^27.5.0",
+    "@types/node": "^14",
     "@types/semver": "^7.3.9",
     "@types/yargs": "^15.0.14",
     "@typescript-eslint/eslint-plugin": "^5",
@@ -91,7 +91,7 @@
     "semver": "^7.3.7",
     "shx": "^0.3.4",
     "xmlbuilder2": "^2.4.1",
-    "yaml": "2.0.0-11",
+    "yaml": "^2.0.1",
     "yargs": "^16.2.0"
   },
   "bundledDependencies": [
@@ -117,11 +117,11 @@
     "scaffolding"
   ],
   "engines": {
-    "node": ">= 12.7.0"
+    "node": ">= 14.0.0"
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "0.54.58",
+  "version": "0.55.2",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

package/releasetag.txt

@@ -1 +1 @@
-v0.54.58
+v0.55.2

package/version.txt

@@ -1 +1 @@
-0.54.58
+0.55.2