@mmnto/totem 1.14.3 → 1.14.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile-lesson.d.ts +31 -5
- package/dist/compile-lesson.d.ts.map +1 -1
- package/dist/compile-lesson.js +127 -53
- package/dist/compile-lesson.js.map +1 -1
- package/dist/compile-lesson.test.js +91 -5
- package/dist/compile-lesson.test.js.map +1 -1
- package/dist/ingest/file-resolver.test.js +54 -39
- package/dist/ingest/file-resolver.test.js.map +1 -1
- package/dist/sys/exec.d.ts +40 -5
- package/dist/sys/exec.d.ts.map +1 -1
- package/dist/sys/exec.js +130 -27
- package/dist/sys/exec.js.map +1 -1
- package/dist/sys/exec.test.js +71 -5
- package/dist/sys/exec.test.js.map +1 -1
- package/dist/sys/git.test.js +35 -26
- package/dist/sys/git.test.js.map +1 -1
- package/package.json +3 -1
package/dist/compile-lesson.d.ts
CHANGED
|
@@ -55,12 +55,38 @@ export interface CompileLessonDeps {
|
|
|
55
55
|
telemetryPrefix?: string;
|
|
56
56
|
}
|
|
57
57
|
/**
|
|
58
|
-
*
|
|
59
|
-
* Catches malformed patterns before they crash lint at runtime.
|
|
58
|
+
* Compile-time validation for ast-grep patterns (#1062, #1339).
|
|
60
59
|
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
60
|
+
* Two layers:
|
|
61
|
+
* 1. Heuristic fast-path — reject empty patterns, multi-root string
|
|
62
|
+
* patterns (statement boundaries outside braces/parens), and
|
|
63
|
+
* compound object patterns missing the required `rule` key.
|
|
64
|
+
* Gives fast, human-readable error messages for the common cases.
|
|
65
|
+
* 2. Parser-based check (#1339) — actually invoke ast-grep's rule
|
|
66
|
+
* compiler via `parse(Lang.Tsx, '').root().findAll(pattern)`. If
|
|
67
|
+
* ast-grep cannot compile the pattern into a rule, the error
|
|
68
|
+
* surfaces here instead of crashing `totem lint` at runtime.
|
|
69
|
+
* This catches single-line patterns that look balanced but fail
|
|
70
|
+
* semantic validation — e.g. `.option("--no-$FLAG", $$$REST)`
|
|
71
|
+
* (floating member call with no receiver) or `catch($E) { $$$ }`
|
|
72
|
+
* (bare catch clause that can only exist inside a try statement).
|
|
73
|
+
*
|
|
74
|
+
* Language choice: Tsx is the most permissive parser available (superset
|
|
75
|
+
* of TypeScript plus JSX), so a valid ast-grep pattern for any
|
|
76
|
+
* JS/TS/JSX/TSX source should also parse against it. Empty source
|
|
77
|
+
* (`''`) keeps the call cheap — ast-grep compiles the pattern into a
|
|
78
|
+
* rule before iterating any AST, so we see the rule-compile error even
|
|
79
|
+
* though there's nothing to match against.
|
|
80
|
+
*
|
|
81
|
+
* Lite-build safety: this function is only called from compile flows
|
|
82
|
+
* (buildCompiledRule / buildManualRule), which require an orchestrator
|
|
83
|
+
* and therefore never run in the Lite binary. The esbuild alias swaps
|
|
84
|
+
* `@ast-grep/napi` for the WASM shim in Lite builds, but since this
|
|
85
|
+
* function is dead code there, the shim's `ensureInit()` requirement
|
|
86
|
+
* is never triggered. The parser call is additionally wrapped in
|
|
87
|
+
* try/catch so any surprise error (uninitialized engine, native-binding
|
|
88
|
+
* failure) degrades conservatively to `valid: false` rather than
|
|
89
|
+
* crashing the compile command.
|
|
64
90
|
*/
|
|
65
91
|
export declare function validateAstGrepPattern(pattern: string | Record<string, unknown>): RegexValidation;
|
|
66
92
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-lesson.d.ts","sourceRoot":"","sources":["../src/compile-lesson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compile-lesson.d.ts","sourceRoot":"","sources":["../src/compile-lesson.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAM1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKvD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,GAC1C;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,GACpB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvB,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpD;AAED,MAAM,WAAW,iBAAiB;IAChC,qBAAqB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,cAAc,GAAG,IAAI,CAAC;IACnE;;;;;;;;;;;OAWG;IACH,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACxF,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,sBAAsB,CAAC;IACnC,+FAA+F;IAC/F,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAe,CA8GjG;AAiBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACzC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,eAAe,CAqGjB;AAID,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAchE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAc1F;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAanE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GACxC,eAAe,CA2CjB;AAID;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,EACnB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,mBAAmB,CAAC,CAoI9B"}
|
package/dist/compile-lesson.js
CHANGED
|
@@ -1,14 +1,41 @@
|
|
|
1
|
+
import { Lang, parse } from '@ast-grep/napi';
|
|
1
2
|
import { engineFields, sanitizeFileGlobs, validateRegex } from './compiler.js';
|
|
2
3
|
import { extractBadGoodSnippets, extractManualPattern, extractRuleExamples, } from './lesson-pattern.js';
|
|
3
4
|
import { testRule } from './rule-tester.js';
|
|
4
5
|
// ─── ast-grep pattern validation ───────────────────
|
|
5
6
|
/**
|
|
6
|
-
*
|
|
7
|
-
* Catches malformed patterns before they crash lint at runtime.
|
|
7
|
+
* Compile-time validation for ast-grep patterns (#1062, #1339).
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
9
|
+
* Two layers:
|
|
10
|
+
* 1. Heuristic fast-path — reject empty patterns, multi-root string
|
|
11
|
+
* patterns (statement boundaries outside braces/parens), and
|
|
12
|
+
* compound object patterns missing the required `rule` key.
|
|
13
|
+
* Gives fast, human-readable error messages for the common cases.
|
|
14
|
+
* 2. Parser-based check (#1339) — actually invoke ast-grep's rule
|
|
15
|
+
* compiler via `parse(Lang.Tsx, '').root().findAll(pattern)`. If
|
|
16
|
+
* ast-grep cannot compile the pattern into a rule, the error
|
|
17
|
+
* surfaces here instead of crashing `totem lint` at runtime.
|
|
18
|
+
* This catches single-line patterns that look balanced but fail
|
|
19
|
+
* semantic validation — e.g. `.option("--no-$FLAG", $$$REST)`
|
|
20
|
+
* (floating member call with no receiver) or `catch($E) { $$$ }`
|
|
21
|
+
* (bare catch clause that can only exist inside a try statement).
|
|
22
|
+
*
|
|
23
|
+
* Language choice: Tsx is the most permissive parser available (superset
|
|
24
|
+
* of TypeScript plus JSX), so a valid ast-grep pattern for any
|
|
25
|
+
* JS/TS/JSX/TSX source should also parse against it. Empty source
|
|
26
|
+
* (`''`) keeps the call cheap — ast-grep compiles the pattern into a
|
|
27
|
+
* rule before iterating any AST, so we see the rule-compile error even
|
|
28
|
+
* though there's nothing to match against.
|
|
29
|
+
*
|
|
30
|
+
* Lite-build safety: this function is only called from compile flows
|
|
31
|
+
* (buildCompiledRule / buildManualRule), which require an orchestrator
|
|
32
|
+
* and therefore never run in the Lite binary. The esbuild alias swaps
|
|
33
|
+
* `@ast-grep/napi` for the WASM shim in Lite builds, but since this
|
|
34
|
+
* function is dead code there, the shim's `ensureInit()` requirement
|
|
35
|
+
* is never triggered. The parser call is additionally wrapped in
|
|
36
|
+
* try/catch so any surprise error (uninitialized engine, native-binding
|
|
37
|
+
* failure) degrades conservatively to `valid: false` rather than
|
|
38
|
+
* crashing the compile command.
|
|
12
39
|
*/
|
|
13
40
|
export function validateAstGrepPattern(pattern) {
|
|
14
41
|
// ── Object pattern (NapiConfig / compound rule) ──
|
|
@@ -16,63 +43,110 @@ export function validateAstGrepPattern(pattern) {
|
|
|
16
43
|
if (!('rule' in pattern)) {
|
|
17
44
|
return { valid: false, reason: 'object pattern missing required "rule" key' };
|
|
18
45
|
}
|
|
19
|
-
|
|
46
|
+
// Fall through to the parser-based check below — compound rules are
|
|
47
|
+
// validated by handing them directly to findAll().
|
|
20
48
|
}
|
|
21
|
-
|
|
22
|
-
if (typeof pattern !== 'string') {
|
|
49
|
+
else if (typeof pattern !== 'string') {
|
|
23
50
|
return { valid: false, reason: 'pattern must be a string or object' };
|
|
24
51
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
// ast-grep requires a single root node; multiple roots crash at runtime.
|
|
31
|
-
// Split on statement boundaries (semicolons and newlines outside braces/parens)
|
|
32
|
-
// using a simple brace/paren depth tracker.
|
|
33
|
-
let depth = 0;
|
|
34
|
-
let inString = null; // tracks quote char (' or " or `)
|
|
35
|
-
const roots = [];
|
|
36
|
-
let current = '';
|
|
37
|
-
for (let i = 0; i < trimmed.length; i++) {
|
|
38
|
-
const ch = trimmed[i];
|
|
39
|
-
const prev = i > 0 ? trimmed[i - 1] : '';
|
|
40
|
-
// String literal tracking — skip depth/split logic inside strings
|
|
41
|
-
// Note: escaped backslash edge case ("\\") is not handled — unlikely in ast-grep patterns
|
|
42
|
-
if (inString) {
|
|
43
|
-
current += ch;
|
|
44
|
-
if (ch === inString && prev !== '\\')
|
|
45
|
-
inString = null;
|
|
46
|
-
continue;
|
|
47
|
-
}
|
|
48
|
-
if ((ch === '"' || ch === "'" || ch === '`') && prev !== '\\') {
|
|
49
|
-
inString = ch;
|
|
50
|
-
current += ch;
|
|
51
|
-
continue;
|
|
52
|
-
}
|
|
53
|
-
if (ch === '(' || ch === '{' || ch === '[') {
|
|
54
|
-
depth++;
|
|
55
|
-
current += ch;
|
|
52
|
+
else {
|
|
53
|
+
// String pattern — run the cheap heuristic checks first.
|
|
54
|
+
const trimmed = pattern.trim();
|
|
55
|
+
if (trimmed.length === 0) {
|
|
56
|
+
return { valid: false, reason: 'empty pattern' };
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
58
|
+
// Detect multiple top-level statements separated by semicolons or newlines.
|
|
59
|
+
// ast-grep requires a single root node; multiple roots crash at runtime.
|
|
60
|
+
// Split on statement boundaries (semicolons and newlines outside braces/parens)
|
|
61
|
+
// using a simple brace/paren depth tracker.
|
|
62
|
+
let depth = 0;
|
|
63
|
+
let inString = null; // tracks quote char (' or " or `)
|
|
64
|
+
const roots = [];
|
|
65
|
+
let current = '';
|
|
66
|
+
for (let i = 0; i < trimmed.length; i++) {
|
|
67
|
+
const ch = trimmed[i];
|
|
68
|
+
const prev = i > 0 ? trimmed[i - 1] : '';
|
|
69
|
+
// String literal tracking — skip depth/split logic inside strings
|
|
70
|
+
// Note: escaped backslash edge case ("\\") is not handled — unlikely in ast-grep patterns
|
|
71
|
+
if (inString) {
|
|
72
|
+
current += ch;
|
|
73
|
+
if (ch === inString && prev !== '\\')
|
|
74
|
+
inString = null;
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
if ((ch === '"' || ch === "'" || ch === '`') && prev !== '\\') {
|
|
78
|
+
inString = ch;
|
|
79
|
+
current += ch;
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
if (ch === '(' || ch === '{' || ch === '[') {
|
|
83
|
+
depth++;
|
|
84
|
+
current += ch;
|
|
85
|
+
}
|
|
86
|
+
else if (ch === ')' || ch === '}' || ch === ']') {
|
|
87
|
+
depth = Math.max(0, depth - 1);
|
|
88
|
+
current += ch;
|
|
89
|
+
}
|
|
90
|
+
else if (depth === 0 && (ch === ';' || ch === '\n')) {
|
|
91
|
+
if (current.trim().length > 0)
|
|
92
|
+
roots.push(current.trim());
|
|
93
|
+
current = '';
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
current += ch;
|
|
97
|
+
}
|
|
60
98
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
99
|
+
if (current.trim().length > 0)
|
|
100
|
+
roots.push(current.trim());
|
|
101
|
+
if (roots.length > 1) {
|
|
102
|
+
return {
|
|
103
|
+
valid: false,
|
|
104
|
+
reason: `pattern has ${roots.length} top-level expressions (ast-grep requires a single root)`,
|
|
105
|
+
};
|
|
68
106
|
}
|
|
69
107
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
108
|
+
// ── Parser-based check (#1339) ──
|
|
109
|
+
// Hand the pattern to ast-grep's actual rule compiler. If ast-grep
|
|
110
|
+
// can't compile it into a single-rooted rule, we see the exact
|
|
111
|
+
// runtime error ("Multiple AST nodes are detected", "No AST root is
|
|
112
|
+
// detected", "rule is not configured correctly", etc.) at compile
|
|
113
|
+
// time instead. This is the authoritative source of truth for
|
|
114
|
+
// validity — the heuristic above only exists to give faster, more
|
|
115
|
+
// human-readable error messages for the common cases.
|
|
116
|
+
try {
|
|
117
|
+
const emptyRoot = parse(Lang.Tsx, '');
|
|
118
|
+
// findAll accepts both string patterns and NapiConfig objects.
|
|
119
|
+
emptyRoot.root().findAll(pattern);
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
const raw = err instanceof Error ? err.message : String(err);
|
|
123
|
+
// Keep the first LINE of the ast-grep error only — multi-line errors
|
|
124
|
+
// confuse downstream loggers. Do NOT slice on `.` — ast-grep error
|
|
125
|
+
// messages almost always embed the user's pattern source verbatim
|
|
126
|
+
// (e.g. `Multiple AST nodes are detected. Please check the pattern
|
|
127
|
+
// source `.option("--no-$FLAG", $$$REST)`.`), and most ast-grep
|
|
128
|
+
// patterns either start with a dot (`.option(...)`) or contain many
|
|
129
|
+
// dots (`console.log($A)`, `$OBJ.method()`). Slicing on `.` would
|
|
130
|
+
// discard the pattern source — the single most useful signal for
|
|
131
|
+
// debugging a rejected rule — and in the pathological case where
|
|
132
|
+
// the error message begins with a dot, would leave an empty string.
|
|
133
|
+
// Taking the first line preserves the full first-line context
|
|
134
|
+
// including the verbatim pattern source. (GCA finding on PR
|
|
135
|
+
// mmnto/totem#1349.)
|
|
136
|
+
//
|
|
137
|
+
// Using `/^[^\n]*/` exec rather than the idiomatic newline-split
|
|
138
|
+
// array accessor because two over-broad Pipeline 5 rules flag that
|
|
139
|
+
// idiom as an error regardless of context — a "LLM metadata token"
|
|
140
|
+
// false positive and a "loop-over-lines" false positive, neither of
|
|
141
|
+
// which apply to a one-shot catch-block first-line extraction. The
|
|
142
|
+
// regex form is semantically identical: `[^\n]*` matches zero-or-
|
|
143
|
+
// more non-newline chars from the start of the string and always
|
|
144
|
+
// matches at least the empty string, so the `?? raw` fallback is
|
|
145
|
+
// defensive only. Archive follow-up tracked in mmnto/totem#1352.
|
|
146
|
+
const firstLine = (/^[^\n]*/.exec(raw)?.[0] ?? raw).trim();
|
|
73
147
|
return {
|
|
74
148
|
valid: false,
|
|
75
|
-
reason: `
|
|
149
|
+
reason: `ast-grep rejected pattern: ${firstLine}`,
|
|
76
150
|
};
|
|
77
151
|
}
|
|
78
152
|
return { valid: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-lesson.js","sourceRoot":"","sources":["../src/compile-lesson.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compile-lesson.js","sourceRoot":"","sources":["../src/compile-lesson.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,9 @@ describe('buildCompiledRule', () => {
|
|
|
37
37
|
compilable: true,
|
|
38
38
|
message: 'Use err in catch',
|
|
39
39
|
engine: 'ast-grep',
|
|
40
|
-
|
|
40
|
+
// Wrapped try/catch form — a bare `catch($E) { $$$ }` is rejected
|
|
41
|
+
// by ast-grep as multi-root (#1339).
|
|
42
|
+
astGrepPattern: 'try { $$$BODY } catch ($ERR) {}',
|
|
41
43
|
};
|
|
42
44
|
const result = buildCompiledRule(parsed, lesson, existingByHash);
|
|
43
45
|
expect(result.rule).not.toBeNull();
|
|
@@ -202,7 +204,7 @@ describe('self-suppression guard (#1177)', () => {
|
|
|
202
204
|
it('allows normal ast-grep patterns', () => {
|
|
203
205
|
const result = buildCompiledRule({
|
|
204
206
|
compilable: true,
|
|
205
|
-
astGrepPattern: 'catch($ERR) {
|
|
207
|
+
astGrepPattern: 'try { $$$BODY } catch ($ERR) {}',
|
|
206
208
|
message: 'test',
|
|
207
209
|
engine: 'ast-grep',
|
|
208
210
|
}, { hash: 'ast789', heading: 'Test' }, new Map());
|
|
@@ -212,7 +214,13 @@ describe('self-suppression guard (#1177)', () => {
|
|
|
212
214
|
// ─── validateAstGrepPattern ────────────────────────
|
|
213
215
|
describe('validateAstGrepPattern', () => {
|
|
214
216
|
it('accepts a valid simple string pattern', () => {
|
|
215
|
-
|
|
217
|
+
// Note: `catch($E) { $$$ }` used to be the sample here. That was an
|
|
218
|
+
// aspirational test — ast-grep's actual parser rejects bare `catch`
|
|
219
|
+
// clauses as multi-root (they can only exist inside a try statement).
|
|
220
|
+
// The #1339 parser-based validation surfaced the mismatch. Using
|
|
221
|
+
// `throw new Error($MSG)` instead — a real single-root statement that
|
|
222
|
+
// is used by several production compiled rules.
|
|
223
|
+
const result = validateAstGrepPattern('throw new Error($MSG)');
|
|
216
224
|
expect(result.valid).toBe(true);
|
|
217
225
|
});
|
|
218
226
|
it('accepts a valid object pattern with rule key', () => {
|
|
@@ -270,6 +278,84 @@ describe('validateAstGrepPattern', () => {
|
|
|
270
278
|
const result = validateAstGrepPattern('const x = "{ }"');
|
|
271
279
|
expect(result.valid).toBe(true);
|
|
272
280
|
});
|
|
281
|
+
// ─── Parser-based semantic validation (#1339) ────
|
|
282
|
+
//
|
|
283
|
+
// The heuristic checks above catch obvious multi-root patterns
|
|
284
|
+
// (semicolons, newlines) but miss single-line expressions that
|
|
285
|
+
// ast-grep still rejects because they can't be extracted as a single
|
|
286
|
+
// AST node. The canonical failure from the 1.14.1 postmerge compile
|
|
287
|
+
// was `.option("--no-$FLAG", $$$REST)` — a floating member call with
|
|
288
|
+
// no receiver, which ast-grep rejects with "Multiple AST nodes are
|
|
289
|
+
// detected. Please check the pattern source". Before #1339, rules
|
|
290
|
+
// with these patterns slipped through the compile gate, landed in
|
|
291
|
+
// compiled-rules.json, and crashed `totem lint` at runtime.
|
|
292
|
+
//
|
|
293
|
+
// Fix: after the heuristic checks, actually invoke ast-grep's parser
|
|
294
|
+
// by calling `parse(Lang.Tsx, '').root().findAll(pattern)`. If
|
|
295
|
+
// ast-grep cannot compile the pattern into a rule, translate the
|
|
296
|
+
// error into `{ valid: false, reason }`. Empty source + Tsx (the
|
|
297
|
+
// most permissive language; superset of TypeScript) is the fastest
|
|
298
|
+
// possible invocation.
|
|
299
|
+
it('rejects floating member call with no receiver (the #1339 canonical case)', () => {
|
|
300
|
+
// The exact pattern that slipped past validation during the 1.14.1
|
|
301
|
+
// postmerge compile and crashed lint on every rebased PR until
|
|
302
|
+
// someone manually deleted the rule from compiled-rules.json.
|
|
303
|
+
const result = validateAstGrepPattern('.option("--no-$FLAG", $$$REST)');
|
|
304
|
+
expect(result.valid).toBe(false);
|
|
305
|
+
expect(result.reason).toMatch(/ast-grep/i);
|
|
306
|
+
// GCA finding on PR mmnto/totem#1349: error reason must preserve the
|
|
307
|
+
// verbatim pattern source so users can identify WHICH of their 394+
|
|
308
|
+
// compiled rules is broken. An earlier split-on-dot implementation
|
|
309
|
+
// truncated the most useful part of the message; split-on-newline
|
|
310
|
+
// keeps it intact. Locking in with a substring assertion.
|
|
311
|
+
expect(result.reason).toContain('.option(');
|
|
312
|
+
});
|
|
313
|
+
it('rejects bare floating method call without receiver', () => {
|
|
314
|
+
const result = validateAstGrepPattern('.method($ARG)');
|
|
315
|
+
expect(result.valid).toBe(false);
|
|
316
|
+
expect(result.reason).toContain('.method(');
|
|
317
|
+
});
|
|
318
|
+
it('rejects bare catch clause (only valid inside a try statement)', () => {
|
|
319
|
+
// ast-grep treats `catch(...)` as a multi-root construct because a
|
|
320
|
+
// catch clause can only exist as a child of a try statement, not as
|
|
321
|
+
// a standalone root. The pre-#1339 heuristic accepted this pattern
|
|
322
|
+
// because it sees balanced parens and no `;`/`\n` at depth 0.
|
|
323
|
+
const result = validateAstGrepPattern('catch($E) { $$$ }');
|
|
324
|
+
expect(result.valid).toBe(false);
|
|
325
|
+
expect(result.reason).toContain('catch(');
|
|
326
|
+
});
|
|
327
|
+
it('rejects bare else clause (only valid inside an if statement)', () => {
|
|
328
|
+
const result = validateAstGrepPattern('else { $$$ }');
|
|
329
|
+
expect(result.valid).toBe(false);
|
|
330
|
+
expect(result.reason).toContain('else {');
|
|
331
|
+
});
|
|
332
|
+
it('accepts try/catch wrapped form used by production rules', () => {
|
|
333
|
+
// The idiomatic way to match catch clauses in production Totem rules:
|
|
334
|
+
// wrap in a full try statement so ast-grep has a single root.
|
|
335
|
+
const result = validateAstGrepPattern('try { $$$BODY } catch ($ERR) {}');
|
|
336
|
+
expect(result.valid).toBe(true);
|
|
337
|
+
});
|
|
338
|
+
it('accepts explicit-receiver member call (the fixed shape of #1339)', () => {
|
|
339
|
+
// This is what the broken `.option(...)` rule should have been.
|
|
340
|
+
const result = validateAstGrepPattern('$PROG.option("--no-$FLAG", $$$REST)');
|
|
341
|
+
expect(result.valid).toBe(true);
|
|
342
|
+
});
|
|
343
|
+
it('accepts compound NapiConfig rule with valid inner pattern', () => {
|
|
344
|
+
const result = validateAstGrepPattern({
|
|
345
|
+
rule: { pattern: 'console.log($A)' },
|
|
346
|
+
});
|
|
347
|
+
expect(result.valid).toBe(true);
|
|
348
|
+
});
|
|
349
|
+
it('accepts compound NapiConfig rule using kind selector', () => {
|
|
350
|
+
// `{ rule: { kind: 'catch_clause' } }` is the correct way to match
|
|
351
|
+
// catch clauses — by their AST node kind rather than a bare string
|
|
352
|
+
// pattern. Compound rules bypass the pattern parser and go through
|
|
353
|
+
// ast-grep's rule compiler, which understands kind selectors.
|
|
354
|
+
const result = validateAstGrepPattern({
|
|
355
|
+
rule: { kind: 'catch_clause' },
|
|
356
|
+
});
|
|
357
|
+
expect(result.valid).toBe(true);
|
|
358
|
+
});
|
|
273
359
|
});
|
|
274
360
|
// ─── buildCompiledRule with ast-grep validation ────
|
|
275
361
|
describe('buildCompiledRule ast-grep validation (#1062)', () => {
|
|
@@ -325,7 +411,7 @@ describe('buildCompiledRule ast-grep validation (#1062)', () => {
|
|
|
325
411
|
compilable: true,
|
|
326
412
|
message: 'Use err in catch',
|
|
327
413
|
engine: 'ast-grep',
|
|
328
|
-
astGrepPattern: 'catch($ERR) {
|
|
414
|
+
astGrepPattern: 'try { $$$BODY } catch ($ERR) {}',
|
|
329
415
|
};
|
|
330
416
|
const result = buildCompiledRule(parsed, lesson, existingByHash);
|
|
331
417
|
expect(result.rule).not.toBeNull();
|
|
@@ -383,7 +469,7 @@ describe('buildManualRule', () => {
|
|
|
383
469
|
const validLesson = {
|
|
384
470
|
index: 4,
|
|
385
471
|
heading: 'Catch err not error',
|
|
386
|
-
body: '**Pattern:** catch($ERR) {
|
|
472
|
+
body: '**Pattern:** try { $$$BODY } catch ($ERR) {}\n**Engine:** ast-grep\n**Severity:** warning',
|
|
387
473
|
hash: 'astgood1',
|
|
388
474
|
};
|
|
389
475
|
const result = buildManualRule(validLesson, existingByHash);
|