@kyro-cms/core 0.8.0 → 0.9.1

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

@@ -1,4 +1,4 @@
-import { AbstractBaseAdapter, applyRLS, DEFAULT_RLS_CONFIG, canAccessDocument } from './chunk-3ZFYL34R.js';
+import { AbstractBaseAdapter, applyRLS, DEFAULT_RLS_CONFIG, canAccessDocument } from './chunk-DYTZ6FQ7.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';
@@ -15,11 +15,13 @@ function fieldToDrizzleType(field, dialect = "postgres") {
     case "text":
     case "email":
     case "password":
-    case "textarea":
     case "color":
+      return dialect === "sqlite" ? "text" : "varchar";
+    case "textarea":
     case "code":
     case "markdown":
-      return dialect === "sqlite" ? "text" : "varchar";
+    case "secret":
+      return "text";
     case "number":
       return field.integer ? "integer" : "decimal";
     case "checkbox":
@@ -41,7 +43,7 @@ function fieldToDrizzleType(field, dialect = "postgres") {
     case "relationship":
       return dialect === "sqlite" ? "text" : "varchar";
     case "upload":
-      return dialect === "sqlite" ? "text" : "varchar";
+      return "jsonb";
     default:
       return "jsonb";
   }
@@ -74,8 +76,8 @@ function collectionToDrizzleSchema(collection, dialect = "postgres") {
     lines.push(`  createdAt: pg.timestamp('created_at').defaultNow(),`);
     lines.push(`  updatedAt: pg.timestamp('updated_at').defaultNow(),`);
   }
-  lines.push(`  _status: ${dialect === "sqlite" ? "sqlite" : "pg"}.varchar('_status').default('published'),`);
-  lines.push(`  _has_draft: ${dialect === "sqlite" ? "sqlite" : "pg"}.boolean('_has_draft').default(false),`);
+  lines.push(`  publishStatus: ${dialect === "sqlite" ? "sqlite" : "pg"}.varchar('publishStatus').default('draft'),`);
+  lines.push(`  hasDraft: ${dialect === "sqlite" ? "sqlite" : "pg"}.boolean('hasDraft').default(false),`);
   lines.push("});");
   return lines.join("\n");
 }
@@ -86,13 +88,6 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
   connectionString;
   draftsTableReady = false;
   versionsTableReady = false;
-  tenantContext;
-  setTenantContext(context) {
-    this.tenantContext = context;
-  }
-  getTenantContext() {
-    return this.tenantContext;
-  }
   constructor(options) {
     super();
     this.schema = options.schema || {};
@@ -119,6 +114,14 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     if (result.updatedAt && typeof result.updatedAt === "string") {
       result.updatedAt = new Date(result.updatedAt);
     }
+    for (const field of config.fields) {
+      if (field.type === "date" && field.name) {
+        const value = result[field.name];
+        if (value && typeof value === "string") {
+          result[field.name] = new Date(value);
+        }
+      }
+    }
     for (const field of config.fields) {
       const dbType = fieldToDrizzleType(field, this.dialect);
       const isJsonb = dbType === "jsonb";
@@ -147,6 +150,14 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
         }
       }
     }
+    for (const field of config.fields) {
+      if (field.name && result[field.name] === "") {
+        const dbType = fieldToDrizzleType(field, this.dialect);
+        if (dbType === "timestamp" || dbType === "jsonb" || dbType === "decimal" || dbType === "integer" || dbType === "numeric" || dbType === "boolean") {
+          result[field.name] = null;
+        }
+      }
+    }
     return result;
   }
   async connect() {
@@ -263,8 +274,8 @@ 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._status = this.dialect === "sqlite" ? text$1("_status").default("published") : varchar("_status", { length: 20 }).default("published");
-    columns._has_draft = this.dialect === "sqlite" ? integer("_has_draft", { mode: "boolean" }).default(false) : boolean("_has_draft").default(false);
+    columns.publishStatus = this.dialect === "sqlite" ? text$1("publishStatus").default("draft") : varchar("publishStatus", { 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);
   }
   async ensureCollectionTables(collections) {
@@ -283,8 +294,8 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
             ${colDefs}
             ${hasCreated ? "" : '"created_at" TIMESTAMP NOT NULL DEFAULT NOW(),'}
             ${hasUpdated ? "" : '"updated_at" TIMESTAMP NOT NULL DEFAULT NOW(),'}
-            "_status" VARCHAR(20) DEFAULT 'published',
-            "_has_draft" BOOLEAN DEFAULT false
+            "publishStatus" VARCHAR(20) DEFAULT 'draft',
+            "hasDraft" BOOLEAN DEFAULT false
           )
         `);
       } else {
@@ -295,8 +306,8 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
             ${colDefs}
             ${hasCreated ? "" : `"created_at" TEXT NOT NULL DEFAULT (datetime('now')),`}
             ${hasUpdated ? "" : `"updated_at" TEXT NOT NULL DEFAULT (datetime('now')),`}
-            "_status" TEXT DEFAULT 'published',
-            "_has_draft" INTEGER DEFAULT 0
+            "publishStatus" TEXT DEFAULT 'draft',
+            "hasDraft" INTEGER DEFAULT 0
           )
         `);
       }
@@ -310,6 +321,126 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
         }
       }
     }
+    for (const config of collections) {
+      const tableName = this.getTableName(config.slug);
+      if (tableName === "users" || tableName === "audit_logs") continue;
+      await this.syncTableColumns(config, tableName);
+    }
+  }
+  getColumnSqlDefinition(field, dialect) {
+    const dbType = fieldToDrizzleType(field, dialect);
+    const sqlName = field.name.replace(/-/g, "_").replace(/([A-Z])/g, "_$1").toLowerCase();
+    const sqlType = this.columnSqlType(dbType, dialect);
+    return `"${sqlName}" ${sqlType} DEFAULT NULL`;
+  }
+  columnSqlType(dbType, dialect) {
+    if (dialect === "sqlite") {
+      switch (dbType) {
+        case "varchar":
+          return "TEXT";
+        case "text":
+          return "TEXT";
+        case "integer":
+          return "INTEGER";
+        case "decimal":
+        case "numeric":
+          return "NUMERIC";
+        case "boolean":
+          return "INTEGER";
+        case "timestamp":
+          return "TEXT";
+        case "jsonb":
+          return "TEXT";
+        default:
+          return "TEXT";
+      }
+    }
+    switch (dbType) {
+      case "varchar":
+        return "VARCHAR(255)";
+      case "text":
+        return "TEXT";
+      case "integer":
+        return "INTEGER";
+      case "decimal":
+      case "numeric":
+        return "DECIMAL";
+      case "boolean":
+        return "BOOLEAN";
+      case "timestamp":
+        return "TIMESTAMP";
+      case "jsonb":
+        return "JSONB";
+      default:
+        return "TEXT";
+    }
+  }
+  getExpectedColumnDefs(config, tableName) {
+    const defs = {};
+    const isGlobal = config.slug.startsWith("_globals_");
+    const hasCreated = config.fields.some((f) => f.name === "createdAt");
+    const hasUpdated = config.fields.some((f) => f.name === "updatedAt");
+    if (this.dialect === "postgres") {
+      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["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["hasDraft"] = '"hasDraft" INTEGER DEFAULT NULL';
+    }
+    for (const field of config.fields) {
+      if (!field.name || field.name === "id") continue;
+      const def = this.getColumnSqlDefinition(field, this.dialect);
+      const sqlName = field.name.replace(/-/g, "_").replace(/([A-Z])/g, "_$1").toLowerCase();
+      defs[sqlName] = def;
+    }
+    return defs;
+  }
+  async syncTableColumns(config, tableName) {
+    let existingCols;
+    try {
+      if (this.dialect === "postgres") {
+        const result = await this.client.execute(
+          sql`SELECT column_name, data_type, character_maximum_length FROM information_schema.columns WHERE table_name = ${tableName}`
+        );
+        existingCols = new Map(result.map((r) => [r.column_name, { type: r.data_type, maxLen: r.character_maximum_length }]));
+      } else {
+        const result = await this.client.execute(
+          sql`PRAGMA table_info("${sql.raw(tableName)}")`
+        );
+        existingCols = new Map(result.map((r) => [r.name, { type: r.type, maxLen: null }]));
+      }
+    } catch {
+      return;
+    }
+    const expected = this.getExpectedColumnDefs(config, tableName);
+    const missing = Object.keys(expected).filter((k) => !existingCols.has(k));
+    if (missing.length > 0) {
+      const alterStmts = missing.map((k) => `ALTER TABLE "${tableName}" ADD COLUMN ${expected[k]}`);
+      await this.executeRaw(sql.raw(alterStmts.join(";\n")));
+    }
+    if (this.dialect === "postgres") {
+      for (const field of config.fields) {
+        if (!field.name || field.name === "id") continue;
+        const expectedDbType = fieldToDrizzleType(field, this.dialect);
+        const sqlName = field.name.replace(/-/g, "_").replace(/([A-Z])/g, "_$1").toLowerCase();
+        const info = existingCols.get(sqlName);
+        if (!info || info.type !== "character varying") continue;
+        if (expectedDbType === "text") {
+          await this.executeRaw(sql.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "${sqlName}" TYPE TEXT`));
+          console.log(`[DrizzleAdapter] Fixed column type: "${tableName}"."${sqlName}" VARCHAR \u2192 TEXT`);
+        } else if (expectedDbType === "jsonb") {
+          await this.executeRaw(sql.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "${sqlName}" DROP DEFAULT`));
+          await this.executeRaw(sql.raw(`ALTER TABLE "${tableName}" ALTER COLUMN "${sqlName}" TYPE JSONB USING (CASE WHEN "${sqlName}" IS NULL THEN NULL WHEN "${sqlName}"::text ~ '^\\s*\\{' THEN "${sqlName}"::jsonb ELSE jsonb_build_object('id', "${sqlName}"::text) END)`));
+          console.log(`[DrizzleAdapter] Fixed column type: "${tableName}"."${sqlName}" VARCHAR \u2192 JSONB`);
+        }
+      }
+    }
   }
   generateCreateColumns(config) {
     const cols = [];
@@ -386,8 +517,8 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       effectiveWhere = rlsQuery.where || {};
     }
     const filters = this.buildWhereClause(effectiveWhere, config, table, tenantID);
-    if (!draft && table._status) {
-      filters.push(eq(table._status, "published"));
+    if (!draft && table.publishStatus) {
+      filters.push(eq(table.publishStatus, "published"));
     }
     const sortOption = this.parseSort(sort);
     const totalDocs = await this.count({ collection: slug, where: effectiveWhere, tenantID });
@@ -410,7 +541,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     if (draft) {
       docs = await Promise.all(docs.map(async (doc) => {
-        if (doc._has_draft) {
+        if (doc.hasDraft) {
           const versions = await this.findVersions({
             collection: slug,
             documentId: doc.id,
@@ -418,7 +549,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
             sort: "-createdAt"
           });
           if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-            return { ...doc, ...versions.docs[0].data, _has_draft: true, _status: doc._status };
+            return { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
           }
         }
         return doc;
@@ -441,12 +572,12 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     }
     const conditions = [eq(table.id, id)];
     if (tenantID && table.tenantId) conditions.push(eq(table.tenantId, tenantID));
-    if (!draft && table._status) conditions.push(eq(table._status, "published"));
+    if (!draft && table.publishStatus) conditions.push(eq(table.publishStatus, "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._has_draft) {
+    if (draft && doc.hasDraft) {
       const versions = await this.findVersions({
         collection: slug,
         documentId: doc.id,
@@ -454,7 +585,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
         sort: "-createdAt"
       });
       if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-        doc = { ...doc, ...versions.docs[0].data, _has_draft: true, _status: doc._status };
+        doc = { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
       }
     }
     return doc;
@@ -475,21 +606,27 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     const config = this.getCollection(slug);
     const table = this.getTable(slug);
     const updateData = this.prepareData(data, config);
-    if (tenantID) {
-      updateData.tenantId = tenantID;
+    delete updateData.id;
+    console.log(`[DrizzleAdapter.update] CALLED for ${slug}/${id}`);
+    const conditions = [eq(table.id, id)];
+    if (tenantID && table.tenantId) {
+      conditions.push(eq(table.tenantId, tenantID));
+    }
+    const result = await this.client.update(table).set(updateData).where(and(...conditions)).returning();
+    if (result.length === 0) {
+      throw new Error(`Document not found: ${slug}/${id}`);
     }
-    const result = await this.client.update(table).set(updateData).where(eq(table.id, id)).returning();
     return this.processResult(result[0], config);
   }
   async delete(args) {
     const { collection: slug, id, tenantID } = args;
     const config = this.getCollection(slug);
     const table = this.getTable(slug);
-    let query = this.client.delete(table).where(eq(table.id, id)).returning();
+    const conditions = [eq(table.id, id)];
     if (tenantID && table.tenantId) {
-      query = query.where(eq(table.tenantId, tenantID));
+      conditions.push(eq(table.tenantId, tenantID));
     }
-    const result = await query;
+    const result = await this.client.delete(table).where(and(...conditions)).returning();
     if (result.length === 0) {
       throw new Error(`Document not found: ${slug}/${id}`);
     }
@@ -519,13 +656,13 @@ 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._status) {
-        query = query.where(eq(table._status, "published"));
+      if (!draft && table.publishStatus) {
+        query = query.where(eq(table.publishStatus, "published"));
       }
       const results = await query.limit(1);
       if (results.length === 0) return null;
       let doc = this.processResult(results[0], globalConfig);
-      if (draft && doc._has_draft) {
+      if (draft && doc.hasDraft) {
         const versions = await this.findVersions({
           collection: slug,
           documentId: globalSlug,
@@ -533,7 +670,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
           sort: "-createdAt"
         });
         if (versions.docs.length > 0 && versions.docs[0].status === "draft") {
-          doc = { ...doc, ...versions.docs[0].data, _has_draft: true, _status: doc._status };
+          doc = { ...doc, ...versions.docs[0].data, hasDraft: true, publishStatus: doc.publishStatus };
         }
       }
       return doc;
@@ -772,6 +909,22 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
       }
       if (field.type === "tabs" && "tabs" in field && field.name) {
         if (typeof result[field.name] === "object" && result[field.name] !== null && !Array.isArray(result[field.name])) {
+          for (const tab of field.tabs) {
+            for (const tabField of tab.fields) {
+              if ((tabField.type === "upload" || tabField.type === "image") && tabField.name) {
+                const val = result[field.name][tabField.name];
+                if (typeof val === "string") {
+                  try {
+                    const parsed = JSON.parse(val);
+                    result[field.name][tabField.name] = Array.isArray(parsed) ? parsed.map((item) => item && typeof item === "object" && typeof item.id === "string" ? item.id : String(item || "")) : typeof parsed.id === "string" ? parsed.id : String(parsed.id || "");
+                  } catch {
+                  }
+                } else if (val && typeof val === "object") {
+                  result[field.name][tabField.name] = Array.isArray(val) ? val.map((item) => item && typeof item === "object" && typeof item.id === "string" ? item.id : String(item || "")) : typeof val.id === "string" ? val.id : String(val.id || "");
+                }
+              }
+            }
+          }
           continue;
         }
         if (typeof result[field.name] === "string") {
@@ -796,6 +949,9 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
                   } catch {
                   }
                 }
+                if ((tabField.type === "upload" || tabField.type === "image") && value && typeof value === "object") {
+                  value = Array.isArray(value) ? value.map((item) => item && typeof item === "object" && typeof item.id === "string" ? item.id : String(item || "")) : typeof value.id === "string" ? value.id : String(value.id || "");
+                }
               }
               tabData[tabField.name] = value;
               delete result[tabField.name];
@@ -814,7 +970,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     return result;
   }
   async ensureDraftsTable() {
-    if (_schemaEnsured || this.draftsTableReady) return;
+    if (this.draftsTableReady) return;
     let createTableSQL;
     if (this.dialect === "sqlite") {
       createTableSQL = `
@@ -849,7 +1005,7 @@ var DrizzleAdapter = class extends AbstractBaseAdapter {
     this.draftsTableReady = true;
   }
   async ensureVersionsTable() {
-    if (_schemaEnsured || this.versionsTableReady) return;
+    if (this.versionsTableReady) return;
     let createTableSQL;
     if (this.dialect === "sqlite") {
       createTableSQL = `
@@ -956,7 +1112,7 @@ async function runMigrations(_db, _dialect) {
   );
 }
 async function seedDefaultRoles(db) {
-  const { roles } = await import('./schema-5PHL5IVB.js');
+  const { roles } = await import('./schema-6I5OFR4Z.js');
   await db.insert(roles).values({
     name: "super_admin",
     level: 100,
@@ -967,5 +1123,5 @@ async function seedDefaultRoles(db) {
 }
 
 export { DrizzleAdapter, collectionToDrizzleSchema, createDatabase, createDrizzleAdapter, fieldToDrizzleType, genId, runMigrations, seedDefaultRoles };
-//# sourceMappingURL=chunk-QPPDLRNR.js.map
-//# sourceMappingURL=chunk-QPPDLRNR.js.map
+//# sourceMappingURL=chunk-EJN2PAOE.js.map
+//# sourceMappingURL=chunk-EJN2PAOE.js.map