@kywi-software/core 0.2.1 → 0.3.0

package/dist/db/revision-queries.d.ts

@@ -0,0 +1,122 @@
+import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import { type ContentWithCustomFields } from './content-queries.js';
+import type { KywiDb } from './client.js';
+/**
+ * Pending revisions (#42) — reviewing edits to already-published content without
+ * unpublishing the live version.
+ *
+ * The problem: an editor could only push edits to a live page by direct-publish;
+ * `published → pending` was a forbidden transition, and even if allowed it would
+ * pull the page off the live site (only `published` renders). There was no
+ * "draft of a published page under review" concept.
+ *
+ * The model, built entirely on the EXISTING kywi_content_versions table (no new
+ * table, no schema migration): a pending revision is a version row with
+ * `status = 'pending'` whose snapshot carries the {@link REVISION_MARKER} flag
+ * and the PROPOSED (edited) content. The live kywi_content row is never touched
+ * on submit, so the published page keeps serving its current content. The marker
+ * distinguishes an OUTSTANDING revision from the ordinary historical
+ * status='pending' snapshot the draft→pending→approve cycle also produces, so the
+ * approvals queue never confuses the two. On resolution the marked row is
+ * deleted, so "outstanding revision" == "a marked pending version exists".
+ */
+/** Snapshot flag marking a version row as an outstanding pending revision. */
+export declare const REVISION_MARKER = "__pendingRevision";
+/** Return a copy of a revision snapshot with the internal marker removed. */
+export declare function stripRevisionMarker(snapshot: Record<string, unknown>): Record<string, unknown>;
+/** A pending-revision version joined with its live content, for the queue. */
+export interface PendingRevisionRow {
+    versionId: string;
+    version: number;
+    contentId: string;
+    contentTypeName: string;
+    title: string;
+    siteId: string;
+    status: string;
+    createdBy: string | null;
+    createdAt: Date;
+    changeNote: string | null;
+    snapshot: Record<string, unknown>;
+}
+/**
+ * Create a pending revision: a version snapshot of the proposed content with the
+ * revision marker, status 'pending'. The live content row is deliberately NOT
+ * modified — the caller has already confirmed the content is published/approved
+ * and the point is that it keeps serving until approval.
+ *
+ * Uses createVersion directly (not recordContentVersion) so a pending revision is
+ * never pruned by the retention cap while it awaits review.
+ */
+export declare function createPendingRevision(db: KywiDb, data: {
+    contentId: string;
+    siteId: string;
+    proposed: Record<string, unknown>;
+    changeNote?: string | undefined;
+    createdBy: string | null;
+}): Promise<{
+    id: string;
+    siteId: string;
+    status: string;
+    createdAt: Date;
+    createdBy: string | null;
+    contentId: string;
+    version: number;
+    snapshot: unknown;
+    changeNote: string | null;
+}>;
+/**
+ * List outstanding pending revisions for a site — one row per revision version
+ * carrying the marker, joined to its (non-deleted) live content. Ordered newest
+ * first. Feeds the approvals queue alongside the plain status='pending' drafts.
+ */
+export declare function listPendingRevisions(db: KywiDb, siteId: string): Promise<PendingRevisionRow[]>;
+/**
+ * Fetch a single pending-revision version by id, validating it is a marked,
+ * still-pending revision belonging to `contentId`. Returns null otherwise (an
+ * already-resolved or non-revision version id).
+ */
+export declare function getPendingRevision(db: KywiDb, contentId: string, versionId: string): Promise<{
+    id: string;
+    version: number;
+    siteId: string;
+    snapshot: Record<string, unknown>;
+    changeNote: string | null;
+} | null>;
+/**
+ * Approve a pending revision: apply its proposed snapshot onto the live content
+ * (publishing it), record a normal published version of the result, and delete
+ * the marked revision row so it leaves the queue. The live page transitions from
+ * its old content to the approved content in one step, staying published.
+ */
+export declare function approvePendingRevision(db: KywiDb, opts: {
+    contentId: string;
+    versionId: string;
+    userId: string;
+    userEmail: string;
+    customTable: PgTableWithColumns<any> | null;
+    customFieldNames?: readonly string[];
+}): Promise<{
+    success: boolean;
+    content?: ContentWithCustomFields;
+    error?: string;
+}>;
+/**
+ * Reject a pending revision: discard the proposed snapshot (delete the marked
+ * row) and record a version on the UNCHANGED live content whose changeNote is
+ * `Rejected: <reason>`. Recording it as a version (matching the draft-reject
+ * flow) is what surfaces the reason back to the editor — the edit screen reads
+ * the latest `Rejected:` version note. The live content is never modified.
+ */
+export declare function rejectPendingRevision(db: KywiDb, opts: {
+    contentId: string;
+    versionId: string;
+    reason?: string | undefined;
+    userId: string;
+    userEmail: string;
+    customTable: PgTableWithColumns<any> | null;
+}): Promise<{
+    success: boolean;
+    content?: ContentWithCustomFields;
+    error?: string;
+}>;
+//# sourceMappingURL=revision-queries.d.ts.map

package/dist/db/revision-queries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"revision-queries.d.ts","sourceRoot":"","sources":["../../src/db/revision-queries.ts"],"names":[],"mappings":"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"}

package/dist/db/revision-queries.js

@@ -0,0 +1,213 @@
+import { eq, and, desc, sql } from 'drizzle-orm';
+import { kywiContent, kywiContentVersions } from '../schema/base.js';
+import { createVersion, getLatestVersionNumber, recordContentVersion } from './version-queries.js';
+import { getContentById } from './content-queries.js';
+import { applyContentSnapshot } from './apply-snapshot.js';
+import { createAuditEntry } from './audit-queries.js';
+/**
+ * Pending revisions (#42) — reviewing edits to already-published content without
+ * unpublishing the live version.
+ *
+ * The problem: an editor could only push edits to a live page by direct-publish;
+ * `published → pending` was a forbidden transition, and even if allowed it would
+ * pull the page off the live site (only `published` renders). There was no
+ * "draft of a published page under review" concept.
+ *
+ * The model, built entirely on the EXISTING kywi_content_versions table (no new
+ * table, no schema migration): a pending revision is a version row with
+ * `status = 'pending'` whose snapshot carries the {@link REVISION_MARKER} flag
+ * and the PROPOSED (edited) content. The live kywi_content row is never touched
+ * on submit, so the published page keeps serving its current content. The marker
+ * distinguishes an OUTSTANDING revision from the ordinary historical
+ * status='pending' snapshot the draft→pending→approve cycle also produces, so the
+ * approvals queue never confuses the two. On resolution the marked row is
+ * deleted, so "outstanding revision" == "a marked pending version exists".
+ */
+/** Snapshot flag marking a version row as an outstanding pending revision. */
+export const REVISION_MARKER = '__pendingRevision';
+/** Return a copy of a revision snapshot with the internal marker removed. */
+export function stripRevisionMarker(snapshot) {
+    const { [REVISION_MARKER]: _marker, ...rest } = snapshot;
+    return rest;
+}
+/**
+ * Create a pending revision: a version snapshot of the proposed content with the
+ * revision marker, status 'pending'. The live content row is deliberately NOT
+ * modified — the caller has already confirmed the content is published/approved
+ * and the point is that it keeps serving until approval.
+ *
+ * Uses createVersion directly (not recordContentVersion) so a pending revision is
+ * never pruned by the retention cap while it awaits review.
+ */
+export async function createPendingRevision(db, data) {
+    const latest = await getLatestVersionNumber(db, data.contentId);
+    const snapshot = { ...data.proposed, [REVISION_MARKER]: true };
+    return createVersion(db, {
+        contentId: data.contentId,
+        siteId: data.siteId,
+        version: latest + 1,
+        snapshot,
+        status: 'pending',
+        createdBy: data.createdBy,
+        ...(data.changeNote !== undefined ? { changeNote: data.changeNote } : {}),
+    });
+}
+/**
+ * List outstanding pending revisions for a site — one row per revision version
+ * carrying the marker, joined to its (non-deleted) live content. Ordered newest
+ * first. Feeds the approvals queue alongside the plain status='pending' drafts.
+ */
+export async function listPendingRevisions(db, siteId) {
+    const rows = await db
+        .select({
+        versionId: kywiContentVersions.id,
+        version: kywiContentVersions.version,
+        contentId: kywiContentVersions.contentId,
+        siteId: kywiContentVersions.siteId,
+        createdBy: kywiContentVersions.createdBy,
+        createdAt: kywiContentVersions.createdAt,
+        changeNote: kywiContentVersions.changeNote,
+        snapshot: kywiContentVersions.snapshot,
+        contentTypeName: kywiContent.contentTypeName,
+        title: kywiContent.title,
+        contentStatus: kywiContent.status,
+    })
+        .from(kywiContentVersions)
+        .innerJoin(kywiContent, eq(kywiContent.id, kywiContentVersions.contentId))
+        .where(and(eq(kywiContentVersions.siteId, siteId), eq(kywiContentVersions.status, 'pending'), sql `(${kywiContentVersions.snapshot} ->> ${REVISION_MARKER}) = 'true'`, sql `${kywiContent.deletedAt} IS NULL`))
+        .orderBy(desc(kywiContentVersions.createdAt));
+    return rows.map((r) => ({
+        versionId: r.versionId,
+        version: r.version,
+        contentId: r.contentId,
+        contentTypeName: r.contentTypeName,
+        title: r.title,
+        siteId: r.siteId,
+        status: r.contentStatus,
+        createdBy: r.createdBy ?? null,
+        createdAt: r.createdAt,
+        changeNote: r.changeNote ?? null,
+        snapshot: r.snapshot,
+    }));
+}
+/**
+ * Fetch a single pending-revision version by id, validating it is a marked,
+ * still-pending revision belonging to `contentId`. Returns null otherwise (an
+ * already-resolved or non-revision version id).
+ */
+export async function getPendingRevision(db, contentId, versionId) {
+    const [row] = await db
+        .select()
+        .from(kywiContentVersions)
+        .where(eq(kywiContentVersions.id, versionId))
+        .limit(1);
+    if (!row)
+        return null;
+    if (row.contentId !== contentId)
+        return null;
+    if (row.status !== 'pending')
+        return null;
+    const snapshot = row.snapshot;
+    if (snapshot?.[REVISION_MARKER] !== true)
+        return null;
+    return {
+        id: row.id,
+        version: row.version,
+        siteId: row.siteId,
+        snapshot,
+        changeNote: row.changeNote ?? null,
+    };
+}
+/**
+ * Approve a pending revision: apply its proposed snapshot onto the live content
+ * (publishing it), record a normal published version of the result, and delete
+ * the marked revision row so it leaves the queue. The live page transitions from
+ * its old content to the approved content in one step, staying published.
+ */
+export async function approvePendingRevision(db, opts) {
+    const revision = await getPendingRevision(db, opts.contentId, opts.versionId);
+    if (!revision)
+        return { success: false, error: 'Pending revision not found' };
+    const content = await db.transaction(async (rawTx) => {
+        const tx = rawTx;
+        const clean = stripRevisionMarker(revision.snapshot);
+        await applyContentSnapshot(tx, opts.contentId, clean, {
+            forceStatus: 'published',
+            userId: opts.userId,
+            customTable: opts.customTable,
+            customFieldNames: opts.customFieldNames ?? [],
+        });
+        // Remove the revision row first so the published version we record next is
+        // the highest version number (and the revision leaves the queue).
+        await tx.delete(kywiContentVersions).where(eq(kywiContentVersions.id, opts.versionId));
+        const applied = await getContentById(tx, opts.customTable, opts.contentId);
+        if (applied) {
+            await recordContentVersion(tx, {
+                contentId: opts.contentId,
+                siteId: revision.siteId,
+                snapshot: applied,
+                status: 'published',
+                createdBy: opts.userId,
+                changeNote: revision.changeNote
+                    ? `Approved revision: ${revision.changeNote}`
+                    : 'Approved revision',
+            });
+        }
+        await createAuditEntry(tx, {
+            siteId: revision.siteId,
+            contentId: opts.contentId,
+            action: 'approve',
+            fromStatus: 'published',
+            toStatus: 'published',
+            userId: opts.userId,
+            userEmail: opts.userEmail,
+        });
+        return applied;
+    });
+    const result = { success: true };
+    if (content)
+        result.content = content;
+    return result;
+}
+/**
+ * Reject a pending revision: discard the proposed snapshot (delete the marked
+ * row) and record a version on the UNCHANGED live content whose changeNote is
+ * `Rejected: <reason>`. Recording it as a version (matching the draft-reject
+ * flow) is what surfaces the reason back to the editor — the edit screen reads
+ * the latest `Rejected:` version note. The live content is never modified.
+ */
+export async function rejectPendingRevision(db, opts) {
+    const revision = await getPendingRevision(db, opts.contentId, opts.versionId);
+    if (!revision)
+        return { success: false, error: 'Pending revision not found' };
+    const content = await db.transaction(async (rawTx) => {
+        const tx = rawTx;
+        await tx.delete(kywiContentVersions).where(eq(kywiContentVersions.id, opts.versionId));
+        const current = await getContentById(tx, opts.customTable, opts.contentId);
+        if (current) {
+            await recordContentVersion(tx, {
+                contentId: opts.contentId,
+                siteId: revision.siteId,
+                snapshot: current,
+                status: current.status ?? 'published',
+                createdBy: opts.userId,
+                changeNote: opts.reason !== undefined ? `Rejected: ${opts.reason}` : 'Rejected',
+            });
+        }
+        await createAuditEntry(tx, {
+            siteId: revision.siteId,
+            contentId: opts.contentId,
+            action: 'reject',
+            fromStatus: current?.status ?? 'published',
+            toStatus: current?.status ?? 'published',
+            userId: opts.userId,
+            userEmail: opts.userEmail,
+        });
+        return current;
+    });
+    const result = { success: true };
+    if (content)
+        result.content = content;
+    return result;
+}
+//# sourceMappingURL=revision-queries.js.map

package/dist/db/revision-queries.js.map

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

package/dist/db/schema-apply.d.ts

@@ -13,6 +13,14 @@ export interface SchemaDiff {
 export declare function diffFields(actualColumns: string[], desiredFields: FieldDefinition[]): SchemaDiff;
 /** Read actual column names for a table from information_schema. */
 export declare function getActualColumns(db: KywiDb, tableName: string): Promise<string[]>;
+/**
+ * List every dynamic content-type table (`kywi_ct_*`) that physically exists in
+ * the public schema. Used by `migrate:generate` (#38) to compute which dynamic
+ * tables are orphans (present in the DB but backed by neither a config type nor
+ * a currently-registered admin type) so they can be excluded from the drizzle-kit
+ * diff instead of being offered for DROP.
+ */
+export declare function listCustomContentTables(db: KywiDb): Promise<string[]>;
 /** Does a table exist in the public schema? */
 export declare function tableExists(db: KywiDb, tableName: string): Promise<boolean>;
 /**

package/dist/db/schema-apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-apply.d.ts","sourceRoot":"","sources":["../../src/db/schema-apply.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAGzD,MAAM,WAAW,UAAU;IACzB,6EAA6E;IAC7E,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,8GAA8G;IAC9G,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,UAAU,CAQhG;AAiCD,oEAAoE;AACpE,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CASvF;AAED,+CAA+C;AAC/C,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOjF;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUlG;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,eAAe,EAAE,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAelE"}
+{"version":3,"file":"schema-apply.d.ts","sourceRoot":"","sources":["../../src/db/schema-apply.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAGzD,MAAM,WAAW,UAAU;IACzB,6EAA6E;IAC7E,KAAK,EAAE,eAAe,EAAE,CAAA;IACxB,8GAA8G;IAC9G,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,UAAU,CAQhG;AAmCD,oEAAoE;AACpE,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CASvF;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAO3E;AAED,+CAA+C;AAC/C,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOjF;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAUlG;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,eAAe,EAAE,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAelE"}

package/dist/db/schema-apply.js

@@ -17,9 +17,11 @@ function fieldTypeToSql(field) {
         case 'text':
         case 'richText':
         case 'textarea':
+        case 'url':
             return 'text';
         case 'select':
         case 'slug':
+        case 'email':
             return 'varchar(255)';
         case 'color':
             return 'varchar(7)';
@@ -52,6 +54,21 @@ export async function getActualColumns(db, tableName) {
   `);
     return rows.map((r) => r.column_name);
 }
+/**
+ * List every dynamic content-type table (`kywi_ct_*`) that physically exists in
+ * the public schema. Used by `migrate:generate` (#38) to compute which dynamic
+ * tables are orphans (present in the DB but backed by neither a config type nor
+ * a currently-registered admin type) so they can be excluded from the drizzle-kit
+ * diff instead of being offered for DROP.
+ */
+export async function listCustomContentTables(db) {
+    const rows = await db.execute(sql `
+    SELECT table_name FROM information_schema.tables
+    WHERE table_schema = 'public' AND table_name LIKE 'kywi\\_ct\\_%'
+    ORDER BY table_name
+  `);
+    return rows.map((r) => r.table_name);
+}
 /** Does a table exist in the public schema? */
 export async function tableExists(db, tableName) {
     const rows = await db.execute(sql `

package/dist/db/schema-apply.js.map

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

package/dist/db/schema-field-queries.d.ts

@@ -8,6 +8,8 @@ export interface AdminFieldInput {
     options?: string[] | undefined;
     required?: boolean | undefined;
     validation?: FieldValidation | undefined;
+    /** Target content type (or 'user') for a 'relationship' field (kywi-cms#12). */
+    relatedType?: string | undefined;
     sortOrder?: number | undefined;
 }
 /** Load admin-defined fields for one content type. */

package/dist/db/schema-field-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-field-queries.d.ts","sourceRoot":"","sources":["../../src/db/schema-field-queries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAE1E,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC9B,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;IACxC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAgBD,sDAAsD;AACtD,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;AACtG,6DAA6D;AAC7D,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC,CAAA;AA4B1F,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBtF;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,8FAA8F;AAC9F,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG"}
+{"version":3,"file":"schema-field-queries.d.ts","sourceRoot":"","sources":["../../src/db/schema-field-queries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAE1E,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC9B,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;IACxC,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC/B;AAkBD,sDAAsD;AACtD,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;AACtG,6DAA6D;AAC7D,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC,CAAA;AA4B1F,wBAAsB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BtF;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,8FAA8F;AAC9F,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjG"}

package/dist/db/schema-field-queries.js

@@ -3,6 +3,7 @@ import { kywiContentTypeFields } from '../schema/base.js';
 function rowToFieldDef(row) {
     const options = row.options ?? undefined;
     const validation = row.validation ?? undefined;
+    const relatedType = row.relatedType ?? undefined;
     return {
         name: row.name,
         type: row.type,
@@ -10,6 +11,7 @@ function rowToFieldDef(row) {
         required: row.required,
         ...(options !== undefined && { options }),
         ...(validation !== undefined && { validation }),
+        ...(relatedType !== undefined && { relatedType }),
         source: 'admin',
     };
 }
@@ -45,6 +47,7 @@ export async function saveAdminField(db, input) {
         options: input.options ?? null,
         required: input.required ?? false,
         validation: input.validation ?? null,
+        relatedType: input.relatedType ?? null,
         sortOrder: input.sortOrder ?? 0,
     })
         .onConflictDoUpdate({
@@ -55,6 +58,7 @@ export async function saveAdminField(db, input) {
             options: input.options ?? null,
             required: input.required ?? false,
             validation: input.validation ?? null,
+            relatedType: input.relatedType ?? null,
             sortOrder: input.sortOrder ?? 0,
             updatedAt: new Date(),
         },

package/dist/db/schema-field-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-field-queries.js","sourceRoot":"","sources":["../../src/db/schema-field-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAErC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAczD,SAAS,aAAa,CAAC,GAA8C;IACnE,MAAM,OAAO,GAAI,GAAG,CAAC,OAA2B,IAAI,SAAS,CAAA;IAC7D,MAAM,UAAU,GAAI,GAAG,CAAC,UAAqC,IAAI,SAAS,CAAA;IAC1E,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,GAAG,CAAC,IAA+B;QACzC,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,CAAC;QACzC,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,CAAC;QAC/C,MAAM,EAAE,OAAO;KAChB,CAAA;AACH,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAU,EACV,eAAwB;IAExB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,EAAE;aAClB,MAAM,EAAE;aACR,IAAI,CAAC,qBAAqB,CAAC;aAC3B,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;aACjE,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAChC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,MAAM,EAAE;SACR,IAAI,CAAC,qBAAqB,CAAC;SAC3B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAE3C,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAA;IAChD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAA;QACnD,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EAAU,EAAE,KAAsB;IACrE,MAAM,EAAE;SACL,MAAM,CAAC,qBAAqB,CAAC;SAC7B,MAAM,CAAC;QACN,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;QAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;QACpC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,CAAC;KAChC,CAAC;SACD,kBAAkB,CAAC;QAClB,MAAM,EAAE,CAAC,qBAAqB,CAAC,eAAe,EAAE,qBAAqB,CAAC,IAAI,CAAC;QAC3E,GAAG,EAAE;YACH,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;YAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;YACjC,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,CAAC;YAC/B,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB;KACF,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAU,EACV,eAAuB,EACvB,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,EAAE;SACpB,MAAM,CAAC,qBAAqB,CAAC;SAC7B,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,qBAAqB,CAAC,eAAe,EAAE,eAAe,CAAC,EAC1D,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CACrC,CACF;SACA,SAAS,EAAE,CAAA;IACd,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;AAC1B,CAAC;AAED,8FAA8F;AAC9F,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAAU,EAAE,eAAuB;IAChF,MAAM,EAAE;SACL,MAAM,CAAC,qBAAqB,CAAC;SAC7B,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;AACtE,CAAC"}
+{"version":3,"file":"schema-field-queries.js","sourceRoot":"","sources":["../../src/db/schema-field-queries.ts"],"names":[],"mappings":"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"}

package/dist/db/site-plugin-queries.d.ts

@@ -7,9 +7,9 @@ export declare function activatePlugin(db: KywiDb, siteId: string, pluginPackage
     id: string;
     siteId: string;
     updatedAt: Date;
-    config: unknown;
     createdAt: Date;
     isActive: boolean;
+    config: unknown;
     pluginPackage: string;
 }>;
 export declare function deactivatePlugin(db: KywiDb, siteId: string, pluginPackage: string): Promise<{
@@ -25,9 +25,9 @@ export declare function listPluginsForSite(db: KywiDb, siteId: string, activeOnl
     id: string;
     siteId: string;
     updatedAt: Date;
-    config: unknown;
     createdAt: Date;
     isActive: boolean;
+    config: unknown;
     pluginPackage: string;
 }[]>;
 export declare function getPluginConfig(db: KywiDb, siteId: string, pluginPackage: string): Promise<Record<string, unknown> | null>;

package/dist/db/user-queries.d.ts

@@ -19,6 +19,18 @@ export declare function getUserById(db: KywiDb, id: string): Promise<KywiUsersRo
 export declare function getUserGroups(db: KywiDb, userId: string): Promise<string[]>;
 /**
  * List users. If siteId is provided, return only users with a membership in that site.
+ *
+ * #40: this used to `innerJoin` kywi_site_memberships and filter on siteId —
+ * correct when a user has exactly one membership row for that site, but
+ * `kywi_site_memberships` has no uniqueness constraint on (userId, siteId), so
+ * a duplicate row (e.g. the New User form granting the same site twice — once
+ * implicitly via POST /users, once explicitly via POST /users/:id/sites/:sid)
+ * fanned the join out into one kywi_users row PER membership row, rendering
+ * the same user 2-3x in All Users, the ACL "Grant to → User" dropdown (both
+ * read this same query), and — downstream — the group-members panel (which
+ * filters this same user list by membership id). Filtering by an `IN`
+ * subquery instead of joining can never fan out kywi_users' own rows, no
+ * matter how many (or how few, post schema fix) membership rows exist.
  */
 export declare function listUsers(db: KywiDb, siteId?: string): Promise<KywiUsersRow[]>;
 /**

package/dist/db/user-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-queries.d.ts","sourceRoot":"","sources":["../../src/db/user-queries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGrD;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,MAAM,CAAC,EACvC,UAAU,EAAE,MAAM,EAAE,GACnB,WAAW,CAMb;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAO9B;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAOtF;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOjF;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CASpF;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9E,OAAO,CAAC,YAAY,CAAC,CAYvB;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,WAAW,CAAC,CAAC,GACpD,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAO9B;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMzE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IAAE,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAA;CAAE,EACxC,UAAU,EAAE,MAAM,GACjB,OAAO,CAIT"}
+{"version":3,"file":"user-queries.d.ts","sourceRoot":"","sources":["../../src/db/user-queries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGrD;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,MAAM,CAAC,EACvC,UAAU,EAAE,MAAM,EAAE,GACnB,WAAW,CAMb;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAO9B;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAOtF;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOjF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBpF;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9E,OAAO,CAAC,YAAY,CAAC,CAYvB;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,WAAW,CAAC,CAAC,GACpD,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAO9B;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMzE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IAAE,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAA;CAAE,EACxC,UAAU,EAAE,MAAM,GACjB,OAAO,CAIT"}

package/dist/db/user-queries.js

@@ -1,4 +1,4 @@
-import { eq, getTableColumns } from 'drizzle-orm';
+import { eq, inArray } from 'drizzle-orm';
 import { kywiUsers, kywiUserGroups, kywiGroups, kywiSiteMemberships } from '../schema/base.js';
 import { hashPassword } from '../auth/passwords.js';
 /**
@@ -46,14 +46,28 @@ export async function getUserGroups(db, userId) {
 }
 /**
  * List users. If siteId is provided, return only users with a membership in that site.
+ *
+ * #40: this used to `innerJoin` kywi_site_memberships and filter on siteId —
+ * correct when a user has exactly one membership row for that site, but
+ * `kywi_site_memberships` has no uniqueness constraint on (userId, siteId), so
+ * a duplicate row (e.g. the New User form granting the same site twice — once
+ * implicitly via POST /users, once explicitly via POST /users/:id/sites/:sid)
+ * fanned the join out into one kywi_users row PER membership row, rendering
+ * the same user 2-3x in All Users, the ACL "Grant to → User" dropdown (both
+ * read this same query), and — downstream — the group-members panel (which
+ * filters this same user list by membership id). Filtering by an `IN`
+ * subquery instead of joining can never fan out kywi_users' own rows, no
+ * matter how many (or how few, post schema fix) membership rows exist.
  */
 export async function listUsers(db, siteId) {
     if (siteId) {
         return db
-            .select(getTableColumns(kywiUsers))
+            .select()
             .from(kywiUsers)
-            .innerJoin(kywiSiteMemberships, eq(kywiSiteMemberships.userId, kywiUsers.id))
-            .where(eq(kywiSiteMemberships.siteId, siteId));
+            .where(inArray(kywiUsers.id, db
+            .select({ userId: kywiSiteMemberships.userId })
+            .from(kywiSiteMemberships)
+            .where(eq(kywiSiteMemberships.siteId, siteId))));
     }
     return db.select().from(kywiUsers);
 }

package/dist/db/user-queries.js.map

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