feat: 🎸 简化注册 client 流程 (#57)

Co-authored-by: WhimsFate <[email protected]>

Author: WhimsFate

packages/mini-app-demo/src/main.ts

@@ -84,7 +84,7 @@ export function createApp() {
         return data.data;
     });
 
-    store.registerClient('REST', restClient);
+    store.registerClient(restClient);
 
     app.use(store);
 

packages/model/docs/guide/client.md

@@ -35,4 +35,4 @@ restClient.interceptors.response.use(({ data }) => {
 });
 ```
 
-详细`options`配置与`拦截器配置`，请参考[createClient](../api/client.md#createclient)
+详细`options`配置与`拦截器配置`，请参考[createClient](../api/client.md#createclient)

packages/model/docs/guide/installation.md

@@ -20,7 +20,7 @@ import CompositionAPI, { createApp, h } from '@vue/composition-api';
 
 Vue.use(CompositionAPI);
 
-const restClient = createClient('rest', {
+const restClient = createClient('REST', {
     method: 'post',
     timeout: 10 * 1000,
 });
@@ -46,7 +46,7 @@ restClient.interceptors.response.use(({ data }) => {
 const store = createStore();
 
 // 注册对应的Client
-store.registerClient('REST', restClient);
+store.registerClient(restClient);
 
 // 绑定Store与app实例的关系
 app.use(store);

packages/model/docs/guide/store.md

@@ -16,7 +16,9 @@ app.use(store);
 注册对应client，**注意** client为单例模式
 ```typescript
 // 注册Rest Client
-store.registerClient('REST', restClient);
+const restClient = createClient('REST')
+store.registerClient(restClient);
 // 注册GQL Client，暂不可用
-store.registerClient('GQL', restClient);
+const gqlClient = createClient('GQL')
+store.registerClient(gqlClient);
 ```

packages/model/examples/client/main.ts

@@ -22,7 +22,7 @@ export function createApp(customFetch?: Fetch) {
         return res.data;
     });
 
-    store.registerClient('REST', restClient);
+    store.registerClient(restClient);
     const app = createSSRApp({
         render: () => h(App),
     });

packages/model/src/__test__/api.spec.ts

@@ -16,7 +16,7 @@ describe(`model should has it's own effect scope`, () => {
         const store = createStore();
         const client = createClient('REST');
 
-        store.registerClient('REST', client);
+        store.registerClient(client);
 
         const app = createApp({
             render: () => h(App)

packages/model/src/__test__/server.spec.ts

@@ -21,7 +21,7 @@ describe(`model should has it's own effect scope`, () => {
             return JSON.parse(data.data);
         });
 
-        store.registerClient('REST', client);
+        store.registerClient(client);
 
         const app = createSSRApp(App);
         app.use(store, true);

packages/model/src/clients/client-factory.ts

@@ -311,5 +311,6 @@ export function clientFactory(
         interceptors,
         query: requestWithCache,
         mutate: request,
+        type
     };
 }

packages/model/src/model/__test__/fn-type.spec.ts

@@ -27,6 +27,7 @@ import {
 
 import { MockModel, MockComposeModel } from './mock-models/fn-type';
 import 'unfetch/polyfill'
+import { isFetchMoreState } from '../../operations';
 
 const restClient = createClient('REST', {
     method: 'post',

packages/model/src/store/index.ts

@@ -57,8 +57,8 @@ export function createStore() {
 
     const rebornClient: RebornClient = {};
 
-    function registerClient(type: 'REST' | 'GQL', client: Client): void {
-        if (type === 'REST') {
+    function registerClient(client: Client): void {
+        if (client.type === 'REST') {
             if (rebornClient.rest) {
                 console.warn('You have already registered a restClient yet');
                 return;