primitive-admin 1.1.0-alpha.47 → 1.1.0-alpha.49

package/dist/src/lib/app-settings-descriptor.js

@@ -0,0 +1,250 @@
+/**
+ * Shared field descriptor for app-settings TOML sync (issue #1033).
+ *
+ * A single source of truth describing every app setting that round-trips
+ * through `app.toml`. It drives BOTH directions:
+ *  - pull  (`serializeAppSettingsToToml`): server settings -> `app.toml` object
+ *  - push  (`parseTomlToAppSettings`):     `app.toml` object -> settings payload
+ *
+ * Driving serializer and parser from one table means the two can never drift
+ * apart, and a single drift test can assert the descriptor stays in step with
+ * the server's `GET /settings` response and `PUT /settings` allow-list. This
+ * generalizes the earlier hand-maintained `AUTH_BOOLEAN_KEYS` /
+ * `RECOGNIZED_AUTH_KEYS` pattern to every section, and fully replaces it.
+ *
+ * Design decisions of record (issue #1033):
+ *  - `googleClientSecret` is a secret: never written to `app.toml` on pull, and
+ *    a hard error (abort before any PUT) if hand-added on push. Non-secret
+ *    `googleClientId` syncs normally.
+ *  - `[cors]` is always emitted (the `mode` key is `emit: "always"`), even in
+ *    universal mode. A one-time diff on the next pull for existing apps is
+ *    acceptable.
+ *  - `[invitations]` is an additive table for the member-invitation fields.
+ *  - Legacy `passkeyRpId` / `passkeyRpName` are still writable server-side but
+ *    excluded from TOML (superseded by `passkeyRpConfig` -> `[auth.passkeys]`).
+ *    The coverage test classifies them as deprecated-writable exclusions, NOT
+ *    computed/read-only.
+ *  - Push type mismatches are field-named validation errors — no silent
+ *    coercion of a mistyped TOML value.
+ */
+/**
+ * Every field that round-trips through `app.toml`. 26 entries — the server's
+ * `PUT /settings` allow-list minus the two deprecated legacy passkey fields.
+ * `googleClientSecret` is present but flagged `secret` (excluded from TOML).
+ */
+export const APP_SETTINGS_DESCRIPTOR = [
+    // ---- [app] --------------------------------------------------------------
+    { field: "name", section: "app", key: "name", type: "string", emit: "always" },
+    { field: "mode", section: "app", key: "mode", type: "string", emit: "always" },
+    { field: "baseUrl", section: "app", key: "baseUrl", type: "string", emit: "whenSet" },
+    { field: "waitlistEnabled", section: "app", key: "waitlistEnabled", type: "boolean", emit: "always" },
+    { field: "waitlistNotifyAdmins", section: "app", key: "waitlistNotifyAdmins", type: "boolean", emit: "always" },
+    { field: "allowedDomains", section: "app", key: "allowedDomains", type: "string[]", emit: "whenSet" },
+    { field: "testAccountBaseEmails", section: "app", key: "testAccountBaseEmails", type: "string[]", emit: "whenSet" },
+    // ---- [auth] -------------------------------------------------------------
+    { field: "googleOAuthEnabled", section: "auth", key: "googleOAuthEnabled", type: "boolean", emit: "whenSet" },
+    { field: "googleClientId", section: "auth", key: "googleClientId", type: "string", emit: "whenSet" },
+    // Secret — omitted on pull, hard error on push. See GOOGLE_CLIENT_SECRET_PUSH_ERROR.
+    { field: "googleClientSecret", section: "auth", key: "googleClientSecret", type: "string", emit: "whenSet", secret: true },
+    { field: "passkeyEnabled", section: "auth", key: "passkeyEnabled", type: "boolean", emit: "always" },
+    { field: "magicLinkEnabled", section: "auth", key: "magicLinkEnabled", type: "boolean", emit: "always" },
+    { field: "appleSignInEnabled", section: "auth", key: "appleSignInEnabled", type: "boolean", emit: "whenSet" },
+    { field: "otpEnabled", section: "auth", key: "otpEnabled", type: "boolean", emit: "whenSet" },
+    { field: "appleAudiences", section: "auth", key: "appleAudiences", type: "string[]", emit: "whenSet" },
+    { field: "redirectUris", section: "auth", key: "redirectUris", type: "string[]", emit: "whenSet" },
+    // passkeyRpConfig <-> [auth.passkeys] (nested object of rpId -> { name }).
+    { field: "passkeyRpConfig", section: "auth", key: "passkeys", type: "object", emit: "whenSet" },
+    // ---- [cors] -------------------------------------------------------------
+    // `mode` is `always` so the [cors] table is always emitted (decision 3).
+    { field: "corsMode", section: "cors", key: "mode", type: "string", emit: "always" },
+    { field: "corsAllowedOrigins", section: "cors", key: "allowedOrigins", type: "string[]", emit: "whenSet" },
+    { field: "corsAllowCredentials", section: "cors", key: "allowCredentials", type: "boolean", emit: "whenSet" },
+    { field: "corsAllowedMethods", section: "cors", key: "allowedMethods", type: "string[]", emit: "whenSet" },
+    { field: "corsAllowedHeaders", section: "cors", key: "allowedHeaders", type: "string[]", emit: "whenSet" },
+    { field: "corsExposedHeaders", section: "cors", key: "exposedHeaders", type: "string[]", emit: "whenSet" },
+    { field: "corsMaxAge", section: "cors", key: "maxAge", type: "number", emit: "whenSet" },
+    // ---- [invitations] ------------------------------------------------------
+    { field: "memberInvitationsEnabled", section: "invitations", key: "enabled", type: "boolean", emit: "always" },
+    { field: "memberInvitationLimit", section: "invitations", key: "limit", type: "number", emit: "always" },
+];
+/** Section render order for a stable, diff-friendly `app.toml`. */
+export const APP_SETTINGS_SECTIONS = [
+    "app",
+    "auth",
+    "cors",
+    "invitations",
+];
+/**
+ * `GET /settings` keys that are computed/read-only and never sync (no server
+ * setter). The external coverage drift test classifies these here.
+ */
+export const IGNORED_GET_KEYS = new Set([
+    "appId",
+    "hasGoogleAuth",
+    "hasAppleAuth",
+    "hasPasskey",
+    "createdAt",
+    "modifiedAt",
+]);
+/**
+ * Fields that ARE still writable server-side (present in the `PUT /settings`
+ * allow-list) but are deliberately excluded from TOML because a newer field
+ * supersedes them. Kept distinct from `IGNORED_GET_KEYS` so the coverage test's
+ * "every allow-listed field is covered" claim stays true — these are excluded,
+ * not read-only. (Codex design-review concern #1.)
+ */
+export const DEPRECATED_WRITABLE_EXCLUDED = new Set([
+    "passkeyRpId",
+    "passkeyRpName",
+]);
+/** Push error for a hand-added `googleClientSecret` — points at a real command. */
+export const GOOGLE_CLIENT_SECRET_PUSH_ERROR = 'app.toml must not contain a "googleClientSecret" key under [auth]. ' +
+    "Secrets are excluded from synced config by design. Remove the key, then set " +
+    "the secret with:\n  primitive apps update <appId> --google-client-secret <secret>";
+const DESCRIPTOR_BY_SECTION = (() => {
+    const m = new Map();
+    for (const d of APP_SETTINGS_DESCRIPTOR) {
+        const list = m.get(d.section) ?? [];
+        list.push(d);
+        m.set(d.section, list);
+    }
+    return m;
+})();
+/** Descriptor `field` names, for parity/coverage tests. */
+export const DESCRIPTOR_FIELDS = new Set(APP_SETTINGS_DESCRIPTOR.map((d) => d.field));
+function typeOfValue(value) {
+    if (value === null || value === undefined)
+        return "null";
+    if (typeof value === "boolean")
+        return "boolean";
+    if (typeof value === "number")
+        return "number";
+    if (typeof value === "string")
+        return "string";
+    if (Array.isArray(value))
+        return "string[]";
+    if (typeof value === "object")
+        return "object";
+    return "unknown";
+}
+/** True if a value should be omitted under `emit: "whenSet"`. */
+function isEmptyForEmit(value, type) {
+    if (value === null || value === undefined)
+        return true;
+    if (type === "string")
+        return value === "";
+    if (type === "string[]")
+        return !Array.isArray(value) || value.length === 0;
+    if (type === "object")
+        return (typeof value !== "object" ||
+            value === null ||
+            Object.keys(value).length === 0);
+    return false; // booleans (false) and numbers (0) are meaningful, never empty
+}
+/**
+ * Validate a push value against its descriptor type. Returns an error string
+ * (field-named) on mismatch, or `null` when the value is acceptable. Arrays are
+ * checked element-by-element so a `["a", 1]` mistype is caught.
+ */
+function typeError(descriptor, value) {
+    const actual = typeOfValue(value);
+    if (actual === "null")
+        return null; // null clears; server owns clear semantics
+    if (descriptor.type === "string[]") {
+        if (!Array.isArray(value) || !value.every((v) => typeof v === "string")) {
+            return `[${descriptor.section}].${descriptor.key} must be an array of strings (got ${actual})`;
+        }
+        return null;
+    }
+    if (descriptor.type === "object") {
+        if (actual !== "object") {
+            return `[${descriptor.section}].${descriptor.key} must be a table (got ${actual})`;
+        }
+        return null;
+    }
+    if (actual !== descriptor.type) {
+        return `[${descriptor.section}].${descriptor.key} must be a ${descriptor.type} (got ${actual})`;
+    }
+    return null;
+}
+/**
+ * Build one `app.toml` section object from server settings (pull direction).
+ * Secret fields are never written. Applies each field's `emit` rule; a `null`
+ * value is always omitted (TOML cannot encode null).
+ */
+export function serializeSection(settings, section) {
+    const out = {};
+    for (const d of DESCRIPTOR_BY_SECTION.get(section) ?? []) {
+        if (d.secret)
+            continue;
+        const value = settings[d.field];
+        if (value === null || value === undefined)
+            continue;
+        if (d.emit === "whenSet" && isEmptyForEmit(value, d.type))
+            continue;
+        out[d.key] = value;
+    }
+    return out;
+}
+/**
+ * Build the full `app.toml` data object (all sections) from server settings.
+ * Empty sections are omitted, though in practice every section has at least one
+ * `emit: "always"` key so all four are present.
+ */
+export function serializeAppSettingsToToml(settings) {
+    const data = {};
+    for (const section of APP_SETTINGS_SECTIONS) {
+        const obj = serializeSection(settings, section);
+        if (Object.keys(obj).length > 0)
+            data[section] = obj;
+    }
+    return data;
+}
+/**
+ * Translate a parsed `app.toml` object into a `PUT /settings` payload (push
+ * direction). Only keys present in the TOML are forwarded — an omitted key
+ * never overwrites server state. Unknown keys warn; type mismatches and any
+ * secret key are hard errors that the caller must treat as abort-before-PUT.
+ *
+ * `isCrossAppPush` strips `name` so a cross-app push never overwrites the
+ * target app's name.
+ */
+export function parseTomlToAppSettings(tomlData, options = {}) {
+    const settings = {};
+    const warnings = [];
+    const errors = [];
+    for (const section of APP_SETTINGS_SECTIONS) {
+        const sectionData = tomlData?.[section];
+        if (sectionData === undefined || sectionData === null)
+            continue;
+        if (typeof sectionData !== "object" || Array.isArray(sectionData)) {
+            errors.push(`[${section}] must be a table`);
+            continue;
+        }
+        const descriptors = DESCRIPTOR_BY_SECTION.get(section) ?? [];
+        const byKey = new Map(descriptors.map((d) => [d.key, d]));
+        for (const key of Object.keys(sectionData)) {
+            const d = byKey.get(key);
+            if (!d) {
+                warnings.push(`Unrecognized [${section}] key "${key}" in app.toml — ignored. ` +
+                    `Recognized keys: ${descriptors.map((x) => x.key).join(", ")}.`);
+                continue;
+            }
+            if (d.secret) {
+                errors.push(GOOGLE_CLIENT_SECRET_PUSH_ERROR);
+                continue;
+            }
+            if (options.isCrossAppPush && d.field === "name")
+                continue;
+            const value = sectionData[key];
+            const err = typeError(d, value);
+            if (err) {
+                errors.push(err);
+                continue;
+            }
+            settings[d.field] = value;
+        }
+    }
+    return { settings, warnings, errors };
+}
+//# sourceMappingURL=app-settings-descriptor.js.map

package/dist/src/lib/app-settings-descriptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-settings-descriptor.js","sourceRoot":"","sources":["../../../src/lib/app-settings-descriptor.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/codegen-shared/generatedFiles.d.ts

@@ -52,6 +52,21 @@ export interface WriteOrCheckOptions {
      * reaches the other generator's files.
      */
     generatedSuffix?: string;
+    /**
+     * Optional banner prefix that further narrows ownership by file CONTENT.
+     * When set, a `<suffix>` file is only considered owned (for orphan cleanup /
+     * stale detection) if its contents also start with this prefix.
+     *
+     * The Swift path needs this: both `workflows codegen --lang swift` and the
+     * Swift model codegen (`swift-bao-codegen`) emit `.generated.swift` files and
+     * may share one output dir (a Sources dir in the consuming app). Suffix alone
+     * cannot tell them apart, so a suffix-only sweep would delete the other
+     * generator's files. Scoping by the emitted header banner keeps each
+     * generator's cleanup to its own files. The TS callers leave this unset —
+     * their default `generated/` dirs are single-generator, so suffix ownership
+     * is already unambiguous.
+     */
+    ownershipBanner?: string;
 }
 /**
  * Write (or `--check`) a set of rendered generated files, handling orphan

package/dist/src/lib/codegen-shared/generatedFiles.js

@@ -24,10 +24,10 @@ export async function writeOrCheckGeneratedFiles(options) {
     const outAbs = path.resolve(options.outputDir);
     const suffix = options.generatedSuffix ?? DEFAULT_GENERATED_SUFFIX;
     if (options.check === true) {
-        return await runCheck(outAbs, options.filesToWrite, options.fullOwnership, suffix);
+        return await runCheck(outAbs, options.filesToWrite, options.fullOwnership, suffix, options.ownershipBanner);
     }
     await fsp.mkdir(outAbs, { recursive: true });
-    const deletedFiles = await cleanupGeneratedOutputs(outAbs, options.filesToWrite, options.fullOwnership, suffix);
+    const deletedFiles = await cleanupGeneratedOutputs(outAbs, options.filesToWrite, options.fullOwnership, suffix, options.ownershipBanner);
     const writtenFiles = [];
     for (const [filePath, content] of options.filesToWrite) {
         await fsp.writeFile(filePath, content, "utf-8");
@@ -37,7 +37,7 @@ export async function writeOrCheckGeneratedFiles(options) {
     deletedFiles.sort();
     return { writtenFiles, deletedFiles, mismatches: [] };
 }
-async function runCheck(outAbs, filesToWrite, fullOwnership, suffix) {
+async function runCheck(outAbs, filesToWrite, fullOwnership, suffix, ownershipBanner) {
     const mismatches = [];
     for (const [filePath, expected] of filesToWrite) {
         let actual;
@@ -64,7 +64,7 @@ async function runCheck(outAbs, filesToWrite, fullOwnership, suffix) {
     // owns a subset: `filesToWrite` is then partial, so sibling files aren't
     // "stale" — they just weren't in scope.
     if (fullOwnership && (await dirExists(outAbs))) {
-        const onDisk = await listOwnedGeneratedFiles(outAbs, suffix);
+        const onDisk = await listOwnedGeneratedFiles(outAbs, suffix, ownershipBanner);
         const expectedPaths = new Set(filesToWrite.keys());
         for (const filePath of onDisk) {
             if (!expectedPaths.has(filePath)) {
@@ -78,13 +78,13 @@ async function runCheck(outAbs, filesToWrite, fullOwnership, suffix) {
         mismatches,
     };
 }
-async function cleanupGeneratedOutputs(outDir, filesToWrite, fullOwnership, suffix) {
+async function cleanupGeneratedOutputs(outDir, filesToWrite, fullOwnership, suffix, ownershipBanner) {
     // A filtered run only owns a subset; `filesToWrite` does not represent the
     // full set of generated files, so skip orphan cleanup to avoid destroying
     // sibling files. Full cleanup only happens on the unfiltered run.
     if (!fullOwnership)
         return [];
-    const onDisk = await listOwnedGeneratedFiles(outDir, suffix);
+    const onDisk = await listOwnedGeneratedFiles(outDir, suffix, ownershipBanner);
     const expectedPaths = new Set(filesToWrite.keys());
     const deleted = [];
     for (const filePath of onDisk) {
@@ -97,9 +97,11 @@ async function cleanupGeneratedOutputs(outDir, filesToWrite, fullOwnership, suff
 }
 /**
  * List only the generator-owned files in `outDir`, decided by the `suffix`
- * (`.generated.ts`). Hand-written files are never touched.
+ * (`.generated.ts`) and, when given, an `ownershipBanner` prefix on the file's
+ * content. Hand-written files — and files owned by a DIFFERENT generator that
+ * happen to share the suffix — are never touched.
  */
-async function listOwnedGeneratedFiles(outDir, suffix) {
+async function listOwnedGeneratedFiles(outDir, suffix, ownershipBanner) {
     if (!(await dirExists(outDir)))
         return [];
     const entries = await fsp.readdir(outDir, { withFileTypes: true });
@@ -107,9 +109,24 @@ async function listOwnedGeneratedFiles(outDir, suffix) {
     for (const entry of entries) {
         if (!entry.isFile())
             continue;
-        if (entry.name.endsWith(suffix)) {
-            owned.push(path.join(outDir, entry.name));
+        if (!entry.name.endsWith(suffix))
+            continue;
+        const filePath = path.join(outDir, entry.name);
+        if (ownershipBanner) {
+            // Content-scoped ownership: only sweep files carrying THIS generator's
+            // banner, so a shared output dir keeps each generator's cleanup to its
+            // own files. A read failure means "not confidently ours" → skip it.
+            let contents;
+            try {
+                contents = await fsp.readFile(filePath, "utf-8");
+            }
+            catch {
+                continue;
+            }
+            if (!contents.startsWith(ownershipBanner))
+                continue;
         }
+        owned.push(filePath);
     }
     return owned;
 }

package/dist/src/lib/codegen-shared/generatedFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatedFiles.js","sourceRoot":"","sources":["../../../../src/lib/codegen-shared/generatedFiles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generatedFiles.js","sourceRoot":"","sources":["../../../../src/lib/codegen-shared/generatedFiles.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/db-codegen/dbGenerator.d.ts

@@ -6,28 +6,19 @@
  * then either (a) writes them, or (b) compares them against on-disk for
  * `--check`. No commander dependency, no `process.exit`.
  *
- * Reuses the codegen-v2 machinery:
- *   - `loadSchemaFromTomlString` (the shared `[models.*]` parser) for record
- *     interfaces — the database-type `[models.*]` blocks round-trip through
- *     the same loader and the same `FieldType` vocabulary.
- *   - The banner + fingerprint header pattern and stale-output cleanup.
- *
- * Adds the OPERATIONS half (op-params interfaces + per-op result aliases)
- * that codegen-v2 has no analog for. A result alias is derived from `op.type`
- * and, where the shape is derivable, the op's parsed `definition`: a query op's
- * `projection` (#1439), a mutation op's step kinds (#1438), and a pipeline op's
- * `return` step (#1437). This file resolves those into the small descriptors
- * the templates consume; the templates stay pure string-emitters.
+ * The op/record RESOLUTION (parse, schema load, required-ness inference, op
+ * params, and per-op result descriptors) lives in the shared, naming-neutral
+ * `describeDbType` IR (`dbTypeIR.ts`) — the SAME source the Swift renderer
+ * (`swift-codegen/dbGenerator.ts`) consumes (issue #1547 binding 5). This file
+ * is now purely the TS *rendering* half: it applies TS identifier naming
+ * (`resolveRecordInterfaceName`, `opParamsInterfaceName`, …) to that IR and
+ * emits `*.generated.ts` via the pure `dbTemplates` string-emitters. The
+ * emitted bytes are unchanged from the former inline implementation.
  */
 import { type GeneratedFileMismatch } from "../codegen-shared/generatedFiles.js";
-export interface DbCodegenInput {
-    /** Database type name (drives the output filename). */
-    databaseType: string;
-    /** Path to the source `database-types/<type>.toml` file. */
-    tomlPath: string;
-    /** Raw TOML content (already read from disk). */
-    tomlContent: string;
-}
+import { type DbCodegenInput } from "./dbTypeIR.js";
+export type { DbCodegenInput } from "./dbTypeIR.js";
+export { inferArrayParamElementTypes, inferRequiredRecordFields, type InferredRecordModelInfo, } from "./dbTypeIR.js";
 export interface GenerateDbTypesOptions {
     /** One entry per database-type TOML file to generate from. */
     inputs: DbCodegenInput[];
@@ -68,69 +59,6 @@ export type DbCheckMismatch = GeneratedFileMismatch;
  * TOML. Exported so tests can assert on the rendered string directly.
  */
 export declare function renderDbTypeFile(input: DbCodegenInput): string;
-/**
- * Infer the scalar element TS type for op params consumed by a `$in`/`$nin`
- * filter operator (#1488, Phase 1). Codegen-only: a param compared with
- * `$in`/`$nin` against a model field is definitionally an array, so the
- * typed-ops factory (#1441) should emit `<elem>[]` rather than widening an
- * untyped/object param to `Record<string, unknown>` (which `string[]` is not
- * assignable to).
- *
- * Kept a small local helper next to {@link inferRequiredRecordFields} rather
- * than a shared cross-runtime analysis pass (sponsor decision on #1488).
- *
- * Returns a map of param name → element TS type. The `"unknown"` sentinel means
- * "emit `unknown[]`" — used when the compared field is missing from the model
- * schema (or the op has no resolvable model), when the same param is bound to
- * fields of differing element types, or when the param is also used as a scalar
- * elsewhere (conservative widen, mirroring #845's disagreement rule / #1488
- * Fork 4). A param absent from the map is not consumed by any array operator
- * and keeps its declared-type mapping (inference never widens such a param).
- */
-export declare function inferArrayParamElementTypes(op: any, fieldTypesByModel: Map<string, Map<string, string>>): Map<string, string>;
-/**
- * Per-model result of {@link inferRequiredRecordFields}. Shaped as an object
- * (rather than a bare `Set`) so it can grow additional inferred metadata later
- * without changing the call-site contract — e.g. future alignment with #845's
- * server-side op-params analysis. For now it carries only the set of record
- * fields the operation params prove are always supplied at create time.
- */
-export interface InferredRecordModelInfo {
-    /** Record field names promoted to non-optional by op-params inference. */
-    fields: Set<string>;
-}
-/**
- * Infer which record fields are always supplied at create time, by reading the
- * `save` operation params (issue #842).
- *
- * A field is promoted to required for a model only if:
- *   - at least one `save` (create) op writes it from a bare `$params.X`
- *     binding, AND
- *   - EVERY `save` op that writes the field binds it to a param declared
- *     `required: true` (the "ALL writers agree" rule).
- *
- * Deliberately conservative:
- *   - `patch` (and every non-`save` inner op) is excluded — partial updates
- *     don't guarantee creation-time presence.
- *   - whole-object saves (`data = "$params.X"`, a string rather than a
- *     per-field map) carry no field-level mapping, so no field can be promoted
- *     from them (Q4 skip).
- *   - only an EXACT top-level bare `$params.X` value counts (the whole binding
- *     value must match `^\$params\.X$`, and `X` must be a declared top-level
- *     param). A literal, computed, partially-interpolated value, or a nested
- *     path (`$params.obj.sub`) never promotes a field — a nested sub-property
- *     may be absent even when the top-level object param is required. This is
- *     deliberately stricter than the CLI's lenient `collectParamRefs`
- *     first-segment rule, which is fine for its validation use but would
- *     wrongly promote nested bindings here.
- *   - inner ops are matched to the record model by the inner op's own
- *     `modelName` when present, falling back to the enclosing operation's
- *     `modelName`.
- *
- * Pure: no I/O, no mutation of the input. The caller OR's the result with the
- * schema-level `required` flag, so inference only ever ADDS requiredness.
- */
-export declare function inferRequiredRecordFields(operations: any[]): Map<string, InferredRecordModelInfo>;
 /**
  * Run codegen end-to-end across one or more database-type TOML inputs. The
  * disk lifecycle (write / `--check` / stale cleanup) is delegated to the