Run Prettier organize imports plugin (#644)

lacuna-tech · Jul 1, 2021 · e87e9dc · e87e9dc
1 parent d1626d1
commit e87e9dc
Show file tree

Hide file tree

Showing 232 changed files with 773 additions and 843 deletions.
diff --git a/packages/mds-agency-cache/index.ts b/packages/mds-agency-cache/index.ts
@@ -14,31 +14,29 @@
  * limitations under the License.
  */
 
+import { RedisCache } from '@mds-core/mds-cache'
 import logger from '@mds-core/mds-logger'
-
-import flatten, { unflatten } from 'flat'
+import { BoundingBox, Device, Telemetry, Timestamp, UUID, VehicleEvent } from '@mds-core/mds-types'
 import {
+  isInsideBoundingBox,
   NotFoundError,
-  nullKeys,
-  stripNulls,
   now,
-  isInsideBoundingBox,
+  nullKeys,
   routeDistance,
-  tail,
-  setEmptyArraysToUndefined
+  setEmptyArraysToUndefined,
+  stripNulls,
+  tail
 } from '@mds-core/mds-utils'
-import { UUID, Timestamp, Device, VehicleEvent, Telemetry, BoundingBox } from '@mds-core/mds-types'
-import { RedisCache } from '@mds-core/mds-cache'
-
-import { parseTelemetry, parseEvent, parseDevice, parseCachedItem } from './unflatteners'
+import flatten, { unflatten } from 'flat'
 import {
-  CacheReadDeviceResult,
   CachedItem,
+  CacheReadDeviceResult,
   StringifiedCacheReadDeviceResult,
+  StringifiedEvent,
   StringifiedEventWithTelemetry,
-  StringifiedTelemetry,
-  StringifiedEvent
+  StringifiedTelemetry
 } from './types'
+import { parseCachedItem, parseDevice, parseEvent, parseTelemetry } from './unflatteners'
 
 const { env } = process
 

diff --git a/packages/mds-agency-cache/types.ts b/packages/mds-agency-cache/types.ts
@@ -15,12 +15,12 @@
  */
 import {
   Device,
-  VehicleEvent,
-  Timestamp,
-  Telemetry,
+  PROPULSION_TYPE,
   Stringify,
+  Telemetry,
   TelemetryData,
-  PROPULSION_TYPE
+  Timestamp,
+  VehicleEvent
 } from '@mds-core/mds-types'
 
 export type StringifiedEvent = Stringify<Omit<VehicleEvent, 'telemetry' | 'event_types'>> &

diff --git a/packages/mds-agency-cache/unflatteners.ts b/packages/mds-agency-cache/unflatteners.ts
@@ -14,27 +14,26 @@
  * limitations under the License.
  */
 
+import { HasPropertyAssertion } from '@mds-core/mds-schema-validators'
 import {
-  VEHICLE_TYPE,
-  VEHICLE_EVENT,
-  VEHICLE_STATE,
-  PROPULSION_TYPE,
+  ACCESSIBILITY_OPTION,
   Device,
+  MODALITY,
+  PROPULSION_TYPE,
   Telemetry,
+  TRIP_STATE,
   VehicleEvent,
-  ACCESSIBILITY_OPTION,
-  MODALITY,
-  TRIP_STATE
+  VEHICLE_EVENT,
+  VEHICLE_STATE,
+  VEHICLE_TYPE
 } from '@mds-core/mds-types'
-
 import { ParseError } from '@mds-core/mds-utils'
-import { HasPropertyAssertion } from '@mds-core/mds-schema-validators'
 import {
+  CachedItem,
+  StringifiedCacheReadDeviceResult,
   StringifiedEvent,
   StringifiedEventWithTelemetry,
-  StringifiedTelemetry,
-  StringifiedCacheReadDeviceResult,
-  CachedItem
+  StringifiedTelemetry
 } from './types'
 
 function parseTelemetry(telemetry: StringifiedTelemetry): Telemetry {

diff --git a/packages/mds-agency/agency-candidate-request-handlers.ts b/packages/mds-agency/agency-candidate-request-handlers.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { isUUID } from '@mds-core/mds-utils'
+import { parseRequest } from '@mds-core/mds-api-helpers'
 import db from '@mds-core/mds-db'
 import { providerName } from '@mds-core/mds-providers'
-import { parseRequest } from '@mds-core/mds-api-helpers'
+import { isUUID } from '@mds-core/mds-utils'
 import { AgencyApiRequest, AgencyApiResponse } from './types'
 
 export const readAllVehicleIds = async (req: AgencyApiRequest, res: AgencyApiResponse) => {

diff --git a/packages/mds-agency/jest-tests/taxi-test-helpers.ts b/packages/mds-agency/jest-tests/taxi-test-helpers.ts
@@ -1,9 +1,9 @@
-import { Device, TripMetadata, UUID, VehicleEvent } from '@mds-core/mds-types'
 import { TEST1_PROVIDER_ID } from '@mds-core/mds-providers'
-import { now, uuid } from '@mds-core/mds-utils'
-import type supertest from 'supertest'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { PROVIDER_SCOPES } from '@mds-core/mds-test-data'
+import { Device, TripMetadata, UUID, VehicleEvent } from '@mds-core/mds-types'
+import { now, uuid } from '@mds-core/mds-utils'
+import type supertest from 'supertest'
 
 export type POSTableVehicleEvent = Omit<VehicleEvent, 'provider_id' | 'recorded'>
 

diff --git a/packages/mds-agency/middleware/agency-api-version.ts b/packages/mds-agency/middleware/agency-api-version.ts
@@ -15,7 +15,7 @@
  */
 
 import { ApiVersionMiddleware } from '@mds-core/mds-api-server'
-import { AGENCY_API_SUPPORTED_VERSIONS, AGENCY_API_DEFAULT_VERSION } from '../types'
+import { AGENCY_API_DEFAULT_VERSION, AGENCY_API_SUPPORTED_VERSIONS } from '../types'
 
 export const AgencyApiVersionMiddleware = ApiVersionMiddleware(
   'application/vnd.mds.agency+json',

diff --git a/packages/mds-agency/sandbox-admin-request-handlers.ts b/packages/mds-agency/sandbox-admin-request-handlers.ts
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import logger from '@mds-core/mds-logger'
 import cache from '@mds-core/mds-agency-cache'
-import db from '@mds-core/mds-db'
-import { ServerError } from '@mds-core/mds-utils'
 import { parseRequest } from '@mds-core/mds-api-helpers'
 import { ApiRequestParams, ApiRequestQuery } from '@mds-core/mds-api-server'
+import db from '@mds-core/mds-db'
+import logger from '@mds-core/mds-logger'
+import { ServerError } from '@mds-core/mds-utils'
 import { AgencyApiRequest, AgencyApiResponse } from './types'
 import { refresh } from './utils'
 

diff --git a/packages/mds-agency/server.ts b/packages/mds-agency/server.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import logger from '@mds-core/mds-logger'
 import cache from '@mds-core/mds-agency-cache'
-import stream from '@mds-core/mds-stream'
 import { ApiServer, HttpServer } from '@mds-core/mds-api-server'
+import logger from '@mds-core/mds-logger'
+import stream from '@mds-core/mds-stream'
 import { api } from './api'
 
 Promise.all([cache.startup(), stream.initialize()])

diff --git a/packages/mds-api-authorizer/index.ts b/packages/mds-api-authorizer/index.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import express from 'express'
-import jwt from 'jsonwebtoken'
 import { UUID } from '@mds-core/mds-types'
 import { getEnvVar } from '@mds-core/mds-utils'
+import express from 'express'
+import jwt from 'jsonwebtoken'
 
 export interface AuthorizerClaims {
   principalId: string

diff --git a/packages/mds-api-helpers/index.ts b/packages/mds-api-helpers/index.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import urls from 'url'
 import { ApiRequest } from '@mds-core/mds-api-server'
+import urls from 'url'
 import {
   parseObjectPropertiesList,
-  parseObjectPropertiesSingle,
+  ParseObjectPropertiesOptionsList,
   ParseObjectPropertiesOptionsSingle,
-  ParseObjectPropertiesOptionsList
+  parseObjectPropertiesSingle
 } from './object-properties-parser'
 
 const jsonApiLink = (req: ApiRequest, skip: number, take: number): string =>

diff --git a/packages/mds-api-server/@types/index.ts b/packages/mds-api-server/@types/index.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import express from 'express'
 import { AuthorizerClaims } from '@mds-core/mds-api-authorizer'
+import express from 'express'
 
 export type ApiRequest<B = {}> = express.Request<{}, unknown, B, {}>
 

diff --git a/packages/mds-api-server/api-server.ts b/packages/mds-api-server/api-server.ts
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-import express from 'express'
-import HttpStatus from 'http-status-codes'
+import { JurisdictionsClaim, ProviderIdClaim, UserEmailClaim } from '@mds-core/mds-api-authorizer'
 import logger from '@mds-core/mds-logger'
-import { ProviderIdClaim, UserEmailClaim, JurisdictionsClaim } from '@mds-core/mds-api-authorizer'
 import { pathPrefix } from '@mds-core/mds-utils'
-import { AuthorizationMiddlewareOptions, AuthorizationMiddleware } from './middleware/authorization'
-import { CompressionMiddlewareOptions, CompressionMiddleware } from './middleware/compression'
-import { CorsMiddlewareOptions, CorsMiddleware } from './middleware/cors'
-import { JsonBodyParserMiddlewareOptions, JsonBodyParserMiddleware } from './middleware/json-body-parser'
-import { MaintenanceModeMiddlewareOptions, MaintenanceModeMiddleware } from './middleware/maintenance-mode'
-import { RequestLoggingMiddlewareOptions, RequestLoggingMiddleware } from './middleware/request-logging'
-import { PrometheusMiddlewareOptions, PrometheusMiddleware } from './middleware/prometheus'
-import { serverVersion } from './utils'
+import express from 'express'
+import HttpStatus from 'http-status-codes'
 import { HealthRequestHandler } from './handlers/health'
+import { AuthorizationMiddleware, AuthorizationMiddlewareOptions } from './middleware/authorization'
+import { CompressionMiddleware, CompressionMiddlewareOptions } from './middleware/compression'
+import { CorsMiddleware, CorsMiddlewareOptions } from './middleware/cors'
+import { JsonBodyParserMiddleware, JsonBodyParserMiddlewareOptions } from './middleware/json-body-parser'
+import { MaintenanceModeMiddleware, MaintenanceModeMiddlewareOptions } from './middleware/maintenance-mode'
+import { PrometheusMiddleware, PrometheusMiddlewareOptions } from './middleware/prometheus'
+import { RequestLoggingMiddleware, RequestLoggingMiddlewareOptions } from './middleware/request-logging'
+import { serverVersion } from './utils'
 
 export interface ApiServerOptions {
   authorization: AuthorizationMiddlewareOptions

diff --git a/packages/mds-api-server/http-server.ts b/packages/mds-api-server/http-server.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import express from 'express'
 import logger from '@mds-core/mds-logger'
+import express from 'express'
 import { serverVersion } from './utils'
 
 export type HttpServerOptions = Partial<{

diff --git a/packages/mds-api-server/index.ts b/packages/mds-api-server/index.ts
@@ -15,15 +15,15 @@
  */
 
 export * from './@types'
-export { ApiServerOptions, ApiServer } from './api-server'
-export { HttpServerOptions, HttpServer } from './http-server'
+export { ApiServer, ApiServerOptions } from './api-server'
 export { HealthRequestHandler } from './handlers/health'
+export { HttpServer, HttpServerOptions } from './http-server'
+export { ApiErrorHandlingMiddleware } from './middleware/api-error-handling'
 export { ApiVersionMiddleware } from './middleware/api-version'
-export { CompressionMiddlewareOptions, CompressionMiddleware } from './middleware/compression'
-export { CorsMiddlewareOptions, CorsMiddleware } from './middleware/cors'
-export { JsonBodyParserMiddlewareOptions, JsonBodyParserMiddleware } from './middleware/json-body-parser'
-export { RequestLoggingMiddlewareOptions, RequestLoggingMiddleware } from './middleware/request-logging'
-export { RawBodyParserMiddlewareOptions, RawBodyParserMiddleware } from './middleware/raw-body-parser'
-export { PrometheusMiddlewareOptions, PrometheusMiddleware } from './middleware/prometheus'
+export { CompressionMiddleware, CompressionMiddlewareOptions } from './middleware/compression'
+export { CorsMiddleware, CorsMiddlewareOptions } from './middleware/cors'
+export { JsonBodyParserMiddleware, JsonBodyParserMiddlewareOptions } from './middleware/json-body-parser'
+export { PrometheusMiddleware, PrometheusMiddlewareOptions } from './middleware/prometheus'
+export { RawBodyParserMiddleware, RawBodyParserMiddlewareOptions } from './middleware/raw-body-parser'
+export { RequestLoggingMiddleware, RequestLoggingMiddlewareOptions } from './middleware/request-logging'
 export { AccessTokenScopeValidator, checkAccess } from './utils'
-export { ApiErrorHandlingMiddleware } from './middleware/api-error-handling'
diff --git a/packages/mds-api-server/middleware/api-error-handling.ts b/packages/mds-api-server/middleware/api-error-handling.ts
@@ -1,7 +1,7 @@
 import logger from '@mds-core/mds-logger'
-import type express from 'express'
-import { isServiceError, ErrorCheckFunction } from '@mds-core/mds-service-helpers'
+import { ErrorCheckFunction, isServiceError } from '@mds-core/mds-service-helpers'
 import { AuthorizationError, BadParamsError, ConflictError, NotFoundError, ValidationError } from '@mds-core/mds-utils'
+import type express from 'express'
 import HttpStatus from 'http-status-codes'
 import { ApiRequest, ApiResponse } from '../@types'
 

diff --git a/packages/mds-api-server/middleware/authorization.ts b/packages/mds-api-server/middleware/authorization.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import express from 'express'
 import { ApiAuthorizer, AuthorizationHeaderApiAuthorizer } from '@mds-core/mds-api-authorizer'
+import express from 'express'
 import { ApiRequest, ApiResponse, ApiResponseLocalsClaims } from '../@types'
 
 export type AuthorizationMiddlewareOptions = Partial<{ authorizer: ApiAuthorizer }>

diff --git a/packages/mds-api-server/middleware/compression.ts b/packages/mds-api-server/middleware/compression.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { RequestHandler } from 'express'
 import type { CompressionOptions } from 'compression'
 import compression from 'compression'
+import type { RequestHandler } from 'express'
 
 export type CompressionMiddlewareOptions = Partial<CompressionOptions>
 

diff --git a/packages/mds-api-server/middleware/json-body-parser.ts b/packages/mds-api-server/middleware/json-body-parser.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { RequestHandler } from 'express'
 import type { OptionsJson } from 'body-parser'
 import bodyParser from 'body-parser'
+import type { RequestHandler } from 'express'
 
 export type JsonBodyParserMiddlewareOptions = Partial<OptionsJson>
 

diff --git a/packages/mds-api-server/middleware/prometheus/index.ts b/packages/mds-api-server/middleware/prometheus/index.ts
@@ -17,9 +17,9 @@
 import type { Labels as PrometheusLabels, Opts as PrometheusOptions, TransformLabelsFn } from 'express-prom-bundle'
 import prometheus from 'express-prom-bundle'
 import promClient from 'prom-client'
-import { ProviderIdLabeler } from './provider-id-labeler'
 import { ApiRequest, ApiResponse } from '../../@types'
 import { PrometheusLabeler } from './@types'
+import { ProviderIdLabeler } from './provider-id-labeler'
 
 const PrometheusLabelTransformers = (...labelers: TransformLabelsFn[]) => {
   return (labels: PrometheusLabels, req: ApiRequest, res: ApiResponse) => {

diff --git a/packages/mds-api-server/middleware/prometheus/provider-id-labeler.ts b/packages/mds-api-server/middleware/prometheus/provider-id-labeler.ts
@@ -15,8 +15,8 @@
  */
 
 import type { Labels as PrometheusLabels } from 'express-prom-bundle'
-import { PrometheusLabeler } from './@types'
 import { ApiRequest, ApiResponse, ApiResponseLocalsClaims } from '../../@types'
+import { PrometheusLabeler } from './@types'
 
 const providerIdLabelTransformer = (
   labels: PrometheusLabels,

diff --git a/packages/mds-api-server/middleware/raw-body-parser.ts b/packages/mds-api-server/middleware/raw-body-parser.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { RequestHandler } from 'express'
 import type { Options as OptionsRaw } from 'body-parser'
 import bodyParser from 'body-parser'
+import type { RequestHandler } from 'express'
 
 export type RawBodyParserMiddlewareOptions = Partial<OptionsRaw>
 

diff --git a/packages/mds-api-server/middleware/request-logging.ts b/packages/mds-api-server/middleware/request-logging.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+import logger from '@mds-core/mds-logger'
 import express from 'express'
-import morgan from 'morgan'
 import httpContext from 'express-http-context'
 import HttpStatus from 'http-status-codes'
-import logger from '@mds-core/mds-logger'
+import morgan from 'morgan'
 import { ApiRequest, ApiResponse, ApiResponseLocalsClaims } from '../@types'
 
 const { REQUEST_LOGGING_LEVEL = HttpStatus.OK } = process.env

diff --git a/packages/mds-api-server/utils/index.ts b/packages/mds-api-server/utils/index.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import express from 'express'
 import { AuthorizerClaims } from '@mds-core/mds-api-authorizer'
 import { AuthorizationError } from '@mds-core/mds-utils'
+import express from 'express'
 import { ApiRequest, ApiResponse, ApiResponseLocalsClaims } from '../@types'
 
 export const healthInfo = () => {

diff --git a/packages/mds-attachment-service/@types/index.ts b/packages/mds-attachment-service/@types/index.ts
@@ -15,9 +15,9 @@
  */
 
 import { DomainModelCreate } from '@mds-core/mds-repository'
-import { RpcServiceDefinition, RpcRoute } from '@mds-core/mds-rpc-common'
-import { Nullable, UUID } from '@mds-core/mds-types'
+import { RpcRoute, RpcServiceDefinition } from '@mds-core/mds-rpc-common'
 import { SerializedBuffers } from '@mds-core/mds-service-helpers'
+import { Nullable, UUID } from '@mds-core/mds-types'
 
 /** You can either provide a list of `attachment_id` values to get each of those attachments,
  * or you can provide an `attachment_list_id` to get a group of attachments which share the same origin

diff --git a/packages/mds-attachment-service/client/index.ts b/packages/mds-attachment-service/client/index.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { ServiceClient } from '@mds-core/mds-service-helpers'
 import { RpcClient, RpcRequest } from '@mds-core/mds-rpc-common'
+import { ServiceClient } from '@mds-core/mds-service-helpers'
 import { AttachmentService, AttachmentServiceDefinition } from '../@types'
 
 const AttachmentServiceRpcClient = RpcClient(AttachmentServiceDefinition, {