chore(deps): Bump yaml from 2.3.4 to 2.4.2 (#727)

Bumps [yaml](https://github.com/eemeli/yaml) from 2.3.4 to 2.4.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/eemeli/yaml/releases">yaml's releases</a>.</em></p> <blockquote> <h2>v2.4.2</h2> <ul> <li>Restrict YAML 1.1 boolean strings to their explicit capitalization (<a href="https://github.com/eemeli/yaml/issues/530">#530</a>)</li> <li>Add sponsorship by <a href="https://www.scipress.io/">Scipress</a> (<a href="https://github.com/eemeli/yaml/issues/536">#536</a>)</li> </ul> <h2>v2.4.1</h2> <ul> <li>cst: Do not drop trailing newline after line comment in block-map if followed by unindented block-seq value (<a href="https://github.com/eemeli/yaml/issues/525">#525</a>)</li> <li>Stringify flow collection comments in parent (<a href="https://github.com/eemeli/yaml/issues/528">#528</a>)</li> <li>Do not skip folding lines after the first in indented block scalars (<a href="https://github.com/eemeli/yaml/issues/529">#529</a>)</li> </ul> <h2>v2.4.0</h2> <ul> <li>Add a command-line tool (<a href="https://github.com/eemeli/yaml/issues/523">#523</a>)</li> <li>Use the <code>lineWidth</code> option for line breaking in flow collections (<a href="https://github.com/eemeli/yaml/issues/522">#522</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/eemeli/yaml/commit/f792d1b72fb98792a66ca2dcf5b606448e762b16"><code>f792d1b</code></a> 2.4.2</li> <li><a href="https://github.com/eemeli/yaml/commit/de120d69ab908946843749ebb0cecb0522a0b671"><code>de120d6</code></a> docs: Move sponsor section up</li> <li><a href="https://github.com/eemeli/yaml/commit/5410c25083f4105d9911aa77449c7aa41e4a7fec"><code>5410c25</code></a> ci: Drop tests in EOL Node.js versions</li> <li><a href="https://github.com/eemeli/yaml/commit/30868a8135175aef7e18880fc8fde077af947344"><code>30868a8</code></a> chore: Add sponsorship by Scipress (<a href="https://github.com/eemeli/yaml/issues/536">#536</a>)</li> <li><a href="https://github.com/eemeli/yaml/commit/1c6fd6a76a92ce8dda28a66b2af6f3e6a3182958"><code>1c6fd6a</code></a> fix: Restrict YAML 1.1 boolean strings to their explicit capitalization (<a href="https://github.com/eemeli/yaml/issues/530">#530</a>)</li> <li><a href="https://github.com/eemeli/yaml/commit/4aa56d337dc5e286eb0c9111a3b370f21e321117"><code>4aa56d3</code></a> 2.4.1</li> <li><a href="https://github.com/eemeli/yaml/commit/e651ce1457e10145b87bd69a11c67e241540c022"><code>e651ce1</code></a> chore: Refresh lockfile</li> <li><a href="https://github.com/eemeli/yaml/commit/1775f1341f9d0676142f95c708fc88531d2dbe12"><code>1775f13</code></a> test: Drop unused import to satisfy TS</li> <li><a href="https://github.com/eemeli/yaml/commit/40903db981917ba5be113e170af00c8bfd85be92"><code>40903db</code></a> fix(cst): Do not drop trailing newline after line comment in block-map if fol...</li> <li><a href="https://github.com/eemeli/yaml/commit/46a816ecc1ab1767a8a2df26d930bee23c81b3f5"><code>46a816e</code></a> fix: Do not skip folding lines after the first in indented block scalars (fix...</li> <li>Additional commits viewable in <a href="https://github.com/eemeli/yaml/compare/v2.3.4...v2.4.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=yaml&package-manager=npm_and_yarn&previous-version=2.3.4&new-version=2.4.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Ian Lewis <ianmlewis@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ian Lewis <ianmlewis@gmail.com>
ianlewis · May 15, 2024 · 1115bc0 · 1115bc0
1 parent 7a35423
commit 1115bc0
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 46 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -36650,19 +36650,19 @@ function foldNewline(source, offset) {
     return { fold, offset };
 }
 const escapeCodes = {
-    '0': '\0',
-    a: '\x07',
-    b: '\b',
-    e: '\x1b',
-    f: '\f',
-    n: '\n',
-    r: '\r',
-    t: '\t',
-    v: '\v',
-    N: '\u0085',
-    _: '\u00a0',
-    L: '\u2028',
-    P: '\u2029',
+    '0': '\0', // null character
+    a: '\x07', // bell character
+    b: '\b', // backspace
+    e: '\x1b', // escape character
+    f: '\f', // form feed
+    n: '\n', // line feed
+    r: '\r', // carriage return
+    t: '\t', // horizontal tab
+    v: '\v', // vertical tab
+    N: '\u0085', // Unicode next line
+    _: '\u00a0', // Unicode non-breaking space
+    L: '\u2028', // Unicode line separator
+    P: '\u2029', // Unicode paragraph separator
     ' ': ' ',
     '"': '"',
     '/': '/',
@@ -40604,7 +40604,10 @@ 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 &&
+                this.type !== 'seq-item-ind';
             // For empty nodes, assign newline-separated not indented empty tokens to following node
             let start = [];
             if (atNextItem && it.sep && !it.value) {
@@ -41649,7 +41652,7 @@ var Scalar = __nccwpck_require__(9338);
 var stringifyString = __nccwpck_require__(6226);
 
 const binary = {
-    identify: value => value instanceof Uint8Array,
+    identify: value => value instanceof Uint8Array, // Buffer inherits from Uint8Array
     default: false,
     tag: 'tag:yaml.org,2002:binary',
     /**
@@ -41741,7 +41744,7 @@ const falseTag = {
     identify: value => value === false,
     default: true,
     tag: 'tag:yaml.org,2002:bool',
-    test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/i,
+    test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/,
     resolve: () => new Scalar.Scalar(false),
     stringify: boolStringify
 };
@@ -42369,7 +42372,7 @@ function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth =
     let escStart = -1;
     let escEnd = -1;
     if (mode === FOLD_BLOCK) {
-        i = consumeMoreIndentedLines(text, i);
+        i = consumeMoreIndentedLines(text, i, indent.length);
         if (i !== -1)
             end = i + endStep;
     }
@@ -42393,8 +42396,8 @@ function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth =
         }
         if (ch === '\n') {
             if (mode === FOLD_BLOCK)
-                i = consumeMoreIndentedLines(text, i);
-            end = i + endStep;
+                i = consumeMoreIndentedLines(text, i, indent.length);
+            end = i + indent.length + endStep;
             split = undefined;
         }
         else {
@@ -42462,15 +42465,24 @@ function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth =
  * Presumes `i + 1` is at the start of a line
  * @returns index of last newline in more-indented block
  */
-function consumeMoreIndentedLines(text, i) {
-    let ch = text[i + 1];
+function consumeMoreIndentedLines(text, i, indent) {
+    let end = i;
+    let start = i + 1;
+    let ch = text[start];
     while (ch === ' ' || ch === '\t') {
-        do {
-            ch = text[(i += 1)];
-        } while (ch && ch !== '\n');
-        ch = text[i + 1];
+        if (i < start + indent) {
+            ch = text[++i];
+        }
+        else {
+            do {
+                ch = text[++i];
+            } while (ch && ch !== '\n');
+            end = i;
+            start = i + 1;
+            ch = text[start];
+        }
     }
-    return i;
+    return end;
 }
 
 exports.FOLD_BLOCK = FOLD_BLOCK;
@@ -42622,7 +42634,6 @@ exports.stringify = stringify;
 "use strict";
 
 
-var Collection = __nccwpck_require__(3466);
 var identity = __nccwpck_require__(5589);
 var stringify = __nccwpck_require__(8409);
 var stringifyComment = __nccwpck_require__(5182);
@@ -42683,7 +42694,7 @@ function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, fl
         onChompKeep();
     return str;
 }
-function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
+function stringifyFlowCollection({ items }, ctx, { flowChars, itemIndent }) {
     const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
     itemIndent += indentStep;
     const itemCtx = Object.assign({}, ctx, {
@@ -42736,32 +42747,25 @@ function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemInden
         lines.push(str);
         linesAtValue = lines.length;
     }
-    let str;
     const { start, end } = flowChars;
     if (lines.length === 0) {
-        str = start + end;
+        return start + end;
     }
     else {
         if (!reqNewline) {
             const len = lines.reduce((sum, line) => sum + line.length + 2, 2);
-            reqNewline = len > Collection.Collection.maxFlowStringSingleLineLength;
+            reqNewline = ctx.options.lineWidth > 0 && len > ctx.options.lineWidth;
         }
         if (reqNewline) {
-            str = start;
+            let str = start;
             for (const line of lines)
                 str += line ? `\n${indentStep}${indent}${line}` : '\n';
-            str += `\n${indent}${end}`;
+            return `${str}\n${indent}${end}`;
         }
         else {
-            str = `${start}${fcPadding}${lines.join(' ')}${fcPadding}${end}`;
+            return `${start}${fcPadding}${lines.join(' ')}${fcPadding}${end}`;
         }
     }
-    if (comment) {
-        str += stringifyComment.lineComment(str, indent, commentString(comment));
-        if (onComment)
-            onComment();
-    }
-    return str;
 }
 function addCommentBefore({ indent, options: { commentString } }, lines, comment, chompKeep) {
     if (comment && chompKeep)

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "@actions/exec": "^1.1.1",
     "@actions/github": "^6.0.0",
     "@actions/tool-cache": "^2.0.1",
-    "yaml": "^2.3.2"
+    "yaml": "^2.4.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",