evikit 2.10.1 → 2.11.0

package/README.md

@@ -218,7 +218,7 @@ export function api() {
 
 #### Page router
 
-Add a Preact router at `src/app.js` (uncomment the routes one-by-one when we add them later):
+Add a Preact router at `src/prerender.js` (uncomment the routes one-by-one when we add them later):
 
 ```js
 import { route, ssr } from "evikit";
@@ -252,7 +252,7 @@ Make an HTML template `index.html`, leaving placeholders for server-rendered con
   </head>
   <body>
     <div id="app"><!--app-html--></div>
-    <script prerender type="module" src="/src/app.js"></script>
+    <script prerender type="module" src="/src/prerender.js"></script>
   </body>
 </html>
 ```
@@ -308,7 +308,7 @@ import { readFile } from "node:fs/promises";
 import swaggerUi from "swagger-ui-express";
 
 import { api } from "./src/api.js";
-import { prerender } from "./src/app.js";
+import { prerender } from "./src/prerender.js";
 
 const app = express();
 app.use(api().onRequest);
@@ -433,7 +433,7 @@ export function HomePage() {
 }
 ```
 
-Uncomment the `HomePage` import and `/` route in `src/app.js`.
+Uncomment the `HomePage` import and `/` route in `src/prerender.js`.
 
 #### Forms
 
@@ -524,7 +524,7 @@ export function QuestionIdPage() {
 }
 ```
 
-Uncomment the `QuestionIdPage` import and `/question/:id` route in `src/app.js`.
+Uncomment the `QuestionIdPage` import and `/question/:id` route in `src/prerender.js`.
 
 ##### Suggest own option
 
@@ -789,8 +789,9 @@ import { ok } from "node:assert/strict";
 
 // ...
 
-const Question = db.Question.select({
+const [question] = db.Question.select({
   with: { Choice: { with: { iconStorage: true } } },
+  where: { id: input.id },
 });
 
 // ...

package/db.d.ts

@@ -17,7 +17,12 @@ export type Db<
         delete(where: Where<Schema, Table>): void;
 
         select<
-          W extends Partial<Join<R, Table>> & { where?: Where<Schema, Table> },
+          W extends Partial<Join<R, Table>> & {
+            limit?: number;
+            offset?: number;
+            order?: Order<Schema, Table>;
+            where?: Where<Schema, Table>;
+          },
         >(
           props?: W,
         ): Select<Schema, R, F, Table, W>[];
@@ -93,6 +98,14 @@ export type Join<Relations, Self extends keyof Relations> = UnionToIntersection<
   }[keyof Relations[Self]]
 >;
 
+export type Order<
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  Schema extends Record<string, ObjectSchema<any, any>>,
+  Table extends keyof Schema,
+> =
+  | { [K in keyof Schema[Table]["entries"]]?: null | { desc: true } }
+  | { [K in keyof Schema[Table]["entries"]]?: null | { desc: true } }[];
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Relations<Schema extends Record<string, ObjectSchema<any, any>>> = {
   [Self in keyof Schema]: Self extends string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "evikit",
   "description": "Preact/SQLite SSR framework for small web apps",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "type": "module",
   "exports": {
     ".": "./index.js",

package/sqlite.js

@@ -391,17 +391,35 @@ export function sqlite({ pkg, schema }) {
   };
 }
 
-/** @type {<Schema extends Record<string, import("valibot").ObjectSchema<any, any>>, R extends import("./db.d.ts").Relations<Schema> = import("./db.d.ts").Relations<Schema>, F extends import("./db.d.ts").Flatten<Schema> = import("./db.d.ts").Flatten<Schema>, Table extends keyof F & keyof Schema = keyof F & keyof Schema >(props: { database: DatabaseSync; flat: F; join?: import("./db.d.ts").Join<R, Table> & { where?: import("./db.d.ts").Where<Schema, Table> }; schema: Schema; table: Table; }) => any[]} */
+/** @type {<Schema extends Record<string, import("valibot").ObjectSchema<any, any>>, R extends import("./db.d.ts").Relations<Schema> = import("./db.d.ts").Relations<Schema>, F extends import("./db.d.ts").Flatten<Schema> = import("./db.d.ts").Flatten<Schema>, Table extends keyof F & keyof Schema = keyof F & keyof Schema >(props: { database: DatabaseSync; flat: F; join?: import("./db.d.ts").Join<R, Table> & { limit?: number, offset?: number, order?: import("./db.d.ts").Order<Schema, Table>, where?: import("./db.d.ts").Where<Schema, Table> }; schema: Schema; table: Table; }) => any[]} */
 function select(props) {
   ok(typeof props.table == "string");
-  let alias = `${props.table}_0`;
-  let sql = `from ${props.table} ${alias}`;
+  let sql =
+    `select * from ${props.table}` +
+    whereQuery({ where: props.join?.where }) +
+    (props.join?.order
+      ? "\norder by " +
+        (Array.isArray(props.join.order)
+          ? props.join.order
+          : [props.join.order]
+        )
+          .flatMap((column) =>
+            Object.entries(column).map(([name, props]) =>
+              props?.desc ? `${name} desc` : name,
+            ),
+          )
+          .join(", ")
+      : "") +
+    (props.join?.offset ? `\noffset ${props.join.offset}` : "") +
+    (props.join?.limit ? `\nlimit ${props.join.limit}` : "");
 
+  let alias = `${props.table}_0`;
   let columns = Object.keys(
     /** @type {any} */ (props.schema)[props.table].entries,
   );
   if (/** @type {any} */ (props.join)?.with) {
     columns = columns.map((name) => `${alias}.${name} ${alias}_${name}`);
+    sql = `select COLUMNS\nfrom (${sql}) ${alias}`;
   }
 
   /** @type {Record<string, { entities: any[]; table: string }>} */
@@ -446,11 +464,8 @@ function select(props) {
       }
     }
   }
-
   join(0, props.table, alias, /** @type {any} */ (props.join));
-  sql =
-    `select ${columns.join(",\n")} ${sql}` +
-    whereQuery({ alias, where: props.join?.where });
+  sql = sql.replace("COLUMNS", columns.join(",\n  "));
 
   const rows = props.database
     .prepare(sql)