enhance: Keep legacy Resource (#376)

__tests__/common.ts

@@ -1,16 +1,11 @@
-import {
-  Resource,
-  SchemaList,
-  schemas,
-  ReadShape,
-  SchemaDetail,
-} from 'rest-hooks';
+import { SchemaList, schemas, ReadShape, SchemaDetail } from 'rest-hooks';
 import {
   AbstractInstanceType,
   MutateShape,
   SimpleRecord,
 } from '@rest-hooks/core';
 import { Endpoint, EndpointExtraOptions } from '@rest-hooks/endpoint';
+import { Resource } from '@rest-hooks/rest';
 import React from 'react';
 
 export class UserResource extends Resource {

__tests__/tsconfig.json

@@ -6,6 +6,7 @@
   "include": ["."],
   "references": [
     { "path": "../packages/endpoint" },
+    { "path": "../packages/rest" },
     { "path": "../packages/core" },
     { "path": "../packages/rest-hooks" }
   ]

jest.config.js

@@ -51,6 +51,7 @@ const baseConfig = {
 const packages = [
   'legacy',
   'endpoint',
+  'rest',
   'core',
   'rest-hooks',
   'normalizr',

packages/rest-hooks/src/index.ts

@@ -70,7 +70,7 @@ export type {
 } from '@rest-hooks/core';
 
 export { Resource, SimpleResource } from './resource';
-export type { SchemaDetail, SchemaList } from './resource/types';
+export type { SchemaDetail, SchemaList, Method } from './resource/types';
 export {
   CacheProvider,
   ExternalCacheProvider,

packages/rest-hooks/src/resource/Resource.ts

@@ -1,3 +1,6 @@
+/* istanbul ignore file */
+
+import type { Method } from './types';
 import SimpleResource from './SimpleResource';
 
 class NetworkError extends Error {
@@ -16,17 +19,25 @@ class NetworkError extends Error {
  * Typically 1:1 with a url endpoint.
  */
 export default abstract class Resource extends SimpleResource {
+  /** A function to mutate all request options for fetch */
+  static fetchOptionsPlugin?: (options: RequestInit) => RequestInit;
+
   /** Perform network request and resolve with HTTP Response */
-  static fetchResponse(input: RequestInfo, init: RequestInit) {
-    const options: RequestInit = {
-      ...init,
+  static fetchResponse(
+    method: Method,
+    url: string,
+    body?: Readonly<object | string>,
+  ) {
+    let options: RequestInit = {
+      method: method.toUpperCase(),
       headers: {
         'Content-Type': 'application/json',
         // "Content-Type": "application/x-www-form-urlencoded",  -- maybe use this if typeof body is FormData ?
-        ...init.headers,
       },
     };
-    return fetch(input, options)
+    if (this.fetchOptionsPlugin) options = this.fetchOptionsPlugin(options);
+    if (body) options.body = JSON.stringify(body);
+    return fetch(url, options)
       .then(response => {
         if (!response.ok) {
           throw new NetworkError(response);
@@ -43,8 +54,8 @@ export default abstract class Resource extends SimpleResource {
   }
 
   /** Perform network request and resolve with json body */
-  static fetch(input: RequestInfo, init: RequestInit) {
-    return this.fetchResponse(input, init).then((response: Response) => {
+  static fetch(method: Method, url: string, body?: Readonly<object | string>) {
+    return this.fetchResponse(method, url, body).then((response: Response) => {
       if (
         !response.headers.get('content-type')?.includes('json') ||
         response.status === 204