mirror of
https://github.com/rohitg00/skillkit.git
synced 2026-11-19 02:13:58 +00:00
fix: address remaining CodeRabbit review suggestions
- Escape regex metacharacters in vague term patterns (fix.ts) - Improve diff algorithm using set-based comparison (fix.ts) - Fix validateSkill receiving file path instead of directory (validate.ts) - Check final section in completeness assessment (index.ts) - Add error handling and empty skills guard (compute-quality.ts)
This commit is contained in:
@@ -105,7 +105,8 @@ function generateFixes(content: string, quality: QualityScore, skillName: string
|
||||
}
|
||||
|
||||
for (const [vague, replacement] of Object.entries(VAGUE_TERM_REPLACEMENTS)) {
|
||||
const regex = new RegExp(vague, 'gi');
|
||||
const escaped = vague.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
const regex = new RegExp(escaped, 'gi');
|
||||
if (regex.test(content)) {
|
||||
fixes.push({
|
||||
type: 'replace',
|
||||
@@ -148,7 +149,8 @@ function applyFixes(content: string, fixes: FixSuggestion[]): string {
|
||||
result = result.trimEnd() + '\n' + fix.replacement;
|
||||
}
|
||||
} else if (fix.type === 'replace' && fix.original && fix.automatic) {
|
||||
const regex = new RegExp(fix.original, 'gi');
|
||||
const escaped = fix.original.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
const regex = new RegExp(escaped, 'gi');
|
||||
result = result.replace(regex, fix.replacement);
|
||||
}
|
||||
}
|
||||
@@ -351,33 +353,31 @@ export class FixCommand extends Command {
|
||||
function generateDiff(original: string, modified: string): string {
|
||||
const originalLines = original.split('\n');
|
||||
const modifiedLines = modified.split('\n');
|
||||
|
||||
const originalSet = new Set(originalLines);
|
||||
const modifiedSet = new Set(modifiedLines);
|
||||
|
||||
const added = modifiedLines.filter(line => !originalSet.has(line));
|
||||
const removed = originalLines.filter(line => !modifiedSet.has(line));
|
||||
|
||||
const diff: string[] = [];
|
||||
|
||||
let i = 0;
|
||||
let j = 0;
|
||||
|
||||
while (i < modifiedLines.length || j < originalLines.length) {
|
||||
if (i < modifiedLines.length && (j >= originalLines.length || modifiedLines[i] !== originalLines[j])) {
|
||||
if (i < 10 || i >= modifiedLines.length - 3) {
|
||||
diff.push(colors.success(`+ ${modifiedLines[i]}`));
|
||||
}
|
||||
i++;
|
||||
} else if (j < originalLines.length && (i >= modifiedLines.length || originalLines[j] !== modifiedLines[i])) {
|
||||
if (j < 10) {
|
||||
diff.push(colors.error(`- ${originalLines[j]}`));
|
||||
}
|
||||
j++;
|
||||
} else {
|
||||
if (i < 5) {
|
||||
diff.push(colors.muted(` ${modifiedLines[i]}`));
|
||||
}
|
||||
i++;
|
||||
j++;
|
||||
}
|
||||
for (const line of removed.slice(0, 5)) {
|
||||
diff.push(colors.error(`- ${line}`));
|
||||
}
|
||||
if (removed.length > 5) {
|
||||
diff.push(colors.muted(` ... and ${removed.length - 5} more removed`));
|
||||
}
|
||||
|
||||
if (diff.length > 20) {
|
||||
return diff.slice(0, 20).join('\n') + '\n' + colors.muted(`... and ${diff.length - 20} more lines`);
|
||||
for (const line of added.slice(0, 10)) {
|
||||
diff.push(colors.success(`+ ${line}`));
|
||||
}
|
||||
if (added.length > 10) {
|
||||
diff.push(colors.muted(` ... and ${added.length - 10} more added`));
|
||||
}
|
||||
|
||||
if (diff.length === 0) {
|
||||
diff.push(colors.muted(' (no visible changes)'));
|
||||
}
|
||||
|
||||
return diff.join('\n');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { existsSync, readdirSync, statSync } from 'node:fs';
|
||||
import { join, basename, resolve } from 'node:path';
|
||||
import { join, basename, resolve, dirname } from 'node:path';
|
||||
import { Command, Option } from 'clipanion';
|
||||
import {
|
||||
validateSkill,
|
||||
@@ -259,7 +259,8 @@ export class ValidateCommand extends Command {
|
||||
}
|
||||
} else {
|
||||
const isFile = resolved.endsWith('.md') || resolved.endsWith('.mdc');
|
||||
const formatResult = this.quality ? { valid: true, errors: [] } : validateSkill(resolved);
|
||||
const skillDir = isFile ? dirname(resolved) : resolved;
|
||||
const formatResult = this.quality ? { valid: true, errors: [] } : validateSkill(skillDir);
|
||||
const quality = isFile ? evaluateSkillFile(resolved) : evaluateSkillDirectory(resolved);
|
||||
results.push({
|
||||
name: basename(target),
|
||||
|
||||
@@ -340,6 +340,15 @@ function assessCompleteness(content: string): CompletenessResult {
|
||||
}
|
||||
}
|
||||
|
||||
if (headerPositions.length > 0) {
|
||||
const last = headerPositions[headerPositions.length - 1];
|
||||
const tailContent = content.slice(last.index + last.header.length).trim();
|
||||
if (tailContent.length < 20) {
|
||||
const sectionName = last.header.replace(/^#+\s+/, '');
|
||||
emptySections.push(sectionName);
|
||||
}
|
||||
}
|
||||
|
||||
const codeBlocks = countCodeBlocks(content);
|
||||
const exampleCoverage = Math.min(100, codeBlocks * 25);
|
||||
|
||||
|
||||
@@ -92,11 +92,24 @@ function computeDefaultQuality(skill: Skill): number {
|
||||
return Math.min(100, score);
|
||||
}
|
||||
|
||||
function main() {
|
||||
function main(): void {
|
||||
const skillsPath = join(__dirname, '../marketplace/skills.json');
|
||||
|
||||
console.log('Reading skills.json...');
|
||||
const data = JSON.parse(readFileSync(skillsPath, 'utf-8')) as SkillsIndex;
|
||||
|
||||
let data: SkillsIndex;
|
||||
try {
|
||||
const content = readFileSync(skillsPath, 'utf-8');
|
||||
data = JSON.parse(content) as SkillsIndex;
|
||||
} catch (err) {
|
||||
console.error(`Failed to read or parse skills.json: ${err instanceof Error ? err.message : String(err)}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (!data.skills || data.skills.length === 0) {
|
||||
console.log('No skills found in skills.json');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`Processing ${data.skills.length} skills...`);
|
||||
|
||||
@@ -118,10 +131,19 @@ function main() {
|
||||
|
||||
console.log(`Updated ${updated} skills with quality scores`);
|
||||
console.log(`Verified sources: ${verified} skills (quality >= 85)`);
|
||||
console.log(`Average quality: ${Math.round(data.skills.reduce((sum, s) => sum + (s.quality || 70), 0) / data.skills.length)}`);
|
||||
|
||||
writeFileSync(skillsPath, JSON.stringify(data, null, 2) + '\n');
|
||||
console.log('Saved skills.json');
|
||||
const averageQuality = Math.round(
|
||||
data.skills.reduce((sum, s) => sum + (s.quality || 70), 0) / data.skills.length
|
||||
);
|
||||
console.log(`Average quality: ${averageQuality}`);
|
||||
|
||||
try {
|
||||
writeFileSync(skillsPath, JSON.stringify(data, null, 2) + '\n');
|
||||
console.log('Saved skills.json');
|
||||
} catch (err) {
|
||||
console.error(`Failed to write skills.json: ${err instanceof Error ? err.message : String(err)}`);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
|
||||
Reference in New Issue
Block a user