Skip to content

fix(build): match helper imports literally #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cevdetch merged 1 commit into from
Oct 16, 2026
Merged

fix(build): match helper imports literally #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/rules-source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ export async function checkLibModules(libDir: string = LIB_DIR, logicDir: string
const name = m[1]!;
// `import { x }`, `import type { X }` and `import { type X }` all count.
const used = new RegExp(
`import\\s*(?:type\\s+)?\\{[^}]*\\b${name}\\b[^}]*\\}\\s*from\\s*["']\\.\\./\\.\\./lib/${file}["']`,
`import\\s*(?:type\\s+)?\\{[^}]*(?<![\\w$])${RegExp.escape(name)}(?![\\w$])[^}]*\\}\\s*from\\s*["']\\.\\./\\.\\./lib/${RegExp.escape(file)}["']`,
).test(logicText);
if (!used) {
diagnostics.push({
Expand Down
32 changes: 32 additions & 0 deletions test/rules.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,38 @@ test("checkLibModules sees async functions and types, and type-only imports", as
}
});

test("checkLibModules matches complete JavaScript identifiers including dollar signs", async (t) => {
const { checkLibModules } = await import("../scripts/rules-source.ts");
const dir = await mkdtemp(join(tmpdir(), "deadhead-lib-"));
t.after(() => rm(dir, { recursive: true, force: true }));
const lib = join(dir, "lib");
const logic = join(dir, "logic", "meta");
await mkdir(lib, { recursive: true });
await mkdir(logic, { recursive: true });
await writeFile(join(lib, "x.ts"), "export const $leading = 1;\nexport const trailing$ = 2;\nexport const leading = 3;\nexport const trailing = 4;\n");
await writeFile(join(logic, "a.ts"), 'import { $leading, trailing$ } from "../../lib/x.ts";\n');
assert.deepEqual((await checkLibModules(lib, join(dir, "logic"))).map((d) => d.message), [
"`leading` is exported but no logic module imports it",
"`trailing` is exported but no logic module imports it",
]);
});

test("checkLibModules treats module filenames literally", async (t) => {
const { checkLibModules } = await import("../scripts/rules-source.ts");
const dir = await mkdtemp(join(tmpdir(), "deadhead-lib-"));
t.after(() => rm(dir, { recursive: true, force: true }));
const lib = join(dir, "lib");
const logic = join(dir, "logic", "meta");
await mkdir(lib, { recursive: true });
await mkdir(logic, { recursive: true });
await writeFile(join(lib, "x.ts"), "export const value = 1;\n");
await writeFile(join(logic, "a.ts"), 'import { value } from "../../lib/xXts";\n');
assert.equal((await checkLibModules(lib, join(dir, "logic"))).length, 1);
await writeFile(join(lib, "x+.ts"), "export const extra = 2;\n");
await writeFile(join(logic, "a.ts"), 'import { value } from "../../lib/x.ts";\nimport { extra } from "../../lib/x+.ts";\n');
assert.deepEqual(await checkLibModules(lib, join(dir, "logic")), []);
});

test("lib/json-ld someNode walks an array too long to spread into arguments", async () => {
const { someNode } = await import("../packages/rules/lib/json-ld.ts");
const huge: unknown[] = Array.from({ length: 500_000 }, () => 0);
Expand Down
Loading