mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-15 21:07:20 +01:00
fix(pregate): strays matches only the documented scratch names; literals ignores a named literal the branch only adds (GST-1211)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
bf2bcf14b0
commit
fe05b3ccf5
6 files changed
+62
-9
No files matched your search
@@ -57,10 +57,10 @@ export function constantsIn(text: string): Map<string, string> {
|
||||
return out;
|
||||
}
|
||||
|
||||
/** Named numeric call sites (`timeout: 5000`) keyed by name; the last value per name wins, which is enough to spot a change. */
|
||||
export function callLiteralsIn(text: string): Map<string, string> {
|
||||
const out = new Map<string, string>();
|
||||
for (const m of text.matchAll(CALL_PATTERN)) out.set(m[1]!, m[2]!);
|
||||
/** Named numeric call sites (`timeout: 5000`) keyed by name, every value in source order. */
|
||||
export function callLiteralsIn(text: string): Map<string, string[]> {
|
||||
const out = new Map<string, string[]>();
|
||||
for (const m of text.matchAll(CALL_PATTERN)) out.set(m[1]!, [...(out.get(m[1]!) ?? []), m[2]!]);
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,13 @@ export function changedLiterals(file: string, oldText: string, newText: string):
|
||||
const oldC = constantsIn(oldText); const newC = constantsIn(newText);
|
||||
for (const [name, old] of oldC) { const now = newC.get(name); if (now !== undefined && now !== old) out.push({ name, old, new: now, file }); }
|
||||
const oldCall = callLiteralsIn(oldText); const newCall = callLiteralsIn(newText);
|
||||
for (const [name, old] of oldCall) { const now = newCall.get(name); if (now !== undefined && now !== old && !oldC.has(name)) out.push({ name, old, new: now, file }); }
|
||||
for (const [name, olds] of oldCall) {
|
||||
if (oldC.has(name)) continue;
|
||||
const added = [...(newCall.get(name) ?? [])];
|
||||
const removed = olds.filter(v => { const i = added.indexOf(v); if (i >= 0) added.splice(i, 1); return i < 0; });
|
||||
const seen = new Set<string>();
|
||||
removed.forEach((old, i) => { if (i < added.length && !seen.has(old)) { seen.add(old); out.push({ name, old, new: added[i]!, file }); } });
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ import type { CheckDef, CheckResult, PregateContext } from '../types';
|
||||
|
||||
/** Conventional root files a repo adds without a declaration. */
|
||||
export const ROOT_OK = /^(?:README|LICENSE|LICENCE|NOTICE|CHANGELOG|CONTRIBUTING|CODE_OF_CONDUCT|SECURITY|AUTHORS|VERSION|Makefile|Dockerfile|Procfile|Gemfile|Rakefile|Cargo\.(?:toml|lock)|go\.(?:mod|sum)|package(?:-lock)?\.json|bun\.lockb?|pnpm-lock\.yaml|yarn\.lock|tsconfig[\w.-]*\.json|bunfig\.toml|pyproject\.toml|pubspec\.(?:yaml|lock)|analysis_options\.yaml|dart_test\.yaml|requirements[\w.-]*\.txt|setup\.(?:py|cfg)|\.[\w.-]+|[\w.-]+\.config\.[cm]?[jt]s|[\w.-]+\.md)$/i;
|
||||
export const STRAY_NAME = /^(?:zz-|tmp|temp|scratch|debug-|probe)|\.(?:orig|rej|swp|swo|bak|tmp)$|~$|^\.DS_Store$|^Thumbs\.db$/i;
|
||||
export const STRAY_NAME = /^(?:zz-|tmp|scratch)|\.(?:orig|rej|swp|swo|bak|tmp)$|~$|^\.DS_Store$|^Thumbs\.db$/i;
|
||||
|
||||
function run(ctx: PregateContext): CheckResult {
|
||||
const inputs = baseInputs(ctx);
|
||||
|
||||
Reference in new issue
Block a user