diff --git a/src/plugins/navigation/__tests__/testURI.node.js b/src/plugins/navigation/__tests__/testURI.node.js index 498e969f1..311252d25 100644 --- a/src/plugins/navigation/__tests__/testURI.node.js +++ b/src/plugins/navigation/__tests__/testURI.node.js @@ -11,7 +11,7 @@ import { parameterIsNumberType, replaceRequiredParametersWithValues, filterOptionalParameters, -} from '../util/uri'; +} from '../util/uri.tsx'; test('parse required parameters from uri', () => { const testURI = diff --git a/src/plugins/navigation/components/NavigationInfoBox.js b/src/plugins/navigation/components/NavigationInfoBox.js index e739c8ac4..7fe6740bb 100644 --- a/src/plugins/navigation/components/NavigationInfoBox.js +++ b/src/plugins/navigation/components/NavigationInfoBox.js @@ -7,7 +7,7 @@ */ import {styled} from 'flipper'; -import {parseURIParameters} from '../util/uri'; +import {parseURIParameters} from '../util/uri.tsx'; import {IconButton, FavoriteButton} from './'; type Props = {| diff --git a/src/plugins/navigation/components/RequiredParametersDialog.js b/src/plugins/navigation/components/RequiredParametersDialog.js index db490cca3..db3fcf890 100644 --- a/src/plugins/navigation/components/RequiredParametersDialog.js +++ b/src/plugins/navigation/components/RequiredParametersDialog.js @@ -13,7 +13,7 @@ import { parameterIsBooleanType, validateParameter, liveEdit, -} from '../util/uri'; +} from '../util/uri.tsx'; import {useRequiredParameterFormValidator} from '../hooks/requiredParameters'; import type {URI} from '../flow-types'; diff --git a/src/plugins/navigation/hooks/requiredParameters.js b/src/plugins/navigation/hooks/requiredParameters.js index 4865cb81a..fbbd93068 100644 --- a/src/plugins/navigation/hooks/requiredParameters.js +++ b/src/plugins/navigation/hooks/requiredParameters.js @@ -7,7 +7,7 @@ */ import {useEffect, useState} from 'react'; -import {validateParameter} from '../util/uri'; +import {validateParameter} from '../util/uri.tsx'; export const useRequiredParameterFormValidator = ( requiredParameters: Array, diff --git a/src/plugins/navigation/index.js b/src/plugins/navigation/index.js index 2ac75620f..75730c708 100644 --- a/src/plugins/navigation/index.js +++ b/src/plugins/navigation/index.js @@ -26,7 +26,7 @@ import { DefaultProvider, } from './util/autoCompleteProvider'; import {getAppMatchPatterns} from './util/appMatchPatterns'; -import {getRequiredParameters, filterOptionalParameters} from './util/uri'; +import {getRequiredParameters, filterOptionalParameters} from './util/uri.tsx'; import type { State, diff --git a/src/plugins/navigation/util/uri.js b/src/plugins/navigation/util/uri.tsx similarity index 89% rename from src/plugins/navigation/util/uri.js rename to src/plugins/navigation/util/uri.tsx index 5739d66c1..ed4f96aef 100644 --- a/src/plugins/navigation/util/uri.js +++ b/src/plugins/navigation/util/uri.tsx @@ -3,7 +3,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * @format - * @flow strict-local */ import querystring from 'querystring'; @@ -18,13 +17,11 @@ export const validateParameter = (value: string, parameter: string) => { ); }; -export const filterOptionalParameters: string => string = (uri: string) => { +export const filterOptionalParameters = (uri: string) => { return uri.replace(/[/&]?([^&?={}\/]*=)?{\?.*?}/g, ''); }; -export const parseURIParameters: string => Map = ( - query: string, -) => { +export const parseURIParameters = (query: string) => { // get parameters from query string and store in Map const parameters = query .split('?') @@ -33,7 +30,7 @@ export const parseURIParameters: string => Map = ( const parametersObj = querystring.parse(parameters); const parametersMap = new Map(); for (const key in parametersObj) { - parametersMap.set(key, parametersObj[key]); + parametersMap.set(key, parametersObj[key] as string); } return parametersMap; }; @@ -78,7 +75,7 @@ export const getRequiredParameters = (uri: string) => { return matches; }; -export const liveEdit = (uri: string, formValues: Array): string => { +export const liveEdit = (uri: string, formValues: Array) => { const parameterRegExp = /({[^?]*?})/g; const uriArray = uri.split(parameterRegExp); return uriArray.reduce((acc, uriComponent, idx) => {