@everystack/api 0.4.5 → 0.4.7

package/CHANGELOG.md

@@ -4,6 +4,45 @@ All notable changes to `@everystack/api` are documented here.
 
 Format based on [Keep a Changelog](https://keepachangelog.com/).
 
+## [0.4.7] - 2026-10-18
+
+### BREAKING CHANGES
+
+- date filters no longer throw; refuse impossible calendar dates; map 22007 and 22008 to 422
+- list fields sort by default; the API refuses an order it cannot apply (#92)
+- datetimes show in the viewer's zone and edit round-trip in it (#94)
+
+### Added
+
+- HandlerError carries a machine-readable code and column on RPC answers
+
+### Fixed
+
+- hiddenColumns accepts the camelCase of a column's SQL name; an ambiguous alias refuses at init
+
+### Changed
+
+- move HandlerError to its own import-free module, @everystack/api/errors
+
+## [0.4.6] - 2026-10-16
+
+### BREAKING CHANGES
+
+- an undeclared embed in select now answers 400 instead of a 200 with the embed dropped
+- a JSON-path filter that cannot be built now answers 400 instead of being dropped; a DELETE or PATCH with such a filter used to run on the remaining filters alone
+
+### Added
+
+- cs, cd and ov array filter operators on text[] and varchar[] columns
+
+### Fixed
+
+- map integrity errors to safe client refusals
+- preserve legacy errors alongside integrity mapping
+- protect integrity diagnostics across failing tables
+- show integrity errors under matching form fields
+- the integrity mapper follows nested causes and keeps legacy hostile-value answers
+
 ## [0.4.5] - 2026-10-15
 
 ### BREAKING CHANGES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/api",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "PostgREST-compatible HTTP handler + typed fetch client for Drizzle ORM",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",
@@ -27,6 +27,11 @@
       "types": "./src/handler/index.ts",
       "default": "./src/handler/index.ts"
     },
+    "./errors": {
+      "source": "./src/handler/errors.ts",
+      "types": "./src/handler/errors.ts",
+      "default": "./src/handler/errors.ts"
+    },
     "./client": {
       "source": "./src/client/index.ts",
       "types": "./src/client/index.ts",

package/src/client/index.ts

@@ -27,6 +27,9 @@ export interface ClientOptions {
 export interface ClientError {
   status: number;
   message: string;
+  code?: string;
+  constraint?: string;
+  column?: string;
 }
 
 export interface ClientResponse<T> {
@@ -337,7 +340,13 @@ function parseContentRange(header: string | null): number {
 
 async function parseError(response: Response): Promise<ClientError> {
   const body = await response.json().catch(() => ({}));
-  return { status: response.status, message: body.message || response.statusText };
+  return {
+    status: response.status,
+    message: body.message || response.statusText,
+    ...(typeof body.code === 'string' ? { code: body.code } : {}),
+    ...(typeof body.constraint === 'string' ? { constraint: body.constraint } : {}),
+    ...(typeof body.column === 'string' ? { column: body.column } : {}),
+  };
 }
 
 function buildUrl(

package/src/handler/array-literal.ts

@@ -0,0 +1,58 @@
+/** Most elements an array filter value may list. A longer list is refused. */
+export const ARRAY_LITERAL_MAX_ELEMENTS = 100;
+/** Most characters one element may hold, after unescaping. A longer one is refused. */
+export const ARRAY_LITERAL_MAX_ELEMENT_LENGTH = 200;
+
+const UNQUOTED_FORBIDDEN = new Set(['{', '}', '"', '\\']);
+
+/**
+ * Parse the PostgREST array value of a cs/cd/ov filter: `{a,b}`, `{"a,b","c\"d"}`, `{}`.
+ *
+ * An element is either unquoted (non-empty; no comma, brace, double quote, backslash or
+ * edge whitespace) or double-quoted, where `\"` and `\\` are the only escapes. Returns
+ * null for anything else, or past the element and length caps. The caller binds the
+ * result as one parameter; this text never reaches SQL.
+ */
+export function parseArrayLiteral(value: string): string[] | null {
+  if (value.length < 2 || value[0] !== '{' || value[value.length - 1] !== '}') return null;
+  const body = value.slice(1, -1);
+  if (body === '') return [];
+
+  const elements: string[] = [];
+  let i = 0;
+  for (;;) {
+    if (elements.length === ARRAY_LITERAL_MAX_ELEMENTS) return null;
+    let element = '';
+    if (body[i] === '"') {
+      i++;
+      for (;;) {
+        if (i >= body.length) return null;
+        const char = body[i];
+        if (char === '"') { i++; break; }
+        if (char === '\\') {
+          const next = body[i + 1];
+          if (next !== '"' && next !== '\\') return null;
+          element += next;
+          i += 2;
+        } else {
+          element += char;
+          i++;
+        }
+        if (element.length > ARRAY_LITERAL_MAX_ELEMENT_LENGTH) return null;
+      }
+    } else {
+      const start = i;
+      while (i < body.length && body[i] !== ',') {
+        if (UNQUOTED_FORBIDDEN.has(body[i])) return null;
+        i++;
+      }
+      element = body.slice(start, i);
+      if (element === '' || /^\s|\s$/.test(element)) return null;
+      if (element.length > ARRAY_LITERAL_MAX_ELEMENT_LENGTH) return null;
+    }
+    elements.push(element);
+    if (i === body.length) return elements;
+    if (body[i] !== ',') return null;
+    i++;
+  }
+}

package/src/handler/errors.ts

@@ -0,0 +1,39 @@
+/**
+ * HandlerError lives in its own module with no imports, so code that only needs to throw one
+ * (the admin's RPC factory) does not pull the whole server handler into its bundle.
+ */
+
+/** An application error code: lower-case words, never a Postgres SQLSTATE or a system errno. */
+const APP_ERROR_CODE = /^[a-z][a-z0-9_]{0,63}$/;
+const isAppErrorCode = (value: unknown): value is string => typeof value === 'string' && APP_ERROR_CODE.test(value);
+const isAppErrorColumn = (value: unknown): value is string =>
+  typeof value === 'string' && value.length >= 1 && value.length <= 128 && !/[\u0000-\u001f\u007f-\u009f]/.test(value);
+
+const appErrorMetadata = new WeakMap<object, { readonly code?: string; readonly column?: string }>();
+const EMPTY_METADATA: { readonly code?: string; readonly column?: string } = Object.freeze(Object.create(null));
+
+/** Throw from hooks or RPCs to return a custom status and message; RPCs also expose optional metadata. */
+export class HandlerError extends Error {
+  status: number;
+  constructor(status: number, message: string, options?: { code?: string; column?: string }) {
+    super(message);
+    const code = options?.code;
+    const column = options?.column;
+    if (code !== undefined && !isAppErrorCode(code)) {
+      throw new TypeError('HandlerError code must match /^[a-z][a-z0-9_]{0,63}$/');
+    }
+    if (column !== undefined && !isAppErrorColumn(column)) {
+      throw new TypeError('HandlerError column must be 1 to 128 characters with no control characters');
+    }
+    this.status = status;
+    this.name = 'HandlerError';
+    // Held outside the instance: only what the author passed here is ever sent, and no property
+    // or getter on the error can change it afterwards.
+    appErrorMetadata.set(this, Object.freeze({ code, column }));
+  }
+
+  /** The `code` and `column` given to the constructor. Anything assigned to the error later is not here. */
+  static metadataOf(error: HandlerError): { code?: string; column?: string } {
+    return appErrorMetadata.get(error) ?? EMPTY_METADATA;
+  }
+}

package/src/handler/index.ts

@@ -7,7 +7,9 @@
  *   // Mount as Expo Router API route or any Web Standard handler
  */
 
-import { eq, ne, gt, gte, lt, lte, like, ilike, isNull, isNotNull, inArray, and, or, not, asc, desc, sql, getTableColumns, type SQL } from 'drizzle-orm';
+import { eq, ne, gt, gte, lt, lte, like, ilike, isNull, isNotNull, inArray, arrayContains, arrayContained, arrayOverlaps, and, or, not, asc, desc, sql, getTableColumns, is, Param, type SQL } from 'drizzle-orm';
+import { getTableConfig, PgTable } from 'drizzle-orm/pg-core';
+import { parseArrayLiteral, ARRAY_LITERAL_MAX_ELEMENTS, ARRAY_LITERAL_MAX_ELEMENT_LENGTH } from './array-literal';
 import { emitAudit, resolvePrincipal, type AuditConfig, type RequestContext } from './audit';
 import { isServiceUnavailable, SERVICE_UNAVAILABLE_MESSAGE } from './service-unavailable';
 import { isPermissionDenied, safeRead, UNREADABLE } from './thrown';
@@ -24,15 +26,8 @@ type Schema = Record<string, DrizzleTable>;
 
 type Handler = (request: Request) => Promise<Response>;
 
-/** Throw from hooks to return a custom status code and message to the client. */
-export class HandlerError extends Error {
-  status: number;
-  constructor(status: number, message: string) {
-    super(message);
-    this.status = status;
-    this.name = 'HandlerError';
-  }
-}
+export { HandlerError } from './errors';
+import { HandlerError } from './errors';
 
 /**
  * A 5xx system fault surfaced to the observability sink. Distinct from a 4xx
@@ -176,13 +171,18 @@ function describeError(error: unknown): Pick<HandlerFault, 'message' | 'stack' |
 }
 
 /** Replace schema-revealing error details with a generic message when hideSchemaErrors is enabled. */
-function sanitizeError(message: string, status: number, options?: HandlerOptions): Response {
+function sanitizeError(
+  message: string,
+  status: number,
+  options?: HandlerOptions,
+  extra?: { code: string; column: string },
+): Response {
   if (options?.hideSchemaErrors) {
     if (status === 404) return json({ message: 'Not found' }, 404);
     if (status === 403) return json({ message: 'Forbidden' }, 403);
-    if (status === 400) return json({ message: 'Bad request' }, 400);
+    if (status === 400) return json({ message: 'Bad request', ...extra }, 400);
   }
-  return json({ message }, status);
+  return json({ message, ...extra }, status);
 }
 
 export interface AuthConfig {
@@ -392,6 +392,9 @@ export interface HandlerOptions {
   /** When true, error messages hide internal details (table names, column names, operators).
    *  Enable in production to prevent schema enumeration. Default: false. */
   hideSchemaErrors?: boolean;
+  /** App-approved messages keyed by PostgreSQL constraint name. These may expose an
+   *  optional column even with hideSchemaErrors; hiddenColumns always wins. */
+  constraintMessages?: Record<string, string | { message: string; column?: string }>;
   /** Forensic audit logging (distinct from observability). When a sink is set,
    *  records every non-GET request (writes + RPCs) — the query, not the response —
    *  to an app-provided append-only sink, stamped with the trace-id (`x-amz-cf-id`).
@@ -714,6 +717,48 @@ function transformBodyKeys(body: unknown, table: DrizzleTable): unknown {
  */
 const ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2}))?$/;
 
+/**
+ * The one date rule, shared by a write body and a query-string filter so the two cannot
+ * drift: the Date for `value`, or the 400 message naming `key`.
+ */
+function parseDateValue(key: string, value: string | number): Date | { error: string } {
+  if (typeof value === 'string' && !ISO_DATE_RE.test(value)) {
+    return { error: `Invalid date value for "${key}": expected ISO 8601, got ${JSON.stringify(value)}` };
+  }
+  const parsed = new Date(value);
+  if (Number.isNaN(parsed.getTime())) {
+    return { error: `Invalid date value for "${key}": ${JSON.stringify(value)}` };
+  }
+  if (typeof value === 'string' && !isCalendarDate(value.slice(0, 10))) {
+    return { error: `Invalid date value for "${key}": ${value.slice(0, 10)} is not a calendar date` };
+  }
+  return parsed;
+}
+
+/**
+ * The YYYY-MM-DD digits as written name a real day. `new Date('2026-02-29')` rolls over to
+ * 1 March with no error, which would match or store the wrong day; PostgreSQL refuses it.
+ * Checked on the digits before any offset is applied.
+ */
+function isCalendarDate(ymd: string): boolean {
+  const [year, month, day] = ymd.split('-').map(Number);
+  const probe = new Date(0);
+  probe.setUTCFullYear(year, month - 1, day);
+  return probe.getUTCFullYear() === year && probe.getUTCMonth() === month - 1 && probe.getUTCDate() === day;
+}
+
+/**
+ * A JSON boolean, array or plain object: never a date, and the date encoder throws on it.
+ * A Date or a drizzle SQL/Param a hook set has a class prototype and is not one of these.
+ */
+function isJsonShape(value: unknown): boolean {
+  if (typeof value === 'boolean' || Array.isArray(value)) return true;
+  if (value === null || typeof value !== 'object') return false;
+  // Plain from any realm: a parsed body's Object.prototype need not be this module's.
+  const proto = Object.getPrototypeOf(value);
+  return proto === null || Object.getPrototypeOf(proto) === null;
+}
+
 function coerceDateColumnValues(body: unknown, table: DrizzleTable): unknown {
   if (Array.isArray(body)) return body.map(row => coerceDateColumnValues(row, table));
   if (body === null || typeof body !== 'object') {
@@ -722,16 +767,14 @@ function coerceDateColumnValues(body: unknown, table: DrizzleTable): unknown {
 
   const result: Record<string, unknown> = { ...(body as Record<string, unknown>) };
   for (const [key, value] of Object.entries(result)) {
-    if (typeof value !== 'string' && typeof value !== 'number') continue;
+    if (typeof value !== 'string' && typeof value !== 'number' && !isJsonShape(value)) continue;
     const column = getColumn(table, key);
     if (!column || column.dataType !== 'date') continue;
-    if (typeof value === 'string' && !ISO_DATE_RE.test(value)) {
+    if (isJsonShape(value)) {
       throw new HandlerError(400, `Invalid date value for "${key}": expected ISO 8601, got ${JSON.stringify(value)}`);
     }
-    const parsed = new Date(value);
-    if (Number.isNaN(parsed.getTime())) {
-      throw new HandlerError(400, `Invalid date value for "${key}": ${JSON.stringify(value)}`);
-    }
+    const parsed = parseDateValue(key, value as string | number);
+    if (!(parsed instanceof Date)) throw new HandlerError(400, parsed.error);
     result[key] = parsed;
   }
   return result;
@@ -948,7 +991,16 @@ function resolveHiddenColumns(schema: Schema, options?: HandlerOptions): Handler
     const table = schema[tableName];
     const hidden = byTable.get(table) ?? new Set<string>();
     for (const name of names) {
-      const property = columnPropertyName(table, name);
+      let property = columnPropertyName(table, name);
+      if (property === undefined && table) {
+        const matches = Object.entries(getTableColumns(table))
+          .filter(([, column]) => toCamelCase((column as DrizzleColumn).name) === name);
+        if (matches.length > 1) {
+          const candidates = matches.map(([key]) => JSON.stringify(key)).join(' and ');
+          throw new Error(`[everystack/api] hiddenColumns.${tableName}: "${name}" is ambiguous: it is the camelCase of columns ${candidates}; name one by its property or SQL name`);
+        }
+        property = matches[0]?.[0];
+      }
       if (property === undefined) {
         throw new Error(`[everystack/api] hiddenColumns.${tableName}: "${name}" does not resolve to a column`);
       }
@@ -964,6 +1016,109 @@ function resolveHiddenColumns(schema: Schema, options?: HandlerOptions): Handler
   return { ...options, hiddenColumns };
 }
 
+/** Safe, fixed client messages. Never derive these from PostgreSQL text or detail. */
+const INTEGRITY_ERRORS: Record<string, { status: number; message: string }> = {
+  '23514': { status: 422, message: 'Value does not meet a constraint' },
+  '23502': { status: 422, message: 'A required value is missing' },
+  '23503': { status: 422, message: 'Related record does not exist' },
+  '23000': { status: 422, message: 'Value violates an integrity constraint' },
+  '23505': { status: 409, message: 'Value already exists' },
+  '23P01': { status: 409, message: 'Value conflicts with an existing record' },
+  '22P02': { status: 422, message: 'Invalid value format' },
+  '22001': { status: 422, message: 'Value is too long' },
+  '22003': { status: 422, message: 'Value is out of range' },
+  '22007': { status: 422, message: 'Invalid date or time format' },
+  '22008': { status: 422, message: 'Date or time value is out of range' },
+};
+
+type IntegrityAnswer = { status: number; body: {
+  message: string; code: string; constraint?: string; column?: string;
+} };
+
+/** How many `cause` links the integrity mapper follows from the thrown value. */
+const MAX_CAUSE_HOPS = 3;
+
+/**
+ * Both dispatch catches use this after their transaction has rolled back. A throwing
+ * diagnostic getter invalidates the whole classification, including a wrapped cause.
+ * undefined means unclassified; UNREADABLE preserves the caller's 500 fault path.
+ */
+function mapIntegrityError(
+  error: unknown,
+  tableName: string | undefined,
+  options?: HandlerOptions,
+): IntegrityAnswer | typeof UNREADABLE | undefined {
+  // Drizzle drivers may throw directly or wrap the driver's error as cause, and a
+  // query wrapper can wrap again. The first string code on the chain decides.
+  // Classify before touching diagnostics, so unrelated codes keep their old answer.
+  const chain: unknown[] = [error];
+  let code = safeRead(error, 'code');
+  while (typeof code !== 'string' && chain.length <= MAX_CAUSE_HOPS) {
+    if (code === UNREADABLE) return UNREADABLE;
+    const cause = safeRead(chain[chain.length - 1], 'cause');
+    if (cause === UNREADABLE) return UNREADABLE;
+    if (cause === null || typeof cause !== 'object' || chain.includes(cause)) break;
+    chain.push(cause);
+    code = safeRead(cause, 'code');
+  }
+  if (code === UNREADABLE) return UNREADABLE;
+  if (typeof code !== 'string' || !Object.hasOwn(INTEGRITY_ERRORS, code)) return undefined;
+  const read = (value: unknown) => ({
+    message: safeRead(value, 'message'), cause: safeRead(value, 'cause'),
+    constraint: safeRead(value, 'constraint') ?? safeRead(value, 'constraint_name'),
+    column: safeRead(value, 'column') ?? safeRead(value, 'column_name'),
+    table: safeRead(value, 'table') ?? safeRead(value, 'table_name'),
+  });
+  // Diagnostics come only from the object that carried the code (the last link).
+  // Wrapper messages and fields are read only to refuse a hostile value.
+  let fields!: ReturnType<typeof read>;
+  for (const value of chain) {
+    fields = read(value);
+    if (Object.values(fields).includes(UNREADABLE)) return UNREADABLE;
+  }
+  const mapped = INTEGRITY_ERRORS[code];
+  const constraint = typeof fields.constraint === 'string' ? fields.constraint : undefined;
+  const declared = constraint === undefined ? undefined : ownEntry(options?.constraintMessages, constraint);
+  const body: IntegrityAnswer['body'] = { message: mapped.message, code };
+  if (declared !== undefined) {
+    body.message = typeof declared === 'string' ? declared : declared.message;
+    body.constraint = constraint;
+    if (typeof declared !== 'string' && declared.column !== undefined) body.column = declared.column;
+  } else if (!options?.hideSchemaErrors) {
+    if (constraint !== undefined) body.constraint = constraint;
+    if (code === '23502' && typeof fields.column === 'string') body.column = fields.column;
+  }
+  // A failing trigger or FK action can name a different table than the URL.
+  // Missing driver tables (and unknown RPC policies) use every configured list.
+  const driverTable = typeof fields.table === 'string' ? fields.table : undefined;
+  const hiddenColumns = options?.hiddenColumns ?? {};
+  const driverHidden = driverTable === undefined
+    || (tableName === undefined && !Object.hasOwn(hiddenColumns, driverTable))
+    ? Object.values(hiddenColumns).flat() : ownEntry(hiddenColumns, driverTable) ?? [];
+  const hidden = [
+    ...(tableName !== undefined ? ownEntry(hiddenColumns, tableName) ?? [] : []),
+    ...driverHidden,
+  ];
+  if (body.column !== undefined && hidden.includes(body.column)) delete body.column;
+  return { status: mapped.status, body };
+}
+
+function validateConstraintMessages(options?: HandlerOptions): void {
+  if (options?.constraintMessages === undefined) return;
+  if (options.constraintMessages === null || typeof options.constraintMessages !== 'object'
+    || Array.isArray(options.constraintMessages)) {
+    throw new Error('[everystack/api] constraintMessages must be a record');
+  }
+  for (const [constraint, entry] of Object.entries(options.constraintMessages)) {
+    const object = entry !== null && typeof entry === 'object' && !Array.isArray(entry);
+    const message = typeof entry === 'string' ? entry : object ? entry.message : undefined;
+    if (typeof message !== 'string' || message.trim().length === 0
+      || (object && entry.column !== undefined && typeof entry.column !== 'string')) {
+      throw new Error(`[everystack/api] constraintMessages.${constraint}: expected a non-empty message and optional string column`);
+    }
+  }
+}
+
 export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: HandlerOptions): Handler {
   // The naming seam: URLs, exposedTables, and relation targets historically mixed
   // drizzle export keys (`texturePacks`) with SQL names (`texture_packs`), and any
@@ -973,6 +1128,7 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
   const namePairs = tableNamePairs(rawSchema);
   const schema = expandSchema(rawSchema, namePairs);
   const options = resolveHiddenColumns(schema, expandTableKeyedOptions(rawOptions, namePairs));
+  validateConstraintMessages(options);
   validateRowOwnership(schema, rawOptions);
   validateSoftDeleteRestore(schema, options);
   validateSanitizeColumns(schema, options);
@@ -1156,20 +1312,22 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
           const rpcCacheControl = getCacheControl(options);
           return json(result, 200, rpcCacheControl ? { 'Cache-Control': rpcCacheControl } : undefined);
         } catch (error) {
+          // App answers and outages take precedence over integrity classification.
+          const unavailable = !(error instanceof HandlerError) && isServiceUnavailable(error);
+          const integrity = error instanceof HandlerError || unavailable
+            ? undefined : mapIntegrityError(error, undefined, options);
           const code = safeRead(error, 'code');
           const text = safeRead(error, 'message');
-          // A value whose getter throws is hostile: classify nothing from it
-          // and echo nothing of it. It answers the generic 500 (or an outage's 503).
-          const hostile = code === UNREADABLE || text === UNREADABLE || safeRead(error, 'cause') === UNREADABLE;
+          // A value whose getter throws is hostile: classify nothing from it and echo
+          // nothing of it, whatever its code (the mapper reads cause only for its codes).
+          const hostile = integrity === UNREADABLE || code === UNREADABLE || text === UNREADABLE
+            || safeRead(error, 'cause') === UNREADABLE;
           const pgCode = hostile ? undefined : code;
-          // An outage: answer 503 with a fixed body. The driver's message
-          // carries host and port; it goes to onError only. A HandlerError's
-          // own answer still wins: its return below runs first.
-          const unavailable = isServiceUnavailable(error);
+          const mapped = !hostile ? integrity : undefined;
           let status = 500;
           if (unavailable) status = 503;
+          else if (mapped) status = mapped.status;
           else if (pgCode === '42501') status = 403;
-          else if (pgCode === '23505') status = 409;
           else if (pgCode === '22023' || pgCode === 'P0001') status = 422;
           // Split the outcome: an authz/validation refusal (4xx) is `deny`; a
           // system fault (5xx) is `error`. Conflating them blinds an investigation.
@@ -1189,9 +1347,16 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
             });
           }
           if (error instanceof HandlerError) {
-            return json({ message: error.message }, error.status);
+            const { code, column } = HandlerError.metadataOf(error);
+            return json({
+              message: error.message,
+              ...(code !== undefined ? { code } : {}),
+              ...(column !== undefined ? { column } : {}),
+            }, error.status);
           }
           if (unavailable) return serviceUnavailableResponse();
+          if (hostile) return json({ message: options?.hideSchemaErrors ? 'Internal Server Error' : 'RPC execution failed' }, 500);
+          if (mapped) return json(mapped.body, mapped.status);
           const message = !hostile && error instanceof Error ? text : 'RPC execution failed';
           if (options?.hideSchemaErrors && status === 500) {
             return json({ message: 'Internal Server Error' }, 500);
@@ -1270,6 +1435,7 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
       // Bound every select before the hidden-column guard walks it. The guard
       // reads duplicates and runs for writes too, so a GET-only check is too late.
       let queryError: string | undefined;
+      let queryErrorEchoesInput = false;
       let auditReadDenial = false;
       for (const selectParam of url.searchParams.getAll('select')) {
         const maxEmbedDepth = options?.maxEmbedDepth ?? 3;
@@ -1280,20 +1446,33 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
         }
       }
 
+      // A part with parentheses is an aggregate or a declared embed. Anything
+      // else cannot be honored, so refuse it rather than drop it from the rows.
+      const tableRelations = ownEntry(options?.relations, tableName);
+      if (!queryError) {
+        for (const selectParam of url.searchParams.getAll('select')) {
+          const { undeclared } = parseSelectParam(selectParam, tableRelations, options?.relations);
+          if (undeclared !== undefined) {
+            queryError = undeclaredSelectPartMessage(undeclared);
+            queryErrorEchoesInput = true;
+            break;
+          }
+        }
+      }
+
       // Refusals share the response audit below without opening a transaction.
       // Response stripping cannot prevent value oracles or aggregate alias reads.
       if (!queryError && requestUsesHiddenColumn(schema, tableName, url.searchParams, options)) {
         queryError = 'Invalid query';
       }
-      // Refuse projections we cannot enforce on the common pre-DB audit path.
-      const tableRelations = ownEntry(options?.relations, tableName);
-      if (!queryError && options?.drizzleRelations && tableRelations) {
+      // Refuse projections neither read path can enforce, on the common pre-DB audit path.
+      if (!queryError && tableRelations) {
         for (const selectParam of url.searchParams.getAll('select')) {
-          const { embeds } = parseSelectParam(selectParam, tableRelations, options.relations);
-          const withClause = buildWithClause(embeds, tableRelations, schema, options);
-          if (withClause === null || withClause === 'unresolvedHiddenColumns') {
+          const { embeds } = parseSelectParam(selectParam, tableRelations, options?.relations);
+          const refused = refusedEmbedProjection(embeds, tableRelations, schema, options);
+          if (refused !== undefined) {
             queryError = 'Invalid query';
-            auditReadDenial = method === 'GET' && withClause === 'unresolvedHiddenColumns';
+            auditReadDenial = method === 'GET' && refused === 'unresolvedHiddenColumns';
             break;
           }
         }
@@ -1317,7 +1496,7 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
       const deferred: Deferred[] = [];
       let response: Response;
       try {
-        response = queryError ? json({ message: queryError }, 400)
+        response = queryError ? (queryErrorEchoesInput ? sanitizeError(queryError, 400, options) : json({ message: queryError }, 400))
           : unbacked ? json({ message: unbacked }, 500) : await executeWithSettings(routedDb, settings, async (dbOrTx) => {
           if (method === 'GET') {
             const cacheControl = getCacheControl(options);
@@ -1358,20 +1537,21 @@ export function createHandler(db: DrizzleDb, rawSchema: Schema, rawOptions?: Han
       }
       return response;
     } catch (error) {
+      const appError = error instanceof HandlerError;
+      const unavailable = !appError && isServiceUnavailable(error);
+      const integrity = appError || unavailable ? undefined : mapIntegrityError(error, tableName, options);
+      const hostile = integrity === UNREADABLE;
+      const mapped = integrity !== UNREADABLE ? integrity : undefined;
+      const permissionDenied = !appError && !unavailable && !hostile && isPermissionDenied(error);
       if (isWrite) {
         await emitAudit(options?.audit, {
           kind: 'rest', name: tableName, user, client,
-          result: isPermissionDenied(error) ? 'deny' : 'error',
+          result: mapped || permissionDenied ? 'deny' : 'error',
           requestId, operation: auditOp, filter: auditFilter, columns: auditColumns,
         });
       }
-      if (isPermissionDenied(error)) {
-        return sanitizeError('Permission denied', 403, options);
-      }
-      // An outage answers 503 with a fixed body; the driver's message (host and
-      // port) goes to onError only. A HandlerError is the app's own answer and
-      // never an outage.
-      const unavailable = !(error instanceof HandlerError) && isServiceUnavailable(error);
+      if (mapped) return json(mapped.body, mapped.status);
+      if (permissionDenied) return sanitizeError('Permission denied', 403, options);
       // Other table faults re-throw to the Lambda boundary (which logs to
       // CloudWatch), but that path never reaches the S3 archive. Surface the
       // cause here too so a write 5xx is in logs:errors. A HandlerError with a
@@ -1595,6 +1775,9 @@ async function handleGet(
     }
 
     const groupColumns = columns || [];
+    const order = orderParam === null ? { expressions: [] } : buildOrderBy(table, orderParam, false, groupColumns);
+    if ('error' in order) return sanitizeError(order.error, 400, options, { code: order.code, column: order.column });
+
     const selectObj = buildAggregateSelect(table, aggregates, groupColumns);
 
     let query: any = db.select(selectObj).from(table);
@@ -1612,10 +1795,7 @@ async function handleGet(
       }
     }
 
-    if (orderParam) {
-      const orderExpr = buildOrderBy(table, orderParam);
-      if (orderExpr) query = query.orderBy(orderExpr);
-    }
+    if (order.expressions.length > 0) query = query.orderBy(...order.expressions);
 
     query = query.limit(limitVal).offset(offsetVal);
 
@@ -1650,8 +1830,12 @@ async function handleGet(
     && (db as any).query?.[tableName];
 
   let rows: unknown[];
+  const isHidden = (column: string): boolean => isHiddenColumn(schema, tableName, column, options);
 
   if (useRelationalQuery) {
+    const order = orderParam === null ? { expressions: [] } : buildOrderBy(table, orderParam, true, undefined, isHidden);
+    if ('error' in order) return sanitizeError(order.error, 400, options, { code: order.code, column: order.column });
+
     // JOIN path — single query via Drizzle relational API (db.query.findMany)
     const queryOptions: Record<string, any> = {
       limit: limitVal,
@@ -1673,14 +1857,14 @@ async function handleGet(
       queryOptions.where = and(...conditions);
     }
 
-    if (orderParam) {
-      const orderExpr = buildOrderBy(table, orderParam);
-      if (orderExpr) queryOptions.orderBy = orderExpr;
-    }
+    if (order.expressions.length > 0) queryOptions.orderBy = order.expressions;
 
     rows = await (db as any).query[tableName].findMany(queryOptions);
   } else {
     // Batch path — standard select + separate relation queries
+    const order = orderParam === null ? { expressions: [] } : buildOrderBy(table, orderParam, true, undefined, isHidden);
+    if ('error' in order) return sanitizeError(order.error, 400, options, { code: order.code, column: order.column });
+
     let query: any = db.select().from(table);
 
     if (conditions.length === 1) {
@@ -1689,12 +1873,7 @@ async function handleGet(
       query = query.where(and(...conditions));
     }
 
-    if (orderParam) {
-      const orderExpr = buildOrderBy(table, orderParam);
-      if (orderExpr) {
-        query = query.orderBy(orderExpr);
-      }
-    }
+    if (order.expressions.length > 0) query = query.orderBy(...order.expressions);
 
     query = query.limit(limitVal).offset(offsetVal);
     rows = await query;
@@ -1799,7 +1978,7 @@ function parseSelectParam(
   selectParam: string | null,
   tableRelations?: Record<string, RelationConfig>,
   allRelations?: Record<string, Record<string, RelationConfig>>,
-): { columns: string[] | null; embeds: EmbedRequest[]; aggregates: AggregateField[] } {
+): { columns: string[] | null; embeds: EmbedRequest[]; aggregates: AggregateField[]; undeclared?: string } {
   if (!selectParam) {
     return { columns: null, embeds: [], aggregates: [] };
   }
@@ -1808,6 +1987,9 @@ function parseSelectParam(
   const columns: string[] = [];
   const aggregates: AggregateField[] = [];
   let hasWildcard = false;
+  // The first part with parentheses that is neither an aggregate nor a declared
+  // embed, at any depth. The caller refuses the select; it is never a column.
+  let undeclared: string | undefined;
 
   // Parse: split on commas, but respect parentheses
   const parts = splitSelectParam(selectParam);
@@ -1831,11 +2013,14 @@ function parseSelectParam(
       const targetTableName = tableRelations[name].table;
       const targetRelations = ownEntry(allRelations, targetTableName);
       const inner = parseSelectParam(innerSelect, targetRelations, allRelations);
+      undeclared ??= inner.undeclared;
       embeds.push({
         name,
         columns: inner.columns,
         embeds: inner.embeds,
       });
+    } else if (part.includes('(')) {
+      undeclared ??= part;
     } else if (part === '*') {
       hasWildcard = true;
     } else {
@@ -1847,9 +2032,39 @@ function parseSelectParam(
     columns: hasWildcard ? null : (columns.length > 0 ? columns : null),
     embeds,
     aggregates,
+    ...(undeclared === undefined ? {} : { undeclared }),
   };
 }
 
+/** The 400 for an undeclared select part. It echoes client input only, capped. */
+function undeclaredSelectPartMessage(part: string): string {
+  const chars = Array.from(part);
+  const shown = chars.length > 200 ? `${chars.slice(0, 200).join('')}…` : part;
+  return `Select part is not a declared embed or an aggregate: ${shown}`;
+}
+
+/**
+ * An embed list left empty once unknown and hidden names are removed, at any
+ * depth. Both read paths refuse it the same way, before any DB call.
+ */
+function refusedEmbedProjection(
+  embeds: EmbedRequest[],
+  tableRelations: Record<string, RelationConfig>,
+  schema: Schema,
+  options?: HandlerOptions,
+): null | 'unresolvedHiddenColumns' | undefined {
+  const withClause = buildWithClause(embeds, tableRelations, schema, options);
+  if (withClause === null || withClause === 'unresolvedHiddenColumns') return withClause;
+  for (const embed of embeds) {
+    const relation = ownEntry(tableRelations, embed.name);
+    const targetRelations = relation && ownEntry(options?.relations, relation.table);
+    if (embed.embeds.length === 0 || !targetRelations) continue;
+    const nested = refusedEmbedProjection(embed.embeds, targetRelations, schema, options);
+    if (nested !== undefined) return nested;
+  }
+  return undefined;
+}
+
 /**
  * Split select param respecting parentheses:
  * "id,title,author(name,email),comments(*)" → ["id", "title", "author(name,email)", "comments(*)"]
@@ -1881,6 +2096,34 @@ function splitSelectParam(param: string): string[] {
   return parts;
 }
 
+/** Check a reference against the resolved hidden policy, including related tables. */
+function isHiddenColumn(
+  schema: Schema,
+  sourceTable: string,
+  reference: string,
+  options?: HandlerOptions,
+): boolean {
+  if (!options?.hiddenColumns) return false;
+
+  // A resolved SQL name can contain path syntax; match the literal name first.
+  if (ownEntry(options.hiddenColumns, sourceTable)?.includes(reference)) return true;
+
+  let targetName = sourceTable;
+  let columnName = parseJsonPath(reference)?.baseColumn ?? reference;
+  // Prefer a real source column. The relation fallback only rejects hidden
+  // references; the filter and order builders do not support relation paths.
+  if (!getColumn(schema[targetName], columnName)) {
+    const parts = columnName.split('.');
+    while (parts.length > 1) {
+      const relation = ownEntry(ownEntry(options.relations, targetName), parts.shift()!);
+      if (!relation || !schema[relation.table]) return false;
+      targetName = relation.table;
+    }
+    columnName = parts[0];
+  }
+  return (ownEntry(options.hiddenColumns, targetName) ?? []).includes(columnName);
+}
+
 /** Check explicit query references, including each related table's own policy. */
 function requestUsesHiddenColumn(
   schema: Schema,
@@ -1890,22 +2133,7 @@ function requestUsesHiddenColumn(
 ): boolean {
   if (!options?.hiddenColumns) return false;
 
-  const isHidden = (sourceTable: string, reference: string): boolean => {
-    let targetName = sourceTable;
-    let columnName = parseJsonPath(reference)?.baseColumn ?? reference;
-    // Prefer a real source column. The relation fallback only rejects hidden
-    // references; the filter and order builders do not support relation paths.
-    if (!getColumn(schema[targetName], columnName)) {
-      const parts = columnName.split('.');
-      while (parts.length > 1) {
-        const relation = ownEntry(ownEntry(options.relations, targetName), parts.shift()!);
-        if (!relation || !schema[relation.table]) return false;
-        targetName = relation.table;
-      }
-      columnName = parts[0];
-    }
-    return (options.hiddenColumns?.[targetName] ?? []).includes(columnName);
-  };
+  const isHidden = (sourceTable: string, reference: string): boolean => isHiddenColumn(schema, sourceTable, reference, options);
 
   const selectUsesHidden = (sourceTable: string, select: string): boolean => {
     // Walk the raw selection: parseSelectParam collapses `*,secret` to a
@@ -2681,6 +2909,7 @@ function buildJsonCondition(table: DrizzleTable, filter: Filter): any {
   const jp = filter.jsonPath!;
   const baseCol = getColumn(table, jp.baseColumn);
   if (!baseCol) return { __filterError: `Unknown column: '${jp.baseColumn}'` };
+  if (ARRAY_OPERATORS.has(filter.operator)) return arrayOperatorRefusal(filter.operator, jp.baseColumn);
 
   // Validate all JSON path keys before interpolation
   for (const step of jp.steps) {
@@ -2727,6 +2956,7 @@ function buildJsonCondition(table: DrizzleTable, filter: Filter): any {
     case 'is':
       if (filter.value === 'null') condition = sql`${expr} IS NULL`;
       else if (filter.value === 'not.null') condition = sql`${expr} IS NOT NULL`;
+      else return { __filterError: `Invalid value for 'is': expected null or not.null` };
       break;
     case 'in': {
       const values = filter.value.replace(/^\(/, '').replace(/\)$/, '').split(',');
@@ -2735,7 +2965,8 @@ function buildJsonCondition(table: DrizzleTable, filter: Filter): any {
       break;
     }
     default:
-      return null;
+      // Refused, never dropped: a dropped filter widens the answer.
+      return { __filterError: `Unknown filter operator: '${filter.operator.slice(0, 100)}'` };
   }
 
   if (condition && filter.negated) {
@@ -2748,7 +2979,62 @@ function buildJsonCondition(table: DrizzleTable, filter: Filter): any {
   return condition;
 }
 
-const VALID_OPERATORS = new Set(['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'like', 'ilike', 'is', 'in']);
+const ARRAY_OPERATORS = new Set(['cs', 'cd', 'ov']);
+const VALID_OPERATORS = new Set(['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'like', 'ilike', 'is', 'in', ...ARRAY_OPERATORS]);
+const TEXT_ARRAY_ELEMENT_TYPES = new Set(['PgText', 'PgVarchar']);
+
+function arrayOperatorRefusal(operator: string, column: string): { __filterError: string } {
+  return { __filterError: `Unknown filter operator: '${operator}' for column '${column}' (cs, cd and ov need a text[] or varchar[] column)` };
+}
+
+/**
+ * cs (@>), cd (<@) and ov (&&) on a text[] or varchar[] column. The parsed list is
+ * bound as ONE parameter through the column's own encoder. Passing a Param, not the
+ * bare array, keeps the empty set: drizzle's helpers throw on an empty JS array, and
+ * `{}` must keep PostgreSQL's own meaning.
+ */
+function buildArrayCondition(column: DrizzleColumn, filter: Filter): any {
+  const element = (column as { baseColumn?: { columnType?: string } }).baseColumn?.columnType;
+  if (column.dataType !== 'array' || !element || !TEXT_ARRAY_ELEMENT_TYPES.has(element)) {
+    return arrayOperatorRefusal(filter.operator, filter.column);
+  }
+  const values = parseArrayLiteral(filter.value);
+  if (!values) {
+    return { __filterError: `Invalid array value for '${filter.operator}' on column '${filter.column}': expected {a,b} with at most ${ARRAY_LITERAL_MAX_ELEMENTS} elements of at most ${ARRAY_LITERAL_MAX_ELEMENT_LENGTH} characters` };
+  }
+  const list = new Param(values, column);
+  const condition = filter.operator === 'cs' ? arrayContains(column, list)
+    : filter.operator === 'cd' ? arrayContained(column, list)
+      : arrayOverlaps(column, list);
+  return filter.negated ? not(condition) : condition;
+}
+
+/** PostgREST format: in.(val1,val2,val3) */
+function parseInList(value: string): string[] {
+  return value.replace(/^\(/, '').replace(/\)$/, '').split(',');
+}
+
+const DATE_FILTER_OPERATORS = new Set(['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'in']);
+
+/**
+ * A date-mode column's driver encoder calls `value.toISOString()`, so a filter value must
+ * reach drizzle as a Date: a string throws a TypeError out of the handler. Each value goes
+ * through the write path's rule (parseDateValue); `in` yields one Date per member. An
+ * operator with no date meaning (like, ilike) is refused, never handed a Date.
+ */
+function dateFilterOperand(filter: Filter): Date | Date[] | { __filterError: string } {
+  if (!DATE_FILTER_OPERATORS.has(filter.operator)) {
+    return { __filterError: `Operator '${filter.operator}' is not supported on date column "${filter.column}"` };
+  }
+  const raw = filter.operator === 'in' ? parseInList(filter.value) : [filter.value];
+  const dates: Date[] = [];
+  for (const member of raw) {
+    const parsed = parseDateValue(filter.column, member);
+    if (!(parsed instanceof Date)) return { __filterError: parsed.error };
+    dates.push(parsed);
+  }
+  return filter.operator === 'in' ? dates : dates[0];
+}
 
 function buildCondition(table: DrizzleTable, filter: Filter): any {
   if (filter.jsonPath) {
@@ -2761,27 +3047,37 @@ function buildCondition(table: DrizzleTable, filter: Filter): any {
   if (!VALID_OPERATORS.has(filter.operator)) {
     return { __filterError: `Unknown filter operator: '${filter.operator}'` };
   }
+  if (ARRAY_OPERATORS.has(filter.operator)) return buildArrayCondition(column, filter);
+
+  let value: unknown = filter.value;
+  let values: unknown[] | null = null;
+  if (column.dataType === 'date' && filter.operator !== 'is') {
+    const dated = dateFilterOperand(filter);
+    if (isFilterError(dated)) return dated;
+    if (Array.isArray(dated)) values = dated;
+    else value = dated;
+  }
 
   let condition: any = null;
 
   switch (filter.operator) {
     case 'eq':
-      condition = eq(column, filter.value);
+      condition = eq(column, value);
       break;
     case 'neq':
-      condition = ne(column, filter.value);
+      condition = ne(column, value);
       break;
     case 'gt':
-      condition = gt(column, filter.value);
+      condition = gt(column, value);
       break;
     case 'gte':
-      condition = gte(column, filter.value);
+      condition = gte(column, value);
       break;
     case 'lt':
-      condition = lt(column, filter.value);
+      condition = lt(column, value);
       break;
     case 'lte':
-      condition = lte(column, filter.value);
+      condition = lte(column, value);
       break;
     case 'like':
       // PostgREST uses * for wildcard, SQL uses %
@@ -2794,12 +3090,9 @@ function buildCondition(table: DrizzleTable, filter: Filter): any {
       if (filter.value === 'null') condition = isNull(column);
       else if (filter.value === 'not.null') condition = isNotNull(column);
       break;
-    case 'in': {
-      // PostgREST format: in.(val1,val2,val3)
-      const values = filter.value.replace(/^\(/, '').replace(/\)$/, '').split(',');
-      condition = inArray(column, values);
+    case 'in':
+      condition = inArray(column, values ?? parseInList(filter.value));
       break;
-    }
     default:
       return null;
   }
@@ -2816,18 +3109,51 @@ function buildCondition(table: DrizzleTable, filter: Filter): any {
   return condition;
 }
 
-function buildOrderBy(table: DrizzleTable, orderParam: string): any {
-  // Format: column.direction (e.g., created_at.desc)
-  const dotIndex = orderParam.lastIndexOf('.');
-  if (dotIndex === -1) return null;
-
-  const columnName = orderParam.substring(0, dotIndex);
-  const direction = orderParam.substring(dotIndex + 1);
-
-  const column = getColumn(table, columnName);
-  if (!column) return null;
-
-  return direction === 'desc' ? desc(column) : asc(column);
+function buildOrderBy(
+  table: DrizzleTable,
+  orderParam: string,
+  tieBreak: boolean,
+  groupColumns?: string[],
+  isHidden?: (column: string) => boolean,
+): { expressions: SQL[] } | { error: string; code: 'invalid_order'; column: string } {
+  const columns = Object.values(getTableColumns(table)) as DrizzleColumn[];
+  const expressions: SQL[] = [];
+  const named = new Set<string>();
+
+  for (const part of orderParam.split(',')) {
+    const dotIndex = part.lastIndexOf('.');
+    const columnName = (dotIndex < 0 ? part : part.slice(0, dotIndex)).trim();
+    const direction = dotIndex < 0 ? '' : part.slice(dotIndex + 1).trim();
+    const column = getColumn(table, columnName);
+    // getColumn also sees table properties and inherited names; only real columns can order rows.
+    if (!column || !columns.includes(column)) {
+      return { error: `Unknown order column: ${columnName}`, code: 'invalid_order', column: columnName };
+    }
+    if (direction !== 'asc' && direction !== 'desc') {
+      return { error: `Invalid order direction for ${columnName}: expected asc or desc`, code: 'invalid_order', column: columnName };
+    }
+    if (groupColumns && !groupColumns.some(name => getColumn(table, name) === column)) {
+      return { error: `Order column must be grouped: ${columnName}`, code: 'invalid_order', column: columnName };
+    }
+    expressions.push(direction === 'desc' ? desc(column) : asc(column));
+    named.add(column.name);
+  }
+
+  // Aggregate groups do not represent individual rows, so their order cannot use the row key.
+  if (tieBreak && is(table, PgTable)) {
+    const config = getTableConfig(table);
+    const primaryColumns = [
+      ...config.columns.filter(column => column.primary),
+      ...config.primaryKeys.flatMap(key => key.columns),
+    ];
+    for (const column of primaryColumns) {
+      if (!named.has(column.name) && !isHidden?.(column.name)) {
+        expressions.push(asc(column));
+        named.add(column.name);
+      }
+    }
+  }
+  return { expressions };
 }
 
 const RESERVED_QUERY_PARAMS = new Set(['limit', 'offset', 'order', 'select', 'deleted', 'or', 'and']);
@@ -2866,6 +3192,44 @@ function parseFilters(params: URLSearchParams): Filter[] {
   return filters;
 }
 
+/** A group part reading `column.[not.]cs.` so far: a `{` here opens an array value. */
+const ARRAY_VALUE_OPENING = /^[^.]+\.(?:not\.)?(?:cs|cd|ov)\.$/;
+
+/**
+ * Split a group's content on commas, except inside the `{...}` value of a cs/cd/ov
+ * filter, where a comma, or a brace inside a double-quoted element, is data. Every
+ * other operator splits on every comma, as it always has (`in.(a,b)` included).
+ */
+function splitLogicalGroup(content: string): string[] {
+  const parts: string[] = [];
+  let current = '';
+  let inArray = false;
+  let inQuote = false;
+  for (let i = 0; i < content.length; i++) {
+    const char = content[i];
+    if (inArray) {
+      if (inQuote && char === '\\') {
+        current += char + (content[i + 1] ?? '');
+        i++;
+        continue;
+      }
+      if (char === '"') inQuote = !inQuote;
+      else if (char === '}' && !inQuote) inArray = false;
+      current += char;
+      continue;
+    }
+    if (char === ',') {
+      parts.push(current);
+      current = '';
+      continue;
+    }
+    if (char === '{' && ARRAY_VALUE_OPENING.test(current)) inArray = true;
+    current += char;
+  }
+  parts.push(current);
+  return parts;
+}
+
 /**
  * Parse a logical group value into individual filters.
  * Input: "(status.eq.draft,status.eq.pending)" → [{column:'status', operator:'eq', value:'draft'}, ...]
@@ -2877,7 +3241,7 @@ function parseLogicalGroup(value: string): Filter[] {
   }
 
   const filters: Filter[] = [];
-  for (const part of content.split(',')) {
+  for (const part of splitLogicalGroup(content)) {
     const dotIndex = part.indexOf('.');
     if (dotIndex === -1) continue;