@kyro-cms/core 0.9.1 → 0.9.2

package/dist/{chunk-EJN2PAOE.js → chunk-V7KZQIZ6.js}

@@ -1,4 +1,4 @@
-import { AbstractBaseAdapter, applyRLS, DEFAULT_RLS_CONFIG, canAccessDocument } from './chunk-DYTZ6FQ7.js';
+import { AbstractBaseAdapter, applyRLS, DEFAULT_RLS_CONFIG, canAccessDocument } from './chunk-WXVB364T.js';
 import { sql, eq, desc, and, or, ne, inArray, like, gt, gte, lt, lte } from 'drizzle-orm';
 import { text, uuid, jsonb, timestamp, boolean, decimal, integer as integer$1, varchar, pgTable } from 'drizzle-orm/pg-core';
 import { text as text$1, integer, numeric, sqliteTable } from 'drizzle-orm/sqlite-core';
@@ -76,7 +76,7 @@ function collectionToDrizzleSchema(collection, dialect = "postgres") {
     lines.push(`  createdAt: pg.timestamp('created_at').defaultNow(),`);
     lines.push(`  updatedAt: pg.timestamp('updated_at').defaultNow(),`);
   }
-  lines.push(`  publishStatus: ${dialect === "sqlite" ? "sqlite" : "pg"}.varchar('publishStatus').default('draft'),`);
+  lines.push(`  status: ${dialect === "sqlite" ? "sqlite" : "pg"}.varchar('status').default('draft'),`);
   lines.push(`  hasDraft: ${dialect === "sqlite" ? "sqlite" : "pg"}.boolean('hasDraft').default(false),`);
   lines.push("});");
   return lines.join("\n");
@@ -86,7 +86,6 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
   schema;
   dialect;
   connectionString;
-  draftsTableReady = false;
   versionsTableReady = false;
   constructor(options) {
     super();
@@ -274,7 +273,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     if (!columns.createdAt) columns.createdAt = this.dialect === "sqlite" ? text$1("created_at").default((/* @__PURE__ */ new Date()).toISOString()) : timestamp("created_at").defaultNow();
     if (!columns.updatedAt) columns.updatedAt = this.dialect === "sqlite" ? text$1("updated_at").default((/* @__PURE__ */ new Date()).toISOString()) : timestamp("updated_at").defaultNow();
-    columns.publishStatus = this.dialect === "sqlite" ? text$1("publishStatus").default("draft") : varchar("publishStatus", { length: 20 }).default("draft");
+    columns.status = this.dialect === "sqlite" ? text$1("status").default("draft") : varchar("status", { length: 20 }).default("draft");
     columns.hasDraft = this.dialect === "sqlite" ? integer("hasDraft", { mode: "boolean" }).default(false) : boolean("hasDraft").default(false);
     return this.dialect === "sqlite" ? sqliteTable(tableName, columns) : pgTable(tableName, columns);
   }
@@ -294,7 +293,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
             ${colDefs}
             ${hasCreated ? "" : '"created_at" TIMESTAMP NOT NULL DEFAULT NOW(),'}
             ${hasUpdated ? "" : '"updated_at" TIMESTAMP NOT NULL DEFAULT NOW(),'}
-            "publishStatus" VARCHAR(20) DEFAULT 'draft',
+            "status" VARCHAR(20) DEFAULT 'draft',
             "hasDraft" BOOLEAN DEFAULT false
           )
         `);
@@ -306,7 +305,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
             ${colDefs}
             ${hasCreated ? "" : `"created_at" TEXT NOT NULL DEFAULT (datetime('now')),`}
             ${hasUpdated ? "" : `"updated_at" TEXT NOT NULL DEFAULT (datetime('now')),`}
-            "publishStatus" TEXT DEFAULT 'draft',
+            "status" TEXT DEFAULT 'draft',
             "hasDraft" INTEGER DEFAULT 0
           )
         `);
@@ -384,13 +383,13 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       defs["id"] = isGlobal ? '"id" TEXT PRIMARY KEY' : '"id" UUID PRIMARY KEY DEFAULT gen_random_uuid()';
       if (!hasCreated) defs["created_at"] = '"created_at" TIMESTAMP DEFAULT NULL';
       if (!hasUpdated) defs["updated_at"] = '"updated_at" TIMESTAMP DEFAULT NULL';
-      defs["publishStatus"] = '"publishStatus" VARCHAR(20) DEFAULT NULL';
+      defs["status"] = '"status" VARCHAR(20) DEFAULT NULL';
       defs["hasDraft"] = '"hasDraft" BOOLEAN DEFAULT NULL';
     } else {
       defs["id"] = '"id" TEXT PRIMARY KEY';
       if (!hasCreated) defs["created_at"] = '"created_at" TEXT DEFAULT NULL';
       if (!hasUpdated) defs["updated_at"] = '"updated_at" TEXT DEFAULT NULL';
-      defs["publishStatus"] = '"publishStatus" TEXT DEFAULT NULL';
+      defs["status"] = '"status" TEXT DEFAULT NULL';
       defs["hasDraft"] = '"hasDraft" INTEGER DEFAULT NULL';
     }
     for (const field of config.fields) {
@@ -517,11 +516,12 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       effectiveWhere = rlsQuery.where || {};
     }
     const filters = this.buildWhereClause(effectiveWhere, config, table, tenantID);
-    if (!draft && table.publishStatus) {
-      filters.push(eq(table.publishStatus, "published"));
+    if (!draft && table.status) {
+      filters.push(eq(table.status, "published"));
     }
     const sortOption = this.parseSort(sort);
-    const totalDocs = await this.count({ collection: slug, where: effectiveWhere, tenantID });
+    const countWhere = !draft && table.status ? { ...effectiveWhere, status: "published" } : effectiveWhere;
+    const totalDocs = await this.count({ collection: slug, where: countWhere, tenantID });
     const offset = (page - 1) * limit;
     let results = [];
     try {
@@ -541,16 +541,17 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     if (draft) {
       docs = await Promise.all(docs.map(async (doc) => {
-        if (doc.hasDraft) {
-          const versions = await this.findVersions({
-            collection: slug,
-            documentId: doc.id,
-            limit: 1,
-            sort: "-createdAt"
-          });
-          if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-            return { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
-          }
+        const versions = await this.executeRaw(sql`
+          SELECT * FROM kyro_versions
+          WHERE collection_slug = ${slug}
+          AND document_id = ${doc.id}
+          ORDER BY created_at DESC
+          LIMIT 1
+        `);
+        if (versions.length > 0) {
+          const ver = versions[0];
+          const versionData = typeof ver.data === "string" ? JSON.parse(ver.data) : ver.data;
+          return { ...doc, ...versionData, status: doc.status };
         }
         return doc;
       }));
@@ -572,20 +573,23 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     const conditions = [eq(table.id, id)];
     if (tenantID && table.tenantId) conditions.push(eq(table.tenantId, tenantID));
-    if (!draft && table.publishStatus) conditions.push(eq(table.publishStatus, "published"));
+    if (!draft && table.status) conditions.push(eq(table.status, "published"));
     const whereClause = conditions.length > 1 ? and(...conditions) : conditions[0];
     let allRows = await this.client.select().from(table).where(whereClause);
     if (allRows.length === 0) return null;
     let doc = this.processResult(allRows[0], config);
-    if (draft && doc.hasDraft) {
-      const versions = await this.findVersions({
-        collection: slug,
-        documentId: doc.id,
-        limit: 1,
-        sort: "-createdAt"
-      });
-      if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-        doc = { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
+    if (draft) {
+      const versions = await this.executeRaw(sql`
+        SELECT * FROM kyro_versions
+        WHERE collection_slug = ${slug}
+        AND document_id = ${doc.id}
+        ORDER BY created_at DESC
+        LIMIT 1
+      `);
+      if (versions.length > 0) {
+        const ver = versions[0];
+        const versionData = typeof ver.data === "string" ? JSON.parse(ver.data) : ver.data;
+        doc = { ...doc, ...versionData, status: doc.status };
       }
     }
     return doc;
@@ -656,21 +660,24 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       if (!globalConfig) throw new Error(`Global "${globalSlug}" not found`);
       const table = this.getTable(slug);
       let query = this.client.select().from(table);
-      if (!draft && table.publishStatus) {
-        query = query.where(eq(table.publishStatus, "published"));
+      if (!draft && table.status) {
+        query = query.where(eq(table.status, "published"));
       }
       const results = await query.limit(1);
       if (results.length === 0) return null;
       let doc = this.processResult(results[0], globalConfig);
-      if (draft && doc.hasDraft) {
-        const versions = await this.findVersions({
-          collection: slug,
-          documentId: globalSlug,
-          limit: 1,
-          sort: "-createdAt"
-        });
-        if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-          doc = { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
+      if (draft) {
+        const versions = await this.executeRaw(sql`
+          SELECT * FROM kyro_versions
+          WHERE collection_slug = ${slug}
+          AND document_id = ${globalSlug}
+          ORDER BY created_at DESC
+          LIMIT 1
+        `);
+        if (versions.length > 0) {
+          const ver = versions[0];
+          const versionData = typeof ver.data === "string" ? JSON.parse(ver.data) : ver.data;
+          doc = { ...doc, ...versionData, status: doc.status };
         }
       }
       return doc;
@@ -687,6 +694,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       FROM kyro_versions 
       WHERE collection_slug = ${slug} 
       AND document_id = ${documentId}
+      AND autosave = 0
       ${tenantID ? sql`AND tenant_id = ${tenantID}` : sql``}
     `);
     const totalDocs = parseInt(countResult[0]?.count || "0");
@@ -695,6 +703,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       FROM kyro_versions 
       WHERE collection_slug = ${slug} 
       AND document_id = ${documentId}
+      AND autosave = 0
       ${tenantID ? sql`AND tenant_id = ${tenantID}` : sql``}
       ORDER BY created_at DESC
       LIMIT ${limit}
@@ -726,28 +735,53 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
   }
   async createVersion(args) {
     await this.ensureVersionsTable();
-    const id = Math.random().toString(36).substring(2, 15);
     const now = (/* @__PURE__ */ new Date()).toISOString();
+    if (args.autosave) {
+      const existing = await this.executeRaw(sql`
+        SELECT * FROM kyro_versions
+        WHERE collection_slug = ${args.collection}
+        AND document_id = ${args.documentId}
+        AND autosave = 1
+        ${args.tenantID ? sql`AND tenant_id = ${args.tenantID}` : sql``}
+        LIMIT 1
+      `);
+      if (existing.length > 0) {
+        await this.executeRaw(sql`
+          UPDATE kyro_versions
+          SET data = ${JSON.stringify(args.data)},
+              status = ${args.status},
+              updated_at = ${now}
+          WHERE id = ${existing[0].id}
+        `);
+        return this.findVersionByID({ collection: args.collection, versionId: existing[0].id, tenantID: args.tenantID });
+      }
+    }
+    const id = Math.random().toString(36).substring(2, 15);
     await this.executeRaw(sql`
       INSERT INTO kyro_versions (
-        id, collection_slug, document_id, tenant_id, data, status, created_by, change_description, created_at, updated_at
+        id, collection_slug, document_id, tenant_id, data, status, autosave, created_by, change_description, created_at, updated_at
       ) VALUES (
         ${id}, ${args.collection}, ${args.documentId}, ${args.tenantID || null}, 
-        ${JSON.stringify(args.data)}, ${args.status}, ${args.createdBy || null}, 
+        ${JSON.stringify(args.data)}, ${args.status}, ${args.autosave ? 1 : 0}, ${args.createdBy || null}, 
         ${args.changeDescription || null}, ${now}, ${now}
       )
     `);
-    const config = this.getCollection(args.collection);
-    if (config.versions?.maxPerDoc) {
-      await this.deleteVersions({
-        collection: args.collection,
-        documentId: args.documentId,
-        keepLatest: config.versions.maxPerDoc,
-        tenantID: args.tenantID
-      });
+    if (!args.autosave) {
+      const config = this.getCollection(args.collection);
+      if (config.versions?.maxPerDoc) {
+        await this.deleteVersions({
+          collection: args.collection,
+          documentId: args.documentId,
+          keepLatest: config.versions.maxPerDoc,
+          tenantID: args.tenantID
+        });
+      }
     }
     return this.findVersionByID({ collection: args.collection, versionId: id, tenantID: args.tenantID });
   }
+  async updateLatestVersion(args) {
+    return this.createVersion({ ...args, autosave: true });
+  }
   async deleteVersions(args) {
     await this.ensureVersionsTable();
     if (args.keepLatest) {
@@ -755,6 +789,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
         SELECT id FROM kyro_versions
         WHERE collection_slug = ${args.collection}
         AND document_id = ${args.documentId}
+        AND autosave = 0
         ${args.tenantID ? sql`AND tenant_id = ${args.tenantID}` : sql``}
         ORDER BY created_at DESC
         LIMIT ${args.keepLatest}
@@ -765,6 +800,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
           DELETE FROM kyro_versions
           WHERE collection_slug = ${args.collection}
           AND document_id = ${args.documentId}
+          AND autosave = 0
           AND id NOT IN (${sql.join(keepIds.map((id) => sql`${id}`), sql`, `)})
         `);
       }
@@ -777,65 +813,6 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       `);
     }
   }
-  async findDraft(args) {
-    await this.ensureDraftsTable();
-    const draftId = this.getDraftId(args.collection, args.documentId, args.tenantID);
-    const rows = await this.executeRaw(sql`
-      SELECT *
-      FROM kyro_drafts
-      WHERE id = ${draftId}
-      LIMIT 1
-    `);
-    const row = rows[0];
-    return row ? this.rowToDraft(row) : null;
-  }
-  async upsertDraft(args) {
-    await this.ensureDraftsTable();
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const draftUpdatedAt = args.draftUpdatedAt || now;
-    const draftId = this.getDraftId(args.collection, args.documentId, args.tenantID);
-    const existing = await this.findDraft(args);
-    if (existing) {
-      await this.executeRaw(sql`
-        UPDATE kyro_drafts
-        SET
-          data = ${JSON.stringify(args.data)},
-          base_updated_at = ${args.baseUpdatedAt ?? null},
-          draft_updated_at = ${draftUpdatedAt},
-          updated_at = ${now}
-        WHERE id = ${draftId}
-      `);
-    } else {
-      await this.executeRaw(sql`
-        INSERT INTO kyro_drafts (
-          id, collection_slug, document_id, tenant_id, data, base_updated_at, draft_updated_at, created_at, updated_at
-        ) VALUES (
-          ${draftId},
-          ${args.collection},
-          ${args.documentId},
-          ${args.tenantID ?? null},
-          ${JSON.stringify(args.data)},
-          ${args.baseUpdatedAt ?? null},
-          ${draftUpdatedAt},
-          ${now},
-          ${now}
-        )
-      `);
-    }
-    const saved = await this.findDraft(args);
-    if (!saved) {
-      throw new Error("Failed to persist draft snapshot");
-    }
-    return saved;
-  }
-  async deleteDraft(args) {
-    await this.ensureDraftsTable();
-    const draftId = this.getDraftId(args.collection, args.documentId, args.tenantID);
-    await this.executeRaw(sql`
-      DELETE FROM kyro_drafts
-      WHERE id = ${draftId}
-    `);
-  }
   // ========================================================================
   // Helper Methods
   // ========================================================================
@@ -969,41 +946,6 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     return result;
   }
-  async ensureDraftsTable() {
-    if (this.draftsTableReady) return;
-    let createTableSQL;
-    if (this.dialect === "sqlite") {
-      createTableSQL = `
-        CREATE TABLE IF NOT EXISTS kyro_drafts (
-          id text PRIMARY KEY,
-          collection_slug text NOT NULL,
-          document_id text NOT NULL,
-          tenant_id text,
-          data text NOT NULL,
-          base_updated_at text,
-          draft_updated_at text NOT NULL,
-          created_at text DEFAULT (datetime('now')),
-          updated_at text DEFAULT (datetime('now'))
-        )
-      `;
-    } else {
-      createTableSQL = `
-        CREATE TABLE IF NOT EXISTS kyro_drafts (
-          id text PRIMARY KEY,
-          collection_slug text NOT NULL,
-          document_id text NOT NULL,
-          tenant_id text,
-          data text NOT NULL,
-          base_updated_at text,
-          draft_updated_at text NOT NULL,
-          created_at text NOT NULL,
-          updated_at text NOT NULL
-        )
-      `;
-    }
-    await this.executeRaw(sql.raw(createTableSQL));
-    this.draftsTableReady = true;
-  }
   async ensureVersionsTable() {
     if (this.versionsTableReady) return;
     let createTableSQL;
@@ -1016,6 +958,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
           tenant_id text,
           data text NOT NULL,
           status text NOT NULL DEFAULT 'draft',
+          autosave integer NOT NULL DEFAULT 0,
           created_by text,
           change_description text,
           created_at text DEFAULT (datetime('now')),
@@ -1031,6 +974,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
           tenant_id text,
           data text NOT NULL,
           status text NOT NULL,
+          autosave integer NOT NULL DEFAULT 0,
           created_by text,
           change_description text,
           created_at text NOT NULL,
@@ -1039,11 +983,16 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       `;
     }
     await this.executeRaw(sql.raw(createTableSQL));
+    try {
+      if (this.dialect === "postgres") {
+        await this.executeRaw(sql.raw(`ALTER TABLE kyro_versions ADD COLUMN IF NOT EXISTS autosave integer NOT NULL DEFAULT 0`));
+      } else {
+        await this.executeRaw(sql.raw(`ALTER TABLE kyro_versions ADD COLUMN autosave integer NOT NULL DEFAULT 0`));
+      }
+    } catch {
+    }
     this.versionsTableReady = true;
   }
-  getDraftId(collection, documentId, tenantID) {
-    return `${collection}::${documentId}::${tenantID || "global"}`;
-  }
   async executeRaw(query) {
     const result = await this.client.execute(query);
     if (Array.isArray(result)) {
@@ -1057,19 +1006,6 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     return [];
   }
-  rowToDraft(row) {
-    return {
-      id: String(row.id),
-      collection: row.collection_slug,
-      documentId: row.document_id,
-      tenantID: row.tenant_id ?? void 0,
-      data: row.data ? JSON.parse(row.data) : {},
-      baseUpdatedAt: row.base_updated_at ?? null,
-      draftUpdatedAt: row.draft_updated_at,
-      createdAt: row.created_at,
-      updatedAt: row.updated_at
-    };
-  }
 };
 function createDrizzleAdapter(options) {
   return new DrizzleAdapter(options);
@@ -1112,7 +1048,7 @@ async function runMigrations(_db, _dialect) {
   );
 }
 async function seedDefaultRoles(db) {
-  const { roles } = await import('./schema-6I5OFR4Z.js');
+  const { roles } = await import('./schema-FNNWEAAW.js');
   await db.insert(roles).values({
     name: "super_admin",
     level: 100,
@@ -1123,5 +1059,5 @@ async function seedDefaultRoles(db) {
 }
 
 export { DrizzleAdapter, collectionToDrizzleSchema, createDatabase, createDrizzleAdapter, fieldToDrizzleType, genId, runMigrations, seedDefaultRoles };
-//# sourceMappingURL=chunk-EJN2PAOE.js.map
-//# sourceMappingURL=chunk-EJN2PAOE.js.map
+//# sourceMappingURL=chunk-V7KZQIZ6.js.map
+//# sourceMappingURL=chunk-V7KZQIZ6.js.map