primitive-admin 1.1.0-alpha.3 → 1.1.0-alpha.31

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

@@ -0,0 +1,384 @@
+/**
+ * Helpers for emitting `DatabaseTypeOperation` configs as native TOML.
+ *
+ * Background (issue #752): historically `sync pull` serialized
+ * `definition` and `params` as JSON strings stuffed into a single TOML
+ * field, which produced unreviewable 800-char one-liners. This module
+ * lets us emit them as nested TOML tables when they're representable,
+ * while preserving the existing file's shape so we don't generate
+ * surprise diffs.
+ *
+ * Three responsibilities:
+ *   1. `detectExistingOperationForms()` — read the raw TOML source and
+ *      decide, per operation name, whether the file uses JSON-string
+ *      form ("legacy") or nested-table form ("native") for each of
+ *      `definition` and `params`. This drives form preservation on
+ *      `sync pull`.
+ *   2. `canEmitNative()` — recursively check whether a JS value is
+ *      representable as a TOML value. Returns a reason string if not.
+ *      Mainly catches `null` and mixed-type arrays, which `@iarna/toml`
+ *      either rejects or silently mangles.
+ *   3. `buildDatabaseTypeTomlData()` — builds the JS object that we
+ *      hand to `TOML.stringify`. Per operation, decides JSON-string vs
+ *      native based on (existing form, can-emit, override mode).
+ */
+import * as TOML from "@iarna/toml";
+/**
+ * Inspect the raw TOML source for a database-type file and decide which
+ * form each operation's `definition`/`params` currently use.
+ *
+ * Detection is intentionally simple: we walk `[[operations]]` blocks in
+ * source order and, for each one, look for either a `definition = '...'`
+ * line (legacy) or an `[operations.definition]` / `[operations.definition.X]`
+ * sub-header (native).
+ */
+export function detectExistingOperationForms(rawToml) {
+    const lines = rawToml.split(/\r?\n/);
+    const operations = [];
+    let current = null;
+    // `inSubTable` flips to true the moment we descend into a sub-table of
+    // the current operation (e.g. `[operations.definition]` or
+    // `[[operations.params]]`). Once true, subsequent `name = "..."` /
+    // `definition = "..."` / `params = "..."` lines belong to the sub-table,
+    // not to the operation itself, so we must not let them overwrite the
+    // op-level fields (review feedback r3246634568).
+    let inSubTable = false;
+    for (const rawLine of lines) {
+        const line = rawLine.trim();
+        if (line === "[[operations]]") {
+            if (current)
+                operations.push(current);
+            current = { name: null, definition: null, params: null };
+            inSubTable = false;
+            continue;
+        }
+        if (!current)
+            continue;
+        // Sub-header for this op's definition or params.
+        if (/^\[operations\.definition(\..+)?\]/.test(line) || /^\[\[operations\.definition\..+\]\]/.test(line)) {
+            if (current.definition === null)
+                current.definition = "native";
+            inSubTable = true;
+            continue;
+        }
+        if (/^\[\[operations\.params\]\]/.test(line) || /^\[operations\.params(\..+)?\]/.test(line)) {
+            if (current.params === null)
+                current.params = "native";
+            inSubTable = true;
+            continue;
+        }
+        // A new top-level array-of-tables block ends the operation's scope
+        // for our purposes. We don't fully parse TOML here; we just stop
+        // ascribing later lines to this op.
+        if (/^\[\[/.test(line) && !line.startsWith("[[operations.")) {
+            operations.push(current);
+            current = null;
+            inSubTable = false;
+            continue;
+        }
+        if (/^\[/.test(line) && !line.startsWith("[operations.")) {
+            operations.push(current);
+            current = null;
+            inSubTable = false;
+            continue;
+        }
+        // Op-level fields. Skip if we've already descended into a sub-table —
+        // a `name = "id"` inside `[[operations.params]]` belongs to the param,
+        // not to the operation. Same for any other key we recognize here.
+        if (inSubTable)
+            continue;
+        const m = line.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/);
+        if (!m)
+            continue;
+        const key = m[1];
+        const value = m[2];
+        if (key === "name") {
+            const nameMatch = value.match(/^["'](.+)["']\s*$/);
+            if (nameMatch)
+                current.name = nameMatch[1];
+        }
+        else if (key === "definition" && current.definition === null) {
+            current.definition = "legacy";
+        }
+        else if (key === "params" && current.params === null) {
+            current.params = "legacy";
+        }
+    }
+    if (current)
+        operations.push(current);
+    const definition = new Map();
+    const params = new Map();
+    for (const op of operations) {
+        if (!op.name)
+            continue;
+        if (op.definition)
+            definition.set(op.name, op.definition);
+        if (op.params)
+            params.set(op.name, op.params);
+    }
+    return { definition, params };
+}
+/**
+ * Recursively check whether a JS value can be safely serialized to TOML
+ * using `@iarna/toml`. Returns null if OK, a reason string otherwise.
+ *
+ * Things TOML can't represent (in `@iarna/toml`):
+ *   - `null` (TOML has no null).
+ *   - Arrays containing values of different "TOML types" (e.g. mixed
+ *     string and number). Spec-wise TOML 1.0 actually allows this, but
+ *     `@iarna/toml` is strict and throws.
+ *   - `undefined` (different from null but equally not representable).
+ */
+export function canEmitNative(value) {
+    if (value === null)
+        return "value is null";
+    if (value === undefined)
+        return "value is undefined";
+    if (Array.isArray(value)) {
+        if (value.length > 0) {
+            const types = new Set();
+            for (const item of value) {
+                if (item === null)
+                    return "array contains null";
+                if (Array.isArray(item))
+                    types.add("array");
+                else
+                    types.add(typeof item);
+            }
+            if (types.size > 1) {
+                return `array contains mixed types (${[...types].sort().join(", ")})`;
+            }
+        }
+        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;
+}
+/**
+ * Normalize a `params` value into a sorted array of
+ * `{ name, type, required, ... }` rows, suitable for emitting as
+ * `[[operations.params]]`. Accepts both shapes the wire/parser supports:
+ *   - object form: `{ projectId: { type: "string", required: true } }`
+ *   - array form:  `[{ name: "projectId", type: "string", required: true }]`
+ */
+export function normalizeParamsToArray(params) {
+    if (params == null)
+        return null;
+    if (Array.isArray(params)) {
+        return params
+            .map((p) => ({ ...p }))
+            .filter((p) => p && typeof p === "object");
+    }
+    if (typeof params === "object") {
+        return Object.entries(params).map(([name, spec]) => ({
+            name,
+            ...(spec && typeof spec === "object" ? spec : {}),
+        }));
+    }
+    return null;
+}
+/**
+ * Default form for a new operation (no existing form hint): native.
+ * That matches the issue's "new file from server → native by default"
+ * requirement.
+ */
+const DEFAULT_FORM = "native";
+/**
+ * Build the JS object to pass to `TOML.stringify` for a database-type
+ * config file. Per operation:
+ *   - If the chosen form is "native" AND `definition` is TOML-emittable,
+ *     emit `[operations.definition]` (nested table).
+ *   - Else emit `definition = '<json string>'` and log a message.
+ *   - Same logic independently for `params`, but the native form for
+ *     params is `[[operations.params]]` (array-of-tables).
+ */
+export function buildDatabaseTypeTomlData(typeConfig, operations, ruleSetIdToName, options = {}) {
+    const hints = options.hints;
+    const defaultForm = options.defaultForm ?? DEFAULT_FORM;
+    const log = options.logger ?? (() => { });
+    // Prefer the parsed-from-key-based-reference name when present
+    // (`_ruleSetName` is set by `parseDatabaseTypeToml` when the source TOML
+    // uses the modern `ruleSetName = "..."` form). This makes the
+    // parse → serialize cycle a no-op for the rule-set field even when the
+    // caller passes an empty `ruleSetIdToName` map (e.g. `sync migrate-toml`,
+    // review feedback r3246633010).
+    let ruleSetName = "";
+    if (typeConfig._ruleSetName) {
+        ruleSetName = typeConfig._ruleSetName;
+    }
+    else if (typeConfig.ruleSetId) {
+        ruleSetName = ruleSetIdToName.get(typeConfig.ruleSetId) || "";
+    }
+    const data = {
+        type: {
+            databaseType: typeConfig.databaseType,
+            ruleSetName,
+        },
+    };
+    if (typeConfig.metadataAccess) {
+        data.type.celContextAccess = typeConfig.metadataAccess;
+    }
+    if (typeConfig.defaultAccess) {
+        data.type.defaultAccess = typeConfig.defaultAccess;
+    }
+    if (typeConfig.autoPopulatedFields) {
+        data.type.autoPopulatedFields = typeConfig.autoPopulatedFields;
+    }
+    if (typeConfig.triggers) {
+        data.triggers = typeConfig.triggers;
+    }
+    // Issue #666: inline schema TOML. The server-side `schema` field is a raw
+    // TOML string of `[models.*.fields.*]` blocks. Parse + merge into the same
+    // TOML object so the result serializes as `[models.<Name>.fields.<field>]`
+    // headers (matches the round-2 plan-of-record CLI sync layout).
+    if (typeConfig.schema && typeof typeConfig.schema === "string") {
+        try {
+            const parsedSchema = TOML.parse(typeConfig.schema);
+            if (parsedSchema?.models) {
+                data.models = parsedSchema.models;
+            }
+        }
+        catch {
+            // If the stored TOML is malformed (operationally surprising), don't
+            // crash the serializer — fall through without the models block.
+        }
+    }
+    if (operations.length === 0)
+        return data;
+    data.operations = operations.map((op) => {
+        const opRow = {
+            name: op.name,
+            type: op.type,
+            modelName: op.modelName,
+        };
+        if (op.access) {
+            opRow.access = op.access;
+        }
+        // ---- definition ----
+        const defForm = hints?.definition.get(op.name) ?? defaultForm;
+        const defValue = typeof op.definition === "string"
+            ? safeParseJson(op.definition)
+            : op.definition;
+        let definitionEmitted = false;
+        if (defForm === "native" && defValue && typeof defValue === "object") {
+            const reason = canEmitNative(defValue);
+            if (reason) {
+                log(`Operation '${op.name}': cannot emit \`definition\` as native TOML (${reason}); falling back to JSON string for this field.`);
+            }
+            else {
+                opRow.definition = defValue;
+                definitionEmitted = true;
+            }
+        }
+        if (!definitionEmitted) {
+            opRow.definition = typeof op.definition === "object"
+                ? JSON.stringify(op.definition)
+                : op.definition;
+        }
+        // ---- params ----
+        if (op.params != null) {
+            const paramsForm = hints?.params.get(op.name) ?? defaultForm;
+            let paramsEmitted = false;
+            if (paramsForm === "native") {
+                const paramsParsed = typeof op.params === "string"
+                    ? safeParseJson(op.params)
+                    : op.params;
+                const paramsArray = normalizeParamsToArray(paramsParsed);
+                if (paramsArray && paramsArray.length > 0) {
+                    const reason = canEmitNative(paramsArray);
+                    if (reason) {
+                        log(`Operation '${op.name}': cannot emit \`params\` as native TOML (${reason}); falling back to JSON string for this field.`);
+                    }
+                    else {
+                        opRow.params = paramsArray;
+                        paramsEmitted = true;
+                    }
+                }
+                else if (paramsArray && paramsArray.length === 0) {
+                    // Empty params: skip entirely rather than emitting an empty table.
+                    paramsEmitted = true;
+                }
+            }
+            if (!paramsEmitted) {
+                opRow.params = typeof op.params === "object"
+                    ? JSON.stringify(op.params)
+                    : op.params;
+            }
+        }
+        return opRow;
+    });
+    return data;
+}
+function safeParseJson(s) {
+    try {
+        return JSON.parse(s);
+    }
+    catch {
+        return s;
+    }
+}
+/**
+ * After parsing TOML, normalize the `definition` and `params` of each
+ * operation row into the JS objects the server expects. Handles both
+ * native and legacy forms transparently. The server payload is the
+ * source of truth; native TOML is purely a source-control affordance.
+ *
+ * Mirrors `parseDatabaseTypeToml` in `sync.ts`, but is broken out here
+ * so the migrate-toml command can call it without re-implementing.
+ */
+export function normalizeOperationFromToml(op) {
+    const normalized = {
+        name: op.name,
+        type: op.type,
+        modelName: op.modelName,
+        // `access` is optional — when the parent type sets `defaultAccess`,
+        // an operation may inherit by omitting this key. Keep null so the
+        // server-side controller decides whether to require it.
+        access: op.access ?? null,
+    };
+    if (typeof op.definition === "string") {
+        normalized.definition = safeParseJson(op.definition);
+    }
+    else {
+        // Preserve undefined-vs-set parity with the legacy parser by always
+        // assigning the key.
+        normalized.definition = op.definition;
+    }
+    if (op.params != null) {
+        if (typeof op.params === "string") {
+            normalized.params = safeParseJson(op.params);
+        }
+        else if (Array.isArray(op.params)) {
+            // Convert array form back into object form for the server payload.
+            const obj = {};
+            for (const row of op.params) {
+                if (!row || typeof row !== "object" || !row.name)
+                    continue;
+                const { name, ...rest } = row;
+                obj[name] = rest;
+            }
+            normalized.params = obj;
+        }
+        else if (typeof op.params === "object") {
+            normalized.params = op.params;
+        }
+    }
+    else {
+        normalized.params = null;
+    }
+    return normalized;
+}
+//# sourceMappingURL=toml-database-config.js.map

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

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

package/dist/src/lib/toml-params-validator.js

@@ -0,0 +1,183 @@
+/**
+ * Validator: every `$params.X` reference inside an operation's
+ * `definition` must correspond to a declared param in
+ * `[[operations.params]]` (or the legacy JSON-string params object).
+ *
+ * Background (issue #752): a typo like `$params.proectId` used to
+ * silently no-op at runtime. With native TOML, we can catch these at
+ * `sync push` time with the file path and line number of the
+ * operation block where the bad reference appears.
+ *
+ * Design notes:
+ *   - Line attribution is per-operation, not per-reference. We don't
+ *     parse `definition` line-by-line; we just locate the
+ *     `[[operations]]` header for the named op in the raw source and
+ *     report that line. This is the load-bearing UX (jump to the
+ *     offending op block); pinpointing the exact `$params.X` reference
+ *     inside a sub-table would require swapping the TOML parser, which
+ *     the issue explicitly leaves to implementer judgement.
+ *   - We intentionally diverge from the server-side `collectParamRefs`
+ *     in `database-type-operations-controller.ts:1163`. The server pushes
+ *     the full path (e.g. `"X.Y"` for `$params.X.Y`); the CLI extracts
+ *     only the first segment (`"X"`). Net effect: the CLI validator is
+ *     more lenient than the server — `$params.X.Y` passes the CLI check
+ *     when `X` alone is declared in `[[operations.params]]`, even though
+ *     the server treats the full path as the lookup key. The server
+ *     remains authoritative; the CLI's first-segment extraction is a
+ *     pragmatic choice so authors can declare structured params (e.g.
+ *     `config: { type: "object" }`) and reference sub-fields like
+ *     `$params.config.subKey` without listing every sub-field
+ *     individually (review feedback r3246635661).
+ */
+/**
+ * Walk an arbitrary JSON-ish value and collect `$params.X` references
+ * found in string-valued leaves, returning only the first dotted segment
+ * (`"X"` for `$params.X.Y`). Intentionally more lenient than the
+ * server-side helper, which pushes the full path — see the module
+ * doc-comment for the rationale.
+ */
+export function collectParamRefs(value) {
+    const refs = [];
+    if (typeof value === "string") {
+        const match = value.match(/^\$params\.(.+)$/);
+        if (match) {
+            const first = match[1].split(/[.\[]/)[0];
+            if (first)
+                refs.push(first);
+        }
+    }
+    else if (Array.isArray(value)) {
+        for (const item of value) {
+            refs.push(...collectParamRefs(item));
+        }
+    }
+    else if (value !== null && typeof value === "object") {
+        for (const v of Object.values(value)) {
+            refs.push(...collectParamRefs(v));
+        }
+    }
+    return refs;
+}
+/**
+ * Normalize a `params` value (object, array, or JSON string) into the
+ * set of declared param names.
+ */
+export function declaredParamNames(params) {
+    const names = new Set();
+    if (params == null)
+        return names;
+    let value = params;
+    if (typeof value === "string") {
+        try {
+            value = JSON.parse(value);
+        }
+        catch {
+            return names;
+        }
+    }
+    if (Array.isArray(value)) {
+        for (const row of value) {
+            if (row && typeof row === "object" && typeof row.name === "string") {
+                names.add(row.name);
+            }
+        }
+    }
+    else if (typeof value === "object" && value !== null) {
+        for (const key of Object.keys(value)) {
+            names.add(key);
+        }
+    }
+    return names;
+}
+/**
+ * Find the 1-indexed line number in `rawToml` where the `[[operations]]`
+ * block declaring `opName` starts. Returns 0 if not found.
+ *
+ * Implementation: walk in source order, track the most recent
+ * `[[operations]]` header, and when we see a `name = "<opName>"` line
+ * before the next `[[operations]]` or top-level header, return that
+ * header's line.
+ */
+export function locateOperationLine(rawToml, opName) {
+    const lines = rawToml.split(/\r?\n/);
+    let lastOpHeader = 0;
+    let armed = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        if (line === "[[operations]]") {
+            lastOpHeader = i + 1;
+            armed = true;
+            continue;
+        }
+        if (!armed)
+            continue;
+        // Another array-of-tables / top-level table → not this op anymore.
+        if (line.startsWith("[[") && line !== "[[operations]]" && !line.startsWith("[[operations.")) {
+            armed = false;
+            continue;
+        }
+        if (line.startsWith("[") && !line.startsWith("[[") && !line.startsWith("[operations.")) {
+            armed = false;
+            continue;
+        }
+        const m = line.match(/^name\s*=\s*["'](.+)["']\s*$/);
+        if (m && m[1] === opName) {
+            return lastOpHeader;
+        }
+    }
+    return 0;
+}
+/**
+ * Validate `$params` references across every operation in a parsed
+ * database-type config.
+ *
+ * Errors (blocking):
+ *   - A `$params.X` reference inside `definition` where `X` is not
+ *     declared in `[[operations.params]]`.
+ *
+ * Warnings (soft, not blocking):
+ *   - A param declared in `[[operations.params]]` that is not referenced
+ *     anywhere in `definition`. Authors may be staging a deprecation.
+ */
+export function validateOperations(opts) {
+    const errors = [];
+    const warnings = [];
+    for (const op of opts.operations) {
+        if (!op || !op.name)
+            continue;
+        const declared = declaredParamNames(op.params);
+        const refs = new Set(collectParamRefs(op.definition));
+        const line = locateOperationLine(opts.rawToml, op.name);
+        for (const ref of refs) {
+            if (!declared.has(ref)) {
+                errors.push({
+                    file: opts.filePath,
+                    line,
+                    op: op.name,
+                    message: `$params.${ref} not declared in [[operations.params]] for operation '${op.name}'`,
+                });
+            }
+        }
+        for (const name of declared) {
+            if (!refs.has(name)) {
+                warnings.push({
+                    file: opts.filePath,
+                    line,
+                    op: op.name,
+                    message: `param '${name}' declared but not referenced in operation '${op.name}'`,
+                });
+            }
+        }
+    }
+    return { errors, warnings };
+}
+/**
+ * Format a validation issue as `<file>:<line>: <message>`.
+ */
+export function formatIssue(issue) {
+    if (issue.line > 0) {
+        return `${issue.file}:${issue.line}: ${issue.message}`;
+    }
+    return `${issue.file}: ${issue.message}`;
+}
+//# sourceMappingURL=toml-params-validator.js.map

package/dist/src/lib/toml-params-validator.js.map

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