@sonicjs-cms/core 3.0.0-beta.23 → 3.0.0-beta.24

package/dist/{chunk-SK5CHFJP.js → chunk-VC5XVPLM.js}

@@ -1,18 +1,18 @@
 import { isFirstUserRegistration, isRegistrationEnabled, authValidationService } from './chunk-VVYVFCML.js';
 import { renderDocumentFormPage, renderAlert } from './chunk-BHND5PEV.js';
 import { getCacheService, CACHE_CONFIGS, SettingsService, getLogger, getAppInstance, buildRouteList, CATEGORY_INFO } from './chunk-2XAQTPAE.js';
-import { DocumentTypeRegistry, requireAuth, requireRole, optionalAuth, isPluginActive, rateLimit, AuthManager, getJwtExpirySecondsFromDb, getJwtRefreshGraceSecondsFromDb, logActivity, generateCsrfToken } from './chunk-DIBCKCUE.js';
+import { DocumentTypeRegistry, requireAuth, requireRole, optionalAuth, isPluginActive, rateLimit, AuthManager, getJwtExpirySecondsFromDb, getJwtRefreshGraceSecondsFromDb, logActivity, generateCsrfToken } from './chunk-FHPEM77Y.js';
 import { DocumentsService, documentSecondsToMs, RbacService } from './chunk-3TMTYJAJ.js';
 import { nanoid } from './chunk-UWUP2VMT.js';
-import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-KS24NPPL.js';
-import { MigrationService } from './chunk-A46IRC5A.js';
+import { getCollectionRegistry, collectionRecordToRow, loadCollectionConfigs, getVisibleCollections, PluginService, PLUGIN_REGISTRY, findPluginByCodeName, isCodeCollectionInternal, isDbDocTypeInternal, invalidateTenantCache } from './chunk-RJ2O5IIE.js';
+import { MigrationService } from './chunk-UIHIXTIS.js';
 import { renderCheckboxPage, renderAlert as renderAlert$1, renderTable, renderPagination, renderConfirmationDialog, getConfirmationDialogScript, renderAdminLayout, adminLayoutV2, renderForm } from './chunk-BJROXF4N.js';
 import { init_admin_layout_catalyst_template, renderAdminLayoutCatalyst } from './chunk-THFZSDIU.js';
-import { createServiceSingleton, definePlugin, getPluginDefinition, applySchemaDefaults, renderSchemaFields, parseFormDataToSettings, getPluginMenu } from './chunk-2MIYYAO4.js';
+import { createServiceSingleton, definePlugin, getPluginDefinition, applySchemaDefaults, renderSchemaFields, parseFormDataToSettings, getPluginMenu } from './chunk-VGEZNFWH.js';
 import { hasHookSystem, getTypedHooks } from './chunk-RNZFGN4R.js';
 import { QueryFilterBuilder, getBlocksFieldConfig, parseBlocksValue } from './chunk-QZGABF2M.js';
 import { metricsTracker } from './chunk-FICTAGD4.js';
-import { getCoreVersion } from './chunk-DPLJYTHE.js';
+import { getCoreVersion } from './chunk-LNI3FYSI.js';
 import { escapeHtml, sanitizeRichText, sanitizeInput } from './chunk-TQABQWOP.js';
 import { Hono } from 'hono';
 import { z } from 'zod';
@@ -149,6 +149,18 @@ var DocumentRepository = class {
     const row = await this.db.prepare("SELECT * FROM documents WHERE root_id = ? AND tenant_id = ? AND is_published = 1").bind(rootId, this.tenantId).first();
     return row ? rowToDocument(row) : null;
   }
+  // Slug lookup for a single doc. Prefer the published row; fall back to the current
+  // draft so a never-published doc is still reachable by slug (matches getById, which
+  // resolves drafts too). ORDER BY makes the preference deterministic when both exist.
+  async getBySlug(typeId, slug) {
+    const row = await this.db.prepare(
+      `SELECT * FROM documents
+         WHERE tenant_id = ? AND type_id = ? AND slug = ? AND deleted_at IS NULL
+           AND (is_published = 1 OR is_current_draft = 1)
+         ORDER BY is_published DESC LIMIT 1`
+    ).bind(this.tenantId, typeId, slug).first();
+    return row ? rowToDocument(row) : null;
+  }
   // Unified, tenant-scoped list with optional generated-column / facet filters and sort. This is the
   // single place document list SQL is built — route handlers must call this, never inline SQL (R4).
   async list(opts = {}) {
@@ -3399,7 +3411,7 @@ adminApiRoutes.patch("/collections/:id", collectionsReadOnly);
 adminApiRoutes.delete("/collections/:id", collectionsReadOnly);
 adminApiRoutes.get("/migrations/status", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-XQ6EX6HX.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-Z6D27NAW.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const status = await migrationService.getMigrationStatus();
@@ -3442,7 +3454,7 @@ adminApiRoutes.post("/migrations/run", async (c) => {
 });
 adminApiRoutes.get("/migrations/validate", async (c) => {
   try {
-    const { MigrationService: MigrationService2 } = await import('./migrations-XQ6EX6HX.js');
+    const { MigrationService: MigrationService2 } = await import('./migrations-Z6D27NAW.js');
     const db = c.env.DB;
     const migrationService = new MigrationService2(db);
     const validation = await migrationService.validateSchema();
@@ -9008,20 +9020,20 @@ function renderContentFormPage(data, opts) {
               <dl class="space-y-3 text-sm">
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Created</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.created_at ? new Date(data.created_at).toLocaleDateString() : "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.created_at ? new Date(data.created_at * 1e3).toLocaleDateString() : "Unknown"}</dd>
                 </div>
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Last Modified</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.updated_at ? new Date(data.updated_at).toLocaleDateString() : "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.updated_at ? new Date(data.updated_at * 1e3).toLocaleDateString() : "Unknown"}</dd>
                 </div>
                 <div>
                   <dt class="text-zinc-500 dark:text-zinc-400">Author</dt>
-                  <dd class="mt-1 text-zinc-950 dark:text-white">${data.data?.author || "Unknown"}</dd>
+                  <dd class="mt-1 text-zinc-950 dark:text-white">${escapeHtml(String(data.data?.author || data.author_name || "Unknown"))}</dd>
                 </div>
                 ${data.published_at ? `
                   <div>
                     <dt class="text-zinc-500 dark:text-zinc-400">Published</dt>
-                    <dd class="mt-1 text-zinc-950 dark:text-white">${new Date(data.published_at).toLocaleDateString()}</dd>
+                    <dd class="mt-1 text-zinc-950 dark:text-white">${new Date(data.published_at * 1e3).toLocaleDateString()}</dd>
                   </div>
                 ` : ""}
               </dl>
@@ -11623,6 +11635,14 @@ adminContentRoutes.get("/", async (c) => {
       docSql += " ORDER BY updated_at DESC LIMIT ? OFFSET ?";
       docParams.push(limit, offset);
       const { results: docRows } = await db.prepare(docSql).bind(...docParams).all();
+      const docUserIds = [...new Set((docRows ?? []).map((r) => r.created_by).filter(Boolean))];
+      const docAuthorMap = {};
+      for (let i = 0; i < docUserIds.length; i += 99) {
+        const chunk = docUserIds.slice(i, i + 99);
+        const ph = chunk.map(() => "?").join(",");
+        const { results: uRows } = await db.prepare(`SELECT id, email FROM auth_user WHERE id IN (${ph})`).bind(...chunk).all();
+        for (const u of uRows ?? []) docAuthorMap[u.id] = u.email;
+      }
       const statusBadgeCss = {
         published: "bg-green-50 dark:bg-green-500/10 text-green-700 dark:text-green-400 ring-1 ring-inset ring-green-600/20 dark:ring-green-500/20",
         draft: "bg-zinc-50 dark:bg-zinc-500/10 text-zinc-700 dark:text-zinc-400 ring-1 ring-inset ring-zinc-600/20 dark:ring-zinc-500/20"
@@ -11639,7 +11659,7 @@ adminContentRoutes.get("/", async (c) => {
           slug: row.slug || "",
           modelName: docType?.displayName ?? typeId,
           statusBadge: `<span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ${css}">${label}</span>`,
-          authorName: row.created_by || "System",
+          authorName: (row.created_by ? docAuthorMap[row.created_by] ?? row.created_by : null) || "System",
           // Document timestamps are stored in SECONDS (documents.ts), unlike legacy content rows which
           // store MILLISECONDS — hence the *1000 here (D23).
           formattedDate: new Date((row.updated_at ?? 0) * 1e3).toLocaleDateString(),
@@ -11687,8 +11707,8 @@ adminContentRoutes.get("/", async (c) => {
         SELECT d.root_id AS id, d.title AS title, d.slug AS slug,
                CASE WHEN d.is_published = 1 THEN 'published' ELSE 'draft' END AS status,
                d.updated_at * 1000 AS updated_at,
-               dt.display_name AS cdisplay, COALESCE(d.created_by, 'System') AS author_label
-        FROM documents d JOIN document_types dt ON dt.id = d.type_id
+               dt.display_name AS cdisplay, COALESCE(u.email, d.created_by, 'System') AS author_label
+        FROM documents d JOIN document_types dt ON dt.id = d.type_id LEFT JOIN auth_user u ON u.id = d.created_by
         WHERE ${docConds.join(" AND ")}
         ORDER BY updated_at DESC LIMIT ? OFFSET ?`;
       const { results: unionRows } = await db.prepare(unionSql).bind(...docParams, limit, offset).all();
@@ -12029,6 +12049,13 @@ adminContentRoutes.get("/:id/edit", async (c) => {
       if (docType && dcoll) {
         const fields2 = await getCollectionFields(db, dcoll.id);
         const flags = await loadContentEditorFlags(db);
+        let authorName;
+        if (docRow.created_by) {
+          const authorRow = await db.prepare("SELECT name, first_name, last_name, email FROM auth_user WHERE id = ?").bind(docRow.created_by).first();
+          if (authorRow) {
+            authorName = authorRow.name || [authorRow.first_name, authorRow.last_name].filter(Boolean).join(" ") || authorRow.email;
+          }
+        }
         const formData2 = {
           id: docRow.root_id,
           title: docRow.title,
@@ -12043,6 +12070,7 @@ adminContentRoutes.get("/:id/edit", async (c) => {
           isEdit: true,
           referrerParams,
           versioningEnabled: docType?.settings?.versioning === true,
+          author_name: authorName,
           user: user ? { name: user.email, email: user.email, role: user.role } : void 0,
           version: c.get("appVersion"),
           ...flags
@@ -12202,6 +12230,7 @@ adminContentRoutes.post("/", async (c) => {
     const fields = await getCollectionFields(db, collectionId);
     const { data, errors } = extractFieldData(fields, formData);
     if (Object.keys(errors).length > 0) {
+      const flags = await loadContentEditorFlags(db);
       const formDataWithErrors = {
         collection,
         fields,
@@ -12212,7 +12241,8 @@ adminContentRoutes.post("/", async (c) => {
           name: user.email,
           email: user.email,
           role: user.role
-        } : void 0
+        } : void 0,
+        ...flags
       };
       if (c.req.header("HX-Request") === "true") {
         c.header("HX-Retarget", "#content-form-page");
@@ -12393,6 +12423,7 @@ adminContentRoutes.put("/:id", async (c) => {
     const fields = await getCollectionFields(db, existingContent.collection_id);
     const { data, errors } = extractFieldData(fields, formData);
     if (Object.keys(errors).length > 0) {
+      const flags = await loadContentEditorFlags(db);
       const formDataWithErrors = {
         id,
         collection,
@@ -12405,7 +12436,8 @@ adminContentRoutes.put("/:id", async (c) => {
           name: user.email,
           email: user.email,
           role: user.role
-        } : void 0
+        } : void 0,
+        ...flags
       };
       if (c.req.header("HX-Request") === "true") {
         c.header("HX-Retarget", "#content-form-page");
@@ -13076,7 +13108,7 @@ adminContentRoutes.get("/documents/:typeId/:rootId/versions", async (c) => {
   const docType = await registry.findById(typeId);
   if (!docType) return c.html("<div>Unknown type.</div>", 404);
   const result = await db.prepare(
-    "SELECT id, version_number, is_current_draft, is_published, status, updated_at, created_by FROM documents WHERE root_id = ? AND tenant_id = ? ORDER BY version_number DESC LIMIT 50"
+    "SELECT d.id, d.version_number, d.is_current_draft, d.is_published, d.status, d.updated_at, COALESCE(u.email, d.created_by) AS created_by FROM documents d LEFT JOIN auth_user u ON u.id = d.created_by WHERE d.root_id = ? AND d.tenant_id = ? ORDER BY d.version_number DESC LIMIT 50"
   ).bind(rootId, reqTenant(c)).all();
   const versions = (result.results ?? []).map((r) => ({
     id: r.id,
@@ -27084,6 +27116,6 @@ var ROUTES_INFO = {
   reference: "https://github.com/sonicjs/sonicjs"
 };
 
-export { DocumentRepository, ROUTES_INFO, TenantService, VALID_MEMBER_ROLES, adminCheckboxRoutes, adminCollectionsRoutes, adminDocumentsRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_content_default, apiDocumentsRoutes, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, createDocumentSchema, createUserProfilesPlugin, defineUserProfile, denyIfNotAllowed, dispatchHookEvent, getConfirmationDialogScript2 as getConfirmationDialogScript, getCustomData, getEmailService, getUserProfileConfig, getVariablesCached, hasEmailService, invalidateVariablesCache, isValidMemberRole, lexicalEditorPlugin, reconcileMenuFromPlugins, renderConfirmationDialog2 as renderConfirmationDialog, renderTable2 as renderTable, resolveDocScope, resolveVariablesInObject, router, router2, setEmailService, setVariablesCache, test_cleanup_default, userProfilesPlugin, userRoutes };
-//# sourceMappingURL=chunk-SK5CHFJP.js.map
-//# sourceMappingURL=chunk-SK5CHFJP.js.map
+export { DocumentRepository, ROUTES_INFO, TenantService, VALID_MEMBER_ROLES, adminCheckboxRoutes, adminCollectionsRoutes, adminDocumentsRoutes, adminLogsRoutes, adminMediaRoutes, adminPluginRoutes, adminSettingsRoutes, admin_api_default, admin_content_default, apiDocumentsRoutes, api_content_crud_default, api_default, api_media_default, api_system_default, auth_default, createDocumentSchema, createUserProfilesPlugin, defineUserProfile, denyIfNotAllowed, dispatchHookEvent, effectiveTenantForType, getConfirmationDialogScript2 as getConfirmationDialogScript, getCustomData, getDocumentRequestContext, getEmailService, getUserProfileConfig, getVariablesCached, hasEmailService, invalidateVariablesCache, isValidMemberRole, lexicalEditorPlugin, reconcileMenuFromPlugins, renderConfirmationDialog2 as renderConfirmationDialog, renderTable2 as renderTable, resolveDocScope, resolveVariablesInObject, router, router2, setEmailService, setVariablesCache, test_cleanup_default, updateDocumentSchema, userProfilesPlugin, userRoutes };
+//# sourceMappingURL=chunk-VC5XVPLM.js.map
+//# sourceMappingURL=chunk-VC5XVPLM.js.map