Skip to content

Commit e545fe2

Browse files
committed
chore(spec): regenerate the three ratchets after merging #4789 — its rename must not ride out on this branch
`git merge origin/main` brought in #4789 (kernel PackageDependencySchema -> ResolvedPackageDependencySchema, dual-source C7), which touches the same three generated artifacts this branch does. The merge reported NO conflicts and left NO conflict markers, and it was wrong in all three: api-surface.json re-added `PackageDependency (type)` + `PackageDependencySchema (const)` and dropped `ResolvedPackageDependency(Schema)` authorable-surface.json re-added the 4 `kernel/PackageDependency:*` lines and dropped the 4 `kernel/ResolvedPackageDependency:*` ones json-schema.manifest.json re-added `kernel/PackageDependency` and dropped `kernel/ResolvedPackageDependency` json-schema.manifest.json is routed to the `merge=os-regen` driver, which defers rather than regenerates, so nothing textual signals this — the C17/C10 silent revert, reproduced. `git merge-tree` does not run external merge drivers and so cannot see it either. Resolved the way #4783 did, without any textual merge: reset all three (plus api-surface-signatures.json) to origin/main, re-applied ONLY this PR's own deletion to the two hand-ratcheted files, then re-ran the generators over the merged source. The 22 authorable-surface lines and 4 manifest keys are once again deliberate deletions, now anchored at merge base ffab803, which gen:schema re-proved under #4650 route 3 ("def no longer emitted by this build"). Delta vs origin/main is now pure deletion in all three, with #4789's rename intact: api-surface.json -8 (4 const + 4 type), 0 insertions authorable-surface.json -22 lines, 0 insertions json-schema.manifest.json -4 keys, 0 insertions check:dual-source-exports reports 0 accepted dual-source (#4789's shrink to [] survives; this branch does not carry it back to 2). renamed-defs.ts is byte-identical to main and keeps all 6 entries including #4789's. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent e79e2fb commit e545fe2

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

packages/spec/api-surface.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,12 +1657,10 @@
16571657
"PackageArtifact (type)",
16581658
"PackageArtifactInput (type)",
16591659
"PackageArtifactSchema (const)",
1660-
"PackageDependency (type)",
16611660
"PackageDependencyConflict (type)",
16621661
"PackageDependencyConflictSchema (const)",
16631662
"PackageDependencyResolutionResult (type)",
16641663
"PackageDependencyResolutionResultSchema (const)",
1665-
"PackageDependencySchema (const)",
16661664
"PackageStatus (type)",
16671665
"PackageStatusEnum (const)",
16681666
"PermissionAction (type)",
@@ -1790,6 +1788,8 @@
17901788
"RequiredActionSchema (const)",
17911789
"ResolvedDependency (type)",
17921790
"ResolvedDependencySchema (const)",
1791+
"ResolvedPackageDependency (type)",
1792+
"ResolvedPackageDependencySchema (const)",
17931793
"ResourceType (type)",
17941794
"ResourceTypeSchema (const)",
17951795
"RollbackPackageRequest (type)",

packages/spec/authorable-surface.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4679,10 +4679,6 @@
46794679
"kernel/PackageArtifact:signature",
46804680
"kernel/PackageArtifact:size",
46814681
"kernel/PackageArtifact:version",
4682-
"kernel/PackageDependency:name",
4683-
"kernel/PackageDependency:resolvedVersion",
4684-
"kernel/PackageDependency:type",
4685-
"kernel/PackageDependency:versionConstraint",
46864682
"kernel/PackageDependencyConflict:conflicts",
46874683
"kernel/PackageDependencyConflict:package",
46884684
"kernel/PackageDependencyConflict:resolution",
@@ -4998,6 +4994,10 @@
49984994
"kernel/ResolvedDependency:requiredRange",
49994995
"kernel/ResolvedDependency:resolvedVersion",
50004996
"kernel/ResolvedDependency:status",
4997+
"kernel/ResolvedPackageDependency:name",
4998+
"kernel/ResolvedPackageDependency:resolvedVersion",
4999+
"kernel/ResolvedPackageDependency:type",
5000+
"kernel/ResolvedPackageDependency:versionConstraint",
50015001
"kernel/RollbackPackageRequest:packageId",
50025002
"kernel/RollbackPackageRequest:rollbackCustomizations",
50035003
"kernel/RollbackPackageRequest:snapshotId",

packages/spec/json-schema.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,6 @@
980980
"kernel/OpsFilePath",
981981
"kernel/OpsPluginStructure",
982982
"kernel/PackageArtifact",
983-
"kernel/PackageDependency",
984983
"kernel/PackageDependencyConflict",
985984
"kernel/PackageDependencyResolutionResult",
986985
"kernel/PackageStatusEnum",
@@ -1039,6 +1038,7 @@
10391038
"kernel/RealTimeNotificationConfig",
10401039
"kernel/RequiredAction",
10411040
"kernel/ResolvedDependency",
1041+
"kernel/ResolvedPackageDependency",
10421042
"kernel/ResourceType",
10431043
"kernel/RollbackPackageRequest",
10441044
"kernel/RollbackPackageResponse",

0 commit comments

Comments
 (0)