1
0
mirror of https://github.com/lancedikson/bowser synced 2026-09-24 04:55:13 +00:00

fix: bundled.js is not ES5 — restore ES5 output and guard it (#632)

This commit is contained in:
Naor Peled
2026-09-05 23:16:26 +03:00
committed by GitHub
parent 28174aca5e
commit c1208b4a56
11 changed files with 490 additions and 16 deletions

174
test/types/check.mjs Normal file
View File

@@ -0,0 +1,174 @@
/**
* Type-checks a real consumer against the *packed* package under every module
* resolution mode TypeScript offers.
*
* node test/types/check.mjs [path-to-bowser-x.y.z.tgz]
*
* With a tarball, the published artifact itself is checked — that is how CI
* runs it. With no argument the package is assembled from the working tree's
* `files` allowlist instead, so `pnpm test:types` works from a plain checkout
* without the caller having to pack first.
*
* `attw` already runs in CI, but it answers a narrower question: whether the
* types *resolve* to the right file for each condition. It does not compile
* anything, so it cannot catch a declaration that resolves fine and then fails
* to describe the runtime — a missing member, a wrong signature, or a named
* export declared in `index.d.mts` that `bowser.mjs` does not actually have.
*
* Both directions are asserted. The negative cases matter as much as the
* positive ones: `index.d.mts` deliberately omits `BROWSER_MAP` and friends as
* named exports because importing them that way throws at runtime, and only a
* compile that is expected to *fail* can hold that line.
*
* Either way the package is installed into a real `node_modules` and resolved
* by the normal upward walk, so the exports map, the `types` field and the
* published file list are all exercised exactly as a consumer sees them. A
* tsconfig `paths` mapping would resolve the directory directly and silently
* bypass the exports map, which is the thing most worth testing here.
*/
import cp from 'node:child_process';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
const here = path.dirname(fileURLToPath(import.meta.url));
const repoRoot = path.join(here, '..', '..');
const tsc = path.join(repoRoot, 'node_modules', '.bin', 'tsc');
const tarball = process.argv[2];
if (tarball && !fs.existsSync(tarball)) {
console.error(`no such tarball: ${tarball}`);
process.exit(1);
}
/** Each mode a real consumer can be configured with. */
const MODES = [
{ name: 'node10 (CJS)', moduleResolution: 'node10', module: 'commonjs', type: 'commonjs', fixture: 'consumer-cjs.ts' },
{ name: 'node16 (CJS)', moduleResolution: 'node16', module: 'node16', type: 'commonjs', fixture: 'consumer-cjs.ts' },
{ name: 'node16 (ESM)', moduleResolution: 'node16', module: 'node16', type: 'module', fixture: 'consumer-esm.ts' },
{ name: 'nodenext (ESM)', moduleResolution: 'nodenext', module: 'nodenext', type: 'module', fixture: 'consumer-esm.ts' },
{ name: 'bundler', moduleResolution: 'bundler', module: 'esnext', type: 'module', fixture: 'consumer-esm.ts' },
];
/**
* Imports that must NOT compile, because the runtime does not provide them.
* Keeps `index.d.mts` honest — if any of these starts compiling, the types are
* promising something `bowser.mjs` will not deliver.
*/
const MUST_NOT_COMPILE = [
['BROWSER_MAP is not a named export', 'import { BROWSER_MAP } from "bowser"; export default BROWSER_MAP;'],
['OS_MAP is not a named export', 'import { OS_MAP } from "bowser"; export default OS_MAP;'],
['ENGINE_MAP is not a named export', 'import { ENGINE_MAP } from "bowser"; export default ENGINE_MAP;'],
['PLATFORMS_MAP is not a named export', 'import { PLATFORMS_MAP } from "bowser"; export default PLATFORMS_MAP;'],
['Parser is a type, not a value', 'import { Parser } from "bowser"; export default new Parser("x");'],
];
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'bowser-types-'));
const modules = path.join(tmp, 'node_modules');
fs.mkdirSync(modules, { recursive: true });
/**
* Assembles the package from the repo the way `npm pack` would, for when no
* tarball is supplied. `npm pack` is not an option here: package.json carries
* no `version` (it is stamped at release time), and npm refuses to pack
* without one. Copying the `files` allowlist gives the same tree, so
* `pnpm test:types` works from a plain checkout while CI keeps passing the
* real tarball it already builds.
*/
function assembleFromRepo(dest) {
const manifest = JSON.parse(fs.readFileSync(path.join(repoRoot, 'package.json'), 'utf8'));
// npm always includes these regardless of the `files` allowlist.
const entries = [...manifest.files, 'package.json', 'README.md', 'LICENSE'];
for (const entry of entries) {
const from = path.join(repoRoot, entry);
if (!fs.existsSync(from)) continue;
fs.cpSync(from, path.join(dest, entry), { recursive: true });
}
const missing = ['es5.js', 'bundled.js', 'bowser.mjs']
.filter((f) => !fs.existsSync(path.join(dest, f)));
if (missing.length) {
console.error(`missing build output: ${missing.join(', ')} — run \`pnpm build\` first`);
process.exit(1);
}
}
const pkgDir = path.join(modules, 'bowser');
if (tarball) {
cp.execFileSync('tar', ['xzf', path.resolve(tarball), '-C', modules]);
fs.renameSync(path.join(modules, 'package'), pkgDir);
} else {
fs.mkdirSync(pkgDir, { recursive: true });
assembleFromRepo(pkgDir);
}
/** Runs tsc over a single file in a project configured for `mode`. */
function typeCheck(mode, fileName, source) {
// Nested one level under `tmp`, so resolution walks up into tmp/node_modules
// the way a real consumer's does. `paths` would short-circuit the exports map.
const dir = path.join(tmp, `case-${Math.abs(hash(mode.name + fileName))}`);
fs.mkdirSync(dir, { recursive: true });
fs.writeFileSync(path.join(dir, 'app.ts'), source);
fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify({
name: 'consumer', version: '1.0.0', private: true, type: mode.type,
}));
fs.writeFileSync(path.join(dir, 'tsconfig.json'), JSON.stringify({
compilerOptions: {
strict: true,
noEmit: true,
// Do not skip: a broken .d.ts in the package itself must fail the check.
skipLibCheck: false,
target: 'es2020',
module: mode.module,
moduleResolution: mode.moduleResolution,
esModuleInterop: true,
resolveJsonModule: true,
types: [],
},
files: ['app.ts'],
}));
const result = cp.spawnSync(tsc, ['-p', 'tsconfig.json'], { cwd: dir, encoding: 'utf8' });
return { ok: result.status === 0, output: `${result.stdout || ''}${result.stderr || ''}`.trim() };
}
function hash(s) {
let h = 0;
for (let i = 0; i < s.length; i += 1) { h = ((h << 5) - h + s.charCodeAt(i)) | 0; }
return h;
}
let failures = 0;
console.log(`Type-checking consumers against ${tarball ? path.basename(tarball) : 'the working tree'}\n`);
for (const mode of MODES) {
const source = fs.readFileSync(path.join(here, 'fixtures', mode.fixture), 'utf8');
const { ok, output } = typeCheck(mode, mode.fixture, source);
if (ok) {
console.log(` ok ${mode.name.padEnd(16)} ${mode.fixture}`);
} else {
failures += 1;
console.log(` FAIL ${mode.name.padEnd(16)} ${mode.fixture}\n${output.replace(/^/gm, ' ')}`);
}
}
console.log('');
// Only needs one ESM-shaped mode; the .d.mts is what is under test.
const negativeMode = MODES.find((m) => m.name === 'node16 (ESM)');
for (const [label, source] of MUST_NOT_COMPILE) {
const { ok } = typeCheck(negativeMode, `negative-${label}`, source);
if (ok) {
failures += 1;
console.log(` FAIL types accept something the runtime rejects: ${label}`);
} else {
console.log(` ok rejected: ${label}`);
}
}
try { fs.rmSync(tmp, { recursive: true, force: true }); } catch { /* best effort */ }
console.log('');
if (failures) {
console.error(`${failures} type check(s) failed`);
process.exit(1);
}
console.log(`all ${MODES.length + MUST_NOT_COMPILE.length} type checks passed`);

View File

@@ -0,0 +1,15 @@
// A CommonJS consumer: default import via esModuleInterop, types reached
// through the `export =` namespace. This is what `moduleResolution: node10`
// and `node16` (from CJS) consumers write.
import Bowser from 'bowser';
const UA = 'Mozilla/5.0 (Macintosh) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
const result: Bowser.Parser.ParsedResult = Bowser.parse(UA);
const parser: Bowser.Parser.Parser = Bowser.getParser(UA);
const name: string | undefined = result.browser.name;
const satisfies: boolean | undefined = parser.satisfies({ chrome: '>100' });
const hints: Bowser.ClientHints = { mobile: false };
const maps: Record<string, string> = Bowser.BROWSER_MAP;
export { name, satisfies, hints, maps };

View File

@@ -0,0 +1,17 @@
// An ES module consumer: default plus named imports, types imported as types.
// This is `moduleResolution: node16` (from ESM), `nodenext` and `bundler`.
import Bowser, { parse, getParser } from 'bowser';
import type { ParsedResult, Parser, ClientHints, checkTree } from 'bowser';
const UA = 'Mozilla/5.0 (Macintosh) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
const result: ParsedResult = parse(UA);
const parser: Parser = getParser(UA);
const tree: checkTree = { chrome: '>100' };
const satisfies: boolean | undefined = parser.satisfies(tree);
const hints: ClientHints = { mobile: false };
// BROWSER_MAP is deliberately not a named export of bowser.mjs — it only
// exists as a static on the class. Reaching it any other way must not compile.
const maps: Record<string, string> = Bowser.BROWSER_MAP;
export { result, satisfies, hints, maps };