* feat(#2982): extend no-source-grep lint to catch var-binding readFileSync.includes() The base lint (scripts/lint-no-source-grep.cjs) only catches readFileSync(...).<text-method>() chained directly. The much more common var-binding form escapes it: const src = fs.readFileSync(p, 'utf8'); // 50 lines later if (src.includes('foo')) {} // ← still grep, lint missed it Scan of the test suite found ~141 files using this pattern. Implementation built TDD per #2982 with structured-IR assertions: scripts/lint-no-source-grep-extras.cjs - detectVarBindingViolations(src) — pure detector, two passes: pass 1 collects vars bound from readFileSync, pass 2 finds any <var>.<includes|startsWith|endsWith|match|search>( on those vars. - detectWrappedAssertOkMatch(src) — flags assert.ok(<expr>.match(...)) which escapes the assert.match rule. - VIOLATION enum exposes stable codes for tests to assert on. scripts/lint-no-source-grep.cjs - Wires the new detectors into the existing per-file check; one additional violation row per file with the first 3 sample tokens. tests/bug-2982-lint-var-binding.test.cjs - 13 tests, all assertions on typed VIOLATION enum / structured records. Covers all 5 text-match methods, multi-var, no-bind, string literal (must NOT trigger), wrapped assert.ok(.match), and assert.match (must NOT double-flag). Migration backlog (#2974 expanded scope): - 42 files annotated `// allow-test-rule: source-text-is-the-product` (legitimate — they read .md/.json/.yml files whose deployed text IS the product) - 3 files annotated `// allow-test-rule: pending-migration-to-typed-ir [#2974]` (read .cjs/.js source — clear migration debt) - 95 files annotated `pending-migration-to-typed-ir [#2974]` with `Per-file review may reclassify as source-text-is-the-product during migration` (mixed — manual review under #2974) After this lands the lint reports 0 violations on main; new violations in PRs surface immediately. Closes #2982 Refs #2974 * test(#2982): fix truncated test name per CR The label ended with a bare '(' from a copy-paste mishap. Now reads 'does NOT flag .matchAll(...) — matchAll is not match, so assert.ok(.matchAll(...)) is not flagged'. * chore(#2982): add changeset fragment for PR #2985 * chore(#2982): add changeset fragment for PR #2985
192 lines
5.8 KiB
JavaScript
192 lines
5.8 KiB
JavaScript
// allow-test-rule: pending-migration-to-typed-ir [#2974]
|
|
// Tracked in #2974 for migration to typed-IR assertions per CONTRIBUTING.md
|
|
// "Prohibited: Raw Text Matching on Test Outputs". Per-file review may
|
|
// reclassify some entries as source-text-is-the-product during migration.
|
|
|
|
/**
|
|
* GSD Tools Tests - settings.json JSONC (JSON with comments) support
|
|
*
|
|
* Validates that the installer's readSettings() correctly handles
|
|
* settings.json files containing comments (line and block) without
|
|
* silently overwriting them with empty objects.
|
|
*
|
|
* Closes: #1461
|
|
*/
|
|
|
|
const { test, describe, beforeEach, afterEach } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
|
|
// ─── inline stripJsonComments (mirrors install.js logic) ─────────────────────
|
|
|
|
function stripJsonComments(text) {
|
|
let result = '';
|
|
let i = 0;
|
|
let inString = false;
|
|
let stringChar = '';
|
|
while (i < text.length) {
|
|
if (inString) {
|
|
if (text[i] === '\\') {
|
|
result += text[i] + (text[i + 1] || '');
|
|
i += 2;
|
|
continue;
|
|
}
|
|
if (text[i] === stringChar) {
|
|
inString = false;
|
|
}
|
|
result += text[i];
|
|
i++;
|
|
continue;
|
|
}
|
|
if (text[i] === '"' || text[i] === "'") {
|
|
inString = true;
|
|
stringChar = text[i];
|
|
result += text[i];
|
|
i++;
|
|
continue;
|
|
}
|
|
if (text[i] === '/' && text[i + 1] === '/') {
|
|
while (i < text.length && text[i] !== '\n') i++;
|
|
continue;
|
|
}
|
|
if (text[i] === '/' && text[i + 1] === '*') {
|
|
i += 2;
|
|
while (i < text.length && !(text[i] === '*' && text[i + 1] === '/')) i++;
|
|
i += 2;
|
|
continue;
|
|
}
|
|
result += text[i];
|
|
i++;
|
|
}
|
|
return result.replace(/,\s*([}\]])/g, '$1');
|
|
}
|
|
|
|
// ─── tests ───────────────────────────────────────────────────────────────────
|
|
|
|
describe('stripJsonComments (#1461)', () => {
|
|
|
|
test('strips line comments', () => {
|
|
const input = `{
|
|
// This is a comment
|
|
"key": "value"
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.deepStrictEqual(result, { key: 'value' });
|
|
});
|
|
|
|
test('strips block comments', () => {
|
|
const input = `{
|
|
/* Block comment */
|
|
"key": "value"
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.deepStrictEqual(result, { key: 'value' });
|
|
});
|
|
|
|
test('strips multi-line block comments', () => {
|
|
const input = `{
|
|
/*
|
|
* Multi-line
|
|
* block comment
|
|
*/
|
|
"key": "value"
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.deepStrictEqual(result, { key: 'value' });
|
|
});
|
|
|
|
test('preserves comments inside string values', () => {
|
|
const input = `{
|
|
"url": "https://example.com/path",
|
|
"description": "Use // for line comments"
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.strictEqual(result.url, 'https://example.com/path');
|
|
assert.strictEqual(result.description, 'Use // for line comments');
|
|
});
|
|
|
|
test('handles trailing commas', () => {
|
|
const input = `{
|
|
"a": 1,
|
|
"b": 2,
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.deepStrictEqual(result, { a: 1, b: 2 });
|
|
});
|
|
|
|
test('handles inline comments after values', () => {
|
|
const input = `{
|
|
"timeout": 5000, // milliseconds
|
|
"retries": 3 // max attempts
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.strictEqual(result.timeout, 5000);
|
|
assert.strictEqual(result.retries, 3);
|
|
});
|
|
|
|
test('handles standard JSON (no comments) unchanged', () => {
|
|
const input = '{"key": "value", "num": 42}';
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.deepStrictEqual(result, { key: 'value', num: 42 });
|
|
});
|
|
|
|
test('handles empty object', () => {
|
|
const result = JSON.parse(stripJsonComments('{}'));
|
|
assert.deepStrictEqual(result, {});
|
|
});
|
|
|
|
test('handles real-world settings.json with comments', () => {
|
|
const input = `{
|
|
// My configuration
|
|
"hooks": {
|
|
"SessionStart": [
|
|
{
|
|
"matcher": "", /* match all */
|
|
"hooks": [
|
|
{
|
|
"type": "command",
|
|
"command": "node ~/.claude/hooks/gsd-statusline.js"
|
|
}
|
|
]
|
|
}
|
|
]
|
|
},
|
|
"statusLine": {
|
|
"command": "node ~/.claude/hooks/gsd-statusline.js",
|
|
"refreshInterval": 10
|
|
}
|
|
}`;
|
|
const result = JSON.parse(stripJsonComments(input));
|
|
assert.ok(result.hooks, 'should have hooks');
|
|
assert.ok(result.statusLine, 'should have statusLine');
|
|
assert.strictEqual(result.statusLine.refreshInterval, 10);
|
|
});
|
|
});
|
|
|
|
describe('readSettings null return on malformed files (#1461)', () => {
|
|
test('install.js contains JSONC stripping in readSettings', () => {
|
|
const installPath = path.join(__dirname, '..', 'bin', 'install.js');
|
|
const content = fs.readFileSync(installPath, 'utf8');
|
|
assert.ok(content.includes('stripJsonComments'),
|
|
'install.js should use stripJsonComments in readSettings');
|
|
});
|
|
|
|
test('readSettings returns null on truly malformed files (not empty object)', () => {
|
|
const installPath = path.join(__dirname, '..', 'bin', 'install.js');
|
|
const content = fs.readFileSync(installPath, 'utf8');
|
|
assert.ok(content.includes('return null'),
|
|
'readSettings should return null on parse failure, not empty object');
|
|
});
|
|
|
|
test('callers guard against null readSettings return', () => {
|
|
const installPath = path.join(__dirname, '..', 'bin', 'install.js');
|
|
const content = fs.readFileSync(installPath, 'utf8');
|
|
// Should have null guards at the settings configuration call sites
|
|
assert.ok(
|
|
content.includes('=== null') || content.includes('rawSettings === null'),
|
|
'callers should check for null return from readSettings'
|
|
);
|
|
});
|
|
});
|