Skip to content

fix: loading database crashes if collections are missing #2237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rix0rrr merged 3 commits into from
Nov 24, 2025
Merged

fix: loading database crashes if collections are missing #2237

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f7bcec
fix(tskb): handle missing relationship data during database hydration
gasolima Nov 24, 2025
7144be0
Check elsewhere, add tests
rix0rrr Nov 24, 2025
6f953f8
Wut
rix0rrr Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions packages/@cdklabs/tskb/src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,14 @@ export class Database<ES extends object, RS extends object> {

function hydrate(proto: unknown, x: unknown): void {
if (isEntityCollection(proto)) {
proto.hydrateFrom(x);
if (x !== undefined) {
proto.hydrateFrom(x);
}
}
if (isRelationshipCollection(proto)) {
proto.hydrateFrom(x);
if (x !== undefined) {
proto.hydrateFrom(x);
}
}
if (Array.isArray(x)) {
x.forEach(hydrate);
Expand Down Expand Up @@ -237,11 +241,11 @@ type IndexNamesOf<A> = A extends EntityCollection<any> ? KeysOfUnion<A['indexes'
type IndexOf<EC, I extends IndexNamesOf<EC>> =
EC extends EntityCollection<any>
? EC['indexes'][I] extends EntityIndex<any, infer IndexType>
? {
valueType: IndexType;
lookups: keyof EC['indexes'][I]['lookups'];
}
: never
? {
valueType: IndexType;
lookups: keyof EC['indexes'][I]['lookups'];
}
: never
: never;

type EntityType<A> = A extends EntityCollection<infer B> ? B : never;
Expand Down
Loading