From b21d71a6274ee58a08d52edbd09308ecfc9a67f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 16:48:57 +0000 Subject: [PATCH 1/2] Bump simple-git from 3.28.0 to 3.29.0 Bumps [simple-git](https://github.com/steveukx/git-js/tree/HEAD/simple-git) from 3.28.0 to 3.29.0. - [Release notes](https://github.com/steveukx/git-js/releases) - [Changelog](https://github.com/steveukx/git-js/blob/main/simple-git/CHANGELOG.md) - [Commits](https://github.com/steveukx/git-js/commits/HEAD/simple-git) --- updated-dependencies: - dependency-name: simple-git dependency-version: 3.29.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1841485..3c88a28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@actions/artifact": "^4.0.0", "@actions/core": "^1.11.1", "node-html-parser": "^7.0.1", - "simple-git": "^3.28.0", + "simple-git": "^3.30.0", "turndown": "^7.2.2", "turndown-plugin-gfm": "^1.0.2" }, @@ -10314,9 +10314,9 @@ } }, "node_modules/simple-git": { - "version": "3.28.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.28.0.tgz", - "integrity": "sha512-Rs/vQRwsn1ILH1oBUy8NucJlXmnnLeLCfcvbSehkPzbv3wwoFWIdtfd6Ndo6ZPhlPsCZ60CPI4rxurnwAa+a2w==", + "version": "3.30.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.30.0.tgz", + "integrity": "sha512-q6lxyDsCmEal/MEGhP1aVyQ3oxnagGlBDOVSIB4XUVLl1iZh0Pah6ebC9V4xBap/RfgP2WlI8EKs0WS0rMEJHg==", "license": "MIT", "dependencies": { "@kwsites/file-exists": "^1.1.1", diff --git a/package.json b/package.json index 49ec2e1..306124f 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@actions/artifact": "^4.0.0", "@actions/core": "^1.11.1", "node-html-parser": "^7.0.1", - "simple-git": "^3.28.0", + "simple-git": "^3.30.0", "turndown": "^7.2.2", "turndown-plugin-gfm": "^1.0.2" }, From 798e55cd367313ec9f1af6048ecd1ff99f49980e Mon Sep 17 00:00:00 2001 From: AnHeuermann <38031952+AnHeuermann@users.noreply.github.com> Date: Wed, 12 Nov 2025 17:52:23 +0100 Subject: [PATCH 2/2] Updating dist --- dist/index.js | 113 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/dist/index.js b/dist/index.js index df92966..602e4a5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -71932,7 +71932,7 @@ function last(input, offset = 0) { } } function isArrayLike(input) { - return !!(input && typeof input.length === "number"); + return filterHasLength(input); } function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") { return input.split(separator).reduce((output, line) => { @@ -71985,14 +71985,16 @@ function asCamelCase(str) { }); } function asStringArray(source) { - return asArray(source).map(String); + return asArray(source).map((item) => { + return item instanceof String ? item : String(item); + }); } function asNumber(source, onNaN = 0) { if (source == null) { return onNaN; } const num = parseInt(source, 10); - return isNaN(num) ? onNaN : num; + return Number.isNaN(num) ? onNaN : num; } function prefixedArray(input, prefix) { const output = []; @@ -72005,10 +72007,13 @@ function bufferToString(input) { return (Array.isArray(input) ? import_node_buffer.Buffer.concat(input) : input).toString("utf-8"); } function pick(source, properties) { - return Object.assign( - {}, - ...properties.map((property) => property in source ? { [property]: source[property] } : {}) - ); + const out = {}; + properties.forEach((key) => { + if (source[key] !== void 0) { + out[key] = source[key]; + } + }); + return out; } function delay(duration = 0) { return new Promise((done) => setTimeout(done, duration)); @@ -72025,6 +72030,7 @@ var init_util = __esm({ "use strict"; import_node_buffer = __nccwpck_require__(4573); import_file_exists = __nccwpck_require__(47117); + init_argument_filters(); NULL = "\0"; NOOP = () => { }; @@ -72049,21 +72055,21 @@ function filterPlainObject(input) { function filterFunction(input) { return typeof input === "function"; } -var filterArray, filterString, filterStringArray, filterStringOrStringArray, filterHasLength; +var filterArray, filterNumber, filterString, filterStringOrStringArray, filterHasLength; var init_argument_filters = __esm({ "src/lib/utils/argument-filters.ts"() { "use strict"; - init_util(); init_pathspec(); + init_util(); filterArray = (input) => { return Array.isArray(input); }; + filterNumber = (input) => { + return typeof input === "number"; + }; filterString = (input) => { return typeof input === "string"; }; - filterStringArray = (input) => { - return Array.isArray(input) && input.every(filterString); - }; filterStringOrStringArray = (input) => { return filterString(input) || Array.isArray(input) && input.every(filterString); }; @@ -72071,7 +72077,7 @@ var init_argument_filters = __esm({ if (input == null || "number|boolean|function".includes(typeof input)) { return false; } - return Array.isArray(input) || typeof input === "string" || typeof input.length === "number"; + return typeof input.length === "number"; }; } }); @@ -72109,6 +72115,9 @@ var init_git_output_streams = __esm({ }); // src/lib/utils/line-parser.ts +function useMatchesDefault() { + throw new Error(`LineParser:useMatches not implemented`); +} var LineParser, RemoteLineParser; var init_line_parser = __esm({ "src/lib/utils/line-parser.ts"() { @@ -72116,6 +72125,7 @@ var init_line_parser = __esm({ LineParser = class { constructor(regExp, useMatches) { this.matches = []; + this.useMatches = useMatchesDefault; this.parse = (line, target) => { this.resetMatches(); if (!this._regExp.every((reg, index) => this.addMatch(reg, index, line(index)))) { @@ -72128,10 +72138,6 @@ var init_line_parser = __esm({ this.useMatches = useMatches; } } - // @ts-ignore - useMatches(target, match) { - throw new Error(`LineParser:useMatches not implemented`); - } resetMatches() { this.matches.length = 0; } @@ -72224,7 +72230,7 @@ function getTrailingOptions(args, initialPrimitive = 0, objectOnly = false) { } function trailingArrayArgument(args) { const hasTrailingCallback = typeof last(args) === "function"; - return filterType(last(args, hasTrailingCallback ? 1 : 0), filterArray, []); + return asStringArray(filterType(last(args, hasTrailingCallback ? 1 : 0), filterArray, [])); } function trailingOptionsArgument(args) { const hasTrailingCallback = filterFunction(last(args)); @@ -72291,10 +72297,10 @@ __export(utils_exports, { filterArray: () => filterArray, filterFunction: () => filterFunction, filterHasLength: () => filterHasLength, + filterNumber: () => filterNumber, filterPlainObject: () => filterPlainObject, filterPrimitives: () => filterPrimitives, filterString: () => filterString, - filterStringArray: () => filterStringArray, filterStringOrStringArray: () => filterStringOrStringArray, filterType: () => filterType, first: () => first, @@ -72658,7 +72664,7 @@ var init_ConfigList = __esm({ } addValue(file, key, value) { const values = this.addFile(file); - if (!values.hasOwnProperty(key)) { + if (!Object.hasOwn(values, key)) { values[key] = value; } else if (Array.isArray(values[key])) { values[key].push(value); @@ -72673,7 +72679,7 @@ var init_ConfigList = __esm({ // src/lib/tasks/config.ts function asConfigScope(scope, fallback) { - if (typeof scope === "string" && GitConfigScope.hasOwnProperty(scope)) { + if (typeof scope === "string" && Object.hasOwn(GitConfigScope, scope)) { return scope; } return fallback; @@ -72892,12 +72898,13 @@ function getResetMode(mode) { return; } function isValidResetMode(mode) { - return ResetModes.includes(mode); + return typeof mode === "string" && validResetModes.includes(mode); } -var ResetMode, ResetModes; +var ResetMode, validResetModes; var init_reset = __esm({ "src/lib/tasks/reset.ts"() { "use strict"; + init_utils(); init_task(); ResetMode = /* @__PURE__ */ ((ResetMode2) => { ResetMode2["MIXED"] = "mixed"; @@ -72907,7 +72914,7 @@ var init_reset = __esm({ ResetMode2["KEEP"] = "keep"; return ResetMode2; })(ResetMode || {}); - ResetModes = Array.from(Object.values(ResetMode)); + validResetModes = asStringArray(Object.values(ResetMode)); } }); @@ -73950,7 +73957,7 @@ var init_count_objects = __esm({ /([a-z-]+): (\d+)$/, (result, [key, value]) => { const property = asCamelCase(key); - if (result.hasOwnProperty(property)) { + if (Object.hasOwn(result, property)) { result[property] = asNumber(value); } } @@ -74042,7 +74049,10 @@ function commit_default() { const task = rejectDeprecatedSignatures(message) || commitTask( asArray(message), asArray(filterType(rest[0], filterStringOrStringArray, [])), - [...filterType(rest[1], filterArray, []), ...getTrailingOptions(arguments, 0, true)] + [ + ...asStringArray(filterType(rest[1], filterArray, [])), + ...getTrailingOptions(arguments, 0, true) + ] ); return this._runTask(task, next); } @@ -74468,7 +74478,7 @@ function log_default() { const next = trailingFunctionArgument(arguments); const options = parseLogOptions( trailingOptionsArgument(arguments), - filterType(arguments[0], filterArray) + asStringArray(filterType(arguments[0], filterArray, [])) ); const task = rejectDeprecatedSignatures(...rest) || validateLogFormatConfig(options.commands) || createLogTask(options); return this._runTask(task, next); @@ -75113,18 +75123,19 @@ var init_StatusSummary = __esm({ const behindReg = /behind (\d+)/; const currentReg = /^(.+?(?=(?:\.{3}|\s|$)))/; const trackingReg = /\.{3}(\S*)/; - const onEmptyBranchReg = /\son\s([\S]+)$/; - let regexResult; - regexResult = aheadReg.exec(line); + const onEmptyBranchReg = /\son\s(\S+?)(?=\.{3}|$)/; + let regexResult = aheadReg.exec(line); result.ahead = regexResult && +regexResult[1] || 0; regexResult = behindReg.exec(line); result.behind = regexResult && +regexResult[1] || 0; regexResult = currentReg.exec(line); - result.current = regexResult && regexResult[1]; + result.current = filterType(regexResult?.[1], filterString, null); regexResult = trackingReg.exec(line); - result.tracking = regexResult && regexResult[1]; + result.tracking = filterType(regexResult?.[1], filterString, null); regexResult = onEmptyBranchReg.exec(line); - result.current = regexResult && regexResult[1] || result.current; + if (regexResult) { + result.current = filterType(regexResult?.[1], filterString, result.current); + } result.detached = /\(no branch\)/.test(line); } ] @@ -75559,10 +75570,14 @@ var init_BranchSummary = __esm({ function branchStatus(input) { return input ? input.charAt(0) : ""; } -function parseBranchSummary(stdOut) { - return parseStringResponse(new BranchSummaryResult(), parsers9, stdOut); +function parseBranchSummary(stdOut, currentOnly = false) { + return parseStringResponse( + new BranchSummaryResult(), + currentOnly ? [currentBranchParser] : parsers9, + stdOut + ); } -var parsers9; +var parsers9, currentBranchParser; var init_parse_branch = __esm({ "src/lib/parsers/parse-branch.ts"() { "use strict"; @@ -75582,6 +75597,9 @@ var init_parse_branch = __esm({ } ) ]; + currentBranchParser = new LineParser(/^(\S+)$/s, (result, [name]) => { + result.push("*" /* CURRENT */, false, name, "", ""); + }); } }); @@ -75600,6 +75618,7 @@ function containsDeleteBranchCommand(commands) { } function branchTask(customArgs) { const isDelete = containsDeleteBranchCommand(customArgs); + const isCurrentOnly = customArgs.includes("--show-current"); const commands = ["branch", ...customArgs]; if (commands.length === 1) { commands.push("-a"); @@ -75614,16 +75633,17 @@ function branchTask(customArgs) { if (isDelete) { return parseBranchDeletions(stdOut, stdErr).all[0]; } - return parseBranchSummary(stdOut); + return parseBranchSummary(stdOut, isCurrentOnly); } }; } function branchLocalTask() { - const parser4 = parseBranchSummary; return { format: "utf-8", commands: ["branch", "-v"], - parser: parser4 + parser(stdOut) { + return parseBranchSummary(stdOut); + } }; } function deleteBranchesTask(branches, forceDelete = false) { @@ -75671,12 +75691,17 @@ var init_branch = __esm({ }); // src/lib/responses/CheckIgnore.ts -var parseCheckIgnore; +function toPath(input) { + const path = input.trim().replace(/^["']|["']$/g, ""); + return path && (0, import_node_path.normalize)(path); +} +var import_node_path, parseCheckIgnore; var init_CheckIgnore = __esm({ "src/lib/responses/CheckIgnore.ts"() { "use strict"; + import_node_path = __nccwpck_require__(76760); parseCheckIgnore = (text) => { - return text.split(/\n/g).map((line) => line.trim()).filter((file) => !!file); + return text.split(/\n/g).map(toPath).filter(Boolean); }; } }); @@ -75898,7 +75923,7 @@ function parseGetRemotes(text) { function parseGetRemotesVerbose(text) { const remotes = {}; forEach(text, ([name, url, purpose]) => { - if (!remotes.hasOwnProperty(name)) { + if (!Object.hasOwn(remotes, name)) { remotes[name] = { name, refs: { fetch: "", push: "" } @@ -76030,8 +76055,8 @@ var init_sub_module = __esm({ // src/lib/responses/TagList.ts function singleSorted(a, b) { - const aIsNum = isNaN(a); - const bIsNum = isNaN(b); + const aIsNum = Number.isNaN(a); + const bIsNum = Number.isNaN(b); if (aIsNum !== bIsNum) { return aIsNum ? 1 : -1; }