miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(linter): plugin-lint-checks should allow some strings as valid versions (#10647)

Browse Source
This commit is contained in:
Craigory Coppola 2022-06-09 09:27:31 -04:00 committed by GitHub
parent 8c4d4139ce
commit 7f4abd9e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts
View File

@ -21,6 +21,7 @@ type Options = [
executorsJson?: string; executorsJson?: string;
migrationsJson?: string; migrationsJson?: string;
packageJson?: string; packageJson?: string;
allowedVersionStrings: string[];
} }
]; ];
@ -29,6 +30,7 @@ const DEFAULT_OPTIONS = {
executorsJson: 'executors.json', executorsJson: 'executors.json',
migrationsJson: 'migrations.json', migrationsJson: 'migrations.json',
packageJson: 'package.json', packageJson: 'package.json',
allowedVersionStrings: ['*', 'latest', 'next'],
}; };
export type MessageIds = export type MessageIds =
@ -135,6 +137,7 @@ function normalizeOptions(
): Options[0] { ): Options[0] {
const base = { ...DEFAULT_OPTIONS, ...options }; const base = { ...DEFAULT_OPTIONS, ...options };
return { return {
...base,
executorsJson: base.executorsJson executorsJson: base.executorsJson
? `${sourceProject.data.root}/${base.executorsJson}` ? `${sourceProject.data.root}/${base.executorsJson}`
: undefined, : undefined,
@ -437,7 +440,9 @@ export function validatePackageGroup(
const key = (packageNode?.value as AST.JSONLiteral)?.value ?? 'unknown'; const key = (packageNode?.value as AST.JSONLiteral)?.value ?? 'unknown';
if (versionPropertyNode) { if (versionPropertyNode) {
if (!validateVersionJsonExpression(versionPropertyNode.value)) if (
!validateVersionJsonExpression(versionPropertyNode.value, context)
)
context.report({ context.report({
messageId: 'invalidVersion', messageId: 'invalidVersion',
data: { key }, data: { key },
@ -456,7 +461,7 @@ export function validatePackageGroup(
const properties = packageGroupNode.value.properties; const properties = packageGroupNode.value.properties;
// For each property, ensure its value is a valid version // For each property, ensure its value is a valid version
for (const propertyNode of properties) { for (const propertyNode of properties) {
if (!validateVersionJsonExpression(propertyNode.value)) { if (!validateVersionJsonExpression(propertyNode.value, context)) {
context.report({ context.report({
messageId: 'invalidVersion', messageId: 'invalidVersion',
data: { data: {
@ -470,11 +475,15 @@ export function validatePackageGroup(
} }
} }
export function validateVersionJsonExpression(node: AST.JSONExpression) { export function validateVersionJsonExpression(
node: AST.JSONExpression,
context: TSESLint.RuleContext<MessageIds, Options>
) {
return ( return (
node && node &&
node.type === 'JSONLiteral' && node.type === 'JSONLiteral' &&
typeof node.value === 'string' && typeof node.value === 'string' &&
valid(node.value) (valid(node.value) ||
context.options[0]?.allowedVersionStrings.includes(node.value))
); );
} }