From 3225f7a00abceef03c8ea1bd0d6bfee0ad27a9ef Mon Sep 17 00:00:00 2001 From: Lucas Vieira Date: Fri, 13 Dec 2024 11:59:18 -0300 Subject: [PATCH] refactor(nx-python): sonarcloud code smells fixes --- .../generators/release-version/utils/package.ts | 2 +- .../src/provider/poetry/build/resolvers/locked.ts | 6 +----- .../src/provider/poetry/build/resolvers/project.ts | 10 +++------- packages/nx-python/src/provider/poetry/provider.ts | 14 +++++++------- .../src/provider/uv/build/resolvers/locked.ts | 2 +- .../src/provider/uv/build/resolvers/project.ts | 8 ++++---- packages/nx-python/src/provider/uv/provider.ts | 4 ++-- 7 files changed, 19 insertions(+), 27 deletions(-) diff --git a/packages/nx-python/src/generators/release-version/utils/package.ts b/packages/nx-python/src/generators/release-version/utils/package.ts index 26e95f0..538c212 100644 --- a/packages/nx-python/src/generators/release-version/utils/package.ts +++ b/packages/nx-python/src/generators/release-version/utils/package.ts @@ -7,7 +7,7 @@ export class Package { location: string; constructor( - private provider: IProvider, + private readonly provider: IProvider, workspaceRoot: string, private workspaceRelativeLocation: string, ) { diff --git a/packages/nx-python/src/provider/poetry/build/resolvers/locked.ts b/packages/nx-python/src/provider/poetry/build/resolvers/locked.ts index dc83498..bf11482 100644 --- a/packages/nx-python/src/provider/poetry/build/resolvers/locked.ts +++ b/packages/nx-python/src/provider/poetry/build/resolvers/locked.ts @@ -13,11 +13,7 @@ import { PackageDependency } from '../../../base'; import { getLoggingTab } from '../../../utils'; export class LockedDependencyResolver { - private logger: Logger; - - constructor(logger: Logger) { - this.logger = logger; - } + constructor(private readonly logger: Logger) {} public resolve( root: string, diff --git a/packages/nx-python/src/provider/poetry/build/resolvers/project.ts b/packages/nx-python/src/provider/poetry/build/resolvers/project.ts index baafc0e..b0f84fa 100644 --- a/packages/nx-python/src/provider/poetry/build/resolvers/project.ts +++ b/packages/nx-python/src/provider/poetry/build/resolvers/project.ts @@ -12,14 +12,10 @@ import { PackageDependency } from '../../../base'; import { getLoggingTab } from '../../../utils'; export class ProjectDependencyResolver { - private logger: Logger; - private options: BuildExecutorSchema; - private context: ExecutorContext; - constructor( - logger: Logger, - options: BuildExecutorSchema, - context: ExecutorContext, + private readonly logger: Logger, + private readonly options: BuildExecutorSchema, + private readonly context: ExecutorContext, ) { this.logger = logger; this.options = options; diff --git a/packages/nx-python/src/provider/poetry/provider.ts b/packages/nx-python/src/provider/poetry/provider.ts index 77258b6..c5bcc99 100644 --- a/packages/nx-python/src/provider/poetry/provider.ts +++ b/packages/nx-python/src/provider/poetry/provider.ts @@ -83,8 +83,8 @@ export class PoetryProvider implements IProvider { : getPyprojectData(pyprojectTomlPath); return { - name: projectData?.tool?.poetry?.name as string, - version: projectData?.tool?.poetry?.version as string, + name: projectData?.tool?.poetry?.name, + version: projectData?.tool?.poetry?.version, }; } @@ -127,8 +127,8 @@ export class PoetryProvider implements IProvider { ); return { - name: dependentPyproject.tool?.poetry?.name as string, - version: dependentPyproject.tool?.poetry?.version as string, + name: dependentPyproject.tool?.poetry?.name, + version: dependentPyproject.tool?.poetry?.version, group: 'main', }; } @@ -152,8 +152,8 @@ export class PoetryProvider implements IProvider { ); return { - name: dependentPyproject.tool?.poetry?.name as string, - version: dependentPyproject.tool?.poetry?.version as string, + name: dependentPyproject.tool?.poetry?.name, + version: dependentPyproject.tool?.poetry?.version, group: key, }; } @@ -582,7 +582,7 @@ export class PoetryProvider implements IProvider { activateVenv(workspaceRoot); await checkPoetryExecutable(); - return await runPoetry(['run', ...args], options); + runPoetry(['run', ...args], options); } public activateVenv(workspaceRoot: string): void { diff --git a/packages/nx-python/src/provider/uv/build/resolvers/locked.ts b/packages/nx-python/src/provider/uv/build/resolvers/locked.ts index e6b9b1e..324939a 100644 --- a/packages/nx-python/src/provider/uv/build/resolvers/locked.ts +++ b/packages/nx-python/src/provider/uv/build/resolvers/locked.ts @@ -10,7 +10,7 @@ import { includeDependencyPackage } from './utils'; import { existsSync } from 'fs'; export class LockedDependencyResolver { - constructor(private logger: Logger) {} + constructor(private readonly logger: Logger) {} public resolve( projectRoot: string, diff --git a/packages/nx-python/src/provider/uv/build/resolvers/project.ts b/packages/nx-python/src/provider/uv/build/resolvers/project.ts index 85aba7c..f9a86ba 100644 --- a/packages/nx-python/src/provider/uv/build/resolvers/project.ts +++ b/packages/nx-python/src/provider/uv/build/resolvers/project.ts @@ -13,9 +13,9 @@ import { createHash } from 'crypto'; export class ProjectDependencyResolver { constructor( - private logger: Logger, - private options: BuildExecutorSchema, - private context: ExecutorContext, + private readonly logger: Logger, + private readonly options: BuildExecutorSchema, + private readonly context: ExecutorContext, ) {} resolve( @@ -111,7 +111,7 @@ export class ProjectDependencyResolver { continue; } - const match = dependency.match(/^[a-zA-Z0-9-]+/); + const match = /^[a-zA-Z0-9-]+/.exec(dependency); if (match) { if (depMap[match[0]]) { continue; diff --git a/packages/nx-python/src/provider/uv/provider.ts b/packages/nx-python/src/provider/uv/provider.ts index f408f78..399236b 100644 --- a/packages/nx-python/src/provider/uv/provider.ts +++ b/packages/nx-python/src/provider/uv/provider.ts @@ -73,8 +73,8 @@ export class UVProvider implements IProvider { : getPyprojectData(pyprojectTomlPath); return { - name: projectData?.project?.name as string, - version: projectData?.project?.version as string, + name: projectData?.project?.name, + version: projectData?.project?.version, }; }