Skip to content

Commit

Permalink
refactor(nx-python): sonarcloud code smells fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasvieirasilva committed Dec 13, 2024
1 parent 31e1096 commit 3225f7a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export class Package {
location: string;

constructor(
private provider: IProvider,
private readonly provider: IProvider,
workspaceRoot: string,
private workspaceRelativeLocation: string,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions packages/nx-python/src/provider/poetry/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ export class PoetryProvider implements IProvider {
: getPyprojectData<PoetryPyprojectToml>(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,
};
}

Expand Down Expand Up @@ -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',
};
}
Expand All @@ -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,
};
}
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions packages/nx-python/src/provider/uv/build/resolvers/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/nx-python/src/provider/uv/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ export class UVProvider implements IProvider {
: getPyprojectData<UVPyprojectToml>(pyprojectTomlPath);

return {
name: projectData?.project?.name as string,
version: projectData?.project?.version as string,
name: projectData?.project?.name,
version: projectData?.project?.version,
};
}

Expand Down

0 comments on commit 3225f7a

Please sign in to comment.