@xleddyl/nuxt-cms 0.1.26 → 0.1.28

package/dist/runtime/server/api/collection.get.js

@@ -1,4 +1,4 @@
-import { count, desc, sql } from "drizzle-orm";
+import { asc, count, desc, sql } from "drizzle-orm";
 import { defineEventHandler, getValidatedQuery } from "h3";
 import { z } from "zod";
 import { useDb } from "#cms-db";
@@ -9,6 +9,8 @@ const querySchema = z.object({
   limit: z.coerce.number().int().min(1).max(100).default(50),
   offset: z.coerce.number().int().min(0).default(0),
   search: z.string().trim().max(200).optional(),
+  sort: z.string().trim().max(64).optional(),
+  order: z.enum(["asc", "desc"]).default("desc"),
   light: z.stringbool().default(false)
 });
 function likePattern(term) {
@@ -23,7 +25,10 @@ export default defineEventHandler(async (event) => {
     await attachManyToMany(db, name, entry, rows);
     return rows[0] ?? null;
   }
-  const { limit, offset, search, light } = await getValidatedQuery(event, querySchema.parse);
+  const { limit, offset, search, sort, order, light } = await getValidatedQuery(
+    event,
+    querySchema.parse
+  );
   const columns = tableColumns(table);
   const titleColumn = entry.titleField && Object.hasOwn(columns, entry.titleField) ? columns[entry.titleField] : void 0;
   let where;
@@ -36,9 +41,14 @@ export default defineEventHandler(async (event) => {
     ...entry.titleField && titleColumn ? [[entry.titleField, titleColumn]] : [],
     ...entry.drafts && Object.hasOwn(columns, "status") ? [["status", columns.status]] : []
   ]) : void 0;
-  const orderBy = columns.createdAt ?? idColumn(table);
+  const sortColumn = sort && Object.hasOwn(columns, sort) ? columns[sort] : void 0;
+  const orderBy = sortColumn ?? columns.createdAt ?? idColumn(table);
+  const direction = sortColumn && order === "asc" ? asc : desc;
+  const tiebreaker = idColumn(table);
   const base = selection ? db.select(selection).from(table) : db.select().from(table);
-  const items = await (where ? base.where(where) : base).orderBy(desc(orderBy)).limit(limit).offset(offset);
+  const items = await (where ? base.where(where) : base).orderBy(
+    ...orderBy === tiebreaker ? [direction(orderBy)] : [direction(orderBy), desc(tiebreaker)]
+  ).limit(limit).offset(offset);
   const [counted] = await (where ? db.select({ total: count() }).from(table).where(where) : db.select({ total: count() }).from(table));
   if (light) return { items, total: counted?.total ?? 0, relations: {} };
   await attachManyToMany(db, name, entry, items);

package/dist/runtime/server/api/media-presign.post.d.ts

@@ -1,5 +1,6 @@
 declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
     key: string;
+    folder: string | null;
     uploadUrl: string;
     method: string;
     headers: {

package/dist/runtime/server/api/media-presign.post.js

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { createError, defineEventHandler, readValidatedBody } from "h3";
 import { z } from "zod";
-import { slugify } from "../../shared/index.js";
+import { normalizeMediaFolder, slugify } from "../../shared/index.js";
 import { assertUploadContentType, useMediaStorage } from "../utils/media.js";
 import { requireAdmin } from "../utils/require-admin.js";
 const MAX_BASE_LENGTH = 80;
@@ -10,7 +10,8 @@ const MAX_FILE_SIZE = 10 * 1024 * 1024;
 const bodySchema = z.object({
   filename: z.string().trim().min(1).max(255),
   contentType: z.string().regex(/^[-\w.+]+\/[-\w.+]+$/, "Invalid content type"),
-  size: z.number().int().positive()
+  size: z.number().int().positive(),
+  folder: z.string().max(255).nullish()
 });
 function slugifyFilename(filename) {
   const dot = filename.lastIndexOf(".");
@@ -21,7 +22,7 @@ function slugifyFilename(filename) {
 export default defineEventHandler(async (event) => {
   await requireAdmin(event);
   const { media, client, bucketUrl, publicUrl } = useMediaStorage(event);
-  const { filename, contentType, size } = await readValidatedBody(event, bodySchema.parse);
+  const { filename, contentType, size, folder } = await readValidatedBody(event, bodySchema.parse);
   assertUploadContentType(contentType);
   if (size > MAX_FILE_SIZE) {
     throw createError({
@@ -30,7 +31,8 @@ export default defineEventHandler(async (event) => {
     });
   }
   const now = /* @__PURE__ */ new Date();
-  const prefix = `${now.getUTCFullYear()}/${String(now.getUTCMonth() + 1).padStart(2, "0")}`;
+  const normalizedFolder = normalizeMediaFolder(folder);
+  const prefix = normalizedFolder ?? `${now.getUTCFullYear()}/${String(now.getUTCMonth() + 1).padStart(2, "0")}`;
   const key = `${prefix}/${randomUUID()}-${slugifyFilename(filename)}`;
   const url = new URL(`${bucketUrl}/${key}`);
   url.searchParams.set("X-Amz-Expires", String(media.presignExpiry));
@@ -43,6 +45,7 @@ export default defineEventHandler(async (event) => {
   );
   return {
     key,
+    folder: normalizedFolder,
     uploadUrl: signed.url,
     method: "PUT",
     headers: { "content-type": contentType },

package/dist/runtime/server/api/media.post.js

@@ -2,6 +2,7 @@ import { defineEventHandler, readValidatedBody } from "h3";
 import { z } from "zod";
 import { useDb } from "#cms-db";
 import { cms_media } from "#cms-tables";
+import { normalizeMediaFolder } from "../../shared/index.js";
 import { objectKeySchema } from "../../shared/validation.js";
 import {
   assertMediaWritable,
@@ -32,7 +33,7 @@ export default defineEventHandler(async (event) => {
     width: body.width ?? null,
     height: body.height ?? null,
     alt: body.alt ?? null,
-    folder: body.folder ?? null
+    folder: normalizeMediaFolder(body.folder)
   };
   const [row] = await useDb().insert(cms_media).values(values).onConflictDoUpdate({ target: cms_media.key, set: values }).returning();
   return toMediaItem(row, publicUrl);

package/dist/runtime/server/api/media.put.js

@@ -3,6 +3,7 @@ import { createError, defineEventHandler, readValidatedBody } from "h3";
 import { z } from "zod";
 import { useDb } from "#cms-db";
 import { cms_media } from "#cms-tables";
+import { normalizeMediaFolder } from "../../shared/index.js";
 import { assertMediaWritable, toMediaItem, useMediaConfig } from "../utils/media.js";
 import { requireAdmin } from "../utils/require-admin.js";
 const bodySchema = z.object({
@@ -17,7 +18,7 @@ export default defineEventHandler(async (event) => {
   const body = await readValidatedBody(event, bodySchema.parse);
   const updates = {};
   if (body.alt !== void 0) updates.alt = body.alt;
-  if (body.folder !== void 0) updates.folder = body.folder;
+  if (body.folder !== void 0) updates.folder = normalizeMediaFolder(body.folder);
   if (Object.keys(updates).length === 0) {
     throw createError({ statusCode: 400, statusMessage: "No fields to update" });
   }

package/dist/runtime/shared/index.d.ts

@@ -15,6 +15,8 @@ export declare function mediaTypeFor(mime: string | null | undefined, key: strin
 export declare function mediaIconFor(type: MediaType): string;
 export declare function mediaPublicUrl(baseUrl: string | null | undefined, key: string): string | null;
 export declare function slugify(value: string): string;
+export declare const MEDIA_FOLDER_MAX_DEPTH = 4;
+export declare function normalizeMediaFolder(value: string | null | undefined): string | null;
 export interface MediaItem {
     id: number;
     key: string;

package/dist/runtime/shared/index.js

@@ -44,6 +44,12 @@ export function mediaPublicUrl(baseUrl, key) {
 export function slugify(value) {
   return value.toLowerCase().normalize("NFKD").replace(/[\u0300-\u036F]/g, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
+export const MEDIA_FOLDER_MAX_DEPTH = 4;
+export function normalizeMediaFolder(value) {
+  if (!value) return null;
+  const segments = value.split("/").map(slugify).filter(Boolean).slice(0, MEDIA_FOLDER_MAX_DEPTH);
+  return segments.length ? segments.join("/") : null;
+}
 export function isTranslatableField(field) {
   return !!field.translatable && (field.type === "text" || field.type === "richtext");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "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)",
@@ -60,12 +60,13 @@
     "dist"
   ],
   "dependencies": {
+    "@fontsource-variable/hanken-grotesk": "^5.3.0",
+    "@fontsource/fragment-mono": "^5.3.0",
     "@libsql/client": "^0.17.4",
     "@nuxt/kit": "^4.4.8",
     "@tailwindcss/vite": "^4.3.2",
     "@tiptap/starter-kit": "^3.0.0",
     "@tiptap/vue-3": "^3.0.0",
-    "tailwindcss": "^4.3.2",
     "aws4fetch": "^1.0.20",
     "better-sqlite3": "^12.2.0",
     "drizzle-kit": "^0.31.0",
@@ -76,6 +77,7 @@
     "jiti": "^2.7.0",
     "nuxt-auth-utils": "^0.5.29",
     "pg": "^8.16.0",
+    "tailwindcss": "^4.3.2",
     "vite-svg-loader": "^5.1.0",
     "zod": "^4.0.0"
   },