Convert dataProvider, fakeServer and i18n to ts

marmelab · Mar 11, 2020 · cc348ed · cc348ed
1 parent a5c7bcf
commit cc348ed
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 12 deletions.
diff --git a/examples/demo/package.json b/examples/demo/package.json
@@ -42,6 +42,7 @@
         "not op_mini all"
     ],
     "devDependencies": {
+        "@types/fetch-mock": "^7.3.2",
         "@types/classnames": "^2.2.9",
         "@types/jest": "^24.0.23",
         "@types/node": "^12.12.14",

diff --git a/examples/demo/src/App.tsx b/examples/demo/src/App.tsx
@@ -38,10 +38,10 @@ const App = () => {
 
         const fetchDataProvider = async () => {
             restoreFetch = await fakeServerFactory(
-                process.env.REACT_APP_DATA_PROVIDER
+                process.env.REACT_APP_DATA_PROVIDER || ''
             );
             const dataProviderInstance = await dataProviderFactory(
-                process.env.REACT_APP_DATA_PROVIDER
+                process.env.REACT_APP_DATA_PROVIDER || ''
             );
             setDataProvider(
                 // GOTCHA: dataProviderInstance can be a function

diff --git a/examples/demo/src/data-generator-retail.d.ts b/examples/demo/src/data-generator-retail.d.ts
@@ -0,0 +1 @@
+declare module 'data-generator-retail';
diff --git a/examples/demo/src/dataProvider/graphql.js → examples/demo/src/dataProvider/graphql.ts b/examples/demo/src/dataProvider/graphql.js → examples/demo/src/dataProvider/graphql.ts
@@ -3,7 +3,7 @@ import buildApolloClient, {
 } from 'ra-data-graphql-simple';
 import { DELETE } from 'ra-core';
 import gql from 'graphql-tag';
-const getGqlResource = resource => {
+const getGqlResource = (resource: string) => {
     switch (resource) {
         case 'customers':
             return 'Customer';
@@ -28,17 +28,17 @@ const getGqlResource = resource => {
     }
 };
 
-const customBuildQuery = introspectionResults => {
+const customBuildQuery = (introspectionResults: any) => {
     const buildQuery = buildQueryFactory(introspectionResults);
 
-    return (type, resource, params) => {
+    return (type: any, resource: any, params: any) => {
         if (type === DELETE) {
             return {
                 query: gql`mutation remove${resource}($id: ID!) {
                     remove${resource}(id: $id)
                 }`,
                 variables: { id: params.id },
-                parseResponse: ({ data }) => {
+                parseResponse: ({ data }: any) => {
                     if (data[`remove${resource}`]) {
                         return { data: { id: params.id } };
                     }
@@ -59,11 +59,11 @@ export default () => {
         },
         introspection: {
             operationNames: {
-                [DELETE]: resource => `remove${resource.name}`,
+                [DELETE]: (resource: any) => `remove${resource.name}`,
             },
         },
         buildQuery: customBuildQuery,
-    }).then(dataProvider => (type, resource, params) =>
+    }).then((dataProvider: any) => (type: any, resource: any, params: any) =>
         dataProvider(type, getGqlResource(resource), params)
     );
 };
diff --git a/examples/demo/src/dataProvider/index.js → examples/demo/src/dataProvider/index.ts b/examples/demo/src/dataProvider/index.js → examples/demo/src/dataProvider/index.ts
@@ -1,4 +1,4 @@
-export default type => {
+export default (type: string) => {
     switch (type) {
         case 'graphql':
             return import('./graphql').then(factory => factory.default());

diff --git a/examples/demo/src/dataProvider/rest.js → examples/demo/src/dataProvider/rest.ts b/examples/demo/src/dataProvider/rest.js → examples/demo/src/dataProvider/rest.ts
@@ -6,10 +6,13 @@ const delayedDataProvider = new Proxy(restProvider, {
     get: (target, name, self) =>
         name === 'then' // as we await for the dataProvider, JS calls then on it. We must trap that call or else the dataProvider will be called with the then method
             ? self
-            : (resource, params) =>
+            : (resource: any, params: any) =>
                   new Promise(resolve =>
                       setTimeout(
-                          () => resolve(restProvider[name](resource, params)),
+                          () =>
+                              resolve(
+                                  restProvider[name as any](resource, params)
+                              ),
                           500
                       )
                   ),

diff --git a/examples/demo/src/fakeServer/graphql.js → examples/demo/src/fakeServer/graphql.ts b/examples/demo/src/fakeServer/graphql.js → examples/demo/src/fakeServer/graphql.ts
@@ -1,5 +1,6 @@
 import JsonGraphqlServer from 'json-graphql-server';
 import generateData from 'data-generator-retail';
+
 import fetchMock from 'fetch-mock';
 
 export default () => {

diff --git a/examples/demo/src/fakeServer/index.js → examples/demo/src/fakeServer/index.ts b/examples/demo/src/fakeServer/index.js → examples/demo/src/fakeServer/index.ts
@@ -1,4 +1,4 @@
-export default type => {
+export default (type: string) => {
     switch (type) {
         case 'graphql':
             return import('./graphql').then(factory => factory.default());

diff --git a/examples/demo/src/fakeServer/rest.js → examples/demo/src/fakeServer/rest.ts b/examples/demo/src/fakeServer/rest.js → examples/demo/src/fakeServer/rest.ts
@@ -1,5 +1,7 @@
+// @ts-ignore
 import FakeRest from 'fakerest';
 import fetchMock from 'fetch-mock';
+// @ts-ignore
 import generateData from 'data-generator-retail';
 
 export default () => {

diff --git a/examples/demo/src/i18n/en.js → examples/demo/src/i18n/en.ts b/examples/demo/src/i18n/en.js → examples/demo/src/i18n/en.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import englishMessages from 'ra-language-english';
 
 export default {

diff --git a/examples/demo/src/i18n/fr.js → examples/demo/src/i18n/fr.ts b/examples/demo/src/i18n/fr.js → examples/demo/src/i18n/fr.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import frenchMessages from 'ra-language-french';
 
 export default {

diff --git a/examples/demo/src/json-graphql-server.d.ts b/examples/demo/src/json-graphql-server.d.ts
@@ -0,0 +1 @@
+declare module 'json-graphql-server';
diff --git a/examples/demo/src/ra-data-graphql-simple.d.ts b/examples/demo/src/ra-data-graphql-simple.d.ts
@@ -0,0 +1 @@
+declare module 'ra-data-graphql-simple';
diff --git a/examples/demo/src/ra-language-english.d.ts b/examples/demo/src/ra-language-english.d.ts
@@ -0,0 +1 @@
+declare module 'ra-language-english';
diff --git a/examples/demo/src/types.ts b/examples/demo/src/types.ts
@@ -62,3 +62,9 @@ export interface FieldProps<T extends Record = Record> {
 export interface Review extends Record {
     customer_id: string;
 }
+
+declare global {
+    interface Window {
+        restServer: any;
+    }
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1485,6 +1485,11 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/fetch-mock@^7.3.2":
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/@types/fetch-mock/-/fetch-mock-7.3.2.tgz#58805ba36a9357be92cc8c008dbfda937e9f7d8f"
+  integrity sha512-NCEfv49jmDsBAixjMjEHKVgmVQlJ+uK56FOc+2roYPExnXCZDpi6mJOHQ3v23BiO84hBDStND9R2itJr7PNoow==
+
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"