diff --git a/dist/index.js b/dist/index.js index 55ee37a..b0db713 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2455,13 +2455,13 @@ function getFetchUrl(settings) { } function getServerUrl(url) { let resolvedUrl = process.env['GITHUB_SERVER_URL'] || 'https://github.com'; - if (hasContent(url, WhitespaceMode.IgnorePureWhitespace)) { + if (hasContent(url, WhitespaceMode.Trim)) { resolvedUrl = url; } return new url_1.URL(resolvedUrl); } function getServerApiUrl(url) { - if (hasContent(url, WhitespaceMode.IgnorePureWhitespace)) { + if (hasContent(url, WhitespaceMode.Trim)) { let serverUrl = getServerUrl(url); if (isGhes(url)) { serverUrl.pathname = 'api/v3'; @@ -2482,20 +2482,19 @@ function isGhes(url) { return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost; } function pruneSuffix(text, suffix) { - if (hasContent(suffix, WhitespaceMode.AllowPureWhitespace) && - (text === null || text === void 0 ? void 0 : text.endsWith(suffix))) { + if (hasContent(suffix, WhitespaceMode.Preserve) && (text === null || text === void 0 ? void 0 : text.endsWith(suffix))) { return text.substring(0, text.length - suffix.length); } return text; } var WhitespaceMode; (function (WhitespaceMode) { - WhitespaceMode[WhitespaceMode["IgnorePureWhitespace"] = 0] = "IgnorePureWhitespace"; - WhitespaceMode[WhitespaceMode["AllowPureWhitespace"] = 1] = "AllowPureWhitespace"; + WhitespaceMode[WhitespaceMode["Trim"] = 0] = "Trim"; + WhitespaceMode[WhitespaceMode["Preserve"] = 1] = "Preserve"; })(WhitespaceMode || (WhitespaceMode = {})); function hasContent(text, whitespaceMode) { let refinedText = text !== null && text !== void 0 ? text : ''; - if (whitespaceMode == WhitespaceMode.IgnorePureWhitespace) { + if (whitespaceMode == WhitespaceMode.Trim) { refinedText = refinedText.trim(); } return refinedText.length > 0; diff --git a/src/url-helper.ts b/src/url-helper.ts index 47721da..17a0842 100644 --- a/src/url-helper.ts +++ b/src/url-helper.ts @@ -22,7 +22,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string { export function getServerUrl(url?: string): URL { let resolvedUrl = process.env['GITHUB_SERVER_URL'] || 'https://github.com' - if (hasContent(url, WhitespaceMode.IgnorePureWhitespace)) { + if (hasContent(url, WhitespaceMode.Trim)) { resolvedUrl = url! } @@ -30,7 +30,7 @@ export function getServerUrl(url?: string): URL { } export function getServerApiUrl(url?: string): string { - if (hasContent(url, WhitespaceMode.IgnorePureWhitespace)) { + if (hasContent(url, WhitespaceMode.Trim)) { let serverUrl = getServerUrl(url) if (isGhes(url)) { serverUrl.pathname = 'api/v3' @@ -58,18 +58,15 @@ export function isGhes(url?: string): boolean { } function pruneSuffix(text: string, suffix: string) { - if ( - hasContent(suffix, WhitespaceMode.AllowPureWhitespace) && - text?.endsWith(suffix) - ) { + if (hasContent(suffix, WhitespaceMode.Preserve) && text?.endsWith(suffix)) { return text.substring(0, text.length - suffix.length) } return text } enum WhitespaceMode { - IgnorePureWhitespace, - AllowPureWhitespace + Trim, + Preserve } function hasContent( @@ -77,7 +74,7 @@ function hasContent( whitespaceMode: WhitespaceMode ): boolean { let refinedText = text ?? '' - if (whitespaceMode == WhitespaceMode.IgnorePureWhitespace) { + if (whitespaceMode == WhitespaceMode.Trim) { refinedText = refinedText.trim() } return refinedText.length > 0