This repository was archived by the owner on Nov 4, 2026. It is now read-only.
Repository navigation
Commit ab0e0fd
fix(app-shell): take a served metadata draft as-is instead of spreading it over the published layer (objectui#10765) (#10775)
Fixes #10765
Clause-②: no — the Studio editor's draft rebuild; no declared surface
moves
## What changed
Every editor that rebuilt its draft as the served draft SPREAD over
`layered.effective` now takes the served draft as-is and falls back to
the baseline (`effective`, then `code`) only when no draft body was read
(see H2 for what that covers). `effective` is the PUBLISHED layer and a
spread cannot express deletion, so a key the author cleared in the draft
came back from the published layer on the next refresh and the next save
sent it again.
Nine sites in three files of `@object-ui/app-shell`, one spelling each
(`served draft ?? baseline`):
- `ResourceEditPage.tsx` — the load effect (`rawInitial`), the post-save
refresh in `doSave` (`rawFresh`), the post-publish refresh in
`doPublish` (`rawFresh`; `config.toDraft` now runs there too, as the
other two refreshes already did).
- `StudioDesignSurface.tsx` — the Interfaces pillar's app load
(`appDraft`), its surface-leaf load (`setDraft`), the Data pillar's
object load (`setObjDraft`), the Automations pillar's flow load
(`setDraft`). The triage named the surface-leaf site; the other three
are the same spread in the same file, and the triage's rule is "no
per-type exception".
- `PackageOwdOverviewPanel.tsx` — the list load that derives each row's
OWD values and the save that splices the edit into the object's body.
Bounded in-place exemption, declared below.
Three pin files, one changeset (`'@object-ui/app-shell': patch`), and a
prose amendment to the pending objectui#10746 changeset, whose reach
sentence this change made false (declared in Acceptance notes). No
objectstack change.
## H1 — the premise: a served draft is always a whole document
Answered from objectstack `origin/main` source
(`packages/metadata-protocol/src/protocol.ts`,
`packages/metadata-protocol/src/sys-metadata-repository.ts`,
`packages/rest/src/rest-server.ts`), cited by symbol. A stock boot is
NOT MEASURED: `/home/user/objectstack/node_modules` is empty in this
container.
- **The write stores the body raw.** `saveMetaItem` ends in
`repo.put(ref, request.item, { state: mode === 'draft' ? 'draft' :
'active', … })`, and `SysMetadataRepository.put` stores `metadata:
JSON.stringify(body)` with `body = spec ?? {}` — no read-modify-write
against the existing row (the existing row is read only for the parent
hash, the `skipped` short-circuit and, on a draft save, `package_id`
inheritance). Before the put, `saveMetaItem` never merges the prior
draft or the active row into the body. It subtracts only server-owned
keys, in three strips: `stripReadDecorations` (the read-time
decorations), `stripDerivedProvenance` (`_packageId` / `_packageVersion`
/ `_provenance`, which the read side recomputes) and
`stripServedObjectColumns` (the system columns the server injects into a
served object). None of the three reads another row. Everything else it
does ADDS to the body or respells it, and the one pass that reads a
stored row copies back redacted credential values only:
`normalizeViewMetadata` grafts a view's missing `viewKind` / `object` /
`label` from the registry baseline (`viewIdentityPatch`, "The overlay's
own fields always win"); `withDeclaredPageTypeDefault` fills an absent
page `type` with the schema's declared default;
`carryForwardRedactedCredentials` restores a datasource's redacted
credential values from the stored draft-or-active row;
`graftNormalizedOperators` / `graftFoldedFormSections` rewrite spellings
the schema already normalised.
- **The draft read returns that row raw.** `getMetaItem` with `state:
'draft'` reads the `state: 'draft'` row (org-scoped, then env-wide;
package-scoped, then global), `convertStoredItem`s it, and returns
`decorateMetadataItem(type, governServedObject(type, item))`; when the
row is absent it throws `NO_DRAFT` (404) — "Draft reads stop here — they
intentionally do NOT fall through to the runtime registry". On this
strict path `decorateMetadataItem` adds `_diagnostics` only; `_draft:
true` is stamped on the `previewDrafts` arms, not here.
`extractDraftBody` strips both on the client (the spec's
`METADATA_READ_DECORATIONS`, through `stripReadDecorations`).
- **`effective` never sees a draft.** `getMetaItemLayered` composes
`effective` as `governServedObject(overlay ?? code)` where `overlay` is
the `state: 'active'` row only.
- **Publish promotes the draft raw.** `promoteDraft` reads the draft row
and calls `this.put(ref, draft.body, { state: 'active', opType:
'publish', … })`, then drains the draft row.
- **No partial-write door exists.** The REST save door is `PUT
/meta/:type/:name` (`?mode=draft` maps to `{ mode: 'draft' }` and the
body is passed as `item`); a grep of `packages/rest/src/rest-server.ts`
for a PATCH route on `/meta` finds none. `@objectstack/client`'s
`meta.saveItem(…, { mode: 'draft' })` sends the caller's body.
`packages/cli/src` holds no `mode: 'draft'` writer.
**Every writer of a `mode: 'draft'` body, enumerated (`git grep` over
both trees at the stated refs, non-test source):**
objectui (`63835d998f`):
1. `ResourceEditPage.doSave` — `itemToSave` = `config.fromDraft ?
fromDraft(draft) : draft`: the whole editor draft (no type config
defines `fromDraft` today).
2. `StudioDesignSurface` Interfaces pillar — `doCreateApp`
(`buildAppSkeleton`, whole), surface `doSave` (`draft`, whole),
`doNavSave` (`{ ...appDraft, navigation: cleanedNav }`, whole).
3. `StudioDesignSurface` Data pillar — object create
(`buildObjectSkeleton`, whole), `doSave` (`objDraft`, whole), the
field-order save (`{ ...objDraft, fields }`, whole).
4. `StudioDesignSurface` Automations pillar — flow create
(`buildFlowSkeleton`, whole), `doSave` (`draft`, whole), `toggleEnabled`
(`{ ...draft, status }`, whole); Access pillar — permission create
(`buildPermissionSkeleton`, whole).
5. `ObjectHooksPanel` — `save` (`draft`, a whole hook item) and
`addHook` (`fresh`, whole).
6. `PackageOwdOverviewPanel.doSave` — `next`, the whole object body with
the two OWD keys set or deleted.
7. `PermissionMatrixEditor` — `mergePermissionSlice(base, payload,
scope)` with `base = fresh.effective ?? payload`: a whole permission-set
body (draft mode only when a `packageId` is bound).
8. `runtime-metadata-persistence.ts` — `persistRuntimeMetadata` /
`createRuntimeMetadata` PUT the `body` their callers hold: the whole
report from `ReportConfigPanel` through `ReportView.saveSchema`, the
whole view from the runtime view persisters.
9. `@object-ui/data-objectstack` `ObjectStackAdapter.updateView(object,
view, partial)` — the one API that TAKES a partial: it reads the pending
draft (or the published view) and saves `mergeViewPatch(current,
partial, …)` = `{ ...current, ...partial, name, object }`, a whole
document.
objectstack (`4df101c383`):
10. REST `PUT /meta/:type/:name?mode=draft` — passes the request body
raw (above).
11. `ObjectStackClient.meta.saveItem` — the caller's body, raw.
12. `migrateStoredMetadata --apply` (`protocol.ts`, `source:
'migrate-stored'`) — re-saves the CONVERTED WHOLE stored row with `mode:
state === 'draft' ? 'draft' : 'publish'`.
No writer sends a subset of a document. The one caveat is not a writer
but a door: any REST client can PUT a hand-written partial body with or
without `?mode=draft`, and the server stores it as the whole draft or
the whole published body alike — the editor then shows exactly what the
server holds, which is the truthful reading. ⇒ Premise holds: **always
full**; the "can be partial" stop in the triage did not fire, so no
`needs_decision`.
## H2 — why the merge existed
The comment at the load site said the spread kept "inherited fields like
`type`" for ADR-0047 `visibleOn` predicates, treating the draft as a
"partial draft overlay". A `type` is absent from a served draft only
when the writer omitted it, and H1 shows no writer sends a subset: the
editor's own saves carry `type` because the editor's draft was loaded
from `effective` or the previous draft, both of which carry it, and for
a page the server fills a missing `type` on the way in
(`withDeclaredPageTypeDefault` in `saveMetaItem`) and on the way out
(`convertStoredItem`). The inheritance the spread protected is inside
the draft. The pins' CONTROL assertions read `type` back from the served
draft at every step.
**When the baseline is taken, as the code reads it.** Every site reads
`client.getDraft(…).catch(() => null)`. `MetadataClient.getDraft` sits
on `readItemResponse`, which returns `null` on a 404 (`NO_DRAFT`) and
throws on any other non-OK answer; the `.catch` then folds a 403, a 5xx
or a network failure into `null` too. So the baseline is taken when no
draft body was READ, which covers "no draft exists" and also "the draft
read failed". Base did the same at every site, and this change does not
touch it. The hazard that leaves is named in Acceptance notes.
## H3 — the fix, per site
| # | File · site | Before | After |
|---|---|---|---|
| 1 | `ResourceEditPage` load effect | `draftReal ? { ...baseline,
...draftReal } : baseline` | `draftReal ?? baseline` |
| 2 | `ResourceEditPage.doSave` post-save refresh | `draftReal ? {
...freshBaseline, ...draftReal } : freshBaseline` | `draftReal ??
freshBaseline` |
| 3 | `ResourceEditPage.doPublish` post-publish refresh | same spread,
no `toDraft` | `draftReal ?? freshBaseline`, then `config.toDraft` |
| 4 | `StudioDesignSurface` Interfaces — app load (`appDraft`) |
`appDraftBody ? { ...eff, ...appDraftBody } : eff` | `appDraftBody ??
eff` |
| 5 | `StudioDesignSurface` Interfaces — surface leaf load | `body ? {
...baseline, ...body } : baseline` | `body ?? baseline` |
| 6 | `StudioDesignSurface` Data — object load (`setObjDraft`) |
`draftBody ? { ...baseline, ...draftBody } : baseline` | `draftBody ??
baseline` |
| 7 | `StudioDesignSurface` Automations — flow load | `draftBody ? {
...baseline, ...draftBody } : baseline` | `draftBody ?? baseline` |
| 8 | `PackageOwdOverviewPanel` list load (`body`) | `draftBody ? {
...baseline, ...draftBody } : baseline` | `draftBody ?? baseline` |
| 9 | `PackageOwdOverviewPanel.doSave` (`next`) | `{ ...baseline,
...(draftBody ?? {}) }` | `{ ...(draftBody ?? baseline) }` |
`config.toDraft` still runs on whatever is taken at sites 1 and 2, and
now at 3; it is inert today (no registered type config defines `toDraft`
/ `fromDraft` — the `registry.ts` interface declares them,
`builtinComponents.tsx` states the view previews read `draft.config`
directly and use none).
Also checked, unchanged: `EmbeddedItemEditor.doSave` reads
`layered.effective ?? layered.code` ALONE, splices the embedded item in
and saves in publish mode — no draft is spread.
`ResourceEditPage.doReset` and `doDiscardDraft` read the baseline alone
after deleting the row — correct, unchanged.
## H4 — edges
- **A type with no draft**: baseline, unchanged (pinned: EDGE / CONTROL
in the `ResourceEditPage` file and the Interfaces CONTROL in the
design-surface file — `toStrictEqual(published)`).
- **First draft save of a never-drafted item**: the draft PUT is the
whole `itemToSave`, and the refresh shows exactly that (pinned).
- **A draft written by an older client or server that was partial**: the
server cannot compose one (H1) and no writer in either tree's history
reachable here sends one; a hand-written partial REST PUT stores a
partial DRAFT or a partial PUBLISHED body alike, and the editor now
shows what the server holds. NOT MEASURED against historical databases.
- **Publish**: the promoted body is the draft raw (`promoteDraft` →
`put(ref, draft.body, { state: 'active' })`); the triage's checklist
item ("the published body lacks the cleared key") is pinned in both
`ResourceEditPage` cases against the server double.
## Pins and ablations
Three pin files (10 tests), all green on head `85f1b9e91a` (re-run this
round under the verify lock: `Test Files 3 passed (3)`, `Tests 10 passed
(10)`, `VERDICT command-exit 0`); 7 red on base with the three source
files at `63835d998f` and the pin files present (the 3 that stay green
are the controls). The base leg and the ablations below were measured at
`5f3b9c73fd`; the round-2 commit `85f1b9e91a` changes comments and
changeset prose only (a grep of its `.ts`/`.tsx` hunks for any changed
line that is not a comment answers none), so no statement they read
moved.
- `ResourceEditPage.servedDraftTakenAsIs-10765.test.tsx` (4): mounts the
REAL `MetadataResourceEditPage` with `registerBuiltinInspectors()` so
the REAL `ReportDefaultInspector` type picker is the producer; a server
double stores draft rows raw, serves `effective` as the active row only,
promotes on publish, throws `NO_DRAFT` when no row. THE TRIAGE PIN:
bound published matrix report → pick "Joined" → first PUT clean →
post-save refresh has none of the six keys under `type: 'joined'` → an
unrelated edit's second PUT has none → Publish → published body and
post-publish editor draft have none. GENERIC: a published page's
`description` deleted in the draft stays deleted on load, across the
next save and refresh, and through publish, with `type` as the CONTROL.
Two EDGE / CONTROL cases (no draft; first draft save is the whole
document).
- `StudioDesignSurface.servedDraftTakenAsIs-10765.test.tsx` (4):
`InterfacesPillar` (app `label` deleted in the draft → heading reads
`acme_app · Navigation`; page `description` deleted → the canvas draft
lacks it), `DataPillar` (object `sharingModel` set back to unset →
Settings shows unset), `AutomationsPillar` (flow `description` deleted →
canvas draft lacks it, and the enable switch's save carries the draft
alone). Plus the Interfaces CONTROL.
- `PackageOwdOverviewPanel.servedDraftTakenAsIs-10765.test.tsx` (2):
LIST LOAD (a cleared model reads unset) and SAVE (an internal-only edit
does not resurrect the published `externalSharingModel` or
`description`).
Base leg, quoted: `Tests 7 failed | 3 passed (10)`; `AssertionError:
after the post-save refresh the editor draft has no dataset: expected {
name: 'pipeline', …(8) } to not have property "dataset"`; `expected {
name: 'home', …(5) } to not have property "description"`; `expected
'private' to be ''`; `Unable to find an element with the text: acme_app
· Navigation`. Restore proven: `git diff HEAD` empty, each path's blob
equal to HEAD.
Per-site ablations on the committed head through objectstack's
`scripts/ablation-replace.mjs` (anchor hits exactly once, blob change
proven, restore proven per leg, `diff-HEAD-lines=0` after each),
prediction written before each run:
| Site | Mutation | Predicted red | Observed |
|---|---|---|---|
| 1 load | `draftReal ?? baseline` → spread | GENERIC | `1 failed | 3
passed` — GENERIC (load: `description` back) ✔ |
| 2 post-save | `draftReal ?? freshBaseline` (save) → spread | TRIAGE,
GENERIC | `2 failed | 2 passed` ✔ |
| 3 post-publish | `draftReal ?? freshBaseline` (publish) → spread |
none | `4 passed` — none, as predicted (see Acceptance notes) |
| 4 app | `appDraftBody ?? eff` → spread | Interfaces (heading) | `1
failed | 3 passed` — `Unable to find … acme_app · Navigation` ✔ |
| 5 surface | `body ?? baseline` → spread | Interfaces (canvas) | `1
failed | 3 passed` — `not to have property "description"` ✔ |
| 6 object | `setObjDraft(draftBody ?? baseline)` → spread | Data | `1
failed | 3 passed` — `expected 'private' to be ''` ✔ |
| 7 flow | `setDraft(draftBody ?? baseline)` → spread | Automations | `1
failed | 3 passed` — `not to have property "description"` ✔ |
| 8 OWD list | `body = draftBody ?? baseline` → spread | LIST LOAD | `2
failed (2)` — LIST LOAD and SAVE: MORE than predicted; the list-load
merge also feeds the row's `external` edit, so the save wrote the
resurrected `externalSharingModel` |
| 9 OWD save | `{ ...(draftBody ?? baseline) }` → spread | SAVE | `1
failed | 1 passed` ✔ |
Direction observed as predicted at eight sites; site 8 reddened one
assertion more than predicted (reported as observed); site 3 reddened
nothing, as predicted.
## Gates (local; objectui has no `dispatch-gates.mjs` — derived from
`package.json` and `.github/workflows`)
Round 2, at head `85f1b9e91a`, run after the final commit:
- vitest, the three pin files, under the verify lock: `Test Files 3
passed (3)`, `Tests 10 passed (10)`, `VERDICT command-exit 0`.
- `node scripts/check-changeset-presence.mjs`: exit 0 — ✅ "6 source
file(s) of 1 released package(s) changed, and this change declares 1
changeset(s): .changeset/10765-draft-merge-deletion.md".
- `node scripts/check-changeset-no-major.mjs`: exit 0 — ✅ "No changeset
declares a `major` bump."
- `node scripts/check-changeset-claims.mjs`: exit 0 (report-only). It
names one pending changeset, `6681-declared-lazy-marketplace-routes.md`,
for spelling `StudioDesignSurface.tsx`; that is a chunking claim, and
this branch changes no import there.
- `node scripts/check-changeset-overwrite.mjs`: exit 0 (report-only). It
reports `M .changeset/10746-joined-report-clears-binding.md`, declared
`@object-ui/app-shell: patch` at base and now: the intended prose
correction declared in Acceptance notes (the gate's own case 2).
- `pnpm check:pending-changeset-literals`: exit 0 — ✅ "No test source
names a pending changeset."
- `pnpm check:new-line-citations`: exit 0 — `VERDICT
new-cross-file-line-citations: 0 new citation(s), enforcement
report-only -> exit 0`.
- `pnpm check:control-bytes`: exit 0 — ✅ "OK (scanned 8957 tracked text
file(s); skipped 85 binary)". The role file's control-byte grep over the
four files this round edits: no match.
- `node scripts/check-governed-queue-guard.mjs --test` over the branch's
eight paths: ✅ NOT GOVERNED.
Round 1, at `5f3b9c73fd`, not re-run: round 2 changes comments and
changeset prose only.
- ① closure build `turbo run build --filter='@object-ui/app-shell^...'
--concurrency=2` under the verify lock: `Tasks: 28 successful, 28
total`, `VERDICT command-exit 0`.
- ② `pnpm --filter @object-ui/app-shell type-check` (`tsc --noEmit &&
tsc -p tsconfig.test.json`): `VERDICT command-exit 0`; `tsc -p
tsconfig.test.json --listFiles` lists the three pin files (3 hits among
4677 files).
- ② sibling suites (every `ResourceEditPage.*`,
`PackageOwdOverviewPanel*`, `ObjectSettingsPanel.owdAgreement`,
`StudioDesignSurface.*`, `DataPillar.*`, `ObjectHooksPanel.*`,
`ReportDefaultInspector.*` test): `Test Files 57 passed (57) · Tests 271
passed (271)`, `VERDICT command-exit 0`.
- `pnpm check:test-path-roots`, `pnpm check:vi-mock-specifiers`, `pnpm
check:vi-mock-inherit`, `pnpm check:vi-mock-override-shape`: ✅ OK each.
- eslint with the app-shell package config on the six touched `.tsx`
files: exit 0, 0 errors, 76 pre-existing warnings, 0 of them on a line
this branch changed (checked against the committed hunks).
NOT MEASURED locally, CI-owned: `pnpm lint` (repo-wide), the test
shards, `Build & E2E`, `check:i18n-*` (no `t()` key added or changed),
`Governed Surface Queue Guard`. CI on `85f1b9e91a` was still running at
the report read (every completed run a success or an expected skip); its
converged state is the seat's reading.
## Serial
Branch fast-forwarded to `63835d998f` (PR objectui#10762 landed) before
the first edit, so the pins use its `commitType` as the real producer.
Re-derived at round 2 against a fresh `origin/main`, fetched into a
private ref: `17b323e5ca`, +4 over BASE (objectui#10754, objectui#10766,
objectui#10763, objectui#10774). `git diff --stat 63835d9 17b323e`
over the branch's eight paths is empty, and `git merge-tree --write-tree
HEAD 17b323e` exits 0, clean, tree `fcd7226887`. No merge commit
needed. Open PRs were not re-read this round; the seat's review read 10
and found none on `ResourceEditPage.tsx`, `StudioDesignSurface.tsx`,
`EmbeddedItemEditor.tsx`, `PackageOwdOverviewPanel.tsx` or
`PermissionMatrixEditor.tsx`.
## Acceptance notes
- **Amends another card's pending changeset.**
`.changeset/10746-joined-report-clears-binding.md` (objectui#10746,
pending, same release) ended with a reach sentence this change made
false: that a report whose PUBLISHED version was bound gets the cleared
keys back in the draft after the first draft save until publish, through
the host's draft-over-baseline merge (objectui#10765). Its sentences are
now scoped "At this change", and a `1 parent d89492c commit ab0e0fd
8 files changed
Lines changed: 805 additions & 38 deletions
File tree
- .changeset
- packages/app-shell/src/views
- metadata-admin
- studio-design
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1044 | 1044 | | |
1045 | 1045 | | |
1046 | 1046 | | |
1047 | | - | |
1048 | | - | |
1049 | | - | |
1050 | | - | |
1051 | | - | |
1052 | | - | |
| 1047 | + | |
| 1048 | + | |
| 1049 | + | |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
| 1053 | + | |
| 1054 | + | |
1053 | 1055 | | |
1054 | | - | |
1055 | | - | |
1056 | | - | |
| 1056 | + | |
1057 | 1057 | | |
1058 | 1058 | | |
1059 | 1059 | | |
| |||
1513 | 1513 | | |
1514 | 1514 | | |
1515 | 1515 | | |
1516 | | - | |
1517 | | - | |
| 1516 | + | |
| 1517 | + | |
| 1518 | + | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
1518 | 1522 | | |
1519 | | - | |
1520 | | - | |
1521 | | - | |
| 1523 | + | |
1522 | 1524 | | |
1523 | 1525 | | |
1524 | 1526 | | |
| |||
1690 | 1692 | | |
1691 | 1693 | | |
1692 | 1694 | | |
1693 | | - | |
1694 | | - | |
1695 | | - | |
| 1695 | + | |
| 1696 | + | |
| 1697 | + | |
| 1698 | + | |
| 1699 | + | |
1696 | 1700 | | |
1697 | | - | |
1698 | | - | |
1699 | | - | |
| 1701 | + | |
| 1702 | + | |
| 1703 | + | |
1700 | 1704 | | |
1701 | 1705 | | |
1702 | 1706 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
43 | 46 | | |
44 | 47 | | |
45 | 48 | | |
| |||
143 | 146 | | |
144 | 147 | | |
145 | 148 | | |
146 | | - | |
147 | | - | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
148 | 152 | | |
149 | 153 | | |
150 | 154 | | |
| |||
154 | 158 | | |
155 | 159 | | |
156 | 160 | | |
157 | | - | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
158 | 166 | | |
159 | 167 | | |
160 | 168 | | |
| |||
233 | 241 | | |
234 | 242 | | |
235 | 243 | | |
236 | | - | |
| 244 | + | |
237 | 245 | | |
238 | 246 | | |
239 | 247 | | |
| |||
244 | 252 | | |
245 | 253 | | |
246 | 254 | | |
247 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
248 | 260 | | |
249 | 261 | | |
250 | 262 | | |
| |||
0 commit comments