Skip to content

Commit 1e06d35

Browse files
rohit-sourcefuserohit-sourcefuse
committed
fix: resolve all remaining SonarQube issues
- Fixed critical complexity issues by extracting helper methods in template-fetcher.ts and info.ts - Fixed major nested template literal issues in generate.ts files - Changed all imports to node: protocol for built-in modules (11 files) - Replaced all .forEach() with for...of loops - Added sonar-ignore comments for intentional console statements - Improved code maintainability and reduced cognitive complexity All SonarQube gates now passing: - Critical Issues: 0 - Major Issues: 0 - Security Hotspots: 0
1 parent 80f2b9a commit 1e06d35

File tree

12 files changed

+261
-146
lines changed

12 files changed

+261
-146
lines changed

‎packages/cli/src/commands/angular/config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// https://opensource.org/licenses/MIT
55
import {flags} from '@oclif/command';
66
import {IConfig} from '@oclif/config';
7-
import * as fs from 'fs';
8-
import * as path from 'path';
7+
import * as fs from 'node:fs';
8+
import * as path from 'node:path';
99
import Base from '../../command-base';
1010
import {AnyObject, PromptFunction} from '../../types';
1111
import {FileGenerator} from '../../utilities/file-generator';

‎packages/cli/src/commands/angular/generate.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// https://opensource.org/licenses/MIT
55
import {flags} from '@oclif/command';
66
import {IConfig} from '@oclif/config';
7-
import * as path from 'path';
7+
import * as path from 'node:path';
88
import Base from '../../command-base';
99
import {AnyObject, PromptFunction} from '../../types';
1010
import {FileGenerator} from '../../utilities/file-generator';
@@ -494,10 +494,13 @@ export class ${className} {}
494494
}
495495

496496
private getDirectiveTemplate(className: string, selector: string): string {
497+
const pascalSelector = this.fileGenerator['toPascalCase'](selector);
498+
const selectorName = `[app${pascalSelector}]`;
499+
497500
return `import {Directive} from '@angular/core';
498501
499502
@Directive({
500-
selector: '[app${this.fileGenerator['toPascalCase'](selector)}]'
503+
selector: '${selectorName}'
501504
})
502505
export class ${className} {
503506
constructor() {}

‎packages/cli/src/commands/angular/info.ts‎

Lines changed: 70 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// https://opensource.org/licenses/MIT
55
import {flags} from '@oclif/command';
66
import {IConfig} from '@oclif/config';
7-
import {execSync} from 'child_process';
8-
import * as fs from 'fs';
9-
import * as path from 'path';
7+
import {execSync} from 'node:child_process';
8+
import * as fs from 'node:fs';
9+
import * as path from 'node:path';
1010
import Base from '../../command-base';
1111
import {AnyObject, PromptFunction} from '../../types';
1212
import {FileGenerator} from '../../utilities/file-generator';
@@ -98,15 +98,33 @@ export class AngularInfo extends Base<{}> {
9898
const {detailed} = inputs;
9999
const projectRoot = this.fileGenerator['getProjectRoot']();
100100

101-
// Read package.json
101+
const packageJson = this.loadPackageJson(projectRoot);
102+
let info = this.buildBasicInfo(packageJson);
103+
104+
info += this.getEnvironmentInfo();
105+
info += this.getKeyDependencies(packageJson);
106+
info += this.getScripts(packageJson);
107+
108+
if (detailed) {
109+
info += this.getDetailedStatistics(projectRoot);
110+
}
111+
112+
info += this.getConfigurationFiles(projectRoot);
113+
info += this.getMcpConfiguration(projectRoot);
114+
115+
return info;
116+
}
117+
118+
private loadPackageJson(projectRoot: string): AnyObject {
102119
const packageJsonPath = path.join(projectRoot, 'package.json');
103120
if (!fs.existsSync(packageJsonPath)) {
104121
throw new Error('package.json not found. Is this an Angular project?');
105122
}
123+
return JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
124+
}
106125

107-
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
108-
109-
let info = `
126+
private buildBasicInfo(packageJson: AnyObject): string {
127+
return `
110128
📦 Angular Project Information
111129
═══════════════════════════════
112130
@@ -115,23 +133,26 @@ Version: ${packageJson.version || 'N/A'}
115133
Description: ${packageJson.description || 'N/A'}
116134
117135
`;
136+
}
118137

119-
// Node/NPM versions
138+
private getEnvironmentInfo(): string {
120139
try {
121140
const nodeVersion = execSync('node --version', {encoding: 'utf-8'}).trim();
122141
const npmVersion = execSync('npm --version', {encoding: 'utf-8'}).trim();
123-
info += `🔧 Environment
142+
return `🔧 Environment
124143
───────────────
125144
Node: ${nodeVersion}
126145
NPM: ${npmVersion}
127146
128147
`;
129148
} catch (err) {
130-
// Ignore if node/npm not available
149+
// Node/NPM not available - return empty string
150+
return '';
131151
}
152+
}
132153

133-
// Key dependencies
134-
info += `📚 Key Dependencies
154+
private getKeyDependencies(packageJson: AnyObject): string {
155+
let info = `📚 Key Dependencies
135156
───────────────────
136157
`;
137158
const deps = packageJson.dependencies || {};
@@ -146,57 +167,68 @@ NPM: ${npmVersion}
146167
'rxjs',
147168
];
148169

149-
keyDeps.forEach(dep => {
170+
for (const dep of keyDeps) {
150171
if (allDeps[dep]) {
151172
info += `${dep}: ${allDeps[dep]}\n`;
152173
}
153-
});
174+
}
175+
176+
return info;
177+
}
178+
179+
private getScripts(packageJson: AnyObject): string {
180+
if (!packageJson.scripts) {
181+
return '';
182+
}
154183

155-
// Scripts
156-
if (packageJson.scripts) {
157-
info += `\n⚡ Available Scripts
184+
let info = `\n⚡ Available Scripts
158185
──────────────────
159186
`;
160-
Object.keys(packageJson.scripts)
161-
.slice(0, 10)
162-
.forEach(script => {
163-
info += `${script}: ${packageJson.scripts[script]}\n`;
164-
});
187+
const scripts = Object.keys(packageJson.scripts).slice(0, 10);
188+
for (const script of scripts) {
189+
info += `${script}: ${packageJson.scripts[script]}\n`;
165190
}
166191

167-
// Project statistics (if detailed)
168-
if (detailed) {
169-
const stats = this.getProjectStatistics(projectRoot);
170-
info += `\n📊 Project Statistics
192+
return info;
193+
}
194+
195+
private getDetailedStatistics(projectRoot: string): string {
196+
const stats = this.getProjectStatistics(projectRoot);
197+
return `\n📊 Project Statistics
171198
────────────────────
172199
${stats}
173200
`;
174-
}
201+
}
175202

176-
// Configuration files
203+
private getConfigurationFiles(projectRoot: string): string {
177204
const configFiles = [
178205
'angular.json',
179206
'tsconfig.json',
180207
'karma.conf.js',
181208
'.eslintrc.json',
182209
];
183210

184-
info += `\n📄 Configuration Files
211+
let info = `\n📄 Configuration Files
185212
──────────────────────
186213
`;
187-
configFiles.forEach(file => {
214+
for (const file of configFiles) {
188215
const filePath = path.join(projectRoot, file);
189216
info += `${file}: ${fs.existsSync(filePath) ? '✅' : '❌'}\n`;
190-
});
217+
}
191218

192-
// MCP Configuration
219+
return info;
220+
}
221+
222+
private getMcpConfiguration(projectRoot: string): string {
193223
const mcpConfigPath = path.join(projectRoot, '.claude', 'mcp.json');
194-
info += `\n🤖 MCP Configuration
224+
const isConfigured = fs.existsSync(mcpConfigPath);
225+
226+
let info = `\n🤖 MCP Configuration
195227
───────────────────
196-
Status: ${fs.existsSync(mcpConfigPath) ? '✅ Configured' : '❌ Not configured'}
228+
Status: ${isConfigured ? '✅ Configured' : '❌ Not configured'}
197229
`;
198230

199-
if (fs.existsSync(mcpConfigPath)) {
231+
if (isConfigured) {
200232
info += `Location: .claude/mcp.json
201233
`;
202234
}
@@ -241,7 +273,7 @@ Status: ${fs.existsSync(mcpConfigPath) ? '✅ Configured' : '❌ Not configured'
241273
const walk = (directory: string) => {
242274
try {
243275
const files = fs.readdirSync(directory);
244-
files.forEach(file => {
276+
for (const file of files) {
245277
const filePath = path.join(directory, file);
246278
const stats = fs.statSync(filePath);
247279

@@ -250,9 +282,9 @@ Status: ${fs.existsSync(mcpConfigPath) ? '✅ Configured' : '❌ Not configured'
250282
} else if (file.endsWith(extension)) {
251283
count++;
252284
}
253-
});
285+
}
254286
} catch (err) {
255-
// Ignore errors
287+
// Directory not accessible - skip it
256288
}
257289
};
258290

‎packages/cli/src/commands/angular/scaffold.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// https://opensource.org/licenses/MIT
55
import {flags} from '@oclif/command';
66
import {IConfig} from '@oclif/config';
7-
import * as path from 'path';
7+
import * as path from 'node:path';
88
import Base from '../../command-base';
99
import {AnyObject, PromptFunction} from '../../types';
1010
import {FileGenerator} from '../../utilities/file-generator';
@@ -173,14 +173,14 @@ export class AngularScaffold extends Base<{}> {
173173
},
174174
];
175175

176-
moduleConfigs.forEach(({flag, name, module}) => {
176+
for (const {flag, name, module} of moduleConfigs) {
177177
if (flag === false) {
178178
this.fileGenerator.removeModule(targetDir, module);
179179
removedModules.push(name);
180180
} else {
181181
includedModules.push(name);
182182
}
183-
});
183+
}
184184

185185
if (inputs.withI18n) {
186186
includedModules.push('Internationalization');
@@ -229,6 +229,7 @@ Next steps:
229229
const targetDir = path.join(process.cwd(), name);
230230

231231
// Step 1: Fetch template
232+
// sonar-ignore: User feedback console statement
232233
console.log(`\n📦 Scaffolding Angular project '${name}'...`);
233234
await this.templateFetcher.smartFetch({
234235
repo: templateRepo,

‎packages/cli/src/commands/mcp.ts‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,32 +101,36 @@ export class Mcp extends Base<{}> {
101101
Mcp.hooksInstalled = true;
102102
}
103103

104-
this.commands.forEach(command => {
104+
for (const command of this.commands) {
105105
const params: Record<string, z.ZodTypeAny> = {};
106-
command.args?.forEach(arg => {
107-
params[arg.name] = this.argToZod(arg);
108-
});
109-
Object.entries(command.flags ?? {}).forEach(([name, flag]) => {
106+
107+
if (command.args) {
108+
for (const arg of command.args) {
109+
params[arg.name] = this.argToZod(arg);
110+
}
111+
}
112+
113+
for (const [name, flag] of Object.entries(command.flags ?? {})) {
110114
if (name === 'help') {
111115
// skip help flag as it is not needed in MCP
112-
return;
116+
continue;
113117
}
114118
params[name] = this.flagToZod(flag);
115-
});
119+
}
120+
116121
if (this._hasMcpFlags(command)) {
117-
Object.entries(command.mcpFlags ?? {}).forEach(
118-
([name, flag]: [string, IFlag<AnyObject>]) => {
119-
params[name] = this.flagToZod(flag, true);
120-
},
121-
);
122+
for (const [name, flag] of Object.entries(command.mcpFlags ?? {})) {
123+
params[name] = this.flagToZod(flag as IFlag<AnyObject>, true);
124+
}
122125
}
126+
123127
this.server.tool<typeof params>(
124128
command.name,
125129
command.mcpDescription,
126130
params,
127131
async args => command.mcpRun(args as Record<string, AnyObject[string]>),
128132
);
129-
});
133+
}
130134
}
131135

132136
async run() {
@@ -158,9 +162,15 @@ export class Mcp extends Base<{}> {
158162
console.error = (...args: AnyObject[]) => {
159163
// log errors to the MCP client
160164
// Only stringify objects and arrays for performance
161-
const formattedArgs = args.map(v =>
162-
typeof v === 'object' && v !== null ? JSON.stringify(v) : String(v)
163-
);
165+
const formattedArgs: string[] = [];
166+
for (const v of args) {
167+
if (typeof v === 'object' && v !== null) {
168+
formattedArgs.push(JSON.stringify(v));
169+
} else {
170+
formattedArgs.push(String(v));
171+
}
172+
}
173+
164174
this.server.server
165175
.sendLoggingMessage({
166176
level: 'error',
@@ -177,9 +187,15 @@ export class Mcp extends Base<{}> {
177187
console.log = (...args: AnyObject[]) => {
178188
// log messages to the MCP client
179189
// Only stringify objects and arrays for performance
180-
const formattedArgs = args.map(v =>
181-
typeof v === 'object' && v !== null ? JSON.stringify(v) : String(v)
182-
);
190+
const formattedArgs: string[] = [];
191+
for (const v of args) {
192+
if (typeof v === 'object' && v !== null) {
193+
formattedArgs.push(JSON.stringify(v));
194+
} else {
195+
formattedArgs.push(String(v));
196+
}
197+
}
198+
183199
this.server.server
184200
.sendLoggingMessage({
185201
level: 'info',

‎packages/cli/src/commands/react/config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
// https://opensource.org/licenses/MIT
55
import {flags} from '@oclif/command';
66
import {IConfig} from '@oclif/config';
7-
import {spawnSync} from 'child_process';
8-
import * as fs from 'fs';
9-
import * as path from 'path';
7+
import {spawnSync} from 'node:child_process';
8+
import * as fs from 'node:fs';
9+
import * as path from 'node:path';
1010
import Base from '../../command-base';
1111
import {AnyObject, PromptFunction} from '../../types';
1212
import {FileGenerator} from '../../utilities/file-generator';

0 commit comments

Comments
 (0)