Re-use validator's types

Author: khshourov

views/interactivity/src/App.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './App.css';
 import { DictionaryApi } from './components/api/dictionary';
 import SearchBox from './components/search-box/SearchBox';
-import { DictionaryEntry } from './types';
+import { DictionaryEntry } from './components/types';
 
 function App() {
   const [bearerToken, setBearerToken] = useState<string | null>(null);

views/interactivity/src/components/api/dictionary.ts

@@ -1,10 +1,10 @@
 import { Utils } from '../../lib/utils';
-import { DictionaryEntry } from '../../types';
 import { AuthorizationError } from '../../error/authorization';
 import { InternalServerError } from '../../error/server';
 import { NotFoundError } from '../../error/not-found';
 import { lexicalEntrySchema, responseSchema } from './dictionary.validator';
 import { InvalidResponseError } from '../../error/invalid-response';
+import { DictionaryEntry } from '../types';
 
 export class DictionaryApi {
   private token: string;

views/interactivity/src/components/api/dictionary.validator.ts

@@ -1,4 +1,4 @@
-import { array, date, InferType, number, object, string } from 'yup';
+import { array, date, number, object, string } from 'yup';
 
 export const responseSchema = object({
   dictionaryWord: object({
@@ -41,14 +41,3 @@ export const lexicalEntrySchema = object({
     meanings: array().of(meaningSchema).required(),
   }).required(),
 });
-
-export type DictionaryWord = InferType<typeof lexicalEntrySchema>;
-export type AccessSummary = InferType<typeof responseSchema>['accessSummary'];
-export type DictionaryEntry = {
-  dictionaryWord: DictionaryWord;
-  accessSummary: AccessSummary;
-};
-export type RegionPronunciation = InferType<typeof ipaListingSchema>;
-export type IPAListings = DictionaryWord['entry']['ipaListings'];
-export type MeaningEnty = InferType<typeof meaningEntrySchema>;
-export type Meaning = InferType<typeof meaningSchema>;

views/interactivity/src/components/search-box/SearchBox.tsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
-import { DictionaryEntry } from '../../types';
 import { DictionaryApi } from '../api/dictionary';
 import './SearchBox.css';
 import { NotFoundError } from '../../error/not-found';
+import { DictionaryEntry } from '../types';
 
 type Props = {
   dictionaryApi: DictionaryApi;

views/interactivity/src/components/types.d.ts

@@ -0,0 +1,18 @@
+import {
+  lexicalEntrySchema,
+  responseSchema,
+  ipaListingSchema,
+  meaningEntrySchema,
+  meaningSchema,
+} from './api/dictionary.validator';
+
+export type DictionaryWord = InferType<typeof lexicalEntrySchema>;
+export type AccessSummary = InferType<typeof responseSchema>['accessSummary'];
+export type DictionaryEntry = {
+  dictionaryWord: DictionaryWord;
+  accessSummary: AccessSummary;
+};
+export type RegionPronunciation = InferType<typeof ipaListingSchema>;
+export type IPAListings = DictionaryWord['entry']['ipaListings'];
+export type MeaningEnty = InferType<typeof meaningEntrySchema>;
+export type Meaning = InferType<typeof meaningSchema>;