Skip to content
This repository was archived by the owner on Nov 4, 2026. It is now read-only.

Commit 25901fc

Browse files
committed
Merge origin/main into claude/issue-11168-lazy-blocks-form-layout (objectui#11168 slice 3, round 3)
origin/main db0beb2: PR B (#11351, 17dc167), objectui#11331 (bef9f20) and #11337 (db0beb2). Two conflicts, both resolved by measurement: - apps/console registry-inputs-spec-parity.test.ts: the per-owner total. Census of the merged ledgers: unjudgedBlocks 2 (object-gantt, object-timeline), offSpecInputs 0, unpublishedKeys 3, refusedArms 0 (B emptied the map), memberPins 0, so objectui#11168 owns 5; 8652 and 8649 stay 0. Neither side's 6 or 7. - packages/app-shell i18n.ts (en and zh): B's deletions of option.layout.inline / grid kept, with this branch's reworded object-form.columns row. Claude-Session: https://claude.ai/code/session_01VhxTqosz7wn54ahqyxgERT Co-authored-by: Claude <noreply@anthropic.com>
2 parents f7424b7 + db0beb2 commit 25901fc

39 files changed

Lines changed: 2154 additions & 573 deletions

‎.changeset/10859-object-form-properties-bag.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ Nothing changes at render time: `SchemaRenderer` hoists every `properties` key o
2626
**The same release's `.changeset/6152-object-form-unmirrored-members.md`** declared members on the flat mirror so that the strict face stopped refusing them on an authored node. On an authored node those members are now written in the bag, where the spec row judges them: every one of them except `buttons`, `defaults` and `subforms`, which the row does not declare. Those three stay authorable in an `object-view`'s `form` slot, which is built from the mirror, and a section there is still judged member by member.
2727

2828
**What did not move.** The TypeScript `ObjectFormSchema` and its zod mirror `ObjectFormSchema` stay published and unchanged in shape. They are the node as `ObjectForm` reads it after the hoist, and as code composes it (`ObjectView`, `RecordFormPage`, `ScreenView`, a host mounting `<ObjectForm schema={…}>`). The object-view `form` slot is still built from the mirror.
29+
30+
**Note, 2026-10-01 (objectui#11168 slice 3, objectui#7759 group C, shipping in this same release).** `layout` is no longer one of the places the bag and the flat mirror differ. `ObjectFormSchema.layout`, on both faces, now takes the row's own `vertical | horizontal` by reference, the `object-form` registration publishes the same two, and the designer offers only those. `inline` and `grid` rendered as `vertical` before they were refused, so nothing that rendered is lost. The other differences listed above stand.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
'@object-ui/types': minor
3+
---
4+
5+
feat(types): an authored `object-gantt` takes its props in the spec's `properties` bag; the flat spelling is refused by name (objectui#10859, batch 6)
6+
7+
**BREAKING (authoring):** an `object-gantt` node that writes its props on the node itself is now refused by `safeValidateSchema`, `validateSchema` and the strict authoring face, and so by `objectui validate`. Move each prop into the node's `properties` bag, and the field mapping into the bag's `gantt` block:
8+
9+
```json
10+
{ "type": "object-gantt", "properties": { "objectName": "task", "gantt": { "startDateField": "start", "endDateField": "end", "titleField": "name" } } }
11+
```
12+
13+
Nothing changes at render time: `SchemaRenderer` hoists every `properties` key onto the node before `ObjectGantt` runs, so the bag node draws what the flat one drew, and a node built in code (`ObjectView` and `ListView` flatten a stored gantt view this way, flat field keys and the toolbar's `search` term included) keeps working with its flat keys.
14+
15+
**Clause-②: yes (narrowing)** — the accept set narrows (a flat `object-gantt` node that parsed is refused) and widens (a spec-shaped bag node that was refused parses). Released as `minor` under the objectui narrowing rule, with this banner.
16+
17+
**Why.** `@objectstack/spec`'s `ComponentPropsMap['object-gantt']` row is the published declaration of an authored `object-gantt` node's props, and the spec's own strict `PageComponentSchema` refuses a prop written on the node as mis-layered (ADR-0089 D3a). The arm here was the flat mirror of the TypeScript `ObjectGanttSchema`, so the two validators disagreed both ways: a document written in the bag was refused (the flat mirror found no record source on the node), and the flat node `os validate` refuses was accepted.
18+
19+
**What changed, in observable terms.**
20+
21+
- `@object-ui/types/zod` exports `ObjectGanttBlockSchema`, built the way `ObjectMapBlockSchema` is: `BaseSchema`, the `object-gantt` literal, and `properties`, which is the spec row by reference, so the row's members, value types and strictness judge the bag. It declares the node's `dataSource` binding (the spec's `ElementDataSourceSchema`) and refuses `body` / `children` (objectui#9256). The row carries spec defaults; none is written into a validated document.
22+
- Each member of the row written flat on the node is refused on both faces, with a message that names its bag member (`Did you mean \`objectName\` → \`properties.objectName\`?`). The refusal set is read off the row, so it follows the spec. `label` is the exception: the spec's page component declares a node-level display `label` of its own, so a `label` on the node is kept.
23+
- The flat field-mapping keys the flat mirror declared (`startDateField`, `endDateField`, `titleField`, `viewMode` and the rest of `GanttConfig`) and its `dependencyField` alias are refused the same way, pointed at the bag's `gantt` block (`properties.gantt.startDateField`; `dependencyField` at `properties.gantt.dependenciesField`). Inside the bag the spec row refuses them too, with its prescription to move them into `gantt`.
24+
- The record-source rule stays: the node needs one of `properties.data`, `properties.staticData` or `properties.objectName`, or the node's `dataSource` binding naming its object, which the renderer lands on `objectName`. A node with none is refused at the root (`RECORD_SOURCE_REQUIRED`), as the flat node was. A bag node bound only through `dataSource` parses.
25+
- `ObjectGanttBlockSchema` reaches `AnyComponentSchema` through `ObjectQLPublicBlockComponentSchema`. `ObjectGanttSchema` leaves `ObjectQLComponentSchema`.
26+
- `search` and `searchableFields` are not authored keys: a list view writes them onto the node it composes, and the spec row does not declare them. Written flat on an authored node they are unjudged by the tolerant face and refused by the strict one; in the bag the spec row refuses them.
27+
28+
**The same release's `.changeset/6475-gantt-block-face-declared.md`, `.changeset/6939-objectql-record-source-refinement.md`, `.changeset/9256-e3-residual-content-channels.md`, `.changeset/11070-strict-face-read-keys.md` and `.changeset/11117-datasource-objectname-waiver.md`** describe what the validators say about an `object-gantt` written flat. On an authored node those readings now happen in the bag: the `gantt` block is the row's own `gantt` member, with the same three required fields, and the record-source rule reads `properties.data`, `properties.staticData`, `properties.objectName` or the node's `dataSource`. The flat mirror they name still behaves as they say.
29+
30+
**What did not move.** The TypeScript `ObjectGanttSchema` and its zod mirror `ObjectGanttSchema` stay published and unchanged in shape. They are the node as `ObjectGantt` reads it after the hoist, and as code composes it, or hands it to `<ObjectGantt schema={…}>` directly.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@object-ui/plugin-gantt': patch
3+
---
4+
5+
docs(plugin-gantt): authored `object-gantt` examples write their props in the `properties` bag (objectui#10859, batch 6)
6+
7+
The README's authored `object-gantt` examples now write `{ "type": "object-gantt", "properties": { …, "gantt": { … } } }`, the spelling `@objectstack/spec`'s `ComponentPropsMap['object-gantt']` row declares and `objectui validate` now requires, with the field mapping in the bag's `gantt` block. The flat field-mapping keys are described as what they are, the handoff `ObjectView` and `ListView` write onto the node they compose. The examples that mount `ObjectGantt` directly keep the flat `schema` prop: a component mounted without `SchemaRenderer` receives the node as it reads it, and nothing hoists a bag there. Under `src/`, a new render pin holds that the bag draws what the flat spelling drew, and the catalog-plans pin reads the catalog entries' bag. No runtime change.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
---
4+
5+
The page-block inspector no longer offers `Inline` and `Grid` for an `object-form`'s `layout` (objectui#11168 slice 3, objectui#7759 group C). `@objectstack/spec` 17.5.0 refuses both values, and both rendered as `Vertical`, so the designer was writing values that publish refuses. The two option labels (en, zh) are removed with the options.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@object-ui/plugin-form': minor
3+
---
4+
5+
`object-form.layout` publishes only `vertical` and `horizontal`. This is objectui#11168 slice 3 and delivers objectui#7759 group C. `@objectstack/spec` 17.5.0 retired `inline` and `grid` from the form layout enum (objectstack#20221). The authored `object-form` arm, which reads the spec row by reference, already refused both. The registration still published them, so the page validator passed values `objectui validate` refuses.
6+
7+
⚠️ This narrows a published input. Measured through the real `SchemaRenderer` before the change, `inline` and `grid` rendered byte-identical to `vertical` on the simple, tabbed, wizard and split layouts. Nothing that rendered is lost. A stored document carrying either value is refused at authoring; write `vertical` (the default) or `horizontal`. The fixed group ships the change as `minor`.
8+
9+
The fold that mapped `inline` / `grid` to `vertical` is retired with them, in `ObjectForm` (simple, drawer and modal routes), `DrawerForm` and `ModalForm`. `layout` now passes through unfolded, and an absent `layout` still draws as `vertical`.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
'@object-ui/types': minor
3+
---
4+
5+
The form layout mirrors state the two values the spec and the renderers honour. This is objectui#11168 slice 3 and delivers objectui#7759 group C.
6+
7+
- `ObjectFormSchema.layout`, TS and zod, is the `object-form` row's own enum, taken by reference: `vertical | horizontal`. It used to add `inline` and `grid`. `@objectstack/spec` 17.5.0 retired both, and both rendered as `vertical`. `ObjectViewSchema.form`, which picks this key, narrows with it.
8+
- The zod `FormSchema.layout`, on the `form` node, drops `grid`. The TypeScript declaration and the `form` registration never had it, and the renderer reads only `layout === 'horizontal'`. Its `WiderThanDeclared` ledger row in the mirror-parity test resolves and is struck.
9+
- The `columns` docs on both mirrors no longer say "for grid layout". `columns` sets the field grid's width, whatever the `layout`.
10+
11+
⚠️ This narrows the accept set: `layout: 'inline'` or `'grid'` is now a type error and a zod refusal. The fixed group ships the change as `minor`.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
---
4+
5+
fix(app-shell): a Studio pillar whose draft load is cancelled no longer leaves its canvas on "Loading…" (objectui#11331)
6+
7+
Each Studio pillar's draft-load effect raised `loading` when a load started.
8+
Only the load's own `finally` lowered it, behind `if (!cancelled)`. A load
9+
that the effect's cleanup cancelled therefore never lowered it. When the next
10+
run started no load of its own, the canvas showed the spinner for good:
11+
12+
- **Interfaces:** an author who opened a leaf with no designer (a report, say)
13+
while the first leaf's draft was still loading saw "Loading…" until they
14+
opened another editable leaf.
15+
- **Data:** when the metadata client changed identity while an object was
16+
loading, the re-run skipped the load because the object counted as already
17+
loaded. The cancelled load had installed nothing, so the object stayed on
18+
"Loading…".
19+
20+
A load cancelled before it settles now takes back what its start claimed. In
21+
all three pillars (Interfaces, Data and Automations) that is the `loading`
22+
flag. In the Data pillar it is also the load-once claim, so the re-run loads
23+
the object. A load that settled keeps its claim, so a new client after the
24+
object loaded still never re-reads it over an edit in progress.

‎apps/console/src/__tests__/registry-inputs-spec-parity.test.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ const OBJECTUI_11111_LEDGER_CAPS = {
784784
unjudgedBlocks: 2, // objectui#11168: object-gantt, object-timeline (slice 3 loaded and judged object-map and object-tree)
785785
offSpecInputs: 0, // objectui#11168 slice 1 retired action:group.name
786786
unpublishedKeys: 3, // objectui#11168: 3 (action:button endpoint + undoable, action:icon endpoint); objectui#8652: 0 and objectui#8649: 0 (each struck by its landing)
787-
refusedArms: 1, // objectui#11168: object-form (slice 2 narrowed element:definition-list.columns)
787+
refusedArms: 0, // objectui#11168: slice 2 narrowed element:definition-list.columns, slice 3 object-form.layout
788788
memberPins: 0, // objectui#11168 slice 2 pinned element:definition-list.items and element:repeater ×3
789789
} as const;
790790

@@ -2010,11 +2010,15 @@ const OFF_SPEC_ARM_EXEMPTIONS: Record<string, string> = {
20102010
* declares and the renderer compares (`props.columns === 2`); the strings it
20112011
* declared before drew one column. The pin is
20122012
* `packages/components/src/renderers/basic/__tests__/element-list-inputs-11168.test.tsx`.
2013+
*
2014+
* objectui#11168 slice 3 took the last entry, `object-form.layout:enum`, the
2015+
* same way, and with it objectui#7759 group C: the enum is `vertical` /
2016+
* `horizontal`, the two the spec row declares. Measured through the real
2017+
* `SchemaRenderer`, `inline` and `grid` rendered byte-identical to
2018+
* `vertical`, so nothing that rendered is lost. The pin is
2019+
* `packages/plugin-form/src/__tests__/objectFormLayout-11168.test.tsx`.
2020+
* The map is EMPTY again.
20132021
*/
2014-
'object-form.layout:enum': OWED_TO(
2015-
'objectui#11168',
2016-
'A REFUSED ARM: `object-form.layout` declares the members `inline` and `grid`, which the 17.5.0 contract refuses.',
2017-
),
20182022
};
20192023

20202024
// ── the MEMBER direction (objectui#8067) ─────────────────────────────────────
@@ -5697,6 +5701,6 @@ describe('registry `inputs` vs `@objectstack/spec` ComponentPropsMap (repo-wide)
56975701
reasons.filter((reason) => reason.startsWith(`${OWED_PREFIX}${owner}.`)).length,
56985702
]),
56995703
),
5700-
).toEqual({ 'objectui#11168': 6, 'objectui#8652': 0, 'objectui#8649': 0 });
5704+
).toEqual({ 'objectui#11168': 5, 'objectui#8652': 0, 'objectui#8649': 0 });
57015705
});
57025706
});

0 commit comments

Comments
 (0)