@defold-typescript/types 0.6.0 → 0.8.0

package/README.md

@@ -12,8 +12,8 @@ Most users get these wired in automatically by the
 [`defold-typescript`](https://www.npmjs.com/package/@defold-typescript/cli) CLI
 (`bunx @defold-typescript/cli init`), which points `tsconfig.json` at the right surface.
 
-See the repository [README](https://github.com/king8fisher/defold-typescript#readme)
-and [`docs/guide/`](https://github.com/king8fisher/defold-typescript/tree/main/docs/guide)
+See the repository [README](https://github.com/defold-typescript/toolchain#readme)
+and [`docs/guide/`](https://github.com/defold-typescript/toolchain/tree/main/docs/guide)
 for the full workflow.
 
 ## License

package/api-targets.json

@@ -31,6 +31,7 @@
         },
         { "namespace": "graphics", "fixture": "graphics_doc.json", "outFile": "graphics.d.ts" },
         { "namespace": "gui", "fixture": "gui_doc.json", "outFile": "gui.d.ts" },
+        { "namespace": "html5", "fixture": "html5_doc.json", "outFile": "html5.d.ts" },
         { "namespace": "http", "fixture": "http_doc.json", "outFile": "http.d.ts" },
         { "namespace": "iac", "fixture": "iac_doc.json", "outFile": "iac.d.ts" },
         { "namespace": "iap", "fixture": "iap_doc.json", "outFile": "iap.d.ts" },
@@ -65,6 +66,7 @@
         { "namespace": "sys", "fixture": "sys_doc.json", "outFile": "sys.d.ts" },
         { "namespace": "tilemap", "fixture": "tilemap_doc.json", "outFile": "tilemap.d.ts" },
         { "namespace": "timer", "fixture": "timer_doc.json", "outFile": "timer.d.ts" },
+        { "namespace": "types", "fixture": "types_doc.json", "outFile": "types.d.ts" },
         { "namespace": "vmath", "fixture": "vmath_doc.json", "outFile": "vmath.d.ts" },
         { "namespace": "webview", "fixture": "webview_doc.json", "outFile": "webview.d.ts" },
         { "namespace": "window", "fixture": "window_doc.json", "outFile": "window.d.ts" },

package/generated/collectionproxy.d.ts

@@ -40,7 +40,7 @@ declare global {
      * }
      * ```
      */
-    function get_resources(collectionproxy: Url): Record<string | number, unknown>;
+    function get_resources(collectionproxy: Url): Hash[];
     /**
      * The collection should be loaded by the collection proxy.
      * Setting the collection to "nil" will revert it back to the original collection.

package/generated/go.d.ts

@@ -689,7 +689,7 @@ declare global {
      * });
      * ```
      */
-    export function on_input(self: Opaque<"userdata">, action_id: Hash, action: Record<string | number, unknown>): boolean | unknown;
+    export function on_input(self: Opaque<"userdata">, action_id: Hash, action: { value?: number; pressed?: boolean; released?: boolean; repeated?: boolean; x?: number; y?: number; screen_x?: number; screen_y?: number; dx?: number; dy?: number; screen_dx?: number; screen_dy?: number; gamepad?: number; gamepad_axis?: Vector3; touch?: { id?: number; pressed?: boolean; released?: boolean; tap_count?: number; x?: number; y?: number; dx?: number; dy?: number; acc_x?: number; acc_y?: number; acc_z?: number }[]; text?: string }): boolean | unknown;
     /**
      * This is a callback-function, which is called by the engine whenever a message has been sent to the script component.
      * It can be used to take action on the message, e.g. send a response back to the sender of the message.

package/generated/gui.d.ts

@@ -1381,7 +1381,7 @@ declare global {
      * end
      * ```
      */
-    function on_input(self: Opaque<"userdata">, action_id: Hash, action: Record<string | number, unknown>): boolean | unknown;
+    function on_input(self: Opaque<"userdata">, action_id: Hash, action: { value?: number; pressed?: boolean; released?: boolean; repeated?: boolean; x?: number; y?: number; screen_x?: number; screen_y?: number; dx?: number; dy?: number; screen_dx?: number; screen_dy?: number; gamepad?: number; gamepad_axis?: Vector3; touch?: { id?: number; pressed?: boolean; released?: boolean; tap_count?: number; x?: number; y?: number; dx?: number; dy?: number; acc_x?: number; acc_y?: number; acc_z?: number }[]; text?: string }): boolean | unknown;
     /**
      * This is a callback-function, which is called by the engine whenever a message has been sent to the gui component.
      * It can be used to take action on the message, e.g. update the gui or send a response back to the sender of the message.

package/generated/html5.d.ts

@@ -0,0 +1,49 @@
+/** @noSelfInFile */
+declare global {
+  /**
+   * HTML5 platform specific functions.
+   * [icon:html5] The following functions are only available on HTML5 builds, the `html5.*` Lua namespace will not be available on other platforms.
+   */
+  namespace html5 {
+    /**
+     * Executes the supplied string as JavaScript inside the browser.
+     * A call to this function is blocking, the result is returned as-is, as a string.
+     * (Internally this will execute the string using the `eval()` JavaScript function.)
+     *
+     * @param code - Javascript code to run
+     * @returns result as string
+     * @example
+     * ```lua
+     * local res = html5.run("10 + 20") -- returns the string "30"
+     * print(res)
+     * local res_num = tonumber(res) -- convert to number
+     * print(res_num - 20) -- prints 10
+     * ```
+     */
+    function run(code: string): string;
+    /**
+     * Set a JavaScript interaction listener callaback from lua that will be
+     * invoked when a user interacts with the web page by clicking, touching or typing.
+     * The callback can then call DOM restricted actions like requesting a pointer lock,
+     * or start playing sounds the first time the callback is invoked.
+     *
+     * @param callback - The interaction callback. Pass an empty function or `nil` if you no longer wish to receive callbacks.
+     * `self`
+     * object The calling script
+     * @example
+     * ```lua
+     * local function on_interaction(self)
+     *     print("on_interaction called")
+     *     html5.set_interaction_listener(nil)
+     * end
+     *
+     * function init(self)
+     *     html5.set_interaction_listener(on_interaction)
+     * end
+     * ```
+     */
+    function set_interaction_listener(callback?: (self: unknown) => void): void;
+  }
+}
+
+export {};

package/generated/http.d.ts

@@ -61,7 +61,7 @@ declare global {
      * });
      * ```
      */
-    function request(url: string, method: string, callback: (self: unknown, id: unknown, response: unknown) => void, headers?: Record<string | number, unknown>, post_data?: string, options?: { timeout?: number; path?: string; ignore_cache?: boolean; chunked_transfer?: boolean; report_progress?: boolean }): void;
+    function request(url: string, method: string, callback: (self: unknown, id: unknown, response: unknown) => void, headers?: LuaMap<string, string>, post_data?: string, options?: { timeout?: number; path?: string; ignore_cache?: boolean; chunked_transfer?: boolean; report_progress?: boolean }): void;
   }
 }
 

package/generated/kinds/gui-script.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="lua-types/5.1" />
+/// <reference types="lua-types/special/jit-only" />
 import "../b2d";
 import "../buffer";
 import "../camera";
@@ -7,6 +9,7 @@ import "../crash";
 import "../factory";
 import "../go";
 import "../graphics";
+import "../html5";
 import "../http";
 import "../iac";
 import "../iap";
@@ -27,6 +30,7 @@ import "../sprite";
 import "../sys";
 import "../tilemap";
 import "../timer";
+import "../types";
 import "../vmath";
 import "../webview";
 import "../window";

package/generated/kinds/render-script.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="lua-types/5.1" />
+/// <reference types="lua-types/special/jit-only" />
 import "../b2d";
 import "../buffer";
 import "../camera";
@@ -7,6 +9,7 @@ import "../crash";
 import "../factory";
 import "../go";
 import "../graphics";
+import "../html5";
 import "../http";
 import "../iac";
 import "../iap";
@@ -27,6 +30,7 @@ import "../sprite";
 import "../sys";
 import "../tilemap";
 import "../timer";
+import "../types";
 import "../vmath";
 import "../webview";
 import "../window";

package/generated/kinds/script.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="lua-types/5.1" />
+/// <reference types="lua-types/special/jit-only" />
 import "../b2d";
 import "../buffer";
 import "../camera";
@@ -7,6 +9,7 @@ import "../crash";
 import "../factory";
 import "../go";
 import "../graphics";
+import "../html5";
 import "../http";
 import "../iac";
 import "../iap";
@@ -27,6 +30,7 @@ import "../sprite";
 import "../sys";
 import "../tilemap";
 import "../timer";
+import "../types";
 import "../vmath";
 import "../webview";
 import "../window";

package/generated/physics.d.ts

@@ -50,7 +50,7 @@ declare global {
      * See each joint type for possible properties field. The one field that is accepted for all joint types is:
      * - boolean `collide_connected`: Set this flag to true if the attached bodies should collide.
      */
-    function create_joint(joint_type: number, collisionobject_a: string | Hash | Url, joint_id: string | Hash, position_a: Vector3, collisionobject_b: string | Hash | Url, position_b: Vector3, properties?: Record<string | number, unknown>): void;
+    function create_joint(joint_type: number, collisionobject_a: string | Hash | Url, joint_id: string | Hash, position_a: Vector3, collisionobject_b: string | Hash | Url, position_b: Vector3, properties?: { collide_connected?: boolean }): void;
     /**
      * Destroy an already physics joint. The joint has to be created before a
      * destroy can be issued.
@@ -205,7 +205,7 @@ declare global {
      * });
      * ```
      */
-    function raycast(from: Vector3, to: Vector3, groups: Hash[], options?: { all?: boolean }): Record<string | number, unknown> | unknown;
+    function raycast(from: Vector3, to: Vector3, groups: Hash[], options?: { all?: boolean }): { fraction: number; position: Vector3; normal: Vector3; id: Hash; group: Hash; request_id: number }[] | unknown;
     /**
      * Ray casts are used to test for intersections against collision objects in the physics world.
      * Collision objects of types kinematic, dynamic and static are tested against. Trigger objects
@@ -400,7 +400,7 @@ declare global {
      * @param properties - joint specific properties table
      * Note: The `collide_connected` field cannot be updated/changed after a connection has been made.
      */
-    function set_joint_properties(collisionobject: string | Hash | Url, joint_id: string | Hash, properties: Record<string | number, unknown>): void;
+    function set_joint_properties(collisionobject: string | Hash | Url, joint_id: string | Hash, properties: { collide_connected?: boolean }): void;
     /**
      * Sets or clears the masking of a group (maskbit) in a collision object.
      *

package/generated/profiler.d.ts

@@ -213,7 +213,7 @@ declare global {
      * profiler.view_recorded_frame({ distance: -1 });
      * ```
      */
-    function view_recorded_frame(frame_index: Record<string | number, unknown>): void;
+    function view_recorded_frame(frame_index: { distance?: number; frame?: number }): void;
   }
 }
 

package/generated/render.d.ts

@@ -1,5 +1,5 @@
 /** @noSelfInFile */
-import type { Hash, Matrix4, Opaque, Url } from "../src/core-types";
+import type { Hash, Matrix4, Opaque, Url, Vector4 } from "../src/core-types";
 
 declare global {
   /**
@@ -47,7 +47,7 @@ declare global {
      * });
      * ```
      */
-    function clear(buffers: Record<string | number, unknown>): void;
+    function clear(buffers: LuaMap<number, number | Vector4>): void;
     /**
      * Constant buffers are used to set shader program variables and are optionally passed to the `render.draw()` function.
      * The buffer's constant elements can be indexed like an ordinary Lua table, but you can't iterate over them with pairs() or ipairs().
@@ -468,7 +468,7 @@ declare global {
      * const p = render.predicate([hash("opaque"), hash("smoke")]);
      * ```
      */
-    function predicate(tags: Record<string | number, unknown>): number;
+    function predicate(tags: (string | Hash)[]): number;
     /**
      * Creates a new render target according to the supplied
      * specification table.

package/generated/resource.d.ts

@@ -626,7 +626,7 @@ declare global {
      * `geometries`, preserving the frame-to-geometry mapping used by the atlas.
      * See resource.set_atlas for a detailed description of each field
      */
-    function get_atlas(path: Hash | string): { texture: string | Hash; animations: { id: string; width: number; height: number; frame_start: number; frame_end: number; playback: Opaque<"constant">; fps: number; flip_vertical: boolean; flip_horizontal: boolean }[]; geometries: Record<string | number, unknown> };
+    function get_atlas(path: Hash | string): { texture: string | Hash; animations: { id: string; width: number; height: number; frame_start: number; frame_end: number; playback: Opaque<"constant">; fps: number; flip_vertical: boolean; flip_horizontal: boolean }[]; geometries: { vertices: number[]; uvs: number[]; indices: number[] }[] };
     /**
      * gets the buffer from a resource
      *
@@ -739,7 +739,7 @@ declare global {
      * });
      * ```
      */
-    function get_text_metrics(url: Hash, text: string, options?: { width?: number; leading?: number; tracking?: number; line_break?: boolean }): Record<string | number, unknown>;
+    function get_text_metrics(url: Hash, text: string, options?: { width?: number; leading?: number; tracking?: number; line_break?: boolean }): { width: number; height: number; max_ascent: number; max_descent: number };
     /**
      * Gets texture info from a texture resource path or a texture handle
      *
@@ -1007,7 +1007,7 @@ declare global {
      * });
      * ```
      */
-    function set_atlas(path: Hash | string, table: { texture?: string | Hash; animations?: { id?: string; width?: number; height?: number; frame_start?: number; frame_end?: number; playback?: Opaque<"constant">; fps?: number; flip_vertical?: boolean; flip_horizontal?: boolean }[]; geometries?: Record<string | number, unknown>; vertices?: number[]; uvs?: number[]; indices?: number[] }): void;
+    function set_atlas(path: Hash | string, table: { texture?: string | Hash; animations?: { id?: string; width?: number; height?: number; frame_start?: number; frame_end?: number; playback?: Opaque<"constant">; fps?: number; flip_vertical?: boolean; flip_horizontal?: boolean }[]; geometries?: { vertices?: number[]; uvs?: number[]; indices?: number[] }[]; vertices?: number[]; uvs?: number[]; indices?: number[] }): void;
     /**
      * Sets the buffer of a resource. By default, setting the resource buffer will either copy the data from the incoming buffer object
      * to the buffer stored in the destination resource, or make a new buffer object if the sizes between the source buffer and the destination buffer

package/generated/types.d.ts

@@ -0,0 +1,59 @@
+/** @noSelfInFile */
+declare global {
+  /**
+   * Functions for checking Defold userdata types.
+   */
+  namespace types {
+    /**
+     * Check if passed type is hash.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is hash
+     */
+    function is_hash(var_: unknown): boolean;
+    /**
+     * Check if passed type is matrix4.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is matrix4
+     */
+    function is_matrix4(var_: unknown): boolean;
+    /**
+     * Check if passed type is quaternion.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is quaternion
+     */
+    function is_quat(var_: unknown): boolean;
+    /**
+     * Check if passed type is URL.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is URL
+     */
+    function is_url(var_: unknown): boolean;
+    /**
+     * Check if passed type is vector.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is vector
+     */
+    function is_vector(var_: unknown): boolean;
+    /**
+     * Check if passed type is vector3.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is vector3
+     */
+    function is_vector3(var_: unknown): boolean;
+    /**
+     * Check if passed type is vector4.
+     *
+     * @param var_ - Variable to check type
+     * @returns True if passed type is vector4
+     */
+    function is_vector4(var_: unknown): boolean;
+  }
+}
+
+export {};

package/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="lua-types/5.1" />
+/// <reference types="lua-types/special/jit-only" />
 import "./generated/builtin-messages";
 import "./src/msg-overloads";
 import "./src/message-guard";
@@ -14,6 +16,7 @@ import "./generated/go";
 import "./src/go-overloads";
 import "./generated/graphics";
 import "./generated/gui";
+import "./generated/html5";
 import "./generated/http";
 import "./generated/iac";
 import "./generated/iap";
@@ -35,6 +38,7 @@ import "./generated/sprite";
 import "./generated/sys";
 import "./generated/tilemap";
 import "./generated/timer";
+import "./generated/types";
 import "./generated/vmath";
 import "./generated/webview";
 import "./generated/window";

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@defold-typescript/types",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "TypeScript types for the Defold engine's Lua APIs.",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/defold-typescript/toolchain.git",
+    "directory": "packages/types"
+  },
+  "homepage": "https://github.com/defold-typescript/toolchain#readme",
+  "bugs": "https://github.com/defold-typescript/toolchain/issues",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./index.d.ts",
@@ -23,6 +30,9 @@
     "./core-types": {
       "types": "./src/core-types.ts"
     },
+    "./timers": {
+      "types": "./src/timers.d.ts"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -45,6 +55,9 @@
     "sync-api-docs": "bun scripts/sync-api-docs.ts",
     "ref-doc-delta": "bun scripts/ref-doc-delta.ts --target defold-1.9.8 --namespace label --present label.get_text --absent label.set_text"
   },
+  "dependencies": {
+    "lua-types": "^2.13.1"
+  },
   "devDependencies": {
     "@typescript-to-lua/language-extensions": "1.19.0"
   }

package/scripts/doc-source.ts

@@ -11,10 +11,70 @@ export interface ResolvedRefDoc {
   provenance: DocSourceProvenance;
 }
 
-export type DownloadRefDoc = (version: string) => Promise<Uint8Array>;
+// Download by the *resolved* URL (channel-aware), not by re-deriving it from the
+// version: stable is the GitHub release URL, beta/alpha are the channel-head
+// archive on d.defold.com.
+export type DownloadRefDoc = (url: string) => Promise<Uint8Array>;
 
 export type LocateLocalRefDoc = (version: string) => string | null;
 
+export type RefDocChannel = "stable" | "beta" | "alpha";
+
+export const DEFAULT_REF_DOC_CHANNEL: RefDocChannel = "stable";
+
+export const channelInfoUrl = (channel: RefDocChannel): string =>
+  `https://d.defold.com/${channel}/info.json`;
+
+// The channel segment is canonical; the bare `archive/<sha>/...` form
+// 301-redirects to `archive/<channel>/<sha>/...`.
+export const channelArchiveUrl = (channel: RefDocChannel, sha1: string): string =>
+  `https://d.defold.com/archive/${channel}/${sha1}/engine/share/ref-doc.zip`;
+
+export interface ChannelInfo {
+  readonly version: string;
+  readonly sha1: string;
+}
+
+export type FetchChannelInfo = (channel: RefDocChannel) => Promise<ChannelInfo>;
+
+export function createFetchChannelInfo(fetchImpl: typeof fetch = fetch): FetchChannelInfo {
+  return async (channel) => {
+    const url = channelInfoUrl(channel);
+    const res = await fetchImpl(url);
+    if (!res.ok) {
+      throw new Error(
+        `channel info fetch failed for '${channel}': ${url} -> ${res.status} ${res.statusText}`,
+      );
+    }
+    const data = (await res.json()) as ChannelInfo;
+    return { version: data.version, sha1: data.sha1 };
+  };
+}
+
+const defaultFetchChannelInfo: FetchChannelInfo = createFetchChannelInfo();
+
+export interface RefDocDownloadPlan {
+  readonly url: string;
+  readonly cacheSubdir: string;
+}
+
+// Where the ref-doc bytes live and where they cache. Stable is version-addressed
+// (GitHub release, `<version>` subdir) with no network probe; beta/alpha are
+// channel-head-addressed, so the channel head sha is read from info.json and the
+// cache is scoped `<channel>/<sha1>`.
+export async function resolveDownloadPlan(opts: {
+  version: string;
+  channel?: RefDocChannel;
+  fetchChannelInfo?: FetchChannelInfo;
+}): Promise<RefDocDownloadPlan> {
+  const channel = opts.channel ?? DEFAULT_REF_DOC_CHANNEL;
+  if (channel === "stable") {
+    return { url: refDocUrl(opts.version), cacheSubdir: opts.version };
+  }
+  const info = await (opts.fetchChannelInfo ?? defaultFetchChannelInfo)(channel);
+  return { url: channelArchiveUrl(channel, info.sha1), cacheSubdir: join(channel, info.sha1) };
+}
+
 export function defaultDistributionRoots(
   platform: NodeJS.Platform,
   env: NodeJS.ProcessEnv = process.env,
@@ -64,8 +124,7 @@ export function refDocCacheDir(
   return join(env.XDG_CACHE_HOME ?? join(home(), ".cache"), "defold-typescript", "ref-doc");
 }
 
-const fetchRefDoc: DownloadRefDoc = async (version) => {
-  const url = refDocUrl(version);
+const fetchRefDoc: DownloadRefDoc = async (url) => {
   const res = await fetch(url);
   if (!res.ok) {
     throw new Error(`download failed: ${url} -> ${res.status} ${res.statusText}`);
@@ -76,12 +135,19 @@ const fetchRefDoc: DownloadRefDoc = async (version) => {
 export async function resolveRefDoc(opts: {
   version: string;
   cacheDir: string;
+  channel?: RefDocChannel;
   download?: DownloadRefDoc;
   locate?: LocateLocalRefDoc;
   readZip?: typeof readZip;
+  fetchChannelInfo?: FetchChannelInfo;
 }): Promise<ResolvedRefDoc> {
   const open = opts.readZip ?? readZip;
-  const zipPath = join(opts.cacheDir, opts.version, "ref-doc.zip");
+  const plan = await resolveDownloadPlan({
+    version: opts.version,
+    ...(opts.channel ? { channel: opts.channel } : {}),
+    ...(opts.fetchChannelInfo ? { fetchChannelInfo: opts.fetchChannelInfo } : {}),
+  });
+  const zipPath = join(opts.cacheDir, plan.cacheSubdir, "ref-doc.zip");
   if (existsSync(zipPath)) {
     return { zip: open(zipPath), zipPath, provenance: "cache" };
   }
@@ -93,7 +159,7 @@ export async function resolveRefDoc(opts: {
     return { zip: open(zipPath), zipPath, provenance: "local" };
   }
   const download = opts.download ?? fetchRefDoc;
-  const bytes = await download(opts.version);
+  const bytes = await download(plan.url);
   mkdirSync(dirname(zipPath), { recursive: true });
   writeFileSync(zipPath, bytes);
   return { zip: open(zipPath), zipPath, provenance: "download" };

package/scripts/fidelity-audit.ts

@@ -2,10 +2,12 @@ import { resolve } from "node:path";
 import { DEFOLD_TYPE_MAP } from "../src/core-types";
 import {
   ARBITRARY_TABLE_SLOTS,
+  applyNestedFieldCurations,
   buildTableDocResolver,
   HOMOGENEOUS_ARRAY_SLOTS,
   MAPPING_TABLE_SLOTS,
   type NestedMapping,
+  OVERLOAD_COVERED_SKIPS,
   parseTableFields,
   recoverCallbackSignature,
   TABLE_SLOT_CURATIONS,
@@ -117,6 +119,7 @@ function auditEntry(
     mappingSlot?: { key: string; value: string },
     homogeneousElement?: string | readonly string[],
     tableSlotCuration?: TableSlotCuration,
+    slot?: { element: string; kind: "param" | "return"; name: string },
   ) => {
     for (const token of types) {
       // A `table` slot whose doc carries a parseable `<dl>` field list is
@@ -138,12 +141,22 @@ function auditEntry(
           // (`LuaMap<K, LuaMap<K, V>>`) feeds the outer key plus the inner
           // key/value tokens — so an unmapped token in any arm still surfaces.
           if (typeof tableSlotCuration.value === "string") {
-            considerTypes([tableSlotCuration.key, tableSlotCuration.value]);
+            // The value may be a `T | U` union token (render.clear's
+            // `number | vector4`); split on `|` exactly as the emit branch does
+            // so each token is checked against DEFOLD_TYPE_MAP individually and a
+            // single-token value is unaffected.
+            considerTypes([
+              tableSlotCuration.key,
+              ...tableSlotCuration.value.split("|").map((token) => token.trim()),
+            ]);
           } else if (Array.isArray(tableSlotCuration.value)) {
             considerTypes([tableSlotCuration.key]);
             for (const field of tableSlotCuration.value) {
               if (field.fields !== undefined) {
-                for (const nested of field.fields) considerTypes(nested.types);
+                for (const nested of field.fields) {
+                  if (nested.numberList === true) continue;
+                  considerTypes(nested.types);
+                }
               } else if (field.numberList !== true) {
                 considerTypes(field.types);
               }
@@ -174,7 +187,10 @@ function auditEntry(
         if (tableSlotCuration?.kind === "object" || tableSlotCuration?.kind === "array-object") {
           for (const field of tableSlotCuration.fields) {
             if (field.fields !== undefined) {
-              for (const nested of field.fields) considerTypes(nested.types);
+              for (const nested of field.fields) {
+                if (nested.numberList === true) continue;
+                considerTypes(nested.types);
+              }
             } else if (field.numberList !== true) {
               considerTypes(field.types);
             }
@@ -187,20 +203,35 @@ function auditEntry(
           );
           continue;
         }
-        const fields = doc !== undefined ? parseTableFields(doc, resolver) : null;
+        const parsed = doc !== undefined ? parseTableFields(doc, resolver) : null;
+        const fields =
+          parsed !== null && slot !== undefined
+            ? applyNestedFieldCurations(slot.element, slot.kind, slot.name, parsed)
+            : parsed;
         if (fields !== null) {
           // A recovered field carrying nested fields (the mixed `<dl>`+`<ul>`
-          // shape) emits a nested object, not a `Record` — recurse into the
-          // nested field types instead of counting the nested `table`.
+          // shape, or an injected nested-field curation) emits a nested object,
+          // not a `Record` — recurse into the nested field types instead of
+          // counting the nested `table`. A nested number-list member is recovered
+          // as `number[]`, so skip it the same way the top-level branch does.
+          // The function-level arbitraryTable / mappingSlot / homogeneousElement
+          // flags propagate to the recursion so a slot on an ARBITRARY_TABLE_SLOTS
+          // element (or any other function-level reclassification) does not
+          // re-count its parsed sub-tables. The parser-recovered field has no
+          // tableSlotCuration, so the per-slot curation lookup is irrelevant
+          // here.
           for (const field of fields) {
             if (field.fields !== undefined) {
-              for (const nested of field.fields) considerTypes(nested.types);
+              for (const nested of field.fields) {
+                if (nested.numberList === true) continue;
+                considerTypes(nested.types, undefined, arbitraryTable);
+              }
             } else if (field.numberList === true) {
               // Recovered as `number[]` by inlineTableType — no longer a
               // `Record`, so skip it. Re-counting its `table` token here would
               // double-count a slot the emitted surface no longer loses.
             } else {
-              considerTypes(field.types);
+              considerTypes(field.types, undefined, arbitraryTable);
             }
           }
           continue;
@@ -292,6 +323,9 @@ function auditEntry(
         mappingSlot,
         homogeneousElement,
         tableSlotCuration,
+        typeof element.name === "string" && typeof param.name === "string"
+          ? { element: element.name, kind: "param", name: param.name }
+          : undefined,
       );
       // Residual: a doc-optional param the emitter cannot mark `?` because a
       // required param follows it. The trailing-run cutoff must match
@@ -310,6 +344,9 @@ function auditEntry(
         mappingSlot,
         homogeneousElement,
         tableSlotCuration,
+        typeof element.name === "string" && typeof ret.name === "string"
+          ? { element: element.name, kind: "return", name: ret.name }
+          : undefined,
       );
     }
   }
@@ -319,8 +356,9 @@ function auditEntry(
     unknownTokens: [...unknown].sort(),
     recordTables,
     multiReturn,
-    droppedMembers: generateModuleDeclaration(entry, { knownConstantFqns: NO_KNOWN_CONSTANTS })
-      .dropped.length,
+    droppedMembers: generateModuleDeclaration(entry, {
+      knownConstantFqns: NO_KNOWN_CONSTANTS,
+    }).dropped.filter((name) => !OVERLOAD_COVERED_SKIPS.has(name)).length,
     optionalAsRequired,
   };
 }