Fix excludeBuiltins (#292)

Author: fisker

scripts/get-browser-globals.mjs

@@ -307,7 +307,6 @@ async function getBrowserGlobals() {
 		{
 			shouldExclude,
 			isWritable,
-			excludeBuiltins: true,
 		},
 	);
 }
@@ -320,7 +319,6 @@ async function getWebWorkerGlobals() {
 		{
 			shouldExclude: name => name.startsWith('__'),
 			isWritable: name => name.startsWith('on'),
-			excludeBuiltins: true,
 		},
 	);
 }
@@ -337,7 +335,6 @@ async function getServiceWorkerGlobals() {
 		{
 			shouldExclude: name => name.startsWith('__'),
 			isWritable: name => name.startsWith('on'),
-			excludeBuiltins: true,
 		},
 	);
 }

scripts/get-node-builtin-globals.mjs

@@ -5,7 +5,6 @@ export default function getNodeBuiltinGlobals() {
 		getGlobalThisProperties(),
 		{
 			shouldExclude: name => name.startsWith('__'),
-			excludeBuiltins: true,
 		},
 	);
 }

scripts/update.mjs

@@ -58,6 +58,7 @@ async function run(options) {
 		: ALL_JOBS;
 
 	for (const {environment, getGlobals, incremental = true} of jobs) {
+		const excludeBuiltins = environment !== 'builtin';
 		const {
 			added,
 			removed,
@@ -68,6 +69,7 @@ async function run(options) {
 			getGlobals,
 			dryRun: options.dry,
 			incremental: options.clean ? false : incremental,
+			excludeBuiltins,
 		});
 
 		console.log(`✅ ${environment} globals updated.`);

scripts/utilities.mjs

@@ -19,14 +19,26 @@ const writeGlobals = async (environment, globals) => {
 	await fs.writeFile(file, code + '\n');
 };
 
-async function updateGlobals({environment, getGlobals, dryRun, incremental}) {
+async function updateGlobals({
+	environment,
+	getGlobals,
+	dryRun,
+	incremental,
+	excludeBuiltins,
+}) {
 	let updated = await getGlobals();
 	const original = await readGlobals(environment, {ignoreNonExits: true});
 
 	if (incremental) {
 		updated = {...original, ...updated};
 	}
 
+	if (excludeBuiltins) {
+		for (const name of Object.keys(await readGlobals('builtin'))) {
+			delete updated[name];
+		}
+	}
+
 	if (!dryRun) {
 		await writeGlobals(environment, updated);
 	}
@@ -58,20 +70,13 @@ function getGlobalThisProperties() {
 async function createGlobals(names, {
 	shouldExclude,
 	isWritable = () => false,
-	excludeBuiltins,
 }) {
 	names = unique(names);
 
 	if (shouldExclude) {
 		names = names.filter(name => !shouldExclude(name));
 	}
 
-	if (excludeBuiltins) {
-		const builtinGlobals = new Set(Object.keys(await readGlobals('builtin')));
-
-		names = names.filter(name => !builtinGlobals.has(name));
-	}
-
 	return Object.fromEntries(names.map(name => [name, isWritable(name) ?? false]));
 }