@rohal12/twee-ts 1.18.0 → 1.18.1

package/dist/index.d.cts

@@ -582,7 +582,7 @@ export declare const CONFIG_FILENAME = "twee-ts.config.json";
  *
  * @param diagnostics Receives warnings that do not stop the config from loading: keys the config does not
  *   define, and a file that is not valid UTF-8 (it is read as Windows-1252).
- * @throws When the file is not valid JSON or fails {@link validateConfig}.
+ * @throws When the file exists but cannot be read, is not valid JSON or fails {@link validateConfig}.
  */
 export declare function loadConfig(dir?: string, diagnostics?: Diagnostic[]): TweeTsConfig | null;
 /**
@@ -613,8 +613,10 @@ export declare function scaffoldConfig(): string;
 /** Get the cache directory for downloaded story formats. */
 export declare function getCacheDir(): string;
 /**
- * Download a format, verify its checksum, write it to the cache shared by name and version, and
- * return its StoryFormatInfo. Concurrent calls for one download URL share one request.
+ * Download a format, verify its checksum, check that it is the format the entry names, write it to
+ * the cache shared by name and version, and return its StoryFormatInfo. Concurrent calls for one
+ * download URL share one request for the bytes; each call then verifies them against its own
+ * entry, within its own timeout.
  */
 export declare function fetchAndCacheFormat(entry: SFAIndexEntry, downloadUrl: string, options?: RemoteFetchOptions): Promise<StoryFormatInfo>;
 /**

package/dist/index.d.ts

@@ -582,7 +582,7 @@ export declare const CONFIG_FILENAME = "twee-ts.config.json";
  *
  * @param diagnostics Receives warnings that do not stop the config from loading: keys the config does not
  *   define, and a file that is not valid UTF-8 (it is read as Windows-1252).
- * @throws When the file is not valid JSON or fails {@link validateConfig}.
+ * @throws When the file exists but cannot be read, is not valid JSON or fails {@link validateConfig}.
  */
 export declare function loadConfig(dir?: string, diagnostics?: Diagnostic[]): TweeTsConfig | null;
 /**
@@ -613,8 +613,10 @@ export declare function scaffoldConfig(): string;
 /** Get the cache directory for downloaded story formats. */
 export declare function getCacheDir(): string;
 /**
- * Download a format, verify its checksum, write it to the cache shared by name and version, and
- * return its StoryFormatInfo. Concurrent calls for one download URL share one request.
+ * Download a format, verify its checksum, check that it is the format the entry names, write it to
+ * the cache shared by name and version, and return its StoryFormatInfo. Concurrent calls for one
+ * download URL share one request for the bytes; each call then verifies them against its own
+ * entry, within its own timeout.
  */
 export declare function fetchAndCacheFormat(entry: SFAIndexEntry, downloadUrl: string, options?: RemoteFetchOptions): Promise<StoryFormatInfo>;
 /**

package/dist/index.js

@@ -1577,10 +1577,9 @@ function readUTF8(filename, diagnostics) {
 function readBase64(filename) {
 	return readFileSync(filename).toString("base64");
 }
-/** Get the filename without extension, falling back to the full basename for dotfiles. */
+/** Get the filename without extension, a dotfile keeps its whole name. */
 function baseNameWithoutExt(filename) {
-	const { name, ext } = parse(filename);
-	return name || ext;
+	return parse(filename).name;
 }
 //#endregion
 //#region src/formats.ts
@@ -1624,6 +1623,8 @@ function parseFormatObject(text, start, end) {
 	}
 }
 /** Check a parsed format object's fields. Per spec, `name` is optional; `version` and `source` are required. */
+/** The name given to a format.js that names no format. */
+const UNNAMED_FORMAT_NAME = "Untitled Story Format";
 function toFormatJSON(raw) {
 	if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return {
 		ok: false,
@@ -1643,7 +1644,7 @@ function toFormatJSON(raw) {
 		reason: `Story format version ${JSON.stringify(obj.version)} is not a SemVer version.`
 	};
 	const data = {
-		name: typeof obj.name === "string" ? obj.name : "Untitled Story Format",
+		name: typeof obj.name === "string" ? obj.name : UNNAMED_FORMAT_NAME,
 		version: obj.version,
 		source: obj.source,
 		proofing: obj.proofing === true
@@ -2119,31 +2120,37 @@ function clearIndexCache() {
 /** Requests in progress, by what they fetch, so concurrent compiles make each request once. */
 const sharedRequests = /* @__PURE__ */ new Map();
 /**
-* Runs `start` once for all callers that ask for `key` while it is in progress. A caller whose
-* `signal` aborts stops waiting at once and rejects with the signal's reason; the request
-* itself is aborted (through the signal `start` receives) once no caller waits on it.
+* Runs `start` once for all callers that ask for `key` while it is in progress. Each caller waits
+* under its own limits: a caller whose `signal` aborts, or whose `timeout` passes, stops waiting
+* at once and rejects, while the others keep waiting. The request itself is aborted (through
+* the signal `start` receives) once no caller waits on it. `start` must not depend on any one
+* caller: what differs between callers belongs after the shared result.
 */
-function shareRequest(key, signal, start) {
+function shareRequest(key, { signal, timeout, timedOut }, start) {
 	if (signal?.aborted) return Promise.reject(signal.reason);
 	const request = sharedRequests.get(key) ?? startSharedRequest(key, start);
 	request.waiters++;
 	return new Promise((resolve, reject) => {
 		let waiting = true;
+		let timer;
 		const stopWaiting = () => {
 			if (!waiting) return;
 			waiting = false;
 			signal?.removeEventListener("abort", onAbort);
+			clearTimeout(timer);
 			request.waiters--;
 		};
-		const onAbort = () => {
+		const giveUp = (reason) => {
 			stopWaiting();
 			if (request.waiters === 0) {
 				if (sharedRequests.get(key) === request) sharedRequests.delete(key);
-				request.controller.abort(signal?.reason);
+				request.controller.abort(reason);
 			}
-			reject(signal?.reason);
+			reject(reason);
 		};
+		const onAbort = () => giveUp(signal?.reason);
 		signal?.addEventListener("abort", onAbort, { once: true });
+		if (timeout > 0 && timeout <= MAX_TIMER_DELAY) timer = setTimeout(() => giveUp(timedOut()), timeout);
 		request.promise.then((value) => {
 			stopWaiting();
 			resolve(value);
@@ -2173,20 +2180,32 @@ function requestTimeout(options) {
 	if (!(timeout >= 0)) throw new RangeError(`A story format request timeout must be 0 or more milliseconds, not ${timeout}`);
 	return timeout;
 }
+/** How one caller waits for `url`: under its own signal and timeout. `what` names the request in errors. */
+function waitOptions(options, what, url) {
+	const timeout = requestTimeout(options);
+	return {
+		signal: options.signal,
+		timeout,
+		timedOut: () => /* @__PURE__ */ new Error(`Failed to ${what} from ${url}: timed out after ${timeout} ms`)
+	};
+}
 /**
-* Fetch `url` as text, aborting when `signal` does or after `timeout` milliseconds (0: no limit).
-* `what` names the request in errors, as in "Failed to <what> from <url>".
+* Fetch `url` as bytes, aborting when `signal` does. `what` names the request in errors, as in
+* "Failed to <what> from <url>". The bytes are returned undecoded, so checksums cover what was served.
 */
-async function fetchText(url, what, signal, timeout) {
-	const limit = timeout > 0 && timeout <= MAX_TIMER_DELAY ? AbortSignal.timeout(timeout) : void 0;
-	try {
-		const res = await fetch(url, { signal: limit ? AbortSignal.any([signal, limit]) : signal });
-		if (!res.ok) throw new Error(`Failed to ${what} from ${url}: ${res.status} ${res.statusText}`);
-		return await res.text();
-	} catch (e) {
-		if (limit?.aborted && !signal.aborted) throw new Error(`Failed to ${what} from ${url}: timed out after ${timeout} ms`, { cause: e });
-		throw e;
-	}
+async function fetchBytes(url, what, signal) {
+	const res = await fetch(url, { signal });
+	if (!res.ok) throw new Error(`Failed to ${what} from ${url}: ${res.status} ${res.statusText}`);
+	return new Uint8Array(await res.arrayBuffer());
+}
+/** Download a format.js once for every caller in this process that asks for `url` meanwhile. */
+function shareDownload(url, options) {
+	return shareRequest(`download\0${url}`, waitOptions(options, "download format", url), (signal) => fetchBytes(url, "download format", signal));
+}
+/** Decode a downloaded format.js as local ones are (UTF-8, else Windows-1252), without a leading BOM. */
+function decodeDownload(bytes, url) {
+	const { text } = decodeText(bytes, url);
+	return text.charCodeAt(0) === 65279 ? text.slice(1) : text;
 }
 /** Validate that a JSON value is a valid SFAIndexEntry. */
 function isValidEntry(val) {
@@ -2208,9 +2227,8 @@ async function fetchIndex(url, options = {}) {
 	options.signal?.throwIfAborted();
 	const cached = indexCache.get(url);
 	if (cached) return cached;
-	const timeout = requestTimeout(options);
-	return shareRequest(`index\0${url}`, options.signal, async (signal) => {
-		const text = await fetchText(url, "fetch format index", signal, timeout);
+	return shareRequest(`index\0${url}`, waitOptions(options, "fetch format index", url), async (signal) => {
+		const text = decodeDownload(await fetchBytes(url, "fetch format index", signal), url);
 		const data = validateSFAIndex(JSON.parse(text));
 		indexCache.set(url, data);
 		return data;
@@ -2247,26 +2265,37 @@ function cachedFormatInfo(id, filename, data) {
 	};
 }
 /**
-* Download a format, verify its checksum, write it to the cache shared by name and version, and
-* return its StoryFormatInfo. Concurrent calls for one download URL share one request.
+* Check that a downloaded format is the one the index entry promised. The name matches without
+* regard to case, as format requests do, and the version by SemVer precedence, so "1.0" and "v1.0.0"
+* agree. A format.js that names no format ({@link UNNAMED_FORMAT_NAME}) is allowed: such formats
+* exist, and the index entry then supplies the name it is cached under.
+*/
+function checkFormatIdentity(entry, data, downloadUrl) {
+	if ((data.name === "Untitled Story Format" || data.name.toLowerCase() === entry.name.toLowerCase()) && sameVersion(data.version, entry.version)) return;
+	throw new Error(`Story format mismatch for ${downloadUrl}: the index lists ${entry.name} ${entry.version}, but the download is ${data.name} ${data.version}`);
+}
+/**
+* Download a format, verify its checksum, check that it is the format the entry names, write it to
+* the cache shared by name and version, and return its StoryFormatInfo. Concurrent calls for one
+* download URL share one request for the bytes; each call then verifies them against its own
+* entry, within its own timeout.
 */
 async function fetchAndCacheFormat(entry, downloadUrl, options = {}) {
 	cachedFormatDir(entry.name, entry.version);
-	const timeout = requestTimeout(options);
-	return shareRequest(`format\0${getCacheDir()}\0${downloadUrl}`, options.signal, async (signal) => {
-		const text = await fetchText(downloadUrl, "download format", signal, timeout);
-		const checksumKey = Object.keys(entry.checksums ?? {}).find((k) => k.endsWith("format.js"));
-		if (checksumKey) {
-			const expected = entry.checksums[checksumKey];
-			if (!expected) throw new Error(`Missing checksum value for key "${checksumKey}"`);
-			if (!await verifySHA256(new TextEncoder().encode(text), expected)) throw new Error(`Checksum verification failed for ${entry.name} ${entry.version}`);
-		}
-		const id = makeFormatId(entry.name, entry.version);
-		const data = parseFormatJSON(text, id);
-		if (!data) throw new Error(`Failed to parse format JSON from ${downloadUrl}`);
-		signal.throwIfAborted();
-		return cachedFormatInfo(id, writeCacheEntry(resolve(getCacheDir()), [entry.name, entry.version], text), data);
-	});
+	const bytes = await shareDownload(downloadUrl, options);
+	const checksumKey = Object.keys(entry.checksums ?? {}).find((k) => k.endsWith("format.js"));
+	if (checksumKey) {
+		const expected = entry.checksums[checksumKey];
+		if (!expected) throw new Error(`Missing checksum value for key "${checksumKey}"`);
+		if (!await verifySHA256(bytes, expected)) throw new Error(`Checksum verification failed for ${entry.name} ${entry.version}`);
+	}
+	const text = decodeDownload(bytes, downloadUrl);
+	const id = makeFormatId(entry.name, entry.version);
+	const data = parseFormatJSON(text, id);
+	if (!data) throw new Error(`Failed to parse format JSON from ${downloadUrl}`);
+	checkFormatIdentity(entry, data, downloadUrl);
+	options.signal?.throwIfAborted();
+	return cachedFormatInfo(id, writeCacheEntry(resolve(getCacheDir()), [entry.name, entry.version], text), data);
 }
 /**
 * Download a direct format.js URL, parse its JSON, cache it under that URL (apart from the
@@ -2274,16 +2303,13 @@ async function fetchAndCacheFormat(entry, downloadUrl, options = {}) {
 * one URL share one request.
 */
 async function fetchDirectFormat(url, options = {}) {
-	const timeout = requestTimeout(options);
-	return shareRequest(`url\0${getUrlCacheDir()}\0${url}`, options.signal, async (signal) => {
-		const text = await fetchText(url, "download format", signal, timeout);
-		const data = parseFormatJSON(text);
-		if (!data) throw new Error(`Failed to parse format JSON from ${url}`);
-		cachedFormatDir(data.name, data.version);
-		signal.throwIfAborted();
-		const formatPath = writeCacheEntry(getUrlCacheDir(), [urlCacheKey(url)], text);
-		return cachedFormatInfo(makeFormatId(data.name, data.version), formatPath, data);
-	});
+	const text = decodeDownload(await shareDownload(url, options), url);
+	const data = parseFormatJSON(text);
+	if (!data) throw new Error(`Failed to parse format JSON from ${url}`);
+	cachedFormatDir(data.name, data.version);
+	options.signal?.throwIfAborted();
+	const formatPath = writeCacheEntry(getUrlCacheDir(), [urlCacheKey(url)], text);
+	return cachedFormatInfo(makeFormatId(data.name, data.version), formatPath, data);
 }
 /** The copy of a direct format URL in the download cache, if it has been downloaded before. */
 function getCachedDirectFormat(url) {
@@ -2864,8 +2890,6 @@ function* tweeLexer(input) {
 		const items = ctx.drainItems();
 		for (const item of items) yield item;
 	}
-	const remaining = ctx.drainItems();
-	for (const item of remaining) yield item;
 }
 /** Convenience class wrapper for the lexer generator. */
 var TweeLexer = class {
@@ -3018,9 +3042,7 @@ function parseTwee(source, options = {}) {
 					};
 				}
 				try {
-					const raw = JSON.parse(item.val);
-					if (typeof raw !== "object" || raw === null || Array.isArray(raw)) throw new Error("expected a JSON object");
-					const parsed = raw;
+					const parsed = JSON.parse(item.val);
 					const meta = {};
 					for (const [key, value] of Object.entries(parsed)) if (typeof value === "string") meta[key] = value;
 					current.metadata = meta;
@@ -6274,8 +6296,8 @@ function loadFont(story, filename, diagnostics) {
 * Load sources with mtime-based caching for incremental rebuilds.
 * Always creates a fresh Story; cached passages are replayed via storyAdd().
 */
-function loadSourcesCached(story, filenames, opts, diagnostics, processedFiles, cache, changedFiles) {
-	const currentFiles = /* @__PURE__ */ new Set();
+function loadSourcesCached(story, filenames, opts, diagnostics, processedFiles, cache, changedFiles, buildFiles) {
+	const currentFiles = new Set(buildFiles);
 	const changedPaths = changedFiles === void 0 ? void 0 : new Set([...changedFiles].map((f) => resolve(f)));
 	for (const filename of filenames) {
 		if (processedFiles.has(filename)) {
@@ -6340,16 +6362,6 @@ function loadSourcesCached(story, filenames, opts, diagnostics, processedFiles,
 }
 //#endregion
 //#region src/template.ts
-/**
-* An HTML closing head tag: `</head` in any letter case, followed by whitespace, `/` or `>`, up to the next `>`.
-* This is how the HTML tokenizer reads an end tag; it ignores whatever sits between the tag name and the `>`.
-*/
-const CLOSING_HEAD_TAG = "<\\/[Hh][Ee][Aa][Dd](?=[\\t\\n\\f\\r />])[^>]*>";
-/**
-* The start of an HTML body start tag: `<body` in any letter case, followed by whitespace, `/` or `>` (so not
-* `<bodyx>`). Only the `<body` is matched; the attributes and `>` after it are left alone.
-*/
-const BODY_START_TAG = "<[Bb][Oo][Dd][Yy](?=[\\t\\n\\f\\r />])";
 /** The regular expression source matching exactly `text`. */
 function literal(text) {
 	return text.replace(/[.*+?^${}()|[\]\\/]/g, "\\$&");
@@ -6375,6 +6387,8 @@ function fillTemplateParts(parts) {
 		return part.text.replace(pattern, (match, ...groups) => {
 			const slot = slots.find((_, i) => groups[i] !== void 0);
 			if (slot === void 0 || slot.occurrences === "first" && filled.has(slot)) return match;
+			const offset = groups[slots.length];
+			if (slot.accepts !== void 0 && typeof offset === "number" && !slot.accepts(part.text, offset)) return match;
 			filled.add(slot);
 			return slot.replacement(match);
 		});
@@ -6465,15 +6479,18 @@ function placeHead(content, texts, owner) {
 		slot: void 0,
 		diagnostics: []
 	};
-	const found = (tag) => texts.some((text) => new RegExp(tag).test(text));
-	if (found("<\\/[Hh][Ee][Aa][Dd](?=[\\t\\n\\f\\r />])[^>]*>")) return {
-		slot: beforeTag(CLOSING_HEAD_TAG, content),
+	const scans = texts.map((text) => ({
+		text,
+		tags: scanHeadTags(text)
+	}));
+	if (scans.some(({ tags }) => tags.closingHead !== void 0)) return {
+		slot: beforeTag(CLOSING_HEAD_PREFIX, "closingHead", content),
 		diagnostics: []
 	};
-	if (found("<[Bb][Oo][Dd][Yy](?=[\\t\\n\\f\\r />])")) {
+	if (scans.some(({ tags }) => tags.bodyStart !== void 0)) {
 		const message = `${owner} has no closing head tag; the modules and head file were injected before its body start tag.`;
 		return {
-			slot: beforeTag(BODY_START_TAG, content),
+			slot: beforeTag(BODY_START_PREFIX, "bodyStart", content),
 			diagnostics: [{
 				level: "warning",
 				message
@@ -6488,12 +6505,98 @@ function placeHead(content, texts, owner) {
 		}]
 	};
 }
-/** The slot that inserts `content` on its own line before the first match of `tag`, which is kept as written. */
-function beforeTag(tag, content) {
+/** `</head` in any letter case, followed by whitespace, `/` or `>`; the rest of the tag is left alone. */
+const CLOSING_HEAD_PREFIX = "<\\/[Hh][Ee][Aa][Dd](?=[\\t\\n\\f\\r />])";
+/** `<body` in any letter case, followed by whitespace, `/` or `>` (so not `<bodyx>`). */
+const BODY_START_PREFIX = "<[Bb][Oo][Dd][Yy](?=[\\t\\n\\f\\r />])";
+/** Elements whose content is text, so a tag written there is not a tag. */
+const RAW_TEXT_ELEMENTS = /* @__PURE__ */ new Set([
+	"script",
+	"style",
+	"textarea",
+	"title"
+]);
+const isSpace = (c) => c === " " || c === "	" || c === "\n" || c === "\f" || c === "\r";
+const isLetter = (c) => c !== void 0 && /^[A-Za-z]$/.test(c);
+/**
+* Find the first closing head tag and body start tag that HTML would read as tags: not those in a comment, in
+* the text of a script, style, textarea or title element, or in a quoted attribute value. A small scanner, not
+* a full HTML tokenizer; it needs no more than the tags and where they end.
+*/
+function scanHeadTags(html) {
+	let closingHead;
+	let bodyStart;
+	let i = 0;
+	while (i < html.length) {
+		const lt = html.indexOf("<", i);
+		if (lt === -1) break;
+		const next = html[lt + 1];
+		if (html.startsWith("<!--", lt)) {
+			const end = html.indexOf("-->", lt + 4);
+			i = end === -1 ? html.length : end + 3;
+		} else if (next === "!" || next === "?") {
+			const end = html.indexOf(">", lt);
+			i = end === -1 ? html.length : end + 1;
+		} else if (next === "/" && isLetter(html[lt + 2])) {
+			const { name, end } = readTag(html, lt + 2);
+			if (name === "head" && closingHead === void 0) closingHead = lt;
+			i = end;
+		} else if (isLetter(next)) {
+			const { name, end } = readTag(html, lt + 1);
+			if (name === "body" && bodyStart === void 0) bodyStart = lt;
+			i = RAW_TEXT_ELEMENTS.has(name) ? rawTextEnd(html, name, end) : end;
+		} else i = lt + 1;
+		if (closingHead !== void 0 && bodyStart !== void 0) break;
+	}
+	return {
+		closingHead,
+		bodyStart
+	};
+}
+/** Read a tag whose name starts at `from`: its lowercase name, and the offset after its `>` (or the end). */
+function readTag(html, from) {
+	let i = from;
+	while (i < html.length && !isSpace(html[i]) && html[i] !== "/" && html[i] !== ">") i++;
+	const name = html.slice(from, i).toLowerCase();
+	while (i < html.length && html[i] !== ">") {
+		if (html[i] !== "=") {
+			i++;
+			continue;
+		}
+		i++;
+		while (isSpace(html[i])) i++;
+		const quote = html[i];
+		if (quote === "\"" || quote === "'") {
+			const close = html.indexOf(quote, i + 1);
+			i = close === -1 ? html.length : close + 1;
+		}
+	}
+	return {
+		name,
+		end: Math.min(i + 1, html.length)
+	};
+}
+/** The offset of the end tag that closes a raw text element, given where its text starts (or the end). */
+function rawTextEnd(html, name, from) {
+	const close = new RegExp(`</${name}(?=[\\t\\n\\f\\r />])`, "gi");
+	close.lastIndex = from;
+	return close.exec(html)?.index ?? html.length;
+}
+/**
+* The slot that inserts `content` on its own line before the first real tag of the kind `which` names (see
+* `scanHeadTags()`), which is kept as written. A look-alike inside a script or comment is left alone.
+*/
+function beforeTag(pattern, which, content) {
+	const cache = /* @__PURE__ */ new Map();
+	const offsetIn = (text) => {
+		if (!cache.has(text)) cache.set(text, scanHeadTags(text)[which]);
+		return cache.get(text);
+	};
 	return {
-		pattern: tag,
+		pattern,
 		occurrences: "first",
-		replacement: (match) => `${content}\n${match}`
+		replacement: (match) => `${content}\n${match}`,
+		accepts: (text, offset) => offsetIn(text) === offset
 	};
 }
 //#endregion
@@ -6939,6 +7042,7 @@ async function compile(options) {
 */
 async function compileToFile(options) {
 	const result = await compileForOutputFile(options, options.outFile);
+	options.signal?.throwIfAborted();
 	writeFileAtomic(options.outFile, result.output);
 	return result;
 }
@@ -7100,34 +7204,61 @@ async function buildOutput(options, cache, changedFiles, outputs) {
 	const timeout = options.formatFetchTimeout;
 	if (timeout !== void 0 && !(timeout >= 0)) throw new TweeTsError(`formatFetchTimeout must be 0 or more milliseconds, not ${timeout}.`);
 	clearIndexCache();
-	const filePaths = [];
-	const inlineSources = [];
-	for (const source of options.sources) if (typeof source === "string") filePaths.push(source);
-	else inlineSources.push(source);
-	const sourcePaths = getFilenames(filePaths, written, options.exclude);
-	diagnostics.push(...sourcePaths.diagnostics);
-	rejectOutputSources(sourcePaths.outputSources, diagnostics);
-	const sourceFilenames = sourcePaths.filenames;
+	const groups = [];
+	const outputSources = [];
+	for (const source of options.sources) {
+		const last = groups[groups.length - 1];
+		if (typeof source === "string") {
+			if (last?.kind === "paths") last.paths.push(source);
+			else groups.push({
+				kind: "paths",
+				paths: [source]
+			});
+		} else if (last?.kind === "inline") last.sources.push(source);
+		else groups.push({
+			kind: "inline",
+			sources: [source]
+		});
+	}
+	const walked = groups.map((group) => {
+		if (group.kind === "inline") return group;
+		const found = getFilenames(group.paths, written, options.exclude);
+		diagnostics.push(...found.diagnostics);
+		outputSources.push(...found.outputSources);
+		return {
+			kind: "files",
+			filenames: found.filenames
+		};
+	});
+	rejectOutputSources(outputSources, diagnostics);
+	const buildFiles = new Set(walked.flatMap((group) => group.kind === "files" ? group.filenames : []));
 	const story = createStory();
 	const processedFiles = /* @__PURE__ */ new Set();
-	if (cache) loadSourcesCached(story, sourceFilenames, {
+	for (const group of walked) if (group.kind === "inline") loadInlineSources(story, group.sources, {
 		trim,
 		twee2Compat
-	}, diagnostics, processedFiles, cache, changedFiles);
-	else loadSources(story, sourceFilenames, {
+	}, diagnostics);
+	else if (cache) loadSourcesCached(story, group.filenames, {
+		trim,
+		twee2Compat
+	}, diagnostics, processedFiles, cache, changedFiles, buildFiles);
+	else loadSources(story, group.filenames, {
 		trim,
 		twee2Compat
 	}, diagnostics, processedFiles);
-	loadInlineSources(story, inlineSources, {
+	if (cache && buildFiles.size === 0) loadSourcesCached(story, [], {
 		trim,
 		twee2Compat
-	}, diagnostics);
+	}, diagnostics, processedFiles, cache, changedFiles);
 	if (options.tagAliases) story.passages = applyTagAliases(story.passages, options.tagAliases);
 	let format;
-	if (outputMode === "html") format = await resolveStoryFormat(formatRequestFor(options.formatId, story.twine2.format, story.twine2.formatVersion, DEFAULT_FORMAT_ID), {
-		...options,
-		noRemote
-	}, diagnostics);
+	if (outputMode === "html") {
+		format = await resolveStoryFormat(formatRequestFor(options.formatId, story.twine2.format, story.twine2.formatVersion, DEFAULT_FORMAT_ID), {
+			...options,
+			noRemote
+		}, diagnostics);
+		options.signal?.throwIfAborted();
+	}
 	if (options.startPassage) story.twine2.start = options.startPassage;
 	const startName = story.twine2.start || DEFAULT_START_NAME;
 	if (testMode) story.twine2.options.set("debug", true);
@@ -7179,6 +7310,7 @@ async function buildOutput(options, cache, changedFiles, outputs) {
 		...getStoryStats(story, options.wordCountMethod),
 		files: [...processedFiles]
 	};
+	options.signal?.throwIfAborted();
 	return {
 		output,
 		story,
@@ -8944,22 +9076,13 @@ const foldKey = (key) => key.toLowerCase().replace(/[-_]/g, "");
 *
 * @param diagnostics Receives warnings that do not stop the config from loading: keys the config does not
 *   define, and a file that is not valid UTF-8 (it is read as Windows-1252).
-* @throws When the file is not valid JSON or fails {@link validateConfig}.
+* @throws When the file exists but cannot be read, is not valid JSON or fails {@link validateConfig}.
 */
 function loadConfig(dir, diagnostics) {
 	const base = dir ?? process.cwd();
 	const configPath = join(base, CONFIG_FILENAME);
 	if (!existsSync(configPath)) return null;
-	const readDiagnostics = [];
-	let raw;
-	try {
-		raw = readUTF8(configPath, readDiagnostics);
-	} catch {
-		return null;
-	}
-	const config = parseConfig(raw, configPath, readDiagnostics);
-	diagnostics?.push(...readDiagnostics);
-	return config;
+	return loadConfigFile(configPath, diagnostics);
 }
 /**
 * Load a config from a specific file path.