fix: TypeScript 5.7 support

reactive · Dec 28, 2024 · a0236cb · a0236cb
1 parent 4a2ebe1
commit a0236cb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/.changeset/perfect-walls-admire.md b/.changeset/perfect-walls-admire.md
@@ -0,0 +1,26 @@
+---
+'@data-client/rest': patch
+---
+
+Resource.extend() compatibility with TypeScript 5
+
+Previously [extending existing members](https://dataclient.io/rest/api/resource#extend-override) with no
+typed overrides (like [path](https://dataclient.io/rest/api/resource#path)) would not work starting with
+TypeScript 5.7.
+
+```ts
+const UserResource = UserResourceBase.extend({
+  partialUpdate: {
+    getOptimisticResponse(snap, params, body) {
+      params.id;
+      params.group;
+      // @ts-expect-error
+      params.nothere;
+      return {
+        id: params.id,
+        ...body,
+      };
+    },
+  },
+});
+```
diff --git a/packages/rest/src/resourceExtendable.ts b/packages/rest/src/resourceExtendable.ts
@@ -69,11 +69,11 @@ export interface Extendable<
   };
   extend<
     R extends ResourceInterface,
-    Get extends PartialRestGenerics = any,
-    GetList extends PartialRestGenerics = any,
-    Update extends PartialRestGenerics = any,
-    PartialUpdate extends PartialRestGenerics = any,
-    Delete extends PartialRestGenerics = any,
+    Get extends PartialRestGenerics = {},
+    GetList extends PartialRestGenerics = {},
+    Update extends PartialRestGenerics = {},
+    PartialUpdate extends PartialRestGenerics = {},
+    Delete extends PartialRestGenerics = {},
   >(
     this: R,
     options: ResourceEndpointExtensions<

diff --git a/packages/rest/src/resourceExtensionTypes.ts b/packages/rest/src/resourceExtensionTypes.ts
@@ -59,11 +59,11 @@ export type ExtendedResource<
 
 export interface ResourceEndpointExtensions<
   R extends ResourceInterface,
-  Get extends PartialRestGenerics = any,
-  GetList extends PartialRestGenerics = any,
-  Update extends PartialRestGenerics = any,
-  PartialUpdate extends PartialRestGenerics = any,
-  Delete extends PartialRestGenerics = any,
+  Get extends PartialRestGenerics = {},
+  GetList extends PartialRestGenerics = {},
+  Update extends PartialRestGenerics = {},
+  PartialUpdate extends PartialRestGenerics = {},
+  Delete extends PartialRestGenerics = {},
 > {
   readonly get?: RestEndpointOptions<
     unknown extends Get ? EndpointToFunction<R['get']>