includio-cms 0.5.3 → 0.5.5

package/dist/admin/client/collection/collection-entries.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { getRawCollectionEntryLabel } from '../../utils/entryLabel.js';
 	import { getEntryThumbnail } from '../../utils/entryThumbnail.js';
+	import { arrayMove } from '../../utils/arrayMove.js';
 	import { getRemotes } from '../../../sveltekit/index.js';
 	import type { CollectionConfigWithType } from '../../../types/collections.js';
 	import DataTable from './data-table.svelte';
@@ -11,6 +12,7 @@
 	import type { InterfaceLanguage } from '../../../types/languages.js';
 	import { useInterfaceLanguage } from '../../state/interface-language.svelte.js';
 	import { getEntryStatus } from '../entry/utils.js';
+	import { getLocalizedLabel } from '../../utils/collectionLabel.js';
 	import * as AlertDialog from '../../../components/ui/alert-dialog/index.js';
 	import { toast } from 'svelte-sonner';
 	import StatusBadge from './status-badge.svelte';
@@ -110,6 +112,7 @@
 		thumbnail: string | null;
 		searchText: string;
 		a11yWarnings: number;
+		customData: Record<string, unknown>;
 	}
 
 	type Props = {
@@ -140,8 +143,14 @@
 	// Is the current filter for archived entries?
 	const isArchivedFilter = $derived(viewState.statusFilter === 'archived');
 
+	const isOrderable = $derived(!!collection.orderable);
+
 	// Build orderBy from sorting state for server-side mode
 	const serverOrderBy = $derived.by(() => {
+		// When orderable, always sort by sortOrder
+		if (isOrderable) {
+			return { column: 'sortOrder' as const, direction: 'asc' as const };
+		}
 		if (!viewState.sorting.length) return undefined;
 		const { id, desc } = viewState.sorting[0];
 		if (id === 'createdAt' || id === 'updatedAt') {
@@ -240,6 +249,23 @@
 				}),
 			size: 140
 		},
+		// Custom list columns from collection config
+		...(collection.listColumns ?? []).map((fieldSlug) => {
+			const fieldConfig = collection.fields.find((f) => f.slug === fieldSlug);
+			const headerLabel = fieldConfig?.label
+				? getLocalizedLabel(fieldConfig.label, interfaceLanguage.current)
+				: fieldSlug;
+			return {
+				id: `custom_${fieldSlug}`,
+				header: headerLabel,
+				cell: (info: { row: { original: CollectionDataTableRow } }) => {
+					const value = info.row.original.customData[fieldSlug];
+					return String(value ?? '');
+				},
+				enableSorting: false,
+				size: 120
+			} satisfies ColumnDef<CollectionDataTableRow>;
+		}),
 		{
 			id: 'actions',
 			header: '',
@@ -331,6 +357,19 @@
 
 	function mapEntryToRow(entry: RawEntry): CollectionDataTableRow {
 		const data = entry.draftVersion?.data || entry.publishedVersion?.data || {};
+		const customData: Record<string, unknown> = {};
+		if (collection.listColumns) {
+			for (const fieldSlug of collection.listColumns) {
+				const fieldData = (data as Record<string, unknown>)[fieldSlug];
+				// For localized fields, extract current content language value
+				if (fieldData && typeof fieldData === 'object' && !Array.isArray(fieldData)) {
+					const localized = fieldData as Record<string, unknown>;
+					customData[fieldSlug] = localized[contentLanguage.current] ?? Object.values(localized)[0] ?? '';
+				} else {
+					customData[fieldSlug] = fieldData ?? '';
+				}
+			}
+		}
 		return {
 			id: entry.id,
 			name: getRawCollectionEntryLabel(entry, collection, contentLanguage.current),
@@ -341,7 +380,8 @@
 			updatedAt: new Date(entry.updatedAt),
 			thumbnail: getEntryThumbnail(data as Record<string, unknown>, collection),
 			searchText: getSearchText(entry),
-			a11yWarnings: countA11yWarnings(entry)
+			a11yWarnings: countA11yWarnings(entry),
+			customData
 		};
 	}
 
@@ -404,6 +444,14 @@
 		refreshQueries();
 	}
 
+	async function handleReorder(items: CollectionDataTableRow[], fromIndex: number, toIndex: number) {
+		if (!isOrderable || items.length === 0) return;
+		const reordered = arrayMove(items, fromIndex, toIndex);
+		const orderedIds = reordered.map((item) => item.id);
+		await remotes.reorderEntriesCommand({ orderedIds });
+		refreshQueries();
+	}
+
 	async function handleBulkDelete(items: CollectionDataTableRow[]) {
 		const idsToDelete = selectedIndices.map((idx) => items[idx]?.id).filter(Boolean);
 		for (const id of idsToDelete) {
@@ -439,8 +487,7 @@
 				? result.total
 				: filteredRows.length}
 		{@const pageCount = Math.ceil(totalItems / viewState.pageSize)}
-		{@const displayItems =
-			useServerPagination && !viewState.statusFilter
+		{@const displayItems = useServerPagination && !viewState.statusFilter
 				? filteredRows
 				: filteredRows.slice(
 						viewState.pageIndex * viewState.pageSize,
@@ -474,7 +521,7 @@
 					<DataTable
 						data={displayItems}
 						{columns}
-						enableSorting
+						enableSorting={!isOrderable}
 						enableFiltering
 						enableSelection
 						enablePagination
@@ -490,12 +537,14 @@
 							viewState.pageIndex = p.pageIndex;
 						}}
 						tableRef={(t) => (tableInstance = t)}
+						orderable={isOrderable}
+						onReorder={(from, to) => handleReorder(displayItems, from, to)}
 					/>
 				{:else}
 					<DataTable
 						data={displayItems}
 						{columns}
-						enableSorting
+						enableSorting={!isOrderable}
 						enableFiltering
 						enableSelection
 						enablePagination
@@ -508,6 +557,8 @@
 							viewState.pageIndex = p.pageIndex;
 						}}
 						tableRef={(t) => (tableInstance = t)}
+						orderable={isOrderable}
+						onReorder={(from, to) => handleReorder(displayItems, from, to)}
 					/>
 				{/if}
 			</div>

package/dist/admin/client/collection/data-table.svelte

@@ -15,6 +15,8 @@
 	import * as Table from '../../../components/ui/table/index.js';
 	import { useInterfaceLanguage } from '../../state/interface-language.svelte.js';
 	import type { InterfaceLanguage } from '../../../types/languages.js';
+	import { droppable, draggable, dndState } from '@thisux/sveltednd';
+	import { flip } from 'svelte/animate';
 
 	type DataTableProps<TData, TValue> = {
 		columns: ColumnDef<TData, TValue>[];
@@ -35,6 +37,8 @@
 		pageCount?: number;
 		rowCount?: number;
 		emptyMessage?: string;
+		orderable?: boolean;
+		onReorder?: (fromIndex: number, toIndex: number) => void;
 	};
 
 	let {
@@ -55,9 +59,18 @@
 		manualPagination: manualPaginationProp = false,
 		pageCount: pageCountProp,
 		rowCount: rowCountProp,
-		emptyMessage
+		emptyMessage,
+		orderable = false,
+		onReorder
 	}: DataTableProps<TData, TValue> = $props();
 
+	let liveRegionMessage = $state('');
+	let dropProcessing = false;
+
+	const matchesReducedMotion = typeof window !== 'undefined'
+		? window.matchMedia('(prefers-reduced-motion: reduce)').matches
+		: false;
+
 	const interfaceLanguage = useInterfaceLanguage();
 
 	const defaultEmptyMessages: Record<InterfaceLanguage, string> = {
@@ -113,10 +126,17 @@
 	});
 </script>
 
-<Table.Root>
+{#if orderable}
+	<div aria-live="polite" aria-atomic="true" class="sr-only">{liveRegionMessage}</div>
+{/if}
+
+<Table.Root aria-roledescription={orderable ? 'sortable list' : undefined}>
 	<Table.Header class="bg-muted sticky top-0 z-10">
 		{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 			<Table.Row class="border-b-0 hover:bg-transparent">
+				{#if orderable}
+					<Table.Head class="text-[11px] font-bold uppercase tracking-[0.04em] text-muted-foreground h-10 w-10"></Table.Head>
+				{/if}
 				{#each headerGroup.headers as header (header.id)}
 					<Table.Head class="text-[11px] font-bold uppercase tracking-[0.04em] text-muted-foreground h-10">
 						{#if !header.isPlaceholder}
@@ -131,23 +151,112 @@
 		{/each}
 	</Table.Header>
 	<Table.Body>
-		{#each table.getRowModel().rows as row, i (row.id)}
-			<Table.Row
-				data-state={row.getIsSelected() && 'selected'}
-				class="hover:bg-lavender-lighter/50 data-[state=selected]:bg-lavender-lighter/30 {i === table.getRowModel().rows.length - 1 ? 'border-b-0' : ''}"
-			>
-				{#each row.getVisibleCells() as cell (cell.id)}
-					<Table.Cell class="py-3">
-						<FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
+		{#if orderable}
+			{#each table.getRowModel().rows as row, i (row.id)}
+				{@const totalRows = table.getRowModel().rows.length}
+				<tr
+					use:droppable={{
+						container: i.toString(),
+						callbacks: {
+							onDrop: (state) => {
+								if (dropProcessing) return;
+								dropProcessing = true;
+								const fromIndex = parseInt(state.sourceContainer ?? '');
+								const toIndex = parseInt(state.targetContainer ?? '');
+								if (!isNaN(fromIndex) && !isNaN(toIndex)) {
+									onReorder?.(fromIndex, toIndex);
+								}
+								dndState.isDragging = false;
+								dndState.draggedItem = null;
+								dndState.sourceContainer = '';
+								dndState.targetContainer = null;
+								dndState.targetElement = null;
+								setTimeout(() => { dropProcessing = false; }, 50);
+							}
+						}
+					}}
+					animate:flip={{ duration: matchesReducedMotion ? 0 : 200 }}
+					data-slot="table-row"
+					data-state={row.getIsSelected() ? 'selected' : undefined}
+					class="hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors hover:bg-lavender-lighter/50 data-[state=selected]:bg-lavender-lighter/30 {i === totalRows - 1 ? 'border-b-0' : ''}"
+				>
+					<Table.Cell class="py-3 w-10">
+						<div class="flex items-center gap-1">
+							<div
+								use:draggable={{
+									container: i.toString(),
+									dragData: { index: i }
+								}}
+								class="text-muted-foreground hover:text-foreground cursor-grab"
+								role="button"
+								tabindex="0"
+								aria-label={`Drag to reorder, row ${i + 1} of ${totalRows}`}
+								aria-roledescription="draggable"
+							>
+								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="9" cy="12" r="1"/><circle cx="9" cy="5" r="1"/><circle cx="9" cy="19" r="1"/><circle cx="15" cy="12" r="1"/><circle cx="15" cy="5" r="1"/><circle cx="15" cy="19" r="1"/></svg>
+							</div>
+							<div class="flex flex-col">
+								{#if i > 0}
+									<button
+										type="button"
+										class="p-0.5 rounded text-muted-foreground hover:text-foreground"
+										aria-label={`Move up, row ${i + 1} of ${totalRows}`}
+										onclick={() => {
+											onReorder?.(i, i - 1);
+											liveRegionMessage = `Moved to position ${i} of ${totalRows}`;
+										}}
+									>
+										<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="m18 15-6-6-6 6"/></svg>
+									</button>
+								{/if}
+								{#if i < totalRows - 1}
+									<button
+										type="button"
+										class="p-0.5 rounded text-muted-foreground hover:text-foreground"
+										aria-label={`Move down, row ${i + 1} of ${totalRows}`}
+										onclick={() => {
+											onReorder?.(i, i + 1);
+											liveRegionMessage = `Moved to position ${i + 2} of ${totalRows}`;
+										}}
+									>
+										<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="m6 9 6 6 6-6"/></svg>
+									</button>
+								{/if}
+							</div>
+						</div>
 					</Table.Cell>
-				{/each}
-			</Table.Row>
+					{#each row.getVisibleCells() as cell (cell.id)}
+						<Table.Cell class="py-3">
+							<FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
+						</Table.Cell>
+					{/each}
+				</tr>
+			{:else}
+				<Table.Row>
+					<Table.Cell colspan={columns.length + 1} class="h-24 text-center text-muted-foreground">
+						{emptyMessage ?? defaultEmptyMessages[interfaceLanguage.current]}
+					</Table.Cell>
+				</Table.Row>
+			{/each}
 		{:else}
-			<Table.Row>
-				<Table.Cell colspan={columns.length} class="h-24 text-center text-muted-foreground">
-					{emptyMessage ?? defaultEmptyMessages[interfaceLanguage.current]}
-				</Table.Cell>
-			</Table.Row>
-		{/each}
+			{#each table.getRowModel().rows as row, i (row.id)}
+				<Table.Row
+					data-state={row.getIsSelected() && 'selected'}
+					class="hover:bg-lavender-lighter/50 data-[state=selected]:bg-lavender-lighter/30 {i === table.getRowModel().rows.length - 1 ? 'border-b-0' : ''}"
+				>
+					{#each row.getVisibleCells() as cell (cell.id)}
+						<Table.Cell class="py-3">
+							<FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
+						</Table.Cell>
+					{/each}
+				</Table.Row>
+			{:else}
+				<Table.Row>
+					<Table.Cell colspan={columns.length} class="h-24 text-center text-muted-foreground">
+						{emptyMessage ?? defaultEmptyMessages[interfaceLanguage.current]}
+					</Table.Cell>
+				</Table.Row>
+			{/each}
+		{/if}
 	</Table.Body>
 </Table.Root>

package/dist/admin/client/collection/data-table.svelte.d.ts

@@ -18,6 +18,8 @@ type DataTableProps<TData, TValue> = {
     pageCount?: number;
     rowCount?: number;
     emptyMessage?: string;
+    orderable?: boolean;
+    onReorder?: (fromIndex: number, toIndex: number) => void;
 };
 declare function $$render<TData, TValue>(): {
     props: DataTableProps<TData, TValue>;

package/dist/admin/components/fields/relation-field.svelte

@@ -82,16 +82,19 @@
 
 		untrack(() => {
 			loading = true;
-			Promise.all([
-				remotes.getCollection(collection),
-				remotes.getEntries({ slug: collection, language: currentLang })
-			]).then(([collectionConfig, entries]) => {
-				const options = entries.map((entry) => ({
-					label: getCollectionEntryLabel(entry, collectionConfig),
-					value: entry.id
-				}));
-				relationData = { collectionConfig, options };
-				loading = false;
+			remotes.getCollection(collection).then((collectionConfig) => {
+				const entriesParams: Record<string, unknown> = { slug: collection, language: currentLang };
+				if (collectionConfig.orderable) {
+					entriesParams.orderBy = { column: 'sortOrder', direction: 'asc' };
+				}
+				remotes.getEntries(entriesParams).then((entries) => {
+					const options = entries.map((entry) => ({
+						label: getCollectionEntryLabel(entry, collectionConfig),
+						value: entry.id
+					}));
+					relationData = { collectionConfig, options };
+					loading = false;
+				});
 			});
 		});
 	});

package/dist/admin/components/layout/nav-collections.svelte

@@ -12,7 +12,8 @@
 	const remotes = getRemotes();
 
 	function isActive(url: string) {
-		return page.url.pathname.startsWith(url);
+		const pathname = page.url.pathname;
+		return pathname === url || pathname.startsWith(url + '/');
 	}
 
 	async function loadCollections() {

package/dist/admin/components/layout/nav-forms.svelte

@@ -12,7 +12,8 @@
 	const remotes = getRemotes();
 
 	function isActive(url: string) {
-		return page.url.pathname.startsWith(url);
+		const pathname = page.url.pathname;
+		return pathname === url || pathname.startsWith(url + '/');
 	}
 
 	async function loadForms() {

package/dist/admin/components/layout/nav-singletons.svelte

@@ -12,7 +12,8 @@
 	const remotes = getRemotes();
 
 	function isActive(url: string) {
-		return page.url.pathname.startsWith(url);
+		const pathname = page.url.pathname;
+		return pathname === url || pathname.startsWith(url + '/');
 	}
 </script>
 

package/dist/admin/remote/entry.remote.d.ts

@@ -6,7 +6,7 @@ export declare const getRawEntries: import("@sveltejs/kit").RemoteQueryFunction<
     limit?: number | undefined;
     offset?: number | undefined;
     orderBy?: {
-        column: "createdAt" | "updatedAt";
+        column: "createdAt" | "updatedAt" | "sortOrder";
         direction: "asc" | "desc";
     } | undefined;
 }, {
@@ -20,6 +20,10 @@ export declare const getEntries: import("@sveltejs/kit").RemoteQueryFunction<{
     language?: string | undefined;
     status?: "draft" | "published" | "scheduled" | "archived" | undefined;
     slug?: string | undefined;
+    orderBy?: {
+        column: "createdAt" | "updatedAt" | "sortOrder";
+        direction: "asc" | "desc";
+    } | undefined;
 }, import("../../types/entries.js").Entry[]>;
 export declare const getEntry: import("@sveltejs/kit").RemoteQueryFunction<{
     id?: string | undefined;
@@ -53,11 +57,15 @@ export declare const updateEntryCommand: import("@sveltejs/kit").RemoteCommand<{
         publishedAt?: Date | null | undefined;
         publishedVersionId?: string | null | undefined;
         publishedBy?: string | null | undefined;
+        sortOrder?: number | null | undefined;
     };
 }, Promise<import("../../types/entries.js").DbEntry>>;
 export declare const archiveEntryCommand: import("@sveltejs/kit").RemoteCommand<string, Promise<import("../../types/entries.js").DbEntry>>;
 export declare const unarchiveEntryCommand: import("@sveltejs/kit").RemoteCommand<string, Promise<import("../../types/entries.js").DbEntry>>;
 export declare const deleteEntryCommand: import("@sveltejs/kit").RemoteCommand<string, Promise<void>>;
+export declare const reorderEntriesCommand: import("@sveltejs/kit").RemoteCommand<{
+    orderedIds: string[];
+}, Promise<void>>;
 export declare const getEntryVersion: import("@sveltejs/kit").RemoteQueryFunction<{
     id: string;
     language: string;

package/dist/admin/remote/entry.remote.js

@@ -14,7 +14,7 @@ export const getRawEntries = query(z.object({
     offset: z.number().int().nonnegative().optional(),
     orderBy: z
         .object({
-        column: z.enum(['createdAt', 'updatedAt']),
+        column: z.enum(['createdAt', 'updatedAt', 'sortOrder']),
         direction: z.enum(['asc', 'desc'])
     })
         .optional()
@@ -32,7 +32,13 @@ export const getEntries = query(z.object({
     dataLike: z.record(z.string(), z.unknown()).optional(),
     language: z.string().optional(),
     status: z.enum(entryStatuses).optional(),
-    slug: z.string().optional()
+    slug: z.string().optional(),
+    orderBy: z
+        .object({
+        column: z.enum(['createdAt', 'updatedAt', 'sortOrder']),
+        direction: z.enum(['asc', 'desc'])
+    })
+        .optional()
 }), async (input) => {
     return getEntriesOperation(input);
 });
@@ -172,6 +178,12 @@ export const deleteEntryCommand = command(z.string().uuid(), async (id) => {
     }
     return getCMS().databaseAdapter.deleteEntry({ id });
 });
+export const reorderEntriesCommand = command(z.object({
+    orderedIds: z.array(z.string().uuid())
+}), async ({ orderedIds }) => {
+    requireAuth();
+    await Promise.all(orderedIds.map((id, index) => updateEntry(id, { sortOrder: index })));
+});
 export const getEntryVersion = query(z.object({
     id: z.string().uuid(),
     language: z.string()

package/dist/cli/scaffold/admin.js

@@ -156,6 +156,14 @@ export * from 'includio-cms/admin/remote';
 import { createAdminApiHandler } from 'includio-cms/admin/api/handler';
 
 export const { GET, POST, PATCH, PUT, DELETE } = createAdminApiHandler();
+`
+        },
+        {
+            path: 'admin/api/rest/[...restPath]/+server.ts',
+            content: `${GENERATED_COMMENT_TS}
+import { createRestApiHandler } from 'includio-cms/admin/api/rest/handler';
+
+export const { GET, POST, PUT, DELETE } = createRestApiHandler();
 `
         }
     ];

package/dist/core/cms.d.ts

@@ -1,6 +1,6 @@
 import type { DatabaseAdapter } from '../types/adapters/db.js';
 import type { FilesAdapter } from '../types/adapters/files.js';
-import type { CMSConfig, ICMS, MediaConfig } from '../types/cms.js';
+import type { ApiKeyConfig, CMSConfig, ICMS, MediaConfig } from '../types/cms.js';
 import type { CollectionConfigWithType } from '../types/collections.js';
 import type { Language } from '../types/languages.js';
 import type { SingleConfigWithType } from '../types/singles.js';
@@ -22,6 +22,7 @@ export declare class CMS implements ICMS {
     languages: Language[];
     mediaConfig: MediaConfig;
     plugins: PluginConfig[];
+    apiKeys: ApiKeyConfig[];
     constructor(config: CMSConfig);
     getBySlug(slug: string): CollectionConfigWithType | SingleConfigWithType;
     getFormBySlug(slug: string): FormConfig;

package/dist/core/cms.js

@@ -11,6 +11,7 @@ export class CMS {
     languages;
     mediaConfig;
     plugins = [];
+    apiKeys = [];
     constructor(config) {
         this.config = config;
         this.databaseAdapter = config.db;
@@ -40,6 +41,7 @@ export class CMS {
             };
         });
         this.languages = config.languages || [];
+        this.apiKeys = config.apiKeys || [];
         if (config.plugins) {
             this.plugins = config.plugins;
         }

package/dist/core/server/entries/operations/get.js

@@ -161,7 +161,8 @@ export const getEntries = async (options = {}) => {
     // Get entries that match the slug/ids filter
     const dbEntries = await getCMS().databaseAdapter.getEntries({
         ids,
-        slug
+        slug,
+        orderBy: options.orderBy
     });
     if (dbEntries.length === 0) {
         return [];

package/dist/core/server/entries/operations/update.d.ts

@@ -6,6 +6,7 @@ export declare const updateEntrySchema: z.ZodObject<{
     publishedAt: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
     publishedVersionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     publishedBy: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    sortOrder: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, z.z.core.$strip>;
 export declare const updateEntry: (id: string, data: Partial<DbEntry>) => Promise<DbEntry>;
 export declare const updateEntryVersionSchema: z.ZodObject<{

package/dist/core/server/entries/operations/update.js

@@ -9,7 +9,8 @@ export const updateEntrySchema = z.object({
     archivedAt: z.date().nullable().optional(),
     publishedAt: z.date().nullable().optional(),
     publishedVersionId: z.string().uuid().nullable().optional(),
-    publishedBy: z.string().nullable().optional()
+    publishedBy: z.string().nullable().optional(),
+    sortOrder: z.number().int().nullable().optional()
 });
 export const updateEntry = async (id, data) => {
     const filteredDataParse = updateEntrySchema.safeParse(data);
@@ -33,6 +34,9 @@ export const updateEntry = async (id, data) => {
     if (filteredData.publishedBy !== undefined) {
         dataToUpdate.publishedBy = filteredData.publishedBy;
     }
+    if (filteredData.sortOrder !== undefined) {
+        dataToUpdate.sortOrder = filteredData.sortOrder;
+    }
     const updatedEntry = await getCMS().databaseAdapter.updateEntry({
         id,
         data: {

package/dist/db-postgres/schema/entry.d.ts

@@ -200,6 +200,23 @@ export declare const entriesTable: import("drizzle-orm/pg-core/table", { with: {
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        sortOrder: import("drizzle-orm/pg-core", { with: { "resolution-mode": "require" } }).PgColumn<{
+            name: "sort_order";
+            tableName: "entry";
+            dataType: "number";
+            columnType: "PgInteger";
+            data: number;
+            driverParam: string | number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
     };
     dialect: "pg";
 }>;

package/dist/db-postgres/schema/entry.js

@@ -1,4 +1,4 @@
-import { pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
+import { integer, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
 import { entryVersionsTable } from './entryVersion.js';
 export const entriesTable = pgTable('entry', {
     id: uuid('id').primaryKey().defaultRandom(),
@@ -12,5 +12,7 @@ export const entriesTable = pgTable('entry', {
     // Publish state
     publishedAt: timestamp('published_at'),
     publishedVersionId: uuid('published_version_id').references(() => entryVersionsTable.id, { onDelete: 'set null' }),
-    publishedBy: text('published_by')
+    publishedBy: text('published_by'),
+    // Manual ordering
+    sortOrder: integer('sort_order')
 });

package/dist/server/auth.d.ts

@@ -71,7 +71,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                 <AsResponse extends boolean = false, ReturnHeaders extends boolean = false>(inputCtx_0: {
                     body: {
                         userId: string;
-                        role: "user" | "admin" | ("user" | "admin")[];
+                        role: "admin" | "user" | ("admin" | "user")[];
                     };
                 } & {
                     method?: "POST" | undefined;
@@ -138,7 +138,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                         $Infer: {
                             body: {
                                 userId: string;
-                                role: "user" | "admin" | ("user" | "admin")[];
+                                role: "admin" | "user" | ("admin" | "user")[];
                             };
                         };
                     };
@@ -236,7 +236,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                         email: string;
                         password: string;
                         name: string;
-                        role?: "user" | "admin" | ("user" | "admin")[] | undefined;
+                        role?: "admin" | "user" | ("admin" | "user")[] | undefined;
                         data?: Record<string, any>;
                     };
                 } & {
@@ -302,7 +302,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                                 email: string;
                                 password: string;
                                 name: string;
-                                role?: "user" | "admin" | ("user" | "admin")[] | undefined;
+                                role?: "admin" | "user" | ("admin" | "user")[] | undefined;
                                 data?: Record<string, any>;
                             };
                         };
@@ -1184,7 +1184,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                         permission?: never;
                     }) & {
                         userId?: string;
-                        role?: "user" | "admin" | undefined;
+                        role?: "admin" | "user" | undefined;
                     };
                 } & {
                     method?: "POST" | undefined;
@@ -1287,7 +1287,7 @@ export declare const auth: import("better-auth", { with: { "resolution-mode": "r
                                 permission?: never;
                             }) & {
                                 userId?: string;
-                                role?: "user" | "admin" | undefined;
+                                role?: "admin" | "user" | undefined;
                             };
                         };
                     };