Repository navigation
Commit d655caf
feat(objectql)!: refuse a (type, name) held twice inside one namespace (#31717)
<!-- claude-projects-attribution: {"github_login":"os-steve"} -->
_Requested by **Steve** · [project
thread](https://claude.ai/code/project/chan_01FdL1XeUyvVNxLreh3F4Qi9?thread=cmsg_01FdL1XeUyvVNxLreh3F4Qi9Ff4UJdxHJzwSQG7VEko8ou)_
Fixes #31670
ADR-0150 child N (D2, ruled 6724570466): inside one namespace, a `(type,
name)` of the twelve bucket 2/3 types phase 1 does not cover has one
package holder. Claim 6727391505 (`domain:server#1`, card-thread
session_01ADHkmQv69sQL5nfT8xuPWs).
Clause-②: no (narrowing) — measured on head `97b94ed7` and, for base, by
the ablations that remove the one added call at each door (the predicate
module is otherwise unread): the package door
(`SchemaRegistry.installPackage`, every install, boot included) refuses
a package registration it accepted on base, one whose item of these
twelve types bears a name another installed package of its namespace
holds (ablated = base: the second co-owner installs; head:
`NAMESPACE_CONFLICT` 422); `os validate` / `os build` refuse the
artifact that carries it (ablated = base: `os validate --json` exits 0;
head: exits 1). Riding along at those two commands, because the walk
reads `packages[]` through `@objectstack/core`'s
`resolveArtifactPackageOrder` (the boot's own resolver): an artifact
declaring one package id twice (`DUPLICATE_ARTIFACT_PACKAGE`, 422) and
an artifact whose packages' dependencies form a cycle (`[Kernel]
Circular dependency detected`, no code) now exit 1 through the commands'
catch-all instead of exiting 0; neither artifact ever booted, so the two
doors now agree with the boot on them. Nothing is widened.
Metadata-protocol: narrowed
Skills-docs: none — `skills/**` does not teach that two packages of one
namespace may share one of these names; the rule ships in the refusal
text and in ADR-0150 D2, which already records it.
No governed surface is touched. This is a narrowing, so the review of
record runs at CONTRACT_REVIEW_TIER.
## 维护者速读
-
改了什么:同一个命名空间里的几个包(同一制品里的包、或靠依赖共用命名空间的包),它们的共享规则、队列、分配规则、hook、job、应用、页面、仪表盘、报表、文档书、分析立方、工具这
12 类元数据不能重名。安装时拒绝(422 `NAMESPACE_CONFLICT`,点出所有持有包),`os validate` 和 `os
build` 用同一句话提前拒绝,`os build` 不产出制品。
- 为什么改:ADR-0150
以后按「命名空间/名字」寻址这些元数据,两个同命名空间的包同名时,地址就指向两个条目、读者只能静默取第一个。ADR-0150 D2
已裁定:同一命名空间内一个名字只有一个包持有,就像对象名早已如此(ADR-0130 D3)。
- 风险与回滚:只收窄接受集,不改已存数据、不迁移。实测第一方 0 处冲突(启动的 showcase 29 个包 60 个名字、4
个示例应用)。已经存在这种冲突的部署升级后会启动失败并点名两个包——这一点作为开放问题交席位裁定(另一选项:像一期规则那样冷启动只告警)。回滚即
revert。
-
先看:`packages/objectql/src/namespace-co-owner-names.ts`(唯一判定)、`registry.ts`
里 `installPackage` 紧跟 D3 对象检查的那一行和
`refuseNamespaceNameConflicts`、`packages/cli/src/utils/namespace-co-owner-names.ts`(按启动安装顺序走制品)。
- 两分钟验证:`pnpm --filter @objectstack/objectql exec vitest run
src/registry-namespace-co-owner-names.test.ts` —— 预期 56 passed。
- 需要你做的:无,席位落地(收窄,席位按契约档复审)。
## What changes
- **`packages/objectql/src/namespace-co-owner-names.ts`** (new) — the
ONE predicate. `NAMESPACE_UNIQUE_TYPES` (the twelve, in ADR-0150's
child-N order); `declaredNamespaceUniqueNames` reads the names the
engine registers (each collection by `singularToPlural(type)`, nested
`plugins[]` one level deep, the manifest-as-app and plugin-as-app rows,
`name` else `id`); `namespaceNameConflicts(incoming, sitting)` returns,
per `(type, name)` of the incoming package, EVERY other package of its
namespace that holds it; `namespaceNameConflictMessage` is the one
sentence. Not judged: a package with no namespace, the shareable
platform namespaces (`base`, `system`, `sys`, the namespace gate's
exemption), the environment catalog, the same package again.
- **`packages/objectql/src/registry.ts`** — `installPackage` asks it
right after the ADR-0130 D3 object check
(`refuseNamespaceNameConflicts`), ahead of every mutation, at every
install; the sitting holders are the installed package records of the
incoming namespace, so an uninstall takes its names with it and nothing
new is stored. New `NamespaceNameConflictError`: `code:
'NAMESPACE_CONFLICT'` (the namespace gate's, as the bare-name rule
reuses it; no code minted), `status`/`httpStatus` 422, `conflicts[]`,
every holder named. No `collisionPolicy` downgrade. ⛔ Not the #31661
hunks (its `registerItem` comment line and `bare-name-one-holder.ts`) —
untouched.
- **`packages/objectql/src/index.ts`** — exports the predicate, the
sentence and the type list for the CLI (the class stays unexported, as
the registry's other refusals).
- **`packages/cli/src/utils/namespace-co-owner-names.ts`** (new) — the
walk: an artifact's `packages[]` bodies in
`resolveArtifactPackageOrder`'s order (the order the boot installs them,
the same seam `os validate` already drives for the union stack), each
against the bodies before it; every refused body reported, each naming
every holder. A stack without `packages[]` is one package and is never
refused here.
- **`packages/cli/src/commands/validate.ts`** (step 2c-bis) and
**`compile.ts`** (step 3a-ter) — the same call right after the parse,
beside the view-container refusal and with its faces (`--json` `errors`
rows; text bullet list); `os build` writes no artifact.
**`test/validate-build-gate-parity.test.ts`** —
`findNamespaceNameRefusals` joins the shared-gate roster (forced: the
roster is closed, every gate either command calls must be classified).
-
**`scripts/adr-anchors/packages__objectql__src__namespace-co-owner-names.ts.json`**
— anchors the module to ADR-0150 D2 / ADR-0130.
- **`.changeset/31670-namespace-co-owner-names.md`** —
`@objectstack/objectql` and `@objectstack/cli` `minor`, both declaration
lines, BREAKING Why / Before / Now / Who moves / Unchanged with the
one-line fix (rename the item in one of the two packages), `adr-0087:
not-required (no-migration-prescription)`.
Forced test edits: two rows, no existing assertion changed. The parity
roster row above, and one row in
`packages/objectql/src/federated-injected-column-readers.test.ts`'s
closed ledger: `namespace-co-owner-names.ts#<module> :: queue` as
`not-a-read` (its scanner matches the `'queue'` literal of the
twelve-type list as the ADR-0142 injected `queue` column; it names a
metadata type and reads no row, the same disposition as
`assignment-rules.ts#<module> :: queue`).
## Why (measured, Step 0 on `5d1382a5`)
- **ADR-0130 D3's object check lives at ONE door, not two.**
`SchemaRegistry.installPackage` → `refuseCoOwnedObjectNameCollision`
(registry.ts). `os validate` (`packages/cli/src/commands/validate.ts`)
has no D3 check: `git grep` for `DUPLICATE_ARTIFACT_OBJECT_NAME` /
`ArtifactObjectNameConflictError` / `ADR-0130 D3` under
`packages/cli/src` and `packages/lint/src` is 0 hits. So this card
builds the validate door for its own rule; it does not sit on an
existing one there.
- **How D3 decides "same namespace": it does not compare namespaces.**
It reads `coOwnersOf` — `artifact` (every other package of the same
release artifact, whatever its namespace), `dependency` and `sibling`
(ADR-0141 D5, only for a non-shareable namespace) — and leaves a
stranger to the namespace gate. Objects are global names, so that is
enough for D3. For these twelve types two packages of one artifact in
two namespaces hold two addresses, so this rule compares
`manifest.namespace` itself (and so also covers two strangers the `warn`
collision policy lets share a namespace).
- **The twelve types' collection keys** (`PLURAL_TO_SINGULAR`, the
engine's `METADATA_ARRAY_KEYS`): `sharingRules`, `queues`,
`assignmentRules`, `hooks`, `jobs`, `apps` (top level only; plus
manifest-as-app and plugin-as-app), `pages`, `dashboards`, `reports`,
`books`, `analyticsCubes`, `tools`. The namespace field is the package's
`manifest.namespace` for every one of them: no item of these types
carries its own.
- **First-party census.** Booted showcase (`examples/app-showcase`,
`pnpm dev --fresh`, `GET /api/v1/packages`): 29 packages (22 in `sys`, 4
with none), 60 declared names of the twelve types, **0** `(namespace,
type, name)` held by two packages — `sys` included, though it is not
judged. Example stacks (each `objectstack.config.ts`, `packages[]`
resolved as the boot does): app-crm 4 names, app-todo 8,
app-multi-package 2 packages in `crm`, 1 name, app-showcase 50 — **0**
held twice. `os validate --json` on all four: exit 0, 0 errors. HotCRM
is not in this container: **NOT MEASURED** (the card's 0 of 297 is its
claim).
## ADR-0150's four readings
- **(a) phase-1 one-holder tests stay green**:
`registry-bare-name-one-holder*.test.ts` run inside the objectql suite
below — green in the suite, and run alone: 4 files
(`registry-bare-name-one-holder.test.ts` and its ai/flow/request family
files) / **154 passed**.
- **(b) bare-name behaviour unchanged for one-holder names**: the
CONTROL "co-owners with distinct names both install, and the bare name
keeps serving its one holder" (real load path, `getItem('page', NAME)`
answers each package's own page), and every per-type CONTROL (two
namespaces, two types, the same package again) installs; first-party
census 0, so no shipped name changes answer. For an uncovered type's
name with two holders inside one namespace, this card's declared
narrowing stands in its place.
- **(c) no migration**: nothing stored changes shape and nothing is
rewritten; the refusal reads the installed package records at install
time and keeps no state of its own.
- **(d)** `Clause-②: no (narrowing)` above and in the changeset;
`Metadata-protocol: narrowed`; the changeset carries `adr-0087:
not-required (no-migration-prescription)`.
## How the two checks compose at `installPackage` (with #31661)
Order in `installPackage`: namespace gate → ADR-0130 D3 object check →
**this rule** → security catalog → default record page → phase 1's
bare-name rule. So:
- A `tool` held twice **inside one namespace** is refused by this rule
at every install; after the cold boot's seal the bare-name rule would
refuse it too, but this one runs first, so the refusal is
`NamespaceNameConflictError` (both carry `NAMESPACE_CONFLICT` / 422).
Pinned: "after the cold boot's seal, a same-namespace tool is refused by
THIS rule".
- A `tool` held by two packages of **different namespaces** is not this
rule's: after #31661 the bare-name rule refuses it after the seal.
- One difference at the **cold boot**: a deployment already holding a
same-namespace tool clash is refused at boot by this rule, where the
bare-name rule alone would only warn. See open question 1.
- Measured: #31661's head `30b6c84f` merged onto this branch in a
scratch worktree (clean, `registry.ts` auto-merged): this file plus
`registry-bare-name-one-holder-ai-family.test.ts` **2 files / 94
passed**. If #31661 lands first, this branch merges it (no overlapping
hunk).
## Verification
Head `97b94ed7` (merged `origin/main` at `a2d0f737` once, no conflict).
Every heavy run under `os-verify-lock`:
- New: `packages/objectql/src/registry-namespace-co-owner-names.test.ts`
**56 passed**; `packages/cli/src/utils/namespace-co-owner-names.test.ts`
+ parity **2 files / 63 passed**;
`packages/cli/test/validate-namespace-name.test.ts` (spawns `os
validate` / `os build`; asserts the row's message EQUAL to the package
door's thrown message) **4 passed**.
- Suites on the final head: `@objectstack/objectql` **573 files / 11672
passed**; `@objectstack/cli` unit project **406 / 5754 passed** (+ the
two new/edited integration files **2 / 38 passed**);
`@objectstack/metadata-protocol` **328 passed, 4 skipped / 22595 passed,
26 skipped**; `@objectstack/rest` **395 / 7627 passed, 332 skipped**;
`@objectstack/runtime` **563 / 9033 passed, 19 skipped**. Typecheck
objectql and cli exit 0.
- Dogfood battery (narrowing arm): `97b94ed7` · `os-verify-lock: VERDICT
command-exit 0` · Test Files 440 passed, 3 skipped (443) · Tests 3652
passed, 41 skipped (3693) · no failure.
- Lint: `eslint packages/objectql --no-inline-config` exit 0; `eslint
packages/cli --no-inline-config` exit 0.
- Gates: `dispatch-gates --ran` on `97b94ed7`: **84 derived, 84 run, 0
NOT-MEASURED, 0 UNRUN**, every one exit 0. Two first ran exit 3 for a
missing prerequisite and were re-run green: `check-plugin-teardown-shape
--self-test` (its pinned fixture commit fetched first),
`check:dual-build-cjs-loads` (after building the five packages without a
`dist/`).
<details><summary>Ablations (each committed first,
`ablation-replace.mjs`, restored, `git diff HEAD` empty)</summary>
1. Package door — `this.refuseNamespaceNameConflicts(manifest);`
replaced by a comment (`ABLATION-31670`) in `registry.ts` →
`registry-namespace-co-owner-names.test.ts` **17 of 56 red**: the 12
per-type refusals ("expected undefined to be an instance of
NamespaceNameConflictError"), the real-load-path per-family refusal, the
multi-name refusal, the dependency co-owner, the `warn`-policy refusal,
the after-seal tool. The 39 green are the vocabulary cells and every
CONTROL. Restored: blob `3b698a04` == HEAD, `git diff HEAD` 0 bytes.
(objectql's tests import `src`, so no dist leg.)
2. `os validate` door — `if (namespaceNameRefusals.length > 0) {` → `<
0` in `validate.ts` → `validate-namespace-name.test.ts` **1 of 4 red**:
"os validate --json exits 1 …" (`expected +0 to be 1`): with the branch
gone `os validate` exits 0, so no other gate catches the clash. The `os
build` cell stayed green (its own call). Restored: blob `f997cced` ==
HEAD, diff 0 bytes. (`run-dev.js` runs the CLI from `src`.)
3. The walk — `if (conflicts.length > 0) {` → `< 0` in the CLI util →
`namespace-co-owner-names.test.ts` **14 of 29 red** (12 per-type rows,
the three-holder walk, the dependency-order walk); the 15 CONTROLs
green. Restored: blob `fc052169` == HEAD, diff 0 bytes.
</details>
## Acceptance notes
- **Open question 1 (seat's call): the cold boot.** This rule refuses at
every install, the boot included, as ADR-0130 D3's object check does. A
deployment whose installed packages of one namespace already share one
of these names (measured first-party: 0; HotCRM per the card: 0 of 297)
no longer boots after upgrading, and the refusal names both packages.
The alternative is phase 1's posture: judge only after
`kernel:bootstrapped` seals the registry and warn at the cold boot.
Recommendation: keep install-time, because D2 is ruled as an install
refusal "on the ADR-0130 D3 object check", and the measured population
that would stop booting is 0.
- **Open question 2 (seat's call): `sys`.** ADR-0150 D2 names `sys/NAME`
as an address too, but this rule does not judge the shareable namespaces
(`base`, `system`, `sys`), mirroring the namespace gate's exemption and
D3's co-owner map. Measured first-party: the 22 `sys` packages of a
booted showcase hold 0 duplicate names, so judging `sys` would refuse
nothing here today; cloud's `sys` packages are NOT MEASURED.
Recommendation: leave `sys` out in this child; a later child can widen
it once cloud's `sys` packages are measured.
- **Name** (seat's call, house conventions):
`NamespaceNameConflictError`; module `namespace-co-owner-names.ts`;
exported `NAMESPACE_UNIQUE_TYPES`, `namespacePackageOf`,
`namespaceNameConflicts`, `namespaceNameConflictMessage`. No new error
code.
- Not judged at either door: the residual (top-level items of a
`packages[]` stack no body declares), which the boot registers without
an install. `os validate` cannot see packages already installed in a
deployment; that half is the package door's alone.
- Bounds, stated (contract review N1, N2): the sitting holders are read
from the stored package record and the incoming one from the live
manifest, so a nested `plugins[]` entry that is a plugin class instance
counts on the incoming side only; and on a running registry, an upgraded
artifact that moves a covered name from co-owner A to co-owner B is
refused when B re-registers before A (A's stale record still holds it),
the same disposition ADR-0130 D3's object check has; the cold boot
starts empty and is unaffected, and `os validate` accepts that artifact.
- Integration tier: `test/validate-namespace-name.test.ts` spawns the
CLI, so it falls in the cli `integration` project (declared to CI); it
was also run locally above.
---
_Generated by [Claude
Code](https://claude.ai/code/session_01ADHkmQv69sQL5nfT8xuPWs)_
🤖 Generated with [Claude Code](https://claude.com/claude-code)
https://claude.ai/code/session_01ADHkmQv69sQL5nfT8xuPWs
<!-- signed: domain:server#1 · os-steve ·
session_01ADHkmPF1skfu2kx89BEXZi -->
---------
Co-authored-by: Claude <noreply@anthropic.com>1 parent d7a7193 commit d655caf
13 files changed
Lines changed: 1235 additions & 0 deletions
File tree
- .changeset
- packages
- cli
- src
- commands
- utils
- test
- objectql/src
- scripts/adr-anchors
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
76 | 79 | | |
77 | 80 | | |
78 | 81 | | |
| |||
513 | 516 | | |
514 | 517 | | |
515 | 518 | | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
516 | 541 | | |
517 | 542 | | |
518 | 543 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
77 | 81 | | |
78 | 82 | | |
79 | 83 | | |
| |||
505 | 509 | | |
506 | 510 | | |
507 | 511 | | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
508 | 546 | | |
509 | 547 | | |
510 | 548 | | |
| |||
| 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 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 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 | + | |
0 commit comments