fix: merge resource

adityadarma · adityadarma · commit 7e995dbd60e4 · 2025-07-10T11:59:07.000+08:00
diff --git a/src/core/base_resource.ts b/src/core/base_resource.ts
@@ -64,12 +64,12 @@ export abstract class BaseResource<T extends LucidRow['$attributes']> {
       : new MissingValue()
   }
 
-  protected mergeResource<K>(data: K extends LucidRow ? K : never, resource: any) {
+  protected mergeResource<K>(data: K extends LucidRow | LucidRow[] ? K : never, resource: any) {
     return this.mergeResourceWhen(data, resource, null)
   }
 
   protected mergeResourceWhen<K>(
-    data: K extends LucidRow ? K : never,
+    data: K extends LucidRow | LucidRow[] ? K : never,
     resource: any,
     defaultValue: any = undefined
   ) {

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,12 @@ export abstract class BaseResource<T extends LucidRow['$attributes']> {`
`64`	`64`	`: new MissingValue()`
`65`	`65`	`}`
`66`	`66`
`67`		`- protected mergeResource<K>(data: K extends LucidRow ? K : never, resource: any) {`
	`67`	`+ protected mergeResource<K>(data: K extends LucidRow \| LucidRow[] ? K : never, resource: any) {`
`68`	`68`	`return this.mergeResourceWhen(data, resource, null)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`protected mergeResourceWhen<K>(`
`72`		`- data: K extends LucidRow ? K : never,`
	`72`	`+ data: K extends LucidRow \| LucidRow[] ? K : never,`
`73`	`73`	`resource: any,`
`74`	`74`	`defaultValue: any = undefined`
`75`	`75`	`) {`