-
Notifications
You must be signed in to change notification settings - Fork 933
feat(load): resolve plugins correctly if provided as relative or absolute path #2401
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,40 @@ | ||
import path from 'path'; | ||
|
||
// largely adapted from eslint's plugin system | ||
const NAMESPACE_REGEX = /^@.*\//iu; | ||
// In eslint this is a parameter - we don't need to support the extra options | ||
const prefix = 'commitlint-plugin'; | ||
|
||
// Replace Windows with posix style paths | ||
function convertPathToPosix(filepath: string) { | ||
/** | ||
* Replace Windows with posix style paths | ||
*/ | ||
function convertPathToPosix(filepath: string): string { | ||
const normalizedFilepath = path.normalize(filepath); | ||
const posixFilepath = normalizedFilepath.replace(/\\/gu, '/'); | ||
|
||
return posixFilepath; | ||
return normalizedFilepath.replace(/\\/gu, '/'); | ||
} | ||
|
||
/** | ||
* Brings package name to correct format based on prefix | ||
* @param {string} name The name of the package. | ||
* @returns {string} Normalized name of the package | ||
* @private | ||
* @param name The name of the package. | ||
* @returns Normalized name of the package | ||
* @internal | ||
*/ | ||
export function normalizePackageName(name: string) { | ||
export function normalizePackageName( | ||
name: string | ||
): {longName: string; shortName: string} { | ||
let normalizedName = name; | ||
|
||
if ( | ||
path.isAbsolute(name) || | ||
name.startsWith('./') || | ||
name.startsWith('../') || | ||
name.startsWith('.\\') || | ||
name.startsWith('..\\') | ||
Comment on lines
+27
to
+30
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. True, personally I like the readability of the current code as long as won't grow to more cases. |
||
) { | ||
return { | ||
longName: name, | ||
shortName: path.basename(name) || name, | ||
}; | ||
} | ||
|
||
/** | ||
* On Windows, name can come in with Windows slashes instead of Unix slashes. | ||
* Normalize to Unix first to avoid errors later on. | ||
|
@@ -61,40 +74,33 @@ export function normalizePackageName(name: string) { | |
normalizedName = `${prefix}-${normalizedName}`; | ||
} | ||
|
||
return normalizedName; | ||
return { | ||
longName: normalizedName, | ||
shortName: getShorthandName(normalizedName), | ||
}; | ||
} | ||
|
||
/** | ||
* Removes the prefix from a fullname. | ||
* @param {string} fullname The term which may have the prefix. | ||
* @returns {string} The term without prefix. | ||
* Removes the prefix from a fullName. | ||
* @param fullName The term which may have the prefix. | ||
* @returns The term without prefix. | ||
* @internal | ||
*/ | ||
export function getShorthandName(fullname: string) { | ||
if (fullname[0] === '@') { | ||
let matchResult = new RegExp(`^(@[^/]+)/${prefix}$`, 'u').exec(fullname); | ||
export function getShorthandName(fullName: string): string { | ||
if (fullName[0] === '@') { | ||
let matchResult = new RegExp(`^(@[^/]+)/${prefix}$`, 'u').exec(fullName); | ||
|
||
if (matchResult) { | ||
return matchResult[1]; | ||
} | ||
|
||
matchResult = new RegExp(`^(@[^/]+)/${prefix}-(.+)$`, 'u').exec(fullname); | ||
matchResult = new RegExp(`^(@[^/]+)/${prefix}-(.+)$`, 'u').exec(fullName); | ||
if (matchResult) { | ||
return `${matchResult[1]}/${matchResult[2]}`; | ||
} | ||
} else if (fullname.startsWith(`${prefix}-`)) { | ||
return fullname.slice(prefix.length + 1); | ||
} else if (fullName.startsWith(`${prefix}-`)) { | ||
return fullName.slice(prefix.length + 1); | ||
} | ||
|
||
return fullname; | ||
} | ||
|
||
/** | ||
* Gets the scope (namespace) of a term. | ||
* @param {string} term The term which may have the namespace. | ||
* @returns {string} The namepace of the term if it has one. | ||
*/ | ||
export function getNamespaceFromTerm(term: string) { | ||
const match = term.match(NAMESPACE_REGEX); | ||
|
||
return match ? match[0] : ''; | ||
return fullName; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://nodejs.org/api/path.html#path_path_isabsolute_path