@nanokajs/core 1.9.0 → 1.12.2

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { D1Database } from '@cloudflare/workers-types';
 import { A as Adapter } from './types-D2QDVyks.js';
-import { F as Field, I as InferFieldType, a as FieldPolicy, R as RelationDef } from './factories-CiYoD7dl.js';
-export { b as FieldModifiers, c as IsRelationField, d as RelationFieldBuilder, e as RelationKind, f as RelationTargetLike, t } from './factories-CiYoD7dl.js';
+import { F as Field, I as InferFieldType, b as FieldPolicy, R as RelationDef } from './factories-D7estT7E.js';
+export { a as FieldModifiers, c as IsRelationField, d as RelationFieldBuilder, e as RelationKind, f as RelationTargetLike, t } from './factories-D7estT7E.js';
 import { Hook } from '@hono/zod-validator';
 import { SQL } from 'drizzle-orm';
 import { SQLiteTableWithColumns, AnySQLiteColumn } from 'drizzle-orm/sqlite-core';
@@ -114,12 +114,13 @@ type WithResult<Fields extends Record<string, Field<any, any, any>>, With> = Row
 /**
  * Options for findMany query.
  * `limit` is required (no default).
- * `offset` defaults to 0 if omitted.
+ * `offset` defaults to 0 if omitted. Runtime-capped at 100_000 to prevent read amplification — use cursor pagination for deeper paging.
  * `orderBy` is optional for column ordering.
  * `where` accepts either an equality object or a Drizzle SQL expression.
  */
 interface FindManyOptions<Fields extends Record<string, Field<any, any, any>>, With extends WithOptions<Fields> | undefined = undefined> {
     readonly limit: number;
+    /** default: 0; runtime cap: 100000 */
     readonly offset?: number;
     readonly orderBy?: OrderBy<Fields>;
     readonly where?: Where<Fields> | SQL;
@@ -149,15 +150,26 @@ type OrderBy<Fields extends Record<string, Field<any, any, any>>> = (NonRelation
     readonly direction?: 'asc' | 'desc';
 }>;
 /**
- * Where clause object: each key is a field name, each value is the desired equality.
+ * A single where value: either an equality value or an `{ in: [...] }` operator for IN matching.
+ * Note: json fields whose stored value happens to be `{ in: [...] }` in shape are still treated
+ * as equality at runtime — the IN operator is applied to non-json fields only.
+ */
+type WhereValue<T> = T | {
+    readonly in: readonly T[];
+};
+/**
+ * Where clause object: each key is a field name, each value is the desired equality, or an
+ * `{ in: [...] }` operator for IN matching.
+ * json フィールドの値が偶然 `{ in: [...] }` 形でも型上は演算子と区別できないが、ランタイムでは
+ * json フィールドは常に等値比較される（IN 演算子は非 json フィールドのみ）。
  */
 type Where<Fields extends Record<string, Field<any, any, any>>> = {
-    readonly [K in NonRelationKeys<Fields>]?: InferFieldType<Fields[K]>;
+    readonly [K in NonRelationKeys<Fields>]?: WhereValue<InferFieldType<Fields[K]>>;
 };
 /**
- * Identifier or Where clause: can be a primary key value or a Where object.
+ * Identifier or Where clause: can be a primary key value, a Where object, or a Drizzle SQL expression.
  */
-type IdOrWhere<Fields extends Record<string, Field<any, any, any>>> = string | number | Where<Fields>;
+type IdOrWhere<Fields extends Record<string, Field<any, any, any>>> = string | number | Where<Fields> | SQL;
 /**
  * Row type: full record type from fields, excluding relation fields.
  */
@@ -219,7 +231,7 @@ type ServerOnlyKeys<Fields extends Record<string, Field<any, any, any>>> = {
 /**
  * @internal
  * Determines if a field is required for create input.
- * A field is optional if it has a default, is optional, or is readOnly.
+ * A field is optional if it has a default, has defaultNow, is optional, or is readOnly.
  *
  * Uses direct shape matching (`Field<any, { hasDefault: true }, any>`) to avoid
  * the TypeScript infer-widening issue where `infer M` resolves to `FieldModifiers`
@@ -228,6 +240,8 @@ type ServerOnlyKeys<Fields extends Record<string, Field<any, any, any>>> = {
  */
 type IsRequired<F extends Field<any, any, any>> = F extends Field<any, {
     hasDefault: true;
+}, any> ? false : F extends Field<any, {
+    defaultNow: true;
 }, any> ? false : F extends Field<any, {
     optional: true;
 }, any> ? false : F extends Field<any, {
@@ -238,7 +252,7 @@ type IsRequired<F extends Field<any, any, any>> = F extends Field<any, {
  * - `readOnly` fields are optional (library internals can pass them; API callers
  *   are excluded via inputSchema — but CreateInput itself keeps them as optional
  *   so handlers can supply generated values like `id` or `createdAt`)
- * - fields with `default` are optional
+ * - fields with `default` or `defaultNow` are optional (DB or runtime fills the value)
  * - fields marked `optional` are optional
  * - all other fields are required
  * - `serverOnly` fields are completely excluded (cannot be passed even internally)
@@ -475,7 +489,7 @@ interface Model<Fields extends Record<string, Field<any, any, any>>> {
     /**
      * Fetches multiple rows with pagination and optional ordering.
      * `limit` is required (no default) to prevent accidental unbounded queries.
-     * Offset defaults to 0 if omitted.
+     * Offset defaults to 0 if omitted. Runtime-capped at offset 100_000 — use cursor pagination for deeper paging.
      *
      * @example
      * const users = await User.findMany(adapter, { limit: 20 })
@@ -604,6 +618,7 @@ interface NanokaModel<Fields extends Record<string, Field<any, any, any>>> {
     /**
      * Fetches multiple rows with pagination and optional ordering.
      * `limit` is required (no default) to prevent accidental unbounded queries.
+     * Runtime-capped at offset 100_000 — use cursor pagination for deeper paging.
      */
     findMany<With extends WithOptions<Fields>>(options: FindManyOptions<Fields, With> & {
         readonly with: With;

package/dist/index.js

@@ -1,8 +1,8 @@
-export { t } from './chunk-SHPR4NTZ.js';
+export { t } from './chunk-UBDSGKTX.js';
 import { drizzle } from 'drizzle-orm/d1';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { SQL, asc, desc, eq, and, inArray } from 'drizzle-orm';
+import { SQL, asc, desc, inArray, eq, and } from 'drizzle-orm';
 import { HTTPException } from 'hono/http-exception';
 import { sqliteTable } from 'drizzle-orm/sqlite-core';
 import { Hono } from 'hono';
@@ -355,6 +355,7 @@ function buildTable(tableName, fields) {
 }
 
 // src/model/crud.ts
+var MAX_OFFSET = 1e5;
 function guardLimit(limit) {
   if (!Number.isInteger(limit)) {
     throw new HTTPException(400, { message: "limit must be an integer" });
@@ -399,6 +400,9 @@ function findPrimaryKey(fields) {
   }
   return [pkKey, pkField];
 }
+function isInOperator(value, field) {
+  return field?.kind !== "json" && typeof value === "object" && value !== null && !Array.isArray(value) && Object.hasOwn(value, "in") && Array.isArray(value.in);
+}
 function buildWhereClause(table, fields, where) {
   const conditions = [];
   for (const [key, value] of Object.entries(where)) {
@@ -409,7 +413,12 @@ function buildWhereClause(table, fields, where) {
       throw new HTTPException(400, { message: "invalid column in table" });
     }
     const col = table[key];
-    conditions.push(eq(col, value));
+    const field = fields[key];
+    if (isInOperator(value, field)) {
+      conditions.push(inArray(col, value.in));
+    } else {
+      conditions.push(eq(col, value));
+    }
   }
   if (conditions.length === 0) {
     return null;
@@ -523,6 +532,11 @@ async function loadRelations(adapter, _parentTable, parentFields, parentRows, wi
 async function findManyImpl(adapter, table, fields, options) {
   const limit = guardLimit(options.limit);
   const offset = options.offset !== void 0 ? guardOffset(options.offset) : 0;
+  if (offset > MAX_OFFSET) {
+    throw new HTTPException(400, {
+      message: `offset must be <= ${MAX_OFFSET}; use cursor pagination for deeper paging`
+    });
+  }
   let query = adapter.drizzle.select().from(table).limit(limit).offset(offset);
   if (options.where !== void 0) {
     if (options.where instanceof SQL) {
@@ -610,17 +624,22 @@ async function findAllImpl(adapter, table, fields, options) {
   return rows;
 }
 async function findOneImpl(adapter, table, fields, idOrWhere, options) {
-  let where = null;
-  if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
-    const pk = findPrimaryKey(fields);
-    if (!pk) {
-      throw new HTTPException(500, { message: "model has no primary key" });
-    }
-    where = { [pk[0]]: idOrWhere };
+  let whereClause;
+  if (idOrWhere instanceof SQL) {
+    whereClause = idOrWhere;
   } else {
-    where = idOrWhere;
+    let where;
+    if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
+      const pk = findPrimaryKey(fields);
+      if (!pk) {
+        throw new HTTPException(500, { message: "model has no primary key" });
+      }
+      where = { [pk[0]]: idOrWhere };
+    } else {
+      where = idOrWhere;
+    }
+    whereClause = buildWhereClause(table, fields, where);
   }
-  const whereClause = buildWhereClause(table, fields, where);
   if (!whereClause) {
     throw new HTTPException(400, { message: "where clause must not be empty" });
   }
@@ -638,39 +657,51 @@ async function findOneImpl(adapter, table, fields, idOrWhere, options) {
   return rows[0];
 }
 async function createImpl(adapter, table, data) {
-  const rows = await adapter.drizzle.insert(table).values(data).returning();
+  const builder = adapter.drizzle.insert(table).values(data).returning();
+  const rows = await builder;
   return rows[0];
 }
 async function updateImpl(adapter, table, fields, idOrWhere, data) {
-  let where = null;
-  if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
-    const pk = findPrimaryKey(fields);
-    if (!pk) {
-      throw new HTTPException(500, { message: "model has no primary key" });
-    }
-    where = { [pk[0]]: idOrWhere };
+  let whereClause;
+  if (idOrWhere instanceof SQL) {
+    whereClause = idOrWhere;
   } else {
-    where = idOrWhere;
+    let where;
+    if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
+      const pk = findPrimaryKey(fields);
+      if (!pk) {
+        throw new HTTPException(500, { message: "model has no primary key" });
+      }
+      where = { [pk[0]]: idOrWhere };
+    } else {
+      where = idOrWhere;
+    }
+    whereClause = buildWhereClause(table, fields, where);
   }
-  const whereClause = buildWhereClause(table, fields, where);
   if (!whereClause) {
     throw new HTTPException(400, { message: "where clause must not be empty" });
   }
-  const rows = await adapter.drizzle.update(table).set(data).where(whereClause).returning();
+  const builder = adapter.drizzle.update(table).set(data).where(whereClause).returning();
+  const rows = await builder;
   return rows.length > 0 ? rows[0] : null;
 }
 async function deleteImpl(adapter, table, fields, idOrWhere) {
-  let where = null;
-  if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
-    const pk = findPrimaryKey(fields);
-    if (!pk) {
-      throw new HTTPException(500, { message: "model has no primary key" });
-    }
-    where = { [pk[0]]: idOrWhere };
+  let whereClause;
+  if (idOrWhere instanceof SQL) {
+    whereClause = idOrWhere;
   } else {
-    where = idOrWhere;
+    let where;
+    if (typeof idOrWhere === "string" || typeof idOrWhere === "number") {
+      const pk = findPrimaryKey(fields);
+      if (!pk) {
+        throw new HTTPException(500, { message: "model has no primary key" });
+      }
+      where = { [pk[0]]: idOrWhere };
+    } else {
+      where = idOrWhere;
+    }
+    whereClause = buildWhereClause(table, fields, where);
   }
-  const whereClause = buildWhereClause(table, fields, where);
   if (!whereClause) {
     throw new HTTPException(400, { message: "where clause must not be empty" });
   }
@@ -708,7 +739,20 @@ function defineModel(tableName, fields) {
         accessor
       );
       const baseSchema = buildBaseObject(fields);
-      return applySchemaOptions(baseSchema, merged);
+      let schema = applySchemaOptions(baseSchema, merged);
+      if (usage === "create") {
+        const shape = schema.shape;
+        const patch = {};
+        for (const [key, field] of Object.entries(fields)) {
+          if (field.modifiers.defaultNow === true && field.modifiers.policy !== "readOnly" && key in shape) {
+            patch[key] = shape[key].optional();
+          }
+        }
+        if (Object.keys(patch).length > 0) {
+          schema = schema.extend(patch);
+        }
+      }
+      return schema;
     },
     outputSchema(opts) {
       const merged = derivePolicyOptions(fields, "output", opts, accessor);