fix(adapter-commons): multiple type definition issues (#2876)

TheNoim · web-flow · commit 4ff1ed084eb2 · 2022-12-04T09:07:24.000-08:00
diff --git a/packages/adapter-commons/src/declarations.ts b/packages/adapter-commons/src/declarations.ts
@@ -80,7 +80,7 @@ export interface AdapterParams<
  *
  * @see {@link https://docs.feathersjs.com/guides/migrating.html#hook-less-service-methods}
  */
-export interface InternalServiceMethods<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams> {
+export interface InternalServiceMethods<T = any, D = T, P extends AdapterParams = AdapterParams> {
   /**
    * Retrieve all resources from this service.
    * Does not sanitize the query and should only be used on the server.
diff --git a/packages/adapter-commons/src/service.ts b/packages/adapter-commons/src/service.ts
@@ -20,7 +20,7 @@ const alwaysMulti: { [key: string]: boolean } = {
  */
 export abstract class AdapterBase<
   T = any,
-  D = Partial<T>,
+  D = T,
   P extends AdapterParams = AdapterParams,
   O extends AdapterServiceOptions = AdapterServiceOptions
 > implements InternalServiceMethods<T, D, P>
@@ -130,8 +130,8 @@ export abstract class AdapterBase<
    */
   async _find(_params?: P & { paginate?: PaginationOptions }): Promise<Paginated<T>>
   async _find(_params?: P & { paginate: false }): Promise<T[]>
-  async _find(params?: P): Promise<T | T[] | Paginated<T>>
-  async _find(params?: P): Promise<T | T[] | Paginated<T>> {
+  async _find(params?: P): Promise<T[] | Paginated<T>>
+  async _find(params?: P): Promise<T[] | Paginated<T>> {
     const query = await this.sanitizeQuery(params)
 
     return this.$find({
diff --git a/packages/adapter-commons/test/fixture.ts b/packages/adapter-commons/test/fixture.ts
@@ -6,23 +6,22 @@ export type Data = {
 }
 
 export class MethodBase
-  extends AdapterBase<Data, Partial<Data>, AdapterParams>
+  extends AdapterBase<Data, Data, AdapterParams>
   implements InternalServiceMethods<Data>
 {
   async $find(_params?: AdapterParams & { paginate?: PaginationOptions }): Promise<Paginated<Data>>
   async $find(_params?: AdapterParams & { paginate: false }): Promise<Data[]>
-  async $find(params?: AdapterParams): Promise<Data | Data[] | Paginated<Data>>
   async $find(params?: AdapterParams): Promise<Data | Data[] | Paginated<Data>> {
     if (params && params.paginate === false) {
-      return {
-        total: 0,
-        limit: 10,
-        skip: 0,
-        data: []
-      }
+      return []
     }
 
-    return []
+    return {
+      total: 0,
+      limit: 10,
+      skip: 0,
+      data: []
+    }
   }
 
   async $get(id: Id, _params?: AdapterParams): Promise<Data> {
@@ -51,7 +50,7 @@ export class MethodBase
   }
 
   async $update(id: NullableId, _data: Data, _params?: AdapterParams) {
-    return Promise.resolve({ id })
+    return Promise.resolve({ id: id ?? _data.id })
   }
 
   async $patch(id: null, _data: Partial<Data>, _params?: AdapterParams): Promise<Data[]>
diff --git a/packages/adapter-commons/test/service.test.ts b/packages/adapter-commons/test/service.test.ts
@@ -16,7 +16,7 @@ describe('@feathersjs/adapter-commons/service', () => {
     METHODS.forEach((method) => {
       it(`${method}`, () => {
         const service = new MethodService({})
-        const args = []
+        const args: any[] = []
 
         if (method !== 'find') {
           args.push('test')

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export interface AdapterParams<`
`80`	`80`	`*`
`81`	`81`	`* @see {@link https://docs.feathersjs.com/guides/migrating.html#hook-less-service-methods}`
`82`	`82`	`*/`
`83`		`-export interface InternalServiceMethods<T = any, D = Partial<T>, P extends AdapterParams = AdapterParams> {`
	`83`	`+export interface InternalServiceMethods<T = any, D = T, P extends AdapterParams = AdapterParams> {`
`84`	`84`	`/**`
`85`	`85`	`* Retrieve all resources from this service.`
`86`	`86`	`* Does not sanitize the query and should only be used on the server.`