primitive-admin 1.0.52 → 1.0.54

package/dist/src/lib/toml-metadata-config.js

@@ -0,0 +1,463 @@
+/**
+ * CLI TOML parser / validator / serializer for resource-metadata config
+ * surfaces (issue #1304, P-B — CLI/TOML config-sync).
+ *
+ * Two surfaces, mirroring the "config change ships all three surfaces" rule
+ * (CLAUDE.md; same shape as the database type-config helpers in
+ * `toml-database-config.ts`):
+ *
+ *   1. `MetadataCategoryConfig` blocks — a per-`{resourceType, category}`
+ *      typed-schema + read/write-rule definition. These round-trip through
+ *      `primitive sync push` / `pull` against the P-A REST API
+ *      (`metadata-categories` CRUD). One file = one category, using a single
+ *      `[metadataCategoryConfig]` section so the nested `schema.fields.*`
+ *      tables serialize cleanly and byte-stably.
+ *
+ *   2. The declared-access manifest (`[metadata]` + `secrets` blocks) that
+ *      lives on the owning config surfaces (`CollectionTypeConfig` /
+ *      `DatabaseTypeConfig` / `WorkflowDefinition`). This module provides the
+ *      TOML *structure* + *validator* + byte-stable round-trip helpers for the
+ *      manifest so a bad value is rejected with a clear error. Wiring the
+ *      manifest onto those config models' sync push/pull (which needs a
+ *      storage field on each model) is P-C's "persist the manifest on owning
+ *      configs" work — this module ships the parse/validate/serialize the
+ *      P-C eval-site folding will call, matching how earlier phases shipped a
+ *      validated mechanism ahead of its live wiring.
+ *
+ * All functions here are pure and unit-testable (no network, no filesystem).
+ * `validate*` functions return an error string (or `null` when valid) rather
+ * than throwing, mirroring `validateCategorySchema` server-side.
+ */
+import { stringifyConfigToml } from "./config-toml.js";
+/** Identifier-safe name: letters, digits, underscore; not starting with a digit.
+ *  Matches the server's `METADATA_KEY_PATTERN`. */
+const IDENTIFIER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+/** The key format the `secrets` / `vars` services accept when a value is created
+ *  (server's `SCALAR_KEY_RE`, secrets/vars service `KEY_REGEX`). A declared
+ *  scalar-root key that is identifier-safe but does not match this (e.g.
+ *  lowercase) can never be created via the API, so reject it at manifest-parse
+ *  time on both ends (issue #1364). */
+const SCALAR_KEY_PATTERN = /^[A-Z][A-Z0-9_]{0,63}$/;
+/** The reserved projected category (computed live from a resource's columns).
+ *  Matches the server's `RESERVED_PROJECTED_CATEGORY`. */
+export const RESERVED_CATEGORY = "attrs";
+/** The subset of js-bao `FieldOptions` field types the metadata schema accepts.
+ *  Matches the server's `MetadataFieldType`. */
+const METADATA_FIELD_TYPES = new Set([
+    "string",
+    "number",
+    "boolean",
+    "date",
+    "id",
+    "stringset",
+]);
+const CATEGORY_SECTION_KEYS = new Set([
+    "resourceType",
+    "category",
+    "schema",
+    "readRule",
+    "writeRule",
+    "description",
+]);
+/**
+ * Normalize a parsed `[metadataCategoryConfig]` TOML section into the REST
+ * upsert body. Server-managed fields (`schemaVersion`, `generation`) are never
+ * emitted or read here — they'd churn a round-trip.
+ */
+export function parseMetadataCategoryToml(tomlData) {
+    const section = (tomlData && tomlData.metadataCategoryConfig) || {};
+    return {
+        resourceType: section.resourceType,
+        category: section.category,
+        schema: section.schema,
+        readRule: section.readRule ?? null,
+        writeRule: section.writeRule ?? null,
+        description: section.description ?? null,
+        // #1420 Phase 2: the manifest lives in the top-level `[metadata]`/`secrets`
+        // block (sibling to `[metadataCategoryConfig]`), reusing the shared parser.
+        metadataManifest: parseDeclaredAccessManifestToml(tomlData),
+    };
+}
+/**
+ * Validate a parsed category config (post-{@link parseMetadataCategoryToml}).
+ * Returns an error string, or `null` when valid. The server re-validates on
+ * write; this is the fast local check so `sync push` fails with a clear
+ * message before hitting the network.
+ */
+export function validateMetadataCategoryConfig(input) {
+    if (!input.resourceType || typeof input.resourceType !== "string") {
+        return "metadataCategoryConfig.resourceType is required and must be a string";
+    }
+    if (!IDENTIFIER_PATTERN.test(input.resourceType)) {
+        return `metadataCategoryConfig.resourceType "${input.resourceType}" must be identifier-safe (letters, digits, underscore; not starting with a digit)`;
+    }
+    if (!input.category || typeof input.category !== "string") {
+        return "metadataCategoryConfig.category is required and must be a string";
+    }
+    if (!IDENTIFIER_PATTERN.test(input.category)) {
+        return `metadataCategoryConfig.category "${input.category}" must be identifier-safe (letters, digits, underscore; not starting with a digit)`;
+    }
+    if (input.category === RESERVED_CATEGORY) {
+        return `metadataCategoryConfig.category "${RESERVED_CATEGORY}" is reserved (a projected category computed from the resource's own columns) and cannot be defined`;
+    }
+    if (input.readRule !== null &&
+        input.readRule !== undefined &&
+        typeof input.readRule !== "string") {
+        return "metadataCategoryConfig.readRule must be a string (a CEL expression)";
+    }
+    if (input.writeRule !== null &&
+        input.writeRule !== undefined &&
+        typeof input.writeRule !== "string") {
+        return "metadataCategoryConfig.writeRule must be a string (a CEL expression)";
+    }
+    if (input.description !== null &&
+        input.description !== undefined &&
+        typeof input.description !== "string") {
+        return "metadataCategoryConfig.description must be a string";
+    }
+    const schemaError = validateCategorySchema(input.schema);
+    if (schemaError)
+        return schemaError;
+    // #1420 Phase 2: local surface-level check on the declared-access manifest;
+    // the server re-validates the deep path graph at persist time.
+    return validateDeclaredAccessManifest(input.metadataManifest);
+}
+/**
+ * Validate the `schema` block is a well-formed js-bao `FieldOptions` map:
+ * `{ fields: { <name>: { type, required?, maxLength?, maxCount?, enum? } } }`.
+ * Mirrors the server's `validateCategorySchema`.
+ */
+export function validateCategorySchema(schema) {
+    if (schema === null || typeof schema !== "object" || Array.isArray(schema)) {
+        return "metadataCategoryConfig.schema must be a table with a 'fields' map";
+    }
+    const fields = schema.fields;
+    if (fields === null || typeof fields !== "object" || Array.isArray(fields)) {
+        return "metadataCategoryConfig.schema.fields must be a table";
+    }
+    // Reject unknown top-level keys under `schema` (only `fields` is meaningful).
+    for (const key of Object.keys(schema)) {
+        if (key !== "fields") {
+            return `metadataCategoryConfig.schema has an unknown key "${key}" (only "fields" is allowed)`;
+        }
+    }
+    for (const [name, def] of Object.entries(fields)) {
+        if (!IDENTIFIER_PATTERN.test(name)) {
+            return `schema field name "${name}" must be identifier-safe`;
+        }
+        if (def === null || typeof def !== "object" || Array.isArray(def)) {
+            return `schema field "${name}" must be a table with a "type"`;
+        }
+        const field = def;
+        if (typeof field.type !== "string" || !METADATA_FIELD_TYPES.has(field.type)) {
+            return `schema field "${name}" has an invalid type (allowed: ${[
+                ...METADATA_FIELD_TYPES,
+            ].join(", ")})`;
+        }
+        if (field.enum !== undefined) {
+            if (!Array.isArray(field.enum) ||
+                field.enum.some((v) => typeof v !== "string")) {
+                return `schema field "${name}" enum must be an array of strings`;
+            }
+            if (field.type !== "string") {
+                return `schema field "${name}" enum is only valid on a "string" field`;
+            }
+        }
+        if (field.maxLength !== undefined && typeof field.maxLength !== "number") {
+            return `schema field "${name}" maxLength must be a number`;
+        }
+        if (field.maxCount !== undefined && typeof field.maxCount !== "number") {
+            return `schema field "${name}" maxCount must be a number`;
+        }
+        if (field.required !== undefined && typeof field.required !== "boolean") {
+            return `schema field "${name}" required must be a boolean`;
+        }
+    }
+    return null;
+}
+/**
+ * Serialize a category config (as returned by the P-A REST API — `schema` is a
+ * parsed object) to byte-stable TOML. Only the authored fields are emitted;
+ * server-managed `schemaVersion` / `generation` / `appId` / `categoryKey` are
+ * dropped so a pull → push → pull cycle is a no-op.
+ *
+ * Scalars are inserted before `schema` so `smol-toml` emits them ahead of
+ * the nested `[metadataCategoryConfig.schema.fields.*]` tables.
+ */
+export function serializeMetadataCategoryConfig(config) {
+    const section = {
+        resourceType: config.resourceType,
+        category: config.category,
+    };
+    if (config.readRule !== null && config.readRule !== undefined) {
+        section.readRule = config.readRule;
+    }
+    if (config.writeRule !== null && config.writeRule !== undefined) {
+        section.writeRule = config.writeRule;
+    }
+    if (config.description !== null &&
+        config.description !== undefined &&
+        config.description !== "") {
+        section.description = config.description;
+    }
+    // `schema` may arrive as a parsed object (REST) or a JSON string (defensive).
+    let schema = config.schema;
+    if (typeof schema === "string") {
+        try {
+            schema = JSON.parse(schema);
+        }
+        catch {
+            schema = { fields: {} };
+        }
+    }
+    section.schema = schema ?? { fields: {} };
+    // #1420 Phase 2: emit the declared-access manifest as a top-level
+    // `[metadata]`/`secrets` block (sibling to `[metadataCategoryConfig]`),
+    // reusing the shared serializer so it round-trips byte-stable.
+    return stringifyConfigToml({
+        metadataCategoryConfig: section,
+        ...serializeDeclaredAccessManifest(config.metadataManifest),
+    });
+}
+// --- Declared-access manifest (`[metadata]` + `secrets` + `vars`) ----------
+//
+// The manifest that lives on an owning config surface. Shape mirrors the
+// server's `MetadataDeclaration` (`src/app-api/helpers/metadata-cel-access.ts`):
+//   metadata.self.categories = ["profile"]
+//   [metadata.paths.<name>]  from|rootFrom, via, type, categories
+//   secrets = ["STRIPE_KEY"]
+//   vars    = ["ADMIN_GROUP_ID"]   # non-secret twin of secrets (issue #1364)
+/** Root contexts a `rootFrom` path may start at (caller-supplied subjectless
+ *  contexts). Mirrors the server's `ROOT_CONTEXT_PREFIXES`
+ *  (`src/app-api/helpers/metadata-cel-access.ts`). */
+const ROOT_CONTEXT_PREFIXES = ["input", "record", "params"];
+/** The one **server-authenticated** `rootFrom` root — the calling user's id
+ *  (issue #1362). Unlike the {@link ROOT_CONTEXT_PREFIXES} roots (caller-supplied),
+ *  `user.userId` binds the authenticated principal, so a rule may read the
+ *  caller's own metadata (`md.<name>`). Mirrors the server's `CALLER_ROOTFROM`. */
+export const CALLER_ROOTFROM = "user.userId";
+/** The target `type` a {@link CALLER_ROOTFROM} path must declare. `user.userId`
+ *  names a user, so the path must resolve `user`-typed metadata; a mismatched
+ *  type would silently query `app#<type>#<userId>` for a resource that isn't the
+ *  user. Mirrors the server's `CALLER_ROOTFROM_TYPE`. */
+export const CALLER_ROOTFROM_TYPE = "user";
+/**
+ * Validate a path's `rootFrom` value together with its declared target `type`
+ * (issue #1362), mirroring the server's `validateRootFromPath`
+ * (`src/app-api/helpers/metadata-cel-access.ts`). A `rootFrom` is sound when it
+ * is either:
+ *
+ *   - a static dotted **caller-supplied** context path rooted at one of
+ *     {@link ROOT_CONTEXT_PREFIXES} (`input.*`/`record.*`/`params.*`), with at
+ *     least two segments; or
+ *   - exactly {@link CALLER_ROOTFROM} (`user.userId`) — the one
+ *     **server-authenticated** root — in which case the path must also declare
+ *     `type = "user"` ({@link CALLER_ROOTFROM_TYPE}).
+ *
+ * Any other `user.*` path is rejected outright — the caller root is a single
+ * special case, not a blanket `user.*` namespace (Fork 1 = A). This is the fast
+ * local check so `sync push` fails with a clear message before the network call;
+ * the server's `validateRootFromPath` re-validates at persist time. Returns a
+ * human-readable reason (worded to follow `metadata.paths."<name>" `), or null
+ * when sound.
+ */
+export function validateRootFromPath(root, type) {
+    if (root === CALLER_ROOTFROM) {
+        if (type !== CALLER_ROOTFROM_TYPE) {
+            return `rootFrom "${CALLER_ROOTFROM}" requires type = "${CALLER_ROOTFROM_TYPE}" (got ${type ? `"${type}"` : "no type"})`;
+        }
+        return null;
+    }
+    const prefix = root.split(".")[0];
+    if (prefix === "user") {
+        return `rootFrom "${root}" is not allowed — the only server-authenticated root is "${CALLER_ROOTFROM}"`;
+    }
+    const segments = root.split(".");
+    const isStaticDotted = segments.length >= 1 && segments.every((s) => IDENTIFIER_PATTERN.test(s));
+    if (!isStaticDotted ||
+        segments.length < 2 ||
+        !ROOT_CONTEXT_PREFIXES.includes(prefix)) {
+        return `rootFrom "${root}" must be a static dotted context path rooted at ${ROOT_CONTEXT_PREFIXES.join("/")} or "${CALLER_ROOTFROM}"`;
+    }
+    return null;
+}
+const MANIFEST_KEYS = new Set(["self", "paths", "secrets", "vars"]);
+const SELF_KEYS = new Set(["categories"]);
+const PATH_KEYS = new Set(["from", "rootFrom", "via", "type", "categories"]);
+/** The declared scalar roots: `secrets` (masked) and `vars` (non-secret). */
+const SCALAR_ROOT_KEYS = [
+    { key: "secrets", singular: "secret" },
+    { key: "vars", singular: "var" },
+];
+/**
+ * Read the declared-access manifest out of a parsed config TOML: the top-level
+ * `[metadata]` table (self + paths) and the `secrets` / `vars` arrays. Returns
+ * `null` when none is present (the config declares no metadata/scalar access).
+ */
+export function parseDeclaredAccessManifestToml(tomlData) {
+    const metadata = tomlData?.metadata;
+    const secrets = tomlData?.secrets;
+    const vars = tomlData?.vars;
+    if (metadata === undefined && secrets === undefined && vars === undefined) {
+        return null;
+    }
+    const manifest = {};
+    if (metadata && typeof metadata === "object") {
+        if (metadata.self !== undefined) {
+            manifest.self = { categories: metadata.self?.categories };
+        }
+        if (metadata.paths !== undefined) {
+            manifest.paths = metadata.paths;
+        }
+    }
+    if (secrets !== undefined) {
+        manifest.secrets = secrets;
+    }
+    if (vars !== undefined) {
+        manifest.vars = vars;
+    }
+    return manifest;
+}
+/**
+ * Validate a declared-access manifest structurally. Returns an error string,
+ * or `null` when valid. This is the local surface-level check (identifier
+ * names, key shape, exactly-one-root per path); the server's
+ * `validatePathGraph` still does the deep graph validation (cycles, depth,
+ * schema-mismatch) at persist time.
+ */
+export function validateDeclaredAccessManifest(manifest) {
+    if (manifest === null || manifest === undefined)
+        return null;
+    if (typeof manifest !== "object" || Array.isArray(manifest)) {
+        return "declared-access manifest must be a table";
+    }
+    // `self`
+    if (manifest.self !== undefined) {
+        const self = manifest.self;
+        if (self === null || typeof self !== "object" || Array.isArray(self)) {
+            return "metadata.self must be a table with a 'categories' array";
+        }
+        for (const key of Object.keys(self)) {
+            if (!SELF_KEYS.has(key)) {
+                return `metadata.self has an unknown key "${key}" (only "categories" is allowed)`;
+            }
+        }
+        const catError = validateCategoryList(self.categories, "metadata.self");
+        if (catError)
+            return catError;
+    }
+    // `paths`
+    if (manifest.paths !== undefined) {
+        const paths = manifest.paths;
+        if (paths === null || typeof paths !== "object" || Array.isArray(paths)) {
+            return "metadata.paths must be a table of named path declarations";
+        }
+        const declaredNodes = new Set(["self", ...Object.keys(paths)]);
+        for (const [name, raw] of Object.entries(paths)) {
+            if (!IDENTIFIER_PATTERN.test(name)) {
+                return `metadata.paths."${name}" name must be identifier-safe`;
+            }
+            if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+                return `metadata.paths."${name}" must be a table`;
+            }
+            const p = raw;
+            for (const key of Object.keys(p)) {
+                if (!PATH_KEYS.has(key)) {
+                    return `metadata.paths."${name}" has an unknown key "${key}" (allowed: ${[
+                        ...PATH_KEYS,
+                    ].join(", ")})`;
+                }
+            }
+            const hasFrom = typeof p.from === "string" && p.from !== "";
+            const hasRoot = typeof p.rootFrom === "string" && p.rootFrom !== "";
+            if (hasFrom === hasRoot) {
+                return `metadata.paths."${name}" must declare exactly one of "from" or "rootFrom"`;
+            }
+            if (hasFrom) {
+                if (!declaredNodes.has(p.from)) {
+                    return `metadata.paths."${name}" from "${p.from}" references an undeclared node (must be "self" or another declared path)`;
+                }
+                if (typeof p.via !== "string" || !p.via.includes(".")) {
+                    return `metadata.paths."${name}" must declare a "via" of the form "<category>.<key>"`;
+                }
+            }
+            else {
+                // rootFrom: a caller-supplied static context path
+                // (`input.*`/`record.*`/`params.*`) OR the server-authenticated
+                // `user.userId` root (which requires `type = "user"`). Mirrors the
+                // server's `validateRootFromPath` (issue #1362).
+                const rootFrom = p.rootFrom;
+                const type = typeof p.type === "string" ? p.type : undefined;
+                const rootReason = validateRootFromPath(rootFrom, type);
+                if (rootReason) {
+                    return `metadata.paths."${name}" ${rootReason}`;
+                }
+                if (p.via !== undefined) {
+                    return `metadata.paths."${name}" roots at "${rootFrom}" and must not also declare "via"`;
+                }
+            }
+            if (typeof p.type !== "string" || p.type === "") {
+                return `metadata.paths."${name}" must declare a target "type" (the resource type)`;
+            }
+            const catError = validateCategoryList(p.categories, `metadata.paths."${name}"`);
+            if (catError)
+                return catError;
+        }
+    }
+    // `secrets` / `vars` — the declared scalar roots share one key-list shape.
+    for (const { key: rootKey, singular } of SCALAR_ROOT_KEYS) {
+        const keys = manifest[rootKey];
+        if (keys === undefined)
+            continue;
+        if (!Array.isArray(keys) || keys.some((s) => typeof s !== "string")) {
+            return `${rootKey} must be an array of ${singular} key names (strings)`;
+        }
+        for (const key of keys) {
+            if (!SCALAR_KEY_PATTERN.test(key)) {
+                return `${rootKey} key "${key}" must match ^[A-Z][A-Z0-9_]{0,63}$ (uppercase letters, digits, underscores; must start with a letter; max 64 chars)`;
+            }
+        }
+    }
+    return null;
+}
+function validateCategoryList(categories, where) {
+    if (!Array.isArray(categories) ||
+        categories.some((c) => typeof c !== "string")) {
+        return `${where}.categories must be an array of category names (strings)`;
+    }
+    for (const cat of categories) {
+        if (cat !== RESERVED_CATEGORY && !IDENTIFIER_PATTERN.test(cat)) {
+            return `${where}.categories entry "${cat}" must be identifier-safe`;
+        }
+    }
+    return null;
+}
+/**
+ * Serialize a declared-access manifest into the TOML fragment object that
+ * merges into an owning config's TOML data (the caller spreads the returned
+ * keys alongside the config's own section). Returns `{}` when empty so a
+ * config with no declared access emits nothing (byte-stable).
+ */
+export function serializeDeclaredAccessManifest(manifest) {
+    if (!manifest)
+        return {};
+    const out = {};
+    const metadata = {};
+    if (manifest.self && Array.isArray(manifest.self.categories)) {
+        metadata.self = { categories: manifest.self.categories };
+    }
+    if (manifest.paths && Object.keys(manifest.paths).length > 0) {
+        metadata.paths = manifest.paths;
+    }
+    if (Object.keys(metadata).length > 0) {
+        out.metadata = metadata;
+    }
+    if (Array.isArray(manifest.secrets) && manifest.secrets.length > 0) {
+        out.secrets = manifest.secrets;
+    }
+    if (Array.isArray(manifest.vars) && manifest.vars.length > 0) {
+        out.vars = manifest.vars;
+    }
+    return out;
+}
+//# sourceMappingURL=toml-metadata-config.js.map

package/dist/src/lib/toml-metadata-config.js.map

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

package/dist/src/lib/toml-native-form.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Neutral TOML-form helpers shared by every config serializer that chooses
+ * between a native nested-table form and a legacy JSON-string form.
+ *
+ * These used to live in `toml-database-config.ts`, but that module owns
+ * database-operation config specifically; once workflow-schema serialization
+ * also needed `canEmitNative` / `FieldForm` / `classifyInlineFieldForm`
+ * (issue #1446), keeping them there made a database-specific module double as a
+ * generic TOML utility by accident. They now live here so both callers import
+ * from a neutral home. `toml-database-config.ts` re-exports them for backwards
+ * compatibility with existing importers.
+ */
+export type FieldForm = "native" | "legacy";
+/**
+ * Classify a single-line TOML field value (the text after `key = `) as
+ * native or legacy form.
+ *
+ * An inline table (`{ ... }`) or inline array (`[ ... ]`) is native TOML —
+ * the structure is written directly, so `sync pull` should re-emit it through
+ * the native-emission path rather than collapse it back to an opaque JSON
+ * string. A quoted string (`'...'` / `"..."`) is the legacy JSON-string form.
+ *
+ * This is the fix for issue #1255: previously ANY `definition = <value>`
+ * one-liner was classified `legacy`, so an author who wrote the compact
+ * inline form `definition = { filter = { "$in" = [1, 2] } }` got an opaque
+ * JSON string back on the next pull (churn). Distinguishing the two makes
+ * the inline form round-trip stably through the existing native-emission
+ * path.
+ */
+export declare function classifyInlineFieldForm(rawValue: string): FieldForm;
+/**
+ * Recursively check whether a JS value can be represented in TOML **without
+ * data loss**. Returns null if OK, a reason string otherwise.
+ *
+ * This is a data-loss guard, not a "native TOML" gate. The config round-trip
+ * serializes with `smol-toml` (TOML 1.0), which handles heterogeneous arrays,
+ * so the only values that still can't be emitted are the ones every TOML
+ * serializer silently drops:
+ *   - `null` (TOML has no null — the key would vanish on write).
+ *   - `undefined` (same — the key would vanish).
+ *   - arrays containing `null` (the element would vanish, shifting the array).
+ *
+ * Heterogeneous arrays (mixed TOML types) are representable and are NOT
+ * flagged — that fallback was removed in issue #1450.
+ */
+export declare function canEmitNative(value: any): string | null;

package/dist/src/lib/toml-native-form.js

@@ -0,0 +1,78 @@
+/**
+ * Neutral TOML-form helpers shared by every config serializer that chooses
+ * between a native nested-table form and a legacy JSON-string form.
+ *
+ * These used to live in `toml-database-config.ts`, but that module owns
+ * database-operation config specifically; once workflow-schema serialization
+ * also needed `canEmitNative` / `FieldForm` / `classifyInlineFieldForm`
+ * (issue #1446), keeping them there made a database-specific module double as a
+ * generic TOML utility by accident. They now live here so both callers import
+ * from a neutral home. `toml-database-config.ts` re-exports them for backwards
+ * compatibility with existing importers.
+ */
+/**
+ * Classify a single-line TOML field value (the text after `key = `) as
+ * native or legacy form.
+ *
+ * An inline table (`{ ... }`) or inline array (`[ ... ]`) is native TOML —
+ * the structure is written directly, so `sync pull` should re-emit it through
+ * the native-emission path rather than collapse it back to an opaque JSON
+ * string. A quoted string (`'...'` / `"..."`) is the legacy JSON-string form.
+ *
+ * This is the fix for issue #1255: previously ANY `definition = <value>`
+ * one-liner was classified `legacy`, so an author who wrote the compact
+ * inline form `definition = { filter = { "$in" = [1, 2] } }` got an opaque
+ * JSON string back on the next pull (churn). Distinguishing the two makes
+ * the inline form round-trip stably through the existing native-emission
+ * path.
+ */
+export function classifyInlineFieldForm(rawValue) {
+    const trimmed = rawValue.trimStart();
+    if (trimmed.startsWith("{") || trimmed.startsWith("["))
+        return "native";
+    return "legacy";
+}
+/**
+ * Recursively check whether a JS value can be represented in TOML **without
+ * data loss**. Returns null if OK, a reason string otherwise.
+ *
+ * This is a data-loss guard, not a "native TOML" gate. The config round-trip
+ * serializes with `smol-toml` (TOML 1.0), which handles heterogeneous arrays,
+ * so the only values that still can't be emitted are the ones every TOML
+ * serializer silently drops:
+ *   - `null` (TOML has no null — the key would vanish on write).
+ *   - `undefined` (same — the key would vanish).
+ *   - arrays containing `null` (the element would vanish, shifting the array).
+ *
+ * Heterogeneous arrays (mixed TOML types) are representable and are NOT
+ * flagged — that fallback was removed in issue #1450.
+ */
+export function canEmitNative(value) {
+    if (value === null)
+        return "value is null";
+    if (value === undefined)
+        return "value is undefined";
+    if (Array.isArray(value)) {
+        for (const item of value) {
+            if (item === null)
+                return "array contains null";
+        }
+        for (const item of value) {
+            const sub = canEmitNative(item);
+            if (sub)
+                return sub;
+        }
+        return null;
+    }
+    if (typeof value === "object") {
+        for (const v of Object.values(value)) {
+            const sub = canEmitNative(v);
+            if (sub)
+                return sub;
+        }
+        return null;
+    }
+    // primitives: string, number, boolean.
+    return null;
+}
+//# sourceMappingURL=toml-native-form.js.map

package/dist/src/lib/toml-native-form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toml-native-form.js","sourceRoot":"","sources":["../../../src/lib/toml-native-form.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACrC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAC,KAAU;IACtC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,eAAe,CAAC;IAC3C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,oBAAoB,CAAC;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,IAAI;gBAAE,OAAO,qBAAqB,CAAC;QAClD,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,uCAAuC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/lib/toml-params-validator.d.ts

@@ -47,6 +47,33 @@ export interface ValidationResult {
  * doc-comment for the rationale.
  */
 export declare function collectParamRefs(value: any): string[];
+/**
+ * Collect bare `params.X` references from a CEL string (issue #1239).
+ *
+ * Access rules reference operation params with the bare `params.X` form (no
+ * `$` prefix), unlike `definition`, which uses `$params.X` (scanned by
+ * {@link collectParamRefs}). This helper feeds the operation's `access` CEL
+ * and each per-param `access` CEL into the "referenced" set so a param used
+ * only by an access rule is not wrongly flagged "declared but not referenced".
+ *
+ * Supported forms, all whitespace-tolerant:
+ *   - dot notation:     `params.claimedUserId`, `params . claimedUserId`
+ *   - dot path:         `params.config.subField` → first segment `config`
+ *   - bracket notation: `params["claimedUserId"]`, `params['claimedUserId']`
+ *
+ * Word-boundary guard: a `params` preceded by an identifier char, `$`, or `.`
+ * is NOT a match, so `$params.x` (definition syntax), `myparams.x`, and a
+ * dotted member access like `database.metadata.params.userId` are ignored —
+ * `params` only counts as the params root when it's a standalone root
+ * identifier. To avoid counting a `params.` that merely appears inside a quoted
+ * string literal (e.g. `note == "see params.docs"`), bracket keys are scanned
+ * first (they legitimately contain quotes), then string literals are stripped
+ * before the dot-notation scan.
+ *
+ * Purely additive: this only grows the referenced set, loosening the soft
+ * warning. The blocking `$params` error path is untouched.
+ */
+export declare function collectCelParamRefs(cel: any): string[];
 /**
  * Normalize a `params` value (object, array, or JSON string) into the
  * set of declared param names.
@@ -74,6 +101,13 @@ export interface ValidateOptions {
         name: string;
         definition: any;
         params?: any;
+        /**
+         * The operation-level `access` CEL rule, if any (issue #1239). Params
+         * referenced here via bare `params.X` count as "referenced" so they are
+         * not wrongly flagged "declared but not referenced". May be null/absent
+         * when the operation inherits the type's `defaultAccess`.
+         */
+        access?: any;
     }>;
 }
 /**