Read the weather texture limit and the reveal time in the body, not in a parameter default

esbuild compiles an optional method call reached through an optional chain
(`a?.b?.()`) in a parameter's default, for browsers it lowers optional
chaining for (Chrome and Edge before 91), into code that reads a variable out
of its scope. The weather shell's texture limit was read that way, so every
satellite frame threw a ReferenceError in the built app and the layer showed
"Weather imagery unavailable"; the leader and card reveal took their default
time the same way. A test now refuses the form anywhere under src/.
This commit is contained in:
Sameh Khamis committed 2026-11-19 18:59:10 -08:00
1 parent 7f2dc81cf6
commit 84b60a92e0
3 files changed
+116 -14

No files matched your search

+10 -3
View File
@@ -177,13 +177,20 @@ export function createWeatherShell({
drawOf = findDraw,
cameraOf = findCamera,
frameOf = findFrame,
maxTextureSize = rendererOf(viewer)?.quality?.device?.().maxTextureSize ?? 0,
maxTextureSize,
frameSource = null,
}) {
if (!Object.hasOwn(WEATHER_IMAGE_SIZES, product))
throw new TypeError('Unknown weather product');
const size = fitTexture(WEATHER_IMAGE_SIZES[product], maxTextureSize);
const detailSize = fitTexture(WEATHER_DETAIL_SIZE, maxTextureSize);
// Read in the body, not as the parameter's default: an optional method call
// in a default parameter is compiled for older browsers into code that
// throws (esbuild).
const textureLimit =
maxTextureSize === undefined
? (rendererOf(viewer)?.quality?.device?.().maxTextureSize ?? 0)
: maxTextureSize;
const size = fitTexture(WEATHER_IMAGE_SIZES[product], textureLimit);
const detailSize = fitTexture(WEATHER_DETAIL_SIZE, textureLimit);
const infrared = product === 'clouds' || product === 'clouds-regional';
// Global infrared contrast depends on the requested extent, so a window would
// not match the image around it; the globe host also shows one mosaic.
+13 -11
View File
@@ -709,29 +709,31 @@ function leaderDrawRatio(entry) {
return Number.isFinite(ratio) ? Math.max(0.1, Math.min(0.9, ratio)) : 0.68;
}
export function leaderRevealProgress(
entry,
timestamp = globalThis.performance?.now?.() ?? Date.now(),
) {
/** Now, for a reveal given no time. Not a parameter default: an optional
* method call in a default parameter is compiled for older browsers into code
* that throws (esbuild). */
function revealNow() {
return globalThis.performance?.now?.() ?? Date.now();
}
export function leaderRevealProgress(entry, timestamp) {
const at = timestamp === undefined ? revealNow() : timestamp;
const linear = Math.min(
1,
animationLinearProgress(entry, timestamp) / leaderDrawRatio(entry),
animationLinearProgress(entry, at) / leaderDrawRatio(entry),
);
return 1 - Math.pow(1 - linear, 3);
}
export function tacticalCardRevealAlpha(
entry,
timestamp = globalThis.performance?.now?.() ?? Date.now(),
) {
export function tacticalCardRevealAlpha(entry, timestamp) {
if (!(Math.max(0, Number(entry?.leaderAnimationMs) || 0) > 0)) return 1;
const at = timestamp === undefined ? revealNow() : timestamp;
const start = leaderDrawRatio(entry);
const linear = Math.max(
0,
Math.min(
1,
(animationLinearProgress(entry, timestamp) - start) /
Math.max(0.1, 1 - start),
(animationLinearProgress(entry, at) - start) / Math.max(0.1, 1 - start),
),
);
return linear * linear * (3 - 2 * linear);
+93
View File
@@ -0,0 +1,93 @@
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { readFileSync, readdirSync } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import ts from 'typescript';
const SRC_ROOT = fileURLToPath(new URL('.', import.meta.url));
/** Every browser-built module under src/ — the test files are Node-only. */
function browserModules(directory = SRC_ROOT) {
const files = [];
for (const entry of readdirSync(directory, { withFileTypes: true })) {
const absolute = path.join(directory, entry.name);
if (entry.isDirectory()) files.push(...browserModules(absolute));
else if (
entry.isFile() &&
entry.name.endsWith('.js') &&
!entry.name.endsWith('.test.js')
)
files.push(absolute);
}
return files.sort();
}
/**
* Whether `node` is an optional call of a method reached through an optional
* chain: `a?.b?.()`, `f()?.g?.h?.()`. The forms esbuild compiles correctly,
* `a?.b()` and `a.b?.()`, are not.
*/
function optionalMethodCall(node) {
if (!ts.isCallExpression(node) || !node.questionDotToken) return false;
const callee = node.expression;
const member =
ts.isPropertyAccessExpression(callee) ||
ts.isElementAccessExpression(callee);
return member && (callee.flags & ts.NodeFlags.OptionalChain) !== 0;
}
/** Such calls in `node`, a default's expression, outside nested functions. */
function callsIn(node, found = []) {
if (ts.isFunctionLike(node)) return found;
if (optionalMethodCall(node)) found.push(node);
ts.forEachChild(node, (child) => callsIn(child, found));
return found;
}
/** The defaults of a parameter: its own and those inside a destructuring pattern. */
function defaultsOf(binding, found = []) {
if (binding.initializer) found.push(binding.initializer);
if (
ts.isObjectBindingPattern(binding.name) ||
ts.isArrayBindingPattern(binding.name)
)
for (const element of binding.name.elements)
if (ts.isBindingElement(element)) defaultsOf(element, found);
return found;
}
test('no parameter default calls a method through an optional chain', () => {
// esbuild compiles `a?.b?.()` in a parameter's default, for the browsers a
// build still lowers optional chaining for (Chrome and Edge before 91), into
// code that reads a variable out of its scope: the call throws a
// ReferenceError in the built app, never under node:test. The weather shell
// read its texture limit this way, so every satellite frame failed. Compute
// such a value in the function's body instead.
const offenders = [];
for (const file of browserModules()) {
const source = ts.createSourceFile(
file,
readFileSync(file, 'utf8'),
ts.ScriptTarget.Latest,
true,
ts.ScriptKind.JS,
);
const visit = (node) => {
if (ts.isFunctionLike(node))
for (const parameter of node.parameters ?? [])
for (const initializer of defaultsOf(parameter))
for (const call of callsIn(initializer)) {
const { line } = source.getLineAndCharacterOfPosition(
call.getStart(source),
);
offenders.push(
`${path.relative(SRC_ROOT, file)}:${line + 1} ${call.getText(source)}`,
);
}
ts.forEachChild(node, visit);
};
visit(source);
}
assert.deepEqual(offenders, []);
});