objectstack-ai
diff --git a/‎.changeset/21238-multi-value-wrap-one-rule.md‎
Lines changed: 23 additions & 0 deletions b/‎.changeset/21238-multi-value-wrap-one-rule.md‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎packages/core/src/index.ts‎
Lines changed: 7 additions & 0 deletions b/‎packages/core/src/index.ts‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎packages/core/src/utils/multi-value-storage-form.test.ts‎
Lines changed: 46 additions & 0 deletions b/‎packages/core/src/utils/multi-value-storage-form.test.ts‎
Lines changed: 46 additions & 0 deletions
diff --git a/‎packages/core/src/utils/multi-value-storage-form.ts‎
Lines changed: 54 additions & 0 deletions b/‎packages/core/src/utils/multi-value-storage-form.ts‎
Lines changed: 54 additions & 0 deletions
diff --git a/‎packages/objectql/src/validation/record-validator.ts‎
Lines changed: 12 additions & 10 deletions b/‎packages/objectql/src/validation/record-validator.ts‎
Lines changed: 12 additions & 10 deletions
diff --git a/‎packages/plugins/plugin-security/src/rls-check-stored-form.test.ts‎
Lines changed: 103 additions & 2 deletions b/‎packages/plugins/plugin-security/src/rls-check-stored-form.test.ts‎
Lines changed: 103 additions & 2 deletions
@@ -0,0 +1,23 @@
+---
+'@objectstack/core': minor
+'@objectstack/objectql': patch
+'@objectstack/plugin-security': minor
+---
+
+fix(plugin-security): a row-level `check` judges a lone scalar written to a declared multi-valued field as the one-member list it is stored as, so the write and the read the same policy scopes give one answer for one row (#21238)
+
+Clause-②: yes (widening)
+
+The write door stores a lone scalar sent to a multi-valued field (`tags`, `multiselect`, `checkboxes`, or a `select` / `lookup` / `user` / `file` / `image` flagged `multiple: true`) as a one-member list: `tags: 'x'` is stored as `["x"]`. The row-level write `check` judged the value as sent on the insert and on a by-id update, because both images are formed before the write door runs. Measured through `ObjectQL.insert` with `SecurityPlugin` on two SQLite driver families, as a member resolving a permission set, with the same predicate as `using` and `check`:
+
+| `check` | written | write, before | stored | read |
+|---|---|---|---|---|
+| `record.tags.contains('x')` | `'x'` | 403 | `["x"]` | shown |
+| `!record.tags.contains('x')` | `'x'` | admitted | `["x"]` | hidden |
+| `record.tags.contains('x')`, a by-id update | `'x'` | 403 | `["x"]` | shown |
+
+Now the image's value on every field the object declares multi-valued goes through the same rule the write door stores it by, before the check is judged. The first and third rows are admitted. The second is refused: a policy that forbids a member from tagging a row `x` can no longer be passed by sending `'x'` instead of `['x']`. A lone scalar now gets exactly the verdict its stored list gets, on the insert, a by-id update and a predicate update. That includes a policy that compares such a field with a scalar comparison (`==`, `!=`, `in`, an ordering), which the read refuses with `INVALID_FILTER` / 400: there `'x'` used to get the opposite of the verdict `['x']` got, and now gets the same one.
+
+Unchanged: a field the object does not declare multi-valued is judged as written; a list, `null`, a blank string and an object are judged as written, as the write door leaves them; the check's comparands are left as written, since `contains` takes one member; and refusals keep their code and status (`PERMISSION_DENIED` / 403).
+
+**`@objectstack/core`** (one new root export, so `minor`; this export is the widening the `Clause-②: yes (widening)` line declares): `multiValueStorageForm(value)`, the rule itself. It wraps a string, a number or a boolean into a one-member list and returns every other value as the same value. `@objectstack/objectql`'s `normalizeMultiValueFields` now calls it, with no change in what the write door stores (`patch`). `@objectstack/plugin-security` is `minor` because the set of writes its check admits widens (the first and third rows above); that is a security-floor behaviour change, not the declared widening.
@@ -126,6 +126,13 @@ export * from './utils/temporal-comparand.js';
 // do not depend on each other, and each driver used to carry its own copy.
 export * from './utils/temporal-storage-form.js';
 
+// [#21238] …and the storage form of a value written to a declared multi-valued
+// column (a lone scalar stored as a one-member list). `@objectstack/objectql`'s
+// record validator applies it at the write door, and `@objectstack/plugin-security`'s
+// row-level write check applies it to the image it judges — one rule, here
+// because those two do not depend on each other at runtime.
+export * from './utils/multi-value-storage-form.js';
+
 // [#21007] …and the refusal a scalar comparison gets on a field stored as a
 // JSON column: the operator set and the words. `driver-sql` refuses it on
 // `where`, and `@objectstack/objectql` on the per-aggregation `filter` it
 
@@ -0,0 +1,46 @@
+// Copyright (c) 2026 ObjectStack. Licensed under the Apache-2.0 license.
+//
+// [#21238] `multiValueStorageForm` — the ONE rule that puts a value written to a
+// declared multi-valued column into its stored form: objectql's record
+// validator applies it at the write door (`normalizeMultiValueFields`, pinned in
+// `record-validator.test.ts`), and plugin-security's write check applies it to
+// the image it judges (`rls-check-stored-form.test.ts`). This file pins the rule
+// itself.
+
+import { describe, it, expect } from 'vitest';
+import { multiValueStorageForm } from './multi-value-storage-form.js';
+
+describe('multiValueStorageForm — a lone scalar becomes a one-member list', () => {
+  const cases: ReadonlyArray<readonly [string, unknown]> = [
+    ['a string', 'x'],
+    ['a string with surrounding space, kept as written', ' x '],
+    ['a number', 1],
+    ['zero', 0],
+    ['NaN, a number', Number.NaN],
+    ['true', true],
+    ['false', false],
+  ];
+  for (const [name, input] of cases) {
+    it(name, () => expect(multiValueStorageForm(input)).toEqual([input]));
+  }
+});
+
+describe('multiValueStorageForm — everything else is returned as the SAME value', () => {
+  const list = ['x', 'y'];
+  const object = { nested: true };
+  const date = new Date('2026-01-05T00:00:00Z');
+  const cases: ReadonlyArray<readonly [string, unknown]> = [
+    ['a list, already in the form', list],
+    ['an empty list', []],
+    ['undefined', undefined],
+    ['null', null],
+    ['the empty string, read as missing', ''],
+    ['a string of whitespace, read as missing', '  \t '],
+    ['a plain object, left for the validator to refuse', object],
+    ['a Date, not a scalar the rule reads', date],
+    ['a bigint, not a scalar the rule reads', 1n],
+  ];
+  for (const [name, input] of cases) {
+    it(name, () => expect(multiValueStorageForm(input)).toBe(input));
+  }
+});
@@ -0,0 +1,54 @@
+// Copyright (c) 2026 ObjectStack. Licensed under the Apache-2.0 license.
+
+/**
+ * [#21238] THE storage form of one value written to a declared multi-valued
+ * column — one rule, read by the write door that stores it and by the check
+ * that judges the row it stores.
+ *
+ * A multi-valued column (`@objectstack/spec/data`'s `isMultiValueField`: an
+ * inherently-multi option type such as `tags` or `multiselect`, or a
+ * multi-capable type flagged `multiple: true`) persists a LIST. A client may
+ * still send one lone scalar — a legacy console bulk-edit sent
+ * `{ labels: 'frontend' }` at a multiselect (#2552) — and the write door stores
+ * it as a one-member list, so `tags: 'x'` is stored as `['x']`.
+ *
+ * ## Two faces, one rule
+ *
+ * - `@objectstack/objectql`'s record validator applies it on every write
+ *   (`normalizeMultiValueFields`), before validation, so the row it hands the
+ *   driver holds the list.
+ * - `@objectstack/plugin-security`'s row-level write `check` applies it to the
+ *   image it judges (`storedFormCheckJudge`), because some of the images it
+ *   judges are formed before the write door has run: the insert seam and the
+ *   by-id update image. Judged raw, `tags: 'x'` under
+ *   `record.tags.contains('x')` was refused while the stored `['x']` was shown
+ *   by the read the same policy scopes, and admitted under
+ *   `!record.tags.contains('x')` while the read hid it.
+ *
+ * The two packages do not depend on each other at runtime, and a copy each is
+ * how one write comes to get two answers. So the rule lives here, beside
+ * `temporalStorageForm`, which the same two faces share for the same reason.
+ * Which columns it applies to is the caller's: the declared-type predicate
+ * stays the spec's, and the write door also skips the columns the engine owns.
+ *
+ * ## The rule
+ *
+ * - A string, a number or a boolean is wrapped: `[value]`.
+ * - A list is already in the form, and is returned as it is.
+ * - `null`, `undefined`, the empty string and a string of whitespace are not
+ *   wrapped: the write door reads a blank as missing, never as a member.
+ * - Anything else (an object, a `Date`, a function) is returned unchanged, so
+ *   the validator refuses it as a value that is not a list. ⛔ No shape is
+ *   guessed into a list.
+ *
+ * It returns the SAME value when there is nothing to wrap, so a caller can
+ * tell "already in the form" by identity.
+ */
+export function multiValueStorageForm(value: unknown): unknown {
+  if (value === undefined || value === null) return value;
+  if (typeof value === 'string' && value.trim() === '') return value;
+  if (Array.isArray(value)) return value;
+  const t = typeof value;
+  if (t === 'string' || t === 'number' || t === 'boolean') return [value];
+  return value;
+}
@@ -95,7 +95,7 @@ import {
   classifyFilterToken,
 } from '@objectstack/spec/data';
 import type { FieldErrorCode } from '@objectstack/spec/api';
-import { SUPPORTED_TEMPORAL_YEARS, isOutsideTemporalYearRange, isUninterpretableTemporalComparand } from '@objectstack/core';
+import { SUPPORTED_TEMPORAL_YEARS, isOutsideTemporalYearRange, isUninterpretableTemporalComparand, multiValueStorageForm } from '@objectstack/core';
 import { isValueDomainMember, type ValueDomain } from '@objectstack/spec/shared';
 import {
   renderValidationMessage,
@@ -592,24 +592,26 @@ function valueMayBeAnObject(def: FieldDef): boolean {
  * without this the scalar used to be stored verbatim, silently corrupting
  * the column's shape for every consumer that expects an array.
  *
- * Only unambiguous scalars (string/number/boolean) are wrapped; anything
- * else (plain objects, nested garbage) is left untouched so that
- * `validateRecord` can reject it with `invalid_type`.
+ * [#21238] What a value becomes is `@objectstack/core`'s
+ * `multiValueStorageForm`, the one rule the row-level write `check` also puts
+ * the image it judges through: only unambiguous scalars (string/number/boolean)
+ * are wrapped, a blank is left as missing, and anything else (plain objects,
+ * nested garbage) is left untouched so that `validateRecord` can reject it with
+ * `invalid_type`. WHICH columns it is applied to is this door's: a declared
+ * multi-valued field (`isMultiValueField`), never a lifecycle column or one the
+ * engine owns (`system` / `readonly`).
  */
 export function normalizeMultiValueFields(
   objectSchema: { fields?: Record<string, FieldDef> } | undefined | null,
   data: Record<string, unknown> | undefined | null,
 ): void {
   if (!objectSchema?.fields || !data) return;
   for (const [name, value] of Object.entries(data)) {
-    if (SKIP_FIELDS.has(name) || isMissing(value)) continue;
+    if (SKIP_FIELDS.has(name)) continue;
     const def = objectSchema.fields[name];
     if (!def || def.system || def.readonly || !isMultiValueField(def)) continue;
-    if (Array.isArray(value)) continue;
-    const t = typeof value;
-    if (t === 'string' || t === 'number' || t === 'boolean') {
-      data[name] = [value];
-    }
+    const stored = multiValueStorageForm(value);
+    if (stored !== value) data[name] = stored;
   }
 }
 
 
@@ -18,6 +18,17 @@
  * | `record.start_time == '09:00'` | `'09:00:00'` | 403 | `09:00:00` | shown |
  * | `record.due_at == '2026-01-05T10:00:00Z'` | `'2026-01-05T18:00:00+08:00'` | 403 | `2026-01-05T10:00:00.000Z` | shown |
  *
+ * [#21238] The same holds for a lone scalar written to a declared multi-valued
+ * column, which the write door stores as a one-member list (`tags`, and a
+ * `select` flagged `multiple`; the insert, a by-id update and a predicate
+ * update). Measured on `main` before the fold:
+ *
+ * | `check` | written | write, before | stored | read |
+ * |---|---|---|---|---|
+ * | `record.tags.contains('x')` | `'x'` | 403 | `["x"]` | shown |
+ * | `!record.tags.contains('x')` | `'x'` | admitted | `["x"]` | hidden |
+ * | `record.tags.contains('x')`, a by-id update | `'x'` | 403 | `["x"]` | shown |
+ *
  * ## formula's whole-day copy is out of reach here
  *
  * `@objectstack/formula`'s matcher carries its own copy of the whole-day upper
@@ -39,7 +50,13 @@ import { SqliteWasmDriver } from '@objectstack/driver-sqlite-wasm';
 import { PermissionSetSchema } from '@objectstack/spec/security';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
-import { declaredTemporalColumns, storedFormCheckFilter, storedFormImage } from './rls-check-stored-form.js';
+import {
+  declaredMultiValueColumns,
+  declaredTemporalColumns,
+  storedFormCheckFilter,
+  storedFormCheckJudge,
+  storedFormImage,
+} from './rls-check-stored-form.js';
 
 /** A plain object — a filter node or an operator map. */
 function isPlain(value: unknown): value is Record<string, unknown> {
@@ -123,6 +140,8 @@ async function boot(makeDriver: () => Driver, predicate: string) {
           due_on: { name: 'due_on', type: 'date' },
           due_at: { name: 'due_at', type: 'datetime' },
           start_time: { name: 'start_time', type: 'time' },
+          tags: { name: 'tags', type: 'tags' },
+          owners: { name: 'owners', type: 'select', multiple: true, options: [{ label: 'X', value: 'x' }, { label: 'XY', value: 'xy' }] },
         },
       },
     ],
@@ -199,6 +218,16 @@ const CELLS: Cell[] = [
   // Control: a TEXT column is judged as written, whatever its value looks like.
   { predicate: "record.title == '2026-01-05'", column: 'title', value: '2026-01-05T15:00:00Z', stored: '2026-01-05T15:00:00Z', admitted: false },
   { predicate: "record.title > '2026-01-05'", column: 'title', value: '2026-01-05T15:00:00Z', stored: '2026-01-05T15:00:00Z', admitted: true },
+  // [#21238] A declared multi-valued column: a lone scalar is stored as a one-member list.
+  { predicate: "record.tags.contains('x')", column: 'tags', value: 'x', stored: ['x'], admitted: true },
+  { predicate: "record.tags.contains('x')", column: 'tags', value: 'xy', stored: ['xy'], admitted: false },
+  { predicate: "record.tags.contains('x')", column: 'tags', value: ['x'], stored: ['x'], admitted: true },
+  { predicate: "!record.tags.contains('x')", column: 'tags', value: 'x', stored: ['x'], admitted: false },
+  { predicate: "record.owners.contains('x')", column: 'owners', value: 'x', stored: ['x'], admitted: true },
+  { predicate: "record.owners.contains('x')", column: 'owners', value: 'xy', stored: ['xy'], admitted: false },
+  // Control: a TEXT column keeps its scalar, and `contains` stays a substring test.
+  { predicate: "record.title == 'x'", column: 'title', value: 'x', stored: 'x', admitted: true },
+  { predicate: "record.title.contains('x')", column: 'title', value: 'xy', stored: 'xy', admitted: true },
 ];
 
 describe("formula's whole-day copy is out of reach in this file", () => {
@@ -209,7 +238,7 @@ describe("formula's whole-day copy is out of reach in this file", () => {
 });
 
 for (const [driverName, makeDriver] of DRIVERS) {
-  describe(`${driverName}: the write check and the read give one answer for one temporal row`, () => {
+  describe(`${driverName}: the write check and the read give one answer for one stored row`, () => {
     for (const cell of CELLS) {
       const verdict = cell.admitted ? 'admitted and shown' : 'refused 403 and hidden';
       it(`${cell.predicate}, ${cell.column} written as ${show(cell.value)}: ${verdict}`, async () => {
@@ -235,6 +264,29 @@ for (const [driverName, makeDriver] of DRIVERS) {
         .toEqual(DENIED);
       expect((await r.storedRow('u'))?.due_on).toBe('2026-01-05');
     });
+
+    it("[#21238] a by-id update judges a lone scalar on a multi-valued column as its stored list: 'x' admitted, 'xy' 403 and unchanged", async () => {
+      const r = await boot(makeDriver, "record.tags.contains('x')");
+      await r.engine.insert(r.OBJ, { id: 'u', tags: ['x', 'z'] }, { context: SYS_CTX } as never);
+      expect(await outcome(r.engine.update(r.OBJ, { tags: 'x' }, { where: { id: 'u' }, context: r.caller } as never)))
+        .toBe('admitted');
+      expect((await r.storedRow('u'))?.tags).toEqual(['x']);
+      expect(await outcome(r.engine.update(r.OBJ, { tags: 'xy' }, { where: { id: 'u' }, context: r.caller } as never)))
+        .toEqual(DENIED);
+      expect((await r.storedRow('u'))?.tags).toEqual(['x']);
+      expect(await r.shownTo('u')).toBe(true);
+    });
+
+    it("[#21238] a predicate update judges a lone scalar on a multi-valued column as its stored list: 'x' admitted, 'xy' 403 and unchanged", async () => {
+      const r = await boot(makeDriver, "record.tags.contains('x')");
+      await r.engine.insert(r.OBJ, { id: 'p', title: 'batch', tags: ['x'] }, { context: SYS_CTX } as never);
+      expect(await outcome(r.engine.update(r.OBJ, { tags: 'x' }, { where: { title: 'batch' }, multi: true, context: r.caller } as never)))
+        .toBe('admitted');
+      expect((await r.storedRow('p'))?.tags).toEqual(['x']);
+      expect(await outcome(r.engine.update(r.OBJ, { tags: 'xy' }, { where: { title: 'batch' }, multi: true, context: r.caller } as never)))
+        .toEqual(DENIED);
+      expect((await r.storedRow('p'))?.tags).toEqual(['x']);
+    });
   });
 }
 
@@ -286,3 +338,52 @@ describe('the stored-form step reads the declaration, never the values', () => {
     expect(storedFormImage({ due_on: new Date('2026-01-05T15:00:00Z') }, COLUMNS)).toEqual({ due_on: '2026-01-05' });
   });
 });
+
+describe('[#21238] the multi-valued half reads the declaration, never the values', () => {
+  const DECLARED = {
+    fields: {
+      tags: { type: 'tags', multiple: false },
+      labels: { type: 'multiselect', multiple: false },
+      owners: { type: 'select', multiple: true },
+      watchers: { type: 'user', multiple: true },
+      status: { type: 'select', multiple: false },
+      owner: { type: 'lookup', multiple: false },
+      title: { type: 'text', multiple: false },
+      due_on: { type: 'date', multiple: false },
+    },
+  };
+  const MULTI = declaredMultiValueColumns(DECLARED);
+  const TEMPORAL = declaredTemporalColumns(DECLARED);
+
+  it('names exactly the declared multi-valued columns, and none without a declaration', () => {
+    expect([...MULTI]).toEqual(['tags', 'labels', 'owners', 'watchers']);
+    expect(declaredMultiValueColumns(undefined).size).toBe(0);
+  });
+
+  it('stores a lone scalar on a multi-valued column as a one-member list, and nothing else', () => {
+    const image = { tags: 'x', owners: 'x', labels: ['a'], watchers: '', status: 'x', owner: 'x', title: 'x', due_on: '2026-01-05T15:00:00Z' };
+    const before = JSON.stringify(image);
+    const stored = storedFormImage(image, TEMPORAL, MULTI);
+    expect(stored).toEqual({ tags: ['x'], owners: ['x'], labels: ['a'], watchers: '', status: 'x', owner: 'x', title: 'x', due_on: '2026-01-05' });
+    expect(stored.labels).toBe(image.labels);
+    expect(JSON.stringify(image)).toBe(before);
+    const settled = { tags: ['x'], title: 'x', owners: null };
+    expect(storedFormImage(settled, TEMPORAL, MULTI)).toBe(settled);
+  });
+
+  it('gives a lone scalar the verdict its stored list gets, and leaves the comparands as written', () => {
+    for (const part of [
+      { tags: { $contains: 'x' } },
+      { $not: { tags: { $contains: 'x' } } },
+      { tags: { $notContains: 'x' } },
+      { $or: [{ tags: { $contains: 'y' } }, { owners: { $contains: 'x' } }] },
+    ]) {
+      const judge = storedFormCheckJudge([part], DECLARED);
+      expect(judge({ tags: 'x', owners: 'x' })).toBe(judge({ tags: ['x'], owners: ['x'] }));
+      expect(judge({ tags: 'xy', owners: 'xy' })).toBe(judge({ tags: ['xy'], owners: ['xy'] }));
+      expect(storedFormCheckFilter(part, TEMPORAL)).toBe(part);
+    }
+    const contains = storedFormCheckJudge([{ tags: { $contains: 'x' } }], DECLARED);
+    expect([contains({ tags: 'x' }), contains({ tags: 'xy' })]).toEqual([true, false]);
+  });
+});