@umituz/web-hono 1.5.0 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umituz/web-hono",
3
- "version": "1.5.0",
3
+ "version": "1.7.0",
4
4
  "description": "API backend platform for Cloudflare Workers + Neon Postgres: createApi skeleton + error envelope layer, full-CRUD resource factory (opt-in create/remove, list params), schema→client type bridge (ClientRow), apiFetch/apiWrite client, reactive fetch-backed store (+React hooks), and db lifecycle scripts (reset / snapshot / seed)",
5
5
  "type": "module",
6
6
  "main": "./src/index.ts",
package/src/crud.ts CHANGED
@@ -40,6 +40,8 @@ export type CrudDbFactory = (c: RequestContext) => CrudDb;
40
40
 
41
41
  export type CrudTable = PgTable & { id: PgColumn; deletedAt: PgColumn };
42
42
 
43
+ export type OrderSpec = { col: PgColumn; dir?: 'asc' | 'desc' };
44
+
43
45
  /** Opt-in POST create: zod-validated body, server-generated uid, optional
44
46
  * request-scoped stamps (organizationId, createdBy…). */
45
47
  export interface CreateSpec {
@@ -55,8 +57,9 @@ export interface ListSpec {
55
57
  /** Path under /api, e.g. '/activities'. */
56
58
  path: string;
57
59
  table: PgTable & { deletedAt: PgColumn };
58
- /** List order; defaults to insertion order. */
59
- orderBy?: { col: PgColumn; dir?: 'asc' | 'desc' };
60
+ /** List order; defaults to insertion order. Array = multi-key
61
+ * (primary first, ties broken by the next key). */
62
+ orderBy?: OrderSpec | ReadonlyArray<OrderSpec>;
60
63
  /** Injectable db factory (tests, Hyperdrive). Default: per-request
61
64
  * drizzle(neon(c.env.DATABASE_URL)) — the 1.x behavior. */
62
65
  db?: CrudDbFactory;
@@ -85,7 +88,8 @@ export function listRoutes(spec: ListSpec): Hono<{ Bindings: ApiEnv }> {
85
88
  router.get(path, async (c) => {
86
89
  const db = getDb(c);
87
90
  const q = db.select().from(table).where(isNull(table.deletedAt)).$dynamic();
88
- if (orderBy) q.orderBy(orderBy.dir === 'desc' ? desc(orderBy.col) : asc(orderBy.col));
91
+ const orders = orderBy === undefined ? [] : Array.isArray(orderBy) ? orderBy : [orderBy];
92
+ if (orders.length > 0) q.orderBy(...orders.map((o) => (o.dir === 'desc' ? desc(o.col) : asc(o.col))));
89
93
  return c.json(await q);
90
94
  });
91
95
 
@@ -104,20 +108,16 @@ export function crudRoutes(spec: CrudSpec): Hono<{ Bindings: ApiEnv }> {
104
108
  // ?order=col | -col (leading '-' = desc) — whitelisted against the
105
109
  // table's own property columns; an explicit order overrides spec.orderBy.
106
110
  const orderParam = c.req.query('order');
107
- let orderCol: PgColumn | undefined;
108
- let dir: 'asc' | 'desc' = 'asc';
109
111
  if (orderParam !== undefined) {
110
112
  const wantDesc = orderParam.startsWith('-');
111
113
  const name = orderParam.slice(wantDesc ? 1 : 0);
112
114
  const found = (getTableColumns(table) as unknown as Record<string, PgColumn>)[name];
113
115
  if (!found) return c.json({ error: 'Invalid order column' }, 400);
114
- orderCol = found;
115
- dir = wantDesc ? 'desc' : 'asc';
116
+ q.orderBy(wantDesc ? desc(found) : asc(found));
116
117
  } else if (orderBy) {
117
- orderCol = orderBy.col;
118
- dir = orderBy.dir ?? 'asc';
118
+ const orders = Array.isArray(orderBy) ? orderBy : [orderBy];
119
+ q.orderBy(...orders.map((o) => (o.dir === 'desc' ? desc(o.col) : asc(o.col))));
119
120
  }
120
- if (orderCol) q.orderBy(dir === 'desc' ? desc(orderCol) : asc(orderCol));
121
121
 
122
122
  // ?limit/&offset= — absent params add no clauses: the 1.x query exactly.
123
123
  // offset without order follows the spec/default insertion order (the
package/src/validator.ts CHANGED
@@ -23,3 +23,15 @@ export function validateJson<S extends z.ZodType>(schema: S, message = 'Invalid
23
23
  return parsed.data as z.output<S>;
24
24
  };
25
25
  }
26
+
27
+ export const dateOnly = z.string().regex(/^\d{4}-\d{2}-\d{2}$/, 'expected YYYY-MM-DD');
28
+
29
+ export const hhmm = z.string().regex(/^([01]\d|2[0-3]):[0-5]\d$/, 'expected HH:MM');
30
+
31
+ export const datetimeLocal = z.string().regex(/^\d{4}-\d{2}-\d{2}T([01]\d|2[0-3]):[0-5]\d$/, 'expected YYYY-MM-DDTHH:MM');
32
+
33
+ export const datetimeSeconds = z.string().regex(/^\d{4}-\d{2}-\d{2}T([01]\d|2[0-3]):[0-5]\d:[0-5]\d$/, 'expected YYYY-MM-DDTHH:MM:SS');
34
+
35
+ export const hexColor = z.string().regex(/^#[0-9a-fA-F]{6}$/, 'expected #RRGGBB');
36
+
37
+ export const actorFields = { actorId: z.string().optional(), actorName: z.string().optional() } as const;