miolo 3.0.0-beta.162 → 3.0.0-beta.164

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "3.0.0-beta.162",
+  "version": "3.0.0-beta.164",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [
@@ -63,7 +63,7 @@
     "@vitejs/plugin-react": "^5.1.4",
     "autoprefixer": "^10.4.27",
     "cacheiro": "^0.5.0-beta.11",
-    "calustra": "^1.0.0-beta.13",
+    "calustra": "^1.0.0-beta.14",
     "cron": "^4.4.0",
     "deepmerge": "^4.3.1",
     "diskspace": "^2.0.0",

package/template/.env

@@ -58,7 +58,7 @@ MIOLO_DB_POOL_IDLE_TIMEOUT_MS=10000
 # Logging
 #
 
-MIOLO_LOG_LEVEL=debug
+MIOLO_LOG_LEVEL=info
 MIOLO_LOG_CONSOLE_ENABLED=true
 MIOLO_LOG_FILE_ENABLED=false
 MIOLO_LOG_MAIL_ENABLED=false

package/template/biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.6/schema.json",
   "files": {
     "includes": [
       "**/*",

package/template/package.json

@@ -44,9 +44,9 @@
     "intre": "^3.0.0-beta.4",
     "joi": "^18.0.2",
     "lucide-react": "^0.577.0",
-    "miolo-cli": "^3.0.0-beta.162",
+    "miolo-cli": "^3.0.0-beta.164",
     "miolo-model": "file:../miolo-model",
-    "miolo-react": "^3.0.0-beta.162",
+    "miolo-react": "^3.0.0-beta.164",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "^19.2.4",
@@ -60,7 +60,8 @@
     "tw-animate-css": "^1.4.0"
   },
   "devDependencies": {
-    "miolo": "^3.0.0-beta.162",
+    "@biomejs/biome": "2.4.6",
+    "miolo": "^3.0.0-beta.164",
     "sass-embedded": "^1.97.3"
   },
   "overrides": {

package/template/src/cli/context/data/DataProvider.jsx

@@ -4,17 +4,18 @@ import TodoList from "#ns/models/TodoList.mjs"
 import DataContext from "./DataContext.jsx"
 
 const DataProvider = ({ children }) => {
-  const [status, setStatus] = useState("loaded")
   const [breads, setBreads] = useState([])
   const { useSsrData } = useSessionContext()
 
-  const [todos, _setTodos, refreshTodos] = useSsrData("todos", {
-    loader: async (_context, fetcher) => {
-      setStatus("loading")
-      const { data: nTodos } = await fetcher.get("/api/todo/list")
-      setStatus("loaded")
-      return new TodoList(nTodos)
-    }
+  const {
+    data: lastTodos,
+    refresh: refreshLastTodos,
+    ready
+  } = useSsrData("lastTodos", {
+    url: "/api/todo/list",
+    params: { options: { limit: 4 } },
+    model: TodoList,
+    modifier: (data) => data.sort((a, b) => b.created_at - a.created_at)
   })
 
   const setTitle = useCallback((title) => {
@@ -26,10 +27,10 @@ const DataProvider = ({ children }) => {
   return (
     <DataContext.Provider
       value={{
-        todos,
-        refreshTodos,
-        loading: status !== "loaded",
-        loaded: status === "loaded",
+        lastTodos,
+        refreshLastTodos,
+        loading: !ready,
+        loaded: ready,
         breads,
         setBreads,
         setTitle

package/template/src/cli/layout/nav-last-todos.jsx

@@ -1,6 +1,5 @@
 "use client"
 import { Cable, ChartSpline, ChevronRight, HousePlug, Route, RouteOff } from "lucide-react"
-import { useMemo } from "react"
 import { Link } from "react-router"
 
 import {
@@ -21,11 +20,7 @@ import {
 import useDataContext from "#cli/context/data/useDataContext.mjs"
 
 export function NavLastTodos() {
-  const { todos } = useDataContext()
-
-  const lastTodos = useMemo(() => {
-    return todos.sort((a, b) => b.created_at - a.created_at).slice(0, 5)
-  }, [todos])
+  const { lastTodos } = useDataContext()
 
   return (
     <SidebarGroup>

package/template/src/cli/pages/todos/context/TodosProvider.jsx

@@ -4,13 +4,18 @@ import TodoList from "#ns/models/TodoList.mjs"
 import TodosContext from "./TodosContext.jsx"
 
 const TodosProvider = ({ children }) => {
-  const [status, setStatus] = useState("loaded")
+  // const [status, setStatus] = useState("loaded")
   const { useSsrData, fetcher, authenticated } = useSessionContext()
   const [useCrud, setUseCrud] = useState(true)
 
-  const [todoList, setTodoList, refreshTodoList] = useSsrData("todos", {
+  const {
+    data: todoList,
+    setData: setTodoList,
+    refresh: refreshTodoList,
+    ready
+  } = useSsrData("todos", {
     loader: async (_context, fetcher) => {
-      setStatus("loading")
+      //setStatus("loading")
       let data
       if (useCrud) {
         const res = await fetcher.read("/crud/todo")
@@ -18,7 +23,7 @@ const TodosProvider = ({ children }) => {
       } else {
         data = await fetcher.get("/api/todo/list")
       }
-      setStatus("loaded")
+      //setStatus("loaded")
       return new TodoList(data.sort((a, b) => b.created_at - a.created_at))
     }
   })
@@ -53,7 +58,7 @@ const TodosProvider = ({ children }) => {
       async function toggleIt() {
         const nTodoList = [...todoList]
         const selectedTodoIndex = nTodoList.findIndex((item) => item.id === todoId)
-        nTodoList[selectedTodoIndex].done = !nTodoList[selectedTodoIndex].done
+        nTodoList[selectedTodoIndex].toggle()
 
         setTodoList(nTodoList)
 
@@ -120,8 +125,8 @@ const TodosProvider = ({ children }) => {
       value={{
         todoList,
         refreshTodoList,
-        loading: status !== "loaded",
-        loaded: status === "loaded",
+        loading: !ready,
+        loaded: ready,
         addTodo,
         toggleTodo,
         removeTodo,

package/template/src/ns/models/Todo.mjs

@@ -10,6 +10,9 @@ export default class Todo extends MioloModel {
   get done() {
     return this._get("done", false)
   }
+  toggle() {
+    this._set("done", !this.done)
+  }
 
   get createdAt() {
     return this._get("created_at")

package/template/src/server/db/io/todos/find.mjs

@@ -1,13 +1,9 @@
 import { db_todo_read } from "./read.mjs"
 
 export async function db_todo_find(ctx, params) {
-  ctx.miolo.logger.verbose(`[db_todo_find] id: ${params?.id}`)
+  ctx.miolo.logger.verbose(`[db_todo_find] id: ${params?.filter?.id}`)
 
-  const filter = {
-    id: params.id
-  }
-
-  const todos = await db_todo_read(ctx, filter)
+  const todos = await db_todo_read(ctx, params)
 
   if (todos.length === 0) {
     return null

package/template/src/server/db/io/todos/read.mjs

@@ -9,44 +9,55 @@ import { bool_null, opt_int, opt_str_null } from "#server/utils/schema.mjs"
  *    description
  *    done
  * }
+ * options {
+ *    limit : optional int
+ * }
  */
-async function _db_todo_read(ctx, filter) {
-  ctx.miolo.logger.verbose(`[db_todo_read] Reading todos...`)
-  ctx.miolo.logger.silly(`[db_todo_read] filter: ${JSON.stringify(filter)}`)
+async function _db_todo_read(ctx, { filter, options }) {
+  try {
+    ctx.miolo.logger.verbose(
+      `[db_todo_read] Reading todos with filter: ${JSON.stringify(filter)} and options ${JSON.stringify(options)}`
+    )
 
-  const conn = await ctx.miolo.db.get_connection()
-  // TODO : handle transactions
-  const options = { transaction: undefined }
+    const conn = await ctx.miolo.db.get_connection()
 
-  let query = `
-    SELECT *
-      FROM todo AS t
-      *WHERE*`
+    let query = `
+      SELECT *
+        FROM todo AS t
+        *WHERE*`
 
-  const [where, values] = make_query_filter(
-    filter,
-    {
-      todo_id: { alias: "t.id" },
-      description: { op: "~*" },
-      done: { coalesce: false, alias: "COALESCE(done, false)" }
-    },
-    {
-      fields: ["id", "todo_id", "description", "done"]
+    if (options?.limit !== undefined) {
+      query += ` LIMIT ${options.limit}`
     }
-  )
 
-  query = query.replace("*WHERE*", where)
+    const [where, values] = make_query_filter(
+      filter,
+      {
+        todo_id: { alias: "t.id" },
+        description: { op: "~*" },
+        done: { coalesce: false, alias: "COALESCE(done, false)" }
+      },
+      {
+        fields: ["id", "todo_id", "description", "done"]
+      }
+    )
+
+    query = query.replace("*WHERE*", where)
 
-  // if (values.length == 0){
-  //   ctx.miolo.logger.warn(`[prop_detail] Some filter must be specified`)
-  //   return []
-  // }
+    // if (values.length == 0){
+    //   ctx.miolo.logger.warn(`[prop_detail] Some filter must be specified`)
+    //   return []
+    // }
 
-  const todos = await conn.select(query, values, options)
+    const todos = await conn.select(query, values)
 
-  ctx.miolo.logger.verbose(`[db_todo_read] Read ${todos.length} todos`)
+    ctx.miolo.logger.verbose(`[db_todo_read] Read ${todos.length} todos`)
 
-  return todos
+    return todos
+  } catch (error) {
+    ctx.miolo.logger.error(`[db_todo_read] Error reading todos: ${error}`)
+    return []
+  }
 }
 
 /**
@@ -58,10 +69,15 @@ async function _db_todo_read(ctx, filter) {
  */
 
 const todo_read_schema = Joi.object({
-  id: opt_int,
-  todo_id: opt_int,
-  description: opt_str_null,
-  done: bool_null
+  filter: Joi.object({
+    id: opt_int,
+    todo_id: opt_int,
+    description: opt_str_null,
+    done: bool_null
+  }),
+  options: Joi.object({
+    limit: opt_int
+  })
 })
 
 export const db_todo_read = with_miolo_schema(_db_todo_read, todo_read_schema)

package/template/src/server/miolo/ssr/loader.mjs

@@ -1,15 +1,15 @@
 import { db_todo_read } from "#server/db/io/todos/read.mjs"
 
 const loader = async (ctx) => {
-  let todos = []
+  let lastTodos = []
 
   try {
-    todos = await db_todo_read(ctx, {})
-    todos = todos.sort((a, b) => b.created_at - a.created_at)
+    lastTodos = await db_todo_read(ctx, { options: { limit: 3 } })
+    lastTodos = lastTodos.sort((a, b) => b.created_at - a.created_at)
   } catch (_) {}
 
   const data = {
-    todos
+    lastTodos
   }
 
   return data

package/template/src/server/routes/index.mjs

@@ -2,7 +2,7 @@ import Joi from "joi"
 import { with_miolo_schema } from "miolo"
 import { r_todo_delete, r_todo_toggle_done, r_todo_upsave } from "./todos/mod.mjs"
 
-import { r_todo_find, r_todo_list } from "./todos/read.mjs"
+import { r_todo_find, r_todo_last, r_todo_list } from "./todos/read.mjs"
 import { r_todo_count_last_hours, r_todo_insert_fake } from "./todos/special.mjs"
 import { r_change_password, r_forgot, r_user_save } from "./users/user.mjs"
 
@@ -21,6 +21,7 @@ export default [
       { method: "POST", url: "/user/save", auth, callback: r_user_save },
 
       { method: "GET", url: "/todo/list", auth, callback: r_todo_list },
+      { method: "GET", url: "/todo/last", auth, callback: r_todo_last },
       { method: "GET", url: "/todo/findone", auth, callback: r_todo_find },
       { method: "POST", url: "/todo/upsave", auth, callback: r_todo_upsave },
       { method: "POST", url: "/todo/delete", auth, callback: r_todo_delete },

package/template/src/server/routes/todos/read.mjs

@@ -2,15 +2,12 @@ import { db_todo_find } from "#server/db/io/todos/find.mjs"
 import { db_todo_read } from "#server/db/io/todos/read.mjs"
 
 export async function r_todo_list(ctx, params) {
-  // const _p = ctx.miolo.parser
-  // TODO Use some filtering here, or caching
-
   try {
     ctx.miolo.logger.info(`[r_todo_list] Reading todo list`)
 
-    const res = await db_todo_read(ctx.miolo, params)
+    const res = await db_todo_read(ctx, params)
 
-    ctx.miolo.logger.info(`[r_todo_list] Read todo list`)
+    ctx.miolo.logger.info(`[r_todo_list] Read todo list (${res.length})`)
     return { ok: true, data: res }
   } catch (error) {
     ctx.miolo.logger.error(`[r_todo_list] Error reading todo list: ${error}`)
@@ -18,11 +15,25 @@ export async function r_todo_list(ctx, params) {
   }
 }
 
+export async function r_todo_last(ctx, params) {
+  try {
+    ctx.miolo.logger.info(`[r_todo_last] Reading last todos`)
+
+    const res = await db_todo_read(ctx, { options: { limit: 3 } })
+
+    ctx.miolo.logger.info(`[r_todo_last] Read last todos (${res.length})`)
+    return { ok: true, data: res }
+  } catch (error) {
+    ctx.miolo.logger.error(`[r_todo_last] Error reading last todos: ${error}`)
+    return { ok: false, error: error?.message }
+  }
+}
+
 export async function r_todo_find(ctx, params) {
   try {
     ctx.miolo.logger.info(`[r_todo_find] Reading todo for tid ${params?.id}`)
 
-    const todo = await db_todo_find(ctx.miolo, params)
+    const todo = await db_todo_find(ctx, { filter: { id: params?.id } })
 
     ctx.miolo.logger.info(`[r_todo_find] Read todo for tid ${params?.id}`)
     return { ok: todo?.id !== undefined, data: todo }