opacacms 0.2.1 → 0.3.1

package/dist/chunk-mp2gt9yh.js

@@ -0,0 +1,237 @@
+import {
+  require_picocolors
+} from "./chunk-rwqwsanx.js";
+import {
+  Ct,
+  Nt,
+  R,
+  Vt,
+  Zt
+} from "./chunk-ec4jhybj.js";
+import {
+  defineCommand
+} from "./chunk-1qm0m8r8.js";
+import {
+  __toESM
+} from "./chunk-6bywt602.js";
+
+// src/cli/commands/generate.ts
+import fs2 from "node:fs";
+import { resolve as resolve2 } from "node:path";
+var import_picocolors = __toESM(require_picocolors(), 1);
+
+// src/cli/core/types/generate-types.ts
+import fs from "node:fs";
+import { resolve } from "node:path";
+async function generateTypesCommand(url, token, out) {
+  console.log(`[OpacaCMS] Fetching metadata from ${url}/api/__admin/metadata...`);
+  let data;
+  try {
+    const res = await fetch(`${url.replace(/\/$/, "")}/api/__admin/metadata`, {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    });
+    if (!res.ok) {
+      if (res.status === 401 || res.status === 403) {
+        throw new Error("Authentication failed. Ensure your API Key is correct and has the necessary permissions.");
+      }
+      const errorText = await res.text().catch(() => "Unknown error");
+      throw new Error(`Server responded with ${res.status}: ${errorText}`);
+    }
+    data = await res.json();
+  } catch (err) {
+    console.error(`[OpacaCMS] Failed to fetch metadata: ${err.message}`);
+    process.exit(1);
+  }
+  console.log(`[OpacaCMS] Successfully fetched metadata for ${data.collections.length} collections and ${data.globals?.length || 0} globals.`);
+  let dtsContent = `// Automatically generated by OpacaCMS CLI
+// Do not edit this file manually
+
+export interface OpacaAsset {
+  assetId: string;
+  url: string;
+  filename: string;
+  mime_type: string;
+  filesize: number;
+  meta?: Record<string, any>;
+}
+
+export interface OpacaCollections {
+  collections: {
+`;
+  for (const collection of data.collections) {
+    dtsContent += `    "${collection.slug}": {
+`;
+    dtsContent += `      id: string | number;
+`;
+    for (const field of collection.fields) {
+      const typeStr = mapFieldToTsType(field.type);
+      const isOptional = field.required ? "" : "?";
+      dtsContent += `      ${field.name}${isOptional}: ${typeStr};
+`;
+    }
+    if (collection.timestamps) {
+      dtsContent += `      createdAt: string;
+`;
+      dtsContent += `      updatedAt: string;
+`;
+    }
+    dtsContent += `    };
+`;
+  }
+  dtsContent += `  };
+`;
+  if (data.globals && data.globals.length > 0) {
+    dtsContent += `  globals: {
+`;
+    for (const globalConf of data.globals) {
+      dtsContent += `    "${globalConf.slug}": {
+`;
+      for (const field of globalConf.fields) {
+        const typeStr = mapFieldToTsType(field.type);
+        const isOptional = field.required ? "" : "?";
+        dtsContent += `      ${field.name}${isOptional}: ${typeStr};
+`;
+      }
+      dtsContent += `    };
+`;
+    }
+    dtsContent += `  };
+`;
+  } else {
+    dtsContent += `  globals: Record<string, any>;
+`;
+  }
+  dtsContent += `}
+`;
+  const outputPath = resolve(process.cwd(), out || "opaca.d.ts");
+  fs.writeFileSync(outputPath, dtsContent);
+  console.log(`[OpacaCMS] Types successfully generated at ${outputPath}`);
+}
+function mapFieldToTsType(type) {
+  switch (type) {
+    case "text":
+    case "textarea":
+    case "richtext":
+    case "select":
+    case "date":
+      return "string";
+    case "number":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "json":
+      return "any | any[]";
+    case "file":
+      return "OpacaAsset";
+    case "relationship":
+      return "string | number | any";
+    default:
+      return "any";
+  }
+}
+
+// src/cli/commands/generate.ts
+var generate_default = defineCommand({
+  meta: {
+    name: "generate",
+    description: "Generate boilerplates (collections/globals) or TypeScript definitions"
+  },
+  args: {
+    type: {
+      type: "positional",
+      description: "What to generate: 'types', 'collection', or 'global'",
+      required: true
+    },
+    name: {
+      type: "positional",
+      description: "The name of the collection or global to generate (if applicable)",
+      required: false
+    },
+    url: {
+      type: "string",
+      description: "The URL of the OpacaCMS instance (for 'types')"
+    },
+    token: {
+      type: "string",
+      description: "The API Key to use for fetching metadata (for 'types')"
+    },
+    out: {
+      type: "string",
+      alias: "o",
+      description: "The output file path (for 'types')"
+    }
+  },
+  async run({ args }) {
+    if (args.type === "types") {
+      if (!args.url || !args.token) {
+        R.error(import_picocolors.default.red("URL and Token are required to generate types from a remote instance."));
+        R.info("Usage: opacacms generate types --url <url> --token <token> [--out <file>]");
+        process.exit(1);
+      }
+      await generateTypesCommand(args.url, args.token, args.out || "opaca.d.ts");
+      return;
+    }
+    if (args.type === "collection" || args.type === "global") {
+      let name = args.name;
+      if (!name) {
+        const response = await Zt({
+          message: `What should we name your ${args.type}? (e.g. ${args.type === "collection" ? "posts" : "site-settings"})`
+        });
+        if (Ct(response)) {
+          Nt("Operation cancelled.");
+          process.exit(0);
+        }
+        name = response;
+      }
+      const isCollection = args.type === "collection";
+      const folderName = isCollection ? "collections" : "globals";
+      const fileName = `${name}.ts`;
+      const filePath = resolve2(process.cwd(), folderName, fileName);
+      if (fs2.existsSync(filePath)) {
+        R.error(import_picocolors.default.red(`File already exists at ${folderName}/${fileName}`));
+        process.exit(1);
+      }
+      fs2.mkdirSync(resolve2(process.cwd(), folderName), { recursive: true });
+      const template = isCollection ? `import { z, defineCollection } from 'opacacms/schema';
+
+export const ${name} = defineCollection({
+  slug: '${name}',
+  label: '${name.charAt(0).toUpperCase() + name.slice(1)}',
+  admin: {
+    useAsTitle: 'title',
+    icon: 'FileText'
+  },
+  schema: z.object({
+    id: z.text().default(() => crypto.randomUUID()),
+    title: z.text({ label: 'Title' }).required(),
+    content: z.richText({ label: 'Content' }),
+  })
+});
+` : `import { z, defineGlobal } from 'opacacms/schema';
+
+export const ${name} = defineGlobal({
+  slug: '${name}',
+  label: '${name.charAt(0).toUpperCase() + name.slice(1)}',
+  admin: {
+    icon: 'Settings'
+  },
+  schema: z.object({
+    siteName: z.text({ label: 'Site Name' }).required(),
+    description: z.textarea({ label: 'Description' }),
+  })
+});
+`;
+      fs2.writeFileSync(filePath, template);
+      R.success(import_picocolors.default.green(`Successfully generated ${args.type} at ./${folderName}/${fileName}`));
+      Vt(`Don't forget to import it into your opacacms.config.ts and add it to the '${folderName}' array!`, "Reminder");
+      return;
+    }
+    R.error(import_picocolors.default.red(`Unknown generation type: ${args.type}. Use 'types', 'collection', or 'global'.`));
+    process.exit(1);
+  }
+});
+export {
+  generate_default as default
+};

package/dist/chunk-n1twhqmf.js

@@ -0,0 +1,54 @@
+import {
+  init_compiler,
+  init_zod,
+  zodToOpacaFields
+} from "./chunk-m5ems3hh.js";
+
+// src/schema/collection.ts
+init_compiler();
+function defineCollection(config) {
+  const compiledSchema = config.schema.meta({
+    opaca: {
+      collectionConfig: {
+        slug: config.slug,
+        label: config.label,
+        useAsTitle: config.admin?.useAsTitle
+      }
+    }
+  });
+  return {
+    ...config,
+    schema: compiledSchema,
+    fields: zodToOpacaFields(compiledSchema),
+    seed: config.seed,
+    __type: null
+  };
+}
+
+// src/schema/index.ts
+init_compiler();
+
+// src/schema/global.ts
+init_compiler();
+function defineGlobal(config) {
+  const compiledSchema = config.schema.meta({
+    opaca: {
+      globalConfig: {
+        slug: config.slug,
+        label: config.label
+      }
+    }
+  });
+  return {
+    ...config,
+    schema: compiledSchema,
+    fields: zodToOpacaFields(compiledSchema),
+    seed: config.seed,
+    __type: null
+  };
+}
+
+// src/schema/index.ts
+init_zod();
+
+export { defineCollection, defineGlobal };

package/dist/{chunk-bygjkgrx.js → chunk-naqcqj8n.js}

@@ -3,10 +3,13 @@ import {
   flattenPayload,
   pushSchema,
   unflattenRow
-} from "./chunk-dykn5hr6.js";
+} from "./chunk-j8js1y0h.js";
 import {
   BaseDatabaseAdapter
 } from "./chunk-s8mqwnm1.js";
+import {
+  requestContext
+} from "./chunk-q5sb5dcr.js";
 import {
   flattenFields,
   getRelationalFields,
@@ -14,15 +17,20 @@ import {
 } from "./chunk-qxt9vge8.js";
 import {
   logger
-} from "./chunk-t0zg026p.js";
+} from "./chunk-jq1drsen.js";
 import {
   __require
-} from "./chunk-8sqjbsgt.js";
+} from "./chunk-6bywt602.js";
 
 // src/db/better-sqlite.ts
 import fs from "node:fs/promises";
 import path from "node:path";
-import { CompiledQuery, FileMigrationProvider, Kysely, Migrator, SqliteDialect } from "kysely";
+import {
+  CompiledQuery,
+  FileMigrationProvider,
+  Migrator,
+  SqliteDialect
+} from "kysely";
 class BetterSQLiteAdapter extends BaseDatabaseAdapter {
   path;
   name = "better-sqlite3";
@@ -55,10 +63,16 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const require2 = createRequire(import.meta.url);
     const Database = require2("better-sqlite3");
     this._rawDb = new Database(this.path);
-    this._db = new Kysely({
+    const { createOpacaKysely } = await import("./chunk-sqsfk9p4.js");
+    this._db = createOpacaKysely({
       dialect: new SqliteDialect({
         database: this._rawDb
-      })
+      }),
+      config: {
+        collections: this._collections,
+        globals: this._globals,
+        db: { name: "better-sqlite3" }
+      }
     });
   }
   async disconnect() {
@@ -72,45 +86,6 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const result = await this.db.executeQuery(compiled);
     return result.rows;
   }
-  async coerceData(collection, data) {
-    const colDef = this._collections.find((c) => c.slug === collection);
-    if (!colDef)
-      return data;
-    const result = { ...data };
-    const { flattenFields: flattenFields2 } = await import("./chunk-526a3gqx.js");
-    const allFields = flattenFields2(colDef.fields);
-    for (const field of allFields) {
-      const colName = toSnakeCase(field.name);
-      if (!(colName in result))
-        continue;
-      const value = result[colName];
-      if (value === undefined || value === null)
-        continue;
-      switch (field.type) {
-        case "boolean":
-          result[colName] = value ? 1 : 0;
-          break;
-        case "number":
-          result[colName] = Number(value);
-          break;
-        case "date":
-          if (value instanceof Date) {
-            result[colName] = value.toISOString();
-          } else if (typeof value === "string") {
-            result[colName] = new Date(value).toISOString();
-          }
-          break;
-        case "richtext":
-        case "json":
-        case "file":
-          if (typeof value === "object") {
-            result[colName] = JSON.stringify(value);
-          }
-          break;
-      }
-    }
-    return result;
-  }
   async count(collection, query) {
     const tableName = toSnakeCase(collection);
     let qb = this.db.selectFrom(tableName).select((eb) => eb.fn.count("id").as("count"));
@@ -124,13 +99,8 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const tableName = toSnakeCase(collection);
     return this.db.transaction().execute(async (tx) => {
       const colDef = this._collections.find((c) => c.slug === collection);
-      const jsonFields = colDef?.fields.filter((f) => ["richtext", "json", "file"].includes(f.type)).map((f) => f.name) || [];
-      const flatData = flattenPayload(data, "", jsonFields);
-      for (const field of jsonFields) {
-        if (flatData[field] && typeof flatData[field] === "object") {
-          flatData[field] = JSON.stringify(flatData[field]);
-        }
-      }
+      const flatData = flattenPayload(data);
+      const relationalFields = getRelationalFields(colDef?.fields || []);
       const hasManyData = {};
       const blocksData = {};
       for (const key in flatData) {
@@ -144,24 +114,18 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
-      if (!flatData.id)
-        flatData.id = crypto.randomUUID();
       const dbFields = flattenFields(colDef?.fields || []);
       const validCols = new Set(dbFields.map((f) => toSnakeCase(f.name)));
       validCols.add("id");
       validCols.add(toSnakeCase("createdAt"));
       validCols.add(toSnakeCase("updatedAt"));
-      const now = new Date().toISOString();
-      flatData[toSnakeCase("createdAt")] = now;
-      flatData[toSnakeCase("updatedAt")] = now;
       const filteredData = {};
       for (const col of Object.keys(flatData)) {
         if (validCols.has(col)) {
           filteredData[col] = flatData[col];
         }
       }
-      const coercedData = await this.coerceData(collection, filteredData);
-      await tx.insertInto(tableName).values(coercedData).execute();
+      await tx.insertInto(tableName).values(filteredData).execute();
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
         if (values.length > 0) {
@@ -189,13 +153,13 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
             }
           }
           delete blockFlatData.blockType;
-          const coercedBlockData = await this.coerceData(blockTableName, {
+          const blockData = {
             ...blockFlatData,
             _parent_id: flatData.id,
             _order: i,
             block_type: block.blockType
-          });
-          await tx.insertInto(blockTableName).values(coercedBlockData).execute();
+          };
+          await tx.insertInto(blockTableName).values(blockData).execute();
         }
       }
       return this.findOne(collection, { id: flatData.id }, tx);
@@ -214,7 +178,7 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const unflattened = unflattenRow(row);
     const colDef = this._collections.find((c) => c.slug === collection);
     if (colDef) {
-      const { getRelationalFields: getRelationalFields2, toSnakeCase: toSnakeCase2 } = await import("./chunk-526a3gqx.js");
+      const { getRelationalFields: getRelationalFields2, toSnakeCase: toSnakeCase2 } = await import("./chunk-fnsf1dfm.js");
       const relationalFields = getRelationalFields2(colDef.fields);
       for (const field of relationalFields) {
         if (!field.name)
@@ -254,9 +218,17 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const page = options?.page || 1;
     const limit = options?.limit || 10;
     const offset = (page - 1) * limit;
+    const cursorColumn = options?.cursorColumn || "id";
     const total = await this.count(collection, query);
     const tableName = toSnakeCase(collection);
-    let qb = this.db.selectFrom(tableName).selectAll().limit(limit).offset(offset);
+    let qb = this.db.selectFrom(tableName).selectAll().limit(limit);
+    if (options?.after) {
+      qb = qb.where(cursorColumn, ">", options.after);
+    } else if (options?.before) {
+      qb = qb.where(cursorColumn, "<", options.before);
+    } else {
+      qb = qb.offset(offset);
+    }
     if (query && Object.keys(query).length > 0) {
       qb = qb.where((eb) => buildKyselyWhere(eb, query) || eb.val(true));
     }
@@ -265,11 +237,13 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       const col = isDesc ? options.sort.substring(1) : options.sort;
       qb = qb.orderBy(col, isDesc ? "desc" : "asc");
     } else {
-      qb = qb.orderBy("created_at", "desc");
+      qb = qb.orderBy(cursorColumn, "desc");
     }
     const rows = await qb.execute();
     if (rows.length === 0) {
       const totalPages2 = Math.ceil(total / limit);
+      const afterAnchor = options?.after;
+      const beforeAnchor = options?.before;
       return {
         docs: [],
         totalDocs: total,
@@ -277,10 +251,12 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
         totalPages: totalPages2,
         page,
         pagingCounter: offset + 1,
-        hasNextPage: page * limit < total,
-        hasPrevPage: page > 1,
-        prevPage: page > 1 ? page - 1 : null,
-        nextPage: page < totalPages2 ? page + 1 : null
+        hasNextPage: false,
+        hasPrevPage: !!afterAnchor || page > 1,
+        prevPage: null,
+        nextPage: null,
+        nextCursor: null,
+        prevCursor: afterAnchor ? afterAnchor : null
       };
     }
     const rowIds = rows.map((r) => r.id);
@@ -358,9 +334,11 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       page,
       pagingCounter: offset + 1,
       hasNextPage: page * limit < total,
-      hasPrevPage: page > 1,
+      hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
-      nextPage: page < totalPages ? page + 1 : null
+      nextPage: page < totalPages ? page + 1 : null,
+      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }
   async update(collection, query, data) {
@@ -373,6 +351,9 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       const current = await this.findOne(collection, normalizedQuery, tx);
       if (!current)
         throw new Error("Document not found");
+      const store = requestContext.getStore();
+      if (store)
+        store.previousData = current;
       const colDef = this._collections.find((c) => c.slug === collection);
       const jsonFields = colDef?.fields.filter((f) => ["richtext", "json", "file"].includes(f.type)).map((f) => f.name) || [];
       const flatData = flattenPayload(data, "", jsonFields);
@@ -394,10 +375,8 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
-      flatData.updated_at = new Date().toISOString();
       if (Object.keys(flatData).length > 0) {
-        const coercedData = await this.coerceData(collection, flatData);
-        await tx.updateTable(tableName).set(coercedData).where("id", "=", current.id).execute();
+        await tx.updateTable(tableName).set(flatData).where("id", "=", current.id).execute();
       }
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -435,13 +414,13 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
             }
           }
           delete blockFlatData.blockType;
-          const coercedBlockData = await this.coerceData(blockTableName, {
+          const blockData = {
             ...blockFlatData,
             _parent_id: current.id,
             _order: i,
             block_type: block.blockType
-          });
-          await tx.insertInto(blockTableName).values(coercedBlockData).execute();
+          };
+          await tx.insertInto(blockTableName).values(blockData).execute();
         }
       }
       return this.findOne(collection, { id: current.id }, tx);
@@ -500,10 +479,8 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
-      flatData.updated_at = new Date().toISOString();
       if (Object.keys(flatData).length > 0) {
-        const coercedData = await this.coerceData(collection, flatData);
-        const result = await qb.set(coercedData).executeTakeFirst();
+        const result = await qb.set(flatData).executeTakeFirst();
         return Number(result.numUpdatedRows || 0);
       }
       return 0;

package/dist/chunk-q5sb5dcr.js

@@ -0,0 +1,15 @@
+// src/utils/context.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var GLOBAL_CONTEXT_KEY = Symbol.for("opacacms.requestContext");
+if (!globalThis[GLOBAL_CONTEXT_KEY]) {
+  globalThis[GLOBAL_CONTEXT_KEY] = new AsyncLocalStorage;
+}
+var requestContext = globalThis[GLOBAL_CONTEXT_KEY];
+function getUserIdFromContext() {
+  return requestContext.getStore()?.userId || null;
+}
+function getPreviousDataFromContext() {
+  return requestContext.getStore()?.previousData || null;
+}
+
+export { requestContext, getUserIdFromContext, getPreviousDataFromContext };