From fe0376ed1f08e19edee56b6f1dc6fc3cf2eb6b9f Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 11:19:30 +0100 Subject: [PATCH 01/12] Add `getGroupedSarifFilePaths` with tests --- lib/analyze-action.js | 4 +- lib/init-action-post.js | 4 +- lib/upload-lib.js | 80 ++++++++++++++++++++++++++++----- lib/upload-sarif-action.js | 4 +- src/analyses.ts | 6 +++ src/upload-lib.test.ts | 92 +++++++++++++++++++++++++++++++++----- src/upload-lib.ts | 62 +++++++++++++++++++++++++ 7 files changed, 225 insertions(+), 27 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 38336e09ed..9cee6b6c7a 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -28149,11 +28149,11 @@ var require_out = __commonJS({ async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path20, optionsOrSettings) { + function statSync4(path20, optionsOrSettings) { const settings = getSettings(optionsOrSettings); return sync.read(path20, settings); } - exports2.statSync = statSync3; + exports2.statSync = statSync4; function getSettings(settingsOrOptions = {}) { if (settingsOrOptions instanceof settings_1.default) { return settingsOrOptions; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index d56b9982a9..bc8c22d10f 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -28149,11 +28149,11 @@ var require_out = __commonJS({ async.read(path19, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync2(path19, optionsOrSettings) { + function statSync3(path19, optionsOrSettings) { const settings = getSettings(optionsOrSettings); return sync.read(path19, settings); } - exports2.statSync = statSync2; + exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { if (settingsOrOptions instanceof settings_1.default) { return settingsOrOptions; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 27ad934088..148eb55eb2 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -29446,11 +29446,11 @@ var require_out = __commonJS({ async.read(path15, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync2(path15, optionsOrSettings) { + function statSync3(path15, optionsOrSettings) { const settings = getSettings(optionsOrSettings); return sync.read(path15, settings); } - exports2.statSync = statSync2; + exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { if (settingsOrOptions instanceof settings_1.default) { return settingsOrOptions; @@ -84821,6 +84821,7 @@ __export(upload_lib_exports, { InvalidSarifUploadError: () => InvalidSarifUploadError, buildPayload: () => buildPayload, findSarifFilesInDir: () => findSarifFilesInDir, + getGroupedSarifFilePaths: () => getGroupedSarifFilePaths, getSarifFilePaths: () => getSarifFilePaths, populateRunAutomationDetails: () => populateRunAutomationDetails, readSarifFile: () => readSarifFile, @@ -88530,6 +88531,31 @@ async function runTool(cmd, args = [], opts = {}) { return stdout; } +// src/analyses.ts +var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { + AnalysisKind2["CodeScanning"] = "code-scanning"; + AnalysisKind2["CodeQuality"] = "code-quality"; + return AnalysisKind2; +})(AnalysisKind || {}); +var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); +var CodeScanning = { + kind: "code-scanning" /* CodeScanning */, + name: "code scanning", + target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, + sarifExtension: ".sarif", + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + sentinelPrefix: "CODEQL_UPLOAD_SARIF_" +}; +var CodeQuality = { + kind: "code-quality" /* CodeQuality */, + name: "code quality", + target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, + sarifExtension: ".quality.sarif", + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" +}; +var SarifScanOrder = [CodeQuality, CodeScanning]; + // src/api-client.ts var core5 = __toESM(require_core()); var githubUtils = __toESM(require_utils4()); @@ -88921,14 +88947,6 @@ function wrapCliConfigurationError(cliError) { var fs7 = __toESM(require("fs")); var path9 = __toESM(require("path")); -// src/analyses.ts -var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { - AnalysisKind2["CodeScanning"] = "code-scanning"; - AnalysisKind2["CodeQuality"] = "code-quality"; - return AnalysisKind2; -})(AnalysisKind || {}); -var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); - // src/caching-utils.ts var core6 = __toESM(require_core()); @@ -92391,6 +92409,47 @@ function getSarifFilePaths(sarifPath, isSarif) { } return sarifFiles; } +async function getGroupedSarifFilePaths(logger, sarifPath) { + const stats = fs13.statSync(sarifPath, { throwIfNoEntry: false }); + if (stats === void 0) { + throw new ConfigurationError(`Path does not exist: ${sarifPath}`); + } + const results = {}; + if (stats.isDirectory()) { + let sarifFiles = findSarifFilesInDir( + sarifPath, + (name) => name.endsWith(".sarif") + ); + logger.debug( + `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` + ); + for (const analysisConfig of SarifScanOrder) { + const files = sarifFiles.filter(analysisConfig.sarifPredicate); + if (files.length > 0) { + logger.debug( + `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}` + ); + sarifFiles = sarifFiles.filter( + (name) => !analysisConfig.sarifPredicate(name) + ); + results[analysisConfig.kind] = files; + } else { + logger.debug(`Found no SARIF files for ${analysisConfig.name}`); + } + } + } else { + for (const analysisConfig of SarifScanOrder) { + if (analysisConfig.kind === "code-scanning" /* CodeScanning */ || analysisConfig.sarifPredicate(sarifPath)) { + logger.debug( + `Using '${sarifPath}' as a SARIF file for ${analysisConfig.name}.` + ); + results[analysisConfig.kind] = [sarifPath]; + break; + } + } + } + return results; +} function countResultsInSarif(sarif) { let numResults = 0; const parsedSarif = JSON.parse(sarif); @@ -92750,6 +92809,7 @@ function filterAlertsByDiffRange(logger, sarif) { InvalidSarifUploadError, buildPayload, findSarifFilesInDir, + getGroupedSarifFilePaths, getSarifFilePaths, populateRunAutomationDetails, readSarifFile, diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 317e6290bc..9e46c71e79 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -28149,11 +28149,11 @@ var require_out = __commonJS({ async.read(path16, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync2(path16, optionsOrSettings) { + function statSync3(path16, optionsOrSettings) { const settings = getSettings(optionsOrSettings); return sync.read(path16, settings); } - exports2.statSync = statSync2; + exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { if (settingsOrOptions instanceof settings_1.default) { return settingsOrOptions; diff --git a/src/analyses.ts b/src/analyses.ts index 8d8cd1d616..53f17a70a8 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -86,3 +86,9 @@ export const CodeQuality: AnalysisConfig = { sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_", }; + +// Since we have overlapping extensions (i.e. ".sarif" includes ".quality.sarif"), +// we want to scan a folder containing SARIF files in an order that finds the more +// specific extensions first. This constant defines an array in the order of analyis +// configurations with more specific extensions to less specific extensions. +export const SarifScanOrder = [CodeQuality, CodeScanning]; diff --git a/src/upload-lib.test.ts b/src/upload-lib.test.ts index bfa5e9844c..a1fdf218e1 100644 --- a/src/upload-lib.test.ts +++ b/src/upload-lib.test.ts @@ -3,7 +3,7 @@ import * as path from "path"; import test from "ava"; -import { CodeQuality, CodeScanning } from "./analyses"; +import { AnalysisKind, CodeQuality, CodeScanning } from "./analyses"; import { getRunnerLogger, Logger } from "./logging"; import { setupTests } from "./testing-utils"; import * as uploadLib from "./upload-lib"; @@ -127,27 +127,97 @@ test("finding SARIF files", async (t) => { fs.writeFileSync(path.join(tmpDir, "a.quality.sarif"), ""); fs.writeFileSync(path.join(tmpDir, "dir1", "b.quality.sarif"), ""); + const expectedSarifFiles = [ + path.join(tmpDir, "a.sarif"), + path.join(tmpDir, "b.sarif"), + path.join(tmpDir, "dir1", "d.sarif"), + path.join(tmpDir, "dir1", "dir2", "e.sarif"), + ]; const sarifFiles = uploadLib.findSarifFilesInDir( tmpDir, CodeScanning.sarifPredicate, ); - t.deepEqual(sarifFiles, [ - path.join(tmpDir, "a.sarif"), - path.join(tmpDir, "b.sarif"), - path.join(tmpDir, "dir1", "d.sarif"), - path.join(tmpDir, "dir1", "dir2", "e.sarif"), - ]); + t.deepEqual(sarifFiles, expectedSarifFiles); + const expectedQualitySarifFiles = [ + path.join(tmpDir, "a.quality.sarif"), + path.join(tmpDir, "dir1", "b.quality.sarif"), + ]; const qualitySarifFiles = uploadLib.findSarifFilesInDir( tmpDir, CodeQuality.sarifPredicate, ); - t.deepEqual(qualitySarifFiles, [ - path.join(tmpDir, "a.quality.sarif"), - path.join(tmpDir, "dir1", "b.quality.sarif"), - ]); + t.deepEqual(qualitySarifFiles, expectedQualitySarifFiles); + + const groupedSarifFiles = await uploadLib.getGroupedSarifFilePaths( + getRunnerLogger(true), + tmpDir, + ); + + t.not(groupedSarifFiles, undefined); + t.not(groupedSarifFiles[AnalysisKind.CodeScanning], undefined); + t.not(groupedSarifFiles[AnalysisKind.CodeQuality], undefined); + t.deepEqual( + groupedSarifFiles[AnalysisKind.CodeScanning], + expectedSarifFiles, + ); + t.deepEqual( + groupedSarifFiles[AnalysisKind.CodeQuality], + expectedQualitySarifFiles, + ); + }); +}); + +test("getGroupedSarifFilePaths - Code Quality file", async (t) => { + await withTmpDir(async (tmpDir) => { + const sarifPath = path.join(tmpDir, "a.quality.sarif"); + fs.writeFileSync(sarifPath, ""); + + const groupedSarifFiles = await uploadLib.getGroupedSarifFilePaths( + getRunnerLogger(true), + sarifPath, + ); + + t.not(groupedSarifFiles, undefined); + t.is(groupedSarifFiles[AnalysisKind.CodeScanning], undefined); + t.not(groupedSarifFiles[AnalysisKind.CodeQuality], undefined); + t.deepEqual(groupedSarifFiles[AnalysisKind.CodeQuality], [sarifPath]); + }); +}); + +test("getGroupedSarifFilePaths - Code Scanning file", async (t) => { + await withTmpDir(async (tmpDir) => { + const sarifPath = path.join(tmpDir, "a.sarif"); + fs.writeFileSync(sarifPath, ""); + + const groupedSarifFiles = await uploadLib.getGroupedSarifFilePaths( + getRunnerLogger(true), + sarifPath, + ); + + t.not(groupedSarifFiles, undefined); + t.not(groupedSarifFiles[AnalysisKind.CodeScanning], undefined); + t.is(groupedSarifFiles[AnalysisKind.CodeQuality], undefined); + t.deepEqual(groupedSarifFiles[AnalysisKind.CodeScanning], [sarifPath]); + }); +}); + +test("getGroupedSarifFilePaths - Other file", async (t) => { + await withTmpDir(async (tmpDir) => { + const sarifPath = path.join(tmpDir, "a.json"); + fs.writeFileSync(sarifPath, ""); + + const groupedSarifFiles = await uploadLib.getGroupedSarifFilePaths( + getRunnerLogger(true), + sarifPath, + ); + + t.not(groupedSarifFiles, undefined); + t.not(groupedSarifFiles[AnalysisKind.CodeScanning], undefined); + t.is(groupedSarifFiles[AnalysisKind.CodeQuality], undefined); + t.deepEqual(groupedSarifFiles[AnalysisKind.CodeScanning], [sarifPath]); }); }); diff --git a/src/upload-lib.ts b/src/upload-lib.ts index 650e7a803a..f4b171e9ed 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -459,6 +459,68 @@ export function getSarifFilePaths( return sarifFiles; } +/** + * Finds SARIF files in `sarifPath`, and groups them by analysis kind, following `SarifScanOrder`. + * + * @param logger The logger to use. + * @param sarifPath The path of a file or directory to recursively scan for SARIF files. + * @returns The `.sarif` files found in `sarifPath`, grouped by analysis kind. + */ +export async function getGroupedSarifFilePaths( + logger: Logger, + sarifPath: string, +): Promise>> { + const stats = fs.statSync(sarifPath, { throwIfNoEntry: false }); + + if (stats === undefined) { + // This is always a configuration error, even for first-party runs. + throw new ConfigurationError(`Path does not exist: ${sarifPath}`); + } + + const results = {}; + + if (stats.isDirectory()) { + let sarifFiles = findSarifFilesInDir(sarifPath, (name) => + name.endsWith(".sarif"), + ); + logger.debug( + `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}`, + ); + + for (const analysisConfig of analyses.SarifScanOrder) { + const files = sarifFiles.filter(analysisConfig.sarifPredicate); + if (files.length > 0) { + logger.debug( + `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}`, + ); + // Looping through the array a second time is not efficient, but more readable. + // Change this to one loop for both calls to `filter` if this becomes a bottleneck. + sarifFiles = sarifFiles.filter( + (name) => !analysisConfig.sarifPredicate(name), + ); + results[analysisConfig.kind] = files; + } else { + logger.debug(`Found no SARIF files for ${analysisConfig.name}`); + } + } + } else { + for (const analysisConfig of analyses.SarifScanOrder) { + if ( + analysisConfig.kind === analyses.AnalysisKind.CodeScanning || + analysisConfig.sarifPredicate(sarifPath) + ) { + logger.debug( + `Using '${sarifPath}' as a SARIF file for ${analysisConfig.name}.`, + ); + results[analysisConfig.kind] = [sarifPath]; + break; + } + } + } + + return results; +} + // Counts the number of results in the given SARIF file function countResultsInSarif(sarif: string): number { let numResults = 0; From 13ae3d432806d8c6203882a815962b8302e96c54 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 11:39:25 +0100 Subject: [PATCH 02/12] Add and use `getAnalysisConfig` --- src/analyses.ts | 17 +++++++++++++++++ src/upload-sarif.test.ts | 14 ++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/analyses.ts b/src/analyses.ts index 53f17a70a8..ae370e643e 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -87,6 +87,23 @@ export const CodeQuality: AnalysisConfig = { sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_", }; +/** + * Gets the `AnalysisConfig` corresponding to `kind`. + * @param kind The analysis kind to get the `AnalysisConfig` for. + * @returns The `AnalysisConfig` corresponding to `kind`. + */ +export function getAnalysisConfig(kind: AnalysisKind): AnalysisConfig { + // Using a switch statement here accomplishes two things: + // 1. The type checker believes us that we have a case for every `AnalysisKind`. + // 2. If we ever add another member to `AnalysisKind`, the type checker will alert us that we have to add a case. + switch (kind) { + case AnalysisKind.CodeScanning: + return CodeScanning; + case AnalysisKind.CodeQuality: + return CodeQuality; + } +} + // Since we have overlapping extensions (i.e. ".sarif" includes ".quality.sarif"), // we want to scan a folder containing SARIF files in an order that finds the more // specific extensions first. This constant defines an array in the order of analyis diff --git a/src/upload-sarif.test.ts b/src/upload-sarif.test.ts index 44f8564352..b0a288ec5e 100644 --- a/src/upload-sarif.test.ts +++ b/src/upload-sarif.test.ts @@ -7,8 +7,8 @@ import * as sinon from "sinon"; import { AnalysisConfig, AnalysisKind, - CodeQuality, CodeScanning, + getAnalysisConfig, } from "./analyses"; import { getRunnerLogger } from "./logging"; import { createFeatures, setupTests } from "./testing-utils"; @@ -117,9 +117,7 @@ const uploadSarifMacro = test.macro({ sinon.match.any, features, logger, - analysisKind === AnalysisKind.CodeScanning - ? CodeScanning - : CodeQuality, + getAnalysisConfig(analysisKind), ) .resolves(expectedResult[analysisKind as AnalysisKind]?.uploadResult); } @@ -146,9 +144,7 @@ const uploadSarifMacro = test.macro({ sinon.match.any, features, logger, - analysisKind === AnalysisKind.CodeScanning - ? CodeScanning - : CodeQuality, + getAnalysisConfig(analysisKind), ), ); } else { @@ -164,9 +160,7 @@ const uploadSarifMacro = test.macro({ sinon.match.any, features, logger, - analysisKind === AnalysisKind.CodeScanning - ? CodeScanning - : CodeQuality, + getAnalysisConfig(analysisKind), ), `uploadSpecifiedFiles was called for ${analysisKind}, but should not have been.`, ); From 04175316333cf39f5c6a365fb82e5d33ab2d2718 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 12:01:13 +0100 Subject: [PATCH 03/12] Add `keysTyped` and `entriesTyped` helpers --- src/util.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/util.ts b/src/util.ts index db7ba6cfda..94475ce62b 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1287,3 +1287,17 @@ export async function asyncSome( export function isDefined(value: T | null | undefined): value is T { return value !== undefined && value !== null; } + +/** Like `Object.keys`, but infers the correct key type. */ +export function keysTyped>( + object: T, +): Array { + return Object.keys(object) as Array; +} + +/** Like `Object.entries`, but infers the correct key type. */ +export function entriesTyped>( + object: T, +): Array<[keyof T, NonNullable]> { + return Object.entries(object) as Array<[keyof T, NonNullable]>; +} From 717d581574abb1db67faeacd9d1c8ea63dbf3830 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 12:32:35 +0100 Subject: [PATCH 04/12] Add `fixCategory` to `AnalysisConfig` --- lib/analyze-action.js | 9 ++++++--- lib/init-action-post.js | 29 +++++++++++++++++++++++++++++ lib/upload-lib.js | 29 +++++++++++++++++++++++++++++ lib/upload-sarif-action.js | 4 +++- src/analyses.ts | 6 ++++++ src/analyze-action.ts | 5 +++-- src/analyze.ts | 3 +-- src/upload-sarif.ts | 3 +-- 8 files changed, 78 insertions(+), 10 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 9cee6b6c7a..6e38e7192d 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90167,6 +90167,7 @@ var CodeScanning = { target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { @@ -90175,6 +90176,7 @@ var CodeQuality = { target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -93826,7 +93828,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, logger.info(`Interpreting ${analysis.name} results for ${language}`); let category = automationDetailsId; if (analysis.kind === "code-quality" /* CodeQuality */) { - category = fixCodeQualityCategory(logger, automationDetailsId); + category = analysis.fixCategory(logger, automationDetailsId); } const sarifFile = path16.join( sarifFolder, @@ -96146,16 +96148,17 @@ async function run() { core14.setOutput("sarif-id", uploadResult.sarifID); } if (isCodeQualityEnabled(config)) { + const analysis = CodeQuality; const qualityUploadResult = await uploadFiles( outputDir, getRequiredInput("checkout_path"), - fixCodeQualityCategory( + analysis.fixCategory( logger, getOptionalInput("category") ), features, logger, - CodeQuality + analysis ); core14.setOutput("quality-sarif-id", qualityUploadResult.sarifID); } diff --git a/lib/init-action-post.js b/lib/init-action-post.js index bc8c22d10f..965c3bafe1 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -128337,6 +128337,9 @@ function getWorkflowRunAttempt() { function isSelfHostedRunner() { return process.env.RUNNER_ENVIRONMENT === "self-hosted"; } +function isDefaultSetup() { + return getWorkflowEventName() === "dynamic"; +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } @@ -128402,6 +128405,30 @@ var restoreInputs = function() { } } }; +var qualityCategoryMapping = { + "c#": "csharp", + cpp: "c-cpp", + c: "c-cpp", + "c++": "c-cpp", + java: "java-kotlin", + javascript: "javascript-typescript", + typescript: "javascript-typescript", + kotlin: "java-kotlin" +}; +function fixCodeQualityCategory(logger, category) { + if (category !== void 0 && isDefaultSetup() && category.startsWith("/language:")) { + const language = category.substring("/language:".length); + const mappedLanguage = qualityCategoryMapping[language]; + if (mappedLanguage) { + const newCategory = `/language:${mappedLanguage}`; + logger.info( + `Adjusted category for Code Quality from '${category}' to '${newCategory}'.` + ); + return newCategory; + } + } + return category; +} // src/api-client.ts var core5 = __toESM(require_core()); @@ -128807,6 +128834,7 @@ var CodeScanning = { target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + fixCategory: (_2, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { @@ -128815,6 +128843,7 @@ var CodeQuality = { target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 148eb55eb2..0ee4500fe9 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -88474,6 +88474,9 @@ function getWorkflowRunAttempt() { } return workflowRunAttempt; } +function isDefaultSetup() { + return getWorkflowEventName() === "dynamic"; +} function prettyPrintInvocation(cmd, args) { return [cmd, ...args].map((x) => x.includes(" ") ? `'${x}'` : x).join(" "); } @@ -88530,6 +88533,30 @@ async function runTool(cmd, args = [], opts = {}) { } return stdout; } +var qualityCategoryMapping = { + "c#": "csharp", + cpp: "c-cpp", + c: "c-cpp", + "c++": "c-cpp", + java: "java-kotlin", + javascript: "javascript-typescript", + typescript: "javascript-typescript", + kotlin: "java-kotlin" +}; +function fixCodeQualityCategory(logger, category) { + if (category !== void 0 && isDefaultSetup() && category.startsWith("/language:")) { + const language = category.substring("/language:".length); + const mappedLanguage = qualityCategoryMapping[language]; + if (mappedLanguage) { + const newCategory = `/language:${mappedLanguage}`; + logger.info( + `Adjusted category for Code Quality from '${category}' to '${newCategory}'.` + ); + return newCategory; + } + } + return category; +} // src/analyses.ts var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { @@ -88544,6 +88571,7 @@ var CodeScanning = { target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { @@ -88552,6 +88580,7 @@ var CodeQuality = { target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; var SarifScanOrder = [CodeQuality, CodeScanning]; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 9e46c71e79..e9c9af1e08 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88770,6 +88770,7 @@ var CodeScanning = { target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; var CodeQuality = { @@ -88778,6 +88779,7 @@ var CodeQuality = { target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -93466,7 +93468,7 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category) pathStats, checkoutPath, CodeQuality, - fixCodeQualityCategory(logger, category) + CodeQuality.fixCategory(logger, category) ); if (qualityUploadResult !== void 0) { uploadResults["code-quality" /* CodeQuality */] = qualityUploadResult; diff --git a/src/analyses.ts b/src/analyses.ts index ae370e643e..7cac51a345 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -1,3 +1,5 @@ +import { fixCodeQualityCategory } from "./actions-util"; +import { Logger } from "./logging"; import { ConfigurationError } from "./util"; export enum AnalysisKind { @@ -61,6 +63,8 @@ export interface AnalysisConfig { /** A predicate on filenames to decide whether a SARIF file * belongs to this kind of analysis. */ sarifPredicate: (name: string) => boolean; + /** Analysis-specific adjustment of the category. */ + fixCategory: (logger: Logger, category?: string) => string | undefined; /** A prefix for environment variables used to track the uniqueness of SARIF uploads. */ sentinelPrefix: string; } @@ -74,6 +78,7 @@ export const CodeScanning: AnalysisConfig = { sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_", }; @@ -84,6 +89,7 @@ export const CodeQuality: AnalysisConfig = { target: SARIF_UPLOAD_ENDPOINT.CODE_QUALITY, sarifExtension: ".quality.sarif", sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_", }; diff --git a/src/analyze-action.ts b/src/analyze-action.ts index 31251be488..4c8697bbc9 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -345,16 +345,17 @@ async function run() { } if (isCodeQualityEnabled(config)) { + const analysis = analyses.CodeQuality; const qualityUploadResult = await uploadLib.uploadFiles( outputDir, actionsUtil.getRequiredInput("checkout_path"), - actionsUtil.fixCodeQualityCategory( + analysis.fixCategory( logger, actionsUtil.getOptionalInput("category"), ), features, logger, - analyses.CodeQuality, + analysis, ); core.setOutput("quality-sarif-id", qualityUploadResult.sarifID); } diff --git a/src/analyze.ts b/src/analyze.ts index b22e9c23da..b7eec921ac 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -7,7 +7,6 @@ import * as del from "del"; import * as yaml from "js-yaml"; import { - fixCodeQualityCategory, getRequiredInput, getTemporaryDirectory, PullRequestBranches, @@ -781,7 +780,7 @@ export async function runQueries( // accepted by the Code Quality backend. let category = automationDetailsId; if (analysis.kind === analyses.AnalysisKind.CodeQuality) { - category = fixCodeQualityCategory(logger, automationDetailsId); + category = analysis.fixCategory(logger, automationDetailsId); } const sarifFile = path.join( diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts index ba3b5ade8b..436bb9ed82 100644 --- a/src/upload-sarif.ts +++ b/src/upload-sarif.ts @@ -1,6 +1,5 @@ import * as fs from "fs"; -import * as actionsUtil from "./actions-util"; import * as analyses from "./analyses"; import { FeatureEnablement } from "./feature-flags"; import { Logger } from "./logging"; @@ -112,7 +111,7 @@ export async function uploadSarif( pathStats, checkoutPath, analyses.CodeQuality, - actionsUtil.fixCodeQualityCategory(logger, category), + analyses.CodeQuality.fixCategory(logger, category), ); if (qualityUploadResult !== undefined) { uploadResults[analyses.AnalysisKind.CodeQuality] = qualityUploadResult; From 63d1b25e974e149ae85c4e6b10d3004b7b17a2d8 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 12:50:55 +0100 Subject: [PATCH 05/12] Use `getGroupedSarifFilePaths` for `upload-sarif` Action --- lib/upload-sarif-action.js | 261 ++++++++++++++++++++----------------- src/upload-sarif.test.ts | 75 +---------- src/upload-sarif.ts | 98 ++------------ 3 files changed, 153 insertions(+), 281 deletions(-) diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index e9c9af1e08..9bf6647ec6 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -185,7 +185,7 @@ var require_file_command = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.prepareKeyValueMessage = exports2.issueFileCommand = void 0; var crypto = __importStar4(require("crypto")); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var os3 = __importStar4(require("os")); var utils_1 = require_utils(); function issueFileCommand(command, message) { @@ -193,10 +193,10 @@ var require_file_command = __commonJS({ if (!filePath) { throw new Error(`Unable to find environment variable for file command ${command}`); } - if (!fs16.existsSync(filePath)) { + if (!fs15.existsSync(filePath)) { throw new Error(`Missing file at path: ${filePath}`); } - fs16.appendFileSync(filePath, `${(0, utils_1.toCommandValue)(message)}${os3.EOL}`, { + fs15.appendFileSync(filePath, `${(0, utils_1.toCommandValue)(message)}${os3.EOL}`, { encoding: "utf8" }); } @@ -18513,12 +18513,12 @@ var require_io_util = __commonJS({ var _a; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var path16 = __importStar4(require("path")); - _a = fs16.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; + _a = fs15.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; - exports2.READONLY = fs16.constants.O_RDONLY; + exports2.READONLY = fs15.constants.O_RDONLY; function exists(fsPath) { return __awaiter4(this, void 0, void 0, function* () { try { @@ -27907,8 +27907,8 @@ var require_utils7 = __commonJS({ exports2.array = array; var errno = require_errno(); exports2.errno = errno; - var fs16 = require_fs(); - exports2.fs = fs16; + var fs15 = require_fs(); + exports2.fs = fs15; var path16 = require_path(); exports2.path = path16; var pattern = require_pattern(); @@ -28092,12 +28092,12 @@ var require_fs2 = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.createFileSystemAdapter = exports2.FILE_SYSTEM_ADAPTER = void 0; - var fs16 = require("fs"); + var fs15 = require("fs"); exports2.FILE_SYSTEM_ADAPTER = { - lstat: fs16.lstat, - stat: fs16.stat, - lstatSync: fs16.lstatSync, - statSync: fs16.statSync + lstat: fs15.lstat, + stat: fs15.stat, + lstatSync: fs15.lstatSync, + statSync: fs15.statSync }; function createFileSystemAdapter(fsMethods) { if (fsMethods === void 0) { @@ -28114,12 +28114,12 @@ var require_settings = __commonJS({ "node_modules/@nodelib/fs.stat/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var fs16 = require_fs2(); + var fs15 = require_fs2(); var Settings = class { constructor(_options = {}) { this._options = _options; this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true); - this.fs = fs16.createFileSystemAdapter(this._options.fs); + this.fs = fs15.createFileSystemAdapter(this._options.fs); this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); } @@ -28274,8 +28274,8 @@ var require_utils8 = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.fs = void 0; - var fs16 = require_fs3(); - exports2.fs = fs16; + var fs15 = require_fs3(); + exports2.fs = fs15; } }); @@ -28470,14 +28470,14 @@ var require_fs4 = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.createFileSystemAdapter = exports2.FILE_SYSTEM_ADAPTER = void 0; - var fs16 = require("fs"); + var fs15 = require("fs"); exports2.FILE_SYSTEM_ADAPTER = { - lstat: fs16.lstat, - stat: fs16.stat, - lstatSync: fs16.lstatSync, - statSync: fs16.statSync, - readdir: fs16.readdir, - readdirSync: fs16.readdirSync + lstat: fs15.lstat, + stat: fs15.stat, + lstatSync: fs15.lstatSync, + statSync: fs15.statSync, + readdir: fs15.readdir, + readdirSync: fs15.readdirSync }; function createFileSystemAdapter(fsMethods) { if (fsMethods === void 0) { @@ -28496,12 +28496,12 @@ var require_settings2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); var path16 = require("path"); var fsStat = require_out(); - var fs16 = require_fs4(); + var fs15 = require_fs4(); var Settings = class { constructor(_options = {}) { this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); - this.fs = fs16.createFileSystemAdapter(this._options.fs); + this.fs = fs15.createFileSystemAdapter(this._options.fs); this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path16.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); @@ -29762,16 +29762,16 @@ var require_settings4 = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.DEFAULT_FILE_SYSTEM_ADAPTER = void 0; - var fs16 = require("fs"); + var fs15 = require("fs"); var os3 = require("os"); var CPU_COUNT = Math.max(os3.cpus().length, 1); exports2.DEFAULT_FILE_SYSTEM_ADAPTER = { - lstat: fs16.lstat, - lstatSync: fs16.lstatSync, - stat: fs16.stat, - statSync: fs16.statSync, - readdir: fs16.readdir, - readdirSync: fs16.readdirSync + lstat: fs15.lstat, + lstatSync: fs15.lstatSync, + stat: fs15.stat, + statSync: fs15.statSync, + readdir: fs15.readdir, + readdirSync: fs15.readdirSync }; var Settings = class { constructor(_options = {}) { @@ -35465,7 +35465,7 @@ var require_internal_globber = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.DefaultGlobber = void 0; var core14 = __importStar4(require_core()); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); var path16 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); @@ -35517,7 +35517,7 @@ var require_internal_globber = __commonJS({ for (const searchPath of patternHelper.getSearchPaths(patterns)) { core14.debug(`Search path '${searchPath}'`); try { - yield __await4(fs16.promises.lstat(searchPath)); + yield __await4(fs15.promises.lstat(searchPath)); } catch (err) { if (err.code === "ENOENT") { continue; @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs16.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path16.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs15.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path16.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -35583,7 +35583,7 @@ var require_internal_globber = __commonJS({ let stats; if (options.followSymbolicLinks) { try { - stats = yield fs16.promises.stat(item.path); + stats = yield fs15.promises.stat(item.path); } catch (err) { if (err.code === "ENOENT") { if (options.omitBrokenSymbolicLinks) { @@ -35595,10 +35595,10 @@ var require_internal_globber = __commonJS({ throw err; } } else { - stats = yield fs16.promises.lstat(item.path); + stats = yield fs15.promises.lstat(item.path); } if (stats.isDirectory() && options.followSymbolicLinks) { - const realPath = yield fs16.promises.realpath(item.path); + const realPath = yield fs15.promises.realpath(item.path); while (traversalChain.length >= item.level) { traversalChain.pop(); } @@ -36932,7 +36932,7 @@ var require_cacheUtils = __commonJS({ var glob = __importStar4(require_glob()); var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var path16 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); @@ -36962,7 +36962,7 @@ var require_cacheUtils = __commonJS({ } exports2.createTempDirectory = createTempDirectory; function getArchiveFileSizeInBytes(filePath) { - return fs16.statSync(filePath).size; + return fs15.statSync(filePath).size; } exports2.getArchiveFileSizeInBytes = getArchiveFileSizeInBytes; function resolvePaths(patterns) { @@ -37002,7 +37002,7 @@ var require_cacheUtils = __commonJS({ exports2.resolvePaths = resolvePaths; function unlinkFile(filePath) { return __awaiter4(this, void 0, void 0, function* () { - return util.promisify(fs16.unlink)(filePath); + return util.promisify(fs15.unlink)(filePath); }); } exports2.unlinkFile = unlinkFile; @@ -37047,7 +37047,7 @@ var require_cacheUtils = __commonJS({ exports2.getCacheFileName = getCacheFileName; function getGnuTarPathOnWindows() { return __awaiter4(this, void 0, void 0, function* () { - if (fs16.existsSync(constants_1.GnuTarPathOnWindows)) { + if (fs15.existsSync(constants_1.GnuTarPathOnWindows)) { return constants_1.GnuTarPathOnWindows; } const versionOutput = yield getVersion("tar"); @@ -48820,7 +48820,7 @@ var require_dist7 = __commonJS({ var stream2 = require("stream"); var coreLro = require_dist6(); var events = require("events"); - var fs16 = require("fs"); + var fs15 = require("fs"); var util = require("util"); var buffer = require("buffer"); function _interopNamespaceDefault(e) { @@ -48843,7 +48843,7 @@ var require_dist7 = __commonJS({ } var coreHttpCompat__namespace = /* @__PURE__ */ _interopNamespaceDefault(coreHttpCompat); var coreClient__namespace = /* @__PURE__ */ _interopNamespaceDefault(coreClient); - var fs__namespace = /* @__PURE__ */ _interopNamespaceDefault(fs16); + var fs__namespace = /* @__PURE__ */ _interopNamespaceDefault(fs15); var util__namespace = /* @__PURE__ */ _interopNamespaceDefault(util); var logger = logger$1.createClientLogger("storage-blob"); var BaseRequestPolicy = class { @@ -72691,7 +72691,7 @@ var require_downloadUtils = __commonJS({ var http_client_1 = require_lib(); var storage_blob_1 = require_dist7(); var buffer = __importStar4(require("buffer")); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); var utils = __importStar4(require_cacheUtils()); @@ -72802,7 +72802,7 @@ var require_downloadUtils = __commonJS({ exports2.DownloadProgress = DownloadProgress; function downloadCacheHttpClient(archiveLocation, archivePath) { return __awaiter4(this, void 0, void 0, function* () { - const writeStream = fs16.createWriteStream(archivePath); + const writeStream = fs15.createWriteStream(archivePath); const httpClient = new http_client_1.HttpClient("actions/cache"); const downloadResponse = yield (0, requestUtils_1.retryHttpClientResponse)("downloadCache", () => __awaiter4(this, void 0, void 0, function* () { return httpClient.get(archiveLocation); @@ -72828,7 +72828,7 @@ var require_downloadUtils = __commonJS({ function downloadCacheHttpClientConcurrent(archiveLocation, archivePath, options) { var _a; return __awaiter4(this, void 0, void 0, function* () { - const archiveDescriptor = yield fs16.promises.open(archivePath, "w"); + const archiveDescriptor = yield fs15.promises.open(archivePath, "w"); const httpClient = new http_client_1.HttpClient("actions/cache", void 0, { socketTimeout: options.timeoutInMs, keepAlive: true @@ -72945,7 +72945,7 @@ var require_downloadUtils = __commonJS({ } else { const maxSegmentSize = Math.min(134217728, buffer.constants.MAX_LENGTH); const downloadProgress = new DownloadProgress(contentLength); - const fd = fs16.openSync(archivePath, "w"); + const fd = fs15.openSync(archivePath, "w"); try { downloadProgress.startDisplayTimer(); const controller = new abort_controller_1.AbortController(); @@ -72963,12 +72963,12 @@ var require_downloadUtils = __commonJS({ controller.abort(); throw new Error("Aborting cache download as the download time exceeded the timeout."); } else if (Buffer.isBuffer(result)) { - fs16.writeFileSync(fd, result); + fs15.writeFileSync(fd, result); } } } finally { downloadProgress.stopDisplayTimer(); - fs16.closeSync(fd); + fs15.closeSync(fd); } } }); @@ -73267,7 +73267,7 @@ var require_cacheHttpClient = __commonJS({ var core14 = __importStar4(require_core()); var http_client_1 = require_lib(); var auth_1 = require_auth(); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var url_1 = require("url"); var utils = __importStar4(require_cacheUtils()); var uploadUtils_1 = require_uploadUtils(); @@ -73405,7 +73405,7 @@ Other caches with similar key:`); return __awaiter4(this, void 0, void 0, function* () { const fileSize = utils.getArchiveFileSizeInBytes(archivePath); const resourceUrl = getCacheApiUrl(`caches/${cacheId.toString()}`); - const fd = fs16.openSync(archivePath, "r"); + const fd = fs15.openSync(archivePath, "r"); const uploadOptions = (0, options_1.getUploadOptions)(options); const concurrency = utils.assertDefined("uploadConcurrency", uploadOptions.uploadConcurrency); const maxChunkSize = utils.assertDefined("uploadChunkSize", uploadOptions.uploadChunkSize); @@ -73419,7 +73419,7 @@ Other caches with similar key:`); const start = offset; const end = offset + chunkSize - 1; offset += maxChunkSize; - yield uploadChunk(httpClient, resourceUrl, () => fs16.createReadStream(archivePath, { + yield uploadChunk(httpClient, resourceUrl, () => fs15.createReadStream(archivePath, { fd, start, end, @@ -73430,7 +73430,7 @@ Other caches with similar key:`); } }))); } finally { - fs16.closeSync(fd); + fs15.closeSync(fd); } return; }); @@ -80643,7 +80643,7 @@ var require_manifest = __commonJS({ var core_1 = require_core(); var os3 = require("os"); var cp = require("child_process"); - var fs16 = require("fs"); + var fs15 = require("fs"); function _findMatch(versionSpec, stable, candidates, archFilter) { return __awaiter4(this, void 0, void 0, function* () { const platFilter = os3.platform(); @@ -80707,10 +80707,10 @@ var require_manifest = __commonJS({ const lsbReleaseFile = "/etc/lsb-release"; const osReleaseFile = "/etc/os-release"; let contents = ""; - if (fs16.existsSync(lsbReleaseFile)) { - contents = fs16.readFileSync(lsbReleaseFile).toString(); - } else if (fs16.existsSync(osReleaseFile)) { - contents = fs16.readFileSync(osReleaseFile).toString(); + if (fs15.existsSync(lsbReleaseFile)) { + contents = fs15.readFileSync(lsbReleaseFile).toString(); + } else if (fs15.existsSync(osReleaseFile)) { + contents = fs15.readFileSync(osReleaseFile).toString(); } return contents; } @@ -80887,7 +80887,7 @@ var require_tool_cache = __commonJS({ var core14 = __importStar4(require_core()); var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); - var fs16 = __importStar4(require("fs")); + var fs15 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os3 = __importStar4(require("os")); var path16 = __importStar4(require("path")); @@ -80934,7 +80934,7 @@ var require_tool_cache = __commonJS({ exports2.downloadTool = downloadTool2; function downloadToolAttempt(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - if (fs16.existsSync(dest)) { + if (fs15.existsSync(dest)) { throw new Error(`Destination file path ${dest} already exists`); } const http = new httpm.HttpClient(userAgent, [], { @@ -80958,7 +80958,7 @@ var require_tool_cache = __commonJS({ const readStream = responseMessageFactory(); let succeeded = false; try { - yield pipeline(readStream, fs16.createWriteStream(dest)); + yield pipeline(readStream, fs15.createWriteStream(dest)); core14.debug("download complete"); succeeded = true; return dest; @@ -81170,11 +81170,11 @@ var require_tool_cache = __commonJS({ arch2 = arch2 || os3.arch(); core14.debug(`Caching tool ${tool} ${version} ${arch2}`); core14.debug(`source dir: ${sourceDir}`); - if (!fs16.statSync(sourceDir).isDirectory()) { + if (!fs15.statSync(sourceDir).isDirectory()) { throw new Error("sourceDir is not a directory"); } const destPath = yield _createToolPath(tool, version, arch2); - for (const itemName of fs16.readdirSync(sourceDir)) { + for (const itemName of fs15.readdirSync(sourceDir)) { const s = path16.join(sourceDir, itemName); yield io6.cp(s, destPath, { recursive: true }); } @@ -81189,7 +81189,7 @@ var require_tool_cache = __commonJS({ arch2 = arch2 || os3.arch(); core14.debug(`Caching tool ${tool} ${version} ${arch2}`); core14.debug(`source file: ${sourceFile}`); - if (!fs16.statSync(sourceFile).isFile()) { + if (!fs15.statSync(sourceFile).isFile()) { throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); @@ -81219,7 +81219,7 @@ var require_tool_cache = __commonJS({ versionSpec = semver8.clean(versionSpec) || ""; const cachePath = path16.join(_getCacheDirectory(), toolName, versionSpec, arch2); core14.debug(`checking cache: ${cachePath}`); - if (fs16.existsSync(cachePath) && fs16.existsSync(`${cachePath}.complete`)) { + if (fs15.existsSync(cachePath) && fs15.existsSync(`${cachePath}.complete`)) { core14.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); toolPath = cachePath; } else { @@ -81233,12 +81233,12 @@ var require_tool_cache = __commonJS({ const versions = []; arch2 = arch2 || os3.arch(); const toolPath = path16.join(_getCacheDirectory(), toolName); - if (fs16.existsSync(toolPath)) { - const children = fs16.readdirSync(toolPath); + if (fs15.existsSync(toolPath)) { + const children = fs15.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { const fullPath = path16.join(toolPath, child, arch2 || ""); - if (fs16.existsSync(fullPath) && fs16.existsSync(`${fullPath}.complete`)) { + if (fs15.existsSync(fullPath) && fs15.existsSync(`${fullPath}.complete`)) { versions.push(child); } } @@ -81312,7 +81312,7 @@ var require_tool_cache = __commonJS({ function _completeToolPath(tool, version, arch2) { const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; - fs16.writeFileSync(markerPath, ""); + fs15.writeFileSync(markerPath, ""); core14.debug("finished caching tool"); } function isExplicitVersion(versionSpec) { @@ -85706,21 +85706,21 @@ async function getFolderSize(itemPath, options) { getFolderSize.loose = async (itemPath, options) => await core(itemPath, options); getFolderSize.strict = async (itemPath, options) => await core(itemPath, options, { strict: true }); async function core(rootItemPath, options = {}, returnType = {}) { - const fs16 = options.fs || await import("node:fs/promises"); + const fs15 = options.fs || await import("node:fs/promises"); let folderSize = 0n; const foundInos = /* @__PURE__ */ new Set(); const errors = []; await processItem(rootItemPath); async function processItem(itemPath) { if (options.ignore?.test(itemPath)) return; - const stats = returnType.strict ? await fs16.lstat(itemPath, { bigint: true }) : await fs16.lstat(itemPath, { bigint: true }).catch((error2) => errors.push(error2)); + const stats = returnType.strict ? await fs15.lstat(itemPath, { bigint: true }) : await fs15.lstat(itemPath, { bigint: true }).catch((error2) => errors.push(error2)); if (typeof stats !== "object") return; if (!foundInos.has(stats.ino)) { foundInos.add(stats.ino); folderSize += stats.size; } if (stats.isDirectory()) { - const directoryItems = returnType.strict ? await fs16.readdir(itemPath) : await fs16.readdir(itemPath).catch((error2) => errors.push(error2)); + const directoryItems = returnType.strict ? await fs15.readdir(itemPath) : await fs15.readdir(itemPath).catch((error2) => errors.push(error2)); if (typeof directoryItems !== "object") return; await Promise.all( directoryItems.map( @@ -88590,6 +88590,9 @@ async function asyncSome(array, predicate) { const results = await Promise.all(array.map(predicate)); return results.some((result) => result); } +function entriesTyped(object) { + return Object.entries(object); +} // src/actions-util.ts var pkg = require_package(); @@ -88782,6 +88785,15 @@ var CodeQuality = { fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; +function getAnalysisConfig(kind) { + switch (kind) { + case "code-scanning" /* CodeScanning */: + return CodeScanning; + case "code-quality" /* CodeQuality */: + return CodeQuality; + } +} +var SarifScanOrder = [CodeQuality, CodeScanning]; // src/api-client.ts var core5 = __toESM(require_core()); @@ -93076,6 +93088,47 @@ function findSarifFilesInDir(sarifPath, isSarif) { walkSarifFiles(sarifPath); return sarifFiles; } +async function getGroupedSarifFilePaths(logger, sarifPath) { + const stats = fs14.statSync(sarifPath, { throwIfNoEntry: false }); + if (stats === void 0) { + throw new ConfigurationError(`Path does not exist: ${sarifPath}`); + } + const results = {}; + if (stats.isDirectory()) { + let sarifFiles = findSarifFilesInDir( + sarifPath, + (name) => name.endsWith(".sarif") + ); + logger.debug( + `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` + ); + for (const analysisConfig of SarifScanOrder) { + const files = sarifFiles.filter(analysisConfig.sarifPredicate); + if (files.length > 0) { + logger.debug( + `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}` + ); + sarifFiles = sarifFiles.filter( + (name) => !analysisConfig.sarifPredicate(name) + ); + results[analysisConfig.kind] = files; + } else { + logger.debug(`Found no SARIF files for ${analysisConfig.name}`); + } + } + } else { + for (const analysisConfig of SarifScanOrder) { + if (analysisConfig.kind === "code-scanning" /* CodeScanning */ || analysisConfig.sarifPredicate(sarifPath)) { + logger.debug( + `Using '${sarifPath}' as a SARIF file for ${analysisConfig.name}.` + ); + results[analysisConfig.kind] = [sarifPath]; + break; + } + } + } + return results; +} function countResultsInSarif(sarif) { let numResults = 0; const parsedSarif = JSON.parse(sarif); @@ -93418,61 +93471,23 @@ function filterAlertsByDiffRange(logger, sarif) { } // src/upload-sarif.ts -var fs15 = __toESM(require("fs")); -async function findAndUpload(logger, features, sarifPath, pathStats, checkoutPath, analysis, category) { - let sarifFiles; - if (pathStats.isDirectory()) { - sarifFiles = findSarifFilesInDir( - sarifPath, - analysis.sarifPredicate - ); - } else if (pathStats.isFile() && (analysis.sarifPredicate(sarifPath) || analysis.kind === "code-scanning" /* CodeScanning */ && !CodeQuality.sarifPredicate(sarifPath))) { - sarifFiles = [sarifPath]; - } else { - return void 0; - } - if (sarifFiles.length !== 0) { - return await uploadSpecifiedFiles( +async function uploadSarif(logger, features, checkoutPath, sarifPath, category) { + const sarifGroups = await getGroupedSarifFilePaths( + logger, + sarifPath + ); + const uploadResults = {}; + for (const [analysisKind, sarifFiles] of entriesTyped(sarifGroups)) { + const analysisConfig = getAnalysisConfig(analysisKind); + uploadResults[analysisKind] = await uploadSpecifiedFiles( sarifFiles, checkoutPath, - category, + analysisConfig.fixCategory(logger, category), features, logger, - analysis + analysisConfig ); } - return void 0; -} -async function uploadSarif(logger, features, checkoutPath, sarifPath, category) { - const pathStats = fs15.lstatSync(sarifPath, { throwIfNoEntry: false }); - if (pathStats === void 0) { - throw new ConfigurationError(`Path does not exist: ${sarifPath}.`); - } - const uploadResults = {}; - const uploadResult = await findAndUpload( - logger, - features, - sarifPath, - pathStats, - checkoutPath, - CodeScanning, - category - ); - if (uploadResult !== void 0) { - uploadResults["code-scanning" /* CodeScanning */] = uploadResult; - } - const qualityUploadResult = await findAndUpload( - logger, - features, - sarifPath, - pathStats, - checkoutPath, - CodeQuality, - CodeQuality.fixCategory(logger, category) - ); - if (qualityUploadResult !== void 0) { - uploadResults["code-quality" /* CodeQuality */] = qualityUploadResult; - } return uploadResults; } diff --git a/src/upload-sarif.test.ts b/src/upload-sarif.test.ts index b0a288ec5e..893330eda6 100644 --- a/src/upload-sarif.test.ts +++ b/src/upload-sarif.test.ts @@ -4,87 +4,16 @@ import * as path from "path"; import test, { ExecutionContext } from "ava"; import * as sinon from "sinon"; -import { - AnalysisConfig, - AnalysisKind, - CodeScanning, - getAnalysisConfig, -} from "./analyses"; +import { AnalysisKind, getAnalysisConfig } from "./analyses"; import { getRunnerLogger } from "./logging"; import { createFeatures, setupTests } from "./testing-utils"; import { UploadResult } from "./upload-lib"; import * as uploadLib from "./upload-lib"; -import { findAndUpload, uploadSarif } from "./upload-sarif"; +import { uploadSarif } from "./upload-sarif"; import * as util from "./util"; setupTests(test); -const findAndUploadMacro = test.macro({ - exec: async ( - t: ExecutionContext, - sarifFiles: string[], - analysis: AnalysisConfig, - sarifPath: (tempDir: string) => string = (tempDir) => tempDir, - expectedResult: UploadResult | undefined, - ) => { - await util.withTmpDir(async (tempDir) => { - sinon.stub(uploadLib, "uploadSpecifiedFiles").resolves(expectedResult); - const logger = getRunnerLogger(true); - const features = createFeatures([]); - - for (const sarifFile of sarifFiles) { - fs.writeFileSync(path.join(tempDir, sarifFile), ""); - } - - const stats = fs.statSync(sarifPath(tempDir)); - const actual = await findAndUpload( - logger, - features, - sarifPath(tempDir), - stats, - "", - analysis, - ); - - t.deepEqual(actual, expectedResult); - }); - }, - title: (providedTitle = "") => `findAndUpload - ${providedTitle}`, -}); - -test( - "no matching files", - findAndUploadMacro, - ["test.json"], - CodeScanning, - undefined, - undefined, -); - -test( - "matching files for Code Scanning with directory path", - findAndUploadMacro, - ["test.sarif"], - CodeScanning, - undefined, - { - statusReport: {}, - sarifID: "some-id", - }, -); - -test( - "matching files for Code Scanning with file path", - findAndUploadMacro, - ["test.sarif"], - CodeScanning, - (tempDir) => path.join(tempDir, "test.sarif"), - { - statusReport: {}, - sarifID: "some-id", - }, -); - interface UploadSarifExpectedResult { uploadResult?: UploadResult; expectedFiles?: string[]; diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts index 436bb9ed82..ee685f31ab 100644 --- a/src/upload-sarif.ts +++ b/src/upload-sarif.ts @@ -1,64 +1,8 @@ -import * as fs from "fs"; - import * as analyses from "./analyses"; import { FeatureEnablement } from "./feature-flags"; import { Logger } from "./logging"; import * as upload_lib from "./upload-lib"; -import { ConfigurationError } from "./util"; - -/** - * Searches for SARIF files for the given `analysis` in the given `sarifPath`. - * If any are found, then they are uploaded to the appropriate endpoint for the given `analysis`. - * - * @param logger The logger to use. - * @param features Information about FFs. - * @param sarifPath The path to a SARIF file or directory containing SARIF files. - * @param pathStats Information about `sarifPath`. - * @param checkoutPath The checkout path. - * @param analysis The configuration of the analysis we should upload SARIF files for. - * @param category The SARIF category to use for the upload. - * @returns The result of uploading the SARIF file(s) or `undefined` if there are none. - */ -export async function findAndUpload( - logger: Logger, - features: FeatureEnablement, - sarifPath: string, - pathStats: fs.Stats, - checkoutPath: string, - analysis: analyses.AnalysisConfig, - category?: string, -): Promise { - let sarifFiles: string[] | undefined; - - if (pathStats.isDirectory()) { - sarifFiles = upload_lib.findSarifFilesInDir( - sarifPath, - analysis.sarifPredicate, - ); - } else if ( - pathStats.isFile() && - (analysis.sarifPredicate(sarifPath) || - (analysis.kind === analyses.AnalysisKind.CodeScanning && - !analyses.CodeQuality.sarifPredicate(sarifPath))) - ) { - sarifFiles = [sarifPath]; - } else { - return undefined; - } - - if (sarifFiles.length !== 0) { - return await upload_lib.uploadSpecifiedFiles( - sarifFiles, - checkoutPath, - category, - features, - logger, - analysis, - ); - } - - return undefined; -} +import { entriesTyped } from "./util"; // Maps analysis kinds to SARIF IDs. export type UploadSarifResults = Partial< @@ -83,38 +27,22 @@ export async function uploadSarif( sarifPath: string, category?: string, ): Promise { - const pathStats = fs.lstatSync(sarifPath, { throwIfNoEntry: false }); - - if (pathStats === undefined) { - throw new ConfigurationError(`Path does not exist: ${sarifPath}.`); - } - - const uploadResults: UploadSarifResults = {}; - const uploadResult = await findAndUpload( + const sarifGroups = await upload_lib.getGroupedSarifFilePaths( logger, - features, sarifPath, - pathStats, - checkoutPath, - analyses.CodeScanning, - category, ); - if (uploadResult !== undefined) { - uploadResults[analyses.AnalysisKind.CodeScanning] = uploadResult; - } - // If there are `.quality.sarif` files in `sarifPath`, then upload those to the code quality service. - const qualityUploadResult = await findAndUpload( - logger, - features, - sarifPath, - pathStats, - checkoutPath, - analyses.CodeQuality, - analyses.CodeQuality.fixCategory(logger, category), - ); - if (qualityUploadResult !== undefined) { - uploadResults[analyses.AnalysisKind.CodeQuality] = qualityUploadResult; + const uploadResults: UploadSarifResults = {}; + for (const [analysisKind, sarifFiles] of entriesTyped(sarifGroups)) { + const analysisConfig = analyses.getAnalysisConfig(analysisKind); + uploadResults[analysisKind] = await upload_lib.uploadSpecifiedFiles( + sarifFiles, + checkoutPath, + analysisConfig.fixCategory(logger, category), + features, + logger, + analysisConfig, + ); } return uploadResults; From 056fb86575b67fab2ce40184bf81847e34fa17f3 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 12:57:45 +0100 Subject: [PATCH 06/12] Call `fixCategory` in `uploadSpecifiedFiles` Since `fixCategory` is now part of `AnalysisConfig`, we don't have to remember to do it at the call site for `uploadSpecifiedFiles` or `uploadFiles` anymore. --- lib/analyze-action.js | 6 ++---- lib/init-action-post.js | 1 + lib/upload-lib.js | 1 + lib/upload-sarif-action.js | 3 ++- src/analyze-action.ts | 5 +---- src/upload-lib.ts | 1 + src/upload-sarif.ts | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 6e38e7192d..de01b0b4ff 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -95701,6 +95701,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); let sarif; + category = uploadTarget.fixCategory(logger, category); if (sarifPaths.length > 1) { for (const sarifPath of sarifPaths) { const parsedSarif = readSarifFile(sarifPath); @@ -96152,10 +96153,7 @@ async function run() { const qualityUploadResult = await uploadFiles( outputDir, getRequiredInput("checkout_path"), - analysis.fixCategory( - logger, - getOptionalInput("category") - ), + getOptionalInput("category"), features, logger, analysis diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 965c3bafe1..19b39f77ed 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -133162,6 +133162,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); let sarif; + category = uploadTarget.fixCategory(logger, category); if (sarifPaths.length > 1) { for (const sarifPath of sarifPaths) { const parsedSarif = readSarifFile(sarifPath); diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 0ee4500fe9..625eb06f81 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92593,6 +92593,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); let sarif; + category = uploadTarget.fixCategory(logger, category); if (sarifPaths.length > 1) { for (const sarifPath of sarifPaths) { const parsedSarif = readSarifFile(sarifPath); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 9bf6647ec6..6dc87a291f 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -93229,6 +93229,7 @@ async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features logger.info(`Processing sarif files: ${JSON.stringify(sarifPaths)}`); const gitHubVersion = await getGitHubVersion(); let sarif; + category = uploadTarget.fixCategory(logger, category); if (sarifPaths.length > 1) { for (const sarifPath of sarifPaths) { const parsedSarif = readSarifFile(sarifPath); @@ -93482,7 +93483,7 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category) uploadResults[analysisKind] = await uploadSpecifiedFiles( sarifFiles, checkoutPath, - analysisConfig.fixCategory(logger, category), + category, features, logger, analysisConfig diff --git a/src/analyze-action.ts b/src/analyze-action.ts index 4c8697bbc9..5ac1e5069d 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -349,10 +349,7 @@ async function run() { const qualityUploadResult = await uploadLib.uploadFiles( outputDir, actionsUtil.getRequiredInput("checkout_path"), - analysis.fixCategory( - logger, - actionsUtil.getOptionalInput("category"), - ), + actionsUtil.getOptionalInput("category"), features, logger, analysis, diff --git a/src/upload-lib.ts b/src/upload-lib.ts index f4b171e9ed..9566eeb9da 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -717,6 +717,7 @@ export async function uploadSpecifiedFiles( const gitHubVersion = await getGitHubVersion(); let sarif: SarifFile; + category = uploadTarget.fixCategory(logger, category); if (sarifPaths.length > 1) { // Validate that the files we were asked to upload are all valid SARIF files diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts index ee685f31ab..f16c7fb216 100644 --- a/src/upload-sarif.ts +++ b/src/upload-sarif.ts @@ -38,7 +38,7 @@ export async function uploadSarif( uploadResults[analysisKind] = await upload_lib.uploadSpecifiedFiles( sarifFiles, checkoutPath, - analysisConfig.fixCategory(logger, category), + category, features, logger, analysisConfig, From 93711d3d89e7f15ed51f7c4e80ac48d21fd66470 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 29 Sep 2025 12:59:54 +0100 Subject: [PATCH 07/12] Print a warning when there are `sarifFiles` in `getGroupedSarifFilePaths` that don't belong to an analysis kind --- lib/upload-lib.js | 5 +++++ lib/upload-sarif-action.js | 5 +++++ src/upload-lib.ts | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 625eb06f81..b7f23ef735 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92466,6 +92466,11 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } + if (sarifFiles.length !== 0) { + logger.warning( + `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}` + ); + } } else { for (const analysisConfig of SarifScanOrder) { if (analysisConfig.kind === "code-scanning" /* CodeScanning */ || analysisConfig.sarifPredicate(sarifPath)) { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 6dc87a291f..1efe395bb1 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -93116,6 +93116,11 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } + if (sarifFiles.length !== 0) { + logger.warning( + `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}` + ); + } } else { for (const analysisConfig of SarifScanOrder) { if (analysisConfig.kind === "code-scanning" /* CodeScanning */ || analysisConfig.sarifPredicate(sarifPath)) { diff --git a/src/upload-lib.ts b/src/upload-lib.ts index 9566eeb9da..c715a20632 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -503,6 +503,12 @@ export async function getGroupedSarifFilePaths( logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } + + if (sarifFiles.length !== 0) { + logger.warning( + `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}`, + ); + } } else { for (const analysisConfig of analyses.SarifScanOrder) { if ( From ad086e4d90cd2469a6059514596e520d7232895c Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 30 Sep 2025 11:55:04 +0100 Subject: [PATCH 08/12] Use `path.extname` for some extension checks --- lib/analyze-action-post.js | 2 +- lib/analyze-action.js | 592 +++++++++---------- lib/init-action-post.js | 974 ++++++++++++++++---------------- lib/init-action.js | 531 ++++++++--------- lib/upload-lib.js | 522 ++++++++--------- lib/upload-sarif-action-post.js | 2 +- lib/upload-sarif-action.js | 526 ++++++++--------- src/analyze.test.ts | 2 +- src/debug-artifacts.ts | 2 +- src/upload-lib.ts | 5 +- 10 files changed, 1584 insertions(+), 1574 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index dc7b7a8403..e5ccfa9f98 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -118671,7 +118671,7 @@ async function uploadCombinedSarifArtifacts(logger, gitHubVariant, codeQlVersion if (fs5.existsSync(baseTempDir)) { const outputDirs = fs5.readdirSync(baseTempDir); for (const outputDir of outputDirs) { - const sarifFiles = fs5.readdirSync(path5.resolve(baseTempDir, outputDir)).filter((f) => f.endsWith(".sarif")); + const sarifFiles = fs5.readdirSync(path5.resolve(baseTempDir, outputDir)).filter((f) => path5.extname(f) === ".sarif"); for (const sarifFile of sarifFiles) { toUpload.push(path5.resolve(baseTempDir, outputDir, sarifFile)); } diff --git a/lib/analyze-action.js b/lib/analyze-action.js index de01b0b4ff..0652286f6f 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path20 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path22 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path20 && !path20.startsWith("/")) { - path20 = `/${path20}`; + if (path22 && !path22.startsWith("/")) { + path22 = `/${path22}`; } - url2 = new URL(origin + path20); + url2 = new URL(origin + path22); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path20) { - if (typeof path20 !== "string") { + module2.exports = function basename(path22) { + if (typeof path22 !== "string") { return ""; } - for (var i = path20.length - 1; i >= 0; --i) { - switch (path20.charCodeAt(i)) { + for (var i = path22.length - 1; i >= 0; --i) { + switch (path22.charCodeAt(i)) { case 47: // '/' case 92: - path20 = path20.slice(i + 1); - return path20 === ".." || path20 === "." ? "" : path20; + path22 = path22.slice(i + 1); + return path22 === ".." || path22 === "." ? "" : path22; } } - return path20 === ".." || path20 === "." ? "" : path20; + return path22 === ".." || path22 === "." ? "" : path22; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path20, + path: path22, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path20 !== "string") { + if (typeof path22 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path20[0] !== "/" && !(path20.startsWith("http://") || path20.startsWith("https://")) && method !== "CONNECT") { + } else if (path22[0] !== "/" && !(path22.startsWith("http://") || path22.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path20) !== null) { + } else if (invalidPathRegex.exec(path22) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path20, query) : path20; + this.path = query ? util.buildURL(path22, query) : path22; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path20 = search ? `${pathname}${search}` : pathname; + const path22 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path20; + this.opts.path = path22; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path20, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path22, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path20} HTTP/1.1\r + let header = `${method} ${path22} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path20, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path22, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path20; + headers[HTTP2_HEADER_PATH] = path22; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path20) { - if (typeof path20 !== "string") { - return path20; + function safeUrl(path22) { + if (typeof path22 !== "string") { + return path22; } - const pathSegments = path20.split("?"); + const pathSegments = path22.split("?"); if (pathSegments.length !== 2) { - return path20; + return path22; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path20, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path20); + function matchKey(mockDispatch2, { path: path22, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path22); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path20 }) => matchValue(safeUrl(path20), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path22 }) => matchValue(safeUrl(path22), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path20, method, body, headers, query } = opts; + const { path: path22, method, body, headers, query } = opts; return { - path: path20, + path: path22, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path20, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path22, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path20, + Path: path22, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path20) { - for (const char of path20) { + function validateCookiePath(path22) { + for (const char of path22) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path20 = opts.path; + let path22 = opts.path; if (!opts.path.startsWith("/")) { - path20 = `/${path20}`; + path22 = `/${path22}`; } - url2 = new URL(util.parseOrigin(url2).origin + path20); + url2 = new URL(util.parseOrigin(url2).origin + path22); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path20.sep); + return pth.replace(/[/\\]/g, path22.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs20 = __importStar4(require("fs")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); _a = fs20.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path20.extname(filePath).toUpperCase(); + const upperExt = path22.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path20.dirname(filePath); - const upperName = path20.basename(filePath).toUpperCase(); + const directory = path22.dirname(filePath); + const upperName = path22.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path20.join(directory, actualName); + filePath = path22.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path20.join(dest, path20.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path22.join(dest, path22.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path20.relative(source, newDest) === "") { + if (path22.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path20.join(dest, path20.basename(source)); + dest = path22.join(dest, path22.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path20.dirname(dest)); + yield mkdirP(path22.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path20.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path22.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path20.sep)) { + if (tool.includes(path22.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path20.delimiter)) { + for (const p of process.env.PATH.split(path22.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path20.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path22.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os5 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path20.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path22.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve8, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path20.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path22.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path20 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path20} does not exist${os_1.EOL}`); + const path22 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path22} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os5 = require("os"); - var path20 = require("path"); + var path22 = require("path"); var IS_WINDOWS_PLATFORM = os5.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path20.resolve(cwd, filepath); + return path22.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path20 = require("path"); + var path22 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path20.sep, + SEP: path22.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path20 = require("path"); + var path22 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path20.sep === "\\"; + return win32 === true || path22.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path20 = require("path"); + var path22 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path20.basename(input)); + return regex.test(path22.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path20 = require("path"); + var path22 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path20.basename(pattern); + const basename = path22.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path20.isAbsolute(pattern); + return path22.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs20 = require_fs(); exports2.fs = fs20; - var path20 = require_path(); - exports2.path = path20; + var path22 = require_path(); + exports2.path = path22; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path20, settings, callback) { - settings.fs.lstat(path20, (lstatError, lstat) => { + function read(path22, settings, callback) { + settings.fs.lstat(path22, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path20, (statError, stat) => { + settings.fs.stat(path22, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path20, settings) { - const lstat = settings.fs.lstatSync(path20); + function read(path22, settings) { + const lstat = settings.fs.lstatSync(path22); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path20); + const stat = settings.fs.statSync(path22); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path20, optionsOrSettingsOrCallback, callback) { + function stat(path22, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path20, getSettings(), optionsOrSettingsOrCallback); + async.read(path22, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path22, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync4(path20, optionsOrSettings) { + function statSync4(path22, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path20, settings); + return sync.read(path22, settings); } exports2.statSync = statSync4; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path20 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path22 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path20, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path22, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path20, + path: path22, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path22 = require("path"); var fsStat = require_out(); var fs20 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs20.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path22.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path20, optionsOrSettingsOrCallback, callback) { + function scandir(path22, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path20, getSettings(), optionsOrSettingsOrCallback); + async.read(path22, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path22, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path20, optionsOrSettings) { + function scandirSync(path22, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path20, settings); + return sync.read(path22, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path22 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path22.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path22 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path20.resolve(this._settings.cwd, filepath); + return path22.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path22 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path20.resolve(this._settings.cwd, task.base); + return path22.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path20, checkUnignored, mode) { + test(path22, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path20); + const matched = rule[mode].test(path22); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path20, originalPath, doThrow) => { - if (!isString(path20)) { + var checkPath = (path22, originalPath, doThrow) => { + if (!isString(path22)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path20) { + if (!path22) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path20)) { + if (checkPath.isNotRelative(path22)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path20) => REGEX_TEST_INVALID_PATH.test(path20); + var isNotRelative = (path22) => REGEX_TEST_INVALID_PATH.test(path22); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path20 = originalPath && checkPath.convert(originalPath); + const path22 = originalPath && checkPath.convert(originalPath); checkPath( - path20, + path22, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path20, cache, checkUnignored, slices); + return this._t(path22, cache, checkUnignored, slices); } - checkIgnore(path20) { - if (!REGEX_TEST_TRAILING_SLASH.test(path20)) { - return this.test(path20); + checkIgnore(path22) { + if (!REGEX_TEST_TRAILING_SLASH.test(path22)) { + return this.test(path22); } - const slices = path20.split(SLASH).filter(Boolean); + const slices = path22.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path20, false, MODE_CHECK_IGNORE); + return this._rules.test(path22, false, MODE_CHECK_IGNORE); } - _t(path20, cache, checkUnignored, slices) { - if (path20 in cache) { - return cache[path20]; + _t(path22, cache, checkUnignored, slices) { + if (path22 in cache) { + return cache[path22]; } if (!slices) { - slices = path20.split(SLASH).filter(Boolean); + slices = path22.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path20] = this._rules.test(path20, checkUnignored, MODE_IGNORE); + return cache[path22] = this._rules.test(path22, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path20] = parent.ignored ? parent : this._rules.test(path20, checkUnignored, MODE_IGNORE); + return cache[path22] = parent.ignored ? parent : this._rules.test(path22, checkUnignored, MODE_IGNORE); } - ignores(path20) { - return this._test(path20, this._ignoreCache, false).ignored; + ignores(path22) { + return this._test(path22, this._ignoreCache, false).ignored; } createFilter() { - return (path20) => !this.ignores(path20); + return (path22) => !this.ignores(path22); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path20) { - return this._test(path20, this._testCache, true); + test(path22) { + return this._test(path22, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path20) => checkPath(path20 && checkPath.convert(path20), path20, RETURN_FALSE); + var isPathValid = (path22) => checkPath(path22 && checkPath.convert(path22), path22, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path20) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path20) || isNotRelative(path20); + checkPath.isNotRelative = (path22) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path22) || isNotRelative(path22); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path20.dirname(p); + let result = path22.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path20.sep; + root += path22.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path20.sep)) { + if (!p.endsWith(path22.sep)) { return p; } - if (p === path20.sep) { + if (p === path22.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path20 = (function() { + var path22 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path20.sep; + minimatch.sep = path22.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path20.sep !== "/") { - pattern = pattern.split(path20.sep).join("/"); + if (!options.allowWindowsEscape && path22.sep !== "/") { + pattern = pattern.split(path22.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path20.sep !== "/") { - f = f.split(path20.sep).join("/"); + if (path22.sep !== "/") { + f = f.split(path22.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path20.sep); + this.segments = itemPath.split(path22.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path20.basename(remaining); + const basename = path22.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path22.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path22.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path20.sep; + result += path22.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path22.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path20.sep}`; + if (!itemPath.endsWith(path22.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path22.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path22.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path22.sep}`)) { homedir2 = homedir2 || os5.homedir(); assert_1.default(homedir2, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path20, level) { - this.path = path20; + constructor(path22, level) { + this.path = path22; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core15 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path22.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto2 = __importStar4(require("crypto")); var fs20 = __importStar4(require("fs")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path20.join(baseLocation, "actions", "temp"); + tempDirectory = path22.join(baseLocation, "actions", "temp"); } - const dest = path20.join(tempDirectory, crypto2.randomUUID()); + const dest = path22.join(tempDirectory, crypto2.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path20.relative(workspace, file).replace(new RegExp(`\\${path20.sep}`, "g"), "/"); + const relativeFile = path22.relative(workspace, file).replace(new RegExp(`\\${path22.sep}`, "g"), "/"); core15.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path20 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path20.startsWith("/")) { - path20 = path20.substring(1); + let path22 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path22.startsWith("/")) { + path22 = path22.substring(1); } - if (isAbsoluteUrl(path20)) { - requestUrl = path20; + if (isAbsoluteUrl(path22)) { + requestUrl = path22; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path20); + requestUrl = appendPath(requestUrl, path22); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path20 = pathToAppend.substring(0, searchStart); + const path22 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path20; + newPath = newPath + path22; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path20 = urlParsed.pathname; - path20 = path20 || "/"; - path20 = escape(path20); - urlParsed.pathname = path20; + let path22 = urlParsed.pathname; + path22 = path22 || "/"; + path22 = escape(path22); + urlParsed.pathname = path22; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path20 = urlParsed.pathname; - path20 = path20 ? path20.endsWith("/") ? `${path20}${name}` : `${path20}/${name}` : name; - urlParsed.pathname = path20; + let path22 = urlParsed.pathname; + path22 = path22 ? path22.endsWith("/") ? `${path22}${name}` : `${path22}/${name}` : name; + urlParsed.pathname = path22; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path20 = getURLPath(request.url) || "/"; + const path22 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path20}`; + canonicalizedResourceString += `/${this.factory.accountName}${path22}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path20 = getURLPath(request.url) || "/"; + const path22 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path20}`; + canonicalizedResourceString += `/${options.accountName}${path22}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path20 = getURLPath(subRequest.url); - if (!path20 || path20 === "") { + const path22 = getURLPath(subRequest.url); + if (!path22 || path22 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path20 = getURLPath(url3); - if (path20 && path20 !== "/") { + const path22 = getURLPath(url3); + if (path22 && path22 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path22.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path20.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path22.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core15 = __importStar4(require_core()); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core15.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path22.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core15.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core15.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path22.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core15.debug(`Archive path: ${archivePath}`); core15.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path22.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path22.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79593,7 +79593,7 @@ var require_tool_cache = __commonJS({ var fs20 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -79614,8 +79614,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path20.join(_getTempDirectory(), crypto2.randomUUID()); - yield io7.mkdirP(path20.dirname(dest)); + dest = dest || path22.join(_getTempDirectory(), crypto2.randomUUID()); + yield io7.mkdirP(path22.dirname(dest)); core15.debug(`Downloading ${url2}`); core15.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -79702,7 +79702,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path20.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path22.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -79878,7 +79878,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs20.readdirSync(sourceDir)) { - const s = path20.join(sourceDir, itemName); + const s = path22.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -79896,7 +79896,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path20.join(destFolder, targetFile); + const destPath = path22.join(destFolder, targetFile); core15.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -79920,7 +79920,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path22.join(_getCacheDirectory(), toolName, versionSpec, arch2); core15.debug(`checking cache: ${cachePath}`); if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) { core15.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -79935,12 +79935,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os5.arch(); - const toolPath = path20.join(_getCacheDirectory(), toolName); + const toolPath = path22.join(_getCacheDirectory(), toolName); if (fs20.existsSync(toolPath)) { const children = fs20.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path20.join(toolPath, child, arch2 || ""); + const fullPath = path22.join(toolPath, child, arch2 || ""); if (fs20.existsSync(fullPath) && fs20.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -79995,7 +79995,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path20.join(_getTempDirectory(), crypto2.randomUUID()); + dest = path22.join(_getTempDirectory(), crypto2.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path22.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core15.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -80013,7 +80013,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path22.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs20.writeFileSync(markerPath, ""); core15.debug("finished caching tool"); @@ -80728,7 +80728,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -80736,7 +80736,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path20.dirname(p); + let result = path22.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -80774,7 +80774,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path20.sep; + root += path22.sep; } return root + itemPath; } @@ -80812,10 +80812,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path20.sep)) { + if (!p.endsWith(path22.sep)) { return p; } - if (p === path20.sep) { + if (p === path22.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -80966,7 +80966,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -80981,12 +80981,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path20.sep); + this.segments = itemPath.split(path22.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path20.basename(remaining); + const basename = path22.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -81004,7 +81004,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path22.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -81015,12 +81015,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path22.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path20.sep; + result += path22.sep; } result += this.segments[i]; } @@ -81068,7 +81068,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -81097,7 +81097,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path22.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -81121,8 +81121,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path20.sep}`; + if (!itemPath.endsWith(path22.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path22.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -81157,9 +81157,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path22.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path22.sep}`)) { homedir2 = homedir2 || os5.homedir(); (0, assert_1.default)(homedir2, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -81243,8 +81243,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path20, level) { - this.path = path20; + constructor(path22, level) { + this.path = path22; this.level = level; } }; @@ -81370,7 +81370,7 @@ var require_internal_globber2 = __commonJS({ var core15 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -81446,7 +81446,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path20.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path22.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -81456,7 +81456,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path22.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -81608,7 +81608,7 @@ var require_internal_hash_files = __commonJS({ var fs20 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path20 = __importStar4(require("path")); + var path22 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -81624,7 +81624,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path20.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path22.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -81724,14 +81724,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path20, name, argument) { - if (Array.isArray(path20)) { - this.path = path20; - this.property = path20.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path22, name, argument) { + if (Array.isArray(path22)) { + this.path = path22; + this.property = path22.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path20 !== void 0) { - this.property = path20; + } else if (path22 !== void 0) { + this.property = path22; } if (message) { this.message = message; @@ -81822,16 +81822,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path20, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path22, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path20)) { - this.path = path20; - this.propertyPath = path20.reduce(function(sum, item) { + if (Array.isArray(path22)) { + this.path = path22; + this.propertyPath = path22.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path20; + this.propertyPath = path22; } this.base = base; this.schemas = schemas; @@ -81840,10 +81840,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path20 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path22 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path20, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path22, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -86320,12 +86320,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path20) { - const isExtendedLengthPath = path20.startsWith("\\\\?\\"); +function slash(path22) { + const isExtendedLengthPath = path22.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path20; + return path22; } - return path20.replace(/\\/g, "/"); + return path22.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -86413,8 +86413,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path20 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path20) ? path20 : import_node_path3.default.join(cwd, path20); + const path22 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path22) ? path22 : import_node_path3.default.join(cwd, path22); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -90154,6 +90154,7 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts +var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -90166,7 +90167,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -90175,14 +90176,14 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; // src/analyze.ts var fs15 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path18 = __toESM(require("path")); var import_perf_hooks2 = require("perf_hooks"); var io5 = __toESM(require_io()); @@ -90360,7 +90361,7 @@ var core11 = __toESM(require_core()); // src/codeql.ts var fs14 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path16 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -90603,7 +90604,7 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs9 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path11 = __toESM(require("path")); // src/caching-utils.ts var core6 = __toESM(require_core()); @@ -90628,11 +90629,11 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs8 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/feature-flags.ts var fs7 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path9 = __toESM(require("path")); var semver4 = __toESM(require_semver2()); // src/defaults.json @@ -90642,7 +90643,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var crypto = __toESM(require("crypto")); var fs6 = __toESM(require("fs")); -var path7 = __toESM(require("path")); +var path8 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -90768,8 +90769,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path20 = decodeGitFilePath(match[2]); - fileOidMap[path20] = oid; + const path22 = decodeGitFilePath(match[2]); + fileOidMap[path22] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -90893,7 +90894,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path7.join(config.dbLocation, "base-database-oids.json"); + return path8.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -90903,7 +90904,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path7.join( + const overlayChangesFile = path8.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -91229,7 +91230,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -91505,7 +91506,7 @@ async function getDiffInformedAnalysisBranches(codeql, features, logger) { return branches; } function getDiffRangesJsonFilePath() { - return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); } function writeDiffRangesJsonFile(logger, ranges) { const jsonContents = JSON.stringify(ranges, null, 2); @@ -91678,7 +91679,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path10.join(tempDir, "config"); + return path11.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -91734,7 +91735,7 @@ function getPrimaryAnalysisConfig(config) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path12 = __toESM(require("path")); +var path14 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -91796,6 +91797,7 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); +var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -91944,7 +91946,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (tarPath.endsWith(`.${ext}`)) { + if (path12.extname(tarPath) === `.${ext}`) { return method; } } @@ -91954,7 +91956,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os2 = __toESM(require("os")); -var path11 = __toESM(require("path")); +var path13 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -92087,7 +92089,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path11.join( + return path13.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -92230,7 +92232,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path12.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -92568,7 +92570,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path12.join(tempDir, v4_default()); + return path14.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -92601,7 +92603,7 @@ function isReservedToolsValue(tools) { // src/tracer-config.ts var fs13 = __toESM(require("fs")); -var path13 = __toESM(require("path")); +var path15 = __toESM(require("path")); async function shouldEnableIndirectTracing(codeql, config) { if (config.buildMode === "none" /* None */) { return false; @@ -92616,7 +92618,7 @@ async function endTracingForCluster(codeql, config, logger) { logger.info( "Unsetting build tracing environment variables. Subsequent steps of this job will not be traced." ); - const envVariablesFile = path13.resolve( + const envVariablesFile = path15.resolve( config.dbLocation, "temp/tracingEnvironment/end-tracing.json" ); @@ -92672,7 +92674,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path14.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path16.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -92733,7 +92735,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path14.join( + const tracingConfigPath = path16.join( extractorPath, "tools", "tracing-config.lua" @@ -92809,7 +92811,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path14.join( + const autobuildCmd = path16.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -93222,7 +93224,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path14.resolve(config.tempDir, "user-config.yaml"); + return path16.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -93497,7 +93499,7 @@ function dbIsFinalized(config, language, logger) { const dbPath = getCodeQLDatabasePath(config, language); try { const dbInfo = load( - fs15.readFileSync(path16.resolve(dbPath, "codeql-database.yml"), "utf8") + fs15.readFileSync(path18.resolve(dbPath, "codeql-database.yml"), "utf8") ); return !("inProgress" in dbInfo); } catch { @@ -93612,7 +93614,7 @@ Error Response: ${JSON.stringify(error2.response, null, 2)}` } } function getDiffRanges(fileDiff, logger) { - const filename = path16.join(getRequiredInput("checkout_path"), fileDiff.filename).replaceAll(path16.sep, "/"); + const filename = path18.join(getRequiredInput("checkout_path"), fileDiff.filename).replaceAll(path18.sep, "/"); if (fileDiff.patch === void 0) { if (fileDiff.changes === 0) { return []; @@ -93674,10 +93676,10 @@ function writeDiffRangeDataExtensionPack(logger, ranges) { if (ranges.length === 0) { ranges = [{ path: "", startLine: 0, endLine: 0 }]; } - const diffRangeDir = path16.join(getTemporaryDirectory(), "pr-diff-range"); + const diffRangeDir = path18.join(getTemporaryDirectory(), "pr-diff-range"); fs15.mkdirSync(diffRangeDir, { recursive: true }); fs15.writeFileSync( - path16.join(diffRangeDir, "qlpack.yml"), + path18.join(diffRangeDir, "qlpack.yml"), ` name: codeql-action/pr-diff-range version: 0.0.0 @@ -93709,7 +93711,7 @@ extensions: data = ' - ["", 0, 0]\n'; } const extensionContents = header + data; - const extensionFilePath = path16.join(diffRangeDir, "pr-diff-range.yml"); + const extensionFilePath = path18.join(diffRangeDir, "pr-diff-range.yml"); fs15.writeFileSync(extensionFilePath, extensionContents); logger.debug( `Wrote pr-diff-range extension pack to ${extensionFilePath}: @@ -93830,7 +93832,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, if (analysis.kind === "code-quality" /* CodeQuality */) { category = analysis.fixCategory(logger, automationDetailsId); } - const sarifFile = path16.join( + const sarifFile = path18.join( sarifFolder, addSarifExtension(analysis, language) ); @@ -94168,7 +94170,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs18 = __toESM(require("fs")); -var path18 = __toESM(require("path")); +var path20 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core13 = __toESM(require_core()); @@ -95481,10 +95483,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path18.resolve(tempDir, "combined-sarif"); + const baseTempDir = path20.resolve(tempDir, "combined-sarif"); fs18.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs18.mkdtempSync(path18.resolve(baseTempDir, "output-")); - const outputFile = path18.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs18.mkdtempSync(path20.resolve(baseTempDir, "output-")); + const outputFile = path20.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -95517,7 +95519,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path18.join( + const payloadSaveFile = path20.join( getTemporaryDirectory(), "payload.json" ); @@ -95561,9 +95563,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs18.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path18.resolve(dir, entry.name)); + sarifFiles.push(path20.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path18.resolve(dir, entry.name)); + walkSarifFiles(path20.resolve(dir, entry.name)); } } }; @@ -95784,7 +95786,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path18.resolve( + const outputFile = path20.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -95932,7 +95934,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path18.join(checkoutPath, locationUri).replaceAll(path18.sep, "/"); + const locationPath = path20.join(checkoutPath, locationUri).replaceAll(path20.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); @@ -95994,7 +95996,7 @@ function doesGoExtractionOutputExist(config) { ".trap.tar.gz", ".trap.tar.br", ".trap.tar" - ].some((ext) => fileName.endsWith(ext)) + ].some((ext) => import_path4.default.extname(fileName) === ext) ); } async function runAutobuildIfLegacyGoWorkflow(config, logger) { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 19b39f77ed..bce64b8d07 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path19 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path21 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path19 && !path19.startsWith("/")) { - path19 = `/${path19}`; + if (path21 && !path21.startsWith("/")) { + path21 = `/${path21}`; } - url2 = new URL(origin + path19); + url2 = new URL(origin + path21); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path19) { - if (typeof path19 !== "string") { + module2.exports = function basename(path21) { + if (typeof path21 !== "string") { return ""; } - for (var i = path19.length - 1; i >= 0; --i) { - switch (path19.charCodeAt(i)) { + for (var i = path21.length - 1; i >= 0; --i) { + switch (path21.charCodeAt(i)) { case 47: // '/' case 92: - path19 = path19.slice(i + 1); - return path19 === ".." || path19 === "." ? "" : path19; + path21 = path21.slice(i + 1); + return path21 === ".." || path21 === "." ? "" : path21; } } - return path19 === ".." || path19 === "." ? "" : path19; + return path21 === ".." || path21 === "." ? "" : path21; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path19, + path: path21, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path19 !== "string") { + if (typeof path21 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path19[0] !== "/" && !(path19.startsWith("http://") || path19.startsWith("https://")) && method !== "CONNECT") { + } else if (path21[0] !== "/" && !(path21.startsWith("http://") || path21.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path19) !== null) { + } else if (invalidPathRegex.exec(path21) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path19, query) : path19; + this.path = query ? util.buildURL(path21, query) : path21; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path19 = search ? `${pathname}${search}` : pathname; + const path21 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path19; + this.opts.path = path21; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path19, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path21, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path19} HTTP/1.1\r + let header = `${method} ${path21} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path19, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path21, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path19; + headers[HTTP2_HEADER_PATH] = path21; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path19) { - if (typeof path19 !== "string") { - return path19; + function safeUrl(path21) { + if (typeof path21 !== "string") { + return path21; } - const pathSegments = path19.split("?"); + const pathSegments = path21.split("?"); if (pathSegments.length !== 2) { - return path19; + return path21; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path19, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path19); + function matchKey(mockDispatch2, { path: path21, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path21); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path19 }) => matchValue(safeUrl(path19), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path21 }) => matchValue(safeUrl(path21), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path19, method, body, headers, query } = opts; + const { path: path21, method, body, headers, query } = opts; return { - path: path19, + path: path21, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path19, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path21, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path19, + Path: path21, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path19) { - for (const char of path19) { + function validateCookiePath(path21) { + for (const char of path21) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path19 = opts.path; + let path21 = opts.path; if (!opts.path.startsWith("/")) { - path19 = `/${path19}`; + path21 = `/${path21}`; } - url2 = new URL(util.parseOrigin(url2).origin + path19); + url2 = new URL(util.parseOrigin(url2).origin + path21); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path19.sep); + return pth.replace(/[/\\]/g, path21.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs20 = __importStar4(require("fs")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); _a = fs20.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path19.extname(filePath).toUpperCase(); + const upperExt = path21.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path19.dirname(filePath); - const upperName = path19.basename(filePath).toUpperCase(); + const directory = path21.dirname(filePath); + const upperName = path21.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path19.join(directory, actualName); + filePath = path21.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path19.join(dest, path19.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path21.join(dest, path21.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path19.relative(source, newDest) === "") { + if (path21.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path19.join(dest, path19.basename(source)); + dest = path21.join(dest, path21.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path19.dirname(dest)); + yield mkdirP(path21.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path19.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path21.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path19.sep)) { + if (tool.includes(path21.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path19.delimiter)) { + for (const p of process.env.PATH.split(path21.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path19.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path21.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os3 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path19.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path21.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve8, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os3 = __importStar4(require("os")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path19.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path21.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path19 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path19} does not exist${os_1.EOL}`); + const path21 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os3 = require("os"); - var path19 = require("path"); + var path21 = require("path"); var IS_WINDOWS_PLATFORM = os3.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path19.resolve(cwd, filepath); + return path21.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path19 = require("path"); + var path21 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path19.sep, + SEP: path21.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path19 = require("path"); + var path21 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path19.sep === "\\"; + return win32 === true || path21.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path19 = require("path"); + var path21 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path19.basename(input)); + return regex.test(path21.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path19 = require("path"); + var path21 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path19.basename(pattern); + const basename = path21.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path19.isAbsolute(pattern); + return path21.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs20 = require_fs(); exports2.fs = fs20; - var path19 = require_path(); - exports2.path = path19; + var path21 = require_path(); + exports2.path = path21; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path19, settings, callback) { - settings.fs.lstat(path19, (lstatError, lstat) => { + function read(path21, settings, callback) { + settings.fs.lstat(path21, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path19, (statError, stat) => { + settings.fs.stat(path21, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path19, settings) { - const lstat = settings.fs.lstatSync(path19); + function read(path21, settings) { + const lstat = settings.fs.lstatSync(path21); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path19); + const stat = settings.fs.statSync(path21); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path19, optionsOrSettingsOrCallback, callback) { + function stat(path21, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path19, getSettings(), optionsOrSettingsOrCallback); + async.read(path21, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path19, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path19, optionsOrSettings) { + function statSync3(path21, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path19, settings); + return sync.read(path21, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path19 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path21 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path19, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path21, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path19, + path: path21, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path19 = require("path"); + var path21 = require("path"); var fsStat = require_out(); var fs20 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs20.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path19.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path19, optionsOrSettingsOrCallback, callback) { + function scandir(path21, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path19, getSettings(), optionsOrSettingsOrCallback); + async.read(path21, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path19, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path19, optionsOrSettings) { + function scandirSync(path21, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path19, settings); + return sync.read(path21, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path19 = require("path"); + var path21 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path19.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path19 = require("path"); + var path21 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path19.resolve(this._settings.cwd, filepath); + return path21.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path19 = require("path"); + var path21 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path19.resolve(this._settings.cwd, task.base); + return path21.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path19, checkUnignored, mode) { + test(path21, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path19); + const matched = rule[mode].test(path21); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path19, originalPath, doThrow) => { - if (!isString(path19)) { + var checkPath = (path21, originalPath, doThrow) => { + if (!isString(path21)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path19) { + if (!path21) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path19)) { + if (checkPath.isNotRelative(path21)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path19) => REGEX_TEST_INVALID_PATH.test(path19); + var isNotRelative = (path21) => REGEX_TEST_INVALID_PATH.test(path21); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path19 = originalPath && checkPath.convert(originalPath); + const path21 = originalPath && checkPath.convert(originalPath); checkPath( - path19, + path21, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path19, cache, checkUnignored, slices); + return this._t(path21, cache, checkUnignored, slices); } - checkIgnore(path19) { - if (!REGEX_TEST_TRAILING_SLASH.test(path19)) { - return this.test(path19); + checkIgnore(path21) { + if (!REGEX_TEST_TRAILING_SLASH.test(path21)) { + return this.test(path21); } - const slices = path19.split(SLASH).filter(Boolean); + const slices = path21.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path19, false, MODE_CHECK_IGNORE); + return this._rules.test(path21, false, MODE_CHECK_IGNORE); } - _t(path19, cache, checkUnignored, slices) { - if (path19 in cache) { - return cache[path19]; + _t(path21, cache, checkUnignored, slices) { + if (path21 in cache) { + return cache[path21]; } if (!slices) { - slices = path19.split(SLASH).filter(Boolean); + slices = path21.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path19] = this._rules.test(path19, checkUnignored, MODE_IGNORE); + return cache[path21] = this._rules.test(path21, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path19] = parent.ignored ? parent : this._rules.test(path19, checkUnignored, MODE_IGNORE); + return cache[path21] = parent.ignored ? parent : this._rules.test(path21, checkUnignored, MODE_IGNORE); } - ignores(path19) { - return this._test(path19, this._ignoreCache, false).ignored; + ignores(path21) { + return this._test(path21, this._ignoreCache, false).ignored; } createFilter() { - return (path19) => !this.ignores(path19); + return (path21) => !this.ignores(path21); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path19) { - return this._test(path19, this._testCache, true); + test(path21) { + return this._test(path21, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path19) => checkPath(path19 && checkPath.convert(path19), path19, RETURN_FALSE); + var isPathValid = (path21) => checkPath(path21 && checkPath.convert(path21), path21, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path19) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path19) || isNotRelative(path19); + checkPath.isNotRelative = (path21) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path21) || isNotRelative(path21); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path19.dirname(p); + let result = path21.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path19.sep; + root += path21.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path19.sep)) { + if (!p.endsWith(path21.sep)) { return p; } - if (p === path19.sep) { + if (p === path21.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path19 = (function() { + var path21 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path19.sep; + minimatch.sep = path21.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path19.sep !== "/") { - pattern = pattern.split(path19.sep).join("/"); + if (!options.allowWindowsEscape && path21.sep !== "/") { + pattern = pattern.split(path21.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path19.sep !== "/") { - f = f.split(path19.sep).join("/"); + if (path21.sep !== "/") { + f = f.split(path21.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path19.sep); + this.segments = itemPath.split(path21.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path19.basename(remaining); + const basename = path21.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path19.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path19.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path19.sep; + result += path21.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path19.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path19.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path19.sep}`; + if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path21.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path19.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path19.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { homedir = homedir || os3.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path19, level) { - this.path = path19; + constructor(path21, level) { + this.path = path21; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core18 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path19.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs20 = __importStar4(require("fs")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path19.join(baseLocation, "actions", "temp"); + tempDirectory = path21.join(baseLocation, "actions", "temp"); } - const dest = path19.join(tempDirectory, crypto.randomUUID()); + const dest = path21.join(tempDirectory, crypto.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path19.relative(workspace, file).replace(new RegExp(`\\${path19.sep}`, "g"), "/"); + const relativeFile = path21.relative(workspace, file).replace(new RegExp(`\\${path21.sep}`, "g"), "/"); core18.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path19 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path19.startsWith("/")) { - path19 = path19.substring(1); + let path21 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path21.startsWith("/")) { + path21 = path21.substring(1); } - if (isAbsoluteUrl(path19)) { - requestUrl = path19; + if (isAbsoluteUrl(path21)) { + requestUrl = path21; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path19); + requestUrl = appendPath(requestUrl, path21); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path19 = pathToAppend.substring(0, searchStart); + const path21 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path19; + newPath = newPath + path21; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path19 = urlParsed.pathname; - path19 = path19 || "/"; - path19 = escape(path19); - urlParsed.pathname = path19; + let path21 = urlParsed.pathname; + path21 = path21 || "/"; + path21 = escape(path21); + urlParsed.pathname = path21; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path19 = urlParsed.pathname; - path19 = path19 ? path19.endsWith("/") ? `${path19}${name}` : `${path19}/${name}` : name; - urlParsed.pathname = path19; + let path21 = urlParsed.pathname; + path21 = path21 ? path21.endsWith("/") ? `${path21}${name}` : `${path21}/${name}` : name; + urlParsed.pathname = path21; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path19 = getURLPath(request.url) || "/"; + const path21 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path19}`; + canonicalizedResourceString += `/${this.factory.accountName}${path21}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path19 = getURLPath(request.url) || "/"; + const path21 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path19}`; + canonicalizedResourceString += `/${options.accountName}${path21}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path19 = getURLPath(subRequest.url); - if (!path19 || path19 === "") { + const path21 = getURLPath(subRequest.url); + if (!path21 || path21 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path19 = getURLPath(url3); - if (path19 && path19 !== "/") { + const path21 = getURLPath(url3); + if (path21 && path21 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path19.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path19.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path21.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core18 = __importStar4(require_core()); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core18.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path19.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core18.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core18.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path19.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core18.debug(`Archive path: ${archivePath}`); core18.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path19.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path19.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79593,7 +79593,7 @@ var require_tool_cache = __commonJS({ var fs20 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os3 = __importStar4(require("os")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -79614,8 +79614,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path19.join(_getTempDirectory(), crypto.randomUUID()); - yield io7.mkdirP(path19.dirname(dest)); + dest = dest || path21.join(_getTempDirectory(), crypto.randomUUID()); + yield io7.mkdirP(path21.dirname(dest)); core18.debug(`Downloading ${url2}`); core18.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -79702,7 +79702,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path19.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path21.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -79878,7 +79878,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs20.readdirSync(sourceDir)) { - const s = path19.join(sourceDir, itemName); + const s = path21.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -79896,7 +79896,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path19.join(destFolder, targetFile); + const destPath = path21.join(destFolder, targetFile); core18.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -79920,7 +79920,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path19.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path21.join(_getCacheDirectory(), toolName, versionSpec, arch2); core18.debug(`checking cache: ${cachePath}`); if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) { core18.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -79935,12 +79935,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os3.arch(); - const toolPath = path19.join(_getCacheDirectory(), toolName); + const toolPath = path21.join(_getCacheDirectory(), toolName); if (fs20.existsSync(toolPath)) { const children = fs20.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path19.join(toolPath, child, arch2 || ""); + const fullPath = path21.join(toolPath, child, arch2 || ""); if (fs20.existsSync(fullPath) && fs20.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -79995,7 +79995,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path19.join(_getTempDirectory(), crypto.randomUUID()); + dest = path21.join(_getTempDirectory(), crypto.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path21.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core18.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -80013,7 +80013,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path21.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs20.writeFileSync(markerPath, ""); core18.debug("finished caching tool"); @@ -82788,13 +82788,13 @@ These characters are not allowed in the artifact name due to limitations with ce (0, core_1.info)(`Artifact name is valid!`); } exports2.validateArtifactName = validateArtifactName; - function validateFilePath(path19) { - if (!path19) { + function validateFilePath(path21) { + if (!path21) { throw new Error(`Provided file path input during validation is empty`); } for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactFilePathCharacters) { - if (path19.includes(invalidCharacterKey)) { - throw new Error(`The path for one of the files in artifact is not valid: ${path19}. Contains the following character: ${errorMessageForCharacter} + if (path21.includes(invalidCharacterKey)) { + throw new Error(`The path for one of the files in artifact is not valid: ${path21}. Contains the following character: ${errorMessageForCharacter} Invalid characters include: ${Array.from(invalidArtifactFilePathCharacters.values()).toString()} @@ -83659,8 +83659,8 @@ var require_minimatch2 = __commonJS({ return new Minimatch(pattern, options).match(p); }; module2.exports = minimatch; - var path19 = require_path2(); - minimatch.sep = path19.sep; + var path21 = require_path2(); + minimatch.sep = path21.sep; var GLOBSTAR = Symbol("globstar **"); minimatch.GLOBSTAR = GLOBSTAR; var expand = require_brace_expansion2(); @@ -84169,8 +84169,8 @@ var require_minimatch2 = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; const options = this.options; - if (path19.sep !== "/") { - f = f.split(path19.sep).join("/"); + if (path21.sep !== "/") { + f = f.split(path21.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -84268,8 +84268,8 @@ var require_readdir_glob = __commonJS({ }); }); } - async function* exploreWalkAsync(dir, path19, followSymlinks, useStat, shouldSkip, strict) { - let files = await readdir(path19 + dir, strict); + async function* exploreWalkAsync(dir, path21, followSymlinks, useStat, shouldSkip, strict) { + let files = await readdir(path21 + dir, strict); for (const file of files) { let name = file.name; if (name === void 0) { @@ -84278,7 +84278,7 @@ var require_readdir_glob = __commonJS({ } const filename = dir + "/" + name; const relative2 = filename.slice(1); - const absolute = path19 + "/" + relative2; + const absolute = path21 + "/" + relative2; let stats = null; if (useStat || followSymlinks) { stats = await stat(absolute, followSymlinks); @@ -84292,15 +84292,15 @@ var require_readdir_glob = __commonJS({ if (stats.isDirectory()) { if (!shouldSkip(relative2)) { yield { relative: relative2, absolute, stats }; - yield* exploreWalkAsync(filename, path19, followSymlinks, useStat, shouldSkip, false); + yield* exploreWalkAsync(filename, path21, followSymlinks, useStat, shouldSkip, false); } } else { yield { relative: relative2, absolute, stats }; } } } - async function* explore(path19, followSymlinks, useStat, shouldSkip) { - yield* exploreWalkAsync("", path19, followSymlinks, useStat, shouldSkip, true); + async function* explore(path21, followSymlinks, useStat, shouldSkip) { + yield* exploreWalkAsync("", path21, followSymlinks, useStat, shouldSkip, true); } function readOptions(options) { return { @@ -86338,14 +86338,14 @@ var require_polyfills = __commonJS({ fs20.fstatSync = statFixSync(fs20.fstatSync); fs20.lstatSync = statFixSync(fs20.lstatSync); if (fs20.chmod && !fs20.lchmod) { - fs20.lchmod = function(path19, mode, cb) { + fs20.lchmod = function(path21, mode, cb) { if (cb) process.nextTick(cb); }; fs20.lchmodSync = function() { }; } if (fs20.chown && !fs20.lchown) { - fs20.lchown = function(path19, uid, gid, cb) { + fs20.lchown = function(path21, uid, gid, cb) { if (cb) process.nextTick(cb); }; fs20.lchownSync = function() { @@ -86412,9 +86412,9 @@ var require_polyfills = __commonJS({ }; })(fs20.readSync); function patchLchmod(fs21) { - fs21.lchmod = function(path19, mode, callback) { + fs21.lchmod = function(path21, mode, callback) { fs21.open( - path19, + path21, constants.O_WRONLY | constants.O_SYMLINK, mode, function(err, fd) { @@ -86430,8 +86430,8 @@ var require_polyfills = __commonJS({ } ); }; - fs21.lchmodSync = function(path19, mode) { - var fd = fs21.openSync(path19, constants.O_WRONLY | constants.O_SYMLINK, mode); + fs21.lchmodSync = function(path21, mode) { + var fd = fs21.openSync(path21, constants.O_WRONLY | constants.O_SYMLINK, mode); var threw = true; var ret; try { @@ -86452,8 +86452,8 @@ var require_polyfills = __commonJS({ } function patchLutimes(fs21) { if (constants.hasOwnProperty("O_SYMLINK") && fs21.futimes) { - fs21.lutimes = function(path19, at, mt, cb) { - fs21.open(path19, constants.O_SYMLINK, function(er, fd) { + fs21.lutimes = function(path21, at, mt, cb) { + fs21.open(path21, constants.O_SYMLINK, function(er, fd) { if (er) { if (cb) cb(er); return; @@ -86465,8 +86465,8 @@ var require_polyfills = __commonJS({ }); }); }; - fs21.lutimesSync = function(path19, at, mt) { - var fd = fs21.openSync(path19, constants.O_SYMLINK); + fs21.lutimesSync = function(path21, at, mt) { + var fd = fs21.openSync(path21, constants.O_SYMLINK); var ret; var threw = true; try { @@ -86584,11 +86584,11 @@ var require_legacy_streams = __commonJS({ ReadStream, WriteStream }; - function ReadStream(path19, options) { - if (!(this instanceof ReadStream)) return new ReadStream(path19, options); + function ReadStream(path21, options) { + if (!(this instanceof ReadStream)) return new ReadStream(path21, options); Stream.call(this); var self2 = this; - this.path = path19; + this.path = path21; this.fd = null; this.readable = true; this.paused = false; @@ -86633,10 +86633,10 @@ var require_legacy_streams = __commonJS({ self2._read(); }); } - function WriteStream(path19, options) { - if (!(this instanceof WriteStream)) return new WriteStream(path19, options); + function WriteStream(path21, options) { + if (!(this instanceof WriteStream)) return new WriteStream(path21, options); Stream.call(this); - this.path = path19; + this.path = path21; this.fd = null; this.writable = true; this.flags = "w"; @@ -86779,14 +86779,14 @@ var require_graceful_fs = __commonJS({ fs21.createWriteStream = createWriteStream2; var fs$readFile = fs21.readFile; fs21.readFile = readFile; - function readFile(path19, options, cb) { + function readFile(path21, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$readFile(path19, options, cb); - function go$readFile(path20, options2, cb2, startTime) { - return fs$readFile(path20, options2, function(err) { + return go$readFile(path21, options, cb); + function go$readFile(path22, options2, cb2, startTime) { + return fs$readFile(path22, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$readFile, [path20, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$readFile, [path22, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86796,14 +86796,14 @@ var require_graceful_fs = __commonJS({ } var fs$writeFile = fs21.writeFile; fs21.writeFile = writeFile; - function writeFile(path19, data, options, cb) { + function writeFile(path21, data, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$writeFile(path19, data, options, cb); - function go$writeFile(path20, data2, options2, cb2, startTime) { - return fs$writeFile(path20, data2, options2, function(err) { + return go$writeFile(path21, data, options, cb); + function go$writeFile(path22, data2, options2, cb2, startTime) { + return fs$writeFile(path22, data2, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$writeFile, [path20, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$writeFile, [path22, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86814,14 +86814,14 @@ var require_graceful_fs = __commonJS({ var fs$appendFile = fs21.appendFile; if (fs$appendFile) fs21.appendFile = appendFile; - function appendFile(path19, data, options, cb) { + function appendFile(path21, data, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$appendFile(path19, data, options, cb); - function go$appendFile(path20, data2, options2, cb2, startTime) { - return fs$appendFile(path20, data2, options2, function(err) { + return go$appendFile(path21, data, options, cb); + function go$appendFile(path22, data2, options2, cb2, startTime) { + return fs$appendFile(path22, data2, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$appendFile, [path20, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$appendFile, [path22, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86852,31 +86852,31 @@ var require_graceful_fs = __commonJS({ var fs$readdir = fs21.readdir; fs21.readdir = readdir; var noReaddirOptionVersions = /^v[0-5]\./; - function readdir(path19, options, cb) { + function readdir(path21, options, cb) { if (typeof options === "function") cb = options, options = null; - var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir2(path20, options2, cb2, startTime) { - return fs$readdir(path20, fs$readdirCallback( - path20, + var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir2(path22, options2, cb2, startTime) { + return fs$readdir(path22, fs$readdirCallback( + path22, options2, cb2, startTime )); - } : function go$readdir2(path20, options2, cb2, startTime) { - return fs$readdir(path20, options2, fs$readdirCallback( - path20, + } : function go$readdir2(path22, options2, cb2, startTime) { + return fs$readdir(path22, options2, fs$readdirCallback( + path22, options2, cb2, startTime )); }; - return go$readdir(path19, options, cb); - function fs$readdirCallback(path20, options2, cb2, startTime) { + return go$readdir(path21, options, cb); + function fs$readdirCallback(path22, options2, cb2, startTime) { return function(err, files) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) enqueue([ go$readdir, - [path20, options2, cb2], + [path22, options2, cb2], err, startTime || Date.now(), Date.now() @@ -86947,7 +86947,7 @@ var require_graceful_fs = __commonJS({ enumerable: true, configurable: true }); - function ReadStream(path19, options) { + function ReadStream(path21, options) { if (this instanceof ReadStream) return fs$ReadStream.apply(this, arguments), this; else @@ -86967,7 +86967,7 @@ var require_graceful_fs = __commonJS({ } }); } - function WriteStream(path19, options) { + function WriteStream(path21, options) { if (this instanceof WriteStream) return fs$WriteStream.apply(this, arguments), this; else @@ -86985,22 +86985,22 @@ var require_graceful_fs = __commonJS({ } }); } - function createReadStream2(path19, options) { - return new fs21.ReadStream(path19, options); + function createReadStream2(path21, options) { + return new fs21.ReadStream(path21, options); } - function createWriteStream2(path19, options) { - return new fs21.WriteStream(path19, options); + function createWriteStream2(path21, options) { + return new fs21.WriteStream(path21, options); } var fs$open = fs21.open; fs21.open = open; - function open(path19, flags, mode, cb) { + function open(path21, flags, mode, cb) { if (typeof mode === "function") cb = mode, mode = null; - return go$open(path19, flags, mode, cb); - function go$open(path20, flags2, mode2, cb2, startTime) { - return fs$open(path20, flags2, mode2, function(err, fd) { + return go$open(path21, flags, mode, cb); + function go$open(path22, flags2, mode2, cb2, startTime) { + return fs$open(path22, flags2, mode2, function(err, fd) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$open, [path20, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$open, [path22, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -89101,22 +89101,22 @@ var require_lazystream = __commonJS({ // node_modules/normalize-path/index.js var require_normalize_path = __commonJS({ "node_modules/normalize-path/index.js"(exports2, module2) { - module2.exports = function(path19, stripTrailing) { - if (typeof path19 !== "string") { + module2.exports = function(path21, stripTrailing) { + if (typeof path21 !== "string") { throw new TypeError("expected path to be a string"); } - if (path19 === "\\" || path19 === "/") return "/"; - var len = path19.length; - if (len <= 1) return path19; + if (path21 === "\\" || path21 === "/") return "/"; + var len = path21.length; + if (len <= 1) return path21; var prefix = ""; - if (len > 4 && path19[3] === "\\") { - var ch = path19[2]; - if ((ch === "?" || ch === ".") && path19.slice(0, 2) === "\\\\") { - path19 = path19.slice(2); + if (len > 4 && path21[3] === "\\") { + var ch = path21[2]; + if ((ch === "?" || ch === ".") && path21.slice(0, 2) === "\\\\") { + path21 = path21.slice(2); prefix = "//"; } } - var segs = path19.split(/[/\\]+/); + var segs = path21.split(/[/\\]+/); if (stripTrailing !== false && segs[segs.length - 1] === "") { segs.pop(); } @@ -97651,11 +97651,11 @@ var require_commonjs13 = __commonJS({ return (f) => f.length === len && f !== "." && f !== ".."; }; var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix"; - var path19 = { + var path21 = { win32: { sep: "\\" }, posix: { sep: "/" } }; - exports2.sep = defaultPlatform === "win32" ? path19.win32.sep : path19.posix.sep; + exports2.sep = defaultPlatform === "win32" ? path21.win32.sep : path21.posix.sep; exports2.minimatch.sep = exports2.sep; exports2.GLOBSTAR = Symbol("globstar **"); exports2.minimatch.GLOBSTAR = exports2.GLOBSTAR; @@ -100903,12 +100903,12 @@ var require_commonjs16 = __commonJS({ /** * Get the Path object referenced by the string path, resolved from this Path */ - resolve(path19) { - if (!path19) { + resolve(path21) { + if (!path21) { return this; } - const rootPath = this.getRootString(path19); - const dir = path19.substring(rootPath.length); + const rootPath = this.getRootString(path21); + const dir = path21.substring(rootPath.length); const dirParts = dir.split(this.splitSep); const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts); return result; @@ -101661,8 +101661,8 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - getRootString(path19) { - return node_path_1.win32.parse(path19).root; + getRootString(path21) { + return node_path_1.win32.parse(path21).root; } /** * @internal @@ -101709,8 +101709,8 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - getRootString(path19) { - return path19.startsWith("/") ? "/" : ""; + getRootString(path21) { + return path21.startsWith("/") ? "/" : ""; } /** * @internal @@ -101800,11 +101800,11 @@ var require_commonjs16 = __commonJS({ /** * Get the depth of a provided path, string, or the cwd */ - depth(path19 = this.cwd) { - if (typeof path19 === "string") { - path19 = this.cwd.resolve(path19); + depth(path21 = this.cwd) { + if (typeof path21 === "string") { + path21 = this.cwd.resolve(path21); } - return path19.depth(); + return path21.depth(); } /** * Return the cache of child entries. Exposed so subclasses can create @@ -102291,9 +102291,9 @@ var require_commonjs16 = __commonJS({ process6(); return results; } - chdir(path19 = this.cwd) { + chdir(path21 = this.cwd) { const oldCwd = this.cwd; - this.cwd = typeof path19 === "string" ? this.cwd.resolve(path19) : path19; + this.cwd = typeof path21 === "string" ? this.cwd.resolve(path21) : path21; this.cwd[setAsCwd](oldCwd); } }; @@ -102681,8 +102681,8 @@ var require_processor = __commonJS({ } // match, absolute, ifdir entries() { - return [...this.store.entries()].map(([path19, n]) => [ - path19, + return [...this.store.entries()].map(([path21, n]) => [ + path21, !!(n & 2), !!(n & 1) ]); @@ -102900,9 +102900,9 @@ var require_walker = __commonJS({ signal; maxDepth; includeChildMatches; - constructor(patterns, path19, opts) { + constructor(patterns, path21, opts) { this.patterns = patterns; - this.path = path19; + this.path = path21; this.opts = opts; this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/"; this.includeChildMatches = opts.includeChildMatches !== false; @@ -102921,11 +102921,11 @@ var require_walker = __commonJS({ }); } } - #ignored(path19) { - return this.seen.has(path19) || !!this.#ignore?.ignored?.(path19); + #ignored(path21) { + return this.seen.has(path21) || !!this.#ignore?.ignored?.(path21); } - #childrenIgnored(path19) { - return !!this.#ignore?.childrenIgnored?.(path19); + #childrenIgnored(path21) { + return !!this.#ignore?.childrenIgnored?.(path21); } // backpressure mechanism pause() { @@ -103141,8 +103141,8 @@ var require_walker = __commonJS({ exports2.GlobUtil = GlobUtil; var GlobWalker = class extends GlobUtil { matches = /* @__PURE__ */ new Set(); - constructor(patterns, path19, opts) { - super(patterns, path19, opts); + constructor(patterns, path21, opts) { + super(patterns, path21, opts); } matchEmit(e) { this.matches.add(e); @@ -103180,8 +103180,8 @@ var require_walker = __commonJS({ exports2.GlobWalker = GlobWalker; var GlobStream = class extends GlobUtil { results; - constructor(patterns, path19, opts) { - super(patterns, path19, opts); + constructor(patterns, path21, opts) { + super(patterns, path21, opts); this.results = new minipass_1.Minipass({ signal: this.signal, objectMode: true @@ -103537,7 +103537,7 @@ var require_commonjs17 = __commonJS({ var require_file3 = __commonJS({ "node_modules/archiver-utils/file.js"(exports2, module2) { var fs20 = require_graceful_fs(); - var path19 = require("path"); + var path21 = require("path"); var flatten = require_flatten(); var difference = require_difference(); var union = require_union(); @@ -103562,7 +103562,7 @@ var require_file3 = __commonJS({ return result; }; file.exists = function() { - var filepath = path19.join.apply(path19, arguments); + var filepath = path21.join.apply(path21, arguments); return fs20.existsSync(filepath); }; file.expand = function(...args) { @@ -103576,7 +103576,7 @@ var require_file3 = __commonJS({ }); if (options.filter) { matches = matches.filter(function(filepath) { - filepath = path19.join(options.cwd || "", filepath); + filepath = path21.join(options.cwd || "", filepath); try { if (typeof options.filter === "function") { return options.filter(filepath); @@ -103593,7 +103593,7 @@ var require_file3 = __commonJS({ file.expandMapping = function(patterns, destBase, options) { options = Object.assign({ rename: function(destBase2, destPath) { - return path19.join(destBase2 || "", destPath); + return path21.join(destBase2 || "", destPath); } }, options); var files = []; @@ -103601,14 +103601,14 @@ var require_file3 = __commonJS({ file.expand(options, patterns).forEach(function(src) { var destPath = src; if (options.flatten) { - destPath = path19.basename(destPath); + destPath = path21.basename(destPath); } if (options.ext) { destPath = destPath.replace(/(\.[^\/]*)?$/, options.ext); } var dest = options.rename(destBase, destPath, options); if (options.cwd) { - src = path19.join(options.cwd, src); + src = path21.join(options.cwd, src); } dest = dest.replace(pathSeparatorRe, "/"); src = src.replace(pathSeparatorRe, "/"); @@ -103690,7 +103690,7 @@ var require_file3 = __commonJS({ var require_archiver_utils = __commonJS({ "node_modules/archiver-utils/index.js"(exports2, module2) { var fs20 = require_graceful_fs(); - var path19 = require("path"); + var path21 = require("path"); var isStream = require_is_stream(); var lazystream = require_lazystream(); var normalizePath = require_normalize_path(); @@ -103778,11 +103778,11 @@ var require_archiver_utils = __commonJS({ if (!file) { return callback(null, results); } - filepath = path19.join(dirpath, file); + filepath = path21.join(dirpath, file); fs20.stat(filepath, function(err2, stats) { results.push({ path: filepath, - relative: path19.relative(base, filepath).replace(/\\/g, "/"), + relative: path21.relative(base, filepath).replace(/\\/g, "/"), stats }); if (stats && stats.isDirectory()) { @@ -103844,7 +103844,7 @@ var require_core2 = __commonJS({ var fs20 = require("fs"); var glob2 = require_readdir_glob(); var async = require_async7(); - var path19 = require("path"); + var path21 = require("path"); var util = require_archiver_utils(); var inherits = require("util").inherits; var ArchiverError = require_error3(); @@ -104120,9 +104120,9 @@ var require_core2 = __commonJS({ task.source = Buffer.concat([]); } else if (stats.isSymbolicLink() && this._moduleSupports("symlink")) { var linkPath = fs20.readlinkSync(task.filepath); - var dirName = path19.dirname(task.filepath); + var dirName = path21.dirname(task.filepath); task.data.type = "symlink"; - task.data.linkname = path19.relative(dirName, path19.resolve(dirName, linkPath)); + task.data.linkname = path21.relative(dirName, path21.resolve(dirName, linkPath)); task.data.sourceType = "buffer"; task.source = Buffer.concat([]); } else { @@ -108572,8 +108572,8 @@ var require_context2 = __commonJS({ if (fs_1.existsSync(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse(fs_1.readFileSync(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path19 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path19} does not exist${os_1.EOL}`); + const path21 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -109715,14 +109715,14 @@ var require_url_state_machine = __commonJS({ return url2.replace(/\u0009|\u000A|\u000D/g, ""); } function shortenPath(url2) { - const path19 = url2.path; - if (path19.length === 0) { + const path21 = url2.path; + if (path21.length === 0) { return; } - if (url2.scheme === "file" && path19.length === 1 && isNormalizedWindowsDriveLetter(path19[0])) { + if (url2.scheme === "file" && path21.length === 1 && isNormalizedWindowsDriveLetter(path21[0])) { return; } - path19.pop(); + path21.pop(); } function includesCredentials(url2) { return url2.username !== "" || url2.password !== ""; @@ -113893,7 +113893,7 @@ var require_traverse = __commonJS({ })(this.value); }; function walk(root, cb, immutable) { - var path19 = []; + var path21 = []; var parents = []; var alive = true; return (function walker(node_) { @@ -113902,11 +113902,11 @@ var require_traverse = __commonJS({ var state = { node, node_, - path: [].concat(path19), + path: [].concat(path21), parent: parents.slice(-1)[0], - key: path19.slice(-1)[0], - isRoot: path19.length === 0, - level: path19.length, + key: path21.slice(-1)[0], + isRoot: path21.length === 0, + level: path21.length, circular: null, update: function(x) { if (!state.isRoot) { @@ -113961,7 +113961,7 @@ var require_traverse = __commonJS({ parents.push(state); var keys = Object.keys(state.node); keys.forEach(function(key, i2) { - path19.push(key); + path21.push(key); if (modifiers.pre) modifiers.pre.call(state, state.node[key], key); var child = walker(state.node[key]); if (immutable && Object.hasOwnProperty.call(state.node, key)) { @@ -113970,7 +113970,7 @@ var require_traverse = __commonJS({ child.isLast = i2 == keys.length - 1; child.isFirst = i2 == 0; if (modifiers.post) modifiers.post.call(state, child); - path19.pop(); + path21.pop(); }); parents.pop(); } @@ -114991,11 +114991,11 @@ var require_unzip_stream = __commonJS({ return requiredLength; case states.CENTRAL_DIRECTORY_FILE_HEADER_SUFFIX: var isUtf8 = (this.parsedEntity.flags & 2048) !== 0; - var path19 = this._decodeString(chunk.slice(0, this.parsedEntity.fileNameLength), isUtf8); + var path21 = this._decodeString(chunk.slice(0, this.parsedEntity.fileNameLength), isUtf8); var extraDataBuffer = chunk.slice(this.parsedEntity.fileNameLength, this.parsedEntity.fileNameLength + this.parsedEntity.extraFieldLength); var extra = this._readExtraFields(extraDataBuffer); if (extra && extra.parsed && extra.parsed.path && !isUtf8) { - path19 = extra.parsed.path; + path21 = extra.parsed.path; } this.parsedEntity.extra = extra.parsed; var isUnix = (this.parsedEntity.versionMadeBy & 65280) >> 8 === 3; @@ -115007,7 +115007,7 @@ var require_unzip_stream = __commonJS({ } if (this.options.debug) { const debugObj = Object.assign({}, this.parsedEntity, { - path: path19, + path: path21, flags: "0x" + this.parsedEntity.flags.toString(16), unixAttrs: unixAttrs && "0" + unixAttrs.toString(8), isSymlink: isSymlink2, @@ -115444,7 +115444,7 @@ var require_parser_stream = __commonJS({ // node_modules/mkdirp/index.js var require_mkdirp = __commonJS({ "node_modules/mkdirp/index.js"(exports2, module2) { - var path19 = require("path"); + var path21 = require("path"); var fs20 = require("fs"); var _0777 = parseInt("0777", 8); module2.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP; @@ -115464,7 +115464,7 @@ var require_mkdirp = __commonJS({ var cb = f || /* istanbul ignore next */ function() { }; - p = path19.resolve(p); + p = path21.resolve(p); xfs.mkdir(p, mode, function(er) { if (!er) { made = made || p; @@ -115472,8 +115472,8 @@ var require_mkdirp = __commonJS({ } switch (er.code) { case "ENOENT": - if (path19.dirname(p) === p) return cb(er); - mkdirP(path19.dirname(p), opts, function(er2, made2) { + if (path21.dirname(p) === p) return cb(er); + mkdirP(path21.dirname(p), opts, function(er2, made2) { if (er2) cb(er2, made2); else mkdirP(p, opts, cb, made2); }); @@ -115500,14 +115500,14 @@ var require_mkdirp = __commonJS({ mode = _0777; } if (!made) made = null; - p = path19.resolve(p); + p = path21.resolve(p); try { xfs.mkdirSync(p, mode); made = made || p; } catch (err0) { switch (err0.code) { case "ENOENT": - made = sync(path19.dirname(p), opts, made); + made = sync(path21.dirname(p), opts, made); sync(p, opts, made); break; // In the case of any other error, just see if there's a dir @@ -115533,7 +115533,7 @@ var require_mkdirp = __commonJS({ var require_extract2 = __commonJS({ "node_modules/unzip-stream/lib/extract.js"(exports2, module2) { var fs20 = require("fs"); - var path19 = require("path"); + var path21 = require("path"); var util = require("util"); var mkdirp = require_mkdirp(); var Transform = require("stream").Transform; @@ -115575,8 +115575,8 @@ var require_extract2 = __commonJS({ }; Extract.prototype._processEntry = function(entry) { var self2 = this; - var destPath = path19.join(this.opts.path, entry.path); - var directory = entry.isDirectory ? destPath : path19.dirname(destPath); + var destPath = path21.join(this.opts.path, entry.path); + var directory = entry.isDirectory ? destPath : path21.dirname(destPath); this.unfinishedEntries++; var writeFileFn = function() { var pipedStream = fs20.createWriteStream(destPath); @@ -115703,10 +115703,10 @@ var require_download_artifact = __commonJS({ parsed.search = ""; return parsed.toString(); }; - function exists(path19) { + function exists(path21) { return __awaiter4(this, void 0, void 0, function* () { try { - yield promises_1.default.access(path19); + yield promises_1.default.access(path21); return true; } catch (error2) { if (error2.code === "ENOENT") { @@ -115937,12 +115937,12 @@ var require_dist_node24 = __commonJS({ octokit.log.debug("request", options); const start = Date.now(); const requestOptions = octokit.request.endpoint.parse(options); - const path19 = requestOptions.url.replace(options.baseUrl, ""); + const path21 = requestOptions.url.replace(options.baseUrl, ""); return request(options).then((response) => { - octokit.log.info(`${requestOptions.method} ${path19} - ${response.status} in ${Date.now() - start}ms`); + octokit.log.info(`${requestOptions.method} ${path21} - ${response.status} in ${Date.now() - start}ms`); return response; }).catch((error2) => { - octokit.log.info(`${requestOptions.method} ${path19} - ${error2.status} in ${Date.now() - start}ms`); + octokit.log.info(`${requestOptions.method} ${path21} - ${error2.status} in ${Date.now() - start}ms`); throw error2; }); }); @@ -116662,13 +116662,13 @@ These characters are not allowed in the artifact name due to limitations with ce (0, core_1.info)(`Artifact name is valid!`); } exports2.checkArtifactName = checkArtifactName; - function checkArtifactFilePath(path19) { - if (!path19) { - throw new Error(`Artifact path: ${path19}, is incorrectly provided`); + function checkArtifactFilePath(path21) { + if (!path21) { + throw new Error(`Artifact path: ${path21}, is incorrectly provided`); } for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactFilePathCharacters) { - if (path19.includes(invalidCharacterKey)) { - throw new Error(`Artifact path is not valid: ${path19}. Contains the following character: ${errorMessageForCharacter} + if (path21.includes(invalidCharacterKey)) { + throw new Error(`Artifact path is not valid: ${path21}. Contains the following character: ${errorMessageForCharacter} Invalid characters include: ${Array.from(invalidArtifactFilePathCharacters.values()).toString()} @@ -116759,7 +116759,7 @@ var require_tmp = __commonJS({ "node_modules/tmp/lib/tmp.js"(exports2, module2) { var fs20 = require("fs"); var os3 = require("os"); - var path19 = require("path"); + var path21 = require("path"); var crypto = require("crypto"); var _c = { fs: fs20.constants, os: os3.constants }; var RANDOM_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -116966,35 +116966,35 @@ var require_tmp = __commonJS({ return [actualOptions, callback]; } function _resolvePath(name, tmpDir, cb) { - const pathToResolve = path19.isAbsolute(name) ? name : path19.join(tmpDir, name); + const pathToResolve = path21.isAbsolute(name) ? name : path21.join(tmpDir, name); fs20.stat(pathToResolve, function(err) { if (err) { - fs20.realpath(path19.dirname(pathToResolve), function(err2, parentDir) { + fs20.realpath(path21.dirname(pathToResolve), function(err2, parentDir) { if (err2) return cb(err2); - cb(null, path19.join(parentDir, path19.basename(pathToResolve))); + cb(null, path21.join(parentDir, path21.basename(pathToResolve))); }); } else { - fs20.realpath(path19, cb); + fs20.realpath(path21, cb); } }); } function _resolvePathSync(name, tmpDir) { - const pathToResolve = path19.isAbsolute(name) ? name : path19.join(tmpDir, name); + const pathToResolve = path21.isAbsolute(name) ? name : path21.join(tmpDir, name); try { fs20.statSync(pathToResolve); return fs20.realpathSync(pathToResolve); } catch (_err) { - const parentDir = fs20.realpathSync(path19.dirname(pathToResolve)); - return path19.join(parentDir, path19.basename(pathToResolve)); + const parentDir = fs20.realpathSync(path21.dirname(pathToResolve)); + return path21.join(parentDir, path21.basename(pathToResolve)); } } function _generateTmpName(opts) { const tmpDir = opts.tmpdir; if (!_isUndefined(opts.name)) { - return path19.join(tmpDir, opts.dir, opts.name); + return path21.join(tmpDir, opts.dir, opts.name); } if (!_isUndefined(opts.template)) { - return path19.join(tmpDir, opts.dir, opts.template).replace(TEMPLATE_PATTERN, _randomChars(6)); + return path21.join(tmpDir, opts.dir, opts.template).replace(TEMPLATE_PATTERN, _randomChars(6)); } const name = [ opts.prefix ? opts.prefix : "tmp", @@ -117004,13 +117004,13 @@ var require_tmp = __commonJS({ _randomChars(12), opts.postfix ? "-" + opts.postfix : "" ].join(""); - return path19.join(tmpDir, opts.dir, name); + return path21.join(tmpDir, opts.dir, name); } function _assertOptionsBase(options) { if (!_isUndefined(options.name)) { const name = options.name; - if (path19.isAbsolute(name)) throw new Error(`name option must not contain an absolute path, found "${name}".`); - const basename = path19.basename(name); + if (path21.isAbsolute(name)) throw new Error(`name option must not contain an absolute path, found "${name}".`); + const basename = path21.basename(name); if (basename === ".." || basename === "." || basename !== name) throw new Error(`name option must not contain a path, found "${name}".`); } @@ -117032,7 +117032,7 @@ var require_tmp = __commonJS({ if (_isUndefined(name)) return cb(null); _resolvePath(name, tmpDir, function(err, resolvedPath) { if (err) return cb(err); - const relativePath = path19.relative(tmpDir, resolvedPath); + const relativePath = path21.relative(tmpDir, resolvedPath); if (!resolvedPath.startsWith(tmpDir)) { return cb(new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`)); } @@ -117042,7 +117042,7 @@ var require_tmp = __commonJS({ function _getRelativePathSync(option, name, tmpDir) { if (_isUndefined(name)) return; const resolvedPath = _resolvePathSync(name, tmpDir); - const relativePath = path19.relative(tmpDir, resolvedPath); + const relativePath = path21.relative(tmpDir, resolvedPath); if (!resolvedPath.startsWith(tmpDir)) { throw new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`); } @@ -117122,14 +117122,14 @@ var require_tmp_promise = __commonJS({ var fileWithOptions = promisify3( (options, cb) => tmp.file( options, - (err, path19, fd, cleanup) => err ? cb(err) : cb(void 0, { path: path19, fd, cleanup: promisify3(cleanup) }) + (err, path21, fd, cleanup) => err ? cb(err) : cb(void 0, { path: path21, fd, cleanup: promisify3(cleanup) }) ) ); module2.exports.file = async (options) => fileWithOptions(options); module2.exports.withFile = async function withFile(fn, options) { - const { path: path19, fd, cleanup } = await module2.exports.file(options); + const { path: path21, fd, cleanup } = await module2.exports.file(options); try { - return await fn({ path: path19, fd }); + return await fn({ path: path21, fd }); } finally { await cleanup(); } @@ -117138,14 +117138,14 @@ var require_tmp_promise = __commonJS({ var dirWithOptions = promisify3( (options, cb) => tmp.dir( options, - (err, path19, cleanup) => err ? cb(err) : cb(void 0, { path: path19, cleanup: promisify3(cleanup) }) + (err, path21, cleanup) => err ? cb(err) : cb(void 0, { path: path21, cleanup: promisify3(cleanup) }) ) ); module2.exports.dir = async (options) => dirWithOptions(options); module2.exports.withDir = async function withDir(fn, options) { - const { path: path19, cleanup } = await module2.exports.dir(options); + const { path: path21, cleanup } = await module2.exports.dir(options); try { - return await fn({ path: path19 }); + return await fn({ path: path21 }); } finally { await cleanup(); } @@ -118853,21 +118853,21 @@ var require_download_specification = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getDownloadSpecification = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); function getDownloadSpecification(artifactName, artifactEntries, downloadPath, includeRootDirectory) { const directories = /* @__PURE__ */ new Set(); const specifications = { - rootDownloadLocation: includeRootDirectory ? path19.join(downloadPath, artifactName) : downloadPath, + rootDownloadLocation: includeRootDirectory ? path21.join(downloadPath, artifactName) : downloadPath, directoryStructure: [], emptyFilesToCreate: [], filesToDownload: [] }; for (const entry of artifactEntries) { if (entry.path.startsWith(`${artifactName}/`) || entry.path.startsWith(`${artifactName}\\`)) { - const normalizedPathEntry = path19.normalize(entry.path); - const filePath = path19.join(downloadPath, includeRootDirectory ? normalizedPathEntry : normalizedPathEntry.replace(artifactName, "")); + const normalizedPathEntry = path21.normalize(entry.path); + const filePath = path21.join(downloadPath, includeRootDirectory ? normalizedPathEntry : normalizedPathEntry.replace(artifactName, "")); if (entry.itemType === "file") { - directories.add(path19.dirname(filePath)); + directories.add(path21.dirname(filePath)); if (entry.fileLength === 0) { specifications.emptyFilesToCreate.push(filePath); } else { @@ -119009,7 +119009,7 @@ Note: The size of downloaded zips can differ significantly from the reported siz return uploadResponse; }); } - downloadArtifact(name, path19, options) { + downloadArtifact(name, path21, options) { return __awaiter4(this, void 0, void 0, function* () { const downloadHttpClient = new download_http_client_1.DownloadHttpClient(); const artifacts = yield downloadHttpClient.listArtifacts(); @@ -119023,12 +119023,12 @@ Note: The size of downloaded zips can differ significantly from the reported siz throw new Error(`Unable to find an artifact with the name: ${name}`); } const items = yield downloadHttpClient.getContainerItems(artifactToDownload.name, artifactToDownload.fileContainerResourceUrl); - if (!path19) { - path19 = (0, config_variables_1.getWorkSpaceDirectory)(); + if (!path21) { + path21 = (0, config_variables_1.getWorkSpaceDirectory)(); } - path19 = (0, path_1.normalize)(path19); - path19 = (0, path_1.resolve)(path19); - const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(name, items.value, path19, (options === null || options === void 0 ? void 0 : options.createArtifactFolder) || false); + path21 = (0, path_1.normalize)(path21); + path21 = (0, path_1.resolve)(path21); + const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(name, items.value, path21, (options === null || options === void 0 ? void 0 : options.createArtifactFolder) || false); if (downloadSpecification.filesToDownload.length === 0) { core18.info(`No downloadable files were found for the artifact: ${artifactToDownload.name}`); } else { @@ -119043,7 +119043,7 @@ Note: The size of downloaded zips can differ significantly from the reported siz }; }); } - downloadAllArtifacts(path19) { + downloadAllArtifacts(path21) { return __awaiter4(this, void 0, void 0, function* () { const downloadHttpClient = new download_http_client_1.DownloadHttpClient(); const response = []; @@ -119052,18 +119052,18 @@ Note: The size of downloaded zips can differ significantly from the reported siz core18.info("Unable to find any artifacts for the associated workflow"); return response; } - if (!path19) { - path19 = (0, config_variables_1.getWorkSpaceDirectory)(); + if (!path21) { + path21 = (0, config_variables_1.getWorkSpaceDirectory)(); } - path19 = (0, path_1.normalize)(path19); - path19 = (0, path_1.resolve)(path19); + path21 = (0, path_1.normalize)(path21); + path21 = (0, path_1.resolve)(path21); let downloadedArtifacts = 0; while (downloadedArtifacts < artifacts.count) { const currentArtifactToDownload = artifacts.value[downloadedArtifacts]; downloadedArtifacts += 1; core18.info(`starting download of artifact ${currentArtifactToDownload.name} : ${downloadedArtifacts}/${artifacts.count}`); const items = yield downloadHttpClient.getContainerItems(currentArtifactToDownload.name, currentArtifactToDownload.fileContainerResourceUrl); - const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(currentArtifactToDownload.name, items.value, path19, true); + const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(currentArtifactToDownload.name, items.value, path21, true); if (downloadSpecification.filesToDownload.length === 0) { core18.info(`No downloadable files were found for any artifact ${currentArtifactToDownload.name}`); } else { @@ -119204,7 +119204,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -119212,7 +119212,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path19.dirname(p); + let result = path21.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -119250,7 +119250,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path19.sep; + root += path21.sep; } return root + itemPath; } @@ -119288,10 +119288,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path19.sep)) { + if (!p.endsWith(path21.sep)) { return p; } - if (p === path19.sep) { + if (p === path21.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -119442,7 +119442,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -119457,12 +119457,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path19.sep); + this.segments = itemPath.split(path21.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path19.basename(remaining); + const basename = path21.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -119480,7 +119480,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path19.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -119491,12 +119491,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path19.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path19.sep; + result += path21.sep; } result += this.segments[i]; } @@ -119544,7 +119544,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -119573,7 +119573,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path19.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -119597,8 +119597,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path19.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path19.sep}`; + if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path21.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -119633,9 +119633,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path19.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path19.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { homedir = homedir || os3.homedir(); (0, assert_1.default)(homedir, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -119719,8 +119719,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path19, level) { - this.path = path19; + constructor(path21, level) { + this.path = path21; this.level = level; } }; @@ -119846,7 +119846,7 @@ var require_internal_globber2 = __commonJS({ var core18 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -119922,7 +119922,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path19.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path21.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -119932,7 +119932,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path19.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -120084,7 +120084,7 @@ var require_internal_hash_files = __commonJS({ var fs20 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path19 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -120100,7 +120100,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path19.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path21.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -120200,14 +120200,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path19, name, argument) { - if (Array.isArray(path19)) { - this.path = path19; - this.property = path19.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path21, name, argument) { + if (Array.isArray(path21)) { + this.path = path21; + this.property = path21.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path19 !== void 0) { - this.property = path19; + } else if (path21 !== void 0) { + this.property = path21; } if (message) { this.message = message; @@ -120298,16 +120298,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path19, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path21, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path19)) { - this.path = path19; - this.propertyPath = path19.reduce(function(sum, item) { + if (Array.isArray(path21)) { + this.path = path21; + this.propertyPath = path21.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path19; + this.propertyPath = path21; } this.base = base; this.schemas = schemas; @@ -120316,10 +120316,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path19 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path21 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path19, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path21, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -124787,12 +124787,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path19) { - const isExtendedLengthPath = path19.startsWith("\\\\?\\"); +function slash(path21) { + const isExtendedLengthPath = path21.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path19; + return path21; } - return path19.replace(/\\/g, "/"); + return path21.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -124880,8 +124880,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path19 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path19) ? path19 : import_node_path3.default.join(cwd, path19); + const path21 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path21) ? path21 : import_node_path3.default.join(cwd, path21); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -128576,7 +128576,7 @@ function wrapApiConfigurationError(e) { // src/codeql.ts var fs13 = __toESM(require("fs")); -var path13 = __toESM(require("path")); +var path15 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -128819,9 +128819,10 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs9 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path11 = __toESM(require("path")); // src/analyses.ts +var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -128833,7 +128834,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), fixCategory: (_2, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -128842,7 +128843,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -128861,11 +128862,11 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs8 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/feature-flags.ts var fs7 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path9 = __toESM(require("path")); var semver4 = __toESM(require_semver2()); // src/defaults.json @@ -128874,7 +128875,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs6 = __toESM(require("fs")); -var path7 = __toESM(require("path")); +var path8 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -129000,8 +129001,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path19 = decodeGitFilePath(match[2]); - fileOidMap[path19] = oid; + const path21 = decodeGitFilePath(match[2]); + fileOidMap[path21] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -129125,7 +129126,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path7.join(config.dbLocation, "base-database-oids.json"); + return path8.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -129135,7 +129136,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path7.join( + const overlayChangesFile = path8.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -129355,7 +129356,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -129615,7 +129616,7 @@ var GitHubFeatureFlags = class { // src/diff-informed-analysis-utils.ts function getDiffRangesJsonFilePath() { - return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -129660,7 +129661,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path10.join(tempDir, "config"); + return path11.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -129704,7 +129705,7 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path12 = __toESM(require("path")); +var path14 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -129766,6 +129767,7 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); +var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -129914,7 +129916,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (tarPath.endsWith(`.${ext}`)) { + if (path12.extname(tarPath) === `.${ext}`) { return method; } } @@ -129924,7 +129926,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os = __toESM(require("os")); -var path11 = __toESM(require("path")); +var path13 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -130057,7 +130059,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path11.join( + return path13.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -130200,7 +130202,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path12.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -130538,7 +130540,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path12.join(tempDir, v4_default()); + return path14.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -130609,7 +130611,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path13.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path15.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -130670,7 +130672,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path13.join( + const tracingConfigPath = path15.join( extractorPath, "tools", "tracing-config.lua" @@ -130746,7 +130748,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path13.join( + const autobuildCmd = path15.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -131159,7 +131161,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path13.resolve(config.tempDir, "user-config.yaml"); + return path15.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -131181,7 +131183,7 @@ async function getJobRunUuidSarifOptions(codeql) { // src/debug-artifacts.ts var fs15 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path17 = __toESM(require("path")); var artifact = __toESM(require_artifact2()); var artifactLegacy = __toESM(require_artifact_client2()); var core12 = __toESM(require_core()); @@ -131189,7 +131191,7 @@ var import_archiver = __toESM(require_archiver()); // src/analyze.ts var fs14 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path16 = __toESM(require("path")); var io5 = __toESM(require_io()); // src/autobuild.ts @@ -131204,7 +131206,7 @@ function dbIsFinalized(config, language, logger) { const dbPath = getCodeQLDatabasePath(config, language); try { const dbInfo = load( - fs14.readFileSync(path14.resolve(dbPath, "codeql-database.yml"), "utf8") + fs14.readFileSync(path16.resolve(dbPath, "codeql-database.yml"), "utf8") ); return !("inProgress" in dbInfo); } catch { @@ -131223,12 +131225,12 @@ function tryPrepareSarifDebugArtifact(config, language, logger) { try { const analyzeActionOutputDir = process.env["CODEQL_ACTION_SARIF_RESULTS_OUTPUT_DIR" /* SARIF_RESULTS_OUTPUT_DIR */]; if (analyzeActionOutputDir !== void 0 && fs15.existsSync(analyzeActionOutputDir) && fs15.lstatSync(analyzeActionOutputDir).isDirectory()) { - const sarifFile = path15.resolve( + const sarifFile = path17.resolve( analyzeActionOutputDir, `${language}.sarif` ); if (fs15.existsSync(sarifFile)) { - const sarifInDbLocation = path15.resolve( + const sarifInDbLocation = path17.resolve( config.dbLocation, `${language}.sarif` ); @@ -131283,13 +131285,13 @@ async function tryUploadAllAvailableDebugArtifacts(codeql, config, logger, codeQ } logger.info("Preparing database logs debug artifact..."); const databaseDirectory = getCodeQLDatabasePath(config, language); - const logsDirectory = path15.resolve(databaseDirectory, "log"); + const logsDirectory = path17.resolve(databaseDirectory, "log"); if (doesDirectoryExist(logsDirectory)) { filesToUpload.push(...listFolder(logsDirectory)); logger.info("Database logs debug artifact ready for upload."); } logger.info("Preparing database cluster logs debug artifact..."); - const multiLanguageTracingLogsDirectory = path15.resolve( + const multiLanguageTracingLogsDirectory = path17.resolve( config.dbLocation, "log" ); @@ -131363,8 +131365,8 @@ async function uploadDebugArtifacts(logger, toUpload, rootDir, artifactName, ghV try { await artifactUploader.uploadArtifact( sanitizeArtifactName(`${artifactName}${suffix}`), - toUpload.map((file) => path15.normalize(file)), - path15.normalize(rootDir), + toUpload.map((file) => path17.normalize(file)), + path17.normalize(rootDir), { // ensure we don't keep the debug artifacts around for too long since they can be large. retentionDays: 7 @@ -131391,7 +131393,7 @@ async function getArtifactUploaderClient(logger, ghVariant) { } async function createPartialDatabaseBundle(config, language) { const databasePath = getCodeQLDatabasePath(config, language); - const databaseBundlePath = path15.resolve( + const databaseBundlePath = path17.resolve( config.dbLocation, `${config.debugDatabaseName}-${language}-partial.zip` ); @@ -131629,7 +131631,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs17 = __toESM(require("fs")); -var path17 = __toESM(require("path")); +var path19 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core14 = __toESM(require_core()); @@ -132942,10 +132944,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path17.resolve(tempDir, "combined-sarif"); + const baseTempDir = path19.resolve(tempDir, "combined-sarif"); fs17.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs17.mkdtempSync(path17.resolve(baseTempDir, "output-")); - const outputFile = path17.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs17.mkdtempSync(path19.resolve(baseTempDir, "output-")); + const outputFile = path19.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -132978,7 +132980,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path17.join( + const payloadSaveFile = path19.join( getTemporaryDirectory(), "payload.json" ); @@ -133022,9 +133024,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs17.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path17.resolve(dir, entry.name)); + sarifFiles.push(path19.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path17.resolve(dir, entry.name)); + walkSarifFiles(path19.resolve(dir, entry.name)); } } }; @@ -133245,7 +133247,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path17.resolve( + const outputFile = path19.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -133393,7 +133395,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path17.join(checkoutPath, locationUri).replaceAll(path17.sep, "/"); + const locationPath = path19.join(checkoutPath, locationUri).replaceAll(path19.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); @@ -133406,7 +133408,7 @@ function filterAlertsByDiffRange(logger, sarif) { // src/workflow.ts var fs18 = __toESM(require("fs")); -var path18 = __toESM(require("path")); +var path20 = __toESM(require("path")); var import_zlib2 = __toESM(require("zlib")); var core15 = __toESM(require_core()); function toCodedErrors(errors) { @@ -133438,7 +133440,7 @@ async function getWorkflow(logger) { } async function getWorkflowAbsolutePath(logger) { const relativePath = await getWorkflowRelativePath(); - const absolutePath = path18.join( + const absolutePath = path20.join( getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath ); diff --git a/lib/init-action.js b/lib/init-action.js index cc8c340407..0d71725e5e 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url.port != null ? url.port : url.protocol === "https:" ? 443 : 80; let origin = url.origin != null ? url.origin : `${url.protocol}//${url.hostname}:${port}`; - let path20 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`; + let path21 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path20 && !path20.startsWith("/")) { - path20 = `/${path20}`; + if (path21 && !path21.startsWith("/")) { + path21 = `/${path21}`; } - url = new URL(origin + path20); + url = new URL(origin + path21); } return url; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path20) { - if (typeof path20 !== "string") { + module2.exports = function basename(path21) { + if (typeof path21 !== "string") { return ""; } - for (var i = path20.length - 1; i >= 0; --i) { - switch (path20.charCodeAt(i)) { + for (var i = path21.length - 1; i >= 0; --i) { + switch (path21.charCodeAt(i)) { case 47: // '/' case 92: - path20 = path20.slice(i + 1); - return path20 === ".." || path20 === "." ? "" : path20; + path21 = path21.slice(i + 1); + return path21 === ".." || path21 === "." ? "" : path21; } } - return path20 === ".." || path20 === "." ? "" : path20; + return path21 === ".." || path21 === "." ? "" : path21; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path20, + path: path21, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path20 !== "string") { + if (typeof path21 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path20[0] !== "/" && !(path20.startsWith("http://") || path20.startsWith("https://")) && method !== "CONNECT") { + } else if (path21[0] !== "/" && !(path21.startsWith("http://") || path21.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path20) !== null) { + } else if (invalidPathRegex.exec(path21) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path20, query) : path20; + this.path = query ? util.buildURL(path21, query) : path21; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path20 = search ? `${pathname}${search}` : pathname; + const path21 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path20; + this.opts.path = path21; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path20, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path21, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path20} HTTP/1.1\r + let header = `${method} ${path21} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path20, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path21, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path20; + headers[HTTP2_HEADER_PATH] = path21; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path20) { - if (typeof path20 !== "string") { - return path20; + function safeUrl(path21) { + if (typeof path21 !== "string") { + return path21; } - const pathSegments = path20.split("?"); + const pathSegments = path21.split("?"); if (pathSegments.length !== 2) { - return path20; + return path21; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path20, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path20); + function matchKey(mockDispatch2, { path: path21, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path21); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path20 }) => matchValue(safeUrl(path20), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path21 }) => matchValue(safeUrl(path21), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path20, method, body, headers, query } = opts; + const { path: path21, method, body, headers, query } = opts; return { - path: path20, + path: path21, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path20, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path21, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path20, + Path: path21, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path20) { - for (const char of path20) { + function validateCookiePath(path21) { + for (const char of path21) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path20 = opts.path; + let path21 = opts.path; if (!opts.path.startsWith("/")) { - path20 = `/${path20}`; + path21 = `/${path21}`; } - url = new URL(util.parseOrigin(url).origin + path20); + url = new URL(util.parseOrigin(url).origin + path21); } else { if (!opts) { opts = typeof url === "object" ? url : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path20.sep); + return pth.replace(/[/\\]/g, path21.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs18 = __importStar4(require("fs")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); _a = fs18.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path20.extname(filePath).toUpperCase(); + const upperExt = path21.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path20.dirname(filePath); - const upperName = path20.basename(filePath).toUpperCase(); + const directory = path21.dirname(filePath); + const upperName = path21.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path20.join(directory, actualName); + filePath = path21.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path20.join(dest, path20.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path21.join(dest, path21.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path20.relative(source, newDest) === "") { + if (path21.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path20.join(dest, path20.basename(source)); + dest = path21.join(dest, path21.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path20.dirname(dest)); + yield mkdirP(path21.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path20.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path21.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path20.sep)) { + if (tool.includes(path21.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path20.delimiter)) { + for (const p of process.env.PATH.split(path21.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path20.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path21.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os5 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path20.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path21.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve9, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path20.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path21.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath2; function getInput2(name, options) { @@ -21743,8 +21743,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path20 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path20} does not exist${os_1.EOL}`); + const path21 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -26505,7 +26505,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os5 = require("os"); - var path20 = require("path"); + var path21 = require("path"); var IS_WINDOWS_PLATFORM = os5.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -26517,7 +26517,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path20.resolve(cwd, filepath); + return path21.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -27814,7 +27814,7 @@ var require_braces = __commonJS({ var require_constants8 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path20 = require("path"); + var path21 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -27984,7 +27984,7 @@ var require_constants8 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path20.sep, + SEP: path21.sep, /** * Create EXTGLOB_CHARS */ @@ -28011,7 +28011,7 @@ var require_constants8 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path20 = require("path"); + var path21 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -28040,7 +28040,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path20.sep === "\\"; + return win32 === true || path21.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -29175,7 +29175,7 @@ var require_parse4 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path20 = require("path"); + var path21 = require("path"); var scan = require_scan(); var parse = require_parse4(); var utils = require_utils6(); @@ -29260,7 +29260,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path20.basename(input)); + return regex.test(path21.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -29487,7 +29487,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path20 = require("path"); + var path21 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -29582,7 +29582,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path20.basename(pattern); + const basename = path21.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -29640,7 +29640,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute3(pattern) { - return path20.isAbsolute(pattern); + return path21.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute3; } @@ -29817,8 +29817,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs18 = require_fs(); exports2.fs = fs18; - var path20 = require_path(); - exports2.path = path20; + var path21 = require_path(); + exports2.path = path21; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -29930,8 +29930,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path20, settings, callback) { - settings.fs.lstat(path20, (lstatError, lstat) => { + function read(path21, settings, callback) { + settings.fs.lstat(path21, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -29940,7 +29940,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path20, (statError, stat) => { + settings.fs.stat(path21, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -29972,13 +29972,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path20, settings) { - const lstat = settings.fs.lstatSync(path20); + function read(path21, settings) { + const lstat = settings.fs.lstatSync(path21); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path20); + const stat = settings.fs.statSync(path21); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -30049,17 +30049,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path20, optionsOrSettingsOrCallback, callback) { + function stat(path21, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path20, getSettings(), optionsOrSettingsOrCallback); + async.read(path21, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync2(path20, optionsOrSettings) { + function statSync2(path21, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path20, settings); + return sync.read(path21, settings); } exports2.statSync = statSync2; function getSettings(settingsOrOptions = {}) { @@ -30275,16 +30275,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path20 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path21 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path20, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path21, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path20, + path: path21, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -30402,7 +30402,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path21 = require("path"); var fsStat = require_out(); var fs18 = require_fs4(); var Settings = class { @@ -30410,7 +30410,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs18.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -30437,17 +30437,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path20, optionsOrSettingsOrCallback, callback) { + function scandir(path21, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path20, getSettings(), optionsOrSettingsOrCallback); + async.read(path21, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path20, optionsOrSettings) { + function scandirSync(path21, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path20, settings); + return sync.read(path21, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -30974,7 +30974,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path21 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -30984,7 +30984,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -31046,7 +31046,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path21 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -31059,7 +31059,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path20.resolve(this._settings.cwd, filepath); + return path21.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -31475,7 +31475,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path20 = require("path"); + var path21 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -31489,7 +31489,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path20.resolve(this._settings.cwd, task.base); + return path21.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -32122,7 +32122,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path20, checkUnignored, mode) { + test(path21, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -32131,7 +32131,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path20); + const matched = rule[mode].test(path21); if (!matched) { return; } @@ -32152,17 +32152,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path20, originalPath, doThrow) => { - if (!isString(path20)) { + var checkPath = (path21, originalPath, doThrow) => { + if (!isString(path21)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path20) { + if (!path21) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path20)) { + if (checkPath.isNotRelative(path21)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -32171,7 +32171,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path20) => REGEX_TEST_INVALID_PATH.test(path20); + var isNotRelative = (path21) => REGEX_TEST_INVALID_PATH.test(path21); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -32201,19 +32201,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path20 = originalPath && checkPath.convert(originalPath); + const path21 = originalPath && checkPath.convert(originalPath); checkPath( - path20, + path21, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path20, cache, checkUnignored, slices); + return this._t(path21, cache, checkUnignored, slices); } - checkIgnore(path20) { - if (!REGEX_TEST_TRAILING_SLASH.test(path20)) { - return this.test(path20); + checkIgnore(path21) { + if (!REGEX_TEST_TRAILING_SLASH.test(path21)) { + return this.test(path21); } - const slices = path20.split(SLASH).filter(Boolean); + const slices = path21.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -32226,18 +32226,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path20, false, MODE_CHECK_IGNORE); + return this._rules.test(path21, false, MODE_CHECK_IGNORE); } - _t(path20, cache, checkUnignored, slices) { - if (path20 in cache) { - return cache[path20]; + _t(path21, cache, checkUnignored, slices) { + if (path21 in cache) { + return cache[path21]; } if (!slices) { - slices = path20.split(SLASH).filter(Boolean); + slices = path21.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path20] = this._rules.test(path20, checkUnignored, MODE_IGNORE); + return cache[path21] = this._rules.test(path21, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -32245,29 +32245,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path20] = parent.ignored ? parent : this._rules.test(path20, checkUnignored, MODE_IGNORE); + return cache[path21] = parent.ignored ? parent : this._rules.test(path21, checkUnignored, MODE_IGNORE); } - ignores(path20) { - return this._test(path20, this._ignoreCache, false).ignored; + ignores(path21) { + return this._test(path21, this._ignoreCache, false).ignored; } createFilter() { - return (path20) => !this.ignores(path20); + return (path21) => !this.ignores(path21); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path20) { - return this._test(path20, this._testCache, true); + test(path21) { + return this._test(path21, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path20) => checkPath(path20 && checkPath.convert(path20), path20, RETURN_FALSE); + var isPathValid = (path21) => checkPath(path21 && checkPath.convert(path21), path21, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path20) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path20) || isNotRelative(path20); + checkPath.isNotRelative = (path21) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path21) || isNotRelative(path21); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path20.dirname(p); + let result = path21.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path20.sep; + root += path21.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path20.sep)) { + if (!p.endsWith(path21.sep)) { return p; } - if (p === path20.sep) { + if (p === path21.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path20 = (function() { + var path21 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path20.sep; + minimatch.sep = path21.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path20.sep !== "/") { - pattern = pattern.split(path20.sep).join("/"); + if (!options.allowWindowsEscape && path21.sep !== "/") { + pattern = pattern.split(path21.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path20.sep !== "/") { - f = f.split(path20.sep).join("/"); + if (path21.sep !== "/") { + f = f.split(path21.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path20.sep); + this.segments = itemPath.split(path21.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path20.basename(remaining); + const basename = path21.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path20.sep; + result += path21.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path20.sep}`; + if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path21.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { homedir2 = homedir2 || os5.homedir(); assert_1.default(homedir2, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path20, level) { - this.path = path20; + constructor(path21, level) { + this.path = path21; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core14 = __importStar4(require_core()); var fs18 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto2 = __importStar4(require("crypto")); var fs18 = __importStar4(require("fs")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var semver9 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path20.join(baseLocation, "actions", "temp"); + tempDirectory = path21.join(baseLocation, "actions", "temp"); } - const dest = path20.join(tempDirectory, crypto2.randomUUID()); + const dest = path21.join(tempDirectory, crypto2.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path20.relative(workspace, file).replace(new RegExp(`\\${path20.sep}`, "g"), "/"); + const relativeFile = path21.relative(workspace, file).replace(new RegExp(`\\${path21.sep}`, "g"), "/"); core14.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path20 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path20.startsWith("/")) { - path20 = path20.substring(1); + let path21 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path21.startsWith("/")) { + path21 = path21.substring(1); } - if (isAbsoluteUrl(path20)) { - requestUrl = path20; + if (isAbsoluteUrl(path21)) { + requestUrl = path21; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path20); + requestUrl = appendPath(requestUrl, path21); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path20 = pathToAppend.substring(0, searchStart); + const path21 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path20; + newPath = newPath + path21; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url2) { const urlParsed = new URL(url2); - let path20 = urlParsed.pathname; - path20 = path20 || "/"; - path20 = escape(path20); - urlParsed.pathname = path20; + let path21 = urlParsed.pathname; + path21 = path21 || "/"; + path21 = escape(path21); + urlParsed.pathname = path21; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url2, name) { const urlParsed = new URL(url2); - let path20 = urlParsed.pathname; - path20 = path20 ? path20.endsWith("/") ? `${path20}${name}` : `${path20}/${name}` : name; - urlParsed.pathname = path20; + let path21 = urlParsed.pathname; + path21 = path21 ? path21.endsWith("/") ? `${path21}${name}` : `${path21}/${name}` : name; + urlParsed.pathname = path21; return urlParsed.toString(); } function setURLParameter(url2, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path20 = getURLPath(request.url) || "/"; + const path21 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path20}`; + canonicalizedResourceString += `/${this.factory.accountName}${path21}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path20 = getURLPath(request.url) || "/"; + const path21 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path20}`; + canonicalizedResourceString += `/${options.accountName}${path21}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path20 = getURLPath(subRequest.url); - if (!path20 || path20 === "") { + const path21 = getURLPath(subRequest.url); + if (!path21 || path21 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url2, getCoreClientOptions(pipeline)); - const path20 = getURLPath(url2); - if (path20 && path20 !== "/") { + const path21 = getURLPath(url2); + if (path21 && path21 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path20.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path21.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core14 = __importStar4(require_core()); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core14.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive path: ${archivePath}`); core14.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79388,7 +79388,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -79396,7 +79396,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path20.dirname(p); + let result = path21.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -79434,7 +79434,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path20.sep; + root += path21.sep; } return root + itemPath; } @@ -79472,10 +79472,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path20.sep)) { + if (!p.endsWith(path21.sep)) { return p; } - if (p === path20.sep) { + if (p === path21.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -79626,7 +79626,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -79641,12 +79641,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path20.sep); + this.segments = itemPath.split(path21.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path20.basename(remaining); + const basename = path21.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -79664,7 +79664,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -79675,12 +79675,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path20.sep; + result += path21.sep; } result += this.segments[i]; } @@ -79728,7 +79728,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -79757,7 +79757,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -79781,8 +79781,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path20.sep}`; + if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path21.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -79817,9 +79817,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { homedir2 = homedir2 || os5.homedir(); (0, assert_1.default)(homedir2, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -79903,8 +79903,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path20, level) { - this.path = path20; + constructor(path21, level) { + this.path = path21; this.level = level; } }; @@ -80030,7 +80030,7 @@ var require_internal_globber2 = __commonJS({ var core14 = __importStar4(require_core()); var fs18 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -80106,7 +80106,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path20.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path21.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -80116,7 +80116,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -80268,7 +80268,7 @@ var require_internal_hash_files = __commonJS({ var fs18 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -80284,7 +80284,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path20.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path21.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -80690,7 +80690,7 @@ var require_tool_cache = __commonJS({ var fs18 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os5 = __importStar4(require("os")); - var path20 = __importStar4(require("path")); + var path21 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver9 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80711,8 +80711,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path20.join(_getTempDirectory(), crypto2.randomUUID()); - yield io7.mkdirP(path20.dirname(dest)); + dest = dest || path21.join(_getTempDirectory(), crypto2.randomUUID()); + yield io7.mkdirP(path21.dirname(dest)); core14.debug(`Downloading ${url}`); core14.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80799,7 +80799,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path20.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path21.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -80975,7 +80975,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs18.readdirSync(sourceDir)) { - const s = path20.join(sourceDir, itemName); + const s = path21.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -80993,7 +80993,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path20.join(destFolder, targetFile); + const destPath = path21.join(destFolder, targetFile); core14.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81017,7 +81017,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver9.clean(versionSpec) || ""; - const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path21.join(_getCacheDirectory(), toolName, versionSpec, arch2); core14.debug(`checking cache: ${cachePath}`); if (fs18.existsSync(cachePath) && fs18.existsSync(`${cachePath}.complete`)) { core14.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81032,12 +81032,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os5.arch(); - const toolPath = path20.join(_getCacheDirectory(), toolName); + const toolPath = path21.join(_getCacheDirectory(), toolName); if (fs18.existsSync(toolPath)) { const children = fs18.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path20.join(toolPath, child, arch2 || ""); + const fullPath = path21.join(toolPath, child, arch2 || ""); if (fs18.existsSync(fullPath) && fs18.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81092,7 +81092,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path20.join(_getTempDirectory(), crypto2.randomUUID()); + dest = path21.join(_getTempDirectory(), crypto2.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -81100,7 +81100,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); + const folderPath = path21.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); core14.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -81110,7 +81110,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); + const folderPath = path21.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs18.writeFileSync(markerPath, ""); core14.debug("finished caching tool"); @@ -81721,7 +81721,7 @@ var require_follow_redirects = __commonJS({ // src/init-action.ts var fs17 = __toESM(require("fs")); -var path19 = __toESM(require("path")); +var path20 = __toESM(require("path")); var core13 = __toESM(require_core()); var io6 = __toESM(require_io()); var semver8 = __toESM(require_semver2()); @@ -82177,12 +82177,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path20) { - const isExtendedLengthPath = path20.startsWith("\\\\?\\"); +function slash(path21) { + const isExtendedLengthPath = path21.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path20; + return path21; } - return path20.replace(/\\/g, "/"); + return path21.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -82270,8 +82270,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path20 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path20) ? path20 : import_node_path3.default.join(cwd, path20); + const path21 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path21) ? path21 : import_node_path3.default.join(cwd, path21); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -86673,8 +86673,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path20 = decodeGitFilePath(match[2]); - fileOidMap[path20] = oid; + const path21 = decodeGitFilePath(match[2]); + fileOidMap[path21] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -88309,13 +88309,13 @@ function flushDiagnostics(config) { // src/init.ts var fs15 = __toESM(require("fs")); -var path17 = __toESM(require("path")); +var path18 = __toESM(require("path")); var toolrunner4 = __toESM(require_toolrunner()); var io5 = __toESM(require_io()); // src/codeql.ts var fs14 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path17 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -88558,7 +88558,7 @@ function wrapCliConfigurationError(cliError) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path15 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -88566,6 +88566,7 @@ var semver7 = __toESM(require_semver2()); // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); +var path13 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -88714,7 +88715,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (tarPath.endsWith(`.${ext}`)) { + if (path13.extname(tarPath) === `.${ext}`) { return method; } } @@ -88724,7 +88725,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os3 = __toESM(require("os")); -var path13 = __toESM(require("path")); +var path14 = __toESM(require("path")); var import_perf_hooks2 = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -88857,7 +88858,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path13.join( + return path14.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -89000,7 +89001,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path15.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -89338,7 +89339,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path14.join(tempDir, v4_default()); + return path15.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -89371,7 +89372,7 @@ function isReservedToolsValue(tools) { // src/tracer-config.ts var fs13 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path16 = __toESM(require("path")); async function shouldEnableIndirectTracing(codeql, config) { if (config.buildMode === "none" /* None */) { return false; @@ -89384,7 +89385,7 @@ async function shouldEnableIndirectTracing(codeql, config) { async function getTracerConfigForCluster(config) { const tracingEnvVariables = JSON.parse( fs13.readFileSync( - path15.resolve( + path16.resolve( config.dbLocation, "temp/tracingEnvironment/start-tracing.json" ), @@ -89431,7 +89432,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path16.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path17.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -89486,7 +89487,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path16.join( + const tracingConfigPath = path17.join( extractorPath, "tools", "tracing-config.lua" @@ -89562,7 +89563,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path16.join( + const autobuildCmd = path17.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -89975,7 +89976,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path16.resolve(config.tempDir, "user-config.yaml"); + return path17.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -90064,9 +90065,9 @@ async function checkPacksForOverlayCompatibility(codeql, config, logger) { } function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) { try { - let qlpackPath = path17.join(packDir, "qlpack.yml"); + let qlpackPath = path18.join(packDir, "qlpack.yml"); if (!fs15.existsSync(qlpackPath)) { - qlpackPath = path17.join(packDir, "codeql-pack.yml"); + qlpackPath = path18.join(packDir, "codeql-pack.yml"); } const qlpackContents = load( fs15.readFileSync(qlpackPath, "utf8") @@ -90074,7 +90075,7 @@ function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) if (!qlpackContents.buildMetadata) { return true; } - const packInfoPath = path17.join(packDir, ".packinfo"); + const packInfoPath = path18.join(packDir, ".packinfo"); if (!fs15.existsSync(packInfoPath)) { logger.warning( `The query pack at ${packDir} does not have a .packinfo file, so it cannot support overlay analysis. Recompiling the query pack with the latest CodeQL CLI should solve this problem.` @@ -90107,7 +90108,7 @@ function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) } async function checkInstallPython311(languages, codeql) { if (languages.includes("python" /* python */) && process.platform === "win32" && !(await codeql.getVersion()).features?.supportsPython312) { - const script = path17.resolve( + const script = path18.resolve( __dirname, "../python-setup", "check_python12.ps1" @@ -90372,7 +90373,7 @@ async function createInitWithConfigStatusReport(config, initStatusReport, config // src/workflow.ts var fs16 = __toESM(require("fs")); -var path18 = __toESM(require("path")); +var path19 = __toESM(require("path")); var import_zlib = __toESM(require("zlib")); var core12 = __toESM(require_core()); function toCodedErrors(errors) { @@ -90527,7 +90528,7 @@ async function getWorkflow(logger) { } async function getWorkflowAbsolutePath(logger) { const relativePath = await getWorkflowRelativePath(); - const absolutePath = path18.join( + const absolutePath = path19.join( getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath ); @@ -90627,7 +90628,7 @@ async function run() { core13.exportVariable("JOB_RUN_UUID" /* JOB_RUN_UUID */, jobRunUuid); core13.exportVariable("CODEQL_ACTION_INIT_HAS_RUN" /* INIT_ACTION_HAS_RUN */, "true"); const configFile = getOptionalInput("config-file"); - const sourceRoot = path19.resolve( + const sourceRoot = path20.resolve( getRequiredEnvParam("GITHUB_WORKSPACE"), getOptionalInput("source-root") || "" ); @@ -90805,14 +90806,14 @@ async function run() { )) { try { logger.debug(`Applying static binary workaround for Go`); - const tempBinPath = path19.resolve( + const tempBinPath = path20.resolve( getTemporaryDirectory(), "codeql-action-go-tracing", "bin" ); fs17.mkdirSync(tempBinPath, { recursive: true }); core13.addPath(tempBinPath); - const goWrapperPath = path19.resolve(tempBinPath, "go"); + const goWrapperPath = path20.resolve(tempBinPath, "go"); fs17.writeFileSync( goWrapperPath, `#!/bin/bash diff --git a/lib/upload-lib.js b/lib/upload-lib.js index b7f23ef735..dc45c92411 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path15 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path17 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path15 && !path15.startsWith("/")) { - path15 = `/${path15}`; + if (path17 && !path17.startsWith("/")) { + path17 = `/${path17}`; } - url2 = new URL(origin + path15); + url2 = new URL(origin + path17); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path15) { - if (typeof path15 !== "string") { + module2.exports = function basename(path17) { + if (typeof path17 !== "string") { return ""; } - for (var i = path15.length - 1; i >= 0; --i) { - switch (path15.charCodeAt(i)) { + for (var i = path17.length - 1; i >= 0; --i) { + switch (path17.charCodeAt(i)) { case 47: // '/' case 92: - path15 = path15.slice(i + 1); - return path15 === ".." || path15 === "." ? "" : path15; + path17 = path17.slice(i + 1); + return path17 === ".." || path17 === "." ? "" : path17; } } - return path15 === ".." || path15 === "." ? "" : path15; + return path17 === ".." || path17 === "." ? "" : path17; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path15, + path: path17, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path15 !== "string") { + if (typeof path17 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path15[0] !== "/" && !(path15.startsWith("http://") || path15.startsWith("https://")) && method !== "CONNECT") { + } else if (path17[0] !== "/" && !(path17.startsWith("http://") || path17.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path15) !== null) { + } else if (invalidPathRegex.exec(path17) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path15, query) : path15; + this.path = query ? util.buildURL(path17, query) : path17; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path15 = search ? `${pathname}${search}` : pathname; + const path17 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path15; + this.opts.path = path17; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path15, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path17, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path15} HTTP/1.1\r + let header = `${method} ${path17} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path15, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path17, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path15; + headers[HTTP2_HEADER_PATH] = path17; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path15) { - if (typeof path15 !== "string") { - return path15; + function safeUrl(path17) { + if (typeof path17 !== "string") { + return path17; } - const pathSegments = path15.split("?"); + const pathSegments = path17.split("?"); if (pathSegments.length !== 2) { - return path15; + return path17; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path15, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path15); + function matchKey(mockDispatch2, { path: path17, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path17); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path15 }) => matchValue(safeUrl(path15), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path17 }) => matchValue(safeUrl(path17), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path15, method, body, headers, query } = opts; + const { path: path17, method, body, headers, query } = opts; return { - path: path15, + path: path17, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path15, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path17, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path15, + Path: path17, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path15) { - for (const char of path15) { + function validateCookiePath(path17) { + for (const char of path17) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path15 = opts.path; + let path17 = opts.path; if (!opts.path.startsWith("/")) { - path15 = `/${path15}`; + path17 = `/${path17}`; } - url2 = new URL(util.parseOrigin(url2).origin + path15); + url2 = new URL(util.parseOrigin(url2).origin + path17); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path15.sep); + return pth.replace(/[/\\]/g, path17.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs14 = __importStar4(require("fs")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); _a = fs14.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path15.extname(filePath).toUpperCase(); + const upperExt = path17.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path15.dirname(filePath); - const upperName = path15.basename(filePath).toUpperCase(); + const directory = path17.dirname(filePath); + const upperName = path17.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path15.join(directory, actualName); + filePath = path17.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path15.join(dest, path15.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path17.join(dest, path17.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path15.relative(source, newDest) === "") { + if (path17.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path15.join(dest, path15.basename(source)); + dest = path17.join(dest, path17.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path15.dirname(dest)); + yield mkdirP(path17.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path15.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path17.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path15.sep)) { + if (tool.includes(path17.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path15.delimiter)) { + for (const p of process.env.PATH.split(path17.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path15.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path17.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os2 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var io6 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path15.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path17.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io6.which(this.toolPath, true); return new Promise((resolve6, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os2 = __importStar4(require("os")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path15.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path17.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19821,14 +19821,14 @@ var require_helpers = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path15, name, argument) { - if (Array.isArray(path15)) { - this.path = path15; - this.property = path15.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path17, name, argument) { + if (Array.isArray(path17)) { + this.path = path17; + this.property = path17.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path15 !== void 0) { - this.property = path15; + } else if (path17 !== void 0) { + this.property = path17; } if (message) { this.message = message; @@ -19919,16 +19919,16 @@ var require_helpers = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path15, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path17, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path15)) { - this.path = path15; - this.propertyPath = path15.reduce(function(sum, item) { + if (Array.isArray(path17)) { + this.path = path17; + this.propertyPath = path17.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path15; + this.propertyPath = path17; } this.base = base; this.schemas = schemas; @@ -19937,10 +19937,10 @@ var require_helpers = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path15 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path17 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path15, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path17, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -21132,8 +21132,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path15 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path15} does not exist${os_1.EOL}`); + const path17 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path17} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -25894,7 +25894,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os2 = require("os"); - var path15 = require("path"); + var path17 = require("path"); var IS_WINDOWS_PLATFORM = os2.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -25906,7 +25906,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path15.resolve(cwd, filepath); + return path17.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -27203,7 +27203,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path15 = require("path"); + var path17 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -27373,7 +27373,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path15.sep, + SEP: path17.sep, /** * Create EXTGLOB_CHARS */ @@ -27400,7 +27400,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path15 = require("path"); + var path17 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -27429,7 +27429,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path15.sep === "\\"; + return win32 === true || path17.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -28564,7 +28564,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path15 = require("path"); + var path17 = require("path"); var scan = require_scan2(); var parse = require_parse3(); var utils = require_utils6(); @@ -28649,7 +28649,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => { const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options); - return regex.test(path15.basename(input)); + return regex.test(path17.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -28876,7 +28876,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path15 = require("path"); + var path17 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -28971,7 +28971,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path15.basename(pattern); + const basename = path17.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -29029,7 +29029,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path15.isAbsolute(pattern); + return path17.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -29206,8 +29206,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs14 = require_fs(); exports2.fs = fs14; - var path15 = require_path(); - exports2.path = path15; + var path17 = require_path(); + exports2.path = path17; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -29319,8 +29319,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path15, settings, callback) { - settings.fs.lstat(path15, (lstatError, lstat) => { + function read(path17, settings, callback) { + settings.fs.lstat(path17, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -29329,7 +29329,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path15, (statError, stat) => { + settings.fs.stat(path17, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -29361,13 +29361,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path15, settings) { - const lstat = settings.fs.lstatSync(path15); + function read(path17, settings) { + const lstat = settings.fs.lstatSync(path17); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path15); + const stat = settings.fs.statSync(path17); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -29438,17 +29438,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path15, optionsOrSettingsOrCallback, callback) { + function stat(path17, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path15, getSettings(), optionsOrSettingsOrCallback); + async.read(path17, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path15, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path17, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path15, optionsOrSettings) { + function statSync3(path17, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path15, settings); + return sync.read(path17, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -29664,16 +29664,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path15 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path17 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path15, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path17, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path15, + path: path17, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -29791,7 +29791,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path15 = require("path"); + var path17 = require("path"); var fsStat = require_out(); var fs14 = require_fs4(); var Settings = class { @@ -29799,7 +29799,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs14.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path15.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path17.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -29826,17 +29826,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path15, optionsOrSettingsOrCallback, callback) { + function scandir(path17, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path15, getSettings(), optionsOrSettingsOrCallback); + async.read(path17, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path15, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path17, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path15, optionsOrSettings) { + function scandirSync(path17, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path15, settings); + return sync.read(path17, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -30363,7 +30363,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path15 = require("path"); + var path17 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -30373,7 +30373,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path15.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path17.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -30435,7 +30435,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path15 = require("path"); + var path17 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -30448,7 +30448,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path15.resolve(this._settings.cwd, filepath); + return path17.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -30864,7 +30864,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path15 = require("path"); + var path17 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -30878,7 +30878,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path15.resolve(this._settings.cwd, task.base); + return path17.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -31511,7 +31511,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path15, checkUnignored, mode) { + test(path17, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -31520,7 +31520,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path15); + const matched = rule[mode].test(path17); if (!matched) { return; } @@ -31541,17 +31541,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path15, originalPath, doThrow) => { - if (!isString(path15)) { + var checkPath = (path17, originalPath, doThrow) => { + if (!isString(path17)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path15) { + if (!path17) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path15)) { + if (checkPath.isNotRelative(path17)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -31560,7 +31560,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path15) => REGEX_TEST_INVALID_PATH.test(path15); + var isNotRelative = (path17) => REGEX_TEST_INVALID_PATH.test(path17); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -31590,19 +31590,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path15 = originalPath && checkPath.convert(originalPath); + const path17 = originalPath && checkPath.convert(originalPath); checkPath( - path15, + path17, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path15, cache, checkUnignored, slices); + return this._t(path17, cache, checkUnignored, slices); } - checkIgnore(path15) { - if (!REGEX_TEST_TRAILING_SLASH.test(path15)) { - return this.test(path15); + checkIgnore(path17) { + if (!REGEX_TEST_TRAILING_SLASH.test(path17)) { + return this.test(path17); } - const slices = path15.split(SLASH).filter(Boolean); + const slices = path17.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -31615,18 +31615,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path15, false, MODE_CHECK_IGNORE); + return this._rules.test(path17, false, MODE_CHECK_IGNORE); } - _t(path15, cache, checkUnignored, slices) { - if (path15 in cache) { - return cache[path15]; + _t(path17, cache, checkUnignored, slices) { + if (path17 in cache) { + return cache[path17]; } if (!slices) { - slices = path15.split(SLASH).filter(Boolean); + slices = path17.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path15] = this._rules.test(path15, checkUnignored, MODE_IGNORE); + return cache[path17] = this._rules.test(path17, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -31634,29 +31634,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path15] = parent.ignored ? parent : this._rules.test(path15, checkUnignored, MODE_IGNORE); + return cache[path17] = parent.ignored ? parent : this._rules.test(path17, checkUnignored, MODE_IGNORE); } - ignores(path15) { - return this._test(path15, this._ignoreCache, false).ignored; + ignores(path17) { + return this._test(path17, this._ignoreCache, false).ignored; } createFilter() { - return (path15) => !this.ignores(path15); + return (path17) => !this.ignores(path17); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path15) { - return this._test(path15, this._testCache, true); + test(path17) { + return this._test(path17, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path15) => checkPath(path15 && checkPath.convert(path15), path15, RETURN_FALSE); + var isPathValid = (path17) => checkPath(path17 && checkPath.convert(path17), path17, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path15) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path15) || isNotRelative(path15); + checkPath.isNotRelative = (path17) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path17) || isNotRelative(path17); }; if ( // Detect `process` so that it can run in browsers. @@ -35348,7 +35348,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -35356,7 +35356,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path15.dirname(p); + let result = path17.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -35394,7 +35394,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path15.sep; + root += path17.sep; } return root + itemPath; } @@ -35432,10 +35432,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path15.sep)) { + if (!p.endsWith(path17.sep)) { return p; } - if (p === path15.sep) { + if (p === path17.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -35768,7 +35768,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path15 = (function() { + var path17 = (function() { try { return require("path"); } catch (e) { @@ -35776,7 +35776,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path15.sep; + minimatch.sep = path17.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -35865,8 +35865,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path15.sep !== "/") { - pattern = pattern.split(path15.sep).join("/"); + if (!options.allowWindowsEscape && path17.sep !== "/") { + pattern = pattern.split(path17.sep).join("/"); } this.options = options; this.set = []; @@ -36235,8 +36235,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path15.sep !== "/") { - f = f.split(path15.sep).join("/"); + if (path17.sep !== "/") { + f = f.split(path17.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -36368,7 +36368,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -36383,12 +36383,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path15.sep); + this.segments = itemPath.split(path17.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path15.basename(remaining); + const basename = path17.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -36406,7 +36406,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path15.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path17.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -36417,12 +36417,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path15.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path17.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path15.sep; + result += path17.sep; } result += this.segments[i]; } @@ -36466,7 +36466,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os2 = __importStar4(require("os")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -36495,7 +36495,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path15.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path17.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -36519,8 +36519,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path15.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path15.sep}`; + if (!itemPath.endsWith(path17.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path17.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -36555,9 +36555,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path15.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path17.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path15.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path17.sep}`)) { homedir = homedir || os2.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -36641,8 +36641,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path15, level) { - this.path = path15; + constructor(path17, level) { + this.path = path17; this.level = level; } }; @@ -36764,7 +36764,7 @@ var require_internal_globber = __commonJS({ var core12 = __importStar4(require_core()); var fs14 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -36845,7 +36845,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs14.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path15.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs14.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path17.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -38230,7 +38230,7 @@ var require_cacheUtils = __commonJS({ var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs14 = __importStar4(require("fs")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -38250,9 +38250,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path15.join(baseLocation, "actions", "temp"); + tempDirectory = path17.join(baseLocation, "actions", "temp"); } - const dest = path15.join(tempDirectory, crypto.randomUUID()); + const dest = path17.join(tempDirectory, crypto.randomUUID()); yield io6.mkdirP(dest); return dest; }); @@ -38276,7 +38276,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path15.relative(workspace, file).replace(new RegExp(`\\${path15.sep}`, "g"), "/"); + const relativeFile = path17.relative(workspace, file).replace(new RegExp(`\\${path17.sep}`, "g"), "/"); core12.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -46182,15 +46182,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path15 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path15.startsWith("/")) { - path15 = path15.substring(1); + let path17 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path17.startsWith("/")) { + path17 = path17.substring(1); } - if (isAbsoluteUrl(path15)) { - requestUrl = path15; + if (isAbsoluteUrl(path17)) { + requestUrl = path17; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path15); + requestUrl = appendPath(requestUrl, path17); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -46238,9 +46238,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path15 = pathToAppend.substring(0, searchStart); + const path17 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path15; + newPath = newPath + path17; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -50389,10 +50389,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path15 = urlParsed.pathname; - path15 = path15 || "/"; - path15 = escape(path15); - urlParsed.pathname = path15; + let path17 = urlParsed.pathname; + path17 = path17 || "/"; + path17 = escape(path17); + urlParsed.pathname = path17; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -50477,9 +50477,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path15 = urlParsed.pathname; - path15 = path15 ? path15.endsWith("/") ? `${path15}${name}` : `${path15}/${name}` : name; - urlParsed.pathname = path15; + let path17 = urlParsed.pathname; + path17 = path17 ? path17.endsWith("/") ? `${path17}${name}` : `${path17}/${name}` : name; + urlParsed.pathname = path17; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -51560,9 +51560,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path15 = getURLPath(request.url) || "/"; + const path17 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path15}`; + canonicalizedResourceString += `/${this.factory.accountName}${path17}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -51855,9 +51855,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path15 = getURLPath(request.url) || "/"; + const path17 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path15}`; + canonicalizedResourceString += `/${options.accountName}${path17}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -71159,8 +71159,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path15 = getURLPath(subRequest.url); - if (!path15 || path15 === "") { + const path17 = getURLPath(subRequest.url); + if (!path17 || path17 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -71220,8 +71220,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path15 = getURLPath(url3); - if (path15 && path15 !== "/") { + const path17 = getURLPath(url3); + if (path17 && path17 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -79971,7 +79971,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io6 = __importStar4(require_io()); var fs_1 = require("fs"); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -80017,13 +80017,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path15.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path17.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -80069,7 +80069,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -80078,7 +80078,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -80093,7 +80093,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -80102,7 +80102,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -80142,7 +80142,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path15.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path17.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -80212,7 +80212,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core12 = __importStar4(require_core()); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -80309,7 +80309,7 @@ var require_cache3 = __commonJS({ core12.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path15.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path17.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core12.isDebug()) { @@ -80378,7 +80378,7 @@ var require_cache3 = __commonJS({ core12.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path15.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path17.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core12.debug(`Archive path: ${archivePath}`); core12.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -80441,7 +80441,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path15.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path17.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -80505,7 +80505,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path15.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path17.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -80890,7 +80890,7 @@ var require_tool_cache = __commonJS({ var fs14 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os2 = __importStar4(require("os")); - var path15 = __importStar4(require("path")); + var path17 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80911,8 +80911,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path15.join(_getTempDirectory(), crypto.randomUUID()); - yield io6.mkdirP(path15.dirname(dest)); + dest = dest || path17.join(_getTempDirectory(), crypto.randomUUID()); + yield io6.mkdirP(path17.dirname(dest)); core12.debug(`Downloading ${url2}`); core12.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80999,7 +80999,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path15.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path17.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -81175,7 +81175,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs14.readdirSync(sourceDir)) { - const s = path15.join(sourceDir, itemName); + const s = path17.join(sourceDir, itemName); yield io6.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -81193,7 +81193,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path15.join(destFolder, targetFile); + const destPath = path17.join(destFolder, targetFile); core12.debug(`destination file ${destPath}`); yield io6.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81217,7 +81217,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path15.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path17.join(_getCacheDirectory(), toolName, versionSpec, arch2); core12.debug(`checking cache: ${cachePath}`); if (fs14.existsSync(cachePath) && fs14.existsSync(`${cachePath}.complete`)) { core12.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81232,12 +81232,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os2.arch(); - const toolPath = path15.join(_getCacheDirectory(), toolName); + const toolPath = path17.join(_getCacheDirectory(), toolName); if (fs14.existsSync(toolPath)) { const children = fs14.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path15.join(toolPath, child, arch2 || ""); + const fullPath = path17.join(toolPath, child, arch2 || ""); if (fs14.existsSync(fullPath) && fs14.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81292,7 +81292,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path15.join(_getTempDirectory(), crypto.randomUUID()); + dest = path17.join(_getTempDirectory(), crypto.randomUUID()); } yield io6.mkdirP(dest); return dest; @@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path17.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core12.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io6.rmRF(folderPath); @@ -81310,7 +81310,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path17.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs14.writeFileSync(markerPath, ""); core12.debug("finished caching tool"); @@ -84837,7 +84837,7 @@ __export(upload_lib_exports, { }); module.exports = __toCommonJS(upload_lib_exports); var fs13 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path16 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core11 = __toESM(require_core()); @@ -85103,12 +85103,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path15) { - const isExtendedLengthPath = path15.startsWith("\\\\?\\"); +function slash(path17) { + const isExtendedLengthPath = path17.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path15; + return path17; } - return path15.replace(/\\/g, "/"); + return path17.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -85196,8 +85196,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path15 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path2.default.isAbsolute(path15) ? path15 : import_node_path2.default.join(cwd, path15); + const path17 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path2.default.isAbsolute(path17) ? path17 : import_node_path2.default.join(cwd, path17); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -88559,6 +88559,7 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts +var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -88570,7 +88571,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -88579,7 +88580,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -88731,7 +88732,7 @@ function wrapApiConfigurationError(e) { // src/codeql.ts var fs11 = __toESM(require("fs")); -var path12 = __toESM(require("path")); +var path14 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -88974,7 +88975,7 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs7 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/caching-utils.ts var core6 = __toESM(require_core()); @@ -88990,7 +88991,7 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs6 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path9 = __toESM(require("path")); // src/feature-flags.ts var semver4 = __toESM(require_semver2()); @@ -89001,7 +89002,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs5 = __toESM(require("fs")); -var path7 = __toESM(require("path")); +var path8 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -89127,8 +89128,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path15 = decodeGitFilePath(match[2]); - fileOidMap[path15] = oid; + const path17 = decodeGitFilePath(match[2]); + fileOidMap[path17] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -89241,7 +89242,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path7.join(config.dbLocation, "base-database-oids.json"); + return path8.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -89251,7 +89252,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path7.join( + const overlayChangesFile = path8.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -89461,7 +89462,7 @@ var featureConfig = { // src/diff-informed-analysis-utils.ts function getDiffRangesJsonFilePath() { - return path8.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -89506,7 +89507,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path9.join(tempDir, "config"); + return path10.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -89550,7 +89551,7 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) { // src/setup-codeql.ts var fs10 = __toESM(require("fs")); -var path11 = __toESM(require("path")); +var path13 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -89612,6 +89613,7 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs8 = __toESM(require("fs")); +var path11 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -89760,7 +89762,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (tarPath.endsWith(`.${ext}`)) { + if (path11.extname(tarPath) === `.${ext}`) { return method; } } @@ -89770,7 +89772,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs9 = __toESM(require("fs")); var os = __toESM(require("os")); -var path10 = __toESM(require("path")); +var path12 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -89903,7 +89905,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path10.join( + return path12.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -90046,7 +90048,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs10.existsSync(path11.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs10.existsSync(path13.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -90384,7 +90386,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path11.join(tempDir, v4_default()); + return path13.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -90455,7 +90457,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path12.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path14.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -90516,7 +90518,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path12.join( + const tracingConfigPath = path14.join( extractorPath, "tools", "tracing-config.lua" @@ -90592,7 +90594,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path12.join( + const autobuildCmd = path14.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -91005,7 +91007,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path12.resolve(config.tempDir, "user-config.yaml"); + return path14.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -92332,10 +92334,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path14.resolve(tempDir, "combined-sarif"); + const baseTempDir = path16.resolve(tempDir, "combined-sarif"); fs13.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs13.mkdtempSync(path14.resolve(baseTempDir, "output-")); - const outputFile = path14.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs13.mkdtempSync(path16.resolve(baseTempDir, "output-")); + const outputFile = path16.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -92368,7 +92370,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path14.join( + const payloadSaveFile = path16.join( getTemporaryDirectory(), "payload.json" ); @@ -92412,9 +92414,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs13.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path14.resolve(dir, entry.name)); + sarifFiles.push(path16.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path14.resolve(dir, entry.name)); + walkSarifFiles(path16.resolve(dir, entry.name)); } } }; @@ -92447,7 +92449,7 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { if (stats.isDirectory()) { let sarifFiles = findSarifFilesInDir( sarifPath, - (name) => name.endsWith(".sarif") + (name) => path16.extname(name) === ".sarif" ); logger.debug( `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` @@ -92681,7 +92683,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path14.resolve( + const outputFile = path16.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -92829,7 +92831,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path14.join(checkoutPath, locationUri).replaceAll(path14.sep, "/"); + const locationPath = path16.join(checkoutPath, locationUri).replaceAll(path16.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 1e61b3bc54..e9b083b3c3 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -117619,7 +117619,7 @@ async function uploadCombinedSarifArtifacts(logger, gitHubVariant, codeQlVersion if (fs.existsSync(baseTempDir)) { const outputDirs = fs.readdirSync(baseTempDir); for (const outputDir of outputDirs) { - const sarifFiles = fs.readdirSync(path.resolve(baseTempDir, outputDir)).filter((f) => f.endsWith(".sarif")); + const sarifFiles = fs.readdirSync(path.resolve(baseTempDir, outputDir)).filter((f) => path.extname(f) === ".sarif"); for (const sarifFile of sarifFiles) { toUpload.push(path.resolve(baseTempDir, outputDir, sarifFile)); } diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 1efe395bb1..da656b7f07 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path16 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path18 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path16 && !path16.startsWith("/")) { - path16 = `/${path16}`; + if (path18 && !path18.startsWith("/")) { + path18 = `/${path18}`; } - url2 = new URL(origin + path16); + url2 = new URL(origin + path18); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path16) { - if (typeof path16 !== "string") { + module2.exports = function basename(path18) { + if (typeof path18 !== "string") { return ""; } - for (var i = path16.length - 1; i >= 0; --i) { - switch (path16.charCodeAt(i)) { + for (var i = path18.length - 1; i >= 0; --i) { + switch (path18.charCodeAt(i)) { case 47: // '/' case 92: - path16 = path16.slice(i + 1); - return path16 === ".." || path16 === "." ? "" : path16; + path18 = path18.slice(i + 1); + return path18 === ".." || path18 === "." ? "" : path18; } } - return path16 === ".." || path16 === "." ? "" : path16; + return path18 === ".." || path18 === "." ? "" : path18; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path16, + path: path18, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path16 !== "string") { + if (typeof path18 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path16[0] !== "/" && !(path16.startsWith("http://") || path16.startsWith("https://")) && method !== "CONNECT") { + } else if (path18[0] !== "/" && !(path18.startsWith("http://") || path18.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path16) !== null) { + } else if (invalidPathRegex.exec(path18) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path16, query) : path16; + this.path = query ? util.buildURL(path18, query) : path18; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path16 = search ? `${pathname}${search}` : pathname; + const path18 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path16; + this.opts.path = path18; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path16, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path18, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path16} HTTP/1.1\r + let header = `${method} ${path18} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path16, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path18, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path16; + headers[HTTP2_HEADER_PATH] = path18; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path16) { - if (typeof path16 !== "string") { - return path16; + function safeUrl(path18) { + if (typeof path18 !== "string") { + return path18; } - const pathSegments = path16.split("?"); + const pathSegments = path18.split("?"); if (pathSegments.length !== 2) { - return path16; + return path18; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path16, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path16); + function matchKey(mockDispatch2, { path: path18, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path18); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path16 }) => matchValue(safeUrl(path16), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path18 }) => matchValue(safeUrl(path18), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path16, method, body, headers, query } = opts; + const { path: path18, method, body, headers, query } = opts; return { - path: path16, + path: path18, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path16, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path18, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path16, + Path: path18, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path16) { - for (const char of path16) { + function validateCookiePath(path18) { + for (const char of path18) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path16 = opts.path; + let path18 = opts.path; if (!opts.path.startsWith("/")) { - path16 = `/${path16}`; + path18 = `/${path18}`; } - url2 = new URL(util.parseOrigin(url2).origin + path16); + url2 = new URL(util.parseOrigin(url2).origin + path18); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path16.sep); + return pth.replace(/[/\\]/g, path18.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs15 = __importStar4(require("fs")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); _a = fs15.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path16.extname(filePath).toUpperCase(); + const upperExt = path18.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path16.dirname(filePath); - const upperName = path16.basename(filePath).toUpperCase(); + const directory = path18.dirname(filePath); + const upperName = path18.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path16.join(directory, actualName); + filePath = path18.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path16.join(dest, path16.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path18.join(dest, path18.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path16.relative(source, newDest) === "") { + if (path18.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path16.join(dest, path16.basename(source)); + dest = path18.join(dest, path18.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path16.dirname(dest)); + yield mkdirP(path18.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path16.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path18.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path16.sep)) { + if (tool.includes(path18.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path16.delimiter)) { + for (const p of process.env.PATH.split(path18.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path16.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path18.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os3 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var io6 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path16.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path18.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io6.which(this.toolPath, true); return new Promise((resolve6, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os3 = __importStar4(require("os")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path16.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path18.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path16 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path16} does not exist${os_1.EOL}`); + const path18 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path18} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os3 = require("os"); - var path16 = require("path"); + var path18 = require("path"); var IS_WINDOWS_PLATFORM = os3.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path16.resolve(cwd, filepath); + return path18.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path16 = require("path"); + var path18 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path16.sep, + SEP: path18.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path16 = require("path"); + var path18 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path16.sep === "\\"; + return win32 === true || path18.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path16 = require("path"); + var path18 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => { const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options); - return regex.test(path16.basename(input)); + return regex.test(path18.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path16 = require("path"); + var path18 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path16.basename(pattern); + const basename = path18.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path16.isAbsolute(pattern); + return path18.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs15 = require_fs(); exports2.fs = fs15; - var path16 = require_path(); - exports2.path = path16; + var path18 = require_path(); + exports2.path = path18; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path16, settings, callback) { - settings.fs.lstat(path16, (lstatError, lstat) => { + function read(path18, settings, callback) { + settings.fs.lstat(path18, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path16, (statError, stat) => { + settings.fs.stat(path18, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path16, settings) { - const lstat = settings.fs.lstatSync(path16); + function read(path18, settings) { + const lstat = settings.fs.lstatSync(path18); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path16); + const stat = settings.fs.statSync(path18); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path16, optionsOrSettingsOrCallback, callback) { + function stat(path18, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path16, getSettings(), optionsOrSettingsOrCallback); + async.read(path18, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path16, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path18, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path16, optionsOrSettings) { + function statSync3(path18, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path16, settings); + return sync.read(path18, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path16 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path18 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path16, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path18, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path16, + path: path18, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path16 = require("path"); + var path18 = require("path"); var fsStat = require_out(); var fs15 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs15.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path16.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path18.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path16, optionsOrSettingsOrCallback, callback) { + function scandir(path18, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path16, getSettings(), optionsOrSettingsOrCallback); + async.read(path18, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path16, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path18, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path16, optionsOrSettings) { + function scandirSync(path18, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path16, settings); + return sync.read(path18, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path16 = require("path"); + var path18 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path16.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path18.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path16 = require("path"); + var path18 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path16.resolve(this._settings.cwd, filepath); + return path18.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path16 = require("path"); + var path18 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path16.resolve(this._settings.cwd, task.base); + return path18.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path16, checkUnignored, mode) { + test(path18, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path16); + const matched = rule[mode].test(path18); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path16, originalPath, doThrow) => { - if (!isString(path16)) { + var checkPath = (path18, originalPath, doThrow) => { + if (!isString(path18)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path16) { + if (!path18) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path16)) { + if (checkPath.isNotRelative(path18)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path16) => REGEX_TEST_INVALID_PATH.test(path16); + var isNotRelative = (path18) => REGEX_TEST_INVALID_PATH.test(path18); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path16 = originalPath && checkPath.convert(originalPath); + const path18 = originalPath && checkPath.convert(originalPath); checkPath( - path16, + path18, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path16, cache, checkUnignored, slices); + return this._t(path18, cache, checkUnignored, slices); } - checkIgnore(path16) { - if (!REGEX_TEST_TRAILING_SLASH.test(path16)) { - return this.test(path16); + checkIgnore(path18) { + if (!REGEX_TEST_TRAILING_SLASH.test(path18)) { + return this.test(path18); } - const slices = path16.split(SLASH).filter(Boolean); + const slices = path18.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path16, false, MODE_CHECK_IGNORE); + return this._rules.test(path18, false, MODE_CHECK_IGNORE); } - _t(path16, cache, checkUnignored, slices) { - if (path16 in cache) { - return cache[path16]; + _t(path18, cache, checkUnignored, slices) { + if (path18 in cache) { + return cache[path18]; } if (!slices) { - slices = path16.split(SLASH).filter(Boolean); + slices = path18.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path16] = this._rules.test(path16, checkUnignored, MODE_IGNORE); + return cache[path18] = this._rules.test(path18, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path16] = parent.ignored ? parent : this._rules.test(path16, checkUnignored, MODE_IGNORE); + return cache[path18] = parent.ignored ? parent : this._rules.test(path18, checkUnignored, MODE_IGNORE); } - ignores(path16) { - return this._test(path16, this._ignoreCache, false).ignored; + ignores(path18) { + return this._test(path18, this._ignoreCache, false).ignored; } createFilter() { - return (path16) => !this.ignores(path16); + return (path18) => !this.ignores(path18); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path16) { - return this._test(path16, this._testCache, true); + test(path18) { + return this._test(path18, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path16) => checkPath(path16 && checkPath.convert(path16), path16, RETURN_FALSE); + var isPathValid = (path18) => checkPath(path18 && checkPath.convert(path18), path18, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path16) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path16) || isNotRelative(path16); + checkPath.isNotRelative = (path18) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path18) || isNotRelative(path18); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path16.dirname(p); + let result = path18.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path16.sep; + root += path18.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path16.sep)) { + if (!p.endsWith(path18.sep)) { return p; } - if (p === path16.sep) { + if (p === path18.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path16 = (function() { + var path18 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path16.sep; + minimatch.sep = path18.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path16.sep !== "/") { - pattern = pattern.split(path16.sep).join("/"); + if (!options.allowWindowsEscape && path18.sep !== "/") { + pattern = pattern.split(path18.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path16.sep !== "/") { - f = f.split(path16.sep).join("/"); + if (path18.sep !== "/") { + f = f.split(path18.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path16.sep); + this.segments = itemPath.split(path18.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path16.basename(remaining); + const basename = path18.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path16.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path18.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path16.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path18.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path16.sep; + result += path18.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path16.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path18.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path16.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path16.sep}`; + if (!itemPath.endsWith(path18.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path18.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path16.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path18.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path16.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path18.sep}`)) { homedir = homedir || os3.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path16, level) { - this.path = path16; + constructor(path18, level) { + this.path = path18; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core14 = __importStar4(require_core()); var fs15 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs15.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path16.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs15.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path18.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs15 = __importStar4(require("fs")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path16.join(baseLocation, "actions", "temp"); + tempDirectory = path18.join(baseLocation, "actions", "temp"); } - const dest = path16.join(tempDirectory, crypto.randomUUID()); + const dest = path18.join(tempDirectory, crypto.randomUUID()); yield io6.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path16.relative(workspace, file).replace(new RegExp(`\\${path16.sep}`, "g"), "/"); + const relativeFile = path18.relative(workspace, file).replace(new RegExp(`\\${path18.sep}`, "g"), "/"); core14.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path16 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path16.startsWith("/")) { - path16 = path16.substring(1); + let path18 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path18.startsWith("/")) { + path18 = path18.substring(1); } - if (isAbsoluteUrl(path16)) { - requestUrl = path16; + if (isAbsoluteUrl(path18)) { + requestUrl = path18; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path16); + requestUrl = appendPath(requestUrl, path18); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path16 = pathToAppend.substring(0, searchStart); + const path18 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path16; + newPath = newPath + path18; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path16 = urlParsed.pathname; - path16 = path16 || "/"; - path16 = escape(path16); - urlParsed.pathname = path16; + let path18 = urlParsed.pathname; + path18 = path18 || "/"; + path18 = escape(path18); + urlParsed.pathname = path18; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path16 = urlParsed.pathname; - path16 = path16 ? path16.endsWith("/") ? `${path16}${name}` : `${path16}/${name}` : name; - urlParsed.pathname = path16; + let path18 = urlParsed.pathname; + path18 = path18 ? path18.endsWith("/") ? `${path18}${name}` : `${path18}/${name}` : name; + urlParsed.pathname = path18; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path16 = getURLPath(request.url) || "/"; + const path18 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path16}`; + canonicalizedResourceString += `/${this.factory.accountName}${path18}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path16 = getURLPath(request.url) || "/"; + const path18 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path16}`; + canonicalizedResourceString += `/${options.accountName}${path18}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path16 = getURLPath(subRequest.url); - if (!path16 || path16 === "") { + const path18 = getURLPath(subRequest.url); + if (!path18 || path18 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path16 = getURLPath(url3); - if (path16 && path16 !== "/") { + const path18 = getURLPath(url3); + if (path18 && path18 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io6 = __importStar4(require_io()); var fs_1 = require("fs"); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path16.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path18.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path16.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path18.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core14 = __importStar4(require_core()); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path16.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path18.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core14.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path16.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path18.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive path: ${archivePath}`); core14.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path16.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path18.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path16.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path18.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79287,14 +79287,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path16, name, argument) { - if (Array.isArray(path16)) { - this.path = path16; - this.property = path16.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path18, name, argument) { + if (Array.isArray(path18)) { + this.path = path18; + this.property = path18.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path16 !== void 0) { - this.property = path16; + } else if (path18 !== void 0) { + this.property = path18; } if (message) { this.message = message; @@ -79385,16 +79385,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path16, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path18, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path16)) { - this.path = path16; - this.propertyPath = path16.reduce(function(sum, item) { + if (Array.isArray(path18)) { + this.path = path18; + this.propertyPath = path18.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path16; + this.propertyPath = path18; } this.base = base; this.schemas = schemas; @@ -79403,10 +79403,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path16 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path18 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path16, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path18, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -80890,7 +80890,7 @@ var require_tool_cache = __commonJS({ var fs15 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os3 = __importStar4(require("os")); - var path16 = __importStar4(require("path")); + var path18 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80911,8 +80911,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path16.join(_getTempDirectory(), crypto.randomUUID()); - yield io6.mkdirP(path16.dirname(dest)); + dest = dest || path18.join(_getTempDirectory(), crypto.randomUUID()); + yield io6.mkdirP(path18.dirname(dest)); core14.debug(`Downloading ${url2}`); core14.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80999,7 +80999,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path16.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path18.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -81175,7 +81175,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs15.readdirSync(sourceDir)) { - const s = path16.join(sourceDir, itemName); + const s = path18.join(sourceDir, itemName); yield io6.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -81193,7 +81193,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path16.join(destFolder, targetFile); + const destPath = path18.join(destFolder, targetFile); core14.debug(`destination file ${destPath}`); yield io6.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81217,7 +81217,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path16.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path18.join(_getCacheDirectory(), toolName, versionSpec, arch2); core14.debug(`checking cache: ${cachePath}`); if (fs15.existsSync(cachePath) && fs15.existsSync(`${cachePath}.complete`)) { core14.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81232,12 +81232,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os3.arch(); - const toolPath = path16.join(_getCacheDirectory(), toolName); + const toolPath = path18.join(_getCacheDirectory(), toolName); if (fs15.existsSync(toolPath)) { const children = fs15.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path16.join(toolPath, child, arch2 || ""); + const fullPath = path18.join(toolPath, child, arch2 || ""); if (fs15.existsSync(fullPath) && fs15.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81292,7 +81292,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path16.join(_getTempDirectory(), crypto.randomUUID()); + dest = path18.join(_getTempDirectory(), crypto.randomUUID()); } yield io6.mkdirP(dest); return dest; @@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path18.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core14.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io6.rmRF(folderPath); @@ -81310,7 +81310,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path18.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs15.writeFileSync(markerPath, ""); core14.debug("finished caching tool"); @@ -85213,12 +85213,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path16) { - const isExtendedLengthPath = path16.startsWith("\\\\?\\"); +function slash(path18) { + const isExtendedLengthPath = path18.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path16; + return path18; } - return path16.replace(/\\/g, "/"); + return path18.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -85306,8 +85306,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path16 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path16) ? path16 : import_node_path3.default.join(cwd, path16); + const path18 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path18) ? path18 : import_node_path3.default.join(cwd, path18); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -88761,6 +88761,7 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts +var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -88772,7 +88773,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -88781,7 +88782,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), + sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -88941,7 +88942,7 @@ function wrapApiConfigurationError(e) { // src/feature-flags.ts var fs6 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path9 = __toESM(require("path")); var semver3 = __toESM(require_semver2()); // src/defaults.json @@ -88950,7 +88951,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs5 = __toESM(require("fs")); -var path7 = __toESM(require("path")); +var path8 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -89076,8 +89077,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path16 = decodeGitFilePath(match[2]); - fileOidMap[path16] = oid; + const path18 = decodeGitFilePath(match[2]); + fileOidMap[path18] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -89193,7 +89194,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path7.join(config.dbLocation, "base-database-oids.json"); + return path8.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -89203,7 +89204,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path7.join( + const overlayChangesFile = path8.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -89419,7 +89420,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -89683,7 +89684,7 @@ var core9 = __toESM(require_core()); // src/config-utils.ts var fs8 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path11 = __toESM(require("path")); // src/caching-utils.ts var core8 = __toESM(require_core()); @@ -89699,9 +89700,9 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs7 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path10 = __toESM(require("path")); function getDiffRangesJsonFilePath() { - return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -89746,7 +89747,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path10.join(tempDir, "config"); + return path11.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -89966,7 +89967,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs14 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path17 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core12 = __toESM(require_core()); @@ -89974,7 +89975,7 @@ var jsonschema = __toESM(require_lib2()); // src/codeql.ts var fs12 = __toESM(require("fs")); -var path13 = __toESM(require("path")); +var path15 = __toESM(require("path")); var core11 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -90217,7 +90218,7 @@ function wrapCliConfigurationError(cliError) { // src/setup-codeql.ts var fs11 = __toESM(require("fs")); -var path12 = __toESM(require("path")); +var path14 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -90279,6 +90280,7 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs9 = __toESM(require("fs")); +var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -90427,7 +90429,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (tarPath.endsWith(`.${ext}`)) { + if (path12.extname(tarPath) === `.${ext}`) { return method; } } @@ -90437,7 +90439,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs10 = __toESM(require("fs")); var os2 = __toESM(require("os")); -var path11 = __toESM(require("path")); +var path13 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core10 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -90570,7 +90572,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path11.join( + return path13.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -90713,7 +90715,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs11.existsSync(path12.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs11.existsSync(path14.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -91051,7 +91053,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path12.join(tempDir, v4_default()); + return path14.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -91122,7 +91124,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path13.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path15.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -91183,7 +91185,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path13.join( + const tracingConfigPath = path15.join( extractorPath, "tools", "tracing-config.lua" @@ -91259,7 +91261,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path13.join( + const autobuildCmd = path15.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -91672,7 +91674,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path13.resolve(config.tempDir, "user-config.yaml"); + return path15.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -92999,10 +93001,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path15.resolve(tempDir, "combined-sarif"); + const baseTempDir = path17.resolve(tempDir, "combined-sarif"); fs14.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs14.mkdtempSync(path15.resolve(baseTempDir, "output-")); - const outputFile = path15.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs14.mkdtempSync(path17.resolve(baseTempDir, "output-")); + const outputFile = path17.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -93035,7 +93037,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path15.join( + const payloadSaveFile = path17.join( getTemporaryDirectory(), "payload.json" ); @@ -93079,9 +93081,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs14.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path15.resolve(dir, entry.name)); + sarifFiles.push(path17.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path15.resolve(dir, entry.name)); + walkSarifFiles(path17.resolve(dir, entry.name)); } } }; @@ -93097,7 +93099,7 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { if (stats.isDirectory()) { let sarifFiles = findSarifFilesInDir( sarifPath, - (name) => name.endsWith(".sarif") + (name) => path17.extname(name) === ".sarif" ); logger.debug( `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` @@ -93317,7 +93319,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path15.resolve( + const outputFile = path17.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -93465,7 +93467,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path15.join(checkoutPath, locationUri).replaceAll(path15.sep, "/"); + const locationPath = path17.join(checkoutPath, locationUri).replaceAll(path17.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); diff --git a/src/analyze.test.ts b/src/analyze.test.ts index 305d41d241..f3d516a78a 100644 --- a/src/analyze.test.ts +++ b/src/analyze.test.ts @@ -334,7 +334,7 @@ test("resolveQuerySuiteAlias", (t) => { for (const suite of defaultSuites) { const resolved = resolveQuerySuiteAlias(KnownLanguage.go, suite); t.assert( - resolved.endsWith(".qls"), + path.extname(resolved) === ".qls", "Resolved default suite doesn't end in .qls", ); t.assert( diff --git a/src/debug-artifacts.ts b/src/debug-artifacts.ts index a355341d04..90e493d680 100644 --- a/src/debug-artifacts.ts +++ b/src/debug-artifacts.ts @@ -59,7 +59,7 @@ export async function uploadCombinedSarifArtifacts( for (const outputDir of outputDirs) { const sarifFiles = fs .readdirSync(path.resolve(baseTempDir, outputDir)) - .filter((f) => f.endsWith(".sarif")); + .filter((f) => path.extname(f) === ".sarif"); for (const sarifFile of sarifFiles) { toUpload.push(path.resolve(baseTempDir, outputDir, sarifFile)); diff --git a/src/upload-lib.ts b/src/upload-lib.ts index c715a20632..bbfd8a7183 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -480,8 +480,9 @@ export async function getGroupedSarifFilePaths( const results = {}; if (stats.isDirectory()) { - let sarifFiles = findSarifFilesInDir(sarifPath, (name) => - name.endsWith(".sarif"), + let sarifFiles = findSarifFilesInDir( + sarifPath, + (name) => path.extname(name) === ".sarif", ); logger.debug( `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}`, From b8c496644d9494d63f2c26ae9085a48c728cee5a Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 30 Sep 2025 12:05:59 +0100 Subject: [PATCH 09/12] Rename variables in `getGroupedSarifFilePaths` --- lib/analyze-action.js | 592 +++++++++++----------- lib/init-action-post.js | 974 ++++++++++++++++++------------------- lib/init-action.js | 531 ++++++++++---------- lib/upload-lib.js | 542 ++++++++++----------- lib/upload-sarif-action.js | 546 ++++++++++----------- src/upload-lib.ts | 26 +- 6 files changed, 1605 insertions(+), 1606 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 0652286f6f..de01b0b4ff 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path22 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path20 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path22 && !path22.startsWith("/")) { - path22 = `/${path22}`; + if (path20 && !path20.startsWith("/")) { + path20 = `/${path20}`; } - url2 = new URL(origin + path22); + url2 = new URL(origin + path20); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path22) { - if (typeof path22 !== "string") { + module2.exports = function basename(path20) { + if (typeof path20 !== "string") { return ""; } - for (var i = path22.length - 1; i >= 0; --i) { - switch (path22.charCodeAt(i)) { + for (var i = path20.length - 1; i >= 0; --i) { + switch (path20.charCodeAt(i)) { case 47: // '/' case 92: - path22 = path22.slice(i + 1); - return path22 === ".." || path22 === "." ? "" : path22; + path20 = path20.slice(i + 1); + return path20 === ".." || path20 === "." ? "" : path20; } } - return path22 === ".." || path22 === "." ? "" : path22; + return path20 === ".." || path20 === "." ? "" : path20; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path22, + path: path20, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path22 !== "string") { + if (typeof path20 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path22[0] !== "/" && !(path22.startsWith("http://") || path22.startsWith("https://")) && method !== "CONNECT") { + } else if (path20[0] !== "/" && !(path20.startsWith("http://") || path20.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path22) !== null) { + } else if (invalidPathRegex.exec(path20) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path22, query) : path22; + this.path = query ? util.buildURL(path20, query) : path20; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path22 = search ? `${pathname}${search}` : pathname; + const path20 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path22; + this.opts.path = path20; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path22, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path20, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path22} HTTP/1.1\r + let header = `${method} ${path20} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path22, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path20, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path22; + headers[HTTP2_HEADER_PATH] = path20; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path22) { - if (typeof path22 !== "string") { - return path22; + function safeUrl(path20) { + if (typeof path20 !== "string") { + return path20; } - const pathSegments = path22.split("?"); + const pathSegments = path20.split("?"); if (pathSegments.length !== 2) { - return path22; + return path20; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path22, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path22); + function matchKey(mockDispatch2, { path: path20, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path20); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path22 }) => matchValue(safeUrl(path22), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path20 }) => matchValue(safeUrl(path20), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path22, method, body, headers, query } = opts; + const { path: path20, method, body, headers, query } = opts; return { - path: path22, + path: path20, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path22, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path20, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path22, + Path: path20, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path22) { - for (const char of path22) { + function validateCookiePath(path20) { + for (const char of path20) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path22 = opts.path; + let path20 = opts.path; if (!opts.path.startsWith("/")) { - path22 = `/${path22}`; + path20 = `/${path20}`; } - url2 = new URL(util.parseOrigin(url2).origin + path22); + url2 = new URL(util.parseOrigin(url2).origin + path20); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path22.sep); + return pth.replace(/[/\\]/g, path20.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs20 = __importStar4(require("fs")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); _a = fs20.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path22.extname(filePath).toUpperCase(); + const upperExt = path20.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path22.dirname(filePath); - const upperName = path22.basename(filePath).toUpperCase(); + const directory = path20.dirname(filePath); + const upperName = path20.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path22.join(directory, actualName); + filePath = path20.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path22.join(dest, path22.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path20.join(dest, path20.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path22.relative(source, newDest) === "") { + if (path20.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path22.join(dest, path22.basename(source)); + dest = path20.join(dest, path20.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path22.dirname(dest)); + yield mkdirP(path20.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path22.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path20.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path22.sep)) { + if (tool.includes(path20.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path22.delimiter)) { + for (const p of process.env.PATH.split(path20.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path22.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path20.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os5 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path22.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path20.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve8, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os5 = __importStar4(require("os")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path22.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path20.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path22 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path22} does not exist${os_1.EOL}`); + const path20 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path20} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os5 = require("os"); - var path22 = require("path"); + var path20 = require("path"); var IS_WINDOWS_PLATFORM = os5.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path22.resolve(cwd, filepath); + return path20.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path22 = require("path"); + var path20 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path22.sep, + SEP: path20.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path22 = require("path"); + var path20 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path22.sep === "\\"; + return win32 === true || path20.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path22 = require("path"); + var path20 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path22.basename(input)); + return regex.test(path20.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path22 = require("path"); + var path20 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path22.basename(pattern); + const basename = path20.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path22.isAbsolute(pattern); + return path20.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs20 = require_fs(); exports2.fs = fs20; - var path22 = require_path(); - exports2.path = path22; + var path20 = require_path(); + exports2.path = path20; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path22, settings, callback) { - settings.fs.lstat(path22, (lstatError, lstat) => { + function read(path20, settings, callback) { + settings.fs.lstat(path20, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path22, (statError, stat) => { + settings.fs.stat(path20, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path22, settings) { - const lstat = settings.fs.lstatSync(path22); + function read(path20, settings) { + const lstat = settings.fs.lstatSync(path20); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path22); + const stat = settings.fs.statSync(path20); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path22, optionsOrSettingsOrCallback, callback) { + function stat(path20, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path22, getSettings(), optionsOrSettingsOrCallback); + async.read(path20, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path22, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync4(path22, optionsOrSettings) { + function statSync4(path20, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path22, settings); + return sync.read(path20, settings); } exports2.statSync = statSync4; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path22 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path20 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path22, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path20, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path22, + path: path20, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path22 = require("path"); + var path20 = require("path"); var fsStat = require_out(); var fs20 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs20.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path22.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path22, optionsOrSettingsOrCallback, callback) { + function scandir(path20, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path22, getSettings(), optionsOrSettingsOrCallback); + async.read(path20, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path22, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path22, optionsOrSettings) { + function scandirSync(path20, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path22, settings); + return sync.read(path20, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path22 = require("path"); + var path20 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path22.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path22 = require("path"); + var path20 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path22.resolve(this._settings.cwd, filepath); + return path20.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path22 = require("path"); + var path20 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path22.resolve(this._settings.cwd, task.base); + return path20.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path22, checkUnignored, mode) { + test(path20, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path22); + const matched = rule[mode].test(path20); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path22, originalPath, doThrow) => { - if (!isString(path22)) { + var checkPath = (path20, originalPath, doThrow) => { + if (!isString(path20)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path22) { + if (!path20) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path22)) { + if (checkPath.isNotRelative(path20)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path22) => REGEX_TEST_INVALID_PATH.test(path22); + var isNotRelative = (path20) => REGEX_TEST_INVALID_PATH.test(path20); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path22 = originalPath && checkPath.convert(originalPath); + const path20 = originalPath && checkPath.convert(originalPath); checkPath( - path22, + path20, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path22, cache, checkUnignored, slices); + return this._t(path20, cache, checkUnignored, slices); } - checkIgnore(path22) { - if (!REGEX_TEST_TRAILING_SLASH.test(path22)) { - return this.test(path22); + checkIgnore(path20) { + if (!REGEX_TEST_TRAILING_SLASH.test(path20)) { + return this.test(path20); } - const slices = path22.split(SLASH).filter(Boolean); + const slices = path20.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path22, false, MODE_CHECK_IGNORE); + return this._rules.test(path20, false, MODE_CHECK_IGNORE); } - _t(path22, cache, checkUnignored, slices) { - if (path22 in cache) { - return cache[path22]; + _t(path20, cache, checkUnignored, slices) { + if (path20 in cache) { + return cache[path20]; } if (!slices) { - slices = path22.split(SLASH).filter(Boolean); + slices = path20.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path22] = this._rules.test(path22, checkUnignored, MODE_IGNORE); + return cache[path20] = this._rules.test(path20, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path22] = parent.ignored ? parent : this._rules.test(path22, checkUnignored, MODE_IGNORE); + return cache[path20] = parent.ignored ? parent : this._rules.test(path20, checkUnignored, MODE_IGNORE); } - ignores(path22) { - return this._test(path22, this._ignoreCache, false).ignored; + ignores(path20) { + return this._test(path20, this._ignoreCache, false).ignored; } createFilter() { - return (path22) => !this.ignores(path22); + return (path20) => !this.ignores(path20); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path22) { - return this._test(path22, this._testCache, true); + test(path20) { + return this._test(path20, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path22) => checkPath(path22 && checkPath.convert(path22), path22, RETURN_FALSE); + var isPathValid = (path20) => checkPath(path20 && checkPath.convert(path20), path20, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path22) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path22) || isNotRelative(path22); + checkPath.isNotRelative = (path20) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path20) || isNotRelative(path20); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path22.dirname(p); + let result = path20.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path22.sep; + root += path20.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path22.sep)) { + if (!p.endsWith(path20.sep)) { return p; } - if (p === path22.sep) { + if (p === path20.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path22 = (function() { + var path20 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path22.sep; + minimatch.sep = path20.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path22.sep !== "/") { - pattern = pattern.split(path22.sep).join("/"); + if (!options.allowWindowsEscape && path20.sep !== "/") { + pattern = pattern.split(path20.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path22.sep !== "/") { - f = f.split(path22.sep).join("/"); + if (path20.sep !== "/") { + f = f.split(path20.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path22.sep); + this.segments = itemPath.split(path20.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path22.basename(remaining); + const basename = path20.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path22.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path22.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path22.sep; + result += path20.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path22.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path22.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path22.sep}`; + if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path20.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path22.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path22.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { homedir2 = homedir2 || os5.homedir(); assert_1.default(homedir2, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path22, level) { - this.path = path22; + constructor(path20, level) { + this.path = path20; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core15 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path22.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto2 = __importStar4(require("crypto")); var fs20 = __importStar4(require("fs")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path22.join(baseLocation, "actions", "temp"); + tempDirectory = path20.join(baseLocation, "actions", "temp"); } - const dest = path22.join(tempDirectory, crypto2.randomUUID()); + const dest = path20.join(tempDirectory, crypto2.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path22.relative(workspace, file).replace(new RegExp(`\\${path22.sep}`, "g"), "/"); + const relativeFile = path20.relative(workspace, file).replace(new RegExp(`\\${path20.sep}`, "g"), "/"); core15.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path22 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path22.startsWith("/")) { - path22 = path22.substring(1); + let path20 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path20.startsWith("/")) { + path20 = path20.substring(1); } - if (isAbsoluteUrl(path22)) { - requestUrl = path22; + if (isAbsoluteUrl(path20)) { + requestUrl = path20; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path22); + requestUrl = appendPath(requestUrl, path20); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path22 = pathToAppend.substring(0, searchStart); + const path20 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path22; + newPath = newPath + path20; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path22 = urlParsed.pathname; - path22 = path22 || "/"; - path22 = escape(path22); - urlParsed.pathname = path22; + let path20 = urlParsed.pathname; + path20 = path20 || "/"; + path20 = escape(path20); + urlParsed.pathname = path20; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path22 = urlParsed.pathname; - path22 = path22 ? path22.endsWith("/") ? `${path22}${name}` : `${path22}/${name}` : name; - urlParsed.pathname = path22; + let path20 = urlParsed.pathname; + path20 = path20 ? path20.endsWith("/") ? `${path20}${name}` : `${path20}/${name}` : name; + urlParsed.pathname = path20; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path22 = getURLPath(request.url) || "/"; + const path20 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path22}`; + canonicalizedResourceString += `/${this.factory.accountName}${path20}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path22 = getURLPath(request.url) || "/"; + const path20 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path22}`; + canonicalizedResourceString += `/${options.accountName}${path20}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path22 = getURLPath(subRequest.url); - if (!path22 || path22 === "") { + const path20 = getURLPath(subRequest.url); + if (!path20 || path20 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path22 = getURLPath(url3); - if (path22 && path22 !== "/") { + const path20 = getURLPath(url3); + if (path20 && path20 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path22.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path22.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path22.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path22.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path20.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core15 = __importStar4(require_core()); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core15.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path22.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core15.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core15.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path22.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core15.debug(`Archive path: ${archivePath}`); core15.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path22.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path22.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core15.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79593,7 +79593,7 @@ var require_tool_cache = __commonJS({ var fs20 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os5 = __importStar4(require("os")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -79614,8 +79614,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path22.join(_getTempDirectory(), crypto2.randomUUID()); - yield io7.mkdirP(path22.dirname(dest)); + dest = dest || path20.join(_getTempDirectory(), crypto2.randomUUID()); + yield io7.mkdirP(path20.dirname(dest)); core15.debug(`Downloading ${url2}`); core15.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -79702,7 +79702,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path22.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path20.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -79878,7 +79878,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs20.readdirSync(sourceDir)) { - const s = path22.join(sourceDir, itemName); + const s = path20.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -79896,7 +79896,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path22.join(destFolder, targetFile); + const destPath = path20.join(destFolder, targetFile); core15.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -79920,7 +79920,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path22.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2); core15.debug(`checking cache: ${cachePath}`); if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) { core15.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -79935,12 +79935,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os5.arch(); - const toolPath = path22.join(_getCacheDirectory(), toolName); + const toolPath = path20.join(_getCacheDirectory(), toolName); if (fs20.existsSync(toolPath)) { const children = fs20.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path22.join(toolPath, child, arch2 || ""); + const fullPath = path20.join(toolPath, child, arch2 || ""); if (fs20.existsSync(fullPath) && fs20.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -79995,7 +79995,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path22.join(_getTempDirectory(), crypto2.randomUUID()); + dest = path20.join(_getTempDirectory(), crypto2.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path22.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core15.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -80013,7 +80013,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path22.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path20.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs20.writeFileSync(markerPath, ""); core15.debug("finished caching tool"); @@ -80728,7 +80728,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -80736,7 +80736,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path22.dirname(p); + let result = path20.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -80774,7 +80774,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path22.sep; + root += path20.sep; } return root + itemPath; } @@ -80812,10 +80812,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path22.sep)) { + if (!p.endsWith(path20.sep)) { return p; } - if (p === path22.sep) { + if (p === path20.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -80966,7 +80966,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -80981,12 +80981,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path22.sep); + this.segments = itemPath.split(path20.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path22.basename(remaining); + const basename = path20.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -81004,7 +81004,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path22.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -81015,12 +81015,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path22.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path22.sep; + result += path20.sep; } result += this.segments[i]; } @@ -81068,7 +81068,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -81097,7 +81097,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path22.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -81121,8 +81121,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path22.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path22.sep}`; + if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path20.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -81157,9 +81157,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path22.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path22.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { homedir2 = homedir2 || os5.homedir(); (0, assert_1.default)(homedir2, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -81243,8 +81243,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path22, level) { - this.path = path22; + constructor(path20, level) { + this.path = path20; this.level = level; } }; @@ -81370,7 +81370,7 @@ var require_internal_globber2 = __commonJS({ var core15 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -81446,7 +81446,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path22.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path20.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -81456,7 +81456,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path22.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -81608,7 +81608,7 @@ var require_internal_hash_files = __commonJS({ var fs20 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path22 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -81624,7 +81624,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path22.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path20.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -81724,14 +81724,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path22, name, argument) { - if (Array.isArray(path22)) { - this.path = path22; - this.property = path22.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path20, name, argument) { + if (Array.isArray(path20)) { + this.path = path20; + this.property = path20.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path22 !== void 0) { - this.property = path22; + } else if (path20 !== void 0) { + this.property = path20; } if (message) { this.message = message; @@ -81822,16 +81822,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path22, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path20, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path22)) { - this.path = path22; - this.propertyPath = path22.reduce(function(sum, item) { + if (Array.isArray(path20)) { + this.path = path20; + this.propertyPath = path20.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path22; + this.propertyPath = path20; } this.base = base; this.schemas = schemas; @@ -81840,10 +81840,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path22 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path20 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path22, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path20, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -86320,12 +86320,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path22) { - const isExtendedLengthPath = path22.startsWith("\\\\?\\"); +function slash(path20) { + const isExtendedLengthPath = path20.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path22; + return path20; } - return path22.replace(/\\/g, "/"); + return path20.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -86413,8 +86413,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path22 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path22) ? path22 : import_node_path3.default.join(cwd, path22); + const path20 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path20) ? path20 : import_node_path3.default.join(cwd, path20); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -90154,7 +90154,6 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts -var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -90167,7 +90166,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -90176,14 +90175,14 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; // src/analyze.ts var fs15 = __toESM(require("fs")); -var path18 = __toESM(require("path")); +var path16 = __toESM(require("path")); var import_perf_hooks2 = require("perf_hooks"); var io5 = __toESM(require_io()); @@ -90361,7 +90360,7 @@ var core11 = __toESM(require_core()); // src/codeql.ts var fs14 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path14 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -90604,7 +90603,7 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs9 = __toESM(require("fs")); -var path11 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/caching-utils.ts var core6 = __toESM(require_core()); @@ -90629,11 +90628,11 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs8 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path9 = __toESM(require("path")); // src/feature-flags.ts var fs7 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path8 = __toESM(require("path")); var semver4 = __toESM(require_semver2()); // src/defaults.json @@ -90643,7 +90642,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var crypto = __toESM(require("crypto")); var fs6 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path7 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -90769,8 +90768,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path22 = decodeGitFilePath(match[2]); - fileOidMap[path22] = oid; + const path20 = decodeGitFilePath(match[2]); + fileOidMap[path20] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -90894,7 +90893,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path8.join(config.dbLocation, "base-database-oids.json"); + return path7.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -90904,7 +90903,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path8.join( + const overlayChangesFile = path7.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -91230,7 +91229,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -91506,7 +91505,7 @@ async function getDiffInformedAnalysisBranches(codeql, features, logger) { return branches; } function getDiffRangesJsonFilePath() { - return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); } function writeDiffRangesJsonFile(logger, ranges) { const jsonContents = JSON.stringify(ranges, null, 2); @@ -91679,7 +91678,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path11.join(tempDir, "config"); + return path10.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -91735,7 +91734,7 @@ function getPrimaryAnalysisConfig(config) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path12 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -91797,7 +91796,6 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); -var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -91946,7 +91944,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (path12.extname(tarPath) === `.${ext}`) { + if (tarPath.endsWith(`.${ext}`)) { return method; } } @@ -91956,7 +91954,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os2 = __toESM(require("os")); -var path13 = __toESM(require("path")); +var path11 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -92089,7 +92087,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path13.join( + return path11.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -92232,7 +92230,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path12.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -92570,7 +92568,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path14.join(tempDir, v4_default()); + return path12.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -92603,7 +92601,7 @@ function isReservedToolsValue(tools) { // src/tracer-config.ts var fs13 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path13 = __toESM(require("path")); async function shouldEnableIndirectTracing(codeql, config) { if (config.buildMode === "none" /* None */) { return false; @@ -92618,7 +92616,7 @@ async function endTracingForCluster(codeql, config, logger) { logger.info( "Unsetting build tracing environment variables. Subsequent steps of this job will not be traced." ); - const envVariablesFile = path15.resolve( + const envVariablesFile = path13.resolve( config.dbLocation, "temp/tracingEnvironment/end-tracing.json" ); @@ -92674,7 +92672,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path16.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path14.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -92735,7 +92733,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path16.join( + const tracingConfigPath = path14.join( extractorPath, "tools", "tracing-config.lua" @@ -92811,7 +92809,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path16.join( + const autobuildCmd = path14.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -93224,7 +93222,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path16.resolve(config.tempDir, "user-config.yaml"); + return path14.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -93499,7 +93497,7 @@ function dbIsFinalized(config, language, logger) { const dbPath = getCodeQLDatabasePath(config, language); try { const dbInfo = load( - fs15.readFileSync(path18.resolve(dbPath, "codeql-database.yml"), "utf8") + fs15.readFileSync(path16.resolve(dbPath, "codeql-database.yml"), "utf8") ); return !("inProgress" in dbInfo); } catch { @@ -93614,7 +93612,7 @@ Error Response: ${JSON.stringify(error2.response, null, 2)}` } } function getDiffRanges(fileDiff, logger) { - const filename = path18.join(getRequiredInput("checkout_path"), fileDiff.filename).replaceAll(path18.sep, "/"); + const filename = path16.join(getRequiredInput("checkout_path"), fileDiff.filename).replaceAll(path16.sep, "/"); if (fileDiff.patch === void 0) { if (fileDiff.changes === 0) { return []; @@ -93676,10 +93674,10 @@ function writeDiffRangeDataExtensionPack(logger, ranges) { if (ranges.length === 0) { ranges = [{ path: "", startLine: 0, endLine: 0 }]; } - const diffRangeDir = path18.join(getTemporaryDirectory(), "pr-diff-range"); + const diffRangeDir = path16.join(getTemporaryDirectory(), "pr-diff-range"); fs15.mkdirSync(diffRangeDir, { recursive: true }); fs15.writeFileSync( - path18.join(diffRangeDir, "qlpack.yml"), + path16.join(diffRangeDir, "qlpack.yml"), ` name: codeql-action/pr-diff-range version: 0.0.0 @@ -93711,7 +93709,7 @@ extensions: data = ' - ["", 0, 0]\n'; } const extensionContents = header + data; - const extensionFilePath = path18.join(diffRangeDir, "pr-diff-range.yml"); + const extensionFilePath = path16.join(diffRangeDir, "pr-diff-range.yml"); fs15.writeFileSync(extensionFilePath, extensionContents); logger.debug( `Wrote pr-diff-range extension pack to ${extensionFilePath}: @@ -93832,7 +93830,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, if (analysis.kind === "code-quality" /* CodeQuality */) { category = analysis.fixCategory(logger, automationDetailsId); } - const sarifFile = path18.join( + const sarifFile = path16.join( sarifFolder, addSarifExtension(analysis, language) ); @@ -94170,7 +94168,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs18 = __toESM(require("fs")); -var path20 = __toESM(require("path")); +var path18 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core13 = __toESM(require_core()); @@ -95483,10 +95481,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path20.resolve(tempDir, "combined-sarif"); + const baseTempDir = path18.resolve(tempDir, "combined-sarif"); fs18.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs18.mkdtempSync(path20.resolve(baseTempDir, "output-")); - const outputFile = path20.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs18.mkdtempSync(path18.resolve(baseTempDir, "output-")); + const outputFile = path18.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -95519,7 +95517,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path20.join( + const payloadSaveFile = path18.join( getTemporaryDirectory(), "payload.json" ); @@ -95563,9 +95561,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs18.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path20.resolve(dir, entry.name)); + sarifFiles.push(path18.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path20.resolve(dir, entry.name)); + walkSarifFiles(path18.resolve(dir, entry.name)); } } }; @@ -95786,7 +95784,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path20.resolve( + const outputFile = path18.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -95934,7 +95932,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path20.join(checkoutPath, locationUri).replaceAll(path20.sep, "/"); + const locationPath = path18.join(checkoutPath, locationUri).replaceAll(path18.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); @@ -95996,7 +95994,7 @@ function doesGoExtractionOutputExist(config) { ".trap.tar.gz", ".trap.tar.br", ".trap.tar" - ].some((ext) => import_path4.default.extname(fileName) === ext) + ].some((ext) => fileName.endsWith(ext)) ); } async function runAutobuildIfLegacyGoWorkflow(config, logger) { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index bce64b8d07..19b39f77ed 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path21 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path19 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path21 && !path21.startsWith("/")) { - path21 = `/${path21}`; + if (path19 && !path19.startsWith("/")) { + path19 = `/${path19}`; } - url2 = new URL(origin + path21); + url2 = new URL(origin + path19); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path21) { - if (typeof path21 !== "string") { + module2.exports = function basename(path19) { + if (typeof path19 !== "string") { return ""; } - for (var i = path21.length - 1; i >= 0; --i) { - switch (path21.charCodeAt(i)) { + for (var i = path19.length - 1; i >= 0; --i) { + switch (path19.charCodeAt(i)) { case 47: // '/' case 92: - path21 = path21.slice(i + 1); - return path21 === ".." || path21 === "." ? "" : path21; + path19 = path19.slice(i + 1); + return path19 === ".." || path19 === "." ? "" : path19; } } - return path21 === ".." || path21 === "." ? "" : path21; + return path19 === ".." || path19 === "." ? "" : path19; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path21, + path: path19, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path21 !== "string") { + if (typeof path19 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path21[0] !== "/" && !(path21.startsWith("http://") || path21.startsWith("https://")) && method !== "CONNECT") { + } else if (path19[0] !== "/" && !(path19.startsWith("http://") || path19.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path21) !== null) { + } else if (invalidPathRegex.exec(path19) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path21, query) : path21; + this.path = query ? util.buildURL(path19, query) : path19; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path21 = search ? `${pathname}${search}` : pathname; + const path19 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path21; + this.opts.path = path19; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path21, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path19, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path21} HTTP/1.1\r + let header = `${method} ${path19} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path21, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path19, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path21; + headers[HTTP2_HEADER_PATH] = path19; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path21) { - if (typeof path21 !== "string") { - return path21; + function safeUrl(path19) { + if (typeof path19 !== "string") { + return path19; } - const pathSegments = path21.split("?"); + const pathSegments = path19.split("?"); if (pathSegments.length !== 2) { - return path21; + return path19; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path21, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path21); + function matchKey(mockDispatch2, { path: path19, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path19); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path21 }) => matchValue(safeUrl(path21), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path19 }) => matchValue(safeUrl(path19), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path21, method, body, headers, query } = opts; + const { path: path19, method, body, headers, query } = opts; return { - path: path21, + path: path19, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path21, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path19, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path21, + Path: path19, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path21) { - for (const char of path21) { + function validateCookiePath(path19) { + for (const char of path19) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path21 = opts.path; + let path19 = opts.path; if (!opts.path.startsWith("/")) { - path21 = `/${path21}`; + path19 = `/${path19}`; } - url2 = new URL(util.parseOrigin(url2).origin + path21); + url2 = new URL(util.parseOrigin(url2).origin + path19); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path21.sep); + return pth.replace(/[/\\]/g, path19.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs20 = __importStar4(require("fs")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); _a = fs20.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path21.extname(filePath).toUpperCase(); + const upperExt = path19.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path21.dirname(filePath); - const upperName = path21.basename(filePath).toUpperCase(); + const directory = path19.dirname(filePath); + const upperName = path19.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path21.join(directory, actualName); + filePath = path19.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path21.join(dest, path21.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path19.join(dest, path19.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path21.relative(source, newDest) === "") { + if (path19.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path21.join(dest, path21.basename(source)); + dest = path19.join(dest, path19.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path21.dirname(dest)); + yield mkdirP(path19.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path21.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path19.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path21.sep)) { + if (tool.includes(path19.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path21.delimiter)) { + for (const p of process.env.PATH.split(path19.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path21.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path19.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os3 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path21.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path19.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve8, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os3 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path21.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path19.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path21 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); + const path19 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path19} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os3 = require("os"); - var path21 = require("path"); + var path19 = require("path"); var IS_WINDOWS_PLATFORM = os3.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path21.resolve(cwd, filepath); + return path19.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path21 = require("path"); + var path19 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path21.sep, + SEP: path19.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path21 = require("path"); + var path19 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path21.sep === "\\"; + return win32 === true || path19.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path21 = require("path"); + var path19 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path21.basename(input)); + return regex.test(path19.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path21 = require("path"); + var path19 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path21.basename(pattern); + const basename = path19.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path21.isAbsolute(pattern); + return path19.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs20 = require_fs(); exports2.fs = fs20; - var path21 = require_path(); - exports2.path = path21; + var path19 = require_path(); + exports2.path = path19; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path21, settings, callback) { - settings.fs.lstat(path21, (lstatError, lstat) => { + function read(path19, settings, callback) { + settings.fs.lstat(path19, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path21, (statError, stat) => { + settings.fs.stat(path19, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path21, settings) { - const lstat = settings.fs.lstatSync(path21); + function read(path19, settings) { + const lstat = settings.fs.lstatSync(path19); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path21); + const stat = settings.fs.statSync(path19); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path21, optionsOrSettingsOrCallback, callback) { + function stat(path19, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path21, getSettings(), optionsOrSettingsOrCallback); + async.read(path19, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path19, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path21, optionsOrSettings) { + function statSync3(path19, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path21, settings); + return sync.read(path19, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path21 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path19 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path21, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path19, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path21, + path: path19, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path19 = require("path"); var fsStat = require_out(); var fs20 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs20.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path19.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path21, optionsOrSettingsOrCallback, callback) { + function scandir(path19, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path21, getSettings(), optionsOrSettingsOrCallback); + async.read(path19, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path19, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path21, optionsOrSettings) { + function scandirSync(path19, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path21, settings); + return sync.read(path19, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path19 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path19.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path19 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path21.resolve(this._settings.cwd, filepath); + return path19.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path19 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path21.resolve(this._settings.cwd, task.base); + return path19.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path21, checkUnignored, mode) { + test(path19, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path21); + const matched = rule[mode].test(path19); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path21, originalPath, doThrow) => { - if (!isString(path21)) { + var checkPath = (path19, originalPath, doThrow) => { + if (!isString(path19)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path21) { + if (!path19) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path21)) { + if (checkPath.isNotRelative(path19)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path21) => REGEX_TEST_INVALID_PATH.test(path21); + var isNotRelative = (path19) => REGEX_TEST_INVALID_PATH.test(path19); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path21 = originalPath && checkPath.convert(originalPath); + const path19 = originalPath && checkPath.convert(originalPath); checkPath( - path21, + path19, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path21, cache, checkUnignored, slices); + return this._t(path19, cache, checkUnignored, slices); } - checkIgnore(path21) { - if (!REGEX_TEST_TRAILING_SLASH.test(path21)) { - return this.test(path21); + checkIgnore(path19) { + if (!REGEX_TEST_TRAILING_SLASH.test(path19)) { + return this.test(path19); } - const slices = path21.split(SLASH).filter(Boolean); + const slices = path19.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path21, false, MODE_CHECK_IGNORE); + return this._rules.test(path19, false, MODE_CHECK_IGNORE); } - _t(path21, cache, checkUnignored, slices) { - if (path21 in cache) { - return cache[path21]; + _t(path19, cache, checkUnignored, slices) { + if (path19 in cache) { + return cache[path19]; } if (!slices) { - slices = path21.split(SLASH).filter(Boolean); + slices = path19.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path21] = this._rules.test(path21, checkUnignored, MODE_IGNORE); + return cache[path19] = this._rules.test(path19, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path21] = parent.ignored ? parent : this._rules.test(path21, checkUnignored, MODE_IGNORE); + return cache[path19] = parent.ignored ? parent : this._rules.test(path19, checkUnignored, MODE_IGNORE); } - ignores(path21) { - return this._test(path21, this._ignoreCache, false).ignored; + ignores(path19) { + return this._test(path19, this._ignoreCache, false).ignored; } createFilter() { - return (path21) => !this.ignores(path21); + return (path19) => !this.ignores(path19); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path21) { - return this._test(path21, this._testCache, true); + test(path19) { + return this._test(path19, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path21) => checkPath(path21 && checkPath.convert(path21), path21, RETURN_FALSE); + var isPathValid = (path19) => checkPath(path19 && checkPath.convert(path19), path19, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path21) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path21) || isNotRelative(path21); + checkPath.isNotRelative = (path19) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path19) || isNotRelative(path19); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path21.dirname(p); + let result = path19.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path21.sep; + root += path19.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path21.sep)) { + if (!p.endsWith(path19.sep)) { return p; } - if (p === path21.sep) { + if (p === path19.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path21 = (function() { + var path19 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path21.sep; + minimatch.sep = path19.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path21.sep !== "/") { - pattern = pattern.split(path21.sep).join("/"); + if (!options.allowWindowsEscape && path19.sep !== "/") { + pattern = pattern.split(path19.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path21.sep !== "/") { - f = f.split(path21.sep).join("/"); + if (path19.sep !== "/") { + f = f.split(path19.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path21.sep); + this.segments = itemPath.split(path19.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path21.basename(remaining); + const basename = path19.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path19.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path19.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path21.sep; + result += path19.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path19.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path21.sep}`; + if (!itemPath.endsWith(path19.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path19.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path19.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path19.sep}`)) { homedir = homedir || os3.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path21, level) { - this.path = path21; + constructor(path19, level) { + this.path = path19; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core18 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path19.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs20 = __importStar4(require("fs")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path21.join(baseLocation, "actions", "temp"); + tempDirectory = path19.join(baseLocation, "actions", "temp"); } - const dest = path21.join(tempDirectory, crypto.randomUUID()); + const dest = path19.join(tempDirectory, crypto.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path21.relative(workspace, file).replace(new RegExp(`\\${path21.sep}`, "g"), "/"); + const relativeFile = path19.relative(workspace, file).replace(new RegExp(`\\${path19.sep}`, "g"), "/"); core18.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path21 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path21.startsWith("/")) { - path21 = path21.substring(1); + let path19 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path19.startsWith("/")) { + path19 = path19.substring(1); } - if (isAbsoluteUrl(path21)) { - requestUrl = path21; + if (isAbsoluteUrl(path19)) { + requestUrl = path19; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path21); + requestUrl = appendPath(requestUrl, path19); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path21 = pathToAppend.substring(0, searchStart); + const path19 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path21; + newPath = newPath + path19; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path21 = urlParsed.pathname; - path21 = path21 || "/"; - path21 = escape(path21); - urlParsed.pathname = path21; + let path19 = urlParsed.pathname; + path19 = path19 || "/"; + path19 = escape(path19); + urlParsed.pathname = path19; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path21 = urlParsed.pathname; - path21 = path21 ? path21.endsWith("/") ? `${path21}${name}` : `${path21}/${name}` : name; - urlParsed.pathname = path21; + let path19 = urlParsed.pathname; + path19 = path19 ? path19.endsWith("/") ? `${path19}${name}` : `${path19}/${name}` : name; + urlParsed.pathname = path19; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path21 = getURLPath(request.url) || "/"; + const path19 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path21}`; + canonicalizedResourceString += `/${this.factory.accountName}${path19}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path21 = getURLPath(request.url) || "/"; + const path19 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path21}`; + canonicalizedResourceString += `/${options.accountName}${path19}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path21 = getURLPath(subRequest.url); - if (!path21 || path21 === "") { + const path19 = getURLPath(subRequest.url); + if (!path19 || path19 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path21 = getURLPath(url3); - if (path21 && path21 !== "/") { + const path19 = getURLPath(url3); + if (path19 && path19 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path19.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path19.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path19.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path21.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path19.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core18 = __importStar4(require_core()); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core18.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path19.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core18.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core18.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path19.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core18.debug(`Archive path: ${archivePath}`); core18.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path19.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path19.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core18.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79593,7 +79593,7 @@ var require_tool_cache = __commonJS({ var fs20 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os3 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -79614,8 +79614,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path21.join(_getTempDirectory(), crypto.randomUUID()); - yield io7.mkdirP(path21.dirname(dest)); + dest = dest || path19.join(_getTempDirectory(), crypto.randomUUID()); + yield io7.mkdirP(path19.dirname(dest)); core18.debug(`Downloading ${url2}`); core18.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -79702,7 +79702,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path21.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path19.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -79878,7 +79878,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs20.readdirSync(sourceDir)) { - const s = path21.join(sourceDir, itemName); + const s = path19.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -79896,7 +79896,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path21.join(destFolder, targetFile); + const destPath = path19.join(destFolder, targetFile); core18.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -79920,7 +79920,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path21.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path19.join(_getCacheDirectory(), toolName, versionSpec, arch2); core18.debug(`checking cache: ${cachePath}`); if (fs20.existsSync(cachePath) && fs20.existsSync(`${cachePath}.complete`)) { core18.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -79935,12 +79935,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os3.arch(); - const toolPath = path21.join(_getCacheDirectory(), toolName); + const toolPath = path19.join(_getCacheDirectory(), toolName); if (fs20.existsSync(toolPath)) { const children = fs20.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path21.join(toolPath, child, arch2 || ""); + const fullPath = path19.join(toolPath, child, arch2 || ""); if (fs20.existsSync(fullPath) && fs20.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -79995,7 +79995,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path21.join(_getTempDirectory(), crypto.randomUUID()); + dest = path19.join(_getTempDirectory(), crypto.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -80003,7 +80003,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path21.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core18.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -80013,7 +80013,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path21.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path19.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs20.writeFileSync(markerPath, ""); core18.debug("finished caching tool"); @@ -82788,13 +82788,13 @@ These characters are not allowed in the artifact name due to limitations with ce (0, core_1.info)(`Artifact name is valid!`); } exports2.validateArtifactName = validateArtifactName; - function validateFilePath(path21) { - if (!path21) { + function validateFilePath(path19) { + if (!path19) { throw new Error(`Provided file path input during validation is empty`); } for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactFilePathCharacters) { - if (path21.includes(invalidCharacterKey)) { - throw new Error(`The path for one of the files in artifact is not valid: ${path21}. Contains the following character: ${errorMessageForCharacter} + if (path19.includes(invalidCharacterKey)) { + throw new Error(`The path for one of the files in artifact is not valid: ${path19}. Contains the following character: ${errorMessageForCharacter} Invalid characters include: ${Array.from(invalidArtifactFilePathCharacters.values()).toString()} @@ -83659,8 +83659,8 @@ var require_minimatch2 = __commonJS({ return new Minimatch(pattern, options).match(p); }; module2.exports = minimatch; - var path21 = require_path2(); - minimatch.sep = path21.sep; + var path19 = require_path2(); + minimatch.sep = path19.sep; var GLOBSTAR = Symbol("globstar **"); minimatch.GLOBSTAR = GLOBSTAR; var expand = require_brace_expansion2(); @@ -84169,8 +84169,8 @@ var require_minimatch2 = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; const options = this.options; - if (path21.sep !== "/") { - f = f.split(path21.sep).join("/"); + if (path19.sep !== "/") { + f = f.split(path19.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -84268,8 +84268,8 @@ var require_readdir_glob = __commonJS({ }); }); } - async function* exploreWalkAsync(dir, path21, followSymlinks, useStat, shouldSkip, strict) { - let files = await readdir(path21 + dir, strict); + async function* exploreWalkAsync(dir, path19, followSymlinks, useStat, shouldSkip, strict) { + let files = await readdir(path19 + dir, strict); for (const file of files) { let name = file.name; if (name === void 0) { @@ -84278,7 +84278,7 @@ var require_readdir_glob = __commonJS({ } const filename = dir + "/" + name; const relative2 = filename.slice(1); - const absolute = path21 + "/" + relative2; + const absolute = path19 + "/" + relative2; let stats = null; if (useStat || followSymlinks) { stats = await stat(absolute, followSymlinks); @@ -84292,15 +84292,15 @@ var require_readdir_glob = __commonJS({ if (stats.isDirectory()) { if (!shouldSkip(relative2)) { yield { relative: relative2, absolute, stats }; - yield* exploreWalkAsync(filename, path21, followSymlinks, useStat, shouldSkip, false); + yield* exploreWalkAsync(filename, path19, followSymlinks, useStat, shouldSkip, false); } } else { yield { relative: relative2, absolute, stats }; } } } - async function* explore(path21, followSymlinks, useStat, shouldSkip) { - yield* exploreWalkAsync("", path21, followSymlinks, useStat, shouldSkip, true); + async function* explore(path19, followSymlinks, useStat, shouldSkip) { + yield* exploreWalkAsync("", path19, followSymlinks, useStat, shouldSkip, true); } function readOptions(options) { return { @@ -86338,14 +86338,14 @@ var require_polyfills = __commonJS({ fs20.fstatSync = statFixSync(fs20.fstatSync); fs20.lstatSync = statFixSync(fs20.lstatSync); if (fs20.chmod && !fs20.lchmod) { - fs20.lchmod = function(path21, mode, cb) { + fs20.lchmod = function(path19, mode, cb) { if (cb) process.nextTick(cb); }; fs20.lchmodSync = function() { }; } if (fs20.chown && !fs20.lchown) { - fs20.lchown = function(path21, uid, gid, cb) { + fs20.lchown = function(path19, uid, gid, cb) { if (cb) process.nextTick(cb); }; fs20.lchownSync = function() { @@ -86412,9 +86412,9 @@ var require_polyfills = __commonJS({ }; })(fs20.readSync); function patchLchmod(fs21) { - fs21.lchmod = function(path21, mode, callback) { + fs21.lchmod = function(path19, mode, callback) { fs21.open( - path21, + path19, constants.O_WRONLY | constants.O_SYMLINK, mode, function(err, fd) { @@ -86430,8 +86430,8 @@ var require_polyfills = __commonJS({ } ); }; - fs21.lchmodSync = function(path21, mode) { - var fd = fs21.openSync(path21, constants.O_WRONLY | constants.O_SYMLINK, mode); + fs21.lchmodSync = function(path19, mode) { + var fd = fs21.openSync(path19, constants.O_WRONLY | constants.O_SYMLINK, mode); var threw = true; var ret; try { @@ -86452,8 +86452,8 @@ var require_polyfills = __commonJS({ } function patchLutimes(fs21) { if (constants.hasOwnProperty("O_SYMLINK") && fs21.futimes) { - fs21.lutimes = function(path21, at, mt, cb) { - fs21.open(path21, constants.O_SYMLINK, function(er, fd) { + fs21.lutimes = function(path19, at, mt, cb) { + fs21.open(path19, constants.O_SYMLINK, function(er, fd) { if (er) { if (cb) cb(er); return; @@ -86465,8 +86465,8 @@ var require_polyfills = __commonJS({ }); }); }; - fs21.lutimesSync = function(path21, at, mt) { - var fd = fs21.openSync(path21, constants.O_SYMLINK); + fs21.lutimesSync = function(path19, at, mt) { + var fd = fs21.openSync(path19, constants.O_SYMLINK); var ret; var threw = true; try { @@ -86584,11 +86584,11 @@ var require_legacy_streams = __commonJS({ ReadStream, WriteStream }; - function ReadStream(path21, options) { - if (!(this instanceof ReadStream)) return new ReadStream(path21, options); + function ReadStream(path19, options) { + if (!(this instanceof ReadStream)) return new ReadStream(path19, options); Stream.call(this); var self2 = this; - this.path = path21; + this.path = path19; this.fd = null; this.readable = true; this.paused = false; @@ -86633,10 +86633,10 @@ var require_legacy_streams = __commonJS({ self2._read(); }); } - function WriteStream(path21, options) { - if (!(this instanceof WriteStream)) return new WriteStream(path21, options); + function WriteStream(path19, options) { + if (!(this instanceof WriteStream)) return new WriteStream(path19, options); Stream.call(this); - this.path = path21; + this.path = path19; this.fd = null; this.writable = true; this.flags = "w"; @@ -86779,14 +86779,14 @@ var require_graceful_fs = __commonJS({ fs21.createWriteStream = createWriteStream2; var fs$readFile = fs21.readFile; fs21.readFile = readFile; - function readFile(path21, options, cb) { + function readFile(path19, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$readFile(path21, options, cb); - function go$readFile(path22, options2, cb2, startTime) { - return fs$readFile(path22, options2, function(err) { + return go$readFile(path19, options, cb); + function go$readFile(path20, options2, cb2, startTime) { + return fs$readFile(path20, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$readFile, [path22, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$readFile, [path20, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86796,14 +86796,14 @@ var require_graceful_fs = __commonJS({ } var fs$writeFile = fs21.writeFile; fs21.writeFile = writeFile; - function writeFile(path21, data, options, cb) { + function writeFile(path19, data, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$writeFile(path21, data, options, cb); - function go$writeFile(path22, data2, options2, cb2, startTime) { - return fs$writeFile(path22, data2, options2, function(err) { + return go$writeFile(path19, data, options, cb); + function go$writeFile(path20, data2, options2, cb2, startTime) { + return fs$writeFile(path20, data2, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$writeFile, [path22, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$writeFile, [path20, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86814,14 +86814,14 @@ var require_graceful_fs = __commonJS({ var fs$appendFile = fs21.appendFile; if (fs$appendFile) fs21.appendFile = appendFile; - function appendFile(path21, data, options, cb) { + function appendFile(path19, data, options, cb) { if (typeof options === "function") cb = options, options = null; - return go$appendFile(path21, data, options, cb); - function go$appendFile(path22, data2, options2, cb2, startTime) { - return fs$appendFile(path22, data2, options2, function(err) { + return go$appendFile(path19, data, options, cb); + function go$appendFile(path20, data2, options2, cb2, startTime) { + return fs$appendFile(path20, data2, options2, function(err) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$appendFile, [path22, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$appendFile, [path20, data2, options2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -86852,31 +86852,31 @@ var require_graceful_fs = __commonJS({ var fs$readdir = fs21.readdir; fs21.readdir = readdir; var noReaddirOptionVersions = /^v[0-5]\./; - function readdir(path21, options, cb) { + function readdir(path19, options, cb) { if (typeof options === "function") cb = options, options = null; - var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir2(path22, options2, cb2, startTime) { - return fs$readdir(path22, fs$readdirCallback( - path22, + var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir2(path20, options2, cb2, startTime) { + return fs$readdir(path20, fs$readdirCallback( + path20, options2, cb2, startTime )); - } : function go$readdir2(path22, options2, cb2, startTime) { - return fs$readdir(path22, options2, fs$readdirCallback( - path22, + } : function go$readdir2(path20, options2, cb2, startTime) { + return fs$readdir(path20, options2, fs$readdirCallback( + path20, options2, cb2, startTime )); }; - return go$readdir(path21, options, cb); - function fs$readdirCallback(path22, options2, cb2, startTime) { + return go$readdir(path19, options, cb); + function fs$readdirCallback(path20, options2, cb2, startTime) { return function(err, files) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) enqueue([ go$readdir, - [path22, options2, cb2], + [path20, options2, cb2], err, startTime || Date.now(), Date.now() @@ -86947,7 +86947,7 @@ var require_graceful_fs = __commonJS({ enumerable: true, configurable: true }); - function ReadStream(path21, options) { + function ReadStream(path19, options) { if (this instanceof ReadStream) return fs$ReadStream.apply(this, arguments), this; else @@ -86967,7 +86967,7 @@ var require_graceful_fs = __commonJS({ } }); } - function WriteStream(path21, options) { + function WriteStream(path19, options) { if (this instanceof WriteStream) return fs$WriteStream.apply(this, arguments), this; else @@ -86985,22 +86985,22 @@ var require_graceful_fs = __commonJS({ } }); } - function createReadStream2(path21, options) { - return new fs21.ReadStream(path21, options); + function createReadStream2(path19, options) { + return new fs21.ReadStream(path19, options); } - function createWriteStream2(path21, options) { - return new fs21.WriteStream(path21, options); + function createWriteStream2(path19, options) { + return new fs21.WriteStream(path19, options); } var fs$open = fs21.open; fs21.open = open; - function open(path21, flags, mode, cb) { + function open(path19, flags, mode, cb) { if (typeof mode === "function") cb = mode, mode = null; - return go$open(path21, flags, mode, cb); - function go$open(path22, flags2, mode2, cb2, startTime) { - return fs$open(path22, flags2, mode2, function(err, fd) { + return go$open(path19, flags, mode, cb); + function go$open(path20, flags2, mode2, cb2, startTime) { + return fs$open(path20, flags2, mode2, function(err, fd) { if (err && (err.code === "EMFILE" || err.code === "ENFILE")) - enqueue([go$open, [path22, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]); + enqueue([go$open, [path20, flags2, mode2, cb2], err, startTime || Date.now(), Date.now()]); else { if (typeof cb2 === "function") cb2.apply(this, arguments); @@ -89101,22 +89101,22 @@ var require_lazystream = __commonJS({ // node_modules/normalize-path/index.js var require_normalize_path = __commonJS({ "node_modules/normalize-path/index.js"(exports2, module2) { - module2.exports = function(path21, stripTrailing) { - if (typeof path21 !== "string") { + module2.exports = function(path19, stripTrailing) { + if (typeof path19 !== "string") { throw new TypeError("expected path to be a string"); } - if (path21 === "\\" || path21 === "/") return "/"; - var len = path21.length; - if (len <= 1) return path21; + if (path19 === "\\" || path19 === "/") return "/"; + var len = path19.length; + if (len <= 1) return path19; var prefix = ""; - if (len > 4 && path21[3] === "\\") { - var ch = path21[2]; - if ((ch === "?" || ch === ".") && path21.slice(0, 2) === "\\\\") { - path21 = path21.slice(2); + if (len > 4 && path19[3] === "\\") { + var ch = path19[2]; + if ((ch === "?" || ch === ".") && path19.slice(0, 2) === "\\\\") { + path19 = path19.slice(2); prefix = "//"; } } - var segs = path21.split(/[/\\]+/); + var segs = path19.split(/[/\\]+/); if (stripTrailing !== false && segs[segs.length - 1] === "") { segs.pop(); } @@ -97651,11 +97651,11 @@ var require_commonjs13 = __commonJS({ return (f) => f.length === len && f !== "." && f !== ".."; }; var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix"; - var path21 = { + var path19 = { win32: { sep: "\\" }, posix: { sep: "/" } }; - exports2.sep = defaultPlatform === "win32" ? path21.win32.sep : path21.posix.sep; + exports2.sep = defaultPlatform === "win32" ? path19.win32.sep : path19.posix.sep; exports2.minimatch.sep = exports2.sep; exports2.GLOBSTAR = Symbol("globstar **"); exports2.minimatch.GLOBSTAR = exports2.GLOBSTAR; @@ -100903,12 +100903,12 @@ var require_commonjs16 = __commonJS({ /** * Get the Path object referenced by the string path, resolved from this Path */ - resolve(path21) { - if (!path21) { + resolve(path19) { + if (!path19) { return this; } - const rootPath = this.getRootString(path21); - const dir = path21.substring(rootPath.length); + const rootPath = this.getRootString(path19); + const dir = path19.substring(rootPath.length); const dirParts = dir.split(this.splitSep); const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts); return result; @@ -101661,8 +101661,8 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - getRootString(path21) { - return node_path_1.win32.parse(path21).root; + getRootString(path19) { + return node_path_1.win32.parse(path19).root; } /** * @internal @@ -101709,8 +101709,8 @@ var require_commonjs16 = __commonJS({ /** * @internal */ - getRootString(path21) { - return path21.startsWith("/") ? "/" : ""; + getRootString(path19) { + return path19.startsWith("/") ? "/" : ""; } /** * @internal @@ -101800,11 +101800,11 @@ var require_commonjs16 = __commonJS({ /** * Get the depth of a provided path, string, or the cwd */ - depth(path21 = this.cwd) { - if (typeof path21 === "string") { - path21 = this.cwd.resolve(path21); + depth(path19 = this.cwd) { + if (typeof path19 === "string") { + path19 = this.cwd.resolve(path19); } - return path21.depth(); + return path19.depth(); } /** * Return the cache of child entries. Exposed so subclasses can create @@ -102291,9 +102291,9 @@ var require_commonjs16 = __commonJS({ process6(); return results; } - chdir(path21 = this.cwd) { + chdir(path19 = this.cwd) { const oldCwd = this.cwd; - this.cwd = typeof path21 === "string" ? this.cwd.resolve(path21) : path21; + this.cwd = typeof path19 === "string" ? this.cwd.resolve(path19) : path19; this.cwd[setAsCwd](oldCwd); } }; @@ -102681,8 +102681,8 @@ var require_processor = __commonJS({ } // match, absolute, ifdir entries() { - return [...this.store.entries()].map(([path21, n]) => [ - path21, + return [...this.store.entries()].map(([path19, n]) => [ + path19, !!(n & 2), !!(n & 1) ]); @@ -102900,9 +102900,9 @@ var require_walker = __commonJS({ signal; maxDepth; includeChildMatches; - constructor(patterns, path21, opts) { + constructor(patterns, path19, opts) { this.patterns = patterns; - this.path = path21; + this.path = path19; this.opts = opts; this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/"; this.includeChildMatches = opts.includeChildMatches !== false; @@ -102921,11 +102921,11 @@ var require_walker = __commonJS({ }); } } - #ignored(path21) { - return this.seen.has(path21) || !!this.#ignore?.ignored?.(path21); + #ignored(path19) { + return this.seen.has(path19) || !!this.#ignore?.ignored?.(path19); } - #childrenIgnored(path21) { - return !!this.#ignore?.childrenIgnored?.(path21); + #childrenIgnored(path19) { + return !!this.#ignore?.childrenIgnored?.(path19); } // backpressure mechanism pause() { @@ -103141,8 +103141,8 @@ var require_walker = __commonJS({ exports2.GlobUtil = GlobUtil; var GlobWalker = class extends GlobUtil { matches = /* @__PURE__ */ new Set(); - constructor(patterns, path21, opts) { - super(patterns, path21, opts); + constructor(patterns, path19, opts) { + super(patterns, path19, opts); } matchEmit(e) { this.matches.add(e); @@ -103180,8 +103180,8 @@ var require_walker = __commonJS({ exports2.GlobWalker = GlobWalker; var GlobStream = class extends GlobUtil { results; - constructor(patterns, path21, opts) { - super(patterns, path21, opts); + constructor(patterns, path19, opts) { + super(patterns, path19, opts); this.results = new minipass_1.Minipass({ signal: this.signal, objectMode: true @@ -103537,7 +103537,7 @@ var require_commonjs17 = __commonJS({ var require_file3 = __commonJS({ "node_modules/archiver-utils/file.js"(exports2, module2) { var fs20 = require_graceful_fs(); - var path21 = require("path"); + var path19 = require("path"); var flatten = require_flatten(); var difference = require_difference(); var union = require_union(); @@ -103562,7 +103562,7 @@ var require_file3 = __commonJS({ return result; }; file.exists = function() { - var filepath = path21.join.apply(path21, arguments); + var filepath = path19.join.apply(path19, arguments); return fs20.existsSync(filepath); }; file.expand = function(...args) { @@ -103576,7 +103576,7 @@ var require_file3 = __commonJS({ }); if (options.filter) { matches = matches.filter(function(filepath) { - filepath = path21.join(options.cwd || "", filepath); + filepath = path19.join(options.cwd || "", filepath); try { if (typeof options.filter === "function") { return options.filter(filepath); @@ -103593,7 +103593,7 @@ var require_file3 = __commonJS({ file.expandMapping = function(patterns, destBase, options) { options = Object.assign({ rename: function(destBase2, destPath) { - return path21.join(destBase2 || "", destPath); + return path19.join(destBase2 || "", destPath); } }, options); var files = []; @@ -103601,14 +103601,14 @@ var require_file3 = __commonJS({ file.expand(options, patterns).forEach(function(src) { var destPath = src; if (options.flatten) { - destPath = path21.basename(destPath); + destPath = path19.basename(destPath); } if (options.ext) { destPath = destPath.replace(/(\.[^\/]*)?$/, options.ext); } var dest = options.rename(destBase, destPath, options); if (options.cwd) { - src = path21.join(options.cwd, src); + src = path19.join(options.cwd, src); } dest = dest.replace(pathSeparatorRe, "/"); src = src.replace(pathSeparatorRe, "/"); @@ -103690,7 +103690,7 @@ var require_file3 = __commonJS({ var require_archiver_utils = __commonJS({ "node_modules/archiver-utils/index.js"(exports2, module2) { var fs20 = require_graceful_fs(); - var path21 = require("path"); + var path19 = require("path"); var isStream = require_is_stream(); var lazystream = require_lazystream(); var normalizePath = require_normalize_path(); @@ -103778,11 +103778,11 @@ var require_archiver_utils = __commonJS({ if (!file) { return callback(null, results); } - filepath = path21.join(dirpath, file); + filepath = path19.join(dirpath, file); fs20.stat(filepath, function(err2, stats) { results.push({ path: filepath, - relative: path21.relative(base, filepath).replace(/\\/g, "/"), + relative: path19.relative(base, filepath).replace(/\\/g, "/"), stats }); if (stats && stats.isDirectory()) { @@ -103844,7 +103844,7 @@ var require_core2 = __commonJS({ var fs20 = require("fs"); var glob2 = require_readdir_glob(); var async = require_async7(); - var path21 = require("path"); + var path19 = require("path"); var util = require_archiver_utils(); var inherits = require("util").inherits; var ArchiverError = require_error3(); @@ -104120,9 +104120,9 @@ var require_core2 = __commonJS({ task.source = Buffer.concat([]); } else if (stats.isSymbolicLink() && this._moduleSupports("symlink")) { var linkPath = fs20.readlinkSync(task.filepath); - var dirName = path21.dirname(task.filepath); + var dirName = path19.dirname(task.filepath); task.data.type = "symlink"; - task.data.linkname = path21.relative(dirName, path21.resolve(dirName, linkPath)); + task.data.linkname = path19.relative(dirName, path19.resolve(dirName, linkPath)); task.data.sourceType = "buffer"; task.source = Buffer.concat([]); } else { @@ -108572,8 +108572,8 @@ var require_context2 = __commonJS({ if (fs_1.existsSync(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse(fs_1.readFileSync(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path21 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); + const path19 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path19} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -109715,14 +109715,14 @@ var require_url_state_machine = __commonJS({ return url2.replace(/\u0009|\u000A|\u000D/g, ""); } function shortenPath(url2) { - const path21 = url2.path; - if (path21.length === 0) { + const path19 = url2.path; + if (path19.length === 0) { return; } - if (url2.scheme === "file" && path21.length === 1 && isNormalizedWindowsDriveLetter(path21[0])) { + if (url2.scheme === "file" && path19.length === 1 && isNormalizedWindowsDriveLetter(path19[0])) { return; } - path21.pop(); + path19.pop(); } function includesCredentials(url2) { return url2.username !== "" || url2.password !== ""; @@ -113893,7 +113893,7 @@ var require_traverse = __commonJS({ })(this.value); }; function walk(root, cb, immutable) { - var path21 = []; + var path19 = []; var parents = []; var alive = true; return (function walker(node_) { @@ -113902,11 +113902,11 @@ var require_traverse = __commonJS({ var state = { node, node_, - path: [].concat(path21), + path: [].concat(path19), parent: parents.slice(-1)[0], - key: path21.slice(-1)[0], - isRoot: path21.length === 0, - level: path21.length, + key: path19.slice(-1)[0], + isRoot: path19.length === 0, + level: path19.length, circular: null, update: function(x) { if (!state.isRoot) { @@ -113961,7 +113961,7 @@ var require_traverse = __commonJS({ parents.push(state); var keys = Object.keys(state.node); keys.forEach(function(key, i2) { - path21.push(key); + path19.push(key); if (modifiers.pre) modifiers.pre.call(state, state.node[key], key); var child = walker(state.node[key]); if (immutable && Object.hasOwnProperty.call(state.node, key)) { @@ -113970,7 +113970,7 @@ var require_traverse = __commonJS({ child.isLast = i2 == keys.length - 1; child.isFirst = i2 == 0; if (modifiers.post) modifiers.post.call(state, child); - path21.pop(); + path19.pop(); }); parents.pop(); } @@ -114991,11 +114991,11 @@ var require_unzip_stream = __commonJS({ return requiredLength; case states.CENTRAL_DIRECTORY_FILE_HEADER_SUFFIX: var isUtf8 = (this.parsedEntity.flags & 2048) !== 0; - var path21 = this._decodeString(chunk.slice(0, this.parsedEntity.fileNameLength), isUtf8); + var path19 = this._decodeString(chunk.slice(0, this.parsedEntity.fileNameLength), isUtf8); var extraDataBuffer = chunk.slice(this.parsedEntity.fileNameLength, this.parsedEntity.fileNameLength + this.parsedEntity.extraFieldLength); var extra = this._readExtraFields(extraDataBuffer); if (extra && extra.parsed && extra.parsed.path && !isUtf8) { - path21 = extra.parsed.path; + path19 = extra.parsed.path; } this.parsedEntity.extra = extra.parsed; var isUnix = (this.parsedEntity.versionMadeBy & 65280) >> 8 === 3; @@ -115007,7 +115007,7 @@ var require_unzip_stream = __commonJS({ } if (this.options.debug) { const debugObj = Object.assign({}, this.parsedEntity, { - path: path21, + path: path19, flags: "0x" + this.parsedEntity.flags.toString(16), unixAttrs: unixAttrs && "0" + unixAttrs.toString(8), isSymlink: isSymlink2, @@ -115444,7 +115444,7 @@ var require_parser_stream = __commonJS({ // node_modules/mkdirp/index.js var require_mkdirp = __commonJS({ "node_modules/mkdirp/index.js"(exports2, module2) { - var path21 = require("path"); + var path19 = require("path"); var fs20 = require("fs"); var _0777 = parseInt("0777", 8); module2.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP; @@ -115464,7 +115464,7 @@ var require_mkdirp = __commonJS({ var cb = f || /* istanbul ignore next */ function() { }; - p = path21.resolve(p); + p = path19.resolve(p); xfs.mkdir(p, mode, function(er) { if (!er) { made = made || p; @@ -115472,8 +115472,8 @@ var require_mkdirp = __commonJS({ } switch (er.code) { case "ENOENT": - if (path21.dirname(p) === p) return cb(er); - mkdirP(path21.dirname(p), opts, function(er2, made2) { + if (path19.dirname(p) === p) return cb(er); + mkdirP(path19.dirname(p), opts, function(er2, made2) { if (er2) cb(er2, made2); else mkdirP(p, opts, cb, made2); }); @@ -115500,14 +115500,14 @@ var require_mkdirp = __commonJS({ mode = _0777; } if (!made) made = null; - p = path21.resolve(p); + p = path19.resolve(p); try { xfs.mkdirSync(p, mode); made = made || p; } catch (err0) { switch (err0.code) { case "ENOENT": - made = sync(path21.dirname(p), opts, made); + made = sync(path19.dirname(p), opts, made); sync(p, opts, made); break; // In the case of any other error, just see if there's a dir @@ -115533,7 +115533,7 @@ var require_mkdirp = __commonJS({ var require_extract2 = __commonJS({ "node_modules/unzip-stream/lib/extract.js"(exports2, module2) { var fs20 = require("fs"); - var path21 = require("path"); + var path19 = require("path"); var util = require("util"); var mkdirp = require_mkdirp(); var Transform = require("stream").Transform; @@ -115575,8 +115575,8 @@ var require_extract2 = __commonJS({ }; Extract.prototype._processEntry = function(entry) { var self2 = this; - var destPath = path21.join(this.opts.path, entry.path); - var directory = entry.isDirectory ? destPath : path21.dirname(destPath); + var destPath = path19.join(this.opts.path, entry.path); + var directory = entry.isDirectory ? destPath : path19.dirname(destPath); this.unfinishedEntries++; var writeFileFn = function() { var pipedStream = fs20.createWriteStream(destPath); @@ -115703,10 +115703,10 @@ var require_download_artifact = __commonJS({ parsed.search = ""; return parsed.toString(); }; - function exists(path21) { + function exists(path19) { return __awaiter4(this, void 0, void 0, function* () { try { - yield promises_1.default.access(path21); + yield promises_1.default.access(path19); return true; } catch (error2) { if (error2.code === "ENOENT") { @@ -115937,12 +115937,12 @@ var require_dist_node24 = __commonJS({ octokit.log.debug("request", options); const start = Date.now(); const requestOptions = octokit.request.endpoint.parse(options); - const path21 = requestOptions.url.replace(options.baseUrl, ""); + const path19 = requestOptions.url.replace(options.baseUrl, ""); return request(options).then((response) => { - octokit.log.info(`${requestOptions.method} ${path21} - ${response.status} in ${Date.now() - start}ms`); + octokit.log.info(`${requestOptions.method} ${path19} - ${response.status} in ${Date.now() - start}ms`); return response; }).catch((error2) => { - octokit.log.info(`${requestOptions.method} ${path21} - ${error2.status} in ${Date.now() - start}ms`); + octokit.log.info(`${requestOptions.method} ${path19} - ${error2.status} in ${Date.now() - start}ms`); throw error2; }); }); @@ -116662,13 +116662,13 @@ These characters are not allowed in the artifact name due to limitations with ce (0, core_1.info)(`Artifact name is valid!`); } exports2.checkArtifactName = checkArtifactName; - function checkArtifactFilePath(path21) { - if (!path21) { - throw new Error(`Artifact path: ${path21}, is incorrectly provided`); + function checkArtifactFilePath(path19) { + if (!path19) { + throw new Error(`Artifact path: ${path19}, is incorrectly provided`); } for (const [invalidCharacterKey, errorMessageForCharacter] of invalidArtifactFilePathCharacters) { - if (path21.includes(invalidCharacterKey)) { - throw new Error(`Artifact path is not valid: ${path21}. Contains the following character: ${errorMessageForCharacter} + if (path19.includes(invalidCharacterKey)) { + throw new Error(`Artifact path is not valid: ${path19}. Contains the following character: ${errorMessageForCharacter} Invalid characters include: ${Array.from(invalidArtifactFilePathCharacters.values()).toString()} @@ -116759,7 +116759,7 @@ var require_tmp = __commonJS({ "node_modules/tmp/lib/tmp.js"(exports2, module2) { var fs20 = require("fs"); var os3 = require("os"); - var path21 = require("path"); + var path19 = require("path"); var crypto = require("crypto"); var _c = { fs: fs20.constants, os: os3.constants }; var RANDOM_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -116966,35 +116966,35 @@ var require_tmp = __commonJS({ return [actualOptions, callback]; } function _resolvePath(name, tmpDir, cb) { - const pathToResolve = path21.isAbsolute(name) ? name : path21.join(tmpDir, name); + const pathToResolve = path19.isAbsolute(name) ? name : path19.join(tmpDir, name); fs20.stat(pathToResolve, function(err) { if (err) { - fs20.realpath(path21.dirname(pathToResolve), function(err2, parentDir) { + fs20.realpath(path19.dirname(pathToResolve), function(err2, parentDir) { if (err2) return cb(err2); - cb(null, path21.join(parentDir, path21.basename(pathToResolve))); + cb(null, path19.join(parentDir, path19.basename(pathToResolve))); }); } else { - fs20.realpath(path21, cb); + fs20.realpath(path19, cb); } }); } function _resolvePathSync(name, tmpDir) { - const pathToResolve = path21.isAbsolute(name) ? name : path21.join(tmpDir, name); + const pathToResolve = path19.isAbsolute(name) ? name : path19.join(tmpDir, name); try { fs20.statSync(pathToResolve); return fs20.realpathSync(pathToResolve); } catch (_err) { - const parentDir = fs20.realpathSync(path21.dirname(pathToResolve)); - return path21.join(parentDir, path21.basename(pathToResolve)); + const parentDir = fs20.realpathSync(path19.dirname(pathToResolve)); + return path19.join(parentDir, path19.basename(pathToResolve)); } } function _generateTmpName(opts) { const tmpDir = opts.tmpdir; if (!_isUndefined(opts.name)) { - return path21.join(tmpDir, opts.dir, opts.name); + return path19.join(tmpDir, opts.dir, opts.name); } if (!_isUndefined(opts.template)) { - return path21.join(tmpDir, opts.dir, opts.template).replace(TEMPLATE_PATTERN, _randomChars(6)); + return path19.join(tmpDir, opts.dir, opts.template).replace(TEMPLATE_PATTERN, _randomChars(6)); } const name = [ opts.prefix ? opts.prefix : "tmp", @@ -117004,13 +117004,13 @@ var require_tmp = __commonJS({ _randomChars(12), opts.postfix ? "-" + opts.postfix : "" ].join(""); - return path21.join(tmpDir, opts.dir, name); + return path19.join(tmpDir, opts.dir, name); } function _assertOptionsBase(options) { if (!_isUndefined(options.name)) { const name = options.name; - if (path21.isAbsolute(name)) throw new Error(`name option must not contain an absolute path, found "${name}".`); - const basename = path21.basename(name); + if (path19.isAbsolute(name)) throw new Error(`name option must not contain an absolute path, found "${name}".`); + const basename = path19.basename(name); if (basename === ".." || basename === "." || basename !== name) throw new Error(`name option must not contain a path, found "${name}".`); } @@ -117032,7 +117032,7 @@ var require_tmp = __commonJS({ if (_isUndefined(name)) return cb(null); _resolvePath(name, tmpDir, function(err, resolvedPath) { if (err) return cb(err); - const relativePath = path21.relative(tmpDir, resolvedPath); + const relativePath = path19.relative(tmpDir, resolvedPath); if (!resolvedPath.startsWith(tmpDir)) { return cb(new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`)); } @@ -117042,7 +117042,7 @@ var require_tmp = __commonJS({ function _getRelativePathSync(option, name, tmpDir) { if (_isUndefined(name)) return; const resolvedPath = _resolvePathSync(name, tmpDir); - const relativePath = path21.relative(tmpDir, resolvedPath); + const relativePath = path19.relative(tmpDir, resolvedPath); if (!resolvedPath.startsWith(tmpDir)) { throw new Error(`${option} option must be relative to "${tmpDir}", found "${relativePath}".`); } @@ -117122,14 +117122,14 @@ var require_tmp_promise = __commonJS({ var fileWithOptions = promisify3( (options, cb) => tmp.file( options, - (err, path21, fd, cleanup) => err ? cb(err) : cb(void 0, { path: path21, fd, cleanup: promisify3(cleanup) }) + (err, path19, fd, cleanup) => err ? cb(err) : cb(void 0, { path: path19, fd, cleanup: promisify3(cleanup) }) ) ); module2.exports.file = async (options) => fileWithOptions(options); module2.exports.withFile = async function withFile(fn, options) { - const { path: path21, fd, cleanup } = await module2.exports.file(options); + const { path: path19, fd, cleanup } = await module2.exports.file(options); try { - return await fn({ path: path21, fd }); + return await fn({ path: path19, fd }); } finally { await cleanup(); } @@ -117138,14 +117138,14 @@ var require_tmp_promise = __commonJS({ var dirWithOptions = promisify3( (options, cb) => tmp.dir( options, - (err, path21, cleanup) => err ? cb(err) : cb(void 0, { path: path21, cleanup: promisify3(cleanup) }) + (err, path19, cleanup) => err ? cb(err) : cb(void 0, { path: path19, cleanup: promisify3(cleanup) }) ) ); module2.exports.dir = async (options) => dirWithOptions(options); module2.exports.withDir = async function withDir(fn, options) { - const { path: path21, cleanup } = await module2.exports.dir(options); + const { path: path19, cleanup } = await module2.exports.dir(options); try { - return await fn({ path: path21 }); + return await fn({ path: path19 }); } finally { await cleanup(); } @@ -118853,21 +118853,21 @@ var require_download_specification = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getDownloadSpecification = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); function getDownloadSpecification(artifactName, artifactEntries, downloadPath, includeRootDirectory) { const directories = /* @__PURE__ */ new Set(); const specifications = { - rootDownloadLocation: includeRootDirectory ? path21.join(downloadPath, artifactName) : downloadPath, + rootDownloadLocation: includeRootDirectory ? path19.join(downloadPath, artifactName) : downloadPath, directoryStructure: [], emptyFilesToCreate: [], filesToDownload: [] }; for (const entry of artifactEntries) { if (entry.path.startsWith(`${artifactName}/`) || entry.path.startsWith(`${artifactName}\\`)) { - const normalizedPathEntry = path21.normalize(entry.path); - const filePath = path21.join(downloadPath, includeRootDirectory ? normalizedPathEntry : normalizedPathEntry.replace(artifactName, "")); + const normalizedPathEntry = path19.normalize(entry.path); + const filePath = path19.join(downloadPath, includeRootDirectory ? normalizedPathEntry : normalizedPathEntry.replace(artifactName, "")); if (entry.itemType === "file") { - directories.add(path21.dirname(filePath)); + directories.add(path19.dirname(filePath)); if (entry.fileLength === 0) { specifications.emptyFilesToCreate.push(filePath); } else { @@ -119009,7 +119009,7 @@ Note: The size of downloaded zips can differ significantly from the reported siz return uploadResponse; }); } - downloadArtifact(name, path21, options) { + downloadArtifact(name, path19, options) { return __awaiter4(this, void 0, void 0, function* () { const downloadHttpClient = new download_http_client_1.DownloadHttpClient(); const artifacts = yield downloadHttpClient.listArtifacts(); @@ -119023,12 +119023,12 @@ Note: The size of downloaded zips can differ significantly from the reported siz throw new Error(`Unable to find an artifact with the name: ${name}`); } const items = yield downloadHttpClient.getContainerItems(artifactToDownload.name, artifactToDownload.fileContainerResourceUrl); - if (!path21) { - path21 = (0, config_variables_1.getWorkSpaceDirectory)(); + if (!path19) { + path19 = (0, config_variables_1.getWorkSpaceDirectory)(); } - path21 = (0, path_1.normalize)(path21); - path21 = (0, path_1.resolve)(path21); - const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(name, items.value, path21, (options === null || options === void 0 ? void 0 : options.createArtifactFolder) || false); + path19 = (0, path_1.normalize)(path19); + path19 = (0, path_1.resolve)(path19); + const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(name, items.value, path19, (options === null || options === void 0 ? void 0 : options.createArtifactFolder) || false); if (downloadSpecification.filesToDownload.length === 0) { core18.info(`No downloadable files were found for the artifact: ${artifactToDownload.name}`); } else { @@ -119043,7 +119043,7 @@ Note: The size of downloaded zips can differ significantly from the reported siz }; }); } - downloadAllArtifacts(path21) { + downloadAllArtifacts(path19) { return __awaiter4(this, void 0, void 0, function* () { const downloadHttpClient = new download_http_client_1.DownloadHttpClient(); const response = []; @@ -119052,18 +119052,18 @@ Note: The size of downloaded zips can differ significantly from the reported siz core18.info("Unable to find any artifacts for the associated workflow"); return response; } - if (!path21) { - path21 = (0, config_variables_1.getWorkSpaceDirectory)(); + if (!path19) { + path19 = (0, config_variables_1.getWorkSpaceDirectory)(); } - path21 = (0, path_1.normalize)(path21); - path21 = (0, path_1.resolve)(path21); + path19 = (0, path_1.normalize)(path19); + path19 = (0, path_1.resolve)(path19); let downloadedArtifacts = 0; while (downloadedArtifacts < artifacts.count) { const currentArtifactToDownload = artifacts.value[downloadedArtifacts]; downloadedArtifacts += 1; core18.info(`starting download of artifact ${currentArtifactToDownload.name} : ${downloadedArtifacts}/${artifacts.count}`); const items = yield downloadHttpClient.getContainerItems(currentArtifactToDownload.name, currentArtifactToDownload.fileContainerResourceUrl); - const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(currentArtifactToDownload.name, items.value, path21, true); + const downloadSpecification = (0, download_specification_1.getDownloadSpecification)(currentArtifactToDownload.name, items.value, path19, true); if (downloadSpecification.filesToDownload.length === 0) { core18.info(`No downloadable files were found for any artifact ${currentArtifactToDownload.name}`); } else { @@ -119204,7 +119204,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -119212,7 +119212,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path21.dirname(p); + let result = path19.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -119250,7 +119250,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path21.sep; + root += path19.sep; } return root + itemPath; } @@ -119288,10 +119288,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path21.sep)) { + if (!p.endsWith(path19.sep)) { return p; } - if (p === path21.sep) { + if (p === path19.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -119442,7 +119442,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -119457,12 +119457,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path21.sep); + this.segments = itemPath.split(path19.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path21.basename(remaining); + const basename = path19.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -119480,7 +119480,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path19.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -119491,12 +119491,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path19.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path21.sep; + result += path19.sep; } result += this.segments[i]; } @@ -119544,7 +119544,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -119573,7 +119573,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path19.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -119597,8 +119597,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path21.sep}`; + if (!itemPath.endsWith(path19.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path19.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -119633,9 +119633,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path19.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path19.sep}`)) { homedir = homedir || os3.homedir(); (0, assert_1.default)(homedir, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -119719,8 +119719,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path21, level) { - this.path = path21; + constructor(path19, level) { + this.path = path19; this.level = level; } }; @@ -119846,7 +119846,7 @@ var require_internal_globber2 = __commonJS({ var core18 = __importStar4(require_core()); var fs20 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -119922,7 +119922,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path21.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path19.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -119932,7 +119932,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs20.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path19.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -120084,7 +120084,7 @@ var require_internal_hash_files = __commonJS({ var fs20 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path21 = __importStar4(require("path")); + var path19 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -120100,7 +120100,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path21.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path19.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -120200,14 +120200,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path21, name, argument) { - if (Array.isArray(path21)) { - this.path = path21; - this.property = path21.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path19, name, argument) { + if (Array.isArray(path19)) { + this.path = path19; + this.property = path19.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path21 !== void 0) { - this.property = path21; + } else if (path19 !== void 0) { + this.property = path19; } if (message) { this.message = message; @@ -120298,16 +120298,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path21, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path19, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path21)) { - this.path = path21; - this.propertyPath = path21.reduce(function(sum, item) { + if (Array.isArray(path19)) { + this.path = path19; + this.propertyPath = path19.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path21; + this.propertyPath = path19; } this.base = base; this.schemas = schemas; @@ -120316,10 +120316,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path21 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path19 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path21, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path19, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -124787,12 +124787,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path21) { - const isExtendedLengthPath = path21.startsWith("\\\\?\\"); +function slash(path19) { + const isExtendedLengthPath = path19.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path21; + return path19; } - return path21.replace(/\\/g, "/"); + return path19.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -124880,8 +124880,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path21 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path21) ? path21 : import_node_path3.default.join(cwd, path21); + const path19 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path19) ? path19 : import_node_path3.default.join(cwd, path19); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -128576,7 +128576,7 @@ function wrapApiConfigurationError(e) { // src/codeql.ts var fs13 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path13 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -128819,10 +128819,9 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs9 = __toESM(require("fs")); -var path11 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/analyses.ts -var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -128834,7 +128833,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), fixCategory: (_2, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -128843,7 +128842,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -128862,11 +128861,11 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs8 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path9 = __toESM(require("path")); // src/feature-flags.ts var fs7 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path8 = __toESM(require("path")); var semver4 = __toESM(require_semver2()); // src/defaults.json @@ -128875,7 +128874,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs6 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path7 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -129001,8 +129000,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path21 = decodeGitFilePath(match[2]); - fileOidMap[path21] = oid; + const path19 = decodeGitFilePath(match[2]); + fileOidMap[path19] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -129126,7 +129125,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path8.join(config.dbLocation, "base-database-oids.json"); + return path7.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -129136,7 +129135,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path8.join( + const overlayChangesFile = path7.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -129356,7 +129355,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -129616,7 +129615,7 @@ var GitHubFeatureFlags = class { // src/diff-informed-analysis-utils.ts function getDiffRangesJsonFilePath() { - return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -129661,7 +129660,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path11.join(tempDir, "config"); + return path10.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -129705,7 +129704,7 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path12 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -129767,7 +129766,6 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); -var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -129916,7 +129914,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (path12.extname(tarPath) === `.${ext}`) { + if (tarPath.endsWith(`.${ext}`)) { return method; } } @@ -129926,7 +129924,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os = __toESM(require("os")); -var path13 = __toESM(require("path")); +var path11 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -130059,7 +130057,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path13.join( + return path11.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -130202,7 +130200,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path12.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -130540,7 +130538,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path14.join(tempDir, v4_default()); + return path12.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -130611,7 +130609,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path15.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path13.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -130672,7 +130670,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path15.join( + const tracingConfigPath = path13.join( extractorPath, "tools", "tracing-config.lua" @@ -130748,7 +130746,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path15.join( + const autobuildCmd = path13.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -131161,7 +131159,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path15.resolve(config.tempDir, "user-config.yaml"); + return path13.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -131183,7 +131181,7 @@ async function getJobRunUuidSarifOptions(codeql) { // src/debug-artifacts.ts var fs15 = __toESM(require("fs")); -var path17 = __toESM(require("path")); +var path15 = __toESM(require("path")); var artifact = __toESM(require_artifact2()); var artifactLegacy = __toESM(require_artifact_client2()); var core12 = __toESM(require_core()); @@ -131191,7 +131189,7 @@ var import_archiver = __toESM(require_archiver()); // src/analyze.ts var fs14 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path14 = __toESM(require("path")); var io5 = __toESM(require_io()); // src/autobuild.ts @@ -131206,7 +131204,7 @@ function dbIsFinalized(config, language, logger) { const dbPath = getCodeQLDatabasePath(config, language); try { const dbInfo = load( - fs14.readFileSync(path16.resolve(dbPath, "codeql-database.yml"), "utf8") + fs14.readFileSync(path14.resolve(dbPath, "codeql-database.yml"), "utf8") ); return !("inProgress" in dbInfo); } catch { @@ -131225,12 +131223,12 @@ function tryPrepareSarifDebugArtifact(config, language, logger) { try { const analyzeActionOutputDir = process.env["CODEQL_ACTION_SARIF_RESULTS_OUTPUT_DIR" /* SARIF_RESULTS_OUTPUT_DIR */]; if (analyzeActionOutputDir !== void 0 && fs15.existsSync(analyzeActionOutputDir) && fs15.lstatSync(analyzeActionOutputDir).isDirectory()) { - const sarifFile = path17.resolve( + const sarifFile = path15.resolve( analyzeActionOutputDir, `${language}.sarif` ); if (fs15.existsSync(sarifFile)) { - const sarifInDbLocation = path17.resolve( + const sarifInDbLocation = path15.resolve( config.dbLocation, `${language}.sarif` ); @@ -131285,13 +131283,13 @@ async function tryUploadAllAvailableDebugArtifacts(codeql, config, logger, codeQ } logger.info("Preparing database logs debug artifact..."); const databaseDirectory = getCodeQLDatabasePath(config, language); - const logsDirectory = path17.resolve(databaseDirectory, "log"); + const logsDirectory = path15.resolve(databaseDirectory, "log"); if (doesDirectoryExist(logsDirectory)) { filesToUpload.push(...listFolder(logsDirectory)); logger.info("Database logs debug artifact ready for upload."); } logger.info("Preparing database cluster logs debug artifact..."); - const multiLanguageTracingLogsDirectory = path17.resolve( + const multiLanguageTracingLogsDirectory = path15.resolve( config.dbLocation, "log" ); @@ -131365,8 +131363,8 @@ async function uploadDebugArtifacts(logger, toUpload, rootDir, artifactName, ghV try { await artifactUploader.uploadArtifact( sanitizeArtifactName(`${artifactName}${suffix}`), - toUpload.map((file) => path17.normalize(file)), - path17.normalize(rootDir), + toUpload.map((file) => path15.normalize(file)), + path15.normalize(rootDir), { // ensure we don't keep the debug artifacts around for too long since they can be large. retentionDays: 7 @@ -131393,7 +131391,7 @@ async function getArtifactUploaderClient(logger, ghVariant) { } async function createPartialDatabaseBundle(config, language) { const databasePath = getCodeQLDatabasePath(config, language); - const databaseBundlePath = path17.resolve( + const databaseBundlePath = path15.resolve( config.dbLocation, `${config.debugDatabaseName}-${language}-partial.zip` ); @@ -131631,7 +131629,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs17 = __toESM(require("fs")); -var path19 = __toESM(require("path")); +var path17 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core14 = __toESM(require_core()); @@ -132944,10 +132942,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path19.resolve(tempDir, "combined-sarif"); + const baseTempDir = path17.resolve(tempDir, "combined-sarif"); fs17.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs17.mkdtempSync(path19.resolve(baseTempDir, "output-")); - const outputFile = path19.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs17.mkdtempSync(path17.resolve(baseTempDir, "output-")); + const outputFile = path17.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -132980,7 +132978,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path19.join( + const payloadSaveFile = path17.join( getTemporaryDirectory(), "payload.json" ); @@ -133024,9 +133022,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs17.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path19.resolve(dir, entry.name)); + sarifFiles.push(path17.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path19.resolve(dir, entry.name)); + walkSarifFiles(path17.resolve(dir, entry.name)); } } }; @@ -133247,7 +133245,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path19.resolve( + const outputFile = path17.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -133395,7 +133393,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path19.join(checkoutPath, locationUri).replaceAll(path19.sep, "/"); + const locationPath = path17.join(checkoutPath, locationUri).replaceAll(path17.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); @@ -133408,7 +133406,7 @@ function filterAlertsByDiffRange(logger, sarif) { // src/workflow.ts var fs18 = __toESM(require("fs")); -var path20 = __toESM(require("path")); +var path18 = __toESM(require("path")); var import_zlib2 = __toESM(require("zlib")); var core15 = __toESM(require_core()); function toCodedErrors(errors) { @@ -133440,7 +133438,7 @@ async function getWorkflow(logger) { } async function getWorkflowAbsolutePath(logger) { const relativePath = await getWorkflowRelativePath(); - const absolutePath = path20.join( + const absolutePath = path18.join( getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath ); diff --git a/lib/init-action.js b/lib/init-action.js index 0d71725e5e..cc8c340407 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url.port != null ? url.port : url.protocol === "https:" ? 443 : 80; let origin = url.origin != null ? url.origin : `${url.protocol}//${url.hostname}:${port}`; - let path21 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`; + let path20 = url.path != null ? url.path : `${url.pathname || ""}${url.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path21 && !path21.startsWith("/")) { - path21 = `/${path21}`; + if (path20 && !path20.startsWith("/")) { + path20 = `/${path20}`; } - url = new URL(origin + path21); + url = new URL(origin + path20); } return url; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path21) { - if (typeof path21 !== "string") { + module2.exports = function basename(path20) { + if (typeof path20 !== "string") { return ""; } - for (var i = path21.length - 1; i >= 0; --i) { - switch (path21.charCodeAt(i)) { + for (var i = path20.length - 1; i >= 0; --i) { + switch (path20.charCodeAt(i)) { case 47: // '/' case 92: - path21 = path21.slice(i + 1); - return path21 === ".." || path21 === "." ? "" : path21; + path20 = path20.slice(i + 1); + return path20 === ".." || path20 === "." ? "" : path20; } } - return path21 === ".." || path21 === "." ? "" : path21; + return path20 === ".." || path20 === "." ? "" : path20; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path21, + path: path20, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path21 !== "string") { + if (typeof path20 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path21[0] !== "/" && !(path21.startsWith("http://") || path21.startsWith("https://")) && method !== "CONNECT") { + } else if (path20[0] !== "/" && !(path20.startsWith("http://") || path20.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path21) !== null) { + } else if (invalidPathRegex.exec(path20) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path21, query) : path21; + this.path = query ? util.buildURL(path20, query) : path20; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path21 = search ? `${pathname}${search}` : pathname; + const path20 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path21; + this.opts.path = path20; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path21, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path20, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path21} HTTP/1.1\r + let header = `${method} ${path20} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path21, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path20, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path21; + headers[HTTP2_HEADER_PATH] = path20; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path21) { - if (typeof path21 !== "string") { - return path21; + function safeUrl(path20) { + if (typeof path20 !== "string") { + return path20; } - const pathSegments = path21.split("?"); + const pathSegments = path20.split("?"); if (pathSegments.length !== 2) { - return path21; + return path20; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path21, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path21); + function matchKey(mockDispatch2, { path: path20, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path20); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path21 }) => matchValue(safeUrl(path21), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path20 }) => matchValue(safeUrl(path20), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path21, method, body, headers, query } = opts; + const { path: path20, method, body, headers, query } = opts; return { - path: path21, + path: path20, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path21, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path20, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path21, + Path: path20, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path21) { - for (const char of path21) { + function validateCookiePath(path20) { + for (const char of path20) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path21 = opts.path; + let path20 = opts.path; if (!opts.path.startsWith("/")) { - path21 = `/${path21}`; + path20 = `/${path20}`; } - url = new URL(util.parseOrigin(url).origin + path21); + url = new URL(util.parseOrigin(url).origin + path20); } else { if (!opts) { opts = typeof url === "object" ? url : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path21.sep); + return pth.replace(/[/\\]/g, path20.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs18 = __importStar4(require("fs")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); _a = fs18.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path21.extname(filePath).toUpperCase(); + const upperExt = path20.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path21.dirname(filePath); - const upperName = path21.basename(filePath).toUpperCase(); + const directory = path20.dirname(filePath); + const upperName = path20.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path21.join(directory, actualName); + filePath = path20.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path21.join(dest, path21.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path20.join(dest, path20.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path21.relative(source, newDest) === "") { + if (path20.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path21.join(dest, path21.basename(source)); + dest = path20.join(dest, path20.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path21.dirname(dest)); + yield mkdirP(path20.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path21.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path20.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path21.sep)) { + if (tool.includes(path20.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path21.delimiter)) { + for (const p of process.env.PATH.split(path20.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path21.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path20.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os5 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var io7 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path21.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path20.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io7.which(this.toolPath, true); return new Promise((resolve9, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os5 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path21.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path20.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath2; function getInput2(name, options) { @@ -21743,8 +21743,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path21 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path21} does not exist${os_1.EOL}`); + const path20 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path20} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -26505,7 +26505,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os5 = require("os"); - var path21 = require("path"); + var path20 = require("path"); var IS_WINDOWS_PLATFORM = os5.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -26517,7 +26517,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path21.resolve(cwd, filepath); + return path20.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -27814,7 +27814,7 @@ var require_braces = __commonJS({ var require_constants8 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path21 = require("path"); + var path20 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -27984,7 +27984,7 @@ var require_constants8 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path21.sep, + SEP: path20.sep, /** * Create EXTGLOB_CHARS */ @@ -28011,7 +28011,7 @@ var require_constants8 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path21 = require("path"); + var path20 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -28040,7 +28040,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path21.sep === "\\"; + return win32 === true || path20.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -29175,7 +29175,7 @@ var require_parse4 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path21 = require("path"); + var path20 = require("path"); var scan = require_scan(); var parse = require_parse4(); var utils = require_utils6(); @@ -29260,7 +29260,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => { const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options); - return regex.test(path21.basename(input)); + return regex.test(path20.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -29487,7 +29487,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path21 = require("path"); + var path20 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -29582,7 +29582,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path21.basename(pattern); + const basename = path20.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -29640,7 +29640,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute3(pattern) { - return path21.isAbsolute(pattern); + return path20.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute3; } @@ -29817,8 +29817,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs18 = require_fs(); exports2.fs = fs18; - var path21 = require_path(); - exports2.path = path21; + var path20 = require_path(); + exports2.path = path20; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -29930,8 +29930,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path21, settings, callback) { - settings.fs.lstat(path21, (lstatError, lstat) => { + function read(path20, settings, callback) { + settings.fs.lstat(path20, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -29940,7 +29940,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path21, (statError, stat) => { + settings.fs.stat(path20, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -29972,13 +29972,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path21, settings) { - const lstat = settings.fs.lstatSync(path21); + function read(path20, settings) { + const lstat = settings.fs.lstatSync(path20); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path21); + const stat = settings.fs.statSync(path20); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -30049,17 +30049,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path21, optionsOrSettingsOrCallback, callback) { + function stat(path20, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path21, getSettings(), optionsOrSettingsOrCallback); + async.read(path20, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync2(path21, optionsOrSettings) { + function statSync2(path20, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path21, settings); + return sync.read(path20, settings); } exports2.statSync = statSync2; function getSettings(settingsOrOptions = {}) { @@ -30275,16 +30275,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path21 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path20 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path21, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path20, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path21, + path: path20, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -30402,7 +30402,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path20 = require("path"); var fsStat = require_out(); var fs18 = require_fs4(); var Settings = class { @@ -30410,7 +30410,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs18.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -30437,17 +30437,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path21, optionsOrSettingsOrCallback, callback) { + function scandir(path20, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path21, getSettings(), optionsOrSettingsOrCallback); + async.read(path20, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path21, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path20, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path21, optionsOrSettings) { + function scandirSync(path20, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path21, settings); + return sync.read(path20, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -30974,7 +30974,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path20 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -30984,7 +30984,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path21.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path20.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -31046,7 +31046,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path20 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -31059,7 +31059,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path21.resolve(this._settings.cwd, filepath); + return path20.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -31475,7 +31475,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path21 = require("path"); + var path20 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -31489,7 +31489,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path21.resolve(this._settings.cwd, task.base); + return path20.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -32122,7 +32122,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path21, checkUnignored, mode) { + test(path20, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -32131,7 +32131,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path21); + const matched = rule[mode].test(path20); if (!matched) { return; } @@ -32152,17 +32152,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path21, originalPath, doThrow) => { - if (!isString(path21)) { + var checkPath = (path20, originalPath, doThrow) => { + if (!isString(path20)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path21) { + if (!path20) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path21)) { + if (checkPath.isNotRelative(path20)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -32171,7 +32171,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path21) => REGEX_TEST_INVALID_PATH.test(path21); + var isNotRelative = (path20) => REGEX_TEST_INVALID_PATH.test(path20); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -32201,19 +32201,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path21 = originalPath && checkPath.convert(originalPath); + const path20 = originalPath && checkPath.convert(originalPath); checkPath( - path21, + path20, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path21, cache, checkUnignored, slices); + return this._t(path20, cache, checkUnignored, slices); } - checkIgnore(path21) { - if (!REGEX_TEST_TRAILING_SLASH.test(path21)) { - return this.test(path21); + checkIgnore(path20) { + if (!REGEX_TEST_TRAILING_SLASH.test(path20)) { + return this.test(path20); } - const slices = path21.split(SLASH).filter(Boolean); + const slices = path20.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -32226,18 +32226,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path21, false, MODE_CHECK_IGNORE); + return this._rules.test(path20, false, MODE_CHECK_IGNORE); } - _t(path21, cache, checkUnignored, slices) { - if (path21 in cache) { - return cache[path21]; + _t(path20, cache, checkUnignored, slices) { + if (path20 in cache) { + return cache[path20]; } if (!slices) { - slices = path21.split(SLASH).filter(Boolean); + slices = path20.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path21] = this._rules.test(path21, checkUnignored, MODE_IGNORE); + return cache[path20] = this._rules.test(path20, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -32245,29 +32245,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path21] = parent.ignored ? parent : this._rules.test(path21, checkUnignored, MODE_IGNORE); + return cache[path20] = parent.ignored ? parent : this._rules.test(path20, checkUnignored, MODE_IGNORE); } - ignores(path21) { - return this._test(path21, this._ignoreCache, false).ignored; + ignores(path20) { + return this._test(path20, this._ignoreCache, false).ignored; } createFilter() { - return (path21) => !this.ignores(path21); + return (path20) => !this.ignores(path20); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path21) { - return this._test(path21, this._testCache, true); + test(path20) { + return this._test(path20, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path21) => checkPath(path21 && checkPath.convert(path21), path21, RETURN_FALSE); + var isPathValid = (path20) => checkPath(path20 && checkPath.convert(path20), path20, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path21) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path21) || isNotRelative(path21); + checkPath.isNotRelative = (path20) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path20) || isNotRelative(path20); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path21.dirname(p); + let result = path20.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path21.sep; + root += path20.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path21.sep)) { + if (!p.endsWith(path20.sep)) { return p; } - if (p === path21.sep) { + if (p === path20.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path21 = (function() { + var path20 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path21.sep; + minimatch.sep = path20.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path21.sep !== "/") { - pattern = pattern.split(path21.sep).join("/"); + if (!options.allowWindowsEscape && path20.sep !== "/") { + pattern = pattern.split(path20.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path21.sep !== "/") { - f = f.split(path21.sep).join("/"); + if (path20.sep !== "/") { + f = f.split(path20.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path21.sep); + this.segments = itemPath.split(path20.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path21.basename(remaining); + const basename = path20.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path21.sep; + result += path20.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path21.sep}`; + if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path20.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { homedir2 = homedir2 || os5.homedir(); assert_1.default(homedir2, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path21, level) { - this.path = path21; + constructor(path20, level) { + this.path = path20; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core14 = __importStar4(require_core()); var fs18 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io7 = __importStar4(require_io()); var crypto2 = __importStar4(require("crypto")); var fs18 = __importStar4(require("fs")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var semver9 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path21.join(baseLocation, "actions", "temp"); + tempDirectory = path20.join(baseLocation, "actions", "temp"); } - const dest = path21.join(tempDirectory, crypto2.randomUUID()); + const dest = path20.join(tempDirectory, crypto2.randomUUID()); yield io7.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path21.relative(workspace, file).replace(new RegExp(`\\${path21.sep}`, "g"), "/"); + const relativeFile = path20.relative(workspace, file).replace(new RegExp(`\\${path20.sep}`, "g"), "/"); core14.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path21 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path21.startsWith("/")) { - path21 = path21.substring(1); + let path20 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path20.startsWith("/")) { + path20 = path20.substring(1); } - if (isAbsoluteUrl(path21)) { - requestUrl = path21; + if (isAbsoluteUrl(path20)) { + requestUrl = path20; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path21); + requestUrl = appendPath(requestUrl, path20); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path21 = pathToAppend.substring(0, searchStart); + const path20 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path21; + newPath = newPath + path20; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url2) { const urlParsed = new URL(url2); - let path21 = urlParsed.pathname; - path21 = path21 || "/"; - path21 = escape(path21); - urlParsed.pathname = path21; + let path20 = urlParsed.pathname; + path20 = path20 || "/"; + path20 = escape(path20); + urlParsed.pathname = path20; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url2, name) { const urlParsed = new URL(url2); - let path21 = urlParsed.pathname; - path21 = path21 ? path21.endsWith("/") ? `${path21}${name}` : `${path21}/${name}` : name; - urlParsed.pathname = path21; + let path20 = urlParsed.pathname; + path20 = path20 ? path20.endsWith("/") ? `${path20}${name}` : `${path20}/${name}` : name; + urlParsed.pathname = path20; return urlParsed.toString(); } function setURLParameter(url2, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path21 = getURLPath(request.url) || "/"; + const path20 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path21}`; + canonicalizedResourceString += `/${this.factory.accountName}${path20}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path21 = getURLPath(request.url) || "/"; + const path20 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path21}`; + canonicalizedResourceString += `/${options.accountName}${path20}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path21 = getURLPath(subRequest.url); - if (!path21 || path21 === "") { + const path20 = getURLPath(subRequest.url); + if (!path20 || path20 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url2, getCoreClientOptions(pipeline)); - const path21 = getURLPath(url2); - if (path21 && path21 !== "/") { + const path20 = getURLPath(url2); + if (path20 && path20 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io7 = __importStar4(require_io()); var fs_1 = require("fs"); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path21.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path20.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path21.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path20.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path21.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path20.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path21.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path20.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core14 = __importStar4(require_core()); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core14.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path21.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path20.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive path: ${archivePath}`); core14.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path21.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path20.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79388,7 +79388,7 @@ var require_internal_path_helper2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -79396,7 +79396,7 @@ var require_internal_path_helper2 = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path21.dirname(p); + let result = path20.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -79434,7 +79434,7 @@ var require_internal_path_helper2 = __commonJS({ (0, assert_1.default)(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path21.sep; + root += path20.sep; } return root + itemPath; } @@ -79472,10 +79472,10 @@ var require_internal_path_helper2 = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path21.sep)) { + if (!p.endsWith(path20.sep)) { return p; } - if (p === path21.sep) { + if (p === path20.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -79626,7 +79626,7 @@ var require_internal_path2 = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -79641,12 +79641,12 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path21.sep); + this.segments = itemPath.split(path20.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path21.basename(remaining); + const basename = path20.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -79664,7 +79664,7 @@ var require_internal_path2 = __commonJS({ (0, assert_1.default)(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - (0, assert_1.default)(!segment.includes(path21.sep), `Parameter 'itemPath' contains unexpected path separators`); + (0, assert_1.default)(!segment.includes(path20.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -79675,12 +79675,12 @@ var require_internal_path2 = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path21.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path20.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path21.sep; + result += path20.sep; } result += this.segments[i]; } @@ -79728,7 +79728,7 @@ var require_internal_pattern2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os5 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper2()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -79757,7 +79757,7 @@ var require_internal_pattern2 = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir2); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path21.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path20.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -79781,8 +79781,8 @@ var require_internal_pattern2 = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path21.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path21.sep}`; + if (!itemPath.endsWith(path20.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path20.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -79817,9 +79817,9 @@ var require_internal_pattern2 = __commonJS({ (0, assert_1.default)(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); (0, assert_1.default)(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path21.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path20.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path21.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path20.sep}`)) { homedir2 = homedir2 || os5.homedir(); (0, assert_1.default)(homedir2, "Unable to determine HOME directory"); (0, assert_1.default)(pathHelper.hasAbsoluteRoot(homedir2), `Expected HOME directory to be a rooted path. Actual '${homedir2}'`); @@ -79903,8 +79903,8 @@ var require_internal_search_state2 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path21, level) { - this.path = path21; + constructor(path20, level) { + this.path = path20; this.level = level; } }; @@ -80030,7 +80030,7 @@ var require_internal_globber2 = __commonJS({ var core14 = __importStar4(require_core()); var fs18 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper2()); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper2()); var internal_match_kind_1 = require_internal_match_kind2(); var internal_pattern_1 = require_internal_pattern2(); @@ -80106,7 +80106,7 @@ var require_internal_globber2 = __commonJS({ if (!stats) { continue; } - if (options.excludeHiddenFiles && path21.basename(item.path).match(/^\./)) { + if (options.excludeHiddenFiles && path20.basename(item.path).match(/^\./)) { continue; } if (stats.isDirectory()) { @@ -80116,7 +80116,7 @@ var require_internal_globber2 = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path21.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs18.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path20.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -80268,7 +80268,7 @@ var require_internal_hash_files = __commonJS({ var fs18 = __importStar4(require("fs")); var stream2 = __importStar4(require("stream")); var util = __importStar4(require("util")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); function hashFiles2(globber, currentWorkspace, verbose = false) { var _a, e_1, _b, _c; var _d; @@ -80284,7 +80284,7 @@ var require_internal_hash_files = __commonJS({ _e = false; const file = _c; writeDelegate(file); - if (!file.startsWith(`${githubWorkspace}${path21.sep}`)) { + if (!file.startsWith(`${githubWorkspace}${path20.sep}`)) { writeDelegate(`Ignore '${file}' since it is not under GITHUB_WORKSPACE.`); continue; } @@ -80690,7 +80690,7 @@ var require_tool_cache = __commonJS({ var fs18 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os5 = __importStar4(require("os")); - var path21 = __importStar4(require("path")); + var path20 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver9 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80711,8 +80711,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path21.join(_getTempDirectory(), crypto2.randomUUID()); - yield io7.mkdirP(path21.dirname(dest)); + dest = dest || path20.join(_getTempDirectory(), crypto2.randomUUID()); + yield io7.mkdirP(path20.dirname(dest)); core14.debug(`Downloading ${url}`); core14.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80799,7 +80799,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path21.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path20.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -80975,7 +80975,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs18.readdirSync(sourceDir)) { - const s = path21.join(sourceDir, itemName); + const s = path20.join(sourceDir, itemName); yield io7.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -80993,7 +80993,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path21.join(destFolder, targetFile); + const destPath = path20.join(destFolder, targetFile); core14.debug(`destination file ${destPath}`); yield io7.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81017,7 +81017,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver9.clean(versionSpec) || ""; - const cachePath = path21.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path20.join(_getCacheDirectory(), toolName, versionSpec, arch2); core14.debug(`checking cache: ${cachePath}`); if (fs18.existsSync(cachePath) && fs18.existsSync(`${cachePath}.complete`)) { core14.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81032,12 +81032,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os5.arch(); - const toolPath = path21.join(_getCacheDirectory(), toolName); + const toolPath = path20.join(_getCacheDirectory(), toolName); if (fs18.existsSync(toolPath)) { const children = fs18.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path21.join(toolPath, child, arch2 || ""); + const fullPath = path20.join(toolPath, child, arch2 || ""); if (fs18.existsSync(fullPath) && fs18.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81092,7 +81092,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path21.join(_getTempDirectory(), crypto2.randomUUID()); + dest = path20.join(_getTempDirectory(), crypto2.randomUUID()); } yield io7.mkdirP(dest); return dest; @@ -81100,7 +81100,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path21.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); + const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); core14.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io7.rmRF(folderPath); @@ -81110,7 +81110,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path21.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); + const folderPath = path20.join(_getCacheDirectory(), tool, semver9.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs18.writeFileSync(markerPath, ""); core14.debug("finished caching tool"); @@ -81721,7 +81721,7 @@ var require_follow_redirects = __commonJS({ // src/init-action.ts var fs17 = __toESM(require("fs")); -var path20 = __toESM(require("path")); +var path19 = __toESM(require("path")); var core13 = __toESM(require_core()); var io6 = __toESM(require_io()); var semver8 = __toESM(require_semver2()); @@ -82177,12 +82177,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path21) { - const isExtendedLengthPath = path21.startsWith("\\\\?\\"); +function slash(path20) { + const isExtendedLengthPath = path20.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path21; + return path20; } - return path21.replace(/\\/g, "/"); + return path20.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -82270,8 +82270,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path21 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path21) ? path21 : import_node_path3.default.join(cwd, path21); + const path20 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path20) ? path20 : import_node_path3.default.join(cwd, path20); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -86673,8 +86673,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path21 = decodeGitFilePath(match[2]); - fileOidMap[path21] = oid; + const path20 = decodeGitFilePath(match[2]); + fileOidMap[path20] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -88309,13 +88309,13 @@ function flushDiagnostics(config) { // src/init.ts var fs15 = __toESM(require("fs")); -var path18 = __toESM(require("path")); +var path17 = __toESM(require("path")); var toolrunner4 = __toESM(require_toolrunner()); var io5 = __toESM(require_io()); // src/codeql.ts var fs14 = __toESM(require("fs")); -var path17 = __toESM(require("path")); +var path16 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -88558,7 +88558,7 @@ function wrapCliConfigurationError(cliError) { // src/setup-codeql.ts var fs12 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path14 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -88566,7 +88566,6 @@ var semver7 = __toESM(require_semver2()); // src/tar.ts var import_child_process = require("child_process"); var fs10 = __toESM(require("fs")); -var path13 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -88715,7 +88714,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (path13.extname(tarPath) === `.${ext}`) { + if (tarPath.endsWith(`.${ext}`)) { return method; } } @@ -88725,7 +88724,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs11 = __toESM(require("fs")); var os3 = __toESM(require("os")); -var path14 = __toESM(require("path")); +var path13 = __toESM(require("path")); var import_perf_hooks2 = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -88858,7 +88857,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path14.join( + return path13.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -89001,7 +89000,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs12.existsSync(path15.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs12.existsSync(path14.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -89339,7 +89338,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path15.join(tempDir, v4_default()); + return path14.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -89372,7 +89371,7 @@ function isReservedToolsValue(tools) { // src/tracer-config.ts var fs13 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path15 = __toESM(require("path")); async function shouldEnableIndirectTracing(codeql, config) { if (config.buildMode === "none" /* None */) { return false; @@ -89385,7 +89384,7 @@ async function shouldEnableIndirectTracing(codeql, config) { async function getTracerConfigForCluster(config) { const tracingEnvVariables = JSON.parse( fs13.readFileSync( - path16.resolve( + path15.resolve( config.dbLocation, "temp/tracingEnvironment/start-tracing.json" ), @@ -89432,7 +89431,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path17.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path16.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -89487,7 +89486,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path17.join( + const tracingConfigPath = path16.join( extractorPath, "tools", "tracing-config.lua" @@ -89563,7 +89562,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path17.join( + const autobuildCmd = path16.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -89976,7 +89975,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path17.resolve(config.tempDir, "user-config.yaml"); + return path16.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -90065,9 +90064,9 @@ async function checkPacksForOverlayCompatibility(codeql, config, logger) { } function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) { try { - let qlpackPath = path18.join(packDir, "qlpack.yml"); + let qlpackPath = path17.join(packDir, "qlpack.yml"); if (!fs15.existsSync(qlpackPath)) { - qlpackPath = path18.join(packDir, "codeql-pack.yml"); + qlpackPath = path17.join(packDir, "codeql-pack.yml"); } const qlpackContents = load( fs15.readFileSync(qlpackPath, "utf8") @@ -90075,7 +90074,7 @@ function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) if (!qlpackContents.buildMetadata) { return true; } - const packInfoPath = path18.join(packDir, ".packinfo"); + const packInfoPath = path17.join(packDir, ".packinfo"); if (!fs15.existsSync(packInfoPath)) { logger.warning( `The query pack at ${packDir} does not have a .packinfo file, so it cannot support overlay analysis. Recompiling the query pack with the latest CodeQL CLI should solve this problem.` @@ -90108,7 +90107,7 @@ function checkPackForOverlayCompatibility(packDir, codeQlOverlayVersion, logger) } async function checkInstallPython311(languages, codeql) { if (languages.includes("python" /* python */) && process.platform === "win32" && !(await codeql.getVersion()).features?.supportsPython312) { - const script = path18.resolve( + const script = path17.resolve( __dirname, "../python-setup", "check_python12.ps1" @@ -90373,7 +90372,7 @@ async function createInitWithConfigStatusReport(config, initStatusReport, config // src/workflow.ts var fs16 = __toESM(require("fs")); -var path19 = __toESM(require("path")); +var path18 = __toESM(require("path")); var import_zlib = __toESM(require("zlib")); var core12 = __toESM(require_core()); function toCodedErrors(errors) { @@ -90528,7 +90527,7 @@ async function getWorkflow(logger) { } async function getWorkflowAbsolutePath(logger) { const relativePath = await getWorkflowRelativePath(); - const absolutePath = path19.join( + const absolutePath = path18.join( getRequiredEnvParam("GITHUB_WORKSPACE"), relativePath ); @@ -90628,7 +90627,7 @@ async function run() { core13.exportVariable("JOB_RUN_UUID" /* JOB_RUN_UUID */, jobRunUuid); core13.exportVariable("CODEQL_ACTION_INIT_HAS_RUN" /* INIT_ACTION_HAS_RUN */, "true"); const configFile = getOptionalInput("config-file"); - const sourceRoot = path20.resolve( + const sourceRoot = path19.resolve( getRequiredEnvParam("GITHUB_WORKSPACE"), getOptionalInput("source-root") || "" ); @@ -90806,14 +90805,14 @@ async function run() { )) { try { logger.debug(`Applying static binary workaround for Go`); - const tempBinPath = path20.resolve( + const tempBinPath = path19.resolve( getTemporaryDirectory(), "codeql-action-go-tracing", "bin" ); fs17.mkdirSync(tempBinPath, { recursive: true }); core13.addPath(tempBinPath); - const goWrapperPath = path20.resolve(tempBinPath, "go"); + const goWrapperPath = path19.resolve(tempBinPath, "go"); fs17.writeFileSync( goWrapperPath, `#!/bin/bash diff --git a/lib/upload-lib.js b/lib/upload-lib.js index dc45c92411..b28ce7ab62 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path17 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path15 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path17 && !path17.startsWith("/")) { - path17 = `/${path17}`; + if (path15 && !path15.startsWith("/")) { + path15 = `/${path15}`; } - url2 = new URL(origin + path17); + url2 = new URL(origin + path15); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path17) { - if (typeof path17 !== "string") { + module2.exports = function basename(path15) { + if (typeof path15 !== "string") { return ""; } - for (var i = path17.length - 1; i >= 0; --i) { - switch (path17.charCodeAt(i)) { + for (var i = path15.length - 1; i >= 0; --i) { + switch (path15.charCodeAt(i)) { case 47: // '/' case 92: - path17 = path17.slice(i + 1); - return path17 === ".." || path17 === "." ? "" : path17; + path15 = path15.slice(i + 1); + return path15 === ".." || path15 === "." ? "" : path15; } } - return path17 === ".." || path17 === "." ? "" : path17; + return path15 === ".." || path15 === "." ? "" : path15; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path17, + path: path15, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path17 !== "string") { + if (typeof path15 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path17[0] !== "/" && !(path17.startsWith("http://") || path17.startsWith("https://")) && method !== "CONNECT") { + } else if (path15[0] !== "/" && !(path15.startsWith("http://") || path15.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path17) !== null) { + } else if (invalidPathRegex.exec(path15) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path17, query) : path17; + this.path = query ? util.buildURL(path15, query) : path15; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path17 = search ? `${pathname}${search}` : pathname; + const path15 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path17; + this.opts.path = path15; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path17, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path15, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path17} HTTP/1.1\r + let header = `${method} ${path15} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path17, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path15, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path17; + headers[HTTP2_HEADER_PATH] = path15; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path17) { - if (typeof path17 !== "string") { - return path17; + function safeUrl(path15) { + if (typeof path15 !== "string") { + return path15; } - const pathSegments = path17.split("?"); + const pathSegments = path15.split("?"); if (pathSegments.length !== 2) { - return path17; + return path15; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path17, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path17); + function matchKey(mockDispatch2, { path: path15, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path15); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path17 }) => matchValue(safeUrl(path17), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path15 }) => matchValue(safeUrl(path15), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path17, method, body, headers, query } = opts; + const { path: path15, method, body, headers, query } = opts; return { - path: path17, + path: path15, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path17, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path15, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path17, + Path: path15, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path17) { - for (const char of path17) { + function validateCookiePath(path15) { + for (const char of path15) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path17 = opts.path; + let path15 = opts.path; if (!opts.path.startsWith("/")) { - path17 = `/${path17}`; + path15 = `/${path15}`; } - url2 = new URL(util.parseOrigin(url2).origin + path17); + url2 = new URL(util.parseOrigin(url2).origin + path15); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path17.sep); + return pth.replace(/[/\\]/g, path15.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs14 = __importStar4(require("fs")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); _a = fs14.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path17.extname(filePath).toUpperCase(); + const upperExt = path15.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path17.dirname(filePath); - const upperName = path17.basename(filePath).toUpperCase(); + const directory = path15.dirname(filePath); + const upperName = path15.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path17.join(directory, actualName); + filePath = path15.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path17.join(dest, path17.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path15.join(dest, path15.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path17.relative(source, newDest) === "") { + if (path15.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path17.join(dest, path17.basename(source)); + dest = path15.join(dest, path15.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path17.dirname(dest)); + yield mkdirP(path15.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path17.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path15.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path17.sep)) { + if (tool.includes(path15.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path17.delimiter)) { + for (const p of process.env.PATH.split(path15.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path17.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path15.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os2 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var io6 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path17.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path15.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io6.which(this.toolPath, true); return new Promise((resolve6, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os2 = __importStar4(require("os")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path17.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path15.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19821,14 +19821,14 @@ var require_helpers = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path17, name, argument) { - if (Array.isArray(path17)) { - this.path = path17; - this.property = path17.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path15, name, argument) { + if (Array.isArray(path15)) { + this.path = path15; + this.property = path15.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path17 !== void 0) { - this.property = path17; + } else if (path15 !== void 0) { + this.property = path15; } if (message) { this.message = message; @@ -19919,16 +19919,16 @@ var require_helpers = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path17, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path15, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path17)) { - this.path = path17; - this.propertyPath = path17.reduce(function(sum, item) { + if (Array.isArray(path15)) { + this.path = path15; + this.propertyPath = path15.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path17; + this.propertyPath = path15; } this.base = base; this.schemas = schemas; @@ -19937,10 +19937,10 @@ var require_helpers = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path17 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path15 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path17, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path15, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -21132,8 +21132,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path17 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path17} does not exist${os_1.EOL}`); + const path15 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path15} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -25894,7 +25894,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os2 = require("os"); - var path17 = require("path"); + var path15 = require("path"); var IS_WINDOWS_PLATFORM = os2.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -25906,7 +25906,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path17.resolve(cwd, filepath); + return path15.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -27203,7 +27203,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path17 = require("path"); + var path15 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -27373,7 +27373,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path17.sep, + SEP: path15.sep, /** * Create EXTGLOB_CHARS */ @@ -27400,7 +27400,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path17 = require("path"); + var path15 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -27429,7 +27429,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path17.sep === "\\"; + return win32 === true || path15.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -28564,7 +28564,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path17 = require("path"); + var path15 = require("path"); var scan = require_scan2(); var parse = require_parse3(); var utils = require_utils6(); @@ -28649,7 +28649,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => { const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options); - return regex.test(path17.basename(input)); + return regex.test(path15.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -28876,7 +28876,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path17 = require("path"); + var path15 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -28971,7 +28971,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path17.basename(pattern); + const basename = path15.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -29029,7 +29029,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path17.isAbsolute(pattern); + return path15.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -29206,8 +29206,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs14 = require_fs(); exports2.fs = fs14; - var path17 = require_path(); - exports2.path = path17; + var path15 = require_path(); + exports2.path = path15; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -29319,8 +29319,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path17, settings, callback) { - settings.fs.lstat(path17, (lstatError, lstat) => { + function read(path15, settings, callback) { + settings.fs.lstat(path15, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -29329,7 +29329,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path17, (statError, stat) => { + settings.fs.stat(path15, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -29361,13 +29361,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path17, settings) { - const lstat = settings.fs.lstatSync(path17); + function read(path15, settings) { + const lstat = settings.fs.lstatSync(path15); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path17); + const stat = settings.fs.statSync(path15); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -29438,17 +29438,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path17, optionsOrSettingsOrCallback, callback) { + function stat(path15, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path17, getSettings(), optionsOrSettingsOrCallback); + async.read(path15, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path17, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path15, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path17, optionsOrSettings) { + function statSync3(path15, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path17, settings); + return sync.read(path15, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -29664,16 +29664,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path17 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path15 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path17, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path15, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path17, + path: path15, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -29791,7 +29791,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path17 = require("path"); + var path15 = require("path"); var fsStat = require_out(); var fs14 = require_fs4(); var Settings = class { @@ -29799,7 +29799,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs14.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path17.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path15.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -29826,17 +29826,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path17, optionsOrSettingsOrCallback, callback) { + function scandir(path15, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path17, getSettings(), optionsOrSettingsOrCallback); + async.read(path15, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path17, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path15, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path17, optionsOrSettings) { + function scandirSync(path15, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path17, settings); + return sync.read(path15, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -30363,7 +30363,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path17 = require("path"); + var path15 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -30373,7 +30373,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path17.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path15.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -30435,7 +30435,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path17 = require("path"); + var path15 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -30448,7 +30448,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path17.resolve(this._settings.cwd, filepath); + return path15.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -30864,7 +30864,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path17 = require("path"); + var path15 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -30878,7 +30878,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path17.resolve(this._settings.cwd, task.base); + return path15.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -31511,7 +31511,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path17, checkUnignored, mode) { + test(path15, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -31520,7 +31520,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path17); + const matched = rule[mode].test(path15); if (!matched) { return; } @@ -31541,17 +31541,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path17, originalPath, doThrow) => { - if (!isString(path17)) { + var checkPath = (path15, originalPath, doThrow) => { + if (!isString(path15)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path17) { + if (!path15) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path17)) { + if (checkPath.isNotRelative(path15)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -31560,7 +31560,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path17) => REGEX_TEST_INVALID_PATH.test(path17); + var isNotRelative = (path15) => REGEX_TEST_INVALID_PATH.test(path15); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -31590,19 +31590,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path17 = originalPath && checkPath.convert(originalPath); + const path15 = originalPath && checkPath.convert(originalPath); checkPath( - path17, + path15, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path17, cache, checkUnignored, slices); + return this._t(path15, cache, checkUnignored, slices); } - checkIgnore(path17) { - if (!REGEX_TEST_TRAILING_SLASH.test(path17)) { - return this.test(path17); + checkIgnore(path15) { + if (!REGEX_TEST_TRAILING_SLASH.test(path15)) { + return this.test(path15); } - const slices = path17.split(SLASH).filter(Boolean); + const slices = path15.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -31615,18 +31615,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path17, false, MODE_CHECK_IGNORE); + return this._rules.test(path15, false, MODE_CHECK_IGNORE); } - _t(path17, cache, checkUnignored, slices) { - if (path17 in cache) { - return cache[path17]; + _t(path15, cache, checkUnignored, slices) { + if (path15 in cache) { + return cache[path15]; } if (!slices) { - slices = path17.split(SLASH).filter(Boolean); + slices = path15.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path17] = this._rules.test(path17, checkUnignored, MODE_IGNORE); + return cache[path15] = this._rules.test(path15, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -31634,29 +31634,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path17] = parent.ignored ? parent : this._rules.test(path17, checkUnignored, MODE_IGNORE); + return cache[path15] = parent.ignored ? parent : this._rules.test(path15, checkUnignored, MODE_IGNORE); } - ignores(path17) { - return this._test(path17, this._ignoreCache, false).ignored; + ignores(path15) { + return this._test(path15, this._ignoreCache, false).ignored; } createFilter() { - return (path17) => !this.ignores(path17); + return (path15) => !this.ignores(path15); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path17) { - return this._test(path17, this._testCache, true); + test(path15) { + return this._test(path15, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path17) => checkPath(path17 && checkPath.convert(path17), path17, RETURN_FALSE); + var isPathValid = (path15) => checkPath(path15 && checkPath.convert(path15), path15, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path17) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path17) || isNotRelative(path17); + checkPath.isNotRelative = (path15) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path15) || isNotRelative(path15); }; if ( // Detect `process` so that it can run in browsers. @@ -35348,7 +35348,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -35356,7 +35356,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path17.dirname(p); + let result = path15.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -35394,7 +35394,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path17.sep; + root += path15.sep; } return root + itemPath; } @@ -35432,10 +35432,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path17.sep)) { + if (!p.endsWith(path15.sep)) { return p; } - if (p === path17.sep) { + if (p === path15.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -35768,7 +35768,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path17 = (function() { + var path15 = (function() { try { return require("path"); } catch (e) { @@ -35776,7 +35776,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path17.sep; + minimatch.sep = path15.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -35865,8 +35865,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path17.sep !== "/") { - pattern = pattern.split(path17.sep).join("/"); + if (!options.allowWindowsEscape && path15.sep !== "/") { + pattern = pattern.split(path15.sep).join("/"); } this.options = options; this.set = []; @@ -36235,8 +36235,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path17.sep !== "/") { - f = f.split(path17.sep).join("/"); + if (path15.sep !== "/") { + f = f.split(path15.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -36368,7 +36368,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -36383,12 +36383,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path17.sep); + this.segments = itemPath.split(path15.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path17.basename(remaining); + const basename = path15.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -36406,7 +36406,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path17.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path15.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -36417,12 +36417,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path17.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path15.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path17.sep; + result += path15.sep; } result += this.segments[i]; } @@ -36466,7 +36466,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os2 = __importStar4(require("os")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -36495,7 +36495,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path17.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path15.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -36519,8 +36519,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path17.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path17.sep}`; + if (!itemPath.endsWith(path15.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path15.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -36555,9 +36555,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path17.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path15.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path17.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path15.sep}`)) { homedir = homedir || os2.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -36641,8 +36641,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path17, level) { - this.path = path17; + constructor(path15, level) { + this.path = path15; this.level = level; } }; @@ -36764,7 +36764,7 @@ var require_internal_globber = __commonJS({ var core12 = __importStar4(require_core()); var fs14 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -36845,7 +36845,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs14.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path17.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs14.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path15.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -38230,7 +38230,7 @@ var require_cacheUtils = __commonJS({ var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs14 = __importStar4(require("fs")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -38250,9 +38250,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path17.join(baseLocation, "actions", "temp"); + tempDirectory = path15.join(baseLocation, "actions", "temp"); } - const dest = path17.join(tempDirectory, crypto.randomUUID()); + const dest = path15.join(tempDirectory, crypto.randomUUID()); yield io6.mkdirP(dest); return dest; }); @@ -38276,7 +38276,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path17.relative(workspace, file).replace(new RegExp(`\\${path17.sep}`, "g"), "/"); + const relativeFile = path15.relative(workspace, file).replace(new RegExp(`\\${path15.sep}`, "g"), "/"); core12.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -46182,15 +46182,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path17 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path17.startsWith("/")) { - path17 = path17.substring(1); + let path15 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path15.startsWith("/")) { + path15 = path15.substring(1); } - if (isAbsoluteUrl(path17)) { - requestUrl = path17; + if (isAbsoluteUrl(path15)) { + requestUrl = path15; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path17); + requestUrl = appendPath(requestUrl, path15); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -46238,9 +46238,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path17 = pathToAppend.substring(0, searchStart); + const path15 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path17; + newPath = newPath + path15; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -50389,10 +50389,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path17 = urlParsed.pathname; - path17 = path17 || "/"; - path17 = escape(path17); - urlParsed.pathname = path17; + let path15 = urlParsed.pathname; + path15 = path15 || "/"; + path15 = escape(path15); + urlParsed.pathname = path15; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -50477,9 +50477,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path17 = urlParsed.pathname; - path17 = path17 ? path17.endsWith("/") ? `${path17}${name}` : `${path17}/${name}` : name; - urlParsed.pathname = path17; + let path15 = urlParsed.pathname; + path15 = path15 ? path15.endsWith("/") ? `${path15}${name}` : `${path15}/${name}` : name; + urlParsed.pathname = path15; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -51560,9 +51560,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path17 = getURLPath(request.url) || "/"; + const path15 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path17}`; + canonicalizedResourceString += `/${this.factory.accountName}${path15}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -51855,9 +51855,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path17 = getURLPath(request.url) || "/"; + const path15 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path17}`; + canonicalizedResourceString += `/${options.accountName}${path15}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -71159,8 +71159,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path17 = getURLPath(subRequest.url); - if (!path17 || path17 === "") { + const path15 = getURLPath(subRequest.url); + if (!path15 || path15 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -71220,8 +71220,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path17 = getURLPath(url3); - if (path17 && path17 !== "/") { + const path15 = getURLPath(url3); + if (path15 && path15 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -79971,7 +79971,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io6 = __importStar4(require_io()); var fs_1 = require("fs"); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -80017,13 +80017,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path17.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path15.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -80069,7 +80069,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -80078,7 +80078,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path17.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path15.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -80093,7 +80093,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -80102,7 +80102,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path17.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path15.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -80142,7 +80142,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path17.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path15.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -80212,7 +80212,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core12 = __importStar4(require_core()); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -80309,7 +80309,7 @@ var require_cache3 = __commonJS({ core12.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path17.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path15.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core12.isDebug()) { @@ -80378,7 +80378,7 @@ var require_cache3 = __commonJS({ core12.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path17.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path15.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core12.debug(`Archive path: ${archivePath}`); core12.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -80441,7 +80441,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path17.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path15.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -80505,7 +80505,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path17.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path15.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core12.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -80890,7 +80890,7 @@ var require_tool_cache = __commonJS({ var fs14 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os2 = __importStar4(require("os")); - var path17 = __importStar4(require("path")); + var path15 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80911,8 +80911,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path17.join(_getTempDirectory(), crypto.randomUUID()); - yield io6.mkdirP(path17.dirname(dest)); + dest = dest || path15.join(_getTempDirectory(), crypto.randomUUID()); + yield io6.mkdirP(path15.dirname(dest)); core12.debug(`Downloading ${url2}`); core12.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80999,7 +80999,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path17.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path15.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -81175,7 +81175,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs14.readdirSync(sourceDir)) { - const s = path17.join(sourceDir, itemName); + const s = path15.join(sourceDir, itemName); yield io6.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -81193,7 +81193,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path17.join(destFolder, targetFile); + const destPath = path15.join(destFolder, targetFile); core12.debug(`destination file ${destPath}`); yield io6.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81217,7 +81217,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path17.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path15.join(_getCacheDirectory(), toolName, versionSpec, arch2); core12.debug(`checking cache: ${cachePath}`); if (fs14.existsSync(cachePath) && fs14.existsSync(`${cachePath}.complete`)) { core12.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81232,12 +81232,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os2.arch(); - const toolPath = path17.join(_getCacheDirectory(), toolName); + const toolPath = path15.join(_getCacheDirectory(), toolName); if (fs14.existsSync(toolPath)) { const children = fs14.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path17.join(toolPath, child, arch2 || ""); + const fullPath = path15.join(toolPath, child, arch2 || ""); if (fs14.existsSync(fullPath) && fs14.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81292,7 +81292,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path17.join(_getTempDirectory(), crypto.randomUUID()); + dest = path15.join(_getTempDirectory(), crypto.randomUUID()); } yield io6.mkdirP(dest); return dest; @@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path17.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core12.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io6.rmRF(folderPath); @@ -81310,7 +81310,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path17.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path15.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs14.writeFileSync(markerPath, ""); core12.debug("finished caching tool"); @@ -84837,7 +84837,7 @@ __export(upload_lib_exports, { }); module.exports = __toCommonJS(upload_lib_exports); var fs13 = __toESM(require("fs")); -var path16 = __toESM(require("path")); +var path14 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core11 = __toESM(require_core()); @@ -85103,12 +85103,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path17) { - const isExtendedLengthPath = path17.startsWith("\\\\?\\"); +function slash(path15) { + const isExtendedLengthPath = path15.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path17; + return path15; } - return path17.replace(/\\/g, "/"); + return path15.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -85196,8 +85196,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path17 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path2.default.isAbsolute(path17) ? path17 : import_node_path2.default.join(cwd, path17); + const path15 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path2.default.isAbsolute(path15) ? path15 : import_node_path2.default.join(cwd, path15); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -88559,7 +88559,6 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts -var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -88571,7 +88570,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -88580,7 +88579,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -88732,7 +88731,7 @@ function wrapApiConfigurationError(e) { // src/codeql.ts var fs11 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path12 = __toESM(require("path")); var core10 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -88975,7 +88974,7 @@ function wrapCliConfigurationError(cliError) { // src/config-utils.ts var fs7 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path9 = __toESM(require("path")); // src/caching-utils.ts var core6 = __toESM(require_core()); @@ -88991,7 +88990,7 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs6 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path8 = __toESM(require("path")); // src/feature-flags.ts var semver4 = __toESM(require_semver2()); @@ -89002,7 +89001,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs5 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path7 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -89128,8 +89127,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path17 = decodeGitFilePath(match[2]); - fileOidMap[path17] = oid; + const path15 = decodeGitFilePath(match[2]); + fileOidMap[path15] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -89242,7 +89241,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path8.join(config.dbLocation, "base-database-oids.json"); + return path7.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -89252,7 +89251,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path8.join( + const overlayChangesFile = path7.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -89462,7 +89461,7 @@ var featureConfig = { // src/diff-informed-analysis-utils.ts function getDiffRangesJsonFilePath() { - return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path8.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -89507,7 +89506,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path10.join(tempDir, "config"); + return path9.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -89551,7 +89550,7 @@ function appendExtraQueryExclusions(extraQueryExclusions, cliConfig) { // src/setup-codeql.ts var fs10 = __toESM(require("fs")); -var path13 = __toESM(require("path")); +var path11 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -89613,7 +89612,6 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs8 = __toESM(require("fs")); -var path11 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -89762,7 +89760,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (path11.extname(tarPath) === `.${ext}`) { + if (tarPath.endsWith(`.${ext}`)) { return method; } } @@ -89772,7 +89770,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs9 = __toESM(require("fs")); var os = __toESM(require("os")); -var path12 = __toESM(require("path")); +var path10 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core9 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -89905,7 +89903,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path12.join( + return path10.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -90048,7 +90046,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs10.existsSync(path13.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs10.existsSync(path11.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -90386,7 +90384,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path13.join(tempDir, v4_default()); + return path11.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -90457,7 +90455,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path14.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path12.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -90518,7 +90516,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path14.join( + const tracingConfigPath = path12.join( extractorPath, "tools", "tracing-config.lua" @@ -90594,7 +90592,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path14.join( + const autobuildCmd = path12.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -91007,7 +91005,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path14.resolve(config.tempDir, "user-config.yaml"); + return path12.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -92334,10 +92332,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path16.resolve(tempDir, "combined-sarif"); + const baseTempDir = path14.resolve(tempDir, "combined-sarif"); fs13.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs13.mkdtempSync(path16.resolve(baseTempDir, "output-")); - const outputFile = path16.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs13.mkdtempSync(path14.resolve(baseTempDir, "output-")); + const outputFile = path14.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -92370,7 +92368,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path16.join( + const payloadSaveFile = path14.join( getTemporaryDirectory(), "payload.json" ); @@ -92414,9 +92412,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs13.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path16.resolve(dir, entry.name)); + sarifFiles.push(path14.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path16.resolve(dir, entry.name)); + walkSarifFiles(path14.resolve(dir, entry.name)); } } }; @@ -92447,30 +92445,32 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { } const results = {}; if (stats.isDirectory()) { - let sarifFiles = findSarifFilesInDir( + let unassignedSarifFiles = findSarifFilesInDir( sarifPath, - (name) => path16.extname(name) === ".sarif" + (name) => path14.extname(name) === ".sarif" ); logger.debug( - `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` + `Found the following .sarif files in ${sarifPath}: ${unassignedSarifFiles.join(", ")}` ); for (const analysisConfig of SarifScanOrder) { - const files = sarifFiles.filter(analysisConfig.sarifPredicate); - if (files.length > 0) { + const filesForCurrentAnalysis = unassignedSarifFiles.filter( + analysisConfig.sarifPredicate + ); + if (filesForCurrentAnalysis.length > 0) { logger.debug( - `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}` + `The following SARIF files are for ${analysisConfig.name}: ${filesForCurrentAnalysis.join(", ")}` ); - sarifFiles = sarifFiles.filter( + unassignedSarifFiles = unassignedSarifFiles.filter( (name) => !analysisConfig.sarifPredicate(name) ); - results[analysisConfig.kind] = files; + results[analysisConfig.kind] = filesForCurrentAnalysis; } else { logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } - if (sarifFiles.length !== 0) { + if (unassignedSarifFiles.length !== 0) { logger.warning( - `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}` + `Found files in ${sarifPath} which do not belong to any analysis: ${unassignedSarifFiles.join(", ")}` ); } } else { @@ -92683,7 +92683,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path16.resolve( + const outputFile = path14.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -92831,7 +92831,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path16.join(checkoutPath, locationUri).replaceAll(path16.sep, "/"); + const locationPath = path14.join(checkoutPath, locationUri).replaceAll(path14.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index da656b7f07..7885adcf41 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -999,14 +999,14 @@ var require_util = __commonJS({ } const port = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80; let origin = url2.origin != null ? url2.origin : `${url2.protocol}//${url2.hostname}:${port}`; - let path18 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; + let path16 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`; if (origin.endsWith("/")) { origin = origin.substring(0, origin.length - 1); } - if (path18 && !path18.startsWith("/")) { - path18 = `/${path18}`; + if (path16 && !path16.startsWith("/")) { + path16 = `/${path16}`; } - url2 = new URL(origin + path18); + url2 = new URL(origin + path16); } return url2; } @@ -2620,20 +2620,20 @@ var require_parseParams = __commonJS({ var require_basename = __commonJS({ "node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module2) { "use strict"; - module2.exports = function basename(path18) { - if (typeof path18 !== "string") { + module2.exports = function basename(path16) { + if (typeof path16 !== "string") { return ""; } - for (var i = path18.length - 1; i >= 0; --i) { - switch (path18.charCodeAt(i)) { + for (var i = path16.length - 1; i >= 0; --i) { + switch (path16.charCodeAt(i)) { case 47: // '/' case 92: - path18 = path18.slice(i + 1); - return path18 === ".." || path18 === "." ? "" : path18; + path16 = path16.slice(i + 1); + return path16 === ".." || path16 === "." ? "" : path16; } } - return path18 === ".." || path18 === "." ? "" : path18; + return path16 === ".." || path16 === "." ? "" : path16; }; } }); @@ -5663,7 +5663,7 @@ var require_request = __commonJS({ } var Request = class _Request { constructor(origin, { - path: path18, + path: path16, method, body, headers, @@ -5677,11 +5677,11 @@ var require_request = __commonJS({ throwOnError, expectContinue }, handler) { - if (typeof path18 !== "string") { + if (typeof path16 !== "string") { throw new InvalidArgumentError("path must be a string"); - } else if (path18[0] !== "/" && !(path18.startsWith("http://") || path18.startsWith("https://")) && method !== "CONNECT") { + } else if (path16[0] !== "/" && !(path16.startsWith("http://") || path16.startsWith("https://")) && method !== "CONNECT") { throw new InvalidArgumentError("path must be an absolute URL or start with a slash"); - } else if (invalidPathRegex.exec(path18) !== null) { + } else if (invalidPathRegex.exec(path16) !== null) { throw new InvalidArgumentError("invalid request path"); } if (typeof method !== "string") { @@ -5744,7 +5744,7 @@ var require_request = __commonJS({ this.completed = false; this.aborted = false; this.upgrade = upgrade || null; - this.path = query ? util.buildURL(path18, query) : path18; + this.path = query ? util.buildURL(path16, query) : path16; this.origin = origin; this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent; this.blocking = blocking == null ? false : blocking; @@ -6752,9 +6752,9 @@ var require_RedirectHandler = __commonJS({ return this.handler.onHeaders(statusCode, headers, resume, statusText); } const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin))); - const path18 = search ? `${pathname}${search}` : pathname; + const path16 = search ? `${pathname}${search}` : pathname; this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin); - this.opts.path = path18; + this.opts.path = path16; this.opts.origin = origin; this.opts.maxRedirections = 0; this.opts.query = null; @@ -7994,7 +7994,7 @@ var require_client = __commonJS({ writeH2(client, client[kHTTP2Session], request); return; } - const { body, method, path: path18, host, upgrade, headers, blocking, reset } = request; + const { body, method, path: path16, host, upgrade, headers, blocking, reset } = request; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { body.read(0); @@ -8044,7 +8044,7 @@ var require_client = __commonJS({ if (blocking) { socket[kBlocking] = true; } - let header = `${method} ${path18} HTTP/1.1\r + let header = `${method} ${path16} HTTP/1.1\r `; if (typeof host === "string") { header += `host: ${host}\r @@ -8107,7 +8107,7 @@ upgrade: ${upgrade}\r return true; } function writeH2(client, session, request) { - const { body, method, path: path18, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; + const { body, method, path: path16, host, upgrade, expectContinue, signal, headers: reqHeaders } = request; let headers; if (typeof reqHeaders === "string") headers = Request[kHTTP2CopyHeaders](reqHeaders.trim()); else headers = reqHeaders; @@ -8150,7 +8150,7 @@ upgrade: ${upgrade}\r }); return true; } - headers[HTTP2_HEADER_PATH] = path18; + headers[HTTP2_HEADER_PATH] = path16; headers[HTTP2_HEADER_SCHEME] = "https"; const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH"; if (body && typeof body.read === "function") { @@ -10390,20 +10390,20 @@ var require_mock_utils = __commonJS({ } return true; } - function safeUrl(path18) { - if (typeof path18 !== "string") { - return path18; + function safeUrl(path16) { + if (typeof path16 !== "string") { + return path16; } - const pathSegments = path18.split("?"); + const pathSegments = path16.split("?"); if (pathSegments.length !== 2) { - return path18; + return path16; } const qp = new URLSearchParams(pathSegments.pop()); qp.sort(); return [...pathSegments, qp.toString()].join("?"); } - function matchKey(mockDispatch2, { path: path18, method, body, headers }) { - const pathMatch = matchValue(mockDispatch2.path, path18); + function matchKey(mockDispatch2, { path: path16, method, body, headers }) { + const pathMatch = matchValue(mockDispatch2.path, path16); const methodMatch = matchValue(mockDispatch2.method, method); const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true; const headersMatch = matchHeaders(mockDispatch2, headers); @@ -10421,7 +10421,7 @@ var require_mock_utils = __commonJS({ function getMockDispatch(mockDispatches, key) { const basePath = key.query ? buildURL(key.path, key.query) : key.path; const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath; - let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path18 }) => matchValue(safeUrl(path18), resolvedPath)); + let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path16 }) => matchValue(safeUrl(path16), resolvedPath)); if (matchedMockDispatches.length === 0) { throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`); } @@ -10458,9 +10458,9 @@ var require_mock_utils = __commonJS({ } } function buildKey(opts) { - const { path: path18, method, body, headers, query } = opts; + const { path: path16, method, body, headers, query } = opts; return { - path: path18, + path: path16, method, body, headers, @@ -10909,10 +10909,10 @@ var require_pending_interceptors_formatter = __commonJS({ } format(pendingInterceptors) { const withPrettyHeaders = pendingInterceptors.map( - ({ method, path: path18, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ + ({ method, path: path16, data: { statusCode }, persist, times, timesInvoked, origin }) => ({ Method: method, Origin: origin, - Path: path18, + Path: path16, "Status code": statusCode, Persistent: persist ? "\u2705" : "\u274C", Invocations: timesInvoked, @@ -15532,8 +15532,8 @@ var require_util6 = __commonJS({ } } } - function validateCookiePath(path18) { - for (const char of path18) { + function validateCookiePath(path16) { + for (const char of path16) { const code = char.charCodeAt(0); if (code < 33 || char === ";") { throw new Error("Invalid cookie path"); @@ -17213,11 +17213,11 @@ var require_undici = __commonJS({ if (typeof opts.path !== "string") { throw new InvalidArgumentError("invalid opts.path"); } - let path18 = opts.path; + let path16 = opts.path; if (!opts.path.startsWith("/")) { - path18 = `/${path18}`; + path16 = `/${path16}`; } - url2 = new URL(util.parseOrigin(url2).origin + path18); + url2 = new URL(util.parseOrigin(url2).origin + path16); } else { if (!opts) { opts = typeof url2 === "object" ? url2 : {}; @@ -18440,7 +18440,7 @@ var require_path_utils = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.toPlatformPath = exports2.toWin32Path = exports2.toPosixPath = void 0; - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); function toPosixPath(pth) { return pth.replace(/[\\]/g, "/"); } @@ -18450,7 +18450,7 @@ var require_path_utils = __commonJS({ } exports2.toWin32Path = toWin32Path; function toPlatformPath(pth) { - return pth.replace(/[/\\]/g, path18.sep); + return pth.replace(/[/\\]/g, path16.sep); } exports2.toPlatformPath = toPlatformPath; } @@ -18514,7 +18514,7 @@ var require_io_util = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.getCmdPath = exports2.tryGetExecutablePath = exports2.isRooted = exports2.isDirectory = exports2.exists = exports2.READONLY = exports2.UV_FS_O_EXLOCK = exports2.IS_WINDOWS = exports2.unlink = exports2.symlink = exports2.stat = exports2.rmdir = exports2.rm = exports2.rename = exports2.readlink = exports2.readdir = exports2.open = exports2.mkdir = exports2.lstat = exports2.copyFile = exports2.chmod = void 0; var fs15 = __importStar4(require("fs")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); _a = fs15.promises, exports2.chmod = _a.chmod, exports2.copyFile = _a.copyFile, exports2.lstat = _a.lstat, exports2.mkdir = _a.mkdir, exports2.open = _a.open, exports2.readdir = _a.readdir, exports2.readlink = _a.readlink, exports2.rename = _a.rename, exports2.rm = _a.rm, exports2.rmdir = _a.rmdir, exports2.stat = _a.stat, exports2.symlink = _a.symlink, exports2.unlink = _a.unlink; exports2.IS_WINDOWS = process.platform === "win32"; exports2.UV_FS_O_EXLOCK = 268435456; @@ -18563,7 +18563,7 @@ var require_io_util = __commonJS({ } if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { - const upperExt = path18.extname(filePath).toUpperCase(); + const upperExt = path16.extname(filePath).toUpperCase(); if (extensions.some((validExt) => validExt.toUpperCase() === upperExt)) { return filePath; } @@ -18587,11 +18587,11 @@ var require_io_util = __commonJS({ if (stats && stats.isFile()) { if (exports2.IS_WINDOWS) { try { - const directory = path18.dirname(filePath); - const upperName = path18.basename(filePath).toUpperCase(); + const directory = path16.dirname(filePath); + const upperName = path16.basename(filePath).toUpperCase(); for (const actualName of yield exports2.readdir(directory)) { if (upperName === actualName.toUpperCase()) { - filePath = path18.join(directory, actualName); + filePath = path16.join(directory, actualName); break; } } @@ -18686,7 +18686,7 @@ var require_io = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.findInPath = exports2.which = exports2.mkdirP = exports2.rmRF = exports2.mv = exports2.cp = void 0; var assert_1 = require("assert"); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var ioUtil = __importStar4(require_io_util()); function cp(source, dest, options = {}) { return __awaiter4(this, void 0, void 0, function* () { @@ -18695,7 +18695,7 @@ var require_io = __commonJS({ if (destStat && destStat.isFile() && !force) { return; } - const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path18.join(dest, path18.basename(source)) : dest; + const newDest = destStat && destStat.isDirectory() && copySourceDirectory ? path16.join(dest, path16.basename(source)) : dest; if (!(yield ioUtil.exists(source))) { throw new Error(`no such file or directory: ${source}`); } @@ -18707,7 +18707,7 @@ var require_io = __commonJS({ yield cpDirRecursive(source, newDest, 0, force); } } else { - if (path18.relative(source, newDest) === "") { + if (path16.relative(source, newDest) === "") { throw new Error(`'${newDest}' and '${source}' are the same file`); } yield copyFile(source, newDest, force); @@ -18720,7 +18720,7 @@ var require_io = __commonJS({ if (yield ioUtil.exists(dest)) { let destExists = true; if (yield ioUtil.isDirectory(dest)) { - dest = path18.join(dest, path18.basename(source)); + dest = path16.join(dest, path16.basename(source)); destExists = yield ioUtil.exists(dest); } if (destExists) { @@ -18731,7 +18731,7 @@ var require_io = __commonJS({ } } } - yield mkdirP(path18.dirname(dest)); + yield mkdirP(path16.dirname(dest)); yield ioUtil.rename(source, dest); }); } @@ -18794,7 +18794,7 @@ var require_io = __commonJS({ } const extensions = []; if (ioUtil.IS_WINDOWS && process.env["PATHEXT"]) { - for (const extension of process.env["PATHEXT"].split(path18.delimiter)) { + for (const extension of process.env["PATHEXT"].split(path16.delimiter)) { if (extension) { extensions.push(extension); } @@ -18807,12 +18807,12 @@ var require_io = __commonJS({ } return []; } - if (tool.includes(path18.sep)) { + if (tool.includes(path16.sep)) { return []; } const directories = []; if (process.env.PATH) { - for (const p of process.env.PATH.split(path18.delimiter)) { + for (const p of process.env.PATH.split(path16.delimiter)) { if (p) { directories.push(p); } @@ -18820,7 +18820,7 @@ var require_io = __commonJS({ } const matches = []; for (const directory of directories) { - const filePath = yield ioUtil.tryGetExecutablePath(path18.join(directory, tool), extensions); + const filePath = yield ioUtil.tryGetExecutablePath(path16.join(directory, tool), extensions); if (filePath) { matches.push(filePath); } @@ -18936,7 +18936,7 @@ var require_toolrunner = __commonJS({ var os3 = __importStar4(require("os")); var events = __importStar4(require("events")); var child = __importStar4(require("child_process")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var io6 = __importStar4(require_io()); var ioUtil = __importStar4(require_io_util()); var timers_1 = require("timers"); @@ -19151,7 +19151,7 @@ var require_toolrunner = __commonJS({ exec() { return __awaiter4(this, void 0, void 0, function* () { if (!ioUtil.isRooted(this.toolPath) && (this.toolPath.includes("/") || IS_WINDOWS && this.toolPath.includes("\\"))) { - this.toolPath = path18.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); + this.toolPath = path16.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io6.which(this.toolPath, true); return new Promise((resolve6, reject) => __awaiter4(this, void 0, void 0, function* () { @@ -19651,7 +19651,7 @@ var require_core = __commonJS({ var file_command_1 = require_file_command(); var utils_1 = require_utils(); var os3 = __importStar4(require("os")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var oidc_utils_1 = require_oidc_utils(); var ExitCode; (function(ExitCode2) { @@ -19679,7 +19679,7 @@ var require_core = __commonJS({ } else { (0, command_1.issueCommand)("add-path", {}, inputPath); } - process.env["PATH"] = `${inputPath}${path18.delimiter}${process.env["PATH"]}`; + process.env["PATH"] = `${inputPath}${path16.delimiter}${process.env["PATH"]}`; } exports2.addPath = addPath; function getInput2(name, options) { @@ -19835,8 +19835,8 @@ var require_context = __commonJS({ if ((0, fs_1.existsSync)(process.env.GITHUB_EVENT_PATH)) { this.payload = JSON.parse((0, fs_1.readFileSync)(process.env.GITHUB_EVENT_PATH, { encoding: "utf8" })); } else { - const path18 = process.env.GITHUB_EVENT_PATH; - process.stdout.write(`GITHUB_EVENT_PATH ${path18} does not exist${os_1.EOL}`); + const path16 = process.env.GITHUB_EVENT_PATH; + process.stdout.write(`GITHUB_EVENT_PATH ${path16} does not exist${os_1.EOL}`); } } this.eventName = process.env.GITHUB_EVENT_NAME; @@ -24597,7 +24597,7 @@ var require_path = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0; var os3 = require("os"); - var path18 = require("path"); + var path16 = require("path"); var IS_WINDOWS_PLATFORM = os3.platform() === "win32"; var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2; var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g; @@ -24609,7 +24609,7 @@ var require_path = __commonJS({ } exports2.unixify = unixify; function makeAbsolute(cwd, filepath) { - return path18.resolve(cwd, filepath); + return path16.resolve(cwd, filepath); } exports2.makeAbsolute = makeAbsolute; function removeLeadingDotSegment(entry) { @@ -25906,7 +25906,7 @@ var require_braces = __commonJS({ var require_constants7 = __commonJS({ "node_modules/picomatch/lib/constants.js"(exports2, module2) { "use strict"; - var path18 = require("path"); + var path16 = require("path"); var WIN_SLASH = "\\\\/"; var WIN_NO_SLASH = `[^${WIN_SLASH}]`; var DOT_LITERAL = "\\."; @@ -26076,7 +26076,7 @@ var require_constants7 = __commonJS({ /* | */ CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */ - SEP: path18.sep, + SEP: path16.sep, /** * Create EXTGLOB_CHARS */ @@ -26103,7 +26103,7 @@ var require_constants7 = __commonJS({ var require_utils6 = __commonJS({ "node_modules/picomatch/lib/utils.js"(exports2) { "use strict"; - var path18 = require("path"); + var path16 = require("path"); var win32 = process.platform === "win32"; var { REGEX_BACKSLASH, @@ -26132,7 +26132,7 @@ var require_utils6 = __commonJS({ if (options && typeof options.windows === "boolean") { return options.windows; } - return win32 === true || path18.sep === "\\"; + return win32 === true || path16.sep === "\\"; }; exports2.escapeLast = (input, char, lastIdx) => { const idx = input.lastIndexOf(char, lastIdx); @@ -27267,7 +27267,7 @@ var require_parse3 = __commonJS({ var require_picomatch = __commonJS({ "node_modules/picomatch/lib/picomatch.js"(exports2, module2) { "use strict"; - var path18 = require("path"); + var path16 = require("path"); var scan = require_scan(); var parse = require_parse3(); var utils = require_utils6(); @@ -27352,7 +27352,7 @@ var require_picomatch = __commonJS({ }; picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => { const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options); - return regex.test(path18.basename(input)); + return regex.test(path16.basename(input)); }; picomatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2); picomatch.parse = (pattern, options) => { @@ -27579,7 +27579,7 @@ var require_pattern = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.isAbsolute = exports2.partitionAbsoluteAndRelative = exports2.removeDuplicateSlashes = exports2.matchAny = exports2.convertPatternsToRe = exports2.makeRe = exports2.getPatternParts = exports2.expandBraceExpansion = exports2.expandPatternsWithBraceExpansion = exports2.isAffectDepthOfReadingPattern = exports2.endsWithSlashGlobStar = exports2.hasGlobStar = exports2.getBaseDirectory = exports2.isPatternRelatedToParentDirectory = exports2.getPatternsOutsideCurrentDirectory = exports2.getPatternsInsideCurrentDirectory = exports2.getPositivePatterns = exports2.getNegativePatterns = exports2.isPositivePattern = exports2.isNegativePattern = exports2.convertToNegativePattern = exports2.convertToPositivePattern = exports2.isDynamicPattern = exports2.isStaticPattern = void 0; - var path18 = require("path"); + var path16 = require("path"); var globParent = require_glob_parent(); var micromatch = require_micromatch(); var GLOBSTAR = "**"; @@ -27674,7 +27674,7 @@ var require_pattern = __commonJS({ } exports2.endsWithSlashGlobStar = endsWithSlashGlobStar; function isAffectDepthOfReadingPattern(pattern) { - const basename = path18.basename(pattern); + const basename = path16.basename(pattern); return endsWithSlashGlobStar(pattern) || isStaticPattern(basename); } exports2.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern; @@ -27732,7 +27732,7 @@ var require_pattern = __commonJS({ } exports2.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative; function isAbsolute2(pattern) { - return path18.isAbsolute(pattern); + return path16.isAbsolute(pattern); } exports2.isAbsolute = isAbsolute2; } @@ -27909,8 +27909,8 @@ var require_utils7 = __commonJS({ exports2.errno = errno; var fs15 = require_fs(); exports2.fs = fs15; - var path18 = require_path(); - exports2.path = path18; + var path16 = require_path(); + exports2.path = path16; var pattern = require_pattern(); exports2.pattern = pattern; var stream2 = require_stream(); @@ -28022,8 +28022,8 @@ var require_async = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path18, settings, callback) { - settings.fs.lstat(path18, (lstatError, lstat) => { + function read(path16, settings, callback) { + settings.fs.lstat(path16, (lstatError, lstat) => { if (lstatError !== null) { callFailureCallback(callback, lstatError); return; @@ -28032,7 +28032,7 @@ var require_async = __commonJS({ callSuccessCallback(callback, lstat); return; } - settings.fs.stat(path18, (statError, stat) => { + settings.fs.stat(path16, (statError, stat) => { if (statError !== null) { if (settings.throwErrorOnBrokenSymbolicLink) { callFailureCallback(callback, statError); @@ -28064,13 +28064,13 @@ var require_sync = __commonJS({ "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.read = void 0; - function read(path18, settings) { - const lstat = settings.fs.lstatSync(path18); + function read(path16, settings) { + const lstat = settings.fs.lstatSync(path16); if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) { return lstat; } try { - const stat = settings.fs.statSync(path18); + const stat = settings.fs.statSync(path16); if (settings.markSymbolicLink) { stat.isSymbolicLink = () => true; } @@ -28141,17 +28141,17 @@ var require_out = __commonJS({ var sync = require_sync(); var settings_1 = require_settings(); exports2.Settings = settings_1.default; - function stat(path18, optionsOrSettingsOrCallback, callback) { + function stat(path16, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path18, getSettings(), optionsOrSettingsOrCallback); + async.read(path16, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path18, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path16, getSettings(optionsOrSettingsOrCallback), callback); } exports2.stat = stat; - function statSync3(path18, optionsOrSettings) { + function statSync3(path16, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path18, settings); + return sync.read(path16, settings); } exports2.statSync = statSync3; function getSettings(settingsOrOptions = {}) { @@ -28367,16 +28367,16 @@ var require_async2 = __commonJS({ return; } const tasks = names.map((name) => { - const path18 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); + const path16 = common2.joinPathSegments(directory, name, settings.pathSegmentSeparator); return (done) => { - fsStat.stat(path18, settings.fsStatSettings, (error2, stats) => { + fsStat.stat(path16, settings.fsStatSettings, (error2, stats) => { if (error2 !== null) { done(error2); return; } const entry = { name, - path: path18, + path: path16, dirent: utils.fs.createDirentFromStats(name, stats) }; if (settings.stats) { @@ -28494,7 +28494,7 @@ var require_settings2 = __commonJS({ "node_modules/@nodelib/fs.scandir/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path18 = require("path"); + var path16 = require("path"); var fsStat = require_out(); var fs15 = require_fs4(); var Settings = class { @@ -28502,7 +28502,7 @@ var require_settings2 = __commonJS({ this._options = _options; this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false); this.fs = fs15.createFileSystemAdapter(this._options.fs); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path18.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path16.sep); this.stats = this._getValue(this._options.stats, false); this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true); this.fsStatSettings = new fsStat.Settings({ @@ -28529,17 +28529,17 @@ var require_out2 = __commonJS({ var sync = require_sync2(); var settings_1 = require_settings2(); exports2.Settings = settings_1.default; - function scandir(path18, optionsOrSettingsOrCallback, callback) { + function scandir(path16, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === "function") { - async.read(path18, getSettings(), optionsOrSettingsOrCallback); + async.read(path16, getSettings(), optionsOrSettingsOrCallback); return; } - async.read(path18, getSettings(optionsOrSettingsOrCallback), callback); + async.read(path16, getSettings(optionsOrSettingsOrCallback), callback); } exports2.scandir = scandir; - function scandirSync(path18, optionsOrSettings) { + function scandirSync(path16, optionsOrSettings) { const settings = getSettings(optionsOrSettings); - return sync.read(path18, settings); + return sync.read(path16, settings); } exports2.scandirSync = scandirSync; function getSettings(settingsOrOptions = {}) { @@ -29066,7 +29066,7 @@ var require_settings3 = __commonJS({ "node_modules/@nodelib/fs.walk/out/settings.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path18 = require("path"); + var path16 = require("path"); var fsScandir = require_out2(); var Settings = class { constructor(_options = {}) { @@ -29076,7 +29076,7 @@ var require_settings3 = __commonJS({ this.deepFilter = this._getValue(this._options.deepFilter, null); this.entryFilter = this._getValue(this._options.entryFilter, null); this.errorFilter = this._getValue(this._options.errorFilter, null); - this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path18.sep); + this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path16.sep); this.fsScandirSettings = new fsScandir.Settings({ followSymbolicLinks: this._options.followSymbolicLinks, fs: this._options.fs, @@ -29138,7 +29138,7 @@ var require_reader2 = __commonJS({ "node_modules/fast-glob/out/readers/reader.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path18 = require("path"); + var path16 = require("path"); var fsStat = require_out(); var utils = require_utils7(); var Reader = class { @@ -29151,7 +29151,7 @@ var require_reader2 = __commonJS({ }); } _getFullEntryPath(filepath) { - return path18.resolve(this._settings.cwd, filepath); + return path16.resolve(this._settings.cwd, filepath); } _makeEntry(stats, pattern) { const entry = { @@ -29567,7 +29567,7 @@ var require_provider = __commonJS({ "node_modules/fast-glob/out/providers/provider.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - var path18 = require("path"); + var path16 = require("path"); var deep_1 = require_deep(); var entry_1 = require_entry(); var error_1 = require_error(); @@ -29581,7 +29581,7 @@ var require_provider = __commonJS({ this.entryTransformer = new entry_2.default(this._settings); } _getRootDirectory(task) { - return path18.resolve(this._settings.cwd, task.base); + return path16.resolve(this._settings.cwd, task.base); } _getReaderOptions(task) { const basePath = task.base === "." ? "" : task.base; @@ -30214,7 +30214,7 @@ var require_ignore = __commonJS({ // path matching. // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE` // @returns {TestResult} true if a file is ignored - test(path18, checkUnignored, mode) { + test(path16, checkUnignored, mode) { let ignored = false; let unignored = false; let matchedRule; @@ -30223,7 +30223,7 @@ var require_ignore = __commonJS({ if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) { return; } - const matched = rule[mode].test(path18); + const matched = rule[mode].test(path16); if (!matched) { return; } @@ -30244,17 +30244,17 @@ var require_ignore = __commonJS({ var throwError2 = (message, Ctor) => { throw new Ctor(message); }; - var checkPath = (path18, originalPath, doThrow) => { - if (!isString(path18)) { + var checkPath = (path16, originalPath, doThrow) => { + if (!isString(path16)) { return doThrow( `path must be a string, but got \`${originalPath}\``, TypeError ); } - if (!path18) { + if (!path16) { return doThrow(`path must not be empty`, TypeError); } - if (checkPath.isNotRelative(path18)) { + if (checkPath.isNotRelative(path16)) { const r = "`path.relative()`d"; return doThrow( `path should be a ${r} string, but got "${originalPath}"`, @@ -30263,7 +30263,7 @@ var require_ignore = __commonJS({ } return true; }; - var isNotRelative = (path18) => REGEX_TEST_INVALID_PATH.test(path18); + var isNotRelative = (path16) => REGEX_TEST_INVALID_PATH.test(path16); checkPath.isNotRelative = isNotRelative; checkPath.convert = (p) => p; var Ignore = class { @@ -30293,19 +30293,19 @@ var require_ignore = __commonJS({ } // @returns {TestResult} _test(originalPath, cache, checkUnignored, slices) { - const path18 = originalPath && checkPath.convert(originalPath); + const path16 = originalPath && checkPath.convert(originalPath); checkPath( - path18, + path16, originalPath, this._strictPathCheck ? throwError2 : RETURN_FALSE ); - return this._t(path18, cache, checkUnignored, slices); + return this._t(path16, cache, checkUnignored, slices); } - checkIgnore(path18) { - if (!REGEX_TEST_TRAILING_SLASH.test(path18)) { - return this.test(path18); + checkIgnore(path16) { + if (!REGEX_TEST_TRAILING_SLASH.test(path16)) { + return this.test(path16); } - const slices = path18.split(SLASH).filter(Boolean); + const slices = path16.split(SLASH).filter(Boolean); slices.pop(); if (slices.length) { const parent = this._t( @@ -30318,18 +30318,18 @@ var require_ignore = __commonJS({ return parent; } } - return this._rules.test(path18, false, MODE_CHECK_IGNORE); + return this._rules.test(path16, false, MODE_CHECK_IGNORE); } - _t(path18, cache, checkUnignored, slices) { - if (path18 in cache) { - return cache[path18]; + _t(path16, cache, checkUnignored, slices) { + if (path16 in cache) { + return cache[path16]; } if (!slices) { - slices = path18.split(SLASH).filter(Boolean); + slices = path16.split(SLASH).filter(Boolean); } slices.pop(); if (!slices.length) { - return cache[path18] = this._rules.test(path18, checkUnignored, MODE_IGNORE); + return cache[path16] = this._rules.test(path16, checkUnignored, MODE_IGNORE); } const parent = this._t( slices.join(SLASH) + SLASH, @@ -30337,29 +30337,29 @@ var require_ignore = __commonJS({ checkUnignored, slices ); - return cache[path18] = parent.ignored ? parent : this._rules.test(path18, checkUnignored, MODE_IGNORE); + return cache[path16] = parent.ignored ? parent : this._rules.test(path16, checkUnignored, MODE_IGNORE); } - ignores(path18) { - return this._test(path18, this._ignoreCache, false).ignored; + ignores(path16) { + return this._test(path16, this._ignoreCache, false).ignored; } createFilter() { - return (path18) => !this.ignores(path18); + return (path16) => !this.ignores(path16); } filter(paths) { return makeArray(paths).filter(this.createFilter()); } // @returns {TestResult} - test(path18) { - return this._test(path18, this._testCache, true); + test(path16) { + return this._test(path16, this._testCache, true); } }; var factory = (options) => new Ignore(options); - var isPathValid = (path18) => checkPath(path18 && checkPath.convert(path18), path18, RETURN_FALSE); + var isPathValid = (path16) => checkPath(path16 && checkPath.convert(path16), path16, RETURN_FALSE); var setupWindows = () => { const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/"); checkPath.convert = makePosix; const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i; - checkPath.isNotRelative = (path18) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path18) || isNotRelative(path18); + checkPath.isNotRelative = (path16) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path16) || isNotRelative(path16); }; if ( // Detect `process` so that it can run in browsers. @@ -34051,7 +34051,7 @@ var require_internal_path_helper = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.safeTrimTrailingSeparator = exports2.normalizeSeparators = exports2.hasRoot = exports2.hasAbsoluteRoot = exports2.ensureAbsoluteRoot = exports2.dirname = void 0; - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; function dirname3(p) { @@ -34059,7 +34059,7 @@ var require_internal_path_helper = __commonJS({ if (IS_WINDOWS && /^\\\\[^\\]+(\\[^\\]+)?$/.test(p)) { return p; } - let result = path18.dirname(p); + let result = path16.dirname(p); if (IS_WINDOWS && /^\\\\[^\\]+\\[^\\]+\\$/.test(result)) { result = safeTrimTrailingSeparator(result); } @@ -34097,7 +34097,7 @@ var require_internal_path_helper = __commonJS({ assert_1.default(hasAbsoluteRoot(root), `ensureAbsoluteRoot parameter 'root' must have an absolute root`); if (root.endsWith("/") || IS_WINDOWS && root.endsWith("\\")) { } else { - root += path18.sep; + root += path16.sep; } return root + itemPath; } @@ -34135,10 +34135,10 @@ var require_internal_path_helper = __commonJS({ return ""; } p = normalizeSeparators(p); - if (!p.endsWith(path18.sep)) { + if (!p.endsWith(path16.sep)) { return p; } - if (p === path18.sep) { + if (p === path16.sep) { return p; } if (IS_WINDOWS && /^[A-Z]:\\$/i.test(p)) { @@ -34471,7 +34471,7 @@ var require_minimatch = __commonJS({ "node_modules/minimatch/minimatch.js"(exports2, module2) { module2.exports = minimatch; minimatch.Minimatch = Minimatch; - var path18 = (function() { + var path16 = (function() { try { return require("path"); } catch (e) { @@ -34479,7 +34479,7 @@ var require_minimatch = __commonJS({ })() || { sep: "/" }; - minimatch.sep = path18.sep; + minimatch.sep = path16.sep; var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}; var expand = require_brace_expansion(); var plTypes = { @@ -34568,8 +34568,8 @@ var require_minimatch = __commonJS({ assertValidPattern(pattern); if (!options) options = {}; pattern = pattern.trim(); - if (!options.allowWindowsEscape && path18.sep !== "/") { - pattern = pattern.split(path18.sep).join("/"); + if (!options.allowWindowsEscape && path16.sep !== "/") { + pattern = pattern.split(path16.sep).join("/"); } this.options = options; this.set = []; @@ -34938,8 +34938,8 @@ var require_minimatch = __commonJS({ if (this.empty) return f === ""; if (f === "/" && partial) return true; var options = this.options; - if (path18.sep !== "/") { - f = f.split(path18.sep).join("/"); + if (path16.sep !== "/") { + f = f.split(path16.sep).join("/"); } f = f.split(slashSplit); this.debug(this.pattern, "split", f); @@ -35071,7 +35071,7 @@ var require_internal_path = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Path = void 0; - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var IS_WINDOWS = process.platform === "win32"; @@ -35086,12 +35086,12 @@ var require_internal_path = __commonJS({ assert_1.default(itemPath, `Parameter 'itemPath' must not be empty`); itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); if (!pathHelper.hasRoot(itemPath)) { - this.segments = itemPath.split(path18.sep); + this.segments = itemPath.split(path16.sep); } else { let remaining = itemPath; let dir = pathHelper.dirname(remaining); while (dir !== remaining) { - const basename = path18.basename(remaining); + const basename = path16.basename(remaining); this.segments.unshift(basename); remaining = dir; dir = pathHelper.dirname(remaining); @@ -35109,7 +35109,7 @@ var require_internal_path = __commonJS({ assert_1.default(segment === pathHelper.dirname(segment), `Parameter 'itemPath' root segment contains information for multiple segments`); this.segments.push(segment); } else { - assert_1.default(!segment.includes(path18.sep), `Parameter 'itemPath' contains unexpected path separators`); + assert_1.default(!segment.includes(path16.sep), `Parameter 'itemPath' contains unexpected path separators`); this.segments.push(segment); } } @@ -35120,12 +35120,12 @@ var require_internal_path = __commonJS({ */ toString() { let result = this.segments[0]; - let skipSlash = result.endsWith(path18.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); + let skipSlash = result.endsWith(path16.sep) || IS_WINDOWS && /^[A-Z]:$/i.test(result); for (let i = 1; i < this.segments.length; i++) { if (skipSlash) { skipSlash = false; } else { - result += path18.sep; + result += path16.sep; } result += this.segments[i]; } @@ -35169,7 +35169,7 @@ var require_internal_pattern = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; var os3 = __importStar4(require("os")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var pathHelper = __importStar4(require_internal_path_helper()); var assert_1 = __importDefault4(require("assert")); var minimatch_1 = require_minimatch(); @@ -35198,7 +35198,7 @@ var require_internal_pattern = __commonJS({ } pattern = _Pattern.fixupPattern(pattern, homedir); this.segments = new internal_path_1.Path(pattern).segments; - this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path18.sep); + this.trailingSeparator = pathHelper.normalizeSeparators(pattern).endsWith(path16.sep); pattern = pathHelper.safeTrimTrailingSeparator(pattern); let foundGlob = false; const searchSegments = this.segments.map((x) => _Pattern.getLiteral(x)).filter((x) => !foundGlob && !(foundGlob = x === "")); @@ -35222,8 +35222,8 @@ var require_internal_pattern = __commonJS({ match(itemPath) { if (this.segments[this.segments.length - 1] === "**") { itemPath = pathHelper.normalizeSeparators(itemPath); - if (!itemPath.endsWith(path18.sep) && this.isImplicitPattern === false) { - itemPath = `${itemPath}${path18.sep}`; + if (!itemPath.endsWith(path16.sep) && this.isImplicitPattern === false) { + itemPath = `${itemPath}${path16.sep}`; } } else { itemPath = pathHelper.safeTrimTrailingSeparator(itemPath); @@ -35258,9 +35258,9 @@ var require_internal_pattern = __commonJS({ assert_1.default(literalSegments.every((x, i) => (x !== "." || i === 0) && x !== ".."), `Invalid pattern '${pattern}'. Relative pathing '.' and '..' is not allowed.`); assert_1.default(!pathHelper.hasRoot(pattern) || literalSegments[0], `Invalid pattern '${pattern}'. Root segment must not contain globs.`); pattern = pathHelper.normalizeSeparators(pattern); - if (pattern === "." || pattern.startsWith(`.${path18.sep}`)) { + if (pattern === "." || pattern.startsWith(`.${path16.sep}`)) { pattern = _Pattern.globEscape(process.cwd()) + pattern.substr(1); - } else if (pattern === "~" || pattern.startsWith(`~${path18.sep}`)) { + } else if (pattern === "~" || pattern.startsWith(`~${path16.sep}`)) { homedir = homedir || os3.homedir(); assert_1.default(homedir, "Unable to determine HOME directory"); assert_1.default(pathHelper.hasAbsoluteRoot(homedir), `Expected HOME directory to be a rooted path. Actual '${homedir}'`); @@ -35344,8 +35344,8 @@ var require_internal_search_state = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.SearchState = void 0; var SearchState = class { - constructor(path18, level) { - this.path = path18; + constructor(path16, level) { + this.path = path16; this.level = level; } }; @@ -35467,7 +35467,7 @@ var require_internal_globber = __commonJS({ var core14 = __importStar4(require_core()); var fs15 = __importStar4(require("fs")); var globOptionsHelper = __importStar4(require_internal_glob_options_helper()); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var patternHelper = __importStar4(require_internal_pattern_helper()); var internal_match_kind_1 = require_internal_match_kind(); var internal_pattern_1 = require_internal_pattern(); @@ -35548,7 +35548,7 @@ var require_internal_globber = __commonJS({ continue; } const childLevel = item.level + 1; - const childItems = (yield __await4(fs15.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path18.join(item.path, x), childLevel)); + const childItems = (yield __await4(fs15.promises.readdir(item.path))).map((x) => new internal_search_state_1.SearchState(path16.join(item.path, x), childLevel)); stack.push(...childItems.reverse()); } else if (match & internal_match_kind_1.MatchKind.File) { yield yield __await4(item.path); @@ -36933,7 +36933,7 @@ var require_cacheUtils = __commonJS({ var io6 = __importStar4(require_io()); var crypto = __importStar4(require("crypto")); var fs15 = __importStar4(require("fs")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var semver8 = __importStar4(require_semver3()); var util = __importStar4(require("util")); var constants_1 = require_constants10(); @@ -36953,9 +36953,9 @@ var require_cacheUtils = __commonJS({ baseLocation = "/home"; } } - tempDirectory = path18.join(baseLocation, "actions", "temp"); + tempDirectory = path16.join(baseLocation, "actions", "temp"); } - const dest = path18.join(tempDirectory, crypto.randomUUID()); + const dest = path16.join(tempDirectory, crypto.randomUUID()); yield io6.mkdirP(dest); return dest; }); @@ -36979,7 +36979,7 @@ var require_cacheUtils = __commonJS({ _c = _g.value; _e = false; const file = _c; - const relativeFile = path18.relative(workspace, file).replace(new RegExp(`\\${path18.sep}`, "g"), "/"); + const relativeFile = path16.relative(workspace, file).replace(new RegExp(`\\${path16.sep}`, "g"), "/"); core14.debug(`Matched: ${relativeFile}`); if (relativeFile === "") { paths.push("."); @@ -44885,15 +44885,15 @@ var require_urlHelpers = __commonJS({ let isAbsolutePath = false; let requestUrl = replaceAll(baseUri, urlReplacements); if (operationSpec.path) { - let path18 = replaceAll(operationSpec.path, urlReplacements); - if (operationSpec.path === "/{nextLink}" && path18.startsWith("/")) { - path18 = path18.substring(1); + let path16 = replaceAll(operationSpec.path, urlReplacements); + if (operationSpec.path === "/{nextLink}" && path16.startsWith("/")) { + path16 = path16.substring(1); } - if (isAbsoluteUrl(path18)) { - requestUrl = path18; + if (isAbsoluteUrl(path16)) { + requestUrl = path16; isAbsolutePath = true; } else { - requestUrl = appendPath(requestUrl, path18); + requestUrl = appendPath(requestUrl, path16); } } const { queryParams, sequenceParams } = calculateQueryParameters(operationSpec, operationArguments, fallbackObject); @@ -44941,9 +44941,9 @@ var require_urlHelpers = __commonJS({ } const searchStart = pathToAppend.indexOf("?"); if (searchStart !== -1) { - const path18 = pathToAppend.substring(0, searchStart); + const path16 = pathToAppend.substring(0, searchStart); const search = pathToAppend.substring(searchStart + 1); - newPath = newPath + path18; + newPath = newPath + path16; if (search) { parsedUrl.search = parsedUrl.search ? `${parsedUrl.search}&${search}` : search; } @@ -49092,10 +49092,10 @@ var require_dist7 = __commonJS({ ]; function escapeURLPath(url3) { const urlParsed = new URL(url3); - let path18 = urlParsed.pathname; - path18 = path18 || "/"; - path18 = escape(path18); - urlParsed.pathname = path18; + let path16 = urlParsed.pathname; + path16 = path16 || "/"; + path16 = escape(path16); + urlParsed.pathname = path16; return urlParsed.toString(); } function getProxyUriFromDevConnString(connectionString) { @@ -49180,9 +49180,9 @@ var require_dist7 = __commonJS({ } function appendToURLPath(url3, name) { const urlParsed = new URL(url3); - let path18 = urlParsed.pathname; - path18 = path18 ? path18.endsWith("/") ? `${path18}${name}` : `${path18}/${name}` : name; - urlParsed.pathname = path18; + let path16 = urlParsed.pathname; + path16 = path16 ? path16.endsWith("/") ? `${path16}${name}` : `${path16}/${name}` : name; + urlParsed.pathname = path16; return urlParsed.toString(); } function setURLParameter(url3, name, value) { @@ -50263,9 +50263,9 @@ var require_dist7 = __commonJS({ * @param request - */ getCanonicalizedResourceString(request) { - const path18 = getURLPath(request.url) || "/"; + const path16 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${this.factory.accountName}${path18}`; + canonicalizedResourceString += `/${this.factory.accountName}${path16}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -50558,9 +50558,9 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; return canonicalizedHeadersStringToSign; } function getCanonicalizedResourceString(request) { - const path18 = getURLPath(request.url) || "/"; + const path16 = getURLPath(request.url) || "/"; let canonicalizedResourceString = ""; - canonicalizedResourceString += `/${options.accountName}${path18}`; + canonicalizedResourceString += `/${options.accountName}${path16}`; const queries = getURLQueries(request.url); const lowercaseQueries = {}; if (queries) { @@ -69862,8 +69862,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; if (this.operationCount >= BATCH_MAX_REQUEST) { throw new RangeError(`Cannot exceed ${BATCH_MAX_REQUEST} sub requests in a single batch`); } - const path18 = getURLPath(subRequest.url); - if (!path18 || path18 === "") { + const path16 = getURLPath(subRequest.url); + if (!path16 || path16 === "") { throw new RangeError(`Invalid url for sub request: '${subRequest.url}'`); } } @@ -69923,8 +69923,8 @@ ${key}:${decodeURIComponent(lowercaseQueries[key])}`; pipeline = newPipeline(credentialOrPipeline, options); } const storageClientContext = new StorageContextClient(url3, getCoreClientOptions(pipeline)); - const path18 = getURLPath(url3); - if (path18 && path18 !== "/") { + const path16 = getURLPath(url3); + if (path16 && path16 !== "/") { this.serviceOrContainerContext = storageClientContext.container; } else { this.serviceOrContainerContext = storageClientContext.service; @@ -78674,7 +78674,7 @@ var require_tar = __commonJS({ var exec_1 = require_exec(); var io6 = __importStar4(require_io()); var fs_1 = require("fs"); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var constants_1 = require_constants10(); var IS_WINDOWS = process.platform === "win32"; @@ -78720,13 +78720,13 @@ var require_tar = __commonJS({ const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD && compressionMethod !== constants_1.CompressionMethod.Gzip && IS_WINDOWS; switch (type2) { case "create": - args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); + args.push("--posix", "-cf", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "--exclude", BSD_TAR_ZSTD ? tarFile : cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "--files-from", constants_1.ManifestFilename); break; case "extract": - args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path18.sep}`, "g"), "/")); + args.push("-xf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P", "-C", workingDirectory.replace(new RegExp(`\\${path16.sep}`, "g"), "/")); break; case "list": - args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), "-P"); + args.push("-tf", BSD_TAR_ZSTD ? tarFile : archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), "-P"); break; } if (tarPath.type === constants_1.ArchiveToolType.GNU) { @@ -78772,7 +78772,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --long=30 --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/") ] : [ "--use-compress-program", IS_WINDOWS ? '"zstd -d --long=30"' : "unzstd --long=30" @@ -78781,7 +78781,7 @@ var require_tar = __commonJS({ return BSD_TAR_ZSTD ? [ "zstd -d --force -o", constants_1.TarFilename, - archivePath.replace(new RegExp(`\\${path18.sep}`, "g"), "/") + archivePath.replace(new RegExp(`\\${path16.sep}`, "g"), "/") ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -d"' : "unzstd"]; default: return ["-z"]; @@ -78796,7 +78796,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ "zstd -T0 --long=30 --force -o", - cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), constants_1.TarFilename ] : [ "--use-compress-program", @@ -78805,7 +78805,7 @@ var require_tar = __commonJS({ case constants_1.CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ "zstd -T0 --force -o", - cacheFileName.replace(new RegExp(`\\${path18.sep}`, "g"), "/"), + cacheFileName.replace(new RegExp(`\\${path16.sep}`, "g"), "/"), constants_1.TarFilename ] : ["--use-compress-program", IS_WINDOWS ? '"zstd -T0"' : "zstdmt"]; default: @@ -78845,7 +78845,7 @@ var require_tar = __commonJS({ exports2.extractTar = extractTar2; function createTar(archiveFolder, sourceDirectories, compressionMethod) { return __awaiter4(this, void 0, void 0, function* () { - (0, fs_1.writeFileSync)(path18.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); + (0, fs_1.writeFileSync)(path16.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join("\n")); const commands = yield getCommands(compressionMethod, "create"); yield execCommands(commands, archiveFolder); }); @@ -78915,7 +78915,7 @@ var require_cache3 = __commonJS({ Object.defineProperty(exports2, "__esModule", { value: true }); exports2.saveCache = exports2.restoreCache = exports2.isFeatureAvailable = exports2.FinalizeCacheError = exports2.ReserveCacheError = exports2.ValidationError = void 0; var core14 = __importStar4(require_core()); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var utils = __importStar4(require_cacheUtils()); var cacheHttpClient = __importStar4(require_cacheHttpClient()); var cacheTwirpClient = __importStar4(require_cacheTwirpClient()); @@ -79012,7 +79012,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return cacheEntry.cacheKey; } - archivePath = path18.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path16.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options); if (core14.isDebug()) { @@ -79081,7 +79081,7 @@ var require_cache3 = __commonJS({ core14.info("Lookup only - skipping download"); return response.matchedKey; } - archivePath = path18.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); + archivePath = path16.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod)); core14.debug(`Archive path: ${archivePath}`); core14.debug(`Starting download of archive to: ${archivePath}`); yield cacheHttpClient.downloadCache(response.signedDownloadUrl, archivePath, options); @@ -79144,7 +79144,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path18.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path16.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79208,7 +79208,7 @@ var require_cache3 = __commonJS({ throw new Error(`Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`); } const archiveFolder = yield utils.createTempDirectory(); - const archivePath = path18.join(archiveFolder, utils.getCacheFileName(compressionMethod)); + const archivePath = path16.join(archiveFolder, utils.getCacheFileName(compressionMethod)); core14.debug(`Archive Path: ${archivePath}`); try { yield (0, tar_1.createTar)(archiveFolder, cachePaths, compressionMethod); @@ -79287,14 +79287,14 @@ var require_helpers3 = __commonJS({ "node_modules/jsonschema/lib/helpers.js"(exports2, module2) { "use strict"; var uri = require("url"); - var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path18, name, argument) { - if (Array.isArray(path18)) { - this.path = path18; - this.property = path18.reduce(function(sum, item) { + var ValidationError = exports2.ValidationError = function ValidationError2(message, instance, schema2, path16, name, argument) { + if (Array.isArray(path16)) { + this.path = path16; + this.property = path16.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); - } else if (path18 !== void 0) { - this.property = path18; + } else if (path16 !== void 0) { + this.property = path16; } if (message) { this.message = message; @@ -79385,16 +79385,16 @@ var require_helpers3 = __commonJS({ name: { value: "SchemaError", enumerable: false } } ); - var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path18, base, schemas) { + var SchemaContext = exports2.SchemaContext = function SchemaContext2(schema2, options, path16, base, schemas) { this.schema = schema2; this.options = options; - if (Array.isArray(path18)) { - this.path = path18; - this.propertyPath = path18.reduce(function(sum, item) { + if (Array.isArray(path16)) { + this.path = path16; + this.propertyPath = path16.reduce(function(sum, item) { return sum + makeSuffix(item); }, "instance"); } else { - this.propertyPath = path18; + this.propertyPath = path16; } this.base = base; this.schemas = schemas; @@ -79403,10 +79403,10 @@ var require_helpers3 = __commonJS({ return uri.resolve(this.base, target); }; SchemaContext.prototype.makeChild = function makeChild(schema2, propertyName) { - var path18 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); + var path16 = propertyName === void 0 ? this.path : this.path.concat([propertyName]); var id = schema2.$id || schema2.id; var base = uri.resolve(this.base, id || ""); - var ctx = new SchemaContext(schema2, this.options, path18, base, Object.create(this.schemas)); + var ctx = new SchemaContext(schema2, this.options, path16, base, Object.create(this.schemas)); if (id && !ctx.schemas[base]) { ctx.schemas[base] = schema2; } @@ -80890,7 +80890,7 @@ var require_tool_cache = __commonJS({ var fs15 = __importStar4(require("fs")); var mm = __importStar4(require_manifest()); var os3 = __importStar4(require("os")); - var path18 = __importStar4(require("path")); + var path16 = __importStar4(require("path")); var httpm = __importStar4(require_lib()); var semver8 = __importStar4(require_semver2()); var stream2 = __importStar4(require("stream")); @@ -80911,8 +80911,8 @@ var require_tool_cache = __commonJS({ var userAgent = "actions/tool-cache"; function downloadTool2(url2, dest, auth, headers) { return __awaiter4(this, void 0, void 0, function* () { - dest = dest || path18.join(_getTempDirectory(), crypto.randomUUID()); - yield io6.mkdirP(path18.dirname(dest)); + dest = dest || path16.join(_getTempDirectory(), crypto.randomUUID()); + yield io6.mkdirP(path16.dirname(dest)); core14.debug(`Downloading ${url2}`); core14.debug(`Destination ${dest}`); const maxAttempts = 3; @@ -80999,7 +80999,7 @@ var require_tool_cache = __commonJS({ process.chdir(originalCwd); } } else { - const escapedScript = path18.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); + const escapedScript = path16.join(__dirname, "..", "scripts", "Invoke-7zdec.ps1").replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const escapedTarget = dest.replace(/'/g, "''").replace(/"|\n|\r/g, ""); const command = `& '${escapedScript}' -Source '${escapedFile}' -Target '${escapedTarget}'`; @@ -81175,7 +81175,7 @@ var require_tool_cache = __commonJS({ } const destPath = yield _createToolPath(tool, version, arch2); for (const itemName of fs15.readdirSync(sourceDir)) { - const s = path18.join(sourceDir, itemName); + const s = path16.join(sourceDir, itemName); yield io6.cp(s, destPath, { recursive: true }); } _completeToolPath(tool, version, arch2); @@ -81193,7 +81193,7 @@ var require_tool_cache = __commonJS({ throw new Error("sourceFile is not a file"); } const destFolder = yield _createToolPath(tool, version, arch2); - const destPath = path18.join(destFolder, targetFile); + const destPath = path16.join(destFolder, targetFile); core14.debug(`destination file ${destPath}`); yield io6.cp(sourceFile, destPath); _completeToolPath(tool, version, arch2); @@ -81217,7 +81217,7 @@ var require_tool_cache = __commonJS({ let toolPath = ""; if (versionSpec) { versionSpec = semver8.clean(versionSpec) || ""; - const cachePath = path18.join(_getCacheDirectory(), toolName, versionSpec, arch2); + const cachePath = path16.join(_getCacheDirectory(), toolName, versionSpec, arch2); core14.debug(`checking cache: ${cachePath}`); if (fs15.existsSync(cachePath) && fs15.existsSync(`${cachePath}.complete`)) { core14.debug(`Found tool in cache ${toolName} ${versionSpec} ${arch2}`); @@ -81232,12 +81232,12 @@ var require_tool_cache = __commonJS({ function findAllVersions2(toolName, arch2) { const versions = []; arch2 = arch2 || os3.arch(); - const toolPath = path18.join(_getCacheDirectory(), toolName); + const toolPath = path16.join(_getCacheDirectory(), toolName); if (fs15.existsSync(toolPath)) { const children = fs15.readdirSync(toolPath); for (const child of children) { if (isExplicitVersion(child)) { - const fullPath = path18.join(toolPath, child, arch2 || ""); + const fullPath = path16.join(toolPath, child, arch2 || ""); if (fs15.existsSync(fullPath) && fs15.existsSync(`${fullPath}.complete`)) { versions.push(child); } @@ -81292,7 +81292,7 @@ var require_tool_cache = __commonJS({ function _createExtractFolder(dest) { return __awaiter4(this, void 0, void 0, function* () { if (!dest) { - dest = path18.join(_getTempDirectory(), crypto.randomUUID()); + dest = path16.join(_getTempDirectory(), crypto.randomUUID()); } yield io6.mkdirP(dest); return dest; @@ -81300,7 +81300,7 @@ var require_tool_cache = __commonJS({ } function _createToolPath(tool, version, arch2) { return __awaiter4(this, void 0, void 0, function* () { - const folderPath = path18.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); core14.debug(`destination ${folderPath}`); const markerPath = `${folderPath}.complete`; yield io6.rmRF(folderPath); @@ -81310,7 +81310,7 @@ var require_tool_cache = __commonJS({ }); } function _completeToolPath(tool, version, arch2) { - const folderPath = path18.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); + const folderPath = path16.join(_getCacheDirectory(), tool, semver8.clean(version) || version, arch2 || ""); const markerPath = `${folderPath}.complete`; fs15.writeFileSync(markerPath, ""); core14.debug("finished caching tool"); @@ -85213,12 +85213,12 @@ var import_fast_glob = __toESM(require_out4(), 1); var import_ignore = __toESM(require_ignore(), 1); // node_modules/slash/index.js -function slash(path18) { - const isExtendedLengthPath = path18.startsWith("\\\\?\\"); +function slash(path16) { + const isExtendedLengthPath = path16.startsWith("\\\\?\\"); if (isExtendedLengthPath) { - return path18; + return path16; } - return path18.replace(/\\/g, "/"); + return path16.replace(/\\/g, "/"); } // node_modules/globby/utilities.js @@ -85306,8 +85306,8 @@ var assertPatternsInput = (patterns) => { } }; var normalizePathForDirectoryGlob = (filePath, cwd) => { - const path18 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; - return import_node_path3.default.isAbsolute(path18) ? path18 : import_node_path3.default.join(cwd, path18); + const path16 = isNegativePattern(filePath) ? filePath.slice(1) : filePath; + return import_node_path3.default.isAbsolute(path16) ? path16 : import_node_path3.default.join(cwd, path16); }; var getDirectoryGlob = ({ directoryPath, files, extensions }) => { const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : ""; @@ -88761,7 +88761,6 @@ function fixCodeQualityCategory(logger, category) { } // src/analyses.ts -var path7 = __toESM(require("path")); var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { AnalysisKind2["CodeScanning"] = "code-scanning"; AnalysisKind2["CodeQuality"] = "code-quality"; @@ -88773,7 +88772,7 @@ var CodeScanning = { name: "code scanning", target: "PUT /repos/:owner/:repo/code-scanning/analysis" /* CODE_SCANNING */, sarifExtension: ".sarif", - sarifPredicate: (name) => path7.extname(name) === CodeScanning.sarifExtension && !CodeQuality.sarifPredicate(name), + sarifPredicate: (name) => name.endsWith(CodeScanning.sarifExtension) && !CodeQuality.sarifPredicate(name), fixCategory: (_, category) => category, sentinelPrefix: "CODEQL_UPLOAD_SARIF_" }; @@ -88782,7 +88781,7 @@ var CodeQuality = { name: "code quality", target: "PUT /repos/:owner/:repo/code-quality/analysis" /* CODE_QUALITY */, sarifExtension: ".quality.sarif", - sarifPredicate: (name) => path7.extname(name) === CodeQuality.sarifExtension, + sarifPredicate: (name) => name.endsWith(CodeQuality.sarifExtension), fixCategory: fixCodeQualityCategory, sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_" }; @@ -88942,7 +88941,7 @@ function wrapApiConfigurationError(e) { // src/feature-flags.ts var fs6 = __toESM(require("fs")); -var path9 = __toESM(require("path")); +var path8 = __toESM(require("path")); var semver3 = __toESM(require_semver2()); // src/defaults.json @@ -88951,7 +88950,7 @@ var cliVersion = "2.23.1"; // src/overlay-database-utils.ts var fs5 = __toESM(require("fs")); -var path8 = __toESM(require("path")); +var path7 = __toESM(require("path")); var actionsCache = __toESM(require_cache3()); // src/git-utils.ts @@ -89077,8 +89076,8 @@ var getFileOidsUnderPath = async function(basePath) { const match = line.match(regex); if (match) { const oid = match[1]; - const path18 = decodeGitFilePath(match[2]); - fileOidMap[path18] = oid; + const path16 = decodeGitFilePath(match[2]); + fileOidMap[path16] = oid; } else { throw new Error(`Unexpected "git ls-files" output: ${line}`); } @@ -89194,7 +89193,7 @@ async function readBaseDatabaseOidsFile(config, logger) { } } function getBaseDatabaseOidsFilePath(config) { - return path8.join(config.dbLocation, "base-database-oids.json"); + return path7.join(config.dbLocation, "base-database-oids.json"); } async function writeOverlayChangesFile(config, sourceRoot, logger) { const baseFileOids = await readBaseDatabaseOidsFile(config, logger); @@ -89204,7 +89203,7 @@ async function writeOverlayChangesFile(config, sourceRoot, logger) { `Found ${changedFiles.length} changed file(s) under ${sourceRoot}.` ); const changedFilesJson = JSON.stringify({ changes: changedFiles }); - const overlayChangesFile = path8.join( + const overlayChangesFile = path7.join( getTemporaryDirectory(), "overlay-changes.json" ); @@ -89420,7 +89419,7 @@ var Features = class { this.gitHubFeatureFlags = new GitHubFeatureFlags( gitHubVersion, repositoryNwo, - path9.join(tempDir, FEATURE_FLAGS_FILE_NAME), + path8.join(tempDir, FEATURE_FLAGS_FILE_NAME), logger ); } @@ -89684,7 +89683,7 @@ var core9 = __toESM(require_core()); // src/config-utils.ts var fs8 = __toESM(require("fs")); -var path11 = __toESM(require("path")); +var path10 = __toESM(require("path")); // src/caching-utils.ts var core8 = __toESM(require_core()); @@ -89700,9 +89699,9 @@ var PACK_IDENTIFIER_PATTERN = (function() { // src/diff-informed-analysis-utils.ts var fs7 = __toESM(require("fs")); -var path10 = __toESM(require("path")); +var path9 = __toESM(require("path")); function getDiffRangesJsonFilePath() { - return path10.join(getTemporaryDirectory(), "pr-diff-range.json"); + return path9.join(getTemporaryDirectory(), "pr-diff-range.json"); } function readDiffRangesJsonFile(logger) { const jsonFilePath = getDiffRangesJsonFilePath(); @@ -89747,7 +89746,7 @@ var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = { swift: "overlay_analysis_code_scanning_swift" /* OverlayAnalysisCodeScanningSwift */ }; function getPathToParsedConfigFile(tempDir) { - return path11.join(tempDir, "config"); + return path10.join(tempDir, "config"); } async function getConfig(tempDir, logger) { const configFile = getPathToParsedConfigFile(tempDir); @@ -89967,7 +89966,7 @@ async function sendStatusReport(statusReport) { // src/upload-lib.ts var fs14 = __toESM(require("fs")); -var path17 = __toESM(require("path")); +var path15 = __toESM(require("path")); var url = __toESM(require("url")); var import_zlib = __toESM(require("zlib")); var core12 = __toESM(require_core()); @@ -89975,7 +89974,7 @@ var jsonschema = __toESM(require_lib2()); // src/codeql.ts var fs12 = __toESM(require("fs")); -var path15 = __toESM(require("path")); +var path13 = __toESM(require("path")); var core11 = __toESM(require_core()); var toolrunner3 = __toESM(require_toolrunner()); @@ -90218,7 +90217,7 @@ function wrapCliConfigurationError(cliError) { // src/setup-codeql.ts var fs11 = __toESM(require("fs")); -var path14 = __toESM(require("path")); +var path12 = __toESM(require("path")); var toolcache3 = __toESM(require_tool_cache()); var import_fast_deep_equal = __toESM(require_fast_deep_equal()); var semver7 = __toESM(require_semver2()); @@ -90280,7 +90279,6 @@ var v4_default = v4; // src/tar.ts var import_child_process = require("child_process"); var fs9 = __toESM(require("fs")); -var path12 = __toESM(require("path")); var stream = __toESM(require("stream")); var import_toolrunner = __toESM(require_toolrunner()); var io4 = __toESM(require_io()); @@ -90429,7 +90427,7 @@ var KNOWN_EXTENSIONS = { }; function inferCompressionMethod(tarPath) { for (const [ext, method] of Object.entries(KNOWN_EXTENSIONS)) { - if (path12.extname(tarPath) === `.${ext}`) { + if (tarPath.endsWith(`.${ext}`)) { return method; } } @@ -90439,7 +90437,7 @@ function inferCompressionMethod(tarPath) { // src/tools-download.ts var fs10 = __toESM(require("fs")); var os2 = __toESM(require("os")); -var path13 = __toESM(require("path")); +var path11 = __toESM(require("path")); var import_perf_hooks = require("perf_hooks"); var core10 = __toESM(require_core()); var import_http_client = __toESM(require_lib()); @@ -90572,7 +90570,7 @@ async function downloadAndExtractZstdWithStreaming(codeqlURL, dest, authorizatio await extractTarZst(response, dest, tarVersion, logger); } function getToolcacheDirectory(version) { - return path13.join( + return path11.join( getRequiredEnvParam("RUNNER_TOOL_CACHE"), TOOLCACHE_TOOL_NAME, semver6.clean(version) || version, @@ -90715,7 +90713,7 @@ async function findOverridingToolsInCache(humanReadableVersion, logger) { const candidates = toolcache3.findAllVersions("CodeQL").filter(isGoodVersion).map((version) => ({ folder: toolcache3.find("CodeQL", version), version - })).filter(({ folder }) => fs11.existsSync(path14.join(folder, "pinned-version"))); + })).filter(({ folder }) => fs11.existsSync(path12.join(folder, "pinned-version"))); if (candidates.length === 1) { const candidate = candidates[0]; logger.debug( @@ -91053,7 +91051,7 @@ async function useZstdBundle(cliVersion2, tarSupportsZstd) { ); } function getTempExtractionDir(tempDir) { - return path14.join(tempDir, v4_default()); + return path12.join(tempDir, v4_default()); } async function getNightlyToolsUrl(logger) { const zstdAvailability = await isZstdAvailable(logger); @@ -91124,7 +91122,7 @@ async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliV toolsDownloadStatusReport )}` ); - let codeqlCmd = path15.join(codeqlFolder, "codeql", "codeql"); + let codeqlCmd = path13.join(codeqlFolder, "codeql", "codeql"); if (process.platform === "win32") { codeqlCmd += ".exe"; } else if (process.platform !== "linux" && process.platform !== "darwin") { @@ -91185,7 +91183,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async isTracedLanguage(language) { const extractorPath = await this.resolveExtractor(language); - const tracingConfigPath = path15.join( + const tracingConfigPath = path13.join( extractorPath, "tools", "tracing-config.lua" @@ -91261,7 +91259,7 @@ async function getCodeQLForCmd(cmd, checkVersion) { }, async runAutobuild(config, language) { applyAutobuildAzurePipelinesTimeoutFix(); - const autobuildCmd = path15.join( + const autobuildCmd = path13.join( await this.resolveExtractor(language), "tools", process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh" @@ -91674,7 +91672,7 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) { ]; } function getGeneratedCodeScanningConfigPath(config) { - return path15.resolve(config.tempDir, "user-config.yaml"); + return path13.resolve(config.tempDir, "user-config.yaml"); } function getExtractionVerbosityArguments(enableDebugLogging) { return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : []; @@ -93001,10 +92999,10 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo } return combineSarifFiles(sarifFiles, logger); } - const baseTempDir = path17.resolve(tempDir, "combined-sarif"); + const baseTempDir = path15.resolve(tempDir, "combined-sarif"); fs14.mkdirSync(baseTempDir, { recursive: true }); - const outputDirectory = fs14.mkdtempSync(path17.resolve(baseTempDir, "output-")); - const outputFile = path17.resolve(outputDirectory, "combined-sarif.sarif"); + const outputDirectory = fs14.mkdtempSync(path15.resolve(baseTempDir, "output-")); + const outputFile = path15.resolve(outputDirectory, "combined-sarif.sarif"); await codeQL.mergeResults(sarifFiles, outputFile, { mergeRunsFromEqualCategory: true }); @@ -93037,7 +93035,7 @@ function getAutomationID2(category, analysis_key, environment) { async function uploadPayload(payload, repositoryNwo, logger, target) { logger.info("Uploading results"); if (isInTestMode()) { - const payloadSaveFile = path17.join( + const payloadSaveFile = path15.join( getTemporaryDirectory(), "payload.json" ); @@ -93081,9 +93079,9 @@ function findSarifFilesInDir(sarifPath, isSarif) { const entries = fs14.readdirSync(dir, { withFileTypes: true }); for (const entry of entries) { if (entry.isFile() && isSarif(entry.name)) { - sarifFiles.push(path17.resolve(dir, entry.name)); + sarifFiles.push(path15.resolve(dir, entry.name)); } else if (entry.isDirectory()) { - walkSarifFiles(path17.resolve(dir, entry.name)); + walkSarifFiles(path15.resolve(dir, entry.name)); } } }; @@ -93097,30 +93095,32 @@ async function getGroupedSarifFilePaths(logger, sarifPath) { } const results = {}; if (stats.isDirectory()) { - let sarifFiles = findSarifFilesInDir( + let unassignedSarifFiles = findSarifFilesInDir( sarifPath, - (name) => path17.extname(name) === ".sarif" + (name) => path15.extname(name) === ".sarif" ); logger.debug( - `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}` + `Found the following .sarif files in ${sarifPath}: ${unassignedSarifFiles.join(", ")}` ); for (const analysisConfig of SarifScanOrder) { - const files = sarifFiles.filter(analysisConfig.sarifPredicate); - if (files.length > 0) { + const filesForCurrentAnalysis = unassignedSarifFiles.filter( + analysisConfig.sarifPredicate + ); + if (filesForCurrentAnalysis.length > 0) { logger.debug( - `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}` + `The following SARIF files are for ${analysisConfig.name}: ${filesForCurrentAnalysis.join(", ")}` ); - sarifFiles = sarifFiles.filter( + unassignedSarifFiles = unassignedSarifFiles.filter( (name) => !analysisConfig.sarifPredicate(name) ); - results[analysisConfig.kind] = files; + results[analysisConfig.kind] = filesForCurrentAnalysis; } else { logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } - if (sarifFiles.length !== 0) { + if (unassignedSarifFiles.length !== 0) { logger.warning( - `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}` + `Found files in ${sarifPath} which do not belong to any analysis: ${unassignedSarifFiles.join(", ")}` ); } } else { @@ -93319,7 +93319,7 @@ function dumpSarifFile(sarifPayload, outputDir, logger, uploadTarget) { `The path specified by the ${"CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */} environment variable exists and is not a directory: ${outputDir}` ); } - const outputFile = path17.resolve( + const outputFile = path15.resolve( outputDir, `upload${uploadTarget.sarifExtension}` ); @@ -93467,7 +93467,7 @@ function filterAlertsByDiffRange(logger, sarif) { if (!locationUri || locationStartLine === void 0) { return false; } - const locationPath = path17.join(checkoutPath, locationUri).replaceAll(path17.sep, "/"); + const locationPath = path15.join(checkoutPath, locationUri).replaceAll(path15.sep, "/"); return diffRanges.some( (range) => range.path === locationPath && (range.startLine <= locationStartLine && range.endLine >= locationStartLine || range.startLine === 0 && range.endLine === 0) ); diff --git a/src/upload-lib.ts b/src/upload-lib.ts index bbfd8a7183..cfa362b678 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -459,6 +459,8 @@ export function getSarifFilePaths( return sarifFiles; } +type GroupedSarifFiles = Partial>; + /** * Finds SARIF files in `sarifPath`, and groups them by analysis kind, following `SarifScanOrder`. * @@ -469,7 +471,7 @@ export function getSarifFilePaths( export async function getGroupedSarifFilePaths( logger: Logger, sarifPath: string, -): Promise>> { +): Promise { const stats = fs.statSync(sarifPath, { throwIfNoEntry: false }); if (stats === undefined) { @@ -477,37 +479,39 @@ export async function getGroupedSarifFilePaths( throw new ConfigurationError(`Path does not exist: ${sarifPath}`); } - const results = {}; + const results: GroupedSarifFiles = {}; if (stats.isDirectory()) { - let sarifFiles = findSarifFilesInDir( + let unassignedSarifFiles = findSarifFilesInDir( sarifPath, (name) => path.extname(name) === ".sarif", ); logger.debug( - `Found the following .sarif files in ${sarifPath}: ${sarifFiles.join(", ")}`, + `Found the following .sarif files in ${sarifPath}: ${unassignedSarifFiles.join(", ")}`, ); for (const analysisConfig of analyses.SarifScanOrder) { - const files = sarifFiles.filter(analysisConfig.sarifPredicate); - if (files.length > 0) { + const filesForCurrentAnalysis = unassignedSarifFiles.filter( + analysisConfig.sarifPredicate, + ); + if (filesForCurrentAnalysis.length > 0) { logger.debug( - `The following SARIF files are for ${analysisConfig.name}: ${files.join(", ")}`, + `The following SARIF files are for ${analysisConfig.name}: ${filesForCurrentAnalysis.join(", ")}`, ); // Looping through the array a second time is not efficient, but more readable. // Change this to one loop for both calls to `filter` if this becomes a bottleneck. - sarifFiles = sarifFiles.filter( + unassignedSarifFiles = unassignedSarifFiles.filter( (name) => !analysisConfig.sarifPredicate(name), ); - results[analysisConfig.kind] = files; + results[analysisConfig.kind] = filesForCurrentAnalysis; } else { logger.debug(`Found no SARIF files for ${analysisConfig.name}`); } } - if (sarifFiles.length !== 0) { + if (unassignedSarifFiles.length !== 0) { logger.warning( - `Found files in ${sarifPath} which do not belong to any analysis: ${sarifFiles.join(", ")}`, + `Found files in ${sarifPath} which do not belong to any analysis: ${unassignedSarifFiles.join(", ")}`, ); } } else { From 9a0b46abff129d5f6ef420d856e068b5f82e17ac Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Tue, 30 Sep 2025 12:14:59 +0100 Subject: [PATCH 10/12] Rename `keys` and `entries` helpers and update docs --- lib/upload-sarif-action.js | 6 ++++-- src/upload-sarif.ts | 6 ++++-- src/util.ts | 22 ++++++++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 7885adcf41..1470a58244 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88590,7 +88590,7 @@ async function asyncSome(array, predicate) { const results = await Promise.all(array.map(predicate)); return results.some((result) => result); } -function entriesTyped(object) { +function unsafeEntriesInvariant(object) { return Object.entries(object); } @@ -93485,7 +93485,9 @@ async function uploadSarif(logger, features, checkoutPath, sarifPath, category) sarifPath ); const uploadResults = {}; - for (const [analysisKind, sarifFiles] of entriesTyped(sarifGroups)) { + for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant( + sarifGroups + )) { const analysisConfig = getAnalysisConfig(analysisKind); uploadResults[analysisKind] = await uploadSpecifiedFiles( sarifFiles, diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts index f16c7fb216..34b912489d 100644 --- a/src/upload-sarif.ts +++ b/src/upload-sarif.ts @@ -2,7 +2,7 @@ import * as analyses from "./analyses"; import { FeatureEnablement } from "./feature-flags"; import { Logger } from "./logging"; import * as upload_lib from "./upload-lib"; -import { entriesTyped } from "./util"; +import { unsafeEntriesInvariant } from "./util"; // Maps analysis kinds to SARIF IDs. export type UploadSarifResults = Partial< @@ -33,7 +33,9 @@ export async function uploadSarif( ); const uploadResults: UploadSarifResults = {}; - for (const [analysisKind, sarifFiles] of entriesTyped(sarifGroups)) { + for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant( + sarifGroups, + )) { const analysisConfig = analyses.getAnalysisConfig(analysisKind); uploadResults[analysisKind] = await upload_lib.uploadSpecifiedFiles( sarifFiles, diff --git a/src/util.ts b/src/util.ts index 94475ce62b..1fb1937983 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1288,16 +1288,26 @@ export function isDefined(value: T | null | undefined): value is T { return value !== undefined && value !== null; } -/** Like `Object.keys`, but infers the correct key type. */ -export function keysTyped>( +/** Like `Object.keys`, but typed so that the elements of the resulting array have the + * same type as the keys of the input object. Note that this may not be sound if the input + * object has been cast to `T` from a subtype of `T` and contains additional keys that + * are not represented by `keyof T`. + */ +export function unsafeKeysInvariant>( object: T, ): Array { return Object.keys(object) as Array; } -/** Like `Object.entries`, but infers the correct key type. */ -export function entriesTyped>( +/** Like `Object.entries`, but typed so that the key elements of the result have the + * same type as the keys of the input object. Note that this may not be sound if the input + * object has been cast to `T` from a subtype of `T` and contains additional keys that + * are not represented by `keyof T`. + */ +export function unsafeEntriesInvariant>( object: T, -): Array<[keyof T, NonNullable]> { - return Object.entries(object) as Array<[keyof T, NonNullable]>; +): Array<[keyof T, Exclude]> { + return Object.entries(object) as Array< + [keyof T, Exclude] + >; } From d25fa60a90ddfe309a83dd8606d2f3e0e5de15a7 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 1 Oct 2025 15:28:31 +0100 Subject: [PATCH 11/12] ESLint: Disable `no-unused-vars` for parameters starting with `_` --- eslint.config.mjs | 6 ++++++ src/config/db-config.test.ts | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index fb4bc87ec3..bd12d12c70 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -146,6 +146,12 @@ export default [ "@typescript-eslint/prefer-regexp-exec": "off", "@typescript-eslint/require-await": "off", "@typescript-eslint/restrict-template-expressions": "off", + "@typescript-eslint/no-unused-vars": [ + "error", + { + "argsIgnorePattern": "^_", + } + ], "func-style": "off", }, }, diff --git a/src/config/db-config.test.ts b/src/config/db-config.test.ts index b22503475d..533459de24 100644 --- a/src/config/db-config.test.ts +++ b/src/config/db-config.test.ts @@ -153,7 +153,6 @@ const packSpecPrettyPrintingMacro = test.macro({ title: ( _providedTitle: string | undefined, packStr: string, - // eslint-disable-next-line @typescript-eslint/no-unused-vars _packObj: dbConfig.Pack, ) => `Prettyprint pack spec: '${packStr}'`, }); From 91a63dc72c2c4c97e141018269495a7b62608d09 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 1 Oct 2025 15:28:56 +0100 Subject: [PATCH 12/12] Remove `undefined` values from results of `unsafeEntriesInvariant` --- lib/upload-sarif-action.js | 4 +++- src/util.ts | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 1470a58244..f703f3c063 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -88591,7 +88591,9 @@ async function asyncSome(array, predicate) { return results.some((result) => result); } function unsafeEntriesInvariant(object) { - return Object.entries(object); + return Object.entries(object).filter( + ([_, val2]) => val2 !== void 0 + ); } // src/actions-util.ts diff --git a/src/util.ts b/src/util.ts index 1fb1937983..e7c29ed12e 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1307,7 +1307,7 @@ export function unsafeKeysInvariant>( export function unsafeEntriesInvariant>( object: T, ): Array<[keyof T, Exclude]> { - return Object.entries(object) as Array< - [keyof T, Exclude] - >; + return Object.entries(object).filter( + ([_, val]) => val !== undefined, + ) as Array<[keyof T, Exclude]>; }