evikit 2.8.1 → 2.9.1

package/README.md

@@ -232,12 +232,9 @@ import { ErrorPage } from "./routes/error.js";
 
 acceptLanguages();
 
-/** @param {{ lang?: string, url: string }} data */
-export async function prerender(data) {
-  return await ssr(App, data);
-}
+export const prerender = ssr(App);
 
-/** @param {{ dehydratedState?: ReturnType<import("evikit").dehydrate> | undefined, i18n: ReturnType<import("evikit").useI18n> }} props */
+/** @type {import("evikit").SsrApp} */
 function App({ dehydratedState, i18n }) {
   return h(
     Router,
@@ -484,12 +481,12 @@ import { QuestionIdGet } from "./types.js";
 export const QuestionIdServer = {
   get: endpoint(QuestionIdGet, async ({ input }) => {
     const i18n = await getI18n(input.lang);
-    const Question = db.Question.select({
+    const [question] = db.Question.select({
       with: { Choice: true },
+      where: { id: input.id },
     });
     // It maps join results to objects, for example you can get:
-    // Question[0]?.Choice[0]?.text
-    const question = Question.find(({ id }) => id == input.id);
+    // question?.Choice[0]?.text
     if (!question) {
       return text(i18n.gettext("Question does not exist"), 404);
     }
@@ -567,8 +564,7 @@ export const ChoiceServer = {
   post: endpoint(ChoicePost, async ({ input }) => {
     const i18n = await getI18n(input.lang);
 
-    const Question = db.Question.select();
-    const question = Question.find(({ id }) => id == input.questionId);
+    const [question] = db.Question.select({ where: { id: input.questionId } });
     if (!question) {
       return text(i18n.gettext("Question does not exist"), 400);
     }
@@ -649,8 +645,7 @@ export const VoteServer = {
   post: endpoint(VotePost, async ({ input }) => {
     const i18n = await getI18n(input.lang);
 
-    const Choice = db.Choice.select();
-    const choice = Choice.find(({ id }) => id == input.choiceId);
+    const [choice] = db.Choice.select({ where: { id: input.choiceId } });
     if (!choice) {
       return text(i18n.gettext("You didn't select a choice"), 400);
     }

package/db.d.ts

@@ -14,31 +14,17 @@ export type Db<
 > = {
   [Table in keyof R]: Table extends keyof F & keyof Schema & string
     ? {
-        delete(where: {
-          [K in keyof Schema[Table]["entries"]]?:
-            | InferOutput<Schema[Table]["entries"][K]>
-            | InferOutput<Schema[Table]["entries"][K]>[];
-        }): void;
+        delete(where: Where<Schema, Table>): void;
 
         select<
-          W extends Partial<Join<R, Table>> & {
-            where?: {
-              [K in keyof Schema[Table]["entries"]]?:
-                | InferOutput<Schema[Table]["entries"][K]>
-                | InferOutput<Schema[Table]["entries"][K]>[];
-            };
-          },
+          W extends Partial<Join<R, Table>> & { where?: Where<Schema, Table> },
         >(
           props?: W,
         ): Select<Schema, R, F, Table, W>[];
 
         update(query: {
           set: Partial<InferOutput<Schema[Table]>>;
-          where: {
-            [K in keyof Schema[Table]["entries"]]?:
-              | InferOutput<Schema[Table]["entries"][K]>
-              | InferOutput<Schema[Table]["entries"][K]>[];
-          };
+          where: Where<Schema, Table>;
         }): void;
 
         upsert(
@@ -164,6 +150,22 @@ export type Relations<Schema extends Record<string, ObjectSchema<any, any>>> = {
     : undefined;
 };
 
+export type Where<
+  // 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"]]?:
+    | InferOutput<Schema[Table]["entries"][K]>
+    | InferOutput<Schema[Table]["entries"][K]>[]
+    | Partial<
+        Record<
+          "gt" | "gte" | "lt" | "lte" | "not",
+          InferOutput<Schema[Table]["entries"][K]>
+        >
+      >;
+};
+
 type OmitExtends<T, U> = {
   [K in keyof T as T[K] extends U ? never : K]: T[K];
 };

package/index.d.ts

@@ -1,158 +1,167 @@
-import type { ClassAttributes, ComponentChildren, JSX, VNode } from "preact";
-
-import i18n from "gettext.js";
-
-import { flatten, primary, references, relations } from "./db.js";
-import { useApi } from "./use-api.js";
-import { useEnhance } from "./use-enhance.js";
-
-export interface DehydratedState {
-  queries: { queryHash: string; state: QueryState }[];
-}
-
-export interface QueryState {
-  data: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  dataUpdatedAt: number;
-  error: null | unknown;
-  isInvalidated: boolean;
-  status: "error" | "loading" | "success";
-}
-
-type H<T extends keyof JSX.IntrinsicElements> = (
-  props: (ClassAttributes<HTMLElement> & JSX.IntrinsicElements[T]) | null,
-  ...children: ComponentChildren[]
-) => VNode<ClassAttributes<HTMLElement> & JSX.IntrinsicElements[T]>;
-
-export function dehydrate(
-  queryClient: ReturnType<typeof useQueryClient>,
-  options: {
-    shouldRedactErrors: (error: unknown) => boolean;
-  },
-): DehydratedState;
-
-export function getI18n(...langs: string[]): Promise<i18n.Gettext>;
-
-export function hydrate(
-  App: (props: {
-    dehydratedState?: DehydratedState | undefined;
-    i18n: i18n.Gettext;
-  }) => VNode<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
-  renderTarget: string,
-): Promise<void>;
-
-export function Router({
-  children,
-  dehydratedState,
-  i18n,
-}: {
-  children?: ComponentChildren;
-  dehydratedState?: DehydratedState | undefined;
-  i18n: i18n.Gettext;
-}): VNode<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
-
-export function ssr(
-  App: (props: {
-    dehydratedState?: DehydratedState | undefined;
-    i18n: i18n.Gettext;
-  }) => VNode<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
-  data: { cookie?: string | undefined; lang?: string; url: string },
-): Promise<{
-  data: {
-    dehydratedState: DehydratedState;
-    lang?: string;
-    url: string;
-  };
-  head: {
-    elements: Set<{
-      props: Record<string, string>;
-      type: string;
-    }>;
-    lang: string;
-    title: string;
-  };
-  html: string;
-  links: Set<string> | undefined;
-}>;
-
-export function useI18n(): i18n.Gettext;
-
-export function useQueryClient(): {
-  invalidateQueries(): void;
-};
-
-export function useStatus(error: unknown): string;
-
-export const a: H<"a">;
-export const address: H<"address">;
-export const article: H<"article">;
-export const aside: H<"aside">;
-export const audio: H<"audio">;
-export const b: H<"b">;
-export const blockquote: H<"blockquote">;
-export const br: H<"br">;
-export const button: H<"button">;
-export const canvas: H<"canvas">;
-export const circle: H<"circle">;
-export const code: H<"code">;
-export const del: H<"del">;
-export const details: H<"details">;
-export const dialog: H<"dialog">;
-export const div: H<"div">;
-export const ellipse: H<"ellipse">;
-export const em: H<"em">;
-export const fieldset: H<"fieldset">;
-export const figcaption: H<"figcaption">;
-export const figure: H<"figure">;
-export const footer: H<"footer">;
-export const form: H<"form">;
-export const h1: H<"h1">;
-export const h2: H<"h2">;
-export const h3: H<"h3">;
-export const h4: H<"h4">;
-export const h5: H<"h5">;
-export const h6: H<"h6">;
-export const header: H<"header">;
-export const hgroup: H<"hgroup">;
-export const hr: H<"hr">;
-export const i: H<"i">;
-export const iframe: H<"iframe">;
-export const img: H<"img">;
-export const input: H<"input">;
-export const ins: H<"ins">;
-export const label: H<"label">;
-export const legend: H<"legend">;
-export const li: H<"li">;
-export const main: H<"main">;
-export const nav: H<"nav">;
-export const ol: H<"ol">;
-export const option: H<"option">;
-export const p: H<"p">;
-export const path: H<"path">;
-export const picture: H<"picture">;
-export const polyline: H<"polyline">;
-export const pre: H<"pre">;
-export const rect: H<"rect">;
-export const section: H<"section">;
-export const select: H<"select">;
-export const small: H<"small">;
-export const source: H<"source">;
-export const span: H<"span">;
-export const strong: H<"strong">;
-export const sub: H<"sub">;
-export const summary: H<"summary">;
-export const sup: H<"sup">;
-export const svg: H<"svg">;
-export const table: H<"table">;
-export const tbody: H<"tbody">;
-export const td: H<"td">;
-export const text: H<"text">;
-export const textarea: H<"textarea">;
-export const th: H<"th">;
-export const thead: H<"thead">;
-export const title: H<"title">;
-export const tr: H<"tr">;
-export const ul: H<"ul">;
-export const video: H<"video">;
-
-export { flatten, primary, references, relations };
-export { useApi, useEnhance };
+import type { ClassAttributes, ComponentChildren, JSX, VNode } from "preact";
+
+import i18n from "gettext.js";
+
+import { flatten, primary, references, relations } from "./db.js";
+import { useApi } from "./use-api.js";
+import { useEnhance } from "./use-enhance.js";
+
+export interface DehydratedState {
+  queries: { queryHash: string; state: QueryState }[];
+}
+
+export interface QueryState {
+  data: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  dataUpdatedAt: number;
+  error: null | unknown;
+  isInvalidated: boolean;
+  status: "error" | "loading" | "success";
+}
+
+export type SsrApp = (props: {
+  dehydratedState?: DehydratedState | undefined;
+  i18n: i18n.Gettext;
+}) => VNode<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+export interface SsrProps {
+  cookie?: string | undefined;
+  lang?: string;
+  url: string;
+}
+
+export interface SsrResponse {
+  data: {
+    dehydratedState: DehydratedState;
+    lang?: string;
+    url: string;
+  };
+  head: {
+    elements: Set<{
+      props: Record<string, string>;
+      type: string;
+    }>;
+    lang: string;
+    title: string;
+  };
+  html: string;
+  links: Set<string> | undefined;
+}
+
+type H<T extends keyof JSX.IntrinsicElements> = (
+  props: (ClassAttributes<HTMLElement> & JSX.IntrinsicElements[T]) | null,
+  ...children: ComponentChildren[]
+) => VNode<ClassAttributes<HTMLElement> & JSX.IntrinsicElements[T]>;
+
+export function dehydrate(
+  queryClient: ReturnType<typeof useQueryClient>,
+  options: {
+    shouldRedactErrors: (error: unknown) => boolean;
+  },
+): DehydratedState;
+
+export function getI18n(...langs: string[]): Promise<i18n.Gettext>;
+
+export function hydrate(
+  App: (props: {
+    dehydratedState?: DehydratedState | undefined;
+    i18n: i18n.Gettext;
+  }) => VNode<any>, // eslint-disable-line @typescript-eslint/no-explicit-any
+  renderTarget: string,
+): Promise<void>;
+
+export function Router({
+  children,
+  dehydratedState,
+  i18n,
+}: {
+  children?: ComponentChildren;
+  dehydratedState?: DehydratedState | undefined;
+  i18n: i18n.Gettext;
+}): VNode<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+/** @deprecated */
+export function ssr(App: SsrApp, props: SsrProps): Promise<SsrResponse>;
+export function ssr(App: SsrApp): (props: SsrProps) => Promise<SsrResponse>;
+
+export function useI18n(): i18n.Gettext;
+
+export function useQueryClient(): {
+  invalidateQueries(): void;
+};
+
+export function useStatus(error: unknown): string;
+
+export const a: H<"a">;
+export const address: H<"address">;
+export const article: H<"article">;
+export const aside: H<"aside">;
+export const audio: H<"audio">;
+export const b: H<"b">;
+export const blockquote: H<"blockquote">;
+export const br: H<"br">;
+export const button: H<"button">;
+export const canvas: H<"canvas">;
+export const circle: H<"circle">;
+export const code: H<"code">;
+export const del: H<"del">;
+export const details: H<"details">;
+export const dialog: H<"dialog">;
+export const div: H<"div">;
+export const ellipse: H<"ellipse">;
+export const em: H<"em">;
+export const fieldset: H<"fieldset">;
+export const figcaption: H<"figcaption">;
+export const figure: H<"figure">;
+export const footer: H<"footer">;
+export const form: H<"form">;
+export const h1: H<"h1">;
+export const h2: H<"h2">;
+export const h3: H<"h3">;
+export const h4: H<"h4">;
+export const h5: H<"h5">;
+export const h6: H<"h6">;
+export const header: H<"header">;
+export const hgroup: H<"hgroup">;
+export const hr: H<"hr">;
+export const i: H<"i">;
+export const iframe: H<"iframe">;
+export const img: H<"img">;
+export const input: H<"input">;
+export const ins: H<"ins">;
+export const label: H<"label">;
+export const legend: H<"legend">;
+export const li: H<"li">;
+export const main: H<"main">;
+export const nav: H<"nav">;
+export const ol: H<"ol">;
+export const option: H<"option">;
+export const p: H<"p">;
+export const path: H<"path">;
+export const picture: H<"picture">;
+export const polyline: H<"polyline">;
+export const pre: H<"pre">;
+export const rect: H<"rect">;
+export const section: H<"section">;
+export const select: H<"select">;
+export const small: H<"small">;
+export const source: H<"source">;
+export const span: H<"span">;
+export const strong: H<"strong">;
+export const sub: H<"sub">;
+export const summary: H<"summary">;
+export const sup: H<"sup">;
+export const svg: H<"svg">;
+export const table: H<"table">;
+export const tbody: H<"tbody">;
+export const td: H<"td">;
+export const text: H<"text">;
+export const textarea: H<"textarea">;
+export const th: H<"th">;
+export const thead: H<"thead">;
+export const title: H<"title">;
+export const tr: H<"tr">;
+export const ul: H<"ul">;
+export const video: H<"video">;
+
+export { flatten, primary, references, relations };
+export { useApi, useEnhance };