Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: improve DeepPartial recursion (#8732)
* fix: improve DeepPartial recursion Closes: #8681 * type simplification * merging master * format * format Co-authored-by: Umed Khudoiberdiev <pleerock.me@gmail.com>
- Loading branch information
Showing
4 changed files
with
75 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,12 @@ | ||
/** | ||
* Same as Partial<T> but goes deeper and makes Partial<T> all its properties and sub-properties. | ||
*/ | ||
export type DeepPartial<T> = T extends object | ||
? { | ||
[P in keyof T]?: DeepPartial<T[P]> | ||
} | ||
export type DeepPartial<T> = T extends Array<infer U> | ||
? DeepPartial<U>[] | ||
: T extends Map<infer K, infer V> | ||
? Map<DeepPartial<K>, DeepPartial<V>> | ||
: T extends Set<infer M> | ||
? Set<DeepPartial<M>> | ||
: T extends object | ||
? { [K in keyof T]?: DeepPartial<T[K]> } | ||
: T |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { Entity, ManyToOne, PrimaryGeneratedColumn } from "../../../../src" | ||
import { Thing } from "./thing.entity" | ||
|
||
@Entity() | ||
export class Item { | ||
@PrimaryGeneratedColumn() | ||
id!: number | ||
|
||
@ManyToOne(() => Thing, (thing) => thing.items) | ||
thing!: Thing | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { Entity, OneToMany, PrimaryGeneratedColumn } from "../../../../src" | ||
import { Item } from "./item.entity" | ||
|
||
@Entity() | ||
export class Thing { | ||
@PrimaryGeneratedColumn() | ||
id!: number | ||
|
||
@OneToMany(() => Item, (item) => item.thing) | ||
items!: Item[] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
import "../../utils/test-setup" | ||
import { | ||
closeTestingConnections, | ||
createTestingConnections, | ||
reloadTestingDatabases, | ||
} from "../../utils/test-utils" | ||
import { DataSource, DeepPartial } from "../../../src" | ||
import { expect } from "chai" | ||
import { Thing } from "./entity/thing.entity" | ||
import { Item } from "./entity/item.entity" | ||
|
||
describe("github issues > #8681 DeepPartial simplification breaks the .create() and .save() method in certain cases.", () => { | ||
let connections: DataSource[] | ||
before( | ||
async () => | ||
(connections = await createTestingConnections({ | ||
entities: [__dirname + "/entity/*{.js,.ts}"], | ||
schemaCreate: true, | ||
dropSchema: true, | ||
})), | ||
) | ||
beforeEach(() => reloadTestingDatabases(connections)) | ||
after(() => closeTestingConnections(connections)) | ||
|
||
it("should .save() and .create() complex deep partial entities", () => | ||
Promise.all( | ||
connections.map(async (connection) => { | ||
const myThing: DeepPartial<Thing> = { | ||
items: [{ id: 1 }, { id: 2 }], | ||
} | ||
|
||
const thing = connection.manager.create(Thing, myThing) | ||
await connection.getRepository(Thing).save(myThing) | ||
|
||
const items = connection.manager.create(Item, myThing.items) | ||
if (myThing.items) | ||
await connection.getRepository(Item).save(myThing.items) | ||
|
||
const dbItems = await connection.manager.find(Item) | ||
expect(dbItems).to.have.length(2) | ||
|
||
return { thing, items } | ||
}), | ||
)) | ||
}) |