projen 0.56.9 → 0.56.12

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

@@ -7,7 +7,7 @@ function includesToken(list, type) {
             return true;
     return false;
 }
-function findNonEmptyIndex(list) {
+function includesNonEmpty(list) {
     for (let i = 0; i < list.length; ++i) {
         switch (list[i].type) {
             case 'space':
@@ -15,10 +15,10 @@ function findNonEmptyIndex(list) {
             case 'newline':
                 break;
             default:
-                return i;
+                return true;
         }
     }
-    return -1;
+    return false;
 }
 function isFlowToken(token) {
     switch (token === null || token === void 0 ? void 0 : token.type) {
@@ -343,7 +343,7 @@ class Parser {
                     !last.sep &&
                     !last.value &&
                     last.start.length > 0 &&
-                    findNonEmptyIndex(last.start) === -1 &&
+                    !includesNonEmpty(last.start) &&
                     (token.indent === 0 ||
                         last.start.every(st => st.type !== 'comment' || st.indent < token.indent))) {
                     if (top.type === 'document')
@@ -391,7 +391,7 @@ class Parser {
             return yield* this.lineEnd(doc);
         switch (this.type) {
             case 'doc-start': {
-                if (findNonEmptyIndex(doc.start) !== -1) {
+                if (includesNonEmpty(doc.start)) {
                     yield* this.pop();
                     yield* this.step();
                 }
@@ -485,21 +485,17 @@ 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];
@@ -516,7 +512,9 @@ class Parser {
                 return;
         }
         if (this.indent >= map.indent) {
-            const atNextItem = !this.onKeyLine && this.indent === map.indent && it.sep;
+            const atNextItem = !this.onKeyLine &&
+                this.indent === map.indent &&
+                (it.sep || includesNonEmpty(it.start));
             // For empty nodes, assign newline-separated not indented empty tokens to following node
             let start = [];
             if (atNextItem && it.sep && !it.value) {

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

@@ -42,13 +42,12 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError) {
                 }
                 continue;
             }
-            if (keyProps.hasNewlineAfterProp || utilContainsNewline.containsNewline(key)) {
-                onError(key !== null && key !== void 0 ? key : start[start.length - 1], 'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
-            }
         }
-        else if (((_a = keyProps.found) === null || _a === void 0 ? void 0 : _a.indent) !== bm.indent) {
+        else if (((_a = keyProps.found) === null || _a === void 0 ? void 0 : _a.indent) !== bm.indent)
             onError(offset, 'BAD_INDENT', startColMsg);
-        }
+        if (implicitKey && utilContainsNewline.containsNewline(key))
+            onError(key, // checked by containsNewline()
+            'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
         // key value
         const keyStart = keyProps.end;
         const keyNode = key

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

@@ -14,7 +14,6 @@ export declare function resolveProps(tokens: SourceToken[], { flow, indicator, n
     spaceBefore: boolean;
     comment: string;
     hasNewline: boolean;
-    hasNewlineAfterProp: boolean;
     anchor: SourceToken | null;
     tag: SourceToken | null;
     end: number;

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

@@ -7,7 +7,6 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, startOnN
     let comment = '';
     let commentSep = '';
     let hasNewline = false;
-    let hasNewlineAfterProp = false;
     let reqSpace = false;
     let anchor = null;
     let tag = null;
@@ -57,8 +56,6 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, startOnN
                     commentSep += token.source;
                 atNewline = true;
                 hasNewline = true;
-                if (anchor || tag)
-                    hasNewlineAfterProp = true;
                 hasSpace = true;
                 break;
             case 'anchor':
@@ -125,7 +122,6 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, startOnN
         spaceBefore,
         comment,
         hasNewline,
-        hasNewlineAfterProp,
         anchor,
         tag,
         end,

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

@@ -9,7 +9,7 @@ function includesToken(list, type) {
             return true;
     return false;
 }
-function findNonEmptyIndex(list) {
+function includesNonEmpty(list) {
     for (let i = 0; i < list.length; ++i) {
         switch (list[i].type) {
             case 'space':
@@ -17,10 +17,10 @@ function findNonEmptyIndex(list) {
             case 'newline':
                 break;
             default:
-                return i;
+                return true;
         }
     }
-    return -1;
+    return false;
 }
 function isFlowToken(token) {
     switch (token === null || token === void 0 ? void 0 : token.type) {
@@ -347,7 +347,7 @@ class Parser {
                     !last.sep &&
                     !last.value &&
                     last.start.length > 0 &&
-                    findNonEmptyIndex(last.start) === -1 &&
+                    !includesNonEmpty(last.start) &&
                     (token.indent === 0 ||
                         last.start.every(st => st.type !== 'comment' || st.indent < token.indent))) {
                     if (top.type === 'document')
@@ -395,7 +395,7 @@ class Parser {
             return yield* this.lineEnd(doc);
         switch (this.type) {
             case 'doc-start': {
-                if (findNonEmptyIndex(doc.start) !== -1) {
+                if (includesNonEmpty(doc.start)) {
                     yield* this.pop();
                     yield* this.step();
                 }
@@ -489,21 +489,17 @@ 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];
@@ -520,7 +516,9 @@ class Parser {
                 return;
         }
         if (this.indent >= map.indent) {
-            const atNextItem = !this.onKeyLine && this.indent === map.indent && it.sep;
+            const atNextItem = !this.onKeyLine &&
+                this.indent === map.indent &&
+                (it.sep || includesNonEmpty(it.start));
             // For empty nodes, assign newline-separated not indented empty tokens to following node
             let start = [];
             if (atNextItem && it.sep && !it.value) {

package/node_modules/yaml/package.json

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

package/package.json

@@ -92,7 +92,7 @@
     "semver": "^7.3.7",
     "shx": "^0.3.4",
     "xmlbuilder2": "^2.4.1",
-    "yaml": "^2.0.1",
+    "yaml": "2.0.0",
     "yargs": "^16.2.0"
   },
   "bundledDependencies": [
@@ -122,7 +122,7 @@
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
-  "version": "0.56.9",
+  "version": "0.56.12",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",
@@ -187,5 +187,8 @@
       "rootDir": "src"
     }
   },
+  "resolutions": {
+    "@types/prettier": "2.6.0"
+  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }

package/releasetag.txt

@@ -1 +1 @@
-v0.56.9
+v0.56.12

package/version.txt

@@ -1 +1 @@
-0.56.9
+0.56.12