@heroiclands/package-build 8.1.0 → 10.0.0

package/sohl/item-fields.mjs

@@ -106,8 +106,7 @@ function noteContext(fm, type) {
 /** Aptitude weights per skill selector, validated as whole numbers. */
 const SKILL_APTITUDES = Object.freeze({
     shape: "map of skill selector → whole number",
-    read: (_raw, { fm }) =>
-        resolveSkillAptitudes(fm, noteContext(fm, "mystery")),
+    read: (_raw, { fm }) => resolveSkillAptitudes(fm, noteContext(fm, "mystery")),
 });
 
 /** Standings toward other affiliations, validated against the closed list. */
@@ -127,14 +126,10 @@ const STRIKE_MODES = Object.freeze({
         const seen = new Set();
         for (const { shortcode } of raw) {
             if (!shortcode) {
-                throw new Error(
-                    "weapongear strikeModes array element requires a 'shortcode'",
-                );
+                throw new Error("weapongear strikeModes array element requires a 'shortcode'");
             }
             if (seen.has(shortcode)) {
-                throw new Error(
-                    `weapongear has duplicate strike-mode shortcode "${shortcode}"`,
-                );
+                throw new Error(`weapongear has duplicate strike-mode shortcode "${shortcode}"`);
             }
             seen.add(shortcode);
         }
@@ -218,8 +213,7 @@ const GEAR_COMMON = Object.freeze([
     {
         to: "sharedWithCohortIds",
         value: () => [],
-        describe:
-            "Cohorts sharing the article. Possession state, never authored.",
+        describe: "Cohorts sharing the article. Possession state, never authored.",
     },
     {
         to: "containerId",
@@ -250,8 +244,7 @@ export const ITEM_FIELDS = Object.freeze({
             to: "subType",
             ...SUB_TYPE,
             required: true,
-            describe:
-                "Which kind of affiliation this is — the society's character.",
+            describe: "Which kind of affiliation this is — the society's character.",
         },
         {
             name: "society",
@@ -286,8 +279,7 @@ export const ITEM_FIELDS = Object.freeze({
             to: "relation",
             ...RELATION,
             default: {},
-            describe:
-                "How this society regards others: aligned, unaligned, rival or nemesis.",
+            describe: "How this society regards others: aligned, unaligned, rival or nemesis.",
         },
     ]),
 
@@ -371,16 +363,14 @@ export const ITEM_FIELDS = Object.freeze({
             to: "locations.flexible",
             ...BLANK_IS_DEFAULT,
             default: [],
-            describe:
-                "Body locations the article covers flexibly, by location shortcode.",
+            describe: "Body locations the article covers flexibly, by location shortcode.",
         },
         {
             name: "rigidloc",
             to: "locations.rigid",
             ...BLANK_IS_DEFAULT,
             default: [],
-            describe:
-                "Body locations the article covers rigidly, by location shortcode.",
+            describe: "Body locations the article covers rigidly, by location shortcode.",
         },
         {
             name: "facing",
@@ -463,16 +453,14 @@ export const ITEM_FIELDS = Object.freeze({
             to: "initDiceFormula",
             ...AS_AUTHORED,
             default: "",
-            describe:
-                "Dice expression rolled to generate the score during character creation.",
+            describe: "Dice expression rolled to generate the score during character creation.",
         },
         {
             name: "impairedByRoles",
             to: "impairedByRoles",
             ...AS_AUTHORED,
             default: [],
-            describe:
-                "Body-part roles whose impairment penalises tests against this attribute.",
+            describe: "Body-part roles whose impairment penalises tests against this attribute.",
         },
     ]),
 
@@ -701,24 +689,21 @@ export const ITEM_FIELDS = Object.freeze({
             ref: "skill",
             ...AS_AUTHORED,
             default: "",
-            describe:
-                "Shortcode of the skill this one specialises, for a specialisation.",
+            describe: "Shortcode of the skill this one specialises, for a specialisation.",
         },
         {
             name: "initSkillMult",
             to: "initSkillMult",
             ...NUMBER,
             default: 0,
-            describe:
-                "Multiplier applied to Skill Base when the skill opens on an actor.",
+            describe: "Multiplier applied to Skill Base when the skill opens on an actor.",
         },
         {
             name: "impairedByRoles",
             to: "impairedByRoles",
             ...AS_AUTHORED,
             default: [],
-            describe:
-                "Body-part roles whose impairment penalises tests against this skill.",
+            describe: "Body-part roles whose impairment penalises tests against this skill.",
         },
     ]),
 
@@ -742,8 +727,7 @@ export const ITEM_FIELDS = Object.freeze({
             to: "levelBase",
             ...NULLABLE_COUNT,
             default: null,
-            describe:
-                "Injury level. Unset on a descriptive condition, which has no level.",
+            describe: "Injury level. Unset on a descriptive condition, which has no level.",
         },
         {
             name: "healingRateBase",
@@ -757,16 +741,14 @@ export const ITEM_FIELDS = Object.freeze({
             to: "aspect",
             ...AS_AUTHORED,
             default: null,
-            describe:
-                "How the injury was inflicted. Unset on a descriptive condition.",
+            describe: "How the injury was inflicted. Unset on a descriptive condition.",
         },
         {
             name: "bodyLocationCode",
             to: "bodyLocationCode",
             ...AS_AUTHORED,
             default: null,
-            describe:
-                "Shortcode of the body location injured. Unset on a descriptive condition.",
+            describe: "Shortcode of the body location injured. Unset on a descriptive condition.",
         },
     ]),
 

package/sohl/items.mjs

@@ -41,7 +41,7 @@ import {
     resolveName,
     resolveImg,
     defaultStats,
-    withArchetypeFlag,
+    systemArchetype,
 } from "../engine/helpers.mjs";
 import { BasePackCompiler } from "../engine/base-compiler.mjs";
 // Per-type default art lives in one framework-free module shared with the
@@ -56,6 +56,15 @@ import { itemDocEntryId, itemDocPointer } from "../engine/item-docs.mjs";
 // them with are one table — the consuming repository's, not this package's
 // (#1504/#1563).
 import { itemTypes, itemBuilder, itemArt } from "../engine/item-registry.mjs";
+// Which Foundry Item subtype a note's `type` compiles into. Looked up in the
+// system's declared map, never inferred from the type itself (#79).
+import { documentSubtype, subtypeRow } from "../engine/document-subtypes.mjs";
+import { SOHL_DOCUMENT_SUBTYPES } from "./document-subtypes.mjs";
+// The note-level `sohl:` block: `sohl.system` onto the document's `system`
+// verbatim, and `sohl.img` / `sohl.effects` / `sohl.flags` overriding their
+// shared top-level forms for this system alone (#58).
+import { blockProperty, claimedPaths, mergeSystemData } from "../engine/system-block.mjs";
+import { itemFields } from "../engine/item-registry.mjs";
 
 /**
  * The description an item carries: a pointer to its **item doc**, the
@@ -86,11 +95,19 @@ function itemDescription(markdown, fm, name) {
 
 /**
  * Build the `system.*` fields shared by every item type:
- *   shortcode, actionDefs, notes, docHtml.
+ *   shortcode, archetype, actionDefs, notes, docHtml.
+ *
+ * @param {object} fm - The note's frontmatter.
+ * @param {string} description - The item's documentation pointer.
+ * @param {string} label - Human-readable context for error messages.
+ * @returns {object} The shared `system` fields.
  */
-function commonSystem(fm, description) {
+function commonSystem(fm, description, label) {
     return {
         shortcode: fm.shortcode,
+        // Required nullable number: a priority, or `null` for a document that
+        // is not an archetype (#126 / archetype contract #604).
+        archetype: systemArchetype(fm, label),
         actionDefs: Array.isArray(fm.actionDefs) ? fm.actionDefs : [],
         notes: "",
         docHtml: description || "",
@@ -105,10 +122,27 @@ function commonSystem(fm, description) {
 /*  Compiler                                                            */
 /* -------------------------------------------------------------------- */
 
+/**
+ * The system this pass compiles for — the block its notes write, and the
+ * registry its builders come from.
+ *
+ * Read from the map rather than spelled here, so the block name, the subtype
+ * map and the registry key are one statement (#58/#79).
+ *
+ * @type {string}
+ */
+const SYSTEM = SOHL_DOCUMENT_SUBTYPES.block;
+
 export class Items extends BasePackCompiler {
     static id = "items";
     static label = "item";
 
+    /**
+     * An Item **is** a system's data, so this pack takes only notes carrying
+     * this system's block (#58).
+     */
+    static requiresSystemBlock = true;
+
     /**
      * How many of each item type this pass wrote, for the summary. Every type
      * is present from the start so the tally reads as a census of the
@@ -121,11 +155,47 @@ export class Items extends BasePackCompiler {
     /**
      * Every content type that compiles into an item.
      *
+     * The whitelist is the consuming repository's `itemBuilders` keys (#1504),
+     * and the system's own map is a second filter on top of it: a type SoHL
+     * maps onto some *other* document class is not an item however a registry
+     * spells it, which is the "no wrongly-typed document" half of #79. A type
+     * the map does not name at all is left to the registry — see
+     * {@link Items#itemSubtype}.
+     *
      * @param {object} fm - The note's frontmatter.
      * @returns {boolean} True for a whitelisted item type.
      */
     selects(fm) {
-        return Boolean(fm.type) && itemTypes().has(fm.type);
+        if (!fm.type || !itemTypes().has(fm.type)) return false;
+        const row = subtypeRow(SOHL_DOCUMENT_SUBTYPES, fm.type);
+        return !row || row.document === "Item";
+    }
+
+    /**
+     * The Foundry Item subtype a note compiles into.
+     *
+     * **Looked up, not inferred.** For every type this system declares, the
+     * emitted subtype is the map's, so the note vocabulary and the document
+     * vocabulary are two separately-stated things rather than one string
+     * written twice (#79).
+     *
+     * **A type the map does not name belongs to the consumer**, and its
+     * registry entry is the declaration: a repository shipping an item type of
+     * its own writes it once, in the `itemBuilders` table of its
+     * `package-build.config.yaml`, and that key is what the document is a
+     * subtype of. That is an authored statement in the consumer's own
+     * configuration, not a coincidence inside this package's source — and
+     * refusing it here would silently drop every document of a type SoHL has
+     * no opinion about (#7/#1563).
+     *
+     * @param {object} fm - The note's frontmatter.
+     * @returns {string} The document's `type`.
+     */
+    itemSubtype(fm) {
+        const declared = documentSubtype(SOHL_DOCUMENT_SUBTYPES, fm.type, fm, {
+            absPath: this.currentNote?.absPath,
+        });
+        return declared ?? fm.type;
     }
 
     /** An item is named by its own type in the log, not by "item". */
@@ -147,26 +217,52 @@ export class Items extends BasePackCompiler {
         const name = resolveName(fm);
         const description = itemDescription(markdown, fm, name);
         const id = fm.id;
+        const subType = this.itemSubtype(fm);
         const system = {
-            ...commonSystem(fm, description),
-            ...itemBuilder(type)(fm),
+            ...commonSystem(fm, description, `item "${name}"`),
+            ...itemBuilder(type, SYSTEM)(fm),
         };
+        // Whatever the note authors under `sohl.system`, at the DataModel's own
+        // paths. A path a declared field already writes is left to that field:
+        // its value came from the same authored place and went through the
+        // field's own coercion (#58).
+        mergeSystemData(system, fm, {
+            block: SYSTEM,
+            claimed: claimedPaths(itemFields(type, SYSTEM)),
+        });
+        this.reportUndeclaredSystemData(fm, SYSTEM, "Item", subType);
+        // And what *this* pass wrote on its own initiative — `shortcode`,
+        // `archetype`, `actionDefs`, `notes`, `docHtml` — which no field
+        // declaration states and so no other check can see (#155). Read off the
+        // assembled block, so a key added to `commonSystem` is checked without
+        // anyone remembering to list it.
+        this.reportEmittedSystemData(system, {
+            fm,
+            block: SYSTEM,
+            documentType: "Item",
+            subType,
+            type,
+            fields: itemFields(type, SYSTEM),
+        });
 
-        const effects = Array.isArray(fm.effects) ? [...fm.effects] : [];
-
+        const effects = blockProperty(fm, SYSTEM, "effects");
         const folderId = sohlField(fm, "folder", null);
         const folder = this.folderResolver(folderId);
 
         return {
             name,
-            type,
-            img: resolveImg(fm.img) || itemArt(type),
+            // The note's `type` addresses the builder and the default art —
+            // both registries are keyed by content type — while the document's
+            // own subtype comes from the system's map (#79).
+            type: subType,
+            img: resolveImg(blockProperty(fm, SYSTEM, "img")) || itemArt(type, SYSTEM),
             _id: id,
             system,
-            effects,
-            // `sohl.archetype` (required nullable number) drives
-            // `flags.sohl.docArchetype` (#640 / archetype contract #604).
-            flags: withArchetypeFlag(fm, fm.flags, `item "${name}"`),
+            effects: Array.isArray(effects) ? [...effects] : [],
+            // Whatever the note authors, and nothing else. `archetype` used to
+            // be spliced in here as `flags.sohl.docArchetype`; it is a schema
+            // field now and sits in `system` (#126).
+            flags: blockProperty(fm, SYSTEM, "flags", {}),
             _stats: this.stats,
             ownership: { default: 0 },
             folder,
@@ -189,8 +285,6 @@ export class Items extends BasePackCompiler {
 
     /** @inheritdoc */
     reportDetail(stats) {
-        log.debug(
-            `Skipped ${stats.skippedOther} non-item file(s) (no recognized type)`,
-        );
+        log.debug(`Skipped ${stats.skippedOther} non-item file(s) (no recognized type)`);
     }
 }

package/sohl/kb-passes.mjs

@@ -90,8 +90,7 @@ function readSymbolMap(file, repoRoot) {
         raw = fs.readFileSync(resolved, "utf8");
     } catch (err) {
         throw new Error(
-            `site.passOptions.symbolMap ${resolved} cannot be read: ` +
-                `${err.message}`,
+            `site.passOptions.symbolMap ${resolved} cannot be read: ` + `${err.message}`,
         );
     }
 
@@ -100,8 +99,7 @@ function readSymbolMap(file, repoRoot) {
         parsed = JSON.parse(raw);
     } catch (err) {
         throw new Error(
-            `site.passOptions.symbolMap ${resolved} is not valid JSON: ` +
-                `${err.message}`,
+            `site.passOptions.symbolMap ${resolved} is not valid JSON: ` + `${err.message}`,
         );
     }
 
@@ -140,39 +138,34 @@ function readSymbolMap(file, repoRoot) {
  * @returns {string} The body with every tag resolved.
  */
 export function resolveApiLinks(body, symbols, apiBase) {
-    return body.replace(
-        /\{@link(code|plain)?\s+([^}]+)\}/g,
-        (_m, kind, inner) => {
-            inner = inner.trim();
-            let target, text;
-            const pipe = inner.indexOf("|");
-            const space = inner.search(/\s/);
-            if (pipe !== -1) {
-                target = inner.slice(0, pipe).trim();
-                text = inner.slice(pipe + 1).trim();
-            } else if (space !== -1) {
-                target = inner.slice(0, space);
-                text = inner.slice(space + 1).trim();
-            } else {
-                target = inner;
-                text = "";
-            }
+    return body.replace(/\{@link(code|plain)?\s+([^}]+)\}/g, (_m, kind, inner) => {
+        inner = inner.trim();
+        let target, text;
+        const pipe = inner.indexOf("|");
+        const space = inner.search(/\s/);
+        if (pipe !== -1) {
+            target = inner.slice(0, pipe).trim();
+            text = inner.slice(pipe + 1).trim();
+        } else if (space !== -1) {
+            target = inner.slice(0, space);
+            text = inner.slice(space + 1).trim();
+        } else {
+            target = inner;
+            text = "";
+        }
 
-            if (/^https?:\/\//.test(target)) {
-                return `[${text || target}](${target})`;
-            }
+        if (/^https?:\/\//.test(target)) {
+            return `[${text || target}](${target})`;
+        }
 
-            const url = symbols[target];
-            const display = text || target.split(".").pop();
-            if (url) {
-                const href = apiBase + url;
-                return kind === "code" ?
-                        `[\`${display}\`](${href})`
-                    :   `[${display}](${href})`;
-            }
-            return kind === "plain" ? display : `\`${display}\``;
-        },
-    );
+        const url = symbols[target];
+        const display = text || target.split(".").pop();
+        if (url) {
+            const href = apiBase + url;
+            return kind === "code" ? `[\`${display}\`](${href})` : `[${display}](${href})`;
+        }
+        return kind === "plain" ? display : `\`${display}\``;
+    });
 }
 
 /**
@@ -218,10 +211,7 @@ export function rewriteRepoLinks(body, docRel, options) {
         let out;
         if (repoRel.startsWith(`${docsRel}/`) && repoRel.endsWith(".md")) {
             const rel2 = repoRel.slice(docsRel.length + 1, -3).toLowerCase();
-            const devPath =
-                path.basename(rel2) === "readme" ?
-                    path.posix.dirname(rel2)
-                :   rel2;
+            const devPath = path.basename(rel2) === "readme" ? path.posix.dirname(rel2) : rel2;
             out = `${route}${devPath === "." ? "" : `${devPath}/`}${anchor}`;
         } else {
             out = `${blob}${repoRel}${anchor}`;

package/sohl/note-schemas.mjs

@@ -122,23 +122,29 @@ const BEING_FIELDS = Object.freeze([
 ]);
 
 /**
- * A map note — `battlemap`, `localmap` or `regionalmap`, each compiled into a
+ * A map note — one type whose `battlemap` / `localmap` / `regionalmap`
+ * subType decides the derived canvas (#174). Compiled into a
  * Foundry Scene.
  *
  * The three differ only in derived canvas defaults, which is the map compiler's
  * business; their authored vocabulary is the same, so they share one
  * declaration rather than three copies that could drift.
  *
- * `image` is the one required field — the compiler refuses a map note without
- * it, since a scene with no background is not a map.
+ * `img` is the one required field — the compiler refuses a map note without it,
+ * since a scene with no background is not a map. It was spelled `image` and
+ * read from the `sohl:` block until #142; both spellings still compile, and the
+ * retired one is reported rather than refused.
  *
  * @type {readonly import("../engine/field-spec.mjs").FieldSpec[]}
  */
 const MAP_FIELDS = Object.freeze([
     {
-        name: "image",
+        name: "img",
         ...STRING,
         required: true,
+        // Art is not system-specific — a Scene is a core Foundry document, and
+        // every other note type carries its `img` at the note's top level.
+        shared: true,
         describe: "The scene's background image.",
     },
     {
@@ -324,7 +330,5 @@ export const NOTE_SCHEMAS = Object.freeze({
     doc: DOC_FIELDS,
     macro: MACRO_FIELDS,
     being: Object.freeze([...BEING_FIELDS, ...PRESENTATION_FIELDS.being]),
-    battlemap: MAP_FIELDS,
-    localmap: MAP_FIELDS,
-    regionalmap: MAP_FIELDS,
+    map: MAP_FIELDS,
 });

package/sohl/skill-base.mjs

@@ -116,9 +116,7 @@ function evalNode(node, attrs) {
     switch (node.type) {
         case "Literal": {
             if (typeof node.value !== "number") {
-                throw new Error(
-                    `unsupported literal ${JSON.stringify(node.value)}`,
-                );
+                throw new Error(`unsupported literal ${JSON.stringify(node.value)}`);
             }
             return node.value;
         }
@@ -126,9 +124,7 @@ function evalNode(node, attrs) {
             // Only `attr.<code>` and `attr["<code>"]`. Any other object, and
             // any computed key that is not a plain string, is out of scope.
             if (node.object?.type !== "Identifier") {
-                throw new Error(
-                    "only `attr.<code>` member reads are supported",
-                );
+                throw new Error("only `attr.<code>` member reads are supported");
             }
             if (node.object.name !== "attr") {
                 throw new Error(
@@ -136,13 +132,8 @@ function evalNode(node, attrs) {
                 );
             }
             if (node.computed) {
-                if (
-                    node.property.type !== "Literal" ||
-                    typeof node.property.value !== "string"
-                ) {
-                    throw new Error(
-                        "a computed `attr[...]` read needs a literal string shortcode",
-                    );
+                if (node.property.type !== "Literal" || typeof node.property.value !== "string") {
+                    throw new Error("a computed `attr[...]` read needs a literal string shortcode");
                 }
                 return readAttr(attrs, node.property.value);
             }
@@ -150,15 +141,11 @@ function evalNode(node, attrs) {
         }
         case "CallExpression": {
             if (node.callee?.type !== "Identifier") {
-                throw new Error(
-                    "only direct calls to a named helper are supported",
-                );
+                throw new Error("only direct calls to a named helper are supported");
             }
             const helper = HELPERS[node.callee.name];
             if (!helper) {
-                throw new Error(
-                    `unknown helper "${node.callee.name}()" in a skill base formula`,
-                );
+                throw new Error(`unknown helper "${node.callee.name}()" in a skill base formula`);
             }
             return helper(...node.arguments.map((a) => evalNode(a, attrs)));
         }
@@ -200,10 +187,7 @@ export function evaluateSkillBase(formula, attrs = {}) {
     let node;
     try {
         const program = parse(source, { ecmaVersion: 2022 });
-        if (
-            program.body.length !== 1 ||
-            program.body[0].type !== "ExpressionStatement"
-        ) {
+        if (program.body.length !== 1 || program.body[0].type !== "ExpressionStatement") {
             return {
                 value: 0,
                 error: `skill base formula "${source}" is not a single expression`,

package/stage.mjs

@@ -46,12 +46,7 @@ import path from "node:path";
  * beneath `site/` — but these four are common to all of them because they come
  * from the shared toolchain rather than from any one package's layout.
  */
-export const BUILD_ARTIFACT_DIRS = Object.freeze([
-    "build",
-    ".vite",
-    ".vitepress",
-    ".rollup.cache",
-]);
+export const BUILD_ARTIFACT_DIRS = Object.freeze(["build", ".vite", ".vitepress", ".rollup.cache"]);
 
 /**
  * A source that does not exist, described for a human.
@@ -66,9 +61,7 @@ export const BUILD_ARTIFACT_DIRS = Object.freeze([
  * @returns {string[]} Every source that is absent, in the order listed.
  */
 export function missingSources(entries, cwd = process.cwd()) {
-    return entries
-        .map(([src]) => src)
-        .filter((src) => !fs.existsSync(path.resolve(cwd, src)));
+    return entries.map(([src]) => src).filter((src) => !fs.existsSync(path.resolve(cwd, src)));
 }
 
 /**
@@ -157,10 +150,7 @@ export function stageAssets(entries, { cwd = process.cwd(), transform } = {}) {
  *   `distclean` case.
  * @returns {string[]} The directories removed, as listed.
  */
-export function cleanBuildArtifacts(
-    root,
-    { extra = [], includeNodeModules = false } = {},
-) {
+export function cleanBuildArtifacts(root, { extra = [], includeNodeModules = false } = {}) {
     const dirs = [
         ...BUILD_ARTIFACT_DIRS,
         ...extra,

package/templates.mjs

@@ -107,10 +107,7 @@ function stripNonProse(source) {
  * @returns {boolean} Whether it should have been localized.
  */
 function isProse(text, allowed) {
-    return (
-        /[A-Za-z]{2}/.test(text.replace(/&[a-zA-Z]+;|&#\d+;/g, " ")) &&
-        !allowed.has(text)
-    );
+    return /[A-Za-z]{2}/.test(text.replace(/&[a-zA-Z]+;|&#\d+;/g, " ")) && !allowed.has(text);
 }
 
 /**
@@ -201,23 +198,15 @@ export function findTemplateSyntaxErrors(source) {
         // answer, in the only place this error carries it.
         const loc = err?.hash?.loc;
         const stated = /Parse error on line (\d+)/.exec(String(err?.message));
-        const line =
-            loc?.first_line ??
-            err?.lineNumber ??
-            (stated ? Number(stated[1]) : undefined);
+        const line = loc?.first_line ?? err?.lineNumber ?? (stated ? Number(stated[1]) : undefined);
         return [
             {
                 ...(typeof line === "number" ? { line } : {}),
-                ...((
-                    typeof line === "number" &&
-                    typeof loc?.first_column === "number"
-                ) ?
+                ...(typeof line === "number" && typeof loc?.first_column === "number" ?
                     { column: loc.first_column + 1 }
                 :   {}),
                 severity: "error",
-                message: `template does not compile: ${
-                    String(err).split("\n")[0]
-                }`,
+                message: `template does not compile: ${String(err).split("\n")[0]}`,
             },
         ];
     }

package/types/bundle.d.mts

@@ -45,7 +45,7 @@ export function globalDeclarations(source: string): Array<{
  *   declaredAs: "esmodules"|"scripts"|"both"|"neither"}} The findings, empty
  *   when the two agree, and how the entry was declared.
  */
-export function checkBundleLoading({ manifest, source, entry, manifestName, }: {
+export function checkBundleLoading({ manifest, source, entry, manifestName }: {
     manifest: object;
     source: string;
     entry: string;

package/types/container.d.mts

@@ -82,7 +82,7 @@ export function resolveStagePort(stage: string, { env, stages }?: {
  * @param {string} [opts.e2eStage] - Which stage the suite runs against.
  * @returns {string|null} The exact build, or `null`.
  */
-export function resolveFoundryVersion(stage: string, { env, stages, compatibilityMinimum, e2eStage, }?: {
+export function resolveFoundryVersion(stage: string, { env, stages, compatibilityMinimum, e2eStage }?: {
     env?: NodeJS.ProcessEnv | undefined;
     stages?: Record<string, ContainerStage> | undefined;
     compatibilityMinimum?: string | null | undefined;
@@ -305,7 +305,7 @@ export function removeContainer(name: string, log?: (message: string) => void):
  * @returns {number} The exit status.
  * @throws {Error} On an unknown action, or a stage with no usable data root.
  */
-export function containerAction({ action, stage, config, env, log, }: {
+export function containerAction({ action, stage, config, env, log }: {
     action: string;
     stage: string;
     config: object;