opacacms 0.3.12 → 0.3.14

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Francy Santos (fhorray)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -123,31 +123,32 @@ A **Collection** is a database table + a REST API. Pure magic. ✨
 
 ```typescript
 // collections/posts.ts
-import { Collection, Field } from 'opacacms';
-
-export const posts = Collection.create('posts')
-  .label('Blog Posts')
-  .icon('FileText')
-  .fields([
-    Field.text('title').required().label('Post Title'),
-    Field.slug('slug').from('title').unique(),
-    Field.richText('content').localized(),
-    Field.relationship('author').to('_users').single(),
-    Field.select('status')
-      .options([
-        { label: 'Draft', value: 'draft' },
-        { label: 'Published', value: 'published' },
-      ])
-      .defaultValue('draft'),
-    Field.checkbox('featured').label('Featured Post'),
-  ])
-  .access({
+import { defineCollection, z } from 'opacacms';
+
+export const posts = defineCollection({
+  slug: 'posts',
+  label: 'Blog Posts',
+  admin: {
+    icon: 'FileText',
+    useAsTitle: 'title',
+  },
+  schema: z.object({
+    title: z.text({ label: 'Post Title' }).required(),
+    slug: z.slug({ from: 'title' }).unique(),
+    content: z.richText({ label: 'Content' }).localized(),
+    author: z.relationship('_users', { label: 'Author' }),
+    status: z
+      .select(['draft', 'published'], { label: 'Status' })
+      .default('draft'),
+    featured: z.boolean({ label: 'Featured Post' }),
+  }),
+  access: {
     read: () => true,
     create: ({ user }) => !!user,
     update: ({ user }) => user?.role === 'admin',
     delete: ({ user }) => user?.role === 'admin',
-  })
-  .hooks({
+  },
+  hooks: {
     beforeCreate: async (data) => {
       // Mutate data before insertion
       return { ...data, publishedAt: new Date().toISOString() };
@@ -155,104 +156,90 @@ export const posts = Collection.create('posts')
     afterCreate: async (doc) => {
       console.log('New post created:', doc.id);
     },
-  });
+  },
+});
 ```
 
-### Collection Builder Methods
+### Collection Configuration
 
-| Method               | Description                                                      |
-| -------------------- | ---------------------------------------------------------------- |
-| `.label(name)`       | Sets the display name used in the Admin UI sidebar               |
-| `.icon(name)`        | [Lucide](https://lucide.dev) icon name for the sidebar           |
-| `.fields([...])`     | Defines the data structure for this collection                   |
-| `.access(rules)`     | Collection-level access control                                  |
-| `.hooks(fns)`        | Lifecycle hooks (`beforeCreate`, `afterUpdate`, etc.)            |
-| `.webhooks([...])`   | External webhook notifications                                   |
-| `.admin({...})`      | Advanced Admin UI configuration (`hidden`, `disableAdmin`, etc.) |
-| `.versions(true)`    | Enable document versioning with history                          |
-| `.timestamps({...})` | Customize timestamp field names                                  |
+| Property     | Description                                               |
+| ------------ | --------------------------------------------------------- |
+| `slug`       | The unique identifier for the collection                  |
+| `label`      | Display name used in the Admin UI                         |
+| `admin`      | UI configuration (`icon`, `useAsTitle`, `defaultColumns`) |
+| `schema`     | A `z.object` defining the data structure                  |
+| `access`     | Collection-level access control                           |
+| `hooks`      | Lifecycle hooks (`beforeCreate`, `afterUpdate`, etc.)     |
+| `webhooks`   | External webhook notifications                            |
+| `versions`   | Enable document versioning with history                   |
+| `timestamps` | Customize or disable timestamp fields                     |
 
 ---
 
 ## 🧪 Field Types
 
-We've got everything you need to build powerful schemas:
-
-| Field                  | Usage                                       | Description                                   |
-| ---------------------- | ------------------------------------------- | --------------------------------------------- |
-| `Field.text()`         | `Field.text('title')`                       | Simple string input                           |
-| `Field.number()`       | `Field.number('price')`                     | Numeric input                                 |
-| `Field.richText()`     | `Field.richText('content')`                 | Block-based Lexical editor (Notion style!) 📝 |
-| `Field.relationship()` | `Field.relationship('author').to('_users')` | Links to another collection                   |
-| `Field.file()`         | `Field.file('image')`                       | File/image upload ☁️                          |
-| `Field.blocks()`       | `Field.blocks('layout').blocks([...])`      | Dynamic page builder 🧱                       |
-| `Field.group()`        | `Field.group('meta').fields([...])`         | Nested object group                           |
-| `Field.array()`        | `Field.array('tags').fields([...])`         | Repeatable field group                        |
-| `Field.select()`       | `Field.select('status').options([...])`     | Dropdown picker                               |
-| `Field.checkbox()`     | `Field.checkbox('active')`                  | Boolean toggle                                |
-| `Field.slug()`         | `Field.slug('slug').from('title')`          | Auto-generated URL slug                       |
-| `Field.date()`         | `Field.date('publishedAt')`                 | Date/time picker                              |
-| `Field.virtual()`      | `Field.virtual('fullName').resolve(...)`    | Computed field (not stored)                   |
-| `Field.tabs()`         | `Field.tabs('layout').tabs([...])`          | UI-only grouping for the admin                |
+| Field              | Usage                                                   | Description                                   |
+| ------------------ | ------------------------------------------------------- | --------------------------------------------- |
+| `z.text()`         | `z.text({ label: 'Title' })`                            | Simple string input                           |
+| `z.textarea()`     | `z.textarea({ label: 'Bio' })`                          | Multi-line text area                          |
+| `z.number()`       | `z.number({ label: 'Price' })`                          | Numeric input                                 |
+| `z.richText()`     | `z.richText({ label: 'Content' })`                      | Block-based Lexical editor (Notion style!) 📝 |
+| `z.relationship()` | `z.relationship('_users', { label: 'Author' })`         | Links to another collection                   |
+| `z.file()`         | `z.file({ label: 'Image' })`                            | File/image upload ☁️                          |
+| `z.blocks()`       | `z.blocks([hero, gallery], { label: 'Layout' })`        | Dynamic page builder 🧱                       |
+| `z.group()`        | `z.group({ meta1: z.text(), meta2: z.text() })`         | Nested object group                           |
+| `z.array()`        | `z.array(z.object({ tag: z.text() }))`                  | Repeatable field array                        |
+| `z.select()`       | `z.select(['draft', 'published'], { label: 'Status' })` | Dropdown picker                               |
+| `z.boolean()`      | `z.boolean({ label: 'Active' })`                        | Boolean toggle                                |
+| `z.slug()`         | `z.slug({ from: 'title', label: 'Slug' })`              | Auto-generated URL slug                       |
+| `z.date()`         | `z.date({ label: 'Published At' })`                     | Date/time picker                              |
+| `z.tabs()`         | `z.tabs({ SEO: z.object({...}) })`                      | UI-only grouping for the admin                |
+| `z.join()`         | `z.join('posts', { foreignKey: 'author' })`             | Virtual reversed relationship (read-only)     |
+| `z.password()`     | `z.password({ label: 'Password' })`                     | Secure, hashed input                          |
 
 ### Common Field Methods
 
 Every field type inherits these chainable methods from the base builder:
 
 ```typescript
-Field.text('email')
-  .label('Email Address') // Admin UI label
-  .placeholder('you@example.com') // Input placeholder
-  .required() // Mark as required
+z.text({ label: 'Email Address', description: 'Primary email' })
+  .required() // Native Zod or custom required condition
   .unique() // Unique constraint in the DB
   .localized() // Enable per-locale values (i18n)
-  .defaultValue('hello@world.com') // Default value
-  .validate(z.string().email()) // Custom validation (function or Zod)
-  .access({ readOnly: true }) // Field-level access control
-  .description('Primary email') // Help text below the field
-  .hidden() // Hide from Admin UI
-  .readOnly() // Read-only in Admin UI
-  .admin({ components: { Field: 'my-custom-field' } }); // Custom component
+  .default('hello@world.com') // Native Zod default value
+  .email('Invalid email address') // Native Zod validation
+  .cms({
+    admin: {
+      readOnly: true,
+      hidden: false,
+      components: { Field: 'my-custom-field' },
+    },
+  }); // Advanced CMS and Admin UI options
 ```
 
 ---
 
 ## ✅ Validation
 
-OpacaCMS supports **granular field validation** via the `.validate()` method. You can pass either a **custom function** or a **Zod schema** — they're fully interchangeable.
-
-### Custom Function Validation
-
-Return `true` to pass, or a `string` error message to fail:
-
-```typescript
-Field.text('username').validate((value) => {
-  if (value === 'admin') return "Username 'admin' is reserved";
-  return true;
-});
-```
+OpacaCMS natively supports validation since the entire schema is built using Zod. You can chain standard Zod validation methods directly to your fields.
 
 ### Zod Schema Validation
 
-Pass any `z.ZodTypeAny` schema directly. Errors are automatically mapped:
+Errors are automatically mapped and handled by the API and Admin UI:
 
 ```typescript
 import { z } from 'opacacms';
 
-Field.text('cpf').validate(
-  z.string().regex(/^\d{3}\.\d{3}\.\d{3}-\d{2}$/, 'Invalid CPF format'),
-);
+// Regular expressions
+z.text().regex(/^\d{3}\.\d{3}\.\d{3}-\d{2}$/, 'Invalid CPF format');
 
-Field.text('password').validate(
-  z
-    .string()
-    .min(8, 'Password must be at least 8 characters')
-    .regex(/[A-Z]/, 'Must contain at least one uppercase letter'),
-);
+// String constraints
+z.text()
+  .min(8, 'Password must be at least 8 characters')
+  .regex(/[A-Z]/, 'Must contain at least one uppercase letter');
 
-Field.text('email')
-  .required()
-  .validate(z.string().email('Invalid email address'));
+// Built-in format validators
+z.text().required().email('Invalid email address');
 ```
 
 > **💡 Tip:** Zod validation integrates seamlessly with `.required()`. The built-in requirement check runs first, then your Zod schema validates the value shape.
@@ -264,17 +251,24 @@ Field.text('email')
 Globals are **singleton documents** — perfect for site settings, navigation, footers, and other one-of-a-kind configs.
 
 ```typescript
-import { Global, Field } from 'opacacms';
+import { defineGlobal, z } from 'opacacms';
 
-export const siteSettings = Global.create('site-settings')
-  .label('Site Settings')
-  .icon('Settings')
-  .fields([
-    Field.text('siteName').required(),
-    Field.text('tagline').localized(),
-    Field.file('logo'),
-    Field.group('social').fields([Field.text('twitter'), Field.text('github')]),
-  ]);
+export const siteSettings = defineGlobal({
+  slug: 'site-settings',
+  label: 'Site Settings',
+  admin: {
+    icon: 'Settings',
+  },
+  schema: z.object({
+    siteName: z.text().required().default('My Shiny App'),
+    tagline: z.text().localized(),
+    logo: z.file(),
+    social: z.group({
+      twitter: z.text(),
+      github: z.text(),
+    }),
+  }),
+});
 ```
 
 API: `GET /api/globals/site-settings` and `PUT /api/globals/site-settings`
@@ -288,25 +282,31 @@ Secure your data with simple functions at both **collection** and **field** leve
 ### Collection-Level Access
 
 ```typescript
-.access({
-  read: ({ user }) => !!user,                    // Logged in? You're good.
-  create: ({ user }) => user?.role === 'admin',   // Only admins please!
-  update: ({ data, user }) => data.ownerId === user.id, // Only your own stuff.
-  delete: ({ user }) => user?.role === 'admin',
-  requireApiKey: true,                            // Require API key for programmatic access
-})
+defineCollection({
+  // ...
+  access: {
+    read: ({ user }) => !!user, // Logged in? You're good.
+    create: ({ user }) => user?.role === 'admin', // Only admins please!
+    update: ({ data, user }) => data.ownerId === user.id, // Only your own stuff.
+    delete: ({ user }) => user?.role === 'admin',
+    requireApiKey: true, // Require API key for programmatic access
+  },
+});
 ```
 
 ### Field-Level Access
 
-Control visibility and editability per-field:
+Control visibility and editability per-field using Zod conditional methods and CMS metadata:
 
 ```typescript
-Field.text('internalNotes').access({
-  hidden: ({ user }) => user?.role !== 'admin', // Only admins see this
-  readOnly: ({ operation }) => operation === 'update', // Editable only on create
-  disabled: false,
-});
+z.text({ label: 'Internal Notes' })
+  .condition((data) => data.role === 'admin') // Only show if another field matches
+  .cms({
+    admin: {
+      hidden: true, // Hide from Admin UI
+      readOnly: false,
+    },
+  });
 ```
 
 ### Role-Based Access Control (RBAC)
@@ -334,30 +334,33 @@ access: {
 Hooks let you run side-effects at key points in the document lifecycle. They receive the document data and can mutate it before persistence.
 
 ```typescript
-.hooks({
-  beforeCreate: async (data) => {
-    // Transform or enrich data before saving
-    data.slug = data.title.toLowerCase().replace(/\s+/g, '-');
-    return data;
-  },
-  afterCreate: async (doc) => {
-    // Side-effects after the document is saved
-    await sendWelcomeEmail(doc.email);
-  },
-  beforeUpdate: async (data) => {
-    data.updatedBy = 'system';
-    return data;
-  },
-  afterUpdate: async (doc) => {
-    await invalidateCache(`/posts/${doc.slug}`);
-  },
-  beforeDelete: async (id) => {
-    await archiveDocument(id);
-  },
-  afterDelete: async (id) => {
-    console.log(`Document ${id} deleted`);
+defineCollection({
+  // ...
+  hooks: {
+    beforeCreate: async (data) => {
+      // Transform or enrich data before saving
+      data.slug = data.title.toLowerCase().replace(/\s+/g, '-');
+      return data;
+    },
+    afterCreate: async (doc) => {
+      // Side-effects after the document is saved
+      await sendWelcomeEmail(doc.email);
+    },
+    beforeUpdate: async (data) => {
+      data.updatedBy = 'system';
+      return data;
+    },
+    afterUpdate: async (doc) => {
+      await invalidateCache(`/posts/${doc.slug}`);
+    },
+    beforeDelete: async (id) => {
+      await archiveDocument(id);
+    },
+    afterDelete: async (id) => {
+      console.log(`Document ${id} deleted`);
+    },
   },
-})
+});
 ```
 
 ---
@@ -367,24 +370,25 @@ Hooks let you run side-effects at key points in the document lifecycle. They rec
 Send HTTP notifications to external services when documents change. Webhooks run in the background using `waitUntil` on supported runtimes (Cloudflare Workers, Vercel Edge).
 
 ```typescript
-import { defineCollection } from 'opacacms';
-
 defineCollection({
   slug: 'orders',
   webhooks: [
-  {
-    url: 'https://hooks.slack.com/services/xxx',
-    events: ['afterCreate', 'afterUpdate'],
-    headers: { Authorization: 'Bearer my-token' },
-  },
-  {
-    url: 'https://api.example.com/webhooks/orders',
-    events: ['afterDelete'],
-  },
-]);
+    {
+      type: 'outgoing',
+      url: 'https://hooks.slack.com/services/xxx',
+      events: ['after:create', 'after:update'],
+      headers: { Authorization: 'Bearer my-token' },
+    },
+    {
+      type: 'outgoing',
+      url: 'https://api.example.com/webhooks/orders',
+      events: ['after:delete'],
+    },
+  ],
+});
 ```
 
-Supported events: `afterCreate`, `afterUpdate`, `afterDelete`.
+Supported events: `after:create`, `after:update`, `after:delete`. OpacaCMS also supports `incoming` webhooks.
 
 ---
 
@@ -393,9 +397,11 @@ Supported events: `afterCreate`, `afterUpdate`, `afterDelete`.
 Enable document versioning to keep a full history of changes. Each save creates a snapshot that can be restored later.
 
 ```typescript
-Collection.create('posts')
-  .versions(true) // That's it!
-  .fields([...])
+defineCollection({
+  slug: 'posts',
+  versions: { drafts: true, maxRevisions: 10 },
+  schema: z.object({...})
+});
 ```
 
 ### Version API
@@ -411,13 +417,27 @@ The admin UI provides a visual "Versions" panel where editors can browse and res
 
 ## 🧮 Virtual Fields
 
-Virtual fields are **computed at read-time** and never stored in the database. Perfect for derived values, aggregated data, or API mashups.
+Virtual fields are **computed at read-time** and never stored in the database. Perfect for derived values, aggregated data, or API mashups. Use `z.helpers()` to infer the collection types for type-safe resolving.
 
 ```typescript
-import { Field } from 'opacacms';
+const userShape = z.object({
+  firstName: z.text(),
+  lastName: z.text(),
+});
 
-Field.virtual('fullName').resolve(async ({ data, user, req }) => {
-  return `${data.firstName} ${data.lastName}`;
+const { meta } = z.helpers(userShape);
+
+export const users = defineCollection({
+  slug: 'users',
+  schema: z.object({
+    ...userShape.shape,
+    fullName: meta(z.text(), {
+      isVirtual: true,
+      resolve: async ({ data, user, req }) => {
+        return `${data.firstName} ${data.lastName}`;
+      },
+    }),
+  }),
 });
 ```
 
@@ -494,12 +514,13 @@ logger.info('Custom route hit');
 
 ## 🗄 Database Adapters
 
-OpacaCMS provides first-class adapters for multiple database engines. All adapters implement the same interface, so switching is as simple as changing one line.
+OpacaCMS provides first-class adapters for multiple database engines.
 
 | Adapter       | Import        | Usage                             |
 | ------------- | ------------- | --------------------------------- |
 | SQLite (Bun)  | `opacacms/db` | `createSQLiteAdapter('local.db')` |
 | Cloudflare D1 | `opacacms/db` | `createD1Adapter(env.DB)`         |
+| PostgreSQL    | `opacacms/db` | `createPostgresAdapter(url)`      |
 
 ---
 
@@ -552,8 +573,8 @@ i18n: {
 }
 
 // Field
-Field.text('title').localized()
-Field.richText('content').localized()
+z.text({ label: 'Title' }).localized()
+z.richText({ label: 'Content' }).localized()
 ```
 
 ### Locale Selection
@@ -583,7 +604,7 @@ This is where OpacaCMS shines. You can replace any field UI with your own **Reac
 
 ```tsx
 // MyColorPicker.tsx
-import { defineReactField } from 'opacacms';
+import { defineReactField } from 'opacacms/admin';
 
 const ColorPicker = ({ value, onChange }) => (
   <input
@@ -600,7 +621,7 @@ defineReactField('my-color-picker', ColorPicker);
 
 ```tsx
 // MyVuePicker.vue
-import { defineVueField } from 'opacacms';
+import { defineVueField } from 'opacacms/admin';
 import { createApp } from 'vue';
 import MyVueComponent from './MyVueComponent.vue';
 
@@ -610,9 +631,11 @@ defineVueField('my-vue-picker', MyVueComponent, { createApp });
 ### 3️⃣ Reference in Schema
 
 ```typescript
-Field.text('color').admin({
-  components: {
-    Field: 'my-color-picker',
+z.text({ label: 'Color' }).cms({
+  admin: {
+    components: {
+      Field: 'my-color-picker',
+    },
   },
 });
 ```
@@ -635,11 +658,13 @@ Collections and Fields can be further customized for the Admin UI using the `.ad
 Example:
 
 ```typescript
-export const InternalData = Collection.create('internal_data')
-  .admin({
+export const InternalData = defineCollection({
+  slug: 'internal_data',
+  admin: {
     hidden: true, // Only accessible via direct link
-  })
-  .fields([...]);
+  },
+  schema: z.object({...}),
+});
 ```
 
 ---
@@ -917,8 +942,8 @@ export const myPlugin = () =>
             icon: "Activity",
             path: "/admin/my-plugin",
             render: (serverUrl) => \`
-              <iframe 
-                src="\${serverUrl}/api/plugins/my-plugin/view" 
+              <iframe
+                src="\${serverUrl}/api/plugins/my-plugin/view"
                 style="width:100%; height:calc(100vh - 100px); border:none;"
               ></iframe>
             \`
@@ -929,14 +954,12 @@ export const myPlugin = () =>
 
       // Serve the Isolated HTML View with Hono/HTML
       app.get('/api/plugins/my-plugin/view', (c) => {
-        return c.html(html`
-          <body
-            style="background: #f6f9fc; padding: 40px; font-family: sans-serif;"
-          >
+        return (c.header('Content-Type', 'text/html'), c.body(\`
+          <body style="background: #f6f9fc; padding: 40px; font-family: sans-serif;">
             <h1>Modern Plugin UI</h1>
             <p>Isolated from CMS styles with zero boilerplate.</p>
           </body>
-        `);
+        \`));
       });
     },
 

package/dist/admin/ui/components/ui/button.d.ts

@@ -2,7 +2,7 @@ import { type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 import "../../styles/button.scss";
 declare const buttonVariants: (props?: ({
-    variant?: "default" | "link" | "destructive" | "outline" | "secondary" | "ghost" | null | undefined;
+    variant?: "link" | "default" | "destructive" | "outline" | "secondary" | "ghost" | null | undefined;
     size?: "default" | "icon" | "sm" | "lg" | "icon-sm" | "icon-xs" | "icon-lg" | "xs" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 declare function Button({ className, variant, size, asChild, ...props }: React.ComponentProps<"button"> & VariantProps<typeof buttonVariants> & {

package/dist/{chunk-8hhzvesq.js → chunk-5b9eqr34.js}

@@ -335,6 +335,7 @@ class D1Adapter extends BaseDatabaseAdapter {
       }
     }
     const totalPages = Math.ceil(total / limit);
+    const hasNextPage = page * limit < total;
     return {
       docs: docs.filter(Boolean),
       totalDocs: total,
@@ -342,11 +343,11 @@ class D1Adapter extends BaseDatabaseAdapter {
       totalPages,
       page,
       pagingCounter: offset + 1,
-      hasNextPage: page * limit < total,
+      hasNextPage,
       hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
       nextPage: page < totalPages ? page + 1 : null,
-      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      nextCursor: docs.length > 0 && hasNextPage ? docs[docs.length - 1][cursorColumn] : null,
       prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }

package/dist/{chunk-1vtdkx5e.js → chunk-dz5bh1bd.js}

@@ -126,6 +126,10 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
           filteredData[col] = flatData[col];
         }
       }
+      if (!filteredData.id) {
+        filteredData.id = crypto.randomUUID();
+        flatData.id = filteredData.id;
+      }
       await tx.insertInto(tableName).values(filteredData).execute();
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -327,6 +331,7 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       }
     }
     const totalPages = Math.ceil(total / limit);
+    const hasNextPage = page * limit < total;
     return {
       docs: docs.filter(Boolean),
       totalDocs: total,
@@ -334,11 +339,11 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       totalPages,
       page,
       pagingCounter: offset + 1,
-      hasNextPage: page * limit < total,
+      hasNextPage,
       hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
       nextPage: page < totalPages ? page + 1 : null,
-      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      nextCursor: hasNextPage && docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
       prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }