@xleddyl/nuxt-cms 0.1.57 → 0.1.58

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@xleddyl/nuxt-cms",
   "configKey": "cms",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/seed.js

@@ -3,6 +3,7 @@ import { dirname, isAbsolute, resolve } from "node:path";
 import { migrationsDirFor } from "./shared/migrations-dir.js";
 import { resolvePageRoutes, routePathsFromDir } from "./shared/page-routes.js";
 import { customId, ID_LENGTH } from "./server/utils/custom-id.js";
+import { applyLibsqlMigrations } from "./server/utils/libsql-migrations.js";
 export { customId, ID_LENGTH };
 export function resolveCmsPages(config, options = {}) {
   const root = options.root ?? process.cwd();
@@ -27,7 +28,7 @@ export async function createCmsSeeder(opts = {}) {
   const resolvedDbPath = isAbsolute(dbPath) ? dbPath : resolve(root, dbPath);
   const migrationsFolder = opts.migrationsDir ?? migrationsDirFor(root, driver);
   if (driver === "libsql") {
-    const { migrate: migrate2 } = await import("drizzle-orm/libsql/migrator");
+    const { readMigrationFiles } = await import("drizzle-orm/migrator");
     const dbUrl = url || `file:${resolvedDbPath}`;
     let db2;
     if (dbUrl.startsWith("file:")) {
@@ -40,7 +41,13 @@ export async function createCmsSeeder(opts = {}) {
       const { drizzle: drizzle2 } = await import("drizzle-orm/libsql/web");
       db2 = drizzle2(createClient({ url: dbUrl, authToken: authToken || void 0 }));
     }
-    return { db: db2, migrate: () => migrate2(db2, { migrationsFolder }) };
+    const client = db2.$client;
+    return {
+      db: db2,
+      migrate: async () => {
+        await applyLibsqlMigrations(client, readMigrationFiles({ migrationsFolder }));
+      }
+    };
   }
   if (driver === "postgres") {
     if (!url) throw new Error("[nuxt-cms] seed: Postgres needs a url (NUXT_CMS_DATABASE_URL)");

package/dist/runtime/server/plugins/migrate-libsql.js

@@ -1,5 +1,5 @@
 import { useDb } from "../utils/db-libsql.js";
-import { runCmsMigrations } from "../utils/migrate.js";
+import { runLibsqlMigrations } from "../utils/migrate.js";
 export default async () => {
-  await runCmsMigrations(useDb());
+  await runLibsqlMigrations(useDb());
 };

package/dist/runtime/server/utils/libsql-migrations.d.ts

@@ -0,0 +1,16 @@
+export interface LibsqlMigration {
+    sql: string[];
+    folderMillis: number;
+    hash: string;
+}
+export interface LibsqlStatement {
+    sql: string;
+    args: (string | number)[];
+}
+export interface LibsqlMigrationClient {
+    execute: (statement: string) => Promise<{
+        rows: ArrayLike<unknown>[];
+    }>;
+    batch: (statements: LibsqlStatement[], mode: 'write') => Promise<unknown>;
+}
+export declare function applyLibsqlMigrations(client: LibsqlMigrationClient, migrations: LibsqlMigration[]): Promise<number>;

package/dist/runtime/server/utils/libsql-migrations.js

@@ -0,0 +1,35 @@
+const MIGRATIONS_TABLE = "__drizzle_migrations";
+async function lastAppliedMillis(client) {
+  const { rows } = await client.execute(
+    `SELECT id, hash, created_at FROM "${MIGRATIONS_TABLE}" ORDER BY created_at DESC LIMIT 1`
+  );
+  const createdAt = rows[0]?.[2];
+  return createdAt == null ? null : Number(createdAt);
+}
+export async function applyLibsqlMigrations(client, migrations) {
+  if (!migrations.length) return 0;
+  await client.execute(
+    `CREATE TABLE IF NOT EXISTS "${MIGRATIONS_TABLE}" (id SERIAL PRIMARY KEY, hash text NOT NULL, created_at numeric)`
+  );
+  const lastApplied = await lastAppliedMillis(client);
+  const pending = migrations.filter(
+    (migration) => lastApplied == null || lastApplied < migration.folderMillis
+  );
+  if (!pending.length) return 0;
+  const statements = pending.flatMap((migration) => [
+    ...migration.sql.filter((statement) => statement.trim()).map((sql) => ({ sql, args: [] })),
+    {
+      sql: `INSERT INTO "${MIGRATIONS_TABLE}" ("hash", "created_at") VALUES (?, ?)`,
+      args: [migration.hash, migration.folderMillis]
+    }
+  ]);
+  try {
+    await client.batch(statements, "write");
+  } catch (error) {
+    const latest = Math.max(...migrations.map((migration) => migration.folderMillis));
+    const appliedNow = await lastAppliedMillis(client).catch(() => null);
+    if (appliedNow != null && appliedNow >= latest) return 0;
+    throw error;
+  }
+  return pending.length;
+}

package/dist/runtime/server/utils/migrate.d.ts

@@ -5,4 +5,5 @@ export interface CmsMigration {
     hash: string;
 }
 export declare function runCmsMigrations(db: unknown): Promise<void>;
+export declare function runLibsqlMigrations(db: unknown): Promise<void>;
 export declare function runD1Migrations(binding: unknown): Promise<void>;

package/dist/runtime/server/utils/migrate.js

@@ -1,6 +1,7 @@
 import cmsConfig from "#cms-config";
 import { migrations as bundledMigrations } from "#cms-migrations";
 import { useRuntimeConfig } from "#imports";
+import { applyLibsqlMigrations } from "./libsql-migrations.js";
 const MIGRATIONS_TABLE = "__drizzle_migrations";
 async function readMigrations(migrationsDir) {
   if (import.meta.dev) {
@@ -28,6 +29,12 @@ export async function runCmsMigrations(db) {
   const { dialect, session } = db;
   await dialect.migrate(migrations, session, {});
 }
+export async function runLibsqlMigrations(db) {
+  const migrations = await pendingMigrations();
+  if (!migrations.length) return;
+  const { $client } = db;
+  await applyLibsqlMigrations($client, migrations);
+}
 export async function runD1Migrations(binding) {
   const migrations = await pendingMigrations();
   if (!migrations.length) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "Lightweight CMS that ships with your Nuxt app: runs on the Nitro server, content types defined in code, /cms admin panel, GraphQL API, SQLite or Postgres. No external CMS needed!",
   "license": "MIT",
   "author": "Edoardo Alberti (https://github.com/xleddyl)",