lib/route: Remove redundant implementations (#37224)

* Remove redundant implementations
* Remove unused page-notifier

Author: sirreal

client/lib/route/add-query-args.js renamed to client/lib/route/add-query-args.ts

@@ -1,13 +1,20 @@
-/** @format */
-
 /**
  * External dependencies
  */
-
 import urlModule from 'url';
 import { pickBy } from 'lodash';
+import { Primitive } from 'utility-types';
+
+/**
+ * Internal dependencies
+ */
+import { URL } from 'types';
+
+interface QueryArgs {
+	[ key: string ]: Primitive;
+}
 
-export default function( args, url ) {
+export default ( args: QueryArgs, url: URL ): URL => {
 	if ( 'object' !== typeof args ) {
 		throw new Error( 'addQueryArgs expects the first argument to be an object.' );
 	}
@@ -33,4 +40,4 @@ export default function( args, url ) {
 	} );
 
 	return urlModule.format( updatedUrlObject );
-}
+};

client/lib/route/index.ts

@@ -1,74 +1,6 @@
-/**
- * External dependencies
- */
-import page from 'page';
-import urlModule from 'url';
-import { pickBy } from 'lodash';
-import { Primitive } from 'utility-types';
-
-/**
- * Internal dependencies
- */
-import { URL } from 'types';
-
 export * from './path';
-
-const appendQueryString = ( basepath: string, querystring: string ): string =>
-	basepath + ( querystring ? '?' + querystring : '' );
-
-interface QueryArgs {
-	[ key: string ]: Primitive;
-}
-export const addQueryArgs = ( args: QueryArgs, url: URL ): URL => {
-	if ( 'object' !== typeof args ) {
-		throw new Error( 'addQueryArgs expects the first argument to be an object.' );
-	}
-
-	if ( 'string' !== typeof url ) {
-		throw new Error( 'addQueryArgs expects the second argument to be a string.' );
-	}
-
-	// Remove any undefined query args
-	args = pickBy( args, arg => arg != null );
-
-	// Build new query object for url
-	const parsedUrl = urlModule.parse( url, true );
-	let query = parsedUrl.query || {};
-	query = Object.assign( query, args );
-
-	// Build new url object
-	//
-	// Note: we set search to false here to that our query object is processed
-	const updatedUrlObject = Object.assign( parsedUrl, {
-		query,
-		search: false,
-	} );
-
-	return urlModule.format( updatedUrlObject );
-};
-
-export const trailingslashit = ( path: string ): string => path.replace( /(\/)?$/, '/' );
-
-export const untrailingslashit = ( path: string ): string =>
-	path === '/' ? path : path.replace( /\/$/, '' );
-
-export const normalize: PageJS.Callback = ( context, next ) => {
-	const normalizedPathName = untrailingslashit( context.pathname );
-	if ( normalizedPathName !== context.pathname ) {
-		page.redirect( appendQueryString( normalizedPathName, context.querystring ) );
-	} else {
-		next();
-	}
-};
-
-export function redirect( path: string ): void {
-	if ( process.env.NODE_ENV === 'development' ) {
-		throw 'route.redirect() is deprecated, use page.redirect()';
-	}
-
-	// Have to wrap the page.replace call in a defer due to
-	// https://github.com/visionmedia/page.js/issues/50
-	setTimeout( function() {
-		page.replace( path );
-	}, 0 );
-}
+export { default as addQueryArgs } from './add-query-args';
+export { default as normalize } from './normalize';
+export { default as trailingslashit } from './trailingslashit';
+export { default as untrailingslashit } from './untrailingslashit';
+export { default as redirect } from './redirect';

client/lib/route/normalize.js renamed to client/lib/route/normalize.ts

@@ -1,21 +1,23 @@
-/** @format */
+/**
+ * External dependencies
+ */
+import page from 'page';
 
 /**
  * Internal dependencies
  */
-
 import untrailingslashit from './untrailingslashit';
-import page from 'page';
 
-function appendQueryString( basepath, querystring ) {
-	return basepath + ( querystring ? '?' + querystring : '' );
-}
+const appendQueryString = ( basepath: string, querystring: string ): string =>
+	basepath + ( querystring ? '?' + querystring : '' );
 
-export default function normalize( context, next ) {
+const normalize: PageJS.Callback = ( context, next ) => {
 	const normalizedPathName = untrailingslashit( context.pathname );
 	if ( normalizedPathName !== context.pathname ) {
 		page.redirect( appendQueryString( normalizedPathName, context.querystring ) );
 	} else {
 		next();
 	}
-}
+};
+
+export default normalize;

client/lib/route/page-notifier.js

@@ -1,10 +1,9 @@
-/** @format */
 /**
- * Internal dependencies
+ * External dependencies
  */
 import page from 'page';
 
-export default function redirect( path ) {
+export function redirect( path: string ): void {
 	if ( process.env.NODE_ENV === 'development' ) {
 		throw 'route.redirect() is deprecated, use page.redirect()';
 	}

client/lib/route/redirect.js renamed to client/lib/route/redirect.ts

@@ -0,0 +1 @@
+export default ( path: string ): string => path.replace( /(\/)?$/, '/' );

client/lib/route/trailingslashit.js

@@ -0,0 +1 @@
+export default ( path: string ): string => ( path === '/' ? path : path.replace( /\/$/, '' ) );