diff --git a/.node-version b/.node-version index 3516580..d4b7699 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.17.0 +20.18.1 diff --git a/dist/index.js b/dist/index.js index f62d071..f366622 100644 --- a/dist/index.js +++ b/dist/index.js @@ -5072,7 +5072,7 @@ var external_child_process_ = __nccwpck_require__(81); var promise_deferred_dist = __nccwpck_require__(156); ;// CONCATENATED MODULE: external "node:events" const external_node_events_namespaceObject = require("node:events"); -;// CONCATENATED MODULE: ./node_modules/.pnpm/simple-git@3.25.0/node_modules/simple-git/dist/esm/index.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/simple-git@3.27.0/node_modules/simple-git/dist/esm/index.js var __defProp = Object.defineProperty; var __defProps = Object.defineProperties; var __getOwnPropDesc = Object.getOwnPropertyDescriptor; @@ -7057,15 +7057,17 @@ var init_parse_diff_summary = __esm({ nameStatusParser = [ new LineParser( /([ACDMRTUXB])([0-9]{0,3})\t(.[^\t]*)(\t(.[^\t]*))?$/, - (result, [status, _similarity, from, _to, to]) => { + (result, [status, similarity, from, _to, to]) => { result.changed++; result.files.push({ file: to != null ? to : from, changes: 0, - status: orVoid(isDiffNameStatus(status) && status), insertions: 0, deletions: 0, - binary: false + binary: false, + status: orVoid(isDiffNameStatus(status) && status), + from: orVoid(!!to && from !== to && from), + similarity: asNumber(similarity) }); } ) @@ -7094,15 +7096,12 @@ function createListLogSummaryParser(splitter = SPLITTER, fields = defaultFieldNa const parseDiffResult = getDiffParser(logFormat); return function(stdOut) { const all = toLinesWithContent( - stdOut, - true, + stdOut.trim(), + false, START_BOUNDARY ).map(function(item) { - const lineDetail = item.trim().split(COMMIT_BOUNDARY); - const listLogLine = lineBuilder( - lineDetail[0].trim().split(splitter), - fields - ); + const lineDetail = item.split(COMMIT_BOUNDARY); + const listLogLine = lineBuilder(lineDetail[0].split(splitter), fields); if (lineDetail.length > 1 && !!lineDetail[1].trim()) { listLogLine.diff = parseDiffResult(lineDetail[1]); } @@ -7724,16 +7723,16 @@ var fromPathRegex, FileStatusSummary; var init_FileStatusSummary = __esm({ "src/lib/responses/FileStatusSummary.ts"() { "use strict"; - fromPathRegex = /^(.+) -> (.+)$/; + fromPathRegex = /^(.+)\0(.+)$/; FileStatusSummary = class { constructor(path, index, working_dir) { this.path = path; this.index = index; this.working_dir = working_dir; - if ("R" === index + working_dir) { + if (index === "R" || working_dir === "R") { const detail = fromPathRegex.exec(path) || [null, path, path]; - this.from = detail[1] || ""; - this.path = detail[2] || ""; + this.from = detail[2] || ""; + this.path = detail[1] || ""; } } }; @@ -7771,7 +7770,7 @@ function splitLine(result, lineStr) { handler(result, path); } if (raw !== "##" && raw !== "!!") { - result.files.push(new FileStatusSummary(path.replace(/\0.+$/, ""), index, workingDir)); + result.files.push(new FileStatusSummary(path, index, workingDir)); } } } diff --git a/package.json b/package.json index f589d52..fce08d7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dependencies": { "@actions/core": "1.11.1", "extract-pr-titles": "1.1.0", - "simple-git": "3.25.0" + "simple-git": "3.27.0" }, "devDependencies": { "@eslint/js": "^9.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8c1868e..7d625f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: 1.1.0 version: 1.1.0 simple-git: - specifier: 3.25.0 - version: 3.25.0 + specifier: 3.27.0 + version: 3.27.0 devDependencies: '@eslint/js': specifier: ^9.0.0 @@ -399,8 +399,8 @@ packages: simple-git@1.132.0: resolution: {integrity: sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg==} - simple-git@3.25.0: - resolution: {integrity: sha512-KIY5sBnzc4yEcJXW7Tdv4viEz8KyG+nU0hay+DWZasvdFOYKeUZ6Xc25LUHHjw0tinPT7O1eY6pzX7pRT1K8rw==} + simple-git@3.27.0: + resolution: {integrity: sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==} strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} @@ -788,7 +788,7 @@ snapshots: transitivePeerDependencies: - supports-color - simple-git@3.25.0: + simple-git@3.27.0: dependencies: '@kwsites/file-exists': 1.1.1 '@kwsites/promise-deferred': 1.1.1