The return value of the resolver for this field's parent (i.e., the previous resolver in the [resolver chain](#resolver-chains)).
For resolvers of top-level fields with no parent (such as fields of `Query`), this value is obtained from the `rootValue` function passed to [Apollo Server's constructor](/api/apollo-server/#apolloserver).
|
+| `args` |
An object that contains all GraphQL arguments provided for this field.
For example, when executing `query{ user(id: "4") }`, the `args` object passed to the `user` resolver is `{ "id": "4" }`.
|
+| `context` |
An object shared across all resolvers that are executing for a particular operation. Use this to share per-operation state, including authentication information, dataloader instances, and anything else to track across resolvers.
See [The `context` argument](#the-context-argument) for more information.
|
+| `info` |
Contains information about the operation's execution state, including the field name, the path to the field from the root, and more.
Its core fields are listed in the [GraphQL.js source code](https://github.com/graphql/graphql-js/blob/master/src/type/definition.js#L917-L928), and it is extended with additional functionality by other modules, like [`apollo-cache-control`](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-cache-control).
|
+
+### The `context` argument
+
+The `context` argument is useful for passing things that any resolver might need, like [authentication scope](https://blog.apollographql.com/authorization-in-graphql-452b1c402a9), database connections, and custom fetch functions. If you're using [dataloaders to batch requests](/data/data-sources/#what-about-dataloader) across resolvers, you can attach them to the `context` as well.
+
+**Resolvers should never destructively modify the `context` argument.** This ensures consistency across all resolvers and prevents unexpected errors.
+
+To provide a `context` to your resolvers, add a `context` initialization function to the `ApolloServer` constructor. This function is called with every request, so you can set the context based on the request's details (such as HTTP headers).
+
+```js
+
+// Constructor
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ context: ({ req }) => ({
+ authScope: getScope(req.headers.authorization)
+ })
+}));
+
+// Example resolver
+(parent, args, context, info) => {
+ if(context.authScope !== ADMIN) throw AuthenticationError('not admin');
+ // Proceed
+}
+```
+
+> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/api/apollo-server/#apolloserver)
+
+Context initialization can be asynchronous, allowing database connections and other operations to complete:
+
+```js
+context: async () => ({
+ db: await client.connect(),
+})
+
+// Resolver
+(parent, args, context, info) => {
+ return context.db.query('SELECT * FROM table_name');
+}
+```
+
+## Return values
+
+A resolver function's return value is treated differently by Apollo Server depending on its type:
+
+| Type | Description |
+|---|---|
+| Scalar / object |
A resolver can return a single value or an object, as shown in [Defining a resolver](#defining-a-resolver). This return value is passed down to any nested resolvers via the `parent` argument.
|
+| `Array` |
Return an array if and only if your schema indicates that the resolver's associated field contains a list.
After you return an array, Apollo Server executes nested resolvers for each item in the array.
|
+| `null` / `undefined` |
Indicates that the value for the field could not be found.
If your schema indicates that this resolver's field is nullable, then the operation result has a `null` value at the field's position.
If this resolver's field is _not_ nullable, Apollo Server sets the field's _parent_ to `null`. If necessary, this process continues up the resolver chain until it reaches a field that _is_ nullable. This ensures that a response never includes a `null` value for a non-nullable field.
Resolvers often perform asynchronous actions, such as fetching from a database or back-end API. To support this, a resolver can return a promise that resolves to any other supported return type.
|
+
+
+## Default resolvers
+
+If you don't define a resolver for a particular schema field, Apollo Server defines a default resolver for it ([see the source](https://github.com/graphql/graphql-js/blob/master/src/execution/execute.js#L1181-L1199)).
+
+The default resolver function uses the following logic:
+
+```mermaid
+graph TB;
+ parent("Does the parent argument have a property with this resolver's exact name?");
+ parent--No-->null("Return undefined");
+ parent--Yes-->function("Is that property's value a function?");
+ function--No-->return("Return the property's value");
+ function--Yes-->call("Call the function and return its return value");
+```
+
+As an example, consider the following schema excerpt:
+
+```graphql
+type Book {
+ title: String
+}
+
+type Author {
+ books: [Book]
+}
+```
+
+If the resolver for the `books` field returns an array of objects that each contain a `title` field, then you can use a default resolver for the `title` field. The default resolver will correctly return `parent.title`.
+
+## Monitoring resolver performance
+
+As with all code, a resolver's performance depends on its logic. It's important to understand which of your schema's fields are computationally expensive or otherwise slow to resolve, so that you can either improve their performance or make sure you only query them when necessary.
+
+[Apollo Graph Manager](https://www.apollographql.com/docs/graph-manager/) integrates directly with Apollo Server to provide field-level metrics that help you understand the performance of your data graph over time. For more information, see [Analyzing performance](https://www.apollographql.com/docs/graph-manager/performance/).
+
+While developing locally, you can provide `tracing: true` to the `ApolloServer` constructor to enable a tracing panel:
+
+```javascript
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ tracing: true,
+});
+```
diff --git a/docs/source/data/subscriptions.md b/docs/source/data/subscriptions.md
index ae080cc65e3..a6e7c4bd4d9 100644
--- a/docs/source/data/subscriptions.md
+++ b/docs/source/data/subscriptions.md
@@ -234,6 +234,10 @@ const server = new ApolloServer(
## `PubSub` Implementations
+> **Please note**: By default `graphql-subscriptions` exports an in-memory (`EventEmitter`) event system to re-run subscriptions. This is not suitable for running in a serious production app, because there is no way to share subscriptions and publishes across many running servers.
+>
+> We recommend using one of the external `PubSub` implementations listed below for production environments.
+
The Apollo Server implementation of `PubSub` can be replaced by another implementations of [PubSubEngine interface](https://github.com/apollographql/graphql-subscriptions/blob/master/src/pubsub-engine.ts). The community has created the following integrations:
- [Redis](https://github.com/davidyaha/graphql-redis-subscriptions)
@@ -245,4 +249,4 @@ The Apollo Server implementation of `PubSub` can be replaced by another implemen
- [Google Cloud Firestore](https://github.com/MrBoolean/graphql-firestore-subscriptions)
- [Add your implementation...](https://github.com/apollographql/apollo-server/pull/new/master)
-You can implement a `PubSub` of your own, using the exported `PubSubEngine` interface from `apollo-server` or another integration. If you want to set up a GraphQL server using the `graphql-subscriptions` package, follow [this guide](https://www.apollographql.com/docs/graphql-subscriptions/).
+You can implement a `PubSub` of your own, using the exported `PubSubEngine` interface from `apollo-server` or another integration. If you want to set up a GraphQL server using the `graphql-subscriptions` package (not recommended for production), follow [this guide](https://www.apollographql.com/docs/graphql-subscriptions/).
diff --git a/docs/source/deployment/azure-functions.md b/docs/source/deployment/azure-functions.md
index d56bfcb43f6..61267b48b22 100644
--- a/docs/source/deployment/azure-functions.md
+++ b/docs/source/deployment/azure-functions.md
@@ -37,7 +37,7 @@ Http Functions:
graphql: http://localhost:7071/api/graphql
```
-Go to [http://localhost:7071/api/apollo-example?name=Apollo](http://localhost:7071/api/apollo-example?name=Apollo) and verify if the text with the content: **Hello Apollo** is appearing at your browser.
+Go to [http://localhost:7071/api/graphql?name=Apollo](http://localhost:7071/api/apollo-example?name=Apollo) and verify if the text with the content: **Hello Apollo** is appearing at your browser.
If you would like to remove the `api` from the url structure, set the prefix in your `host.json` file like below:
diff --git a/docs/source/deployment/lambda.md b/docs/source/deployment/lambda.md
index ca6d2de1260..96f73fe376e 100644
--- a/docs/source/deployment/lambda.md
+++ b/docs/source/deployment/lambda.md
@@ -227,3 +227,23 @@ exports.graphqlHandler = server.createHandler({
},
});
```
+
+## Setting up GraphQL Playground
+
+By default, `serverless` will deploy to AWS with the `stage` set to `development` resulting in an API endpoint at `/dev/graphql`.
+
+To allow GraphQL Playground to correctly use the `dev` endpoint, add a new `endpoint` configuration within the `playground` option to the `ApolloServer` instantiation options:
+
+```js
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ // highlight-start
+ playground: {
+ endpoint: "/dev/graphql"
+ }
+ // highlight-end
+});
+```
+
+For information on additional configuration options, see [GraphQL Playground](https://www.apollographql.com/docs/apollo-server/testing/graphql-playground/).
diff --git a/docs/source/federation/entities.md b/docs/source/federation/entities.md
index 16537b9a6b1..c55408edc53 100644
--- a/docs/source/federation/entities.md
+++ b/docs/source/federation/entities.md
@@ -182,7 +182,7 @@ extend type Product @key(fields: "upc") {
Similar to the `reviews` relationship example above, the gateway fetches the required `upc` field from the `products` service and passes it to the `inventory` service, even if the query didn't ask for the `upc`:
```graphql
-query {
+query GetTopProductAvailability {
topProducts {
inStock
}
diff --git a/docs/source/federation/federation-spec.md b/docs/source/federation/federation-spec.md
index a118a4248bb..4960fb74181 100644
--- a/docs/source/federation/federation-spec.md
+++ b/docs/source/federation/federation-spec.md
@@ -122,7 +122,7 @@ Queries across service boundaries will start off from the `_entities` root field
For example, if we execute a query for the top product's `reviews`:
```graphql
-query {
+query GetTopProductReviews {
topProducts {
reviews {
body
@@ -276,7 +276,7 @@ When fetching `Review.product` from the Reviews service, it is possible to reque
### `@requires`
```graphql
-directive @requires(fields: _FieldSet!) on FIELD_DEFINITON
+directive @requires(fields: _FieldSet!) on FIELD_DEFINITION
```
The `@requires` directive is used to annotate the required input fieldset from a base type for a resolver. It is used to develop a query plan where the required fields may not be needed by the client, but the service may need additional information from other services. For example:
diff --git a/docs/source/federation/gateway.mdx b/docs/source/federation/gateway.mdx
new file mode 100644
index 00000000000..42115ddb5af
--- /dev/null
+++ b/docs/source/federation/gateway.mdx
@@ -0,0 +1,269 @@
+---
+title: "Apollo Federation: The gateway"
+sidebar_title: "The gateway"
+---
+
+import {
+ ExpansionPanel,
+} from 'gatsby-theme-apollo-docs/src/components/expansion-panel';
+
+After you set up at least one federation-ready [implementing service](./implementing-services/), you can configure a **gateway** to sit in front of your services. The gateway **composes** the individual schemas of your services into a federated data graph and then executes incoming operations across those services.
+
+The `@apollo/gateway` package extends Apollo Server's functionality, enabling it to act as a gateway for an Apollo Federation architecture.
+
+> We recommend against running your gateway in a serverless environment (such as AWS Lambda), because schema composition increases Apollo Server's startup time. If you do run your gateway in a serverless environment, set your function's timeout to at least 10 seconds to prevent unexpected errors.
+
+## Setup
+
+First, let's install the necessary packages:
+
+```shell
+npm install @apollo/gateway apollo-server graphql
+```
+
+The `@apollo/gateway` package includes the [`ApolloGateway` class](/api/apollo-gateway/). To configure Apollo Sever to act as a gateway, you pass an instance of `ApolloGateway` to the `ApolloServer` constructor, like so:
+
+```js
+const { ApolloServer } = require('apollo-server');
+const { ApolloGateway } = require('@apollo/gateway');
+
+// Initialize an ApolloGateway instance and pass it an array of
+// your implementing service names and URLs
+const gateway = new ApolloGateway({
+ serviceList: [
+ { name: 'accounts', url: 'http://localhost:4001' },
+ // Define additional services here
+ ],
+});
+
+// Pass the ApolloGateway to the ApolloServer constructor
+const server = new ApolloServer({
+ gateway,
+
+ // Disable subscriptions (not currently supported with ApolloGateway)
+ subscriptions: false,
+});
+
+server.listen().then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+In the above example, we provide the `serviceList` configuration option to the
+`ApolloGateway` constructor. This array specifies a `name` and `url` for each
+of our implementing services. You can specify any string value for `name`, which
+is used primarily for query planner output, error messages, and logging.
+
+> In production, we recommend running the gateway in a **managed mode**, which relies on static files rather than introspection. For details, see the [Apollo Graph Manager documentation](https://www.apollographql.com/docs/graph-manager/federation/).
+
+On startup, the gateway fetches each implementing service's schema from its `url` and composes those schemas into a single federated data graph. It then begins accepting incoming requests and creates query plans for them that execute across one or more services.
+
+> If there are any composition errors, the `new ApolloServer` call throws an exception
+> with a list of [validation errors](/federation/errors/).
+
+## Customizing requests and responses
+
+The gateway can modify the details of an incoming request before executing it across your implementing services. For example, your services might all use the same authorization token to associate an incoming request with a particular user. The gateway can add that token to each operation it sends to your services.
+
+Similarly, the gateway can modify the details of its response to a client, based on the result returned by each implementing service.
+
+### Customizing requests
+
+In the following example, each incoming request to the gateway includes an `Authorization` header. The gateway sets the shared `context` for an operation by pulling the value of that header and using it to fetch the associated user's ID.
+
+After adding the `userId` to the shared `context` object, the gateway can then add that value to a header that it includes in its requests to each implementing service.
+
+
+
+```javascript{4-10,17-19,28-35}
+const { ApolloServer } = require('apollo-server');
+const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway');
+
+class AuthenticatedDataSource extends RemoteGraphQLDataSource {
+ willSendRequest({ request, context }) {
+ // Pass the user's id from the context to underlying services
+ // as a header called `user-id`
+ request.http.headers.set('user-id', context.userId);
+ }
+}
+
+const gateway = new ApolloGateway({
+ serviceList: [
+ { name: 'products', url: 'http://localhost:4001' },
+ // List other services here
+ ],
+ buildService({ name, url }) {
+ return new AuthenticatedDataSource({ url });
+ },
+});
+
+const server = new ApolloServer({
+ gateway,
+
+ // Disable subscriptions (not currently supported with ApolloGateway)
+ subscriptions: false,
+
+ context: ({ req }) => {
+ // Get the user token from the headers
+ const token = req.headers.authorization || '';
+ // Try to retrieve a user with the token
+ const userId = getUserId(token);
+ // Add the user ID to the context
+ return { userId };
+ },
+});
+
+server.listen().then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+
+
+> The fields of the object passed to your `context` function differ if you're using middleware besides Express. [See the API reference for details.](/api/apollo-server/#apolloserver)
+
+The `buildService` function enables us to customize the requests that are sent to our implementing services. In this example, we return a custom `RemoteGraphQLDataSource`. The datasource allows us to modify the outgoing request with information from the Apollo Server `context` before it's sent. Here, we add the `user-id` header to pass an authenticated user ID to downstream services.
+
+### Customizing responses
+
+Let's say that whenever our implementing services return an operation result to the gateway, they include a `Server-Id` header in the response. The value of the header uniquely identifies the service in our graph.
+
+When the gateway then responds to a client, we want _its_ `Server-Id` header to include the identifier for _every_ service that contributed to the response. In this case, we can tell the gateway to aggregate the various server IDs into a single, comma-separated list.
+
+The flow for processing a single operation from a client application then looks like this:
+
+```mermaid
+sequenceDiagram;
+ Client app->>Gateway: Sends GraphQL operation
+ Gateway->>Gateway: Generates query plan for operation
+ loop For each operation in the query plan
+ Gateway->>Implementing Services: Sends the operation to the applicable service
+ Implementing Services->>Gateway: Responds with result and Server-Id header
+ Gateway->>Gateway: Adds the returned Server-Id to the shared context
+ end
+ Gateway->>Gateway: Adds all Server-Ids in the shared context to the response header
+ Gateway->>Client app: Sends operation response
+```
+
+To implement this flow, we can use the `didReceiveResponse` callback of the `RemoteGraphQLDataSource` class to inspect each implementing service's result as it comes in. We can add the `Server-Id` to the shared `context` in this callback, then pull the full list from the `context` when sending the final response to the client.
+
+
+
+```javascript
+const { ApolloServer } = require('apollo-server');
+const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway');
+
+class DataSourceWithServerId extends RemoteGraphQLDataSource {
+ // highlight-start
+ async didReceiveResponse({ response, request, context }) {
+ // Parse the Server-Id header and add it to the array on context
+ const serverId = response.http.headers.get('Server-Id');
+ if (serverId) {
+ context.serverIds.push(serverId);
+ }
+
+ // Return the response, even when unchanged.
+ return response;
+ }
+ // highlight-end
+}
+
+const gateway = new ApolloGateway({
+ serviceList: [
+ { name: 'products', url: 'http://localhost:4001' }
+ // other services
+ ],
+ // highlight-start
+ buildService({ url }) {
+ return new DataSourceWithServerId({ url });
+ }
+ // highlight-end
+});
+
+const server = new ApolloServer({
+ gateway,
+ subscriptions: false, // Must be disabled with the gateway; see above.
+ context() {
+ return { serverIds: [] };
+ },
+ plugins: [
+ // highlight-start
+ {
+ requestDidStart() {
+ return {
+ willSendResponse({ context, response }) {
+ // Append our final result to the outgoing response headers
+ response.http.headers.set(
+ 'Server-Id',
+ context.serverIds.join(',')
+ );
+ }
+ };
+ }
+ }
+ // highlight-end
+ ]
+});
+
+server.listen().then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+
+
+> In this example, multiple calls to `didReceiveResponse` are `push`ing a value onto the shared `context.serverIds` array. The order of these calls cannot be guaranteed. If you write logic that modifies the shared `context` object, make sure that modifications are not destructive, and that the order of modifications doesn't matter.
+
+To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/).
+
+## Custom directive support
+
+The `@apollo/gateway` library supports the use of custom [directives](/schema/directives/) in your implementing service schemas. This support differs depending on whether a given directive is a **type system directive** or an **executable directive**.
+
+### Type system directives
+
+Type system directives are directives that are applied to one of [these locations](http://spec.graphql.org/June2018/#TypeSystemDirectiveLocation). These directives are _not_ used within operations, but rather are applied to locations within the schema itself.
+
+The `@deprecated` directive below is an example of a type system directive:
+
+```graphql
+directive @deprecated(
+ reason: String = "No longer supported"
+) on FIELD_DEFINITION | ENUM_VALUE
+
+type ExampleType {
+ newField: String
+ oldField: String @deprecated(reason: "Use `newField`.")
+}
+```
+
+At composition time, `ApolloGateway` strips all definitions _and_ uses of type system directives from your composed schema. This has no effect on your implementing service schemas, which retain this information.
+
+Effectively, the gateway supports type system directives by _ignoring_ them, making them the responsibility of the implementing services that define them.
+
+### Executable directives
+
+Executable directives are directives that are applied to one of [these locations](http://spec.graphql.org/June2018/#ExecutableDirectiveLocation). These directives are _defined_ in your schema, but they're _used_ in operations that are sent by clients.
+
+>**Although the `@apollo/gateway` library supports executable directives, Apollo Server itself does not**. This guidance is provided primarily for architectures that use the `@apollo/gateway` library in combination with implementing services that do _not_ use Apollo Server.
+
+Here's an example of an executable directive definition:
+
+```graphql
+# Uppercase this field's value (assuming it's a string)
+directive @uppercase on FIELD
+```
+
+And here's an example of a query that uses that directive:
+
+```graphql
+query GetUppercaseUsernames {
+ users {
+ name @uppercase
+ }
+}
+```
+
+At composition time, `ApolloGateway` makes sure that **all of your implementing services define the exact same set of executable directives**. If any service is missing a definition, or if definitions differ in their locations, arguments, or argument types, a composition error occurs.
+
+> It's strongly recommended that all of your implementing services also use the exact same _logic_ for a given executable directive. Otherwise, operations might produce inconsistent or confusing results for clients.
diff --git a/docs/source/federation/implementing-services.mdx b/docs/source/federation/implementing-services.mdx
new file mode 100644
index 00000000000..577bfbc8318
--- /dev/null
+++ b/docs/source/federation/implementing-services.mdx
@@ -0,0 +1,230 @@
+---
+title: "Apollo Federation: Implementing services"
+sidebar_title: Implementing services
+---
+
+import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx';
+
+import {
+ ExpansionPanel,
+} from 'gatsby-theme-apollo-docs/src/components/expansion-panel';
+
+This article describes how to create an **implementing service** for a federated data graph using Apollo Server.
+
+## Defining an implementing service
+
+> To be part of a federated graph, an implementing service must conform to the [Apollo Federation specification](/federation/federation-spec/), which exposes the service's capabilities to the gateway, as well as to tools like Apollo Graph Manager.
+
+Converting an existing schema into an implementing service is the first step in building a federated graph. To start, here's a *non-federated* Apollo Server setup:
+
+```javascript:title=index.js
+const { ApolloServer, gql } = require('apollo-server');
+
+const typeDefs = gql`
+ type Query {
+ me: User
+ }
+
+ type User {
+ id: ID!
+ username: String
+ }
+`;
+
+const resolvers = {
+ Query: {
+ me() {
+ return { id: "1", username: "@ava" }
+ }
+ }
+};
+
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+});
+
+server.listen(4001).then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+This should look familiar if you've [set up Apollo Server](/getting-started/) before. If it doesn't, we recommend you familiarize yourself with the basics before jumping into federation.
+
+Now, let's convert this to an implementing service. The first step is to install the `@apollo/federation` package in our project:
+
+```shell
+npm install @apollo/federation
+```
+
+### Defining an entity
+
+As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an [entity](./entities/):
+
+```js:title=index.js
+const { ApolloServer, gql } = require('apollo-server');
+const { buildFederatedSchema } = require('@apollo/federation');
+
+const typeDefs = gql`
+ type Query {
+ me: User
+ }
+
+ type User @key(fields: "id") {
+ id: ID!
+ username: String
+ }
+`;
+```
+
+The `@key` directive tells other services which field(s) of the `User` type to use
+to uniquely identify a particular instance. In this case, services should use the
+single field `id`.
+
+Next, we add a **reference resolver** for the `User` type. A reference resolver tells the gateway how to fetch an entity by its `@key` fields:
+
+```js:title=index.js
+const resolvers = {
+ Query: {
+ me() {
+ return { id: "1", username: "@ava" }
+ }
+ },
+ User: {
+ __resolveReference(user, { fetchUserById }){
+ return fetchUserById(user.id)
+ }
+ }
+};
+```
+
+(This example requires defining the `fetchUserById` function to obtain the appropriate `User` from our backing data store.)
+
+> [Learn more about entities](./entities/)
+
+### Generating a federated schema
+
+Finally, we use the `buildFederatedSchema` function from the `@apollo/federation` package to augment our schema definition with federation support. We provide the result of this function to the `ApolloServer` constructor:
+
+```js:title=index.js
+const server = new ApolloServer({
+ schema: buildFederatedSchema([{ typeDefs, resolvers }])
+});
+
+server.listen(4001).then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+The server is now ready to act as an implementing service in a federated data graph!
+
+### Combined example
+
+Here are the snippets above combined (again, note that for this sample to be complete, you must define the `fetchUserById` function for your data source):
+
+```js:title=index.js
+const { ApolloServer, gql } = require('apollo-server');
+const { buildFederatedSchema } = require('@apollo/federation');
+
+const typeDefs = gql`
+ type Query {
+ me: User
+ }
+
+ type User @key(fields: "id") {
+ id: ID!
+ username: String
+ }
+`;
+
+const resolvers = {
+ Query: {
+ me() {
+ return { id: "1", username: "@ava" }
+ }
+ },
+ User: {
+ __resolveReference(user, { fetchUserById }){
+ return fetchUserById(user.id)
+ }
+ }
+}
+
+const server = new ApolloServer({
+ schema: buildFederatedSchema([{ typeDefs, resolvers }])
+});
+
+server.listen(4001).then(({ url }) => {
+ console.log(`🚀 Server ready at ${url}`);
+});
+```
+
+## Defining custom directives
+
+The method for defining [custom directives](/schema/creating-directives/) differs slightly in Apollo Federation.
+
+**Without Apollo Federation**, you provide your directive definitions to the constructor of `ApolloServer` in the `schemaDirectives` argument, like so:
+
+
+
+```js{15-17}
+const { ApolloServer, gql, SchemaDirectiveVisitor } = require("apollo-server");
+
+// typeDefs and resolvers defined here
+
+class DeprecatedDirective extends SchemaDirectiveVisitor {
+ public visitFieldDefinition(field: GraphQLField) {
+ field.isDeprecated = true;
+ field.deprecationReason = this.args.reason;
+ }
+}
+
+const server = new ApolloServer({
+ typeDefs,
+ resolvers,
+ schemaDirectives: {
+ deprecated: DeprecatedDirective
+ }
+});
+```
+
+
+
+**With Apollo Federation**, you instead call `SchemaDirectiveVisitor.visitSchemaDirectives`, passing in your schema and your directives, _before_ you provide your schema to the constructor of `ApolloServer`:
+
+```js
+const { ApolloServer, gql, SchemaDirectiveVisitor } = require('apollo-server');
+const { buildFederatedSchema } = require ('@apollo/federation')
+
+// typeDefs and resolvers defined here
+
+class DeprecatedDirective extends SchemaDirectiveVisitor {
+ public visitFieldDefinition(field: GraphQLField) {
+ field.isDeprecated = true;
+ field.deprecationReason = this.args.reason;
+ }
+}
+
+const directives = {
+ deprecated: DeprecatedDirective
+};
+let schema = buildFederatedSchema([{ typeDefs, resolvers }]);
+
+SchemaDirectiveVisitor.visitSchemaDirectives(schema, directives);
+
+const server = new ApolloServer({
+ schema: schema
+});
+```
+
+Also make sure to read about the [gateway's support for custom directives](./gateway/#custom-directive-support).
+
+## Securing implementing services
+
+Because of the power and flexibility of Apollo Federation's `_entities` field, your implementing services should **not** be directly accessible by clients. Instead, only your [gateway](./gateway/) should have access to your implementing services. Clients then communicate with the gateway:
+
+
+
+Make sure to implement any necessary firewall rules, access control
+lists, or other measures to ensure that individual implementing services can
+be accessed only via the gateway.
diff --git a/docs/source/federation/implementing.md b/docs/source/federation/implementing.md
deleted file mode 100644
index 3a7bbadecc0..00000000000
--- a/docs/source/federation/implementing.md
+++ /dev/null
@@ -1,386 +0,0 @@
----
-title: Implementing services and the gateway
----
-
-An Apollo Federation architecture consists of:
-
-* A collection of **implementing services** that each define a distinct GraphQL schema
-* A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph
-
-```mermaid
-graph BT;
- webapp(Web app);
- iosapp(iOS app);
- gateway([Gateway]);
- serviceA[Products service];
- serviceB[Reviews service];
- serviceC[Inventory service];
- webapp & iosapp -.- gateway;
- gateway --- serviceA & serviceB & serviceC;
- class webapp,iosapp tertiary;
-```
-
-Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework.
-
-Let's look at how to get a federated graph up and running. We'll start by preparing an existing implementing service for federation, and then we'll set up a gateway in front of it.
-
-## Defining an implementing service
-
-> To be part of a federated graph, an implementing service must conform to the [Apollo Federation specification](/federation/federation-spec/), which exposes the service's capabilities to the gateway, as well as to tools like Apollo Graph Manager.
-
-Converting an existing schema into an implementing service is the first step in building a federated graph. To start, here's a *non-federated* Apollo Server setup:
-
-```javascript:title=index.js
-const { ApolloServer, gql } = require('apollo-server');
-
-const typeDefs = gql`
- type Query {
- me: User
- }
-
- type User {
- id: ID!
- username: String
- }
-`;
-
-const resolvers = {
- Query: {
- me() {
- return { id: "1", username: "@ava" }
- }
- }
-};
-
-const server = new ApolloServer({
- typeDefs,
- resolvers,
-});
-
-server.listen(4001).then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-This should look familiar if you've [set up Apollo Server](/getting-started/) before. If it doesn't, we recommend you familiarize yourself with the basics before jumping into federation.
-
-Now, let's convert this to an implementing service. The first step is to install the `@apollo/federation` package in our project:
-
-```shell
-npm install @apollo/federation
-```
-
-### Defining an entity
-
-As part of our federated architecture, we want _other_ implementing services to be able to extend the `User` type this service defines. To enable this, we add the `@key` directive to the `User` type's definition to designate it as an **entity**:
-
-```js:title=index.js
-const { ApolloServer, gql } = require('apollo-server');
-const { buildFederatedSchema } = require('@apollo/federation');
-
-const typeDefs = gql`
- type Query {
- me: User
- }
-
- type User @key(fields: "id") {
- id: ID!
- username: String
- }
-`;
-```
-
-The `@key` directive tells other services which field(s) of the `User` type to use
-to uniquely identify a particular instance. In this case, services should use the
-single field `id`.
-
-Next, we add a **reference resolver** for the `User` type. A reference resolver tells the gateway how to fetch an entity by its `@key` fields:
-
-```js:title=index.js
-const resolvers = {
- Query: {
- me() {
- return { id: "1", username: "@ava" }
- }
- },
- User: {
- __resolveReference(user, { fetchUserById }){
- return fetchUserById(user.id)
- }
- }
-};
-```
-
-We would then define the `fetchUserById` function to obtain the appropriate `User`
-from our backing data store.
-
-> [Learn more about entities](./entities/)
-
-### Generating a federated schema
-
-Finally, we use the `buildFederatedSchema` function from the `@apollo/federation` package to augment our schema definition with federation support. We provide the result of this function to the `ApolloServer` constructor:
-
-```js:title=index.js
-const server = new ApolloServer({
- schema: buildFederatedSchema([{ typeDefs, resolvers }])
-});
-
-server.listen(4001).then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-The server is now ready to act as an implementing service in a federated data graph!
-
-### Full example
-
-Here are the snippets above combined (again, note that for this sample to be complete,
- you must define the `fetchUserById` function for your data source):
-
-```js:title=index.js
-const { ApolloServer, gql } = require('apollo-server');
-const { buildFederatedSchema } = require('@apollo/federation');
-
-const typeDefs = gql`
- type Query {
- me: User
- }
-
- type User @key(fields: "id") {
- id: ID!
- username: String
- }
-`;
-
-const resolvers = {
- Query: {
- me() {
- return { id: "1", username: "@ava" }
- }
- },
- User: {
- __resolveReference(user, { fetchUserById }){
- return fetchUserById(user.id)
- }
- }
-}
-
-const server = new ApolloServer({
- schema: buildFederatedSchema([{ typeDefs, resolvers }])
-});
-
-server.listen(4001).then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-## Defining the gateway
-
-Now that we have a federation-ready implementing service, we can set up a federated **gateway** to sit in front of it. First, let's install the necessary packages:
-
-```shell
-npm install @apollo/gateway apollo-server graphql
-```
-
-Now we can set up an `ApolloServer` instance that acts as a gateway to our underlying
-implementing services:
-
-```js
-const { ApolloServer } = require('apollo-server');
-const { ApolloGateway } = require("@apollo/gateway");
-
-// Initialize an ApolloGateway instance and pass it an array of implementing
-// service names and URLs
-const gateway = new ApolloGateway({
- serviceList: [
- { name: 'accounts', url: 'http://localhost:4001' },
- // more services
- ],
-});
-
-// Pass the ApolloGateway to the ApolloServer constructor
-const server = new ApolloServer({
- gateway,
-
- // Disable subscriptions (not currently supported with ApolloGateway)
- subscriptions: false,
-});
-
-server.listen().then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-In the above example, we provide the `serviceList` configuration option to the
-`ApolloGateway` constructor. This array specifies a `name` and `url` for each
-of our implementing services. You can specify any string value for `name`, which
-is used primarily for query planner output, error messages, and logging.
-
-> In production, we recommend configuring the gateway in a managed mode, which relies on static files rather than introspection. For details on how to use the [Apollo schema registry](https://www.apollographql.com/docs/graph-manager/schema-registry/) to support this workflow, see [the Graph Manager documentation](https://www.apollographql.com/docs/graph-manager/federation/).
-
-On startup, the gateway fetches each implementing service's capabilities and composes
-a federated data graph. It accepts incoming requests and creates query plans that query the graph's implementing services.
-
-> If there are any composition errors, the `new ApolloServer` call throws an exception
-> with a list of [validation errors](/federation/errors/).
-
-### Securing implementing services
-
-Due to the power and flexibility of federation's `_entities` field, **only the gateway should be accessible by GraphQL clients**. Individual implementing services
-should **not** be accessible. Make sure to implement firewall rules, access control
-lists, or other measures to ensure that individual implementing services can
-be accessed only via the gateway.
-
-## Sharing context across services
-
-### Customizing incoming requests
-
-If you have an existing set of services, you've probably already
-implemented some form of authentication to associate each request with a user, or
-you require that some information be passed to each service via request headers. The `@apollo/gateway` package enables you to reuse Apollo Server's context feature to customize which information is sent to implementing services.
-
-The following example demonstrates passing user information from the gateway
-to each implementing service via the `user-id` HTTP header:
-
-```javascript
-const { ApolloServer } = require('apollo-server');
-const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway');
-
-// highlight-start
-class AuthenticatedDataSource extends RemoteGraphQLDataSource {
- willSendRequest({ request, context }) {
- // pass the user's id from the context to underlying services
- // as a header called `user-id`
- request.http.headers.set('user-id', context.userId);
- }
-}
-// highlight-end
-
-const gateway = new ApolloGateway({
- serviceList: [
- { name: 'products', url: 'http://localhost:4001' },
- // other services
- ],
- // highlight-start
- buildService({ name, url }) {
- return new AuthenticatedDataSource({ url });
- },
- // highlight-end
-});
-
-const server = new ApolloServer({
- gateway,
-
- // Disable subscriptions (not currently supported with ApolloGateway)
- subscriptions: false,
-
- context: ({ req }) => {
- // get the user token from the headers
- const token = req.headers.authorization || '';
-
- // try to retrieve a user with the token
- const userId = getUserId(token);
-
- // add the user to the context
- return { userId };
- },
-});
-
-server.listen().then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-The `buildService` function enables us to customize the requests that are sent to our implementing services. In this example, we return a custom `RemoteGraphQLDataSource`. The datasource allows us to modify the outgoing request with information from the Apollo Server `context` before it's sent. Here, we add the `user-id` header to pass an authenticated user ID to downstream services.
-
-### Customizing outgoing responses
-
-Similarly, the `didReceiveResponse` callback allows us to inspect an implementing
-service's `response` in order to modify the `context`. The lifecycle of a request to
-a federated server involves a number of responses, multiple of which might contain
-headers that should be passed back to the client.
-
-Suppose our implementing services all use the `Server-Id` header to uniquely
-identify themselves in a response. We want the gateway's `Server-Id` header to include _all_ of these returned values. In this case, we can tell the gateway to aggregate the various server IDs into a single, comma-separated list in its response:
-
-
-
- To implement this behavior, we define a `didReceiveResponse` callback and an `ApolloServerPlugin` in our gateway:
-
-```javascript
-const { ApolloServer } = require('apollo-server');
-const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway');
-
-class DataSourceWithServerId extends RemoteGraphQLDataSource {
- // highlight-start
- async didReceiveResponse({ response, request, context }) {
- // Parse the Server-Id header and add it to the array on context
- const serverId = response.http.headers.get('Server-Id');
- if (serverId) {
- context.serverIds.push(serverId);
- }
-
- // Return the response, even when unchanged.
- return response;
- }
- // highlight-end
-}
-
-const gateway = new ApolloGateway({
- serviceList: [
- { name: 'products', url: 'http://localhost:4001' }
- // other services
- ],
- // highlight-start
- buildService({ url }) {
- return new DataSourceWithServerId({ url });
- }
- // highlight-end
-});
-
-const server = new ApolloServer({
- gateway,
- subscriptions: false, // Must be disabled with the gateway; see above.
- context() {
- return { serverIds: [] };
- },
- plugins: [
- // highlight-start
- {
- requestDidStart() {
- return {
- willSendResponse({ context, response }) {
- // Append our final result to the outgoing response headers
- response.http.headers.append(
- 'Server-Id',
- context.serverIds.join(',')
- );
- }
- };
- }
- }
- // highlight-end
- ]
-});
-
-server.listen().then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/).
-
-## Implementing custom directives
-
-> Note: Apollo Server does not currently support executable directives, however they are supported by the gateway.
-
-The gateway currently provides limited support for custom, service-level directives. To use this feature, there are a few requirements that must be met in order to compose a valid graph:
-
-* Directives can only implement executable locations. Executable directive locations are documented in the [spec](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation).
-> The following locations are considered valid to the gateway: QUERY, MUTATION, SUBSCRIPTION, FIELD, FRAGMENT\_DEFINITION, FRAGMENT\_SPREAD, INLINE\_FRAGMENT
-* Directives must be implemented by *every* service that's part of the graph. It's acceptable for a service to do nothing with a particular directive, but a directive definition must exist within every service's schema.
-* Directive definitions must be identical across all services. A directive definition is identical if its name, arguments and their types, and locations are all the same.
-
-## Managing a federated graph
-
-With Apollo Federation, teams are able to move quickly as they build out their GraphQL services. However, distributed systems introduce complexities that require special tooling and coordination across teams to safely roll out changes. [Apollo Graph Manager](https://engine.apollographql.com) provides solutions to problems like schema change validation, graph update coordination, and metrics collection. For more information on Graph Manager see [Managed federation](https://www.apollographql.com/docs/graph-manager/federation/).
diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx
index 74c8e5ae767..396abf77c96 100644
--- a/docs/source/federation/introduction.mdx
+++ b/docs/source/federation/introduction.mdx
@@ -4,6 +4,8 @@ sidebar_title: Overview
description: Implement a single data graph across multiple services
---
+import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx';
+
To get the most out of GraphQL, your organization should expose a [single data
graph](https://principledgraphql.com/integrity#1-one-graph) that provides a
unified interface for querying all of your backing data sources. This
@@ -22,6 +24,23 @@ implement _only_ the part of your data graph that it should be responsible for.
This way, your organization can represent an enterprise-scale data graph as a
collection of separately maintained GraphQL services.
+## Architecture
+
+An Apollo Federation architecture consists of:
+
+* A collection of **implementing services** that each define a distinct GraphQL schema
+* A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph
+
+
+
+Apollo Server provides libraries for acting both as an implementing service and as a gateway, but these components can be implemented in any language and framework.
+
+> Apollo Federation does not currently support [GraphQL subscription operations](https://www.apollographql.com/docs/react/data/subscriptions/).
+
+The following presentation by [Mandi Wise](https://twitter.com/mandiwise) further describes the architecture of Apollo Federation and walks through implementing a federated graph:
+
+
+
## Core principles
### Incremental adoption
@@ -65,10 +84,9 @@ The difference is that now, each service defines the types and fields that it is
The result is the best of both worlds: an implementation that keeps all the code for a given feature in a single service and separated from unrelated concerns, and a product-centric schema with rich types that reflects the natural way an application developer would want to consume the graph.
-## Apollo Server implementation
+## Apollo Server libraries
-Apollo Server supports Apollo Federation via two open-source extensions:
-`@apollo/federation` and `@apollo/gateway`.
+Apollo Server supports Apollo Federation via two open-source extension libraries:
* `@apollo/federation` provides primitives that your implementing services use to make their individual GraphQL schemas composable.
* `@apollo/gateway` enables you to set up an instance of Apollo Server as a **gateway** that distributes incoming GraphQL operations across one or more implementing services.
@@ -76,7 +94,7 @@ Apollo Server supports Apollo Federation via two open-source extensions:
## Federated schema example
Let's look at an example. Below, we define the schema for a basic e-commerce
-application as three _federated_ schemas, each of which can be implemented as
+application as three _federated_ schemas, each of which is implemented as
a standalone GraphQL service:
```graphql:title=accounts
@@ -158,32 +176,20 @@ That’s it! With Apollo Federation, schemas and resolvers live in your
implementing services. The gateway serves only to plan and execute GraphQL
operations across those implementing services.
-In addition to running a gateway with a static list of services, Apollo
-Gateway can also operate in _managed federation_ mode where Apollo Graph
-Manager acts as the source of truth for the underlying services' SDL. This mode of operation enables multiple
-teams working on a data graph to help them coordinate when underlying
-services change using federation-aware tooling. For more information, read about
-[managed federation](https://www.apollographql.com/docs/graph-manager/federation/)
-in Apollo Graph Manager.
+### Managed federation
-## Query examples
+In addition to running a gateway with a static list of services, Apollo Gateway can operate in **managed federation** mode, where [Apollo Graph Manager](https://www.apollographql.com/docs/graph-manager/) acts as the source of truth for each implementing service's schema.
-Now we can execute GraphQL operations against our composed schema just as if it
-were implemented as a monolithic service:
+This mode enables multiple teams working on a data graph to coordinate when and how underlying services change. For more information, read [Managing a federated graph](https://www.apollographql.com/docs/graph-manager/federation/).
-```graphql
-# a query that the gateway can resolve by calling only the products service
-query {
- topProducts {
- upc
- name
- }
-}
-```
+## Query example
+
+Now we can execute GraphQL operations against our composed schema just as if it
+were implemented as a single, monolithic service:
```graphql
-# a query that the gateway must call all three services to fully resolve
-query {
+# A query that the gateway resolves by calling all three services
+query GetCurrentUserReviews {
me {
username
reviews {
@@ -197,4 +203,4 @@ query {
}
```
-Next, you can [clone a demo schema](https://github.com/apollographql/federation-demo) or [check out the CodeSandbox demo in your browser](https://codesandbox.io/s/v368r9ml47).
+Next, learn how to [define an implementing service](./implementing-services/).
diff --git a/docs/source/federation/metrics.md b/docs/source/federation/metrics.md
index dc3dc2b3745..154cb196ae6 100644
--- a/docs/source/federation/metrics.md
+++ b/docs/source/federation/metrics.md
@@ -16,11 +16,11 @@ The model of federated metrics is that implementing services report timing and e
## Turning it on
-Ensure that all dependencies on `apollo-server` are at version `2.7.0` or higher. Provide an API key to your gateway via the `ENGINE_API_KEY` environment variable for the gateway to report metrics to the default ingress. To ensure that implementing services do not report metrics as well, do not provide them with an `ENGINE_API_KEY` or set `{ engine: true, reporting: false }` in the constructor options to ApolloServer.
+Ensure that all dependencies on `apollo-server` are at version `2.7.0` or higher. Provide an API key to your gateway via the `ENGINE_API_KEY` environment variable for the gateway to report metrics to the default ingress. To ensure that implementing services do not report metrics as well, do not provide them with an `ENGINE_API_KEY` or set `{ engine: false }` in the constructor options to `ApolloServer`.
These options will cause the Apollo gateway to collect tracing information from the underlying federated services and pass them on, along with the query plan, to the Apollo metrics ingress. Currently, only Apollo Server supports detailed metrics insights as an implementing service, but we would love to work with you to implement the protocol in other languages!
-> NOTE: By default, metrics will be reported to the `current` variant. To change the variant for reporting, set the `ENGINE_GRAPH_VARIANT` environment variable.
+> NOTE: By default, metrics will be reported to the `current` variant. To change the variant for reporting, set the `APOLLO_GRAPH_VARIANT` environment variable.
## How tracing data is exposed from a federated service
@@ -30,7 +30,7 @@ The Apollo gateway looks to the `extensions` field of all service responses for
## How traces are constructed and aggregated
-The Apollo gateway constructs traces in the shape of the [query plan](https://www.apollographql.com/docs/apollo-server/federation/implementing/#inspecting-query-plans), embedding an individual `Trace` for each fetch that is performed in the query plan. This indicates the sub-query traces as well as which order they were fetched from the underlying services. The field-level statistics that the Apollo Platform aggregates from these traces are collected over the fields over which the operation was executed **in the federated services**. In other words, field stats are collected based on the operations the query planner makes rather than the operations that the clients make. On the other hand, operation-level statistics are aggregated over the operations exected **by the client**, which means that even if query-planning changes, statistics will still be corresponded to the same client-delivered operation.
+The Apollo gateway constructs traces in the shape of the [query plan](https://www.apollographql.com/docs/apollo-server/federation/implementing/#inspecting-query-plans), embedding an individual `Trace` for each fetch that is performed in the query plan. This indicates the sub-query traces as well as which order they were fetched from the underlying services. The field-level statistics that the Apollo Platform aggregates from these traces are collected over the fields over which the operation was executed **in the federated services**. In other words, field stats are collected based on the operations the query planner makes rather than the operations that the clients make. On the other hand, operation-level statistics are aggregated over the operations executed **by the client**, which means that even if query-planning changes, statistics will still be corresponded to the same client-delivered operation.
## How errors work
diff --git a/docs/source/federation/other-servers.md b/docs/source/federation/other-servers.md
index ddb6957a7ed..2cfa5020241 100644
--- a/docs/source/federation/other-servers.md
+++ b/docs/source/federation/other-servers.md
@@ -5,15 +5,18 @@ sidebar_title: Third-party support
The following is a list of known open source GraphQL server libraries that have built-in support for Apollo Federation.
-| Language | Framework | Library |
-| ----------- | ------------ | -------------------------------------------------------------------------------- |
-| Go | gqlgen | [gqlgen](https://github.com/99designs/gqlgen/tree/master/plugin/federation) |
-| Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) |
-| Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) |
-| PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) |
-| PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) |
-| Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) |
-| Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) |
-| Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) |
+| Language | Framework | Library |
+| ----------- | ------------- | -------------------------------------------------------------------------------- |
+| Go | gqlgen | [gqlgen](https://github.com/99designs/gqlgen/tree/master/plugin/federation) |
+| Java | graphql-java | [federation-jvm](https://github.com/apollographql/federation-jvm) |
+| Java | graphql-java | [graphql-java-federation](https://github.com/rkudryashov/graphql-java-federation)|
+| Kotlin | graphql-java | [graphql-kotlin](https://github.com/ExpediaGroup/graphql-kotlin) |
+| PHP | graphql-php | [php-graphql-federation](https://github.com/pascaldevink/php-graphql-federation) |
+| PHP | wp-graphql | [wp-graphql-federation](https://github.com/wp-graphql/wp-graphql-federation) |
+| Python | ariadne | [ariadne](https://github.com/mirumee/ariadne) |
+| Python | graphene | [graphene-federation](https://github.com/preply/graphene-federation) |
+| Scala | caliban | [caliban](https://github.com/ghostdogpr/caliban) |
+| Ruby | graphql-ruby | [apollo-federation-ruby](https://github.com/Gusto/apollo-federation-ruby) |
+| Rust | async-graphql | [async-graphql](https://github.com/async-graphql/async-graphql) |
Do you maintain a library that implements Apollo Federation that isn't listed here? Please [submit a PR](https://github.com/apollographql/apollo-server/tree/master/docs/source/federation/other-servers.md) to be added to the list!
diff --git a/docs/source/getting-started.md b/docs/source/getting-started.md
index e66baa314b5..7cbb4eb6a2d 100644
--- a/docs/source/getting-started.md
+++ b/docs/source/getting-started.md
@@ -228,5 +228,5 @@ Apollo Server. Check out the following resources to learn more about the basics
of schemas, resolvers, and deployment:
* [Schema basics](/schema/schema/)
-* [Fetching data with resolvers](/data/data/)
+* [Resolvers](/data/resolvers/)
* [Deploying with Heroku](/deployment/heroku/)
diff --git a/docs/source/integrations/middleware.md b/docs/source/integrations/middleware.md
index b17e8c02067..87034e184fe 100644
--- a/docs/source/integrations/middleware.md
+++ b/docs/source/integrations/middleware.md
@@ -42,4 +42,6 @@ app.listen({ port: 4000 }, () =>
In the above example, the `app` parameter you provide to `applyMiddleware`
is your middleware's top-level representation of your application. In Express applications, for example, this variable is commonly named `app`.
+By passing the existing `app` into `applyMiddleware`, Apollo Server can internally configure various middleware (including body parsing, the GraphQL Playground frontend, CORS support, etc.) without needing to separately apply those to the `app` with middleware mechanisms like Express.js' `app.use`.
+
> **Note:** When integrating with hapi, call `applyMiddleware` with `await`.
diff --git a/docs/source/integrations/plugins.md b/docs/source/integrations/plugins.md
index 0400c487195..578e62f6a3e 100644
--- a/docs/source/integrations/plugins.md
+++ b/docs/source/integrations/plugins.md
@@ -99,7 +99,7 @@ const myPlugin = {
parsingDidStart(requestContext) {
console.log('Parsing started!');
- }
+ },
validationDidStart(requestContext) {
console.log('Validation started!');
@@ -121,17 +121,18 @@ The following diagram illustrates the sequence of events that fire for each requ
```mermaid
graph TB;
- request(requestDidStart) --> parsing(parsingDidStart*);
+ request(requestDidStart) --> resolveSource(didResolveSource);
+ resolveSource --"Success"--> parsing(parsingDidStart*);
parsing --"Success"--> validation(validationDidStart*);
- validation --"Success"--> resolve(didResolveOperation);
- resolve --"Success"--> response(responseForOperation);
+ validation --"Success"--> resolveOperation(didResolveOperation);
+ resolveOperation --"Success"--> response(responseForOperation);
execution(executionDidStart*);
errors(didEncounterErrors);
response --"Response provided"--> send;
response --"No response provided"--> execution;
execution --"Success"--> send(willSendResponse);
- execution & resolve & parsing & validation --"Failure"--> errors;
+ execution & resolveSource & resolveOperation & parsing & validation --"Failure"--> errors;
errors --> send;
class server,request secondary;
```
@@ -269,6 +270,15 @@ const server = new ApolloServer({
The `requestDidStart` event fires whenever Apollo Server begins fulfilling a GraphQL request.
+```typescript
+requestDidStart?(
+ requestContext: WithRequired<
+ GraphQLRequestContext,
+ 'request' | 'context' | 'logger'
+ >
+): GraphQLRequestListener | void;
+```
+
This function can optionally return an object that includes functions for responding
to request lifecycle events that might follow `requestDidStart`.
@@ -304,6 +314,23 @@ should not return a value.
> If you're using TypeScript to create your plugin, implement the [ `GraphQLRequestListener` interface](https://github.com/apollographql/apollo-server/blob/master/packages/apollo-server-plugin-base/src/index.ts) from the `apollo-server-plugin-base` module to define functions for request lifecycle events.
+### `didResolveSource`
+
+The `didResolveSource` event is invoked after Apollo Server has determined the
+`String`-representation of the incoming operation that it will act upon. In the
+event that this `String` was not directly passed in from the client, this
+may be retrieved from a cache store (e.g., Automated Persisted Queries).
+
+At this stage, there is not a guarantee that the operation is not malformed.
+
+```typescript
+didResolveSource?(
+ requestContext: WithRequired<
+ GraphQLRequestContext, 'source' | 'logger'>,
+ >,
+): ValueOrPromise;
+```
+
### `parsingDidStart`
The `parsingDidStart` event fires whenever Apollo Server will parse a GraphQL
@@ -318,7 +345,7 @@ does not occur.
parsingDidStart?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source'
+ 'metrics' | 'source' | 'logger'
>,
): (err?: Error) => void | void;
```
@@ -338,7 +365,7 @@ available at this stage, because parsing must succeed for validation to occur.
validationDidStart?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source' | 'document'
+ 'metrics' | 'source' | 'document' | 'logger'
>,
): (err?: ReadonlyArray) => void | void;
```
@@ -355,7 +382,7 @@ both the `operationName` string and `operation` AST are available.
didResolveOperation?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source' | 'document' | 'operationName' | 'operation'
+ 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger'
>,
): ValueOrPromise;
```
@@ -371,7 +398,7 @@ are invoked in series, and the first non-null response is used.
responseForOperation?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source' | 'document' | 'operationName' | 'operation'
+ 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger'
>,
): ValueOrPromise;
```
@@ -385,7 +412,7 @@ GraphQL operation specified by a request's `document` AST.
executionDidStart?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source' | 'document' | 'operationName' | 'operation'
+ 'metrics' | 'source' | 'document' | 'operationName' | 'operation' | 'logger'
>,
): (err?: Error) => void | void;
```
@@ -399,7 +426,7 @@ parsing, validating, or executing a GraphQL operation.
didEncounterErrors?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'source' | 'errors'
+ 'metrics' | 'source' | 'errors' | 'logger'
>,
): ValueOrPromise;
```
@@ -414,7 +441,7 @@ if the GraphQL operation encounters one or more errors.
willSendResponse?(
requestContext: WithRequired<
GraphQLRequestContext,
- 'metrics' | 'response'
+ 'metrics' | 'response' | 'logger'
>,
): ValueOrPromise;
```
diff --git a/docs/source/proxy-configuration.md b/docs/source/proxy-configuration.md
index cb9da46c1c4..17e2d0cc60c 100644
--- a/docs/source/proxy-configuration.md
+++ b/docs/source/proxy-configuration.md
@@ -91,13 +91,13 @@ Of course, a custom namespace can also be provided as well. For more details on
Depending on the proxy communication, it may be necessary to extend the default "root" certificates which Node.js trusts to include a certificate provided by the proxy administrator. These certificates will usually allow the proxy to handle SSL/TLS traffic and permits the proxy to analyze such traffic.
-This can be done [via Node.js' `NODE_EXTRA_CA_CERTS_FILE` environment variable](https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file):
+This can be done [via Node.js' `NODE_EXTRA_CA_CERTS` environment variable](https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file):
1. The appropriate certificate (i.e. PEM file) must be present on the file-system where the server is running.
-2. Start the server with the `NODE_EXTRA_CA_CERTS_FILE` environment variable set to that path, combined with the existing proxy configuration variables which were explained above:
+2. Start the server with the `NODE_EXTRA_CA_CERTS` environment variable set to that path, combined with the existing proxy configuration variables which were explained above:
```shell
- $ NODE_EXTRA_CA_CERTS_FILE=/full/path/to/certificate.pem \
+ $ NODE_EXTRA_CA_CERTS=/full/path/to/certificate.pem \
GLOBAL_AGENT_HTTP_PROXY=http://proxy:3128/ \
node index.js
```
diff --git a/docs/source/schema/scalars-enums.md b/docs/source/schema/scalars-enums.md
index 24006f806b2..06c6c3cc54f 100644
--- a/docs/source/schema/scalars-enums.md
+++ b/docs/source/schema/scalars-enums.md
@@ -237,7 +237,7 @@ type Query {
A query might look like this:
```graphql
-query {
+query GetAvatar {
avatar(borderColor: RED)
}
```
@@ -245,7 +245,7 @@ query {
To pass the enum value as a variable, use a string of JSON, like so:
```graphql
-query MyAvatar($color: AllowedColor) {
+query GetAvatar($color: AllowedColor) {
avatar(borderColor: $color)
}
```
diff --git a/docs/source/schema/schema.md b/docs/source/schema/schema.md
index 258c5ccbfc9..e2cd88476e0 100644
--- a/docs/source/schema/schema.md
+++ b/docs/source/schema/schema.md
@@ -76,18 +76,18 @@ type Author {
### The `Query` type
-The `Query` type defines exactly which GraphQL queries (i.e., read operations) clients can execute against your data graph. It resembles an [object type](#object-types), but its name is always `Query`.
+The `Query` type defines all of the top-level **entry points** for queries that clients execute against your data graph. It resembles an [object type](#object-types), but its name is always `Query`.
-Each field of the `Query` type defines the name and return type of a different supported query. The `Query` type for our example schema might resemble the following:
+Each field of the `Query` type defines the name and return type of a different entry point. The `Query` type for our example schema might resemble the following:
```graphql
type Query {
- getBooks: [Book]
- getAuthors: [Author]
+ books: [Book]
+ authors: [Author]
}
```
-This `Query` type defines two available queries: `getBooks` and `getAuthors`. Each query returns a list of the corresponding type.
+This `Query` type defines two fields: `books` and `authors`. Each field returns a list of the corresponding type.
With a REST-based API, books and authors would probably be returned by different endpoints (e.g., `/api/books` and `/api/authors`). The flexibility of GraphQL enables clients to query both resources with a single request.
@@ -98,12 +98,12 @@ When your clients build queries to execute against your data graph, those querie
Based on our example schema so far, a client could execute the following query, which requests both a list of all book titles _and_ a list of all author names:
```graphql
-query {
- getBooks {
+query GetBooksAndAuthors {
+ books {
title
}
- getAuthors {
+ authors {
name
}
}
@@ -114,13 +114,13 @@ Our server would then respond to the query with results that match the query's s
```json
{
"data": {
- "getBooks": [
+ "books": [
{
"title": "Jurassic Park"
},
...
],
- "getAuthors": [
+ "authors": [
{
"name": "Michael Crichton"
},
@@ -132,11 +132,11 @@ Our server would then respond to the query with results that match the query's s
Although it might be useful in some cases to fetch these two separate lists, a client would probably prefer to fetch a single list of books, where each book's author is included in the result.
-Because our schema's `Book` type has an `author` field of type `Author`, a client could structure their query like so:
+Because our schema's `Book` type has an `author` field of type `Author`, a client could instead structure their query like so:
```graphql
-query {
- getBooks {
+query GetBooks {
+ books {
title
author {
name
@@ -150,7 +150,7 @@ And once again, our server would respond with results that match the query's str
```json
{
"data": {
- "getBooks": [
+ "books": [
{
"title": "Jurassic Park",
"author": {
@@ -165,9 +165,9 @@ And once again, our server would respond with results that match the query's str
### The `Mutation` type
-The `Mutation` type is similar in structure and purpose to the [`Query` type](#the-query-type). Whereas the `Query` type defines your data graph's supported _read_ operations, the `Mutation` type defines supported _write_ operations.
+The `Mutation` type is similar in structure and purpose to the [`Query` type](#the-query-type). Whereas the `Query` type defines entry points for _read_ operations, the `Mutation` type defines entry points for _write_ operations.
-Each field of the `Mutation` type defines the signature and return type of a different mutation. The `Mutation` type for our example schema might resemble the following:
+Each field of the `Mutation` type defines the signature and return type of a different entry point. The `Mutation` type for our example schema might resemble the following:
```graphql
type Mutation {
@@ -182,7 +182,7 @@ This `Mutation` type defines a single available mutation, `addBook`. The mutatio
Like queries, mutations match the structure of your schema's type definitions. The following mutation creates a new `Book` and requests certain fields of the created object as a return value:
```graphql
-mutation {
+mutation CreateBook {
addBook(title: "Fox in Socks", author: "Dr. Seuss") {
title
author {
diff --git a/docs/source/schema/unions-interfaces.md b/docs/source/schema/unions-interfaces.md
index a3a94858de6..805cc0f5db8 100644
--- a/docs/source/schema/unions-interfaces.md
+++ b/docs/source/schema/unions-interfaces.md
@@ -61,7 +61,7 @@ server.listen().then(({ url }) => {
});
```
-A possible query for these result could appear as follows. This query demonstrates the need for the `__resolveType`, since it requests different data depending on the types,
+A possible query for these results could appear as follows. This query demonstrates the need for the `__resolveType`, since it requests different data depending on the types,
```graphql
{
diff --git a/docs/source/why-apollo-server.md b/docs/source/why-apollo-server.md
index 8b4ae82f5d8..e3ab574288b 100644
--- a/docs/source/why-apollo-server.md
+++ b/docs/source/why-apollo-server.md
@@ -40,7 +40,7 @@ server.listen().then(({ url }) => {
});
```
-In the example above, we are describing the shapes of our data, how they relate to each other, and how to fetch what our client needs from our data source. Apollo Server uses simple functions called [resolvers](/data/data/) to bring to life the schema described in SDL type definitions. When a request comes in to `/graphql`, Apollo Server will translate that request into what it takes to execute the query, will run the resolvers for you to load your data, and return the result in JSON so your app can render it out easily!
+In the example above, we are describing the shapes of our data, how they relate to each other, and how to fetch what our client needs from our data source. Apollo Server uses simple functions called [resolvers](/data/resolvers/) to bring to life the schema described in SDL type definitions. When a request comes in to `/graphql`, Apollo Server will translate that request into what it takes to execute the query, will run the resolvers for you to load your data, and return the result in JSON so your app can render it out easily!
Apollo Server takes care of every step of translating the query your client asks for into the data it needs. It is designed to give you maximum control over how you load the data while taking care of everything else for you! You don't need to worry about parsing the request, validating the query, delivering the response, or even profiling your app. Instead, all you have to do is describe the shape of your data and how to find it; Apollo Server does the rest! 💪
diff --git a/docs/static/_redirects b/docs/static/_redirects
index 4862a66cda3..48ff558fd49 100644
--- a/docs/static/_redirects
+++ b/docs/static/_redirects
@@ -1,5 +1,13 @@
/ /docs/apollo-server/
+# The v2 docs were beta for a while, and non-default, but now that they are
+# default, the v2 docs don't exist anymore. So redirect them to the default!
+/docs/apollo-server/v2 /docs/apollo-server/
+/docs/apollo-server/v2/* /docs/apollo-server/:splat
+
+/docs/apollo-server/data/data/ /docs/apollo-server/data/resolvers/
+
+/docs/apollo-server/federation/implementing/ /docs/apollo-server/federation/implementing-services/
/docs/apollo-server/federation/core-concepts/ /docs/apollo-server/federation/entities/
/docs/apollo-server/federation/advanced-features/ /docs/apollo-server/federation/entities/
/docs/apollo-server/federation/concerns/ /docs/apollo-server/federation/introduction/#separation-of-concerns
diff --git a/package-lock.json b/package-lock.json
index d67407fcd67..1cc26ea5803 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,14 +30,25 @@
"apollo-server-caching": "file:packages/apollo-server-caching",
"apollo-server-core": "file:packages/apollo-server-core",
"apollo-server-env": "file:packages/apollo-server-env",
+ "apollo-server-errors": "file:packages/apollo-server-errors",
"apollo-server-types": "file:packages/apollo-server-types",
"graphql-extensions": "file:packages/graphql-extensions",
"loglevel": "^1.6.1",
- "loglevel-debug": "^0.0.1",
- "make-fetch-happen": "^7.1.1",
- "pretty-format": "^24.7.0"
+ "make-fetch-happen": "^8.0.0",
+ "pretty-format": "^26.0.0"
},
"dependencies": {
+ "@jest/types": {
+ "version": "26.0.1",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.0.1.tgz",
+ "integrity": "sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==",
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^4.0.0"
+ }
+ },
"@types/node-fetch": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.4.tgz",
@@ -47,9 +58,12 @@
}
},
"agent-base": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
- "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
+ "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+ "requires": {
+ "debug": "4"
+ }
},
"agentkeepalive": {
"version": "4.1.0",
@@ -61,19 +75,31 @@
"humanize-ms": "^1.2.1"
}
},
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
"cacache": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-14.0.0.tgz",
- "integrity": "sha512-+Nr/BnA/tjAUXza9gH8F+FSP+1HvWqCKt4c95dQr4EDVJVafbzmPZpLKCkLYexs6vSd2B/1TOXrAoNnqVPfvRA==",
+ "version": "15.0.0",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz",
+ "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==",
"requires": {
"chownr": "^1.1.2",
- "figgy-pudding": "^3.5.1",
"fs-minipass": "^2.0.0",
"glob": "^7.1.4",
- "graceful-fs": "^4.2.2",
"infer-owner": "^1.0.4",
"lru-cache": "^5.1.1",
- "minipass": "^3.0.0",
+ "minipass": "^3.1.1",
"minipass-collect": "^1.0.2",
"minipass-flush": "^1.0.5",
"minipass-pipeline": "^1.2.2",
@@ -82,11 +108,59 @@
"p-map": "^3.0.0",
"promise-inflight": "^1.0.1",
"rimraf": "^2.7.1",
- "ssri": "^7.0.0",
- "tar": "^6.0.0",
+ "ssri": "^8.0.0",
+ "tar": "^6.0.1",
"unique-filename": "^1.1.1"
+ },
+ "dependencies": {
+ "minipass-collect": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ },
+ "minipass-flush": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ },
+ "minipass-pipeline": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
+ "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ }
+ }
+ },
+ "chalk": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+ "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
}
},
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -116,30 +190,36 @@
"path-is-absolute": "^1.0.0"
}
},
- "graceful-fs": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
- "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"http-proxy-agent": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-3.0.0.tgz",
- "integrity": "sha512-uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
"requires": {
- "agent-base": "5",
+ "@tootallnate/once": "1",
+ "agent-base": "6",
"debug": "4"
}
},
+ "indent-string": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
+ },
"make-fetch-happen": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-7.1.1.tgz",
- "integrity": "sha512-7fNjiOXNZhNGQzG5P15nU97aZQtzPU2GVgVd7pnqnl5gnpLzMAD8bAe5YG4iW2s0PTqaZy9xGv4Wfqe872kRNQ==",
+ "version": "8.0.4",
+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz",
+ "integrity": "sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==",
"requires": {
"agentkeepalive": "^4.1.0",
- "cacache": "^14.0.0",
- "http-cache-semantics": "^4.0.3",
- "http-proxy-agent": "^3.0.0",
- "https-proxy-agent": "^4.0.0",
+ "cacache": "^15.0.0",
+ "http-cache-semantics": "^4.0.4",
+ "http-proxy-agent": "^4.0.1",
+ "https-proxy-agent": "^5.0.0",
"is-lambda": "^1.0.1",
"lru-cache": "^5.1.1",
"minipass": "^3.0.0",
@@ -148,8 +228,75 @@
"minipass-flush": "^1.0.5",
"minipass-pipeline": "^1.2.2",
"promise-retry": "^1.1.1",
- "socks-proxy-agent": "^4.0.0",
- "ssri": "^7.0.1"
+ "socks-proxy-agent": "^5.0.0",
+ "ssri": "^8.0.0"
+ },
+ "dependencies": {
+ "http-cache-semantics": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+ "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+ },
+ "https-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+ "requires": {
+ "agent-base": "6",
+ "debug": "4"
+ }
+ },
+ "is-lambda": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+ "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
+ },
+ "minipass-collect": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ },
+ "minipass-fetch": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz",
+ "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
+ "requires": {
+ "encoding": "^0.1.12",
+ "minipass": "^3.1.0",
+ "minipass-pipeline": "^1.2.2",
+ "minipass-sized": "^1.0.3",
+ "minizlib": "^2.0.0"
+ }
+ },
+ "minipass-flush": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ },
+ "minipass-pipeline": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
+ "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+ "requires": {
+ "minipass": "^3.0.0"
+ }
+ },
+ "socks-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+ "requires": {
+ "agent-base": "6",
+ "debug": "4",
+ "socks": "^2.3.3"
+ }
+ }
}
},
"minipass": {
@@ -170,9 +317,9 @@
}
},
"mkdirp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
- "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
},
"ms": {
"version": "2.1.2",
@@ -185,8 +332,35 @@
"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
"requires": {
"aggregate-error": "^3.0.0"
+ },
+ "dependencies": {
+ "aggregate-error": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
+ "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+ "requires": {
+ "clean-stack": "^2.0.0",
+ "indent-string": "^4.0.0"
+ }
+ }
+ }
+ },
+ "pretty-format": {
+ "version": "26.0.1",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.0.1.tgz",
+ "integrity": "sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==",
+ "requires": {
+ "@jest/types": "^26.0.1",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+ },
"rimraf": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -196,14 +370,21 @@
}
},
"ssri": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
- "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
+ "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
"requires": {
- "figgy-pudding": "^3.5.1",
"minipass": "^3.1.1"
}
},
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
"tar": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz",
@@ -252,11 +433,51 @@
}
},
"@apollographql/apollo-tools": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.3.tgz",
- "integrity": "sha512-CtC1bmohB1owdGMT2ZZKacI94LcPAZDN2WvCe+4ZXT5d7xO5PHOAb70EP/LcFbvnS8QI+pkYRSCGFQnUcv9efg==",
+ "version": "0.4.8",
+ "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz",
+ "integrity": "sha512-W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA==",
"requires": {
- "apollo-env": "^0.6.1"
+ "apollo-env": "^0.6.5"
+ },
+ "dependencies": {
+ "@types/node-fetch": {
+ "version": "2.5.7",
+ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+ "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+ "requires": {
+ "@types/node": "*",
+ "form-data": "^3.0.0"
+ }
+ },
+ "apollo-env": {
+ "version": "0.6.5",
+ "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz",
+ "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==",
+ "requires": {
+ "@types/node-fetch": "2.5.7",
+ "core-js": "^3.0.1",
+ "node-fetch": "^2.2.0",
+ "sha.js": "^2.4.11"
+ }
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+ "form-data": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+ "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ }
}
},
"@apollographql/graphql-playground-html": {
@@ -264,11 +485,6 @@
"resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz",
"integrity": "sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ=="
},
- "@azure/functions": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@azure/functions/-/functions-1.2.0.tgz",
- "integrity": "sha512-qkaQqTnr56xUnYNkKBM/2wsnf6imAJ3NF6Nbpk691Y6JYliA1YdZngsZsrpHS9tQ9/71MqARl8m50+EmEfLG3g=="
- },
"@babel/code-frame": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
@@ -364,86 +580,270 @@
"@babel/types": "^7.0.0"
}
},
- "@babel/helper-plugin-utils": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
- "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
- "dev": true
- },
- "@babel/helper-split-export-declaration": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
- "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
+ "@babel/helper-member-expression-to-functions": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+ "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
"dev": true,
"requires": {
- "@babel/types": "^7.0.0"
+ "@babel/types": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
- "@babel/helpers": {
- "version": "7.3.1",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz",
- "integrity": "sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==",
+ "@babel/helper-module-imports": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+ "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
"dev": true,
"requires": {
- "@babel/template": "^7.1.2",
- "@babel/traverse": "^7.1.5",
- "@babel/types": "^7.3.0"
+ "@babel/types": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
- "@babel/highlight": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
- "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+ "@babel/helper-module-transforms": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+ "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
"dev": true,
"requires": {
- "chalk": "^2.0.0",
- "esutils": "^2.0.2",
- "js-tokens": "^4.0.0"
+ "@babel/helper-module-imports": "^7.8.3",
+ "@babel/helper-replace-supers": "^7.8.6",
+ "@babel/helper-simple-access": "^7.8.3",
+ "@babel/helper-split-export-declaration": "^7.8.3",
+ "@babel/template": "^7.8.6",
+ "@babel/types": "^7.9.0",
+ "lodash": "^4.17.13"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+ "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
- "@babel/parser": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.4.tgz",
- "integrity": "sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==",
- "dev": true
- },
- "@babel/plugin-syntax-object-rest-spread": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
- "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+ "@babel/helper-optimise-call-expression": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+ "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
"dev": true,
"requires": {
- "@babel/helper-plugin-utils": "^7.0.0"
+ "@babel/types": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
- "@babel/template": {
- "version": "7.2.2",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
- "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.2.2",
- "@babel/types": "^7.2.2"
- }
+ "@babel/helper-plugin-utils": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+ "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+ "dev": true
},
- "@babel/traverse": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.3.4.tgz",
- "integrity": "sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==",
+ "@babel/helper-replace-supers": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+ "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.3.4",
- "@babel/helper-function-name": "^7.1.0",
- "@babel/helper-split-export-declaration": "^7.0.0",
- "@babel/parser": "^7.3.4",
- "@babel/types": "^7.3.4",
- "debug": "^4.1.0",
- "globals": "^11.1.0",
- "lodash": "^4.17.11"
+ "@babel/helper-member-expression-to-functions": "^7.8.3",
+ "@babel/helper-optimise-call-expression": "^7.8.3",
+ "@babel/traverse": "^7.8.6",
+ "@babel/types": "^7.8.6"
},
"dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
+ "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.9.5",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+ "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "^7.8.3",
+ "@babel/template": "^7.8.3",
+ "@babel/types": "^7.9.5"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+ "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+ "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
+ "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/generator": "^7.9.5",
+ "@babel/helper-function-name": "^7.9.5",
+ "@babel/helper-split-export-declaration": "^7.8.3",
+ "@babel/parser": "^7.9.0",
+ "@babel/types": "^7.9.5",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -454,8 +854,315 @@
}
},
"ms": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
+ }
+ },
+ "@babel/helper-simple-access": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+ "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.8.3",
+ "@babel/types": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
+ "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.0.0"
+ }
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+ "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+ "dev": true
+ },
+ "@babel/helpers": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz",
+ "integrity": "sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.1.2",
+ "@babel/traverse": "^7.1.5",
+ "@babel/types": "^7.3.0"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+ "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+ "dev": true,
+ "requires": {
+ "chalk": "^2.0.0",
+ "esutils": "^2.0.2",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.4.tgz",
+ "integrity": "sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==",
+ "dev": true
+ },
+ "@babel/plugin-syntax-async-generators": {
+ "version": "7.8.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-bigint": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-class-properties": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz",
+ "integrity": "sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-json-strings": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-logical-assignment-operators": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz",
+ "integrity": "sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-nullish-coalescing-operator": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-numeric-separator": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
+ "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-optional-catch-binding": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/plugin-syntax-optional-chaining": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/template": {
+ "version": "7.2.2",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
+ "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "@babel/parser": "^7.2.2",
+ "@babel/types": "^7.2.2"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.3.4",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.3.4.tgz",
+ "integrity": "sha512-TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "@babel/generator": "^7.3.4",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.0.0",
+ "@babel/parser": "^7.3.4",
+ "@babel/types": "^7.3.4",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.11"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
}
@@ -472,6 +1179,12 @@
"to-fast-properties": "^2.0.0"
}
},
+ "@bcoe/v8-coverage": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+ "dev": true
+ },
"@cnakazawa/watch": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
@@ -595,9 +1308,9 @@
}
},
"safe-buffer": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
- "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true
},
"semver": {
@@ -608,190 +1321,205 @@
}
}
},
- "@jest/console": {
- "version": "24.7.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
- "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
- "dev": true,
- "requires": {
- "@jest/source-map": "^24.3.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
- }
- },
- "@jest/core": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
- "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
+ "@istanbuljs/load-nyc-config": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz",
+ "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==",
"dev": true,
"requires": {
- "@jest/console": "^24.7.1",
- "@jest/reporters": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "ansi-escapes": "^3.0.0",
- "chalk": "^2.0.1",
- "exit": "^0.1.2",
- "graceful-fs": "^4.1.15",
- "jest-changed-files": "^24.9.0",
- "jest-config": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-resolve-dependencies": "^24.9.0",
- "jest-runner": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "jest-watcher": "^24.9.0",
- "micromatch": "^3.1.10",
- "p-each-series": "^1.0.0",
- "realpath-native": "^1.1.0",
- "rimraf": "^2.5.4",
- "slash": "^2.0.0",
- "strip-ansi": "^5.0.0"
+ "camelcase": "^5.3.1",
+ "find-up": "^4.1.0",
+ "js-yaml": "^3.13.1",
+ "resolve-from": "^5.0.0"
},
"dependencies": {
- "@jest/environment": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
- "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
}
},
- "@jest/fake-timers": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
- "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "p-locate": "^4.1.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "p-limit": "^2.2.0"
}
},
- "@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+ "dev": true
+ }
+ }
+ },
+ "@istanbuljs/schema": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+ "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+ "dev": true
+ },
+ "@jest/console": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+ "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-message-util": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "slash": "^3.0.0"
+ },
+ "dependencies": {
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
- },
- "dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
- "dev": true,
- "requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
- }
- }
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/test-sequencer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
- "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-runner": "^24.9.0",
- "jest-runtime": "^24.9.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@jest/transform": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
- "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@babel/core": "^7.1.0",
- "@jest/types": "^24.9.0",
- "babel-plugin-istanbul": "^5.1.0",
- "chalk": "^2.0.1",
- "convert-source-map": "^1.4.0",
- "fast-json-stable-stringify": "^2.0.0",
- "graceful-fs": "^4.1.15",
- "jest-haste-map": "^24.9.0",
- "jest-regex-util": "^24.9.0",
- "jest-util": "^24.9.0",
- "micromatch": "^3.1.10",
- "pirates": "^4.0.1",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "source-map": "^0.6.1",
- "write-file-atomic": "2.4.1"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
- "dev": true
- }
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "color-name": "~1.1.4"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "has-flag": "^4.0.0"
}
- },
- "babel-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
- "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
- "dev": true,
- "requires": {
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/babel__core": "^7.1.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-preset-jest": "^24.9.0",
- "chalk": "^2.4.2",
- "slash": "^2.0.0"
+ }
+ }
+ },
+ "@jest/core": {
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz",
+ "integrity": "sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA==",
+ "dev": true,
+ "requires": {
+ "@jest/console": "^25.5.0",
+ "@jest/reporters": "^25.5.1",
+ "@jest/test-result": "^25.5.0",
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^3.0.0",
+ "exit": "^0.1.2",
+ "graceful-fs": "^4.2.4",
+ "jest-changed-files": "^25.5.0",
+ "jest-config": "^25.5.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-resolve-dependencies": "^25.5.4",
+ "jest-runner": "^25.5.4",
+ "jest-runtime": "^25.5.4",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "jest-watcher": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "p-each-series": "^2.1.0",
+ "realpath-native": "^2.0.0",
+ "rimraf": "^3.0.0",
+ "slash": "^3.0.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "dependencies": {
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
},
"dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -803,6 +1531,27 @@
"supports-color": "^5.3.0"
}
},
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -814,23 +1563,233 @@
}
}
},
+ "@babel/parser": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+ "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+ "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
+ }
+ },
+ "@jest/console": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+ "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-message-util": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "slash": "^3.0.0"
+ }
+ },
+ "@jest/environment": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
+ "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
+ "dev": true,
+ "requires": {
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0"
+ }
+ },
+ "@jest/fake-timers": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
+ "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "lolex": "^5.0.0"
+ }
+ },
+ "@jest/source-map": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz",
+ "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==",
+ "dev": true,
+ "requires": {
+ "callsites": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "source-map": "^0.6.0"
+ }
+ },
+ "@jest/test-result": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+ "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
+ "dev": true,
+ "requires": {
+ "@jest/console": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
+ }
+ },
+ "@jest/test-sequencer": {
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz",
+ "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==",
+ "dev": true,
+ "requires": {
+ "@jest/test-result": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-runner": "^25.5.4",
+ "jest-runtime": "^25.5.4"
+ }
+ },
+ "@jest/transform": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
+ "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
+ "dev": true,
+ "requires": {
+ "@babel/core": "^7.1.0",
+ "@jest/types": "^25.5.0",
+ "babel-plugin-istanbul": "^6.0.0",
+ "chalk": "^3.0.0",
+ "convert-source-map": "^1.4.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-regex-util": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "pirates": "^4.0.1",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
+ "source-map": "^0.6.1",
+ "write-file-atomic": "^3.0.0"
+ }
+ },
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
+ },
+ "ansi-escapes": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+ "dev": true,
+ "requires": {
+ "type-fest": "^0.11.0"
+ }
+ },
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "anymatch": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "dev": true,
+ "requires": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ }
+ },
+ "babel-jest": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz",
+ "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==",
+ "dev": true,
+ "requires": {
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/babel__core": "^7.1.7",
+ "babel-plugin-istanbul": "^6.0.0",
+ "babel-preset-jest": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "slash": "^3.0.0"
+ }
+ },
"babel-plugin-jest-hoist": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
- "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz",
+ "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==",
"dev": true,
"requires": {
+ "@babel/template": "^7.3.3",
+ "@babel/types": "^7.3.3",
"@types/babel__traverse": "^7.0.6"
}
},
"babel-preset-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
- "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz",
+ "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==",
+ "dev": true,
+ "requires": {
+ "babel-plugin-jest-hoist": "^25.5.0",
+ "babel-preset-current-node-syntax": "^0.1.2"
+ }
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^24.9.0"
+ "fill-range": "^7.0.1"
}
},
"callsites": {
@@ -839,508 +1798,639 @@
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
"dev": true
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
},
"cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"dev": true,
"requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
- },
- "dependencies": {
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- }
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true
+ },
+ "emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"dev": true
},
"expect": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
- "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+ "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-styles": "^3.2.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.9.0"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
- "dev": true
- }
+ "@jest/types": "^25.5.0",
+ "ansi-styles": "^4.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6"
}
},
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true
},
"jest-config": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
- "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz",
+ "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^24.9.0",
- "@jest/types": "^24.9.0",
- "babel-jest": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/test-sequencer": "^25.5.4",
+ "@jest/types": "^25.5.0",
+ "babel-jest": "^25.5.1",
+ "chalk": "^3.0.0",
+ "deepmerge": "^4.2.2",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^24.9.0",
- "jest-environment-node": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "micromatch": "^3.1.10",
- "pretty-format": "^24.9.0",
- "realpath-native": "^1.1.0"
+ "graceful-fs": "^4.2.4",
+ "jest-environment-jsdom": "^25.5.0",
+ "jest-environment-node": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-jasmine2": "^25.5.4",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "pretty-format": "^25.5.0",
+ "realpath-native": "^2.0.0"
}
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-each": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
- "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz",
+ "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0"
}
},
"jest-environment-jsdom": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
- "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz",
+ "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0",
- "jsdom": "^11.5.1"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jsdom": "^15.2.1"
}
},
"jest-environment-node": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
- "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz",
+ "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "semver": "^6.3.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-haste-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
- "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
+ "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "anymatch": "^2.0.0",
+ "@jest/types": "^25.5.0",
+ "@types/graceful-fs": "^4.1.2",
+ "anymatch": "^3.0.3",
"fb-watchman": "^2.0.0",
- "fsevents": "^1.2.7",
- "graceful-fs": "^4.1.15",
- "invariant": "^2.2.4",
- "jest-serializer": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.9.0",
- "micromatch": "^3.1.10",
+ "fsevents": "^2.1.2",
+ "graceful-fs": "^4.2.4",
+ "jest-serializer": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
+ "micromatch": "^4.0.2",
"sane": "^4.0.3",
- "walker": "^1.0.7"
+ "walker": "^1.0.7",
+ "which": "^2.0.2"
}
},
"jest-jasmine2": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
- "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz",
+ "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/environment": "^25.5.0",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"co": "^4.6.0",
- "expect": "^24.9.0",
+ "expect": "^25.5.0",
"is-generator-fn": "^2.0.0",
- "jest-each": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0",
- "throat": "^4.0.0"
+ "jest-each": "^25.5.0",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-runtime": "^25.5.4",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0",
+ "throat": "^5.0.0"
}
},
"jest-leak-detector": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
- "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz",
+ "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==",
"dev": true,
"requires": {
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-mock": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
- "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
+ "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0"
+ "@jest/types": "^25.5.0"
}
},
"jest-resolve": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
- "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+ "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"browser-resolve": "^1.11.3",
- "chalk": "^2.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "read-pkg-up": "^7.0.1",
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.17.0",
+ "slash": "^3.0.0"
}
},
"jest-runner": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
- "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz",
+ "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==",
"dev": true,
"requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.4.2",
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"exit": "^0.1.2",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-docblock": "^24.3.0",
- "jest-haste-map": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-leak-detector": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.6.0",
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-docblock": "^25.3.0",
+ "jest-haste-map": "^25.5.1",
+ "jest-jasmine2": "^25.5.4",
+ "jest-leak-detector": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "jest-runtime": "^25.5.4",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
"source-map-support": "^0.5.6",
- "throat": "^4.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "throat": "^5.0.0"
}
},
"jest-runtime": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
- "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
- "dev": true,
- "requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/source-map": "^24.3.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/yargs": "^13.0.0",
- "chalk": "^2.0.1",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
+ "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+ "dev": true,
+ "requires": {
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/globals": "^25.5.2",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0",
+ "collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
"glob": "^7.1.3",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "strip-bom": "^3.0.0",
- "yargs": "^13.3.0"
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
+ "strip-bom": "^4.0.0",
+ "yargs": "^15.3.1"
}
},
"jest-serializer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
- "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
- "dev": true
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
+ "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.2.4"
+ }
},
"jest-snapshot": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
- "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
+ "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "expect": "^24.9.0",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "mkdirp": "^0.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/prettier": "^1.19.0",
+ "chalk": "^3.0.0",
+ "expect": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "make-dir": "^3.0.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^24.9.0",
- "semver": "^6.2.0"
+ "pretty-format": "^25.5.0",
+ "semver": "^6.3.0"
}
},
"jest-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
- "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/source-map": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "callsites": "^3.0.0",
- "chalk": "^2.0.1",
- "graceful-fs": "^4.1.15",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"is-ci": "^2.0.0",
- "mkdirp": "^0.5.1",
- "slash": "^2.0.0",
- "source-map": "^0.6.0"
- },
- "dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
- "dev": true,
- "requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
- }
- }
+ "make-dir": "^3.0.0"
}
},
"jest-validate": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
- "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
+ "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"camelcase": "^5.3.1",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
"leven": "^3.1.0",
- "pretty-format": "^24.9.0"
+ "pretty-format": "^25.5.0"
}
},
"jest-worker": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
- "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+ "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
"dev": true,
"requires": {
"merge-stream": "^2.0.0",
- "supports-color": "^6.1.0"
+ "supports-color": "^7.0.0"
}
},
- "leven": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
- "dev": true
- },
- "merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
- "dev": true
- },
- "pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "p-locate": "^4.1.0"
}
},
- "require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
- "dev": true
- },
- "semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
- },
- "string-width": {
+ "make-dir": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
"requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "semver": "^6.0.0"
}
},
- "supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
+ "rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^5.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "type-fest": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+ "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+ "dev": true
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
}
},
"wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "write-file-atomic": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
+ "imurmurhash": "^0.1.4",
+ "is-typedarray": "^1.0.0",
+ "signal-exit": "^3.0.2",
+ "typedarray-to-buffer": "^3.1.5"
}
},
"yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "version": "15.3.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+ "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
"dev": true,
"requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
+ "string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "yargs-parser": "^18.1.1"
}
},
"yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -1350,911 +2440,1054 @@
}
},
"@jest/environment": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
- "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
+ "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
"@jest/fake-timers": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
- "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
+ "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "lolex": "^5.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
- "@jest/reporters": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
- "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
+ "@jest/globals": {
+ "version": "25.5.2",
+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-25.5.2.tgz",
+ "integrity": "sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "exit": "^0.1.2",
- "glob": "^7.1.2",
- "istanbul-lib-coverage": "^2.0.2",
- "istanbul-lib-instrument": "^3.0.1",
- "istanbul-lib-report": "^2.0.4",
- "istanbul-lib-source-maps": "^3.0.1",
- "istanbul-reports": "^2.2.6",
- "jest-haste-map": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.6.0",
- "node-notifier": "^5.4.2",
- "slash": "^2.0.0",
- "source-map": "^0.6.0",
- "string-length": "^2.0.0"
+ "@jest/environment": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "expect": "^25.5.0"
},
"dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "@jest/environment": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
+ "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0"
}
},
- "@jest/environment": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
- "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+ "@jest/fake-timers": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
+ "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "lolex": "^5.0.0"
}
},
- "@jest/fake-timers": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
- "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
+ "fill-range": "^7.0.1"
}
},
- "@jest/test-sequencer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
- "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-runner": "^24.9.0",
- "jest-runtime": "^24.9.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@jest/transform": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
- "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@babel/core": "^7.1.0",
- "@jest/types": "^24.9.0",
- "babel-plugin-istanbul": "^5.1.0",
- "chalk": "^2.0.1",
- "convert-source-map": "^1.4.0",
- "fast-json-stable-stringify": "^2.0.0",
- "graceful-fs": "^4.1.15",
- "jest-haste-map": "^24.9.0",
- "jest-regex-util": "^24.9.0",
- "jest-util": "^24.9.0",
- "micromatch": "^3.1.10",
- "pirates": "^4.0.1",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "source-map": "^0.6.1",
- "write-file-atomic": "2.4.1"
+ "color-name": "~1.1.4"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "expect": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+ "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@jest/types": "^25.5.0",
+ "ansi-styles": "^4.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "to-regex-range": "^5.0.1"
}
},
- "babel-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
- "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
- "dev": true,
- "requires": {
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/babel__core": "^7.1.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-preset-jest": "^24.9.0",
- "chalk": "^2.4.2",
- "slash": "^2.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "jest-diff": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+ "dev": true,
+ "requires": {
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
- "babel-plugin-jest-hoist": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
- "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
+ "jest-get-type": {
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+ "dev": true
+ },
+ "jest-matcher-utils": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "@types/babel__traverse": "^7.0.6"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
- "babel-preset-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
- "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
+ "jest-message-util": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^24.9.0"
+ "@babel/code-frame": "^7.0.0",
+ "@jest/types": "^25.5.0",
+ "@types/stack-utils": "^1.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
+ "stack-utils": "^1.0.1"
}
},
- "callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true
+ "jest-mock": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
+ "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0"
+ }
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
+ "jest-util": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "is-ci": "^2.0.0",
+ "make-dir": "^3.0.0"
+ }
},
- "cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
"requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
+ "semver": "^6.0.0"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
- "dev": true
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
},
- "expect": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
- "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+ "pretty-format": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-styles": "^3.2.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true
},
- "jest-config": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
- "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^24.9.0",
- "@jest/types": "^24.9.0",
- "babel-jest": "^24.9.0",
- "chalk": "^2.0.1",
- "glob": "^7.1.1",
- "jest-environment-jsdom": "^24.9.0",
- "jest-environment-node": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "micromatch": "^3.1.10",
- "pretty-format": "^24.9.0",
- "realpath-native": "^1.1.0"
+ "has-flag": "^4.0.0"
}
},
- "jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "is-number": "^7.0.0"
}
- },
- "jest-each": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
- "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
+ }
+ }
+ },
+ "@jest/reporters": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.5.1.tgz",
+ "integrity": "sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw==",
+ "dev": true,
+ "requires": {
+ "@bcoe/v8-coverage": "^0.2.3",
+ "@jest/console": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "collect-v8-coverage": "^1.0.0",
+ "exit": "^0.1.2",
+ "glob": "^7.1.2",
+ "graceful-fs": "^4.2.4",
+ "istanbul-lib-coverage": "^3.0.0",
+ "istanbul-lib-instrument": "^4.0.0",
+ "istanbul-lib-report": "^3.0.0",
+ "istanbul-lib-source-maps": "^4.0.0",
+ "istanbul-reports": "^3.0.2",
+ "jest-haste-map": "^25.5.1",
+ "jest-resolve": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
+ "node-notifier": "^6.0.0",
+ "slash": "^3.0.0",
+ "source-map": "^0.6.0",
+ "string-length": "^3.1.0",
+ "terminal-link": "^2.0.0",
+ "v8-to-istanbul": "^4.1.3"
+ },
+ "dependencies": {
+ "@jest/console": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+ "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-message-util": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "slash": "^3.0.0"
}
},
- "jest-environment-jsdom": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
- "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+ "@jest/test-result": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+ "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0",
- "jsdom": "^11.5.1"
+ "@jest/console": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
}
},
- "jest-environment-node": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
- "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
+ "@jest/transform": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
+ "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0"
+ "@babel/core": "^7.1.0",
+ "@jest/types": "^25.5.0",
+ "babel-plugin-istanbul": "^6.0.0",
+ "chalk": "^3.0.0",
+ "convert-source-map": "^1.4.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-regex-util": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "pirates": "^4.0.1",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
+ "source-map": "^0.6.1",
+ "write-file-atomic": "^3.0.0"
}
},
- "jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
- "dev": true
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
},
- "jest-haste-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
- "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "anymatch": "^2.0.0",
- "fb-watchman": "^2.0.0",
- "fsevents": "^1.2.7",
- "graceful-fs": "^4.1.15",
- "invariant": "^2.2.4",
- "jest-serializer": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.9.0",
- "micromatch": "^3.1.10",
- "sane": "^4.0.3",
- "walker": "^1.0.7"
- },
- "dependencies": {
- "jest-worker": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
- "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
- "dev": true,
- "requires": {
- "merge-stream": "^2.0.0",
- "supports-color": "^6.1.0"
- }
- }
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "jest-jasmine2": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
- "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+ "anymatch": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
"dev": true,
"requires": {
- "@babel/traverse": "^7.1.0",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "co": "^4.6.0",
- "expect": "^24.9.0",
- "is-generator-fn": "^2.0.0",
- "jest-each": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0",
- "throat": "^4.0.0"
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
}
},
- "jest-leak-detector": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
- "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "fill-range": "^7.0.1"
}
},
- "jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
- "stack-utils": "^1.0.1"
+ "color-name": "~1.1.4"
}
},
- "jest-mock": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
- "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0"
+ "to-regex-range": "^5.0.1"
}
},
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"dev": true
},
- "jest-resolve": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
- "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "jest-haste-map": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
+ "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "browser-resolve": "^1.11.3",
- "chalk": "^2.0.1",
- "jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "@jest/types": "^25.5.0",
+ "@types/graceful-fs": "^4.1.2",
+ "anymatch": "^3.0.3",
+ "fb-watchman": "^2.0.0",
+ "fsevents": "^2.1.2",
+ "graceful-fs": "^4.2.4",
+ "jest-serializer": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "sane": "^4.0.3",
+ "walker": "^1.0.7",
+ "which": "^2.0.2"
}
},
- "jest-runner": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
- "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+ "jest-message-util": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.4.2",
- "exit": "^0.1.2",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-docblock": "^24.3.0",
- "jest-haste-map": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-leak-detector": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.6.0",
- "source-map-support": "^0.5.6",
- "throat": "^4.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "@babel/code-frame": "^7.0.0",
+ "@jest/types": "^25.5.0",
+ "@types/stack-utils": "^1.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
+ "stack-utils": "^1.0.1"
}
},
- "jest-runtime": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
- "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
- "dev": true,
- "requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/source-map": "^24.3.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/yargs": "^13.0.0",
- "chalk": "^2.0.1",
- "exit": "^0.1.2",
- "glob": "^7.1.3",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "strip-bom": "^3.0.0",
- "yargs": "^13.3.0"
+ "jest-resolve": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+ "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "browser-resolve": "^1.11.3",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "jest-pnp-resolver": "^1.2.1",
+ "read-pkg-up": "^7.0.1",
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.17.0",
+ "slash": "^3.0.0"
}
},
"jest-serializer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
- "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
- "dev": true
- },
- "jest-snapshot": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
- "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
+ "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
"dev": true,
"requires": {
- "@babel/types": "^7.0.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "expect": "^24.9.0",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "mkdirp": "^0.5.1",
- "natural-compare": "^1.4.0",
- "pretty-format": "^24.9.0",
- "semver": "^6.2.0"
+ "graceful-fs": "^4.2.4"
}
},
"jest-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
- "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/source-map": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "callsites": "^3.0.0",
- "chalk": "^2.0.1",
- "graceful-fs": "^4.1.15",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"is-ci": "^2.0.0",
- "mkdirp": "^0.5.1",
- "slash": "^2.0.0",
- "source-map": "^0.6.0"
+ "make-dir": "^3.0.0"
}
},
- "jest-validate": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
- "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
+ "jest-worker": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+ "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "camelcase": "^5.3.1",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
- "leven": "^3.1.0",
- "pretty-format": "^24.9.0"
+ "merge-stream": "^2.0.0",
+ "supports-color": "^7.0.0"
}
},
- "leven": {
+ "make-dir": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
- "dev": true
- },
- "merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
- "dev": true
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
},
- "pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
}
},
- "require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true
},
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
- "requires": {
- "ansi-regex": "^4.1.0"
- }
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
},
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
}
},
- "wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
+ "is-number": "^7.0.0"
}
},
- "yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
- "require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "isexe": "^2.0.0"
}
},
- "yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "write-file-atomic": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
"dev": true,
"requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
+ "imurmurhash": "^0.1.4",
+ "is-typedarray": "^1.0.0",
+ "signal-exit": "^3.0.2",
+ "typedarray-to-buffer": "^3.1.5"
}
}
}
},
"@jest/source-map": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
- "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz",
+ "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==",
"dev": true,
"requires": {
"callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
+ "graceful-fs": "^4.2.4",
"source-map": "^0.6.0"
},
"dependencies": {
"callsites": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
- "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"dev": true
}
}
},
"@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+ "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
+ "@jest/console": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
},
"dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "color-name": "~1.1.4"
}
},
- "callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
}
}
},
"@jest/test-sequencer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
- "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz",
+ "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-runner": "^24.9.0",
- "jest-runtime": "^24.9.0"
+ "@jest/test-result": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-runner": "^25.5.4",
+ "jest-runtime": "^25.5.4"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ }
}
},
"@jest/transform": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
- "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
+ "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/types": "^24.9.0",
- "babel-plugin-istanbul": "^5.1.0",
- "chalk": "^2.0.1",
+ "@jest/types": "^25.5.0",
+ "babel-plugin-istanbul": "^6.0.0",
+ "chalk": "^3.0.0",
"convert-source-map": "^1.4.0",
"fast-json-stable-stringify": "^2.0.0",
- "graceful-fs": "^4.1.15",
- "jest-haste-map": "^24.9.0",
- "jest-regex-util": "^24.9.0",
- "jest-util": "^24.9.0",
- "micromatch": "^3.1.10",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-regex-util": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "micromatch": "^4.0.2",
"pirates": "^4.0.1",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
"source-map": "^0.6.1",
- "write-file-atomic": "2.4.1"
+ "write-file-atomic": "^3.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
}
},
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
"dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "write-file-atomic": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+ "dev": true,
+ "requires": {
+ "imurmurhash": "^0.1.4",
+ "is-typedarray": "^1.0.0",
+ "signal-exit": "^3.0.2",
+ "typedarray-to-buffer": "^3.1.5"
+ }
}
}
},
@@ -2262,6 +3495,7 @@
"version": "24.9.0",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
"integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
@@ -2272,6 +3506,7 @@
"version": "13.0.2",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
"integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "dev": true,
"requires": {
"@types/yargs-parser": "*"
}
@@ -2287,14 +3522,14 @@
}
},
"@lerna/add": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz",
- "integrity": "sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/add/-/add-3.21.0.tgz",
+ "integrity": "sha512-vhUXXF6SpufBE1EkNEXwz1VLW03f177G9uMOFMQkp6OJ30/PWg4Ekifuz9/3YfgB2/GH8Tu4Lk3O51P2Hskg/A==",
"dev": true,
"requires": {
"@evocateur/pacote": "^9.6.3",
- "@lerna/bootstrap": "3.20.0",
- "@lerna/command": "3.18.5",
+ "@lerna/bootstrap": "3.21.0",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/npm-conf": "3.16.0",
"@lerna/validation-error": "3.13.0",
@@ -2313,12 +3548,12 @@
}
},
"@lerna/bootstrap": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz",
- "integrity": "sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.21.0.tgz",
+ "integrity": "sha512-mtNHlXpmvJn6JTu0KcuTTPl2jLsDNud0QacV/h++qsaKbhAaJr/FElNZ5s7MwZFUM3XaDmvWzHKaszeBMHIbBw==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/has-npm-version": "3.16.5",
"@lerna/npm-install": "3.16.5",
@@ -2352,13 +3587,13 @@
}
},
"@lerna/changed": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz",
- "integrity": "sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.21.0.tgz",
+ "integrity": "sha512-hzqoyf8MSHVjZp0gfJ7G8jaz+++mgXYiNs9iViQGA8JlN/dnWLI5sWDptEH3/B30Izo+fdVz0S0s7ydVE3pWIw==",
"dev": true,
"requires": {
"@lerna/collect-updates": "3.20.0",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/listable": "3.18.5",
"@lerna/output": "3.13.0"
}
@@ -2386,12 +3621,12 @@
}
},
"@lerna/clean": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.20.0.tgz",
- "integrity": "sha512-9ZdYrrjQvR5wNXmHfDsfjWjp0foOkCwKe3hrckTzkAeQA1ibyz5llGwz5e1AeFrV12e2/OLajVqYfe+qdkZUgg==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/clean/-/clean-3.21.0.tgz",
+ "integrity": "sha512-b/L9l+MDgE/7oGbrav6rG8RTQvRiZLO1zTcG17zgJAAuhlsPxJExMlh2DFwJEVi2les70vMhHfST3Ue1IMMjpg==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/prompt": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
@@ -2439,14 +3674,14 @@
}
},
"@lerna/command": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz",
- "integrity": "sha512-36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/command/-/command-3.21.0.tgz",
+ "integrity": "sha512-T2bu6R8R3KkH5YoCKdutKv123iUgUbW8efVjdGCDnCMthAQzoentOJfDeodBwn0P2OqCl3ohsiNVtSn9h78fyQ==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
"@lerna/package-graph": "3.18.5",
- "@lerna/project": "3.18.0",
+ "@lerna/project": "3.21.0",
"@lerna/validation-error": "3.13.0",
"@lerna/write-log-file": "3.13.0",
"clone-deep": "^4.0.1",
@@ -2457,9 +3692,9 @@
}
},
"@lerna/conventional-commits": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz",
- "integrity": "sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.22.0.tgz",
+ "integrity": "sha512-z4ZZk1e8Mhz7+IS8NxHr64wyklHctCJyWpJKEZZPJiLFJ8yKto/x38O80R10pIzC0rr8Sy/OsjSH4bl0TbbgqA==",
"dev": true,
"requires": {
"@lerna/validation-error": "3.13.0",
@@ -2475,12 +3710,6 @@
"semver": "^6.2.0"
},
"dependencies": {
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -2490,14 +3719,14 @@
}
},
"@lerna/create": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz",
- "integrity": "sha512-cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/create/-/create-3.22.0.tgz",
+ "integrity": "sha512-MdiQQzCcB4E9fBF1TyMOaAEz9lUjIHp1Ju9H7f3lXze5JK6Fl5NYkouAvsLgY6YSIhXMY8AHW2zzXeBDY4yWkw==",
"dev": true,
"requires": {
"@evocateur/pacote": "^9.6.3",
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/npm-conf": "3.16.0",
"@lerna/validation-error": "3.13.0",
"camelcase": "^5.0.0",
@@ -2515,28 +3744,11 @@
"whatwg-url": "^7.0.0"
},
"dependencies": {
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
- },
- "whatwg-url": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
- "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
- "dev": true,
- "requires": {
- "lodash.sortby": "^4.7.0",
- "tr46": "^1.0.1",
- "webidl-conversions": "^4.0.2"
- }
}
}
},
@@ -2562,25 +3774,25 @@
}
},
"@lerna/diff": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz",
- "integrity": "sha512-u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/diff/-/diff-3.21.0.tgz",
+ "integrity": "sha512-5viTR33QV3S7O+bjruo1SaR40m7F2aUHJaDAC7fL9Ca6xji+aw1KFkpCtVlISS0G8vikUREGMJh+c/VMSc8Usw==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/validation-error": "3.13.0",
"npmlog": "^4.1.2"
}
},
"@lerna/exec": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.20.0.tgz",
- "integrity": "sha512-pS1mmC7kzV668rHLWuv31ClngqeXjeHC8kJuM+W2D6IpUVMGQHLcCTYLudFgQsuKGVpl0DGNYG+sjLhAPiiu6A==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/exec/-/exec-3.21.0.tgz",
+ "integrity": "sha512-iLvDBrIE6rpdd4GIKTY9mkXyhwsJ2RvQdB9ZU+/NhR3okXfqKc6py/24tV111jqpXTtZUW6HNydT4dMao2hi1Q==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/profiler": "3.20.0",
"@lerna/run-topologically": "3.18.5",
@@ -2633,13 +3845,13 @@
}
},
"@lerna/github-client": {
- "version": "3.16.5",
- "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.5.tgz",
- "integrity": "sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.22.0.tgz",
+ "integrity": "sha512-O/GwPW+Gzr3Eb5bk+nTzTJ3uv+jh5jGho9BOqKlajXaOkMYGBELEAqV5+uARNGWZFvYAiF4PgqHb6aCUu7XdXg==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@octokit/plugin-enterprise-rest": "^3.6.1",
+ "@octokit/plugin-enterprise-rest": "^6.0.1",
"@octokit/rest": "^16.28.4",
"git-url-parse": "^11.1.2",
"npmlog": "^4.1.2"
@@ -2661,17 +3873,6 @@
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
"dev": true
- },
- "whatwg-url": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
- "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
- "dev": true,
- "requires": {
- "lodash.sortby": "^4.7.0",
- "tr46": "^1.0.1",
- "webidl-conversions": "^4.0.2"
- }
}
}
},
@@ -2700,13 +3901,13 @@
}
},
"@lerna/import": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz",
- "integrity": "sha512-PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/import/-/import-3.22.0.tgz",
+ "integrity": "sha512-uWOlexasM5XR6tXi4YehODtH9Y3OZrFht3mGUFFT3OIl2s+V85xIGFfqFGMTipMPAGb2oF1UBLL48kR43hRsOg==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/prompt": "3.18.5",
"@lerna/pulse-till-done": "3.13.0",
"@lerna/validation-error": "3.13.0",
@@ -2716,36 +3917,36 @@
}
},
"@lerna/info": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/info/-/info-3.20.0.tgz",
- "integrity": "sha512-Rsz+KQF9mczbGUbPTrtOed1N0C+cA08Qz0eX/oI+NNjvsryZIju/o7uedG4I3P55MBiAioNrJI88fHH3eTgYug==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/info/-/info-3.21.0.tgz",
+ "integrity": "sha512-0XDqGYVBgWxUquFaIptW2bYSIu6jOs1BtkvRTWDDhw4zyEdp6q4eaMvqdSap1CG+7wM5jeLCi6z94wS0AuiuwA==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/output": "3.13.0",
"envinfo": "^7.3.1"
}
},
"@lerna/init": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz",
- "integrity": "sha512-oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/init/-/init-3.21.0.tgz",
+ "integrity": "sha512-6CM0z+EFUkFfurwdJCR+LQQF6MqHbYDCBPyhu/d086LRf58GtYZYj49J8mKG9ktayp/TOIxL/pKKjgLD8QBPOg==",
"dev": true,
"requires": {
"@lerna/child-process": "3.16.5",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"fs-extra": "^8.1.0",
"p-map": "^2.1.0",
"write-json-file": "^3.2.0"
}
},
"@lerna/link": {
- "version": "3.18.5",
- "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz",
- "integrity": "sha512-xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/link/-/link-3.21.0.tgz",
+ "integrity": "sha512-tGu9GxrX7Ivs+Wl3w1+jrLi1nQ36kNI32dcOssij6bg0oZ2M2MDEFI9UF2gmoypTaN9uO5TSsjCFS7aR79HbdQ==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/package-graph": "3.18.5",
"@lerna/symlink-dependencies": "3.17.0",
"p-map": "^2.1.0",
@@ -2753,12 +3954,12 @@
}
},
"@lerna/list": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.20.0.tgz",
- "integrity": "sha512-fXTicPrfioVnRzknyPawmYIVkzDRBaQqk9spejS1S3O1DOidkihK0xxNkr8HCVC0L22w6f92g83qWDp2BYRUbg==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/list/-/list-3.21.0.tgz",
+ "integrity": "sha512-KehRjE83B1VaAbRRkRy6jLX1Cin8ltsrQ7FHf2bhwhRHK0S54YuA6LOoBnY/NtA8bHDX/Z+G5sMY78X30NS9tg==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/listable": "3.18.5",
"@lerna/output": "3.13.0"
@@ -2795,14 +3996,6 @@
"requires": {
"config-chain": "^1.1.11",
"pify": "^4.0.1"
- },
- "dependencies": {
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- }
}
},
"@lerna/npm-dist-tag": {
@@ -2848,14 +4041,6 @@
"npmlog": "^4.1.2",
"pify": "^4.0.1",
"read-package-json": "^2.0.13"
- },
- "dependencies": {
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- }
}
},
"@lerna/npm-run-script": {
@@ -2913,27 +4098,6 @@
"load-json-file": "^5.3.0",
"npm-package-arg": "^6.1.0",
"write-pkg": "^3.1.0"
- },
- "dependencies": {
- "load-json-file": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
- "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.15",
- "parse-json": "^4.0.0",
- "pify": "^4.0.1",
- "strip-bom": "^3.0.0",
- "type-fest": "^0.3.0"
- }
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- }
}
},
"@lerna/package-graph": {
@@ -2987,9 +4151,9 @@
}
},
"@lerna/project": {
- "version": "3.18.0",
- "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.18.0.tgz",
- "integrity": "sha512-+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/project/-/project-3.21.0.tgz",
+ "integrity": "sha512-xT1mrpET2BF11CY32uypV2GPtPVm6Hgtha7D81GQP9iAitk9EccrdNjYGt5UBYASl4CIDXBRxwmTTVGfrCx82A==",
"dev": true,
"requires": {
"@lerna/package": "3.16.0",
@@ -3004,33 +4168,6 @@
"p-map": "^2.1.0",
"resolve-from": "^4.0.0",
"write-json-file": "^3.2.0"
- },
- "dependencies": {
- "load-json-file": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
- "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.15",
- "parse-json": "^4.0.0",
- "pify": "^4.0.1",
- "strip-bom": "^3.0.0",
- "type-fest": "^0.3.0"
- }
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
- "resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true
- }
}
},
"@lerna/prompt": {
@@ -3044,9 +4181,9 @@
}
},
"@lerna/publish": {
- "version": "3.20.2",
- "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.20.2.tgz",
- "integrity": "sha512-N7Y6PdhJ+tYQPdI1tZum8W25cDlTp4D6brvRacKZusweWexxaopbV8RprBaKexkEX/KIbncuADq7qjDBdQHzaA==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.22.0.tgz",
+ "integrity": "sha512-8LBeTLBN8NIrCrLGykRu+PKrfrCC16sGCVY0/bzq9TDioR7g6+cY0ZAw653Qt/0Kr7rg3J7XxVNdzj3fvevlwA==",
"dev": true,
"requires": {
"@evocateur/libnpmaccess": "^3.1.2",
@@ -3055,7 +4192,7 @@
"@lerna/check-working-tree": "3.16.5",
"@lerna/child-process": "3.16.5",
"@lerna/collect-updates": "3.20.0",
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/describe-ref": "3.16.5",
"@lerna/log-packed": "3.16.0",
"@lerna/npm-conf": "3.16.0",
@@ -3070,7 +4207,7 @@
"@lerna/run-lifecycle": "3.16.2",
"@lerna/run-topologically": "3.18.5",
"@lerna/validation-error": "3.13.0",
- "@lerna/version": "3.20.2",
+ "@lerna/version": "3.22.0",
"figgy-pudding": "^3.5.1",
"fs-extra": "^8.1.0",
"npm-package-arg": "^6.1.0",
@@ -3132,12 +4269,12 @@
}
},
"@lerna/run": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.20.0.tgz",
- "integrity": "sha512-9U3AqeaCeB7KsGS9oyKNp62s9vYoULg/B4cqXTKZkc+OKL6QOEjYHYVSBcMK9lUXrMjCjDIuDSX3PnTCPxQ2Dw==",
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/@lerna/run/-/run-3.21.0.tgz",
+ "integrity": "sha512-fJF68rT3veh+hkToFsBmUJ9MHc9yGXA7LSDvhziAojzOb0AI/jBDp6cEcDQyJ7dbnplba2Lj02IH61QUf9oW0Q==",
"dev": true,
"requires": {
- "@lerna/command": "3.18.5",
+ "@lerna/command": "3.21.0",
"@lerna/filter-options": "3.20.0",
"@lerna/npm-run-script": "3.16.5",
"@lerna/output": "3.13.0",
@@ -3214,17 +4351,17 @@
}
},
"@lerna/version": {
- "version": "3.20.2",
- "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.20.2.tgz",
- "integrity": "sha512-ckBJMaBWc+xJen0cMyCE7W67QXLLrc0ELvigPIn8p609qkfNM0L0CF803MKxjVOldJAjw84b8ucNWZLvJagP/Q==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.22.0.tgz",
+ "integrity": "sha512-6uhL6RL7/FeW6u1INEgyKjd5dwO8+IsbLfkfC682QuoVLS7VG6OOB+JmTpCvnuyYWI6fqGh1bRk9ww8kPsj+EA==",
"dev": true,
"requires": {
"@lerna/check-working-tree": "3.16.5",
"@lerna/child-process": "3.16.5",
"@lerna/collect-updates": "3.20.0",
- "@lerna/command": "3.18.5",
- "@lerna/conventional-commits": "3.18.5",
- "@lerna/github-client": "3.16.5",
+ "@lerna/command": "3.21.0",
+ "@lerna/conventional-commits": "3.22.0",
+ "@lerna/github-client": "3.22.0",
"@lerna/gitlab-client": "3.15.0",
"@lerna/output": "3.13.0",
"@lerna/prerelease-id-from-version": "3.16.0",
@@ -3247,25 +4384,6 @@
"write-json-file": "^3.2.0"
},
"dependencies": {
- "load-json-file": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
- "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.15",
- "parse-json": "^4.0.0",
- "pify": "^4.0.1",
- "strip-bom": "^3.0.0",
- "type-fest": "^0.3.0"
- }
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3300,17 +4418,35 @@
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
"dev": true
},
+ "@octokit/auth-token": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz",
+ "integrity": "sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==",
+ "dev": true,
+ "requires": {
+ "@octokit/types": "^4.0.1"
+ }
+ },
"@octokit/endpoint": {
- "version": "5.5.1",
- "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.1.tgz",
- "integrity": "sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz",
+ "integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==",
"dev": true,
"requires": {
- "@octokit/types": "^2.0.0",
+ "@octokit/types": "^2.11.1",
"is-plain-object": "^3.0.0",
- "universal-user-agent": "^4.0.0"
+ "universal-user-agent": "^5.0.0"
},
"dependencies": {
+ "@octokit/types": {
+ "version": "2.16.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+ "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ },
"is-plain-object": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
@@ -3325,31 +4461,118 @@
"resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
"integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
"dev": true
+ },
+ "universal-user-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
+ "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
+ "dev": true,
+ "requires": {
+ "os-name": "^3.1.0"
+ }
}
}
},
"@octokit/plugin-enterprise-rest": {
- "version": "3.6.2",
- "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz",
- "integrity": "sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
+ "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==",
+ "dev": true
+ },
+ "@octokit/plugin-paginate-rest": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz",
+ "integrity": "sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==",
+ "dev": true,
+ "requires": {
+ "@octokit/types": "^2.0.1"
+ },
+ "dependencies": {
+ "@octokit/types": {
+ "version": "2.16.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+ "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ }
+ }
+ },
+ "@octokit/plugin-request-log": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz",
+ "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==",
"dev": true
},
+ "@octokit/plugin-rest-endpoint-methods": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz",
+ "integrity": "sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==",
+ "dev": true,
+ "requires": {
+ "@octokit/types": "^2.0.1",
+ "deprecation": "^2.3.1"
+ },
+ "dependencies": {
+ "@octokit/types": {
+ "version": "2.16.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+ "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ }
+ }
+ },
"@octokit/request": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz",
- "integrity": "sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==",
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.3.tgz",
+ "integrity": "sha512-RtqMzF3mhqxmWoqVD84x2gdtbqn2inTBU/HPkWf5u0R5r7fBTaLPAcCBgukeI2gjTwD9ChL9Cu0MlTBs7B/tSw==",
"dev": true,
"requires": {
- "@octokit/endpoint": "^5.5.0",
- "@octokit/request-error": "^1.0.1",
- "@octokit/types": "^2.0.0",
+ "@octokit/endpoint": "^6.0.1",
+ "@octokit/request-error": "^2.0.0",
+ "@octokit/types": "^2.11.1",
"deprecation": "^2.0.0",
"is-plain-object": "^3.0.0",
"node-fetch": "^2.3.0",
"once": "^1.4.0",
- "universal-user-agent": "^4.0.0"
+ "universal-user-agent": "^5.0.0"
},
"dependencies": {
+ "@octokit/request-error": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz",
+ "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==",
+ "dev": true,
+ "requires": {
+ "@octokit/types": "^4.0.1",
+ "deprecation": "^2.0.0",
+ "once": "^1.4.0"
+ },
+ "dependencies": {
+ "@octokit/types": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.1.tgz",
+ "integrity": "sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ }
+ }
+ },
+ "@octokit/types": {
+ "version": "2.16.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+ "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ },
"is-plain-object": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz",
@@ -3364,26 +4587,50 @@
"resolved": "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz",
"integrity": "sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==",
"dev": true
+ },
+ "universal-user-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
+ "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
+ "dev": true,
+ "requires": {
+ "os-name": "^3.1.0"
+ }
}
}
},
"@octokit/request-error": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz",
- "integrity": "sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz",
+ "integrity": "sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==",
"dev": true,
"requires": {
"@octokit/types": "^2.0.0",
"deprecation": "^2.0.0",
"once": "^1.4.0"
+ },
+ "dependencies": {
+ "@octokit/types": {
+ "version": "2.16.2",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz",
+ "integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node": ">= 8"
+ }
+ }
}
},
"@octokit/rest": {
- "version": "16.36.0",
- "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.36.0.tgz",
- "integrity": "sha512-zoZj7Ya4vWBK4fjTwK2Cnmu7XBB1p9ygSvTk2TthN6DVJXM4hQZQoAiknWFLJWSTix4dnA3vuHtjPZbExYoCZA==",
+ "version": "16.43.1",
+ "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz",
+ "integrity": "sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==",
"dev": true,
"requires": {
+ "@octokit/auth-token": "^2.4.0",
+ "@octokit/plugin-paginate-rest": "^1.1.1",
+ "@octokit/plugin-request-log": "^1.0.0",
+ "@octokit/plugin-rest-endpoint-methods": "2.4.0",
"@octokit/request": "^5.2.0",
"@octokit/request-error": "^1.0.2",
"atob-lite": "^2.0.0",
@@ -3399,9 +4646,9 @@
}
},
"@octokit/types": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.0.2.tgz",
- "integrity": "sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.1.tgz",
+ "integrity": "sha512-Ho6h7w2h9y8RRE8r656hIj1oiSbwbIHJGF5r9G5FOwS2VdDPq8QLGvsG4x6pKHpvyGK7j+43sAc2cJKMiFoIJw==",
"dev": true,
"requires": {
"@types/node": ">= 8"
@@ -3461,6 +4708,20 @@
"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
"integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
},
+ "@sinonjs/commons": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.2.tgz",
+ "integrity": "sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==",
+ "dev": true,
+ "requires": {
+ "type-detect": "4.0.8"
+ }
+ },
+ "@tootallnate/once": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+ },
"@types/accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
@@ -3477,23 +4738,23 @@
}
},
"@types/async-retry": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/@types/async-retry/-/async-retry-1.4.1.tgz",
- "integrity": "sha512-hDI5Ttk9SUmDLcD/Yl2VuWQRGYZjJ7aaJFeRlomUOz/iTKSE7yA55SwY87QwjiZgwhMlVAKoT1rl08UyQoheag==",
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/@types/async-retry/-/async-retry-1.4.2.tgz",
+ "integrity": "sha512-GUDuJURF0YiJZ+CBjNQA0+vbP/VHlJbB0sFqkzsV7EcOPRfurVonXpXKAt3w8qIjM1TEzpz6hc6POocPvHOS3w==",
"dev": true,
"requires": {
"@types/retry": "*"
}
},
"@types/aws-lambda": {
- "version": "8.10.45",
- "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.45.tgz",
- "integrity": "sha512-qoELSb2Pt2QRpC/9Egw7BlQMQM+3SUAsTr8Z6FoSVR86ffX3qU5pPVgtM6BTfWcIWfTaKZta0ARlYAOHE1tauA=="
+ "version": "8.10.51",
+ "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.51.tgz",
+ "integrity": "sha512-XK7RerpXj4r+IO0r7qIeNqUSU6L4qhPMwNhISxozJJiUX/jdXj9WYzTShRVisEcUQHXgJ4TTBqTArM8f9Mjb8g=="
},
"@types/babel__core": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.0.tgz",
- "integrity": "sha512-wJTeJRt7BToFx3USrCDs2BhEi4ijBInTQjOIukj6a/5tEkwpFMVZ+1ppgmE+Q/FQyc5P/VWUbx7I9NELrKruHA==",
+ "version": "7.1.7",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz",
+ "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==",
"dev": true,
"requires": {
"@babel/parser": "^7.1.0",
@@ -3532,9 +4793,9 @@
}
},
"@types/bluebird": {
- "version": "3.5.29",
- "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.29.tgz",
- "integrity": "sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==",
+ "version": "3.5.30",
+ "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz",
+ "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==",
"dev": true
},
"@types/body-parser": {
@@ -3552,6 +4813,15 @@
"integrity": "sha512-PH7bfkt1nu4pnlxz+Ws+wwJJF1HE12W3ia+Iace2JT7q56DLH3hbyjOJyNHJYRxk3PkKaC36fHfHKyeG1rMgCA==",
"dev": true
},
+ "@types/bunyan": {
+ "version": "1.8.6",
+ "resolved": "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz",
+ "integrity": "sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@types/caseless": {
"version": "0.12.2",
"resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
@@ -3564,6 +4834,11 @@
"integrity": "sha512-qS0VHlL6eBUUoUeBnI/ASCffoniS62zdV6IUtLSIjGKmRhZNawotaOMsTYivZOTZVktfe9koAJkD9XFac7tEEg==",
"dev": true
},
+ "@types/color-name": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+ },
"@types/connect": {
"version": "3.4.33",
"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz",
@@ -3572,6 +4847,12 @@
"@types/node": "*"
}
},
+ "@types/cookiejar": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz",
+ "integrity": "sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==",
+ "dev": true
+ },
"@types/cookies": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.1.tgz",
@@ -3648,6 +4929,15 @@
"@types/node": "*"
}
},
+ "@types/graceful-fs": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
+ "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@types/graphql-upload": {
"version": "8.0.3",
"resolved": "https://registry.npmjs.org/@types/graphql-upload/-/graphql-upload-8.0.3.tgz",
@@ -3660,9 +4950,9 @@
}
},
"@types/hapi": {
- "version": "17.8.7",
- "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-17.8.7.tgz",
- "integrity": "sha512-RUdcYgJc8hJyupMiZo5ooOd+mLLVzCsSIx8ncxeZ2nccLDPW5BFbxOlEYoZuemKRiAMBNevqQnEMeVMpvJchug==",
+ "version": "17.8.8",
+ "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-17.8.8.tgz",
+ "integrity": "sha512-ctv2TfETUyHyZsT5fWJLXwapQb5bvnnPh8c2B/g0eI9pLpJ5dEGHoakUTxQxLYAonFTlQdybU55HVN7tDsCPeg==",
"dev": true,
"requires": {
"@types/boom": "*",
@@ -3681,9 +4971,9 @@
"integrity": "sha512-TZDqvFW4nQwL9DVSNJIJu4lPLttKgzRF58COa7Vs42Ki/MrhIqUbeIw0MWn4kGLiZLXB7oCBibm7nkSjPkzfKQ=="
},
"@types/ioredis": {
- "version": "4.14.8",
- "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.14.8.tgz",
- "integrity": "sha512-ww38Psb0jj/8h9UYjRuT9RYF46E5O3j+03XSEBx6OQvCIkgPV52kF8DshVLh8DMSZs3fEjeoEzmyM3KP9n53tQ==",
+ "version": "4.16.3",
+ "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.16.3.tgz",
+ "integrity": "sha512-hE9HUayptwyZRIhRM2FF4vDmond4Yxylpjpri0qBvs7Rw4tFJnM+fdb2PbpU+PKKkPuFBGKnkrGSgwqeUmCJ2Q==",
"dev": true,
"requires": {
"@types/node": "*"
@@ -3721,12 +5011,101 @@
}
},
"@types/jest": {
- "version": "24.9.1",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz",
- "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==",
+ "version": "25.2.3",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.3.tgz",
+ "integrity": "sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==",
"dev": true,
"requires": {
- "jest-diff": "^24.3.0"
+ "jest-diff": "^25.2.1",
+ "pretty-format": "^25.2.1"
+ },
+ "dependencies": {
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
+ },
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
}
},
"@types/joi": {
@@ -3777,9 +5156,9 @@
}
},
"@types/koa-router": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz",
- "integrity": "sha512-CkNyhGOCJ6rpBEG0rlSQhwHsHNwMzGLE49tV3jE5f0TvMzy/SmoCAIlHWdOLs8Mro+BqtKFH6e/lDaibWkydag==",
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.1.tgz",
+ "integrity": "sha512-Hg78TXz78QYfEgdq3nTeRmQFEwJKZljsXb/DhtexmyrpRDRnl59oMglh9uPj3/WgKor0woANrYTnxA8gaWGK2A==",
"dev": true,
"requires": {
"@types/koa": "*"
@@ -3794,9 +5173,9 @@
}
},
"@types/lodash": {
- "version": "4.14.149",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz",
- "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==",
+ "version": "4.14.154",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.154.tgz",
+ "integrity": "sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ==",
"dev": true
},
"@types/lodash.sortby": {
@@ -3858,15 +5237,15 @@
"integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="
},
"@types/mime-db": {
- "version": "1.27.0",
- "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.27.0.tgz",
- "integrity": "sha1-m8AUof0f30dknBpUxt15ZrgoR5I=",
+ "version": "1.43.0",
+ "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.43.0.tgz",
+ "integrity": "sha512-nCqnKWfvDzTVRh8NS9Zn+rnZYs5+iw5hx3G0nFgKM/R2mJQwPChin4DQ4zXlXnxTtc/3Ys5FnWweKW6NW+d2aw==",
"dev": true
},
"@types/mimos": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.1.tgz",
- "integrity": "sha512-MATIRH4VMIJki8lcYUZdNQEHuAG7iQ1FWwoLgxV+4fUOly2xZYdhHtGgvQyWiTeJqq2tZbE0nOOgZD6pR0FpNQ==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@types/mimos/-/mimos-3.0.2.tgz",
+ "integrity": "sha512-UG3sdP/9HOk0oA1l8VylaZ0fjy6O/QGEeivOK9JhMjgJkcBJRdfsI6FtXFtg6UH17txmxuDOiIsTlrpBkayK0A==",
"dev": true,
"requires": {
"@types/mime-db": "*"
@@ -3878,6 +5257,12 @@
"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
"dev": true
},
+ "@types/minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+ "dev": true
+ },
"@types/nock": {
"version": "10.0.3",
"resolved": "https://registry.npmjs.org/@types/nock/-/nock-10.0.3.tgz",
@@ -3888,9 +5273,9 @@
}
},
"@types/node": {
- "version": "8.10.59",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz",
- "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ=="
+ "version": "8.10.61",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.61.tgz",
+ "integrity": "sha512-l+zSbvT8TPRaCxL1l9cwHCb0tSqGAGcjPJFItGGYat5oCTiq1uQQKYg5m7AF1mgnEBzFXGLJ2LRmNjtreRX76Q=="
},
"@types/node-fetch": {
"version": "2.3.2",
@@ -3901,6 +5286,12 @@
"@types/node": "*"
}
},
+ "@types/normalize-package-data": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+ "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+ "dev": true
+ },
"@types/pino": {
"version": "4.16.1",
"resolved": "https://registry.npmjs.org/@types/pino/-/pino-4.16.1.tgz",
@@ -3917,11 +5308,16 @@
"integrity": "sha1-v6ohUb4rHWEJzGn3+qnawsujuyA=",
"dev": true
},
+ "@types/prettier": {
+ "version": "1.19.1",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
+ "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
+ "dev": true
+ },
"@types/qs": {
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz",
- "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==",
- "dev": true
+ "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA=="
},
"@types/qs-middleware": {
"version": "1.0.1",
@@ -3939,9 +5335,9 @@
"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
},
"@types/request": {
- "version": "2.48.4",
- "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
- "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
+ "version": "2.48.5",
+ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz",
+ "integrity": "sha512-/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ==",
"dev": true,
"requires": {
"@types/caseless": "*",
@@ -3951,9 +5347,9 @@
}
},
"@types/request-promise": {
- "version": "4.1.45",
- "resolved": "https://registry.npmjs.org/@types/request-promise/-/request-promise-4.1.45.tgz",
- "integrity": "sha512-KFagTY/a7CzAj86DkhaAtqP0ViYTNam+CfEokSwtPFUIuq9Qrq+Rq2X4nuaB6OJmM2s0xWeiS085Ro7vR0tt9Q==",
+ "version": "4.1.46",
+ "resolved": "https://registry.npmjs.org/@types/request-promise/-/request-promise-4.1.46.tgz",
+ "integrity": "sha512-3Thpj2Va5m0ji3spaCk8YKrjkZyZc6RqUVOphA0n/Xet66AW/AiOAs5vfXhQIL5NmkaO7Jnun7Nl9NEjJ2zBaw==",
"dev": true,
"requires": {
"@types/bluebird": "*",
@@ -3990,6 +5386,25 @@
"integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
"dev": true
},
+ "@types/superagent": {
+ "version": "4.1.7",
+ "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.7.tgz",
+ "integrity": "sha512-JSwNPgRYjIC4pIeOqLwWwfGj6iP1n5NE6kNBEbGx2V8H78xCPwx7QpNp9plaI30+W3cFEzJO7BIIsXE+dbtaGg==",
+ "dev": true,
+ "requires": {
+ "@types/cookiejar": "*",
+ "@types/node": "*"
+ }
+ },
+ "@types/supertest": {
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.8.tgz",
+ "integrity": "sha512-wcax7/ip4XSSJRLbNzEIUVy2xjcBIZZAuSd2vtltQfRK7kxhx5WMHbLHkYdxN3wuQCrwpYrg86/9byDjPXoGMA==",
+ "dev": true,
+ "requires": {
+ "@types/superagent": "*"
+ }
+ },
"@types/test-listen": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@types/test-listen/-/test-listen-1.1.0.tgz",
@@ -4000,9 +5415,9 @@
}
},
"@types/tough-cookie": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz",
- "integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
+ "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==",
"dev": true
},
"@types/type-is": {
@@ -4014,14 +5429,28 @@
"@types/node": "*"
}
},
+ "@types/uuid": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz",
+ "integrity": "sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==",
+ "dev": true
+ },
"@types/ws": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
- "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
+ "version": "7.2.4",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz",
+ "integrity": "sha512-9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg==",
"requires": {
"@types/node": "*"
}
},
+ "@types/yargs": {
+ "version": "15.0.4",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
+ "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
+ "requires": {
+ "@types/yargs-parser": "*"
+ }
+ },
"@types/yargs-parser": {
"version": "13.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz",
@@ -4093,15 +5522,15 @@
}
},
"acorn": {
- "version": "5.7.3",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
- "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+ "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
"dev": true
},
"acorn-globals": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz",
- "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==",
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+ "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
"dev": true,
"requires": {
"acorn": "^6.0.1",
@@ -4109,9 +5538,9 @@
},
"dependencies": {
"acorn": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
- "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+ "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true
}
}
@@ -4123,9 +5552,10 @@
"dev": true
},
"agent-base": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
- "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+ "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+ "dev": true,
"requires": {
"es6-promisify": "^5.0.0"
}
@@ -4139,22 +5569,6 @@
"humanize-ms": "^1.2.1"
}
},
- "aggregate-error": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
- "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
- "requires": {
- "clean-stack": "^2.0.0",
- "indent-string": "^4.0.0"
- },
- "dependencies": {
- "indent-string": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
- "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
- }
- }
- },
"ajv": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
@@ -4176,12 +5590,14 @@
"ansi-regex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
},
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -4205,7 +5621,7 @@
"version": "file:packages/apollo-cache-control",
"requires": {
"apollo-server-env": "file:packages/apollo-server-env",
- "graphql-extensions": "file:packages/graphql-extensions"
+ "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base"
}
},
"apollo-datasource": {
@@ -4233,9 +5649,17 @@
"apollo-server-caching": "file:packages/apollo-server-caching",
"apollo-server-env": "file:packages/apollo-server-env",
"apollo-server-errors": "file:packages/apollo-server-errors",
+ "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base",
"apollo-server-types": "file:packages/apollo-server-types",
"async-retry": "^1.2.1",
- "graphql-extensions": "file:packages/graphql-extensions"
+ "uuid": "^8.0.0"
+ },
+ "dependencies": {
+ "uuid": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+ "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
+ }
}
},
"apollo-engine-reporting-protobuf": {
@@ -4284,34 +5708,34 @@
}
},
"apollo-link": {
- "version": "1.2.13",
- "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz",
- "integrity": "sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==",
+ "version": "1.2.14",
+ "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz",
+ "integrity": "sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==",
"requires": {
"apollo-utilities": "^1.3.0",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3",
- "zen-observable-ts": "^0.8.20"
+ "zen-observable-ts": "^0.8.21"
}
},
"apollo-link-http": {
- "version": "1.5.16",
- "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.16.tgz",
- "integrity": "sha512-IA3xA/OcrOzINRZEECI6IdhRp/Twom5X5L9jMehfzEo2AXdeRwAMlH5LuvTZHgKD8V1MBnXdM6YXawXkTDSmJw==",
+ "version": "1.5.17",
+ "resolved": "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz",
+ "integrity": "sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==",
"dev": true,
"requires": {
- "apollo-link": "^1.2.13",
- "apollo-link-http-common": "^0.2.15",
+ "apollo-link": "^1.2.14",
+ "apollo-link-http-common": "^0.2.16",
"tslib": "^1.9.3"
}
},
"apollo-link-http-common": {
- "version": "0.2.15",
- "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz",
- "integrity": "sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==",
+ "version": "0.2.16",
+ "resolved": "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz",
+ "integrity": "sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==",
"dev": true,
"requires": {
- "apollo-link": "^1.2.13",
+ "apollo-link": "^1.2.14",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3"
}
@@ -4340,11 +5764,18 @@
"version": "file:packages/apollo-server-azure-functions",
"requires": {
"@apollographql/graphql-playground-html": "1.6.24",
- "@azure/functions": "1.2.0",
+ "@azure/functions": "1.2.2",
"apollo-server-core": "file:packages/apollo-server-core",
"apollo-server-env": "file:packages/apollo-server-env",
"apollo-server-types": "file:packages/apollo-server-types",
"graphql-tools": "^4.0.0"
+ },
+ "dependencies": {
+ "@azure/functions": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@azure/functions/-/functions-1.2.2.tgz",
+ "integrity": "sha512-p/dDHq1sG/iAib+eDY4NxskWHoHW1WFzD85s0SfWxc2wVjJbxB0xz/zBF4s7ymjVgTu+0ceipeBk+tmpnt98oA=="
+ }
}
},
"apollo-server-cache-memcached": {
@@ -4360,8 +5791,15 @@
"requires": {
"apollo-server-caching": "file:packages/apollo-server-caching",
"apollo-server-env": "file:packages/apollo-server-env",
- "dataloader": "^1.4.0",
+ "dataloader": "^2.0.0",
"ioredis": "^4.0.0"
+ },
+ "dependencies": {
+ "dataloader": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.0.0.tgz",
+ "integrity": "sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ=="
+ }
}
},
"apollo-server-caching": {
@@ -4394,7 +5832,7 @@
"@apollographql/apollo-tools": "^0.4.3",
"@apollographql/graphql-playground-html": "1.6.24",
"@types/graphql-upload": "^8.0.0",
- "@types/ws": "^6.0.0",
+ "@types/ws": "^7.0.0",
"apollo-cache-control": "file:packages/apollo-cache-control",
"apollo-datasource": "file:packages/apollo-datasource",
"apollo-engine-reporting": "file:packages/apollo-engine-reporting",
@@ -4409,9 +5847,17 @@
"graphql-tag": "^2.9.2",
"graphql-tools": "^4.0.0",
"graphql-upload": "^8.0.2",
+ "loglevel": "^1.6.7",
"sha.js": "^2.4.11",
"subscriptions-transport-ws": "^0.9.11",
"ws": "^6.0.0"
+ },
+ "dependencies": {
+ "loglevel": {
+ "version": "1.6.7",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
+ "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="
+ }
}
},
"apollo-server-env": {
@@ -4431,7 +5877,7 @@
"@types/accepts": "^1.3.5",
"@types/body-parser": "1.19.0",
"@types/cors": "^2.8.4",
- "@types/express": "4.17.2",
+ "@types/express": "4.17.4",
"accepts": "^1.3.5",
"apollo-server-core": "file:packages/apollo-server-core",
"apollo-server-types": "file:packages/apollo-server-types",
@@ -4443,6 +5889,19 @@
"parseurl": "^1.3.2",
"subscriptions-transport-ws": "^0.9.16",
"type-is": "^1.6.16"
+ },
+ "dependencies": {
+ "@types/express": {
+ "version": "4.17.4",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz",
+ "integrity": "sha512-DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==",
+ "requires": {
+ "@types/body-parser": "*",
+ "@types/express-serve-static-core": "*",
+ "@types/qs": "*",
+ "@types/serve-static": "*"
+ }
+ }
}
},
"apollo-server-fastify": {
@@ -4451,10 +5910,34 @@
"@apollographql/graphql-playground-html": "1.6.24",
"apollo-server-core": "file:packages/apollo-server-core",
"apollo-server-types": "file:packages/apollo-server-types",
- "fastify-accepts": "^0.5.0",
+ "fastify-accepts": "^1.0.0",
"fastify-cors": "^0.2.0",
"graphql-subscriptions": "^1.0.0",
"graphql-tools": "^4.0.0"
+ },
+ "dependencies": {
+ "fastify-accepts": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fastify-accepts/-/fastify-accepts-1.0.0.tgz",
+ "integrity": "sha512-JVI/zKXjVfwIAdXDZvNKM7CCEWkbTFSZQUEQxrH4KBprbopGxq3R4RSIsVxqhdkVanm90yyVcPtgEa2MnDwPyg==",
+ "requires": {
+ "accepts": "^1.3.5",
+ "fastify-plugin": "^1.2.0"
+ }
+ },
+ "fastify-plugin": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-1.6.1.tgz",
+ "integrity": "sha512-APBcb27s+MjaBIerFirYmBLatoPCgmHZM6XP0K+nDL9k0yX8NJPWDY1RAC3bh6z+AB5ULS2j31BUfLMT3uaZ4A==",
+ "requires": {
+ "semver": "^6.3.0"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+ }
}
},
"apollo-server-hapi": {
@@ -4492,7 +5975,7 @@
"apollo-server-types": "file:packages/apollo-server-types",
"graphql-subscriptions": "^1.0.0",
"graphql-tools": "^4.0.0",
- "koa": "2.11.0",
+ "koa": "2.12.0",
"koa-bodyparser": "^4.2.1",
"koa-compose": "^4.1.0",
"koa-router": "^7.4.0",
@@ -4526,6 +6009,68 @@
"apollo-server-types": "file:packages/apollo-server-types"
}
},
+ "apollo-server-plugin-operation-registry": {
+ "version": "file:packages/apollo-server-plugin-operation-registry",
+ "requires": {
+ "apollo-graphql": "0.4.4",
+ "apollo-server-caching": "file:packages/apollo-server-caching",
+ "apollo-server-errors": "file:packages/apollo-server-errors",
+ "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base",
+ "fast-json-stable-stringify": "^2.0.0",
+ "loglevel": "^1.6.1",
+ "loglevel-debug": "^0.0.1",
+ "node-fetch": "^2.3.0"
+ },
+ "dependencies": {
+ "@types/node-fetch": {
+ "version": "2.5.7",
+ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+ "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+ "requires": {
+ "@types/node": "*",
+ "form-data": "^3.0.0"
+ }
+ },
+ "apollo-env": {
+ "version": "0.6.5",
+ "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz",
+ "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==",
+ "requires": {
+ "@types/node-fetch": "2.5.7",
+ "core-js": "^3.0.1",
+ "node-fetch": "^2.2.0",
+ "sha.js": "^2.4.11"
+ }
+ },
+ "apollo-graphql": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.4.tgz",
+ "integrity": "sha512-i012iRKT5nfsOaNMx4MTwHw2jrlyaF1zikpejxsGHsKIf3OngGvGh3pyw20bEmwj413OrNQpRxvvIz5A7W/8xw==",
+ "requires": {
+ "apollo-env": "^0.6.5",
+ "lodash.sortby": "^4.7.0"
+ }
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
+ "form-data": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+ "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ }
+ }
+ },
"apollo-server-plugin-response-cache": {
"version": "file:packages/apollo-server-plugin-response-cache",
"requires": {
@@ -4552,7 +6097,7 @@
"version": "file:packages/apollo-tracing",
"requires": {
"apollo-server-env": "file:packages/apollo-server-env",
- "graphql-extensions": "file:packages/graphql-extensions"
+ "apollo-server-plugin-base": "file:packages/apollo-server-plugin-base"
}
},
"apollo-utilities": {
@@ -4588,9 +6133,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -4746,6 +6291,15 @@
"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
"dev": true
},
+ "async": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.14"
+ }
+ },
"async-limiter": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -4762,8 +6316,7 @@
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
- "dev": true
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"atob": {
"version": "2.1.2",
@@ -4816,88 +6369,223 @@
"integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
"dev": true
},
- "azure-functions-ts-essentials": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/azure-functions-ts-essentials/-/azure-functions-ts-essentials-1.3.2.tgz",
- "integrity": "sha512-DdeXyzAbx632bwNs/+xp6meXWHvKpHCC2647Trfzs48QtEgsxEUB+0Jz4W5J4SNs4k640lWE6431ITOuPsSgpQ==",
- "dev": true
+ "azure-functions-ts-essentials": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/azure-functions-ts-essentials/-/azure-functions-ts-essentials-1.3.2.tgz",
+ "integrity": "sha512-DdeXyzAbx632bwNs/+xp6meXWHvKpHCC2647Trfzs48QtEgsxEUB+0Jz4W5J4SNs4k640lWE6431ITOuPsSgpQ==",
+ "dev": true
+ },
+ "babel-jest": {
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz",
+ "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==",
+ "dev": true,
+ "requires": {
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/babel__core": "^7.1.7",
+ "babel-plugin-istanbul": "^6.0.0",
+ "babel-preset-jest": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "slash": "^3.0.0"
+ },
+ "dependencies": {
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
+ "babel-plugin-istanbul": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+ "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "@istanbuljs/load-nyc-config": "^1.0.0",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-instrument": "^4.0.0",
+ "test-exclude": "^6.0.0"
+ }
},
- "babel-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
- "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
+ "babel-plugin-jest-hoist": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz",
+ "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==",
"dev": true,
"requires": {
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/babel__core": "^7.1.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-preset-jest": "^24.9.0",
- "chalk": "^2.4.2",
- "slash": "^2.0.0"
+ "@babel/template": "^7.3.3",
+ "@babel/types": "^7.3.3",
+ "@types/babel__traverse": "^7.0.6"
},
"dependencies": {
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@babel/highlight": "^7.8.3"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
}
},
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "@babel/parser": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+ "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ },
+ "dependencies": {
+ "@babel/types": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+ "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
}
}
},
- "babel-plugin-istanbul": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz",
- "integrity": "sha512-RNNVv2lsHAXJQsEJ5jonQwrJVWK8AcZpG1oxhnjCUaAjL7xahYLANhPUZbzEQHjKy1NMYUwn+0NPKQc8iSY4xQ==",
- "dev": true,
- "requires": {
- "find-up": "^3.0.0",
- "istanbul-lib-instrument": "^3.0.0",
- "test-exclude": "^5.0.0"
- }
- },
- "babel-plugin-jest-hoist": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
- "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
- "dev": true,
- "requires": {
- "@types/babel__traverse": "^7.0.6"
+ "babel-preset-current-node-syntax": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz",
+ "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==",
+ "dev": true,
+ "requires": {
+ "@babel/plugin-syntax-async-generators": "^7.8.4",
+ "@babel/plugin-syntax-bigint": "^7.8.3",
+ "@babel/plugin-syntax-class-properties": "^7.8.3",
+ "@babel/plugin-syntax-json-strings": "^7.8.3",
+ "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+ "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+ "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+ "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+ "dev": true
+ },
+ "@babel/plugin-syntax-object-rest-spread": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ }
+ }
}
},
"babel-preset-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
- "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz",
+ "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==",
"dev": true,
"requires": {
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^24.9.0"
+ "babel-plugin-jest-hoist": "^25.5.0",
+ "babel-preset-current-node-syntax": "^0.1.2"
}
},
"backo2": {
@@ -5156,6 +6844,18 @@
"integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
"dev": true
},
+ "bunyan": {
+ "version": "1.8.12",
+ "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+ "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
+ "dev": true,
+ "requires": {
+ "dtrace-provider": "~0.8",
+ "moment": "^2.10.6",
+ "mv": "~2",
+ "safe-json-stringify": "~1"
+ }
+ },
"busboy": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
@@ -5182,9 +6882,9 @@
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
},
"cacache": {
- "version": "12.0.3",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
- "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+ "version": "12.0.4",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
"dev": true,
"requires": {
"bluebird": "^3.5.5",
@@ -5289,22 +6989,14 @@
"dev": true
},
"camelcase-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
- "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
"dev": true,
"requires": {
- "camelcase": "^4.1.0",
- "map-obj": "^2.0.0",
- "quick-lru": "^1.0.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
- "dev": true
- }
+ "camelcase": "^5.3.1",
+ "map-obj": "^4.0.0",
+ "quick-lru": "^4.0.1"
}
},
"capture-exit": {
@@ -5408,9 +7100,9 @@
}
},
"cli-width": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
- "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+ "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
"dev": true
},
"cliui": {
@@ -5424,6 +7116,12 @@
"wrap-ansi": "^5.1.0"
},
"dependencies": {
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -5491,9 +7189,9 @@
"dev": true
},
"codecov": {
- "version": "3.6.5",
- "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.5.tgz",
- "integrity": "sha512-v48WuDMUug6JXwmmfsMzhCHRnhUf8O3duqXvltaYJKrO1OekZWpB/eH6iIoaxMl8Qli0+u3OxptdsBOYiD7VAQ==",
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz",
+ "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==",
"dev": true,
"requires": {
"argv": "0.0.2",
@@ -5501,19 +7199,14 @@
"js-yaml": "3.13.1",
"teeny-request": "6.0.1",
"urlgrey": "0.4.4"
- },
- "dependencies": {
- "ignore-walk": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
- "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
- "dev": true,
- "requires": {
- "minimatch": "^3.0.4"
- }
- }
}
},
+ "collect-v8-coverage": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+ "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+ "dev": true
+ },
"collection-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -5524,10 +7217,21 @@
"object-visit": "^1.0.0"
}
},
+ "color": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
+ "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.1",
+ "color-string": "^1.5.2"
+ }
+ },
"color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
"requires": {
"color-name": "1.1.3"
}
@@ -5535,7 +7239,40 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "color-string": {
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+ "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+ "dev": true,
+ "requires": {
+ "color-name": "^1.0.0",
+ "simple-swizzle": "^0.2.2"
+ }
+ },
+ "colornames": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz",
+ "integrity": "sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=",
+ "dev": true
+ },
+ "colors": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+ "dev": true
+ },
+ "colorspace": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
+ "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+ "dev": true,
+ "requires": {
+ "color": "3.0.x",
+ "text-hex": "1.0.x"
+ }
},
"columnify": {
"version": "1.5.4",
@@ -5545,23 +7282,6 @@
"requires": {
"strip-ansi": "^3.0.0",
"wcwidth": "^1.0.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
- "dev": true
- },
- "strip-ansi": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
- "dev": true,
- "requires": {
- "ansi-regex": "^2.0.0"
- }
- }
}
},
"combined-stream": {
@@ -5574,16 +7294,16 @@
}
},
"commander": {
- "version": "2.17.1",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
- "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true,
"optional": true
},
"compare-func": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
- "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz",
+ "integrity": "sha512-sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q==",
"dev": true,
"requires": {
"array-ify": "^1.0.0",
@@ -5631,9 +7351,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -5726,9 +7446,9 @@
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
"conventional-changelog-angular": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz",
- "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==",
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz",
+ "integrity": "sha512-k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA==",
"dev": true,
"requires": {
"compare-func": "^1.3.1",
@@ -5821,41 +7541,29 @@
}
},
"conventional-changelog-preset-loader": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz",
- "integrity": "sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==",
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
+ "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
"dev": true
},
"conventional-changelog-writer": {
- "version": "4.0.11",
- "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz",
- "integrity": "sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==",
+ "version": "4.0.16",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.16.tgz",
+ "integrity": "sha512-jmU1sDJDZpm/dkuFxBeRXvyNcJQeKhGtVcFFkwTphUAzyYWcwz2j36Wcv+Mv2hU3tpvLMkysOPXJTLO55AUrYQ==",
"dev": true,
"requires": {
"compare-func": "^1.3.1",
- "conventional-commits-filter": "^2.0.2",
+ "conventional-commits-filter": "^2.0.6",
"dateformat": "^3.0.0",
- "handlebars": "^4.4.0",
+ "handlebars": "^4.7.6",
"json-stringify-safe": "^5.0.1",
"lodash": "^4.17.15",
- "meow": "^5.0.0",
+ "meow": "^7.0.0",
"semver": "^6.0.0",
"split": "^1.0.0",
"through2": "^3.0.0"
},
"dependencies": {
- "handlebars": {
- "version": "4.5.3",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
- "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
- "dev": true,
- "requires": {
- "neo-async": "^2.6.0",
- "optimist": "^0.6.1",
- "source-map": "^0.6.1",
- "uglify-js": "^3.1.4"
- }
- },
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
@@ -5880,9 +7588,9 @@
}
},
"conventional-commits-filter": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz",
- "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz",
+ "integrity": "sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==",
"dev": true,
"requires": {
"lodash.ismatch": "^4.4.0",
@@ -5890,15 +7598,15 @@
}
},
"conventional-commits-parser": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz",
- "integrity": "sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.1.0.tgz",
+ "integrity": "sha512-RSo5S0WIwXZiRxUGTPuYFbqvrR4vpJ1BDdTlthFgvHt5kEdnd1+pdvwWphWn57/oIl4V72NMmOocFqqJ8mFFhA==",
"dev": true,
"requires": {
"JSONStream": "^1.0.4",
"is-text-path": "^1.0.1",
"lodash": "^4.17.15",
- "meow": "^5.0.0",
+ "meow": "^7.0.0",
"split2": "^2.0.0",
"through2": "^3.0.0",
"trim-off-newlines": "^1.0.0"
@@ -5937,6 +7645,23 @@
"q": "^1.5.1"
},
"dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "camelcase-keys": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+ "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+ "dev": true,
+ "requires": {
+ "camelcase": "^4.1.0",
+ "map-obj": "^2.0.0",
+ "quick-lru": "^1.0.0"
+ }
+ },
"concat-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
@@ -5958,6 +7683,12 @@
"locate-path": "^2.0.0"
}
},
+ "indent-string": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+ "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+ "dev": true
+ },
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -5968,6 +7699,12 @@
"path-exists": "^3.0.0"
}
},
+ "map-obj": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+ "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+ "dev": true
+ },
"meow": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
@@ -5985,6 +7722,16 @@
"trim-newlines": "^2.0.0"
}
},
+ "minimist-options": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+ "dev": true,
+ "requires": {
+ "arrify": "^1.0.1",
+ "is-plain-obj": "^1.1.0"
+ }
+ },
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -6009,6 +7756,12 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
+ "quick-lru": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+ "dev": true
+ },
"read-pkg-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
@@ -6018,6 +7771,28 @@
"find-up": "^2.0.0",
"read-pkg": "^3.0.0"
}
+ },
+ "redent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+ "dev": true,
+ "requires": {
+ "indent-string": "^3.0.0",
+ "strip-indent": "^2.0.0"
+ }
+ },
+ "strip-indent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+ "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+ "dev": true
+ },
+ "trim-newlines": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+ "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+ "dev": true
}
}
},
@@ -6153,18 +7928,26 @@
}
},
"cssom": {
- "version": "0.3.6",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
- "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==",
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+ "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
"dev": true
},
"cssstyle": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz",
- "integrity": "sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz",
+ "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==",
"dev": true,
"requires": {
- "cssom": "0.3.x"
+ "cssom": "~0.3.6"
+ },
+ "dependencies": {
+ "cssom": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+ "dev": true
+ }
}
},
"currently-unhandled": {
@@ -6224,10 +8007,11 @@
}
}
},
- "dataloader": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz",
- "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw=="
+ "date-format": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+ "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
+ "dev": true
},
"dateformat": {
"version": "3.0.3",
@@ -6299,13 +8083,6 @@
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
},
- "deep-extend": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
- "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
- "dev": true,
- "optional": true
- },
"deep-freeze": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
@@ -6385,8 +8162,7 @@
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
- "dev": true
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"delegates": {
"version": "1.0.0",
@@ -6425,17 +8201,10 @@
"integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=",
"dev": true
},
- "detect-libc": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
- "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
- "dev": true,
- "optional": true
- },
"detect-newline": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
- "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+ "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
"dev": true
},
"dezalgo": {
@@ -6448,6 +8217,17 @@
"wrappy": "1"
}
},
+ "diagnostics": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
+ "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
+ "dev": true,
+ "requires": {
+ "colorspace": "1.1.x",
+ "enabled": "1.0.x",
+ "kuler": "1.0.x"
+ }
+ },
"dicer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz",
@@ -6457,9 +8237,9 @@
}
},
"diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+ "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
"dev": true
},
"dir-glob": {
@@ -6489,6 +8269,25 @@
"is-obj": "^1.0.0"
}
},
+ "dtrace-provider": {
+ "version": "0.8.8",
+ "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
+ "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "nan": "^2.14.0"
+ },
+ "dependencies": {
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"duplexer": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -6514,9 +8313,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -6560,6 +8359,15 @@
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
"dev": true
},
+ "enabled": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
+ "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
+ "dev": true,
+ "requires": {
+ "env-variable": "0.0.x"
+ }
+ },
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -6588,10 +8396,16 @@
"integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
"dev": true
},
+ "env-variable": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz",
+ "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==",
+ "dev": true
+ },
"envinfo": {
- "version": "7.5.0",
- "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz",
- "integrity": "sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==",
+ "version": "7.5.1",
+ "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz",
+ "integrity": "sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==",
"dev": true
},
"err-code": {
@@ -6608,11 +8422,6 @@
"is-arrayish": "^0.2.1"
}
},
- "error-inject": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz",
- "integrity": "sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc="
- },
"es-abstract": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
@@ -6637,14 +8446,16 @@
}
},
"es6-promise": {
- "version": "4.2.6",
- "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
- "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+ "dev": true
},
"es6-promisify": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
"integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+ "dev": true,
"requires": {
"es6-promise": "^4.0.3"
}
@@ -6772,91 +8583,133 @@
}
},
"expect": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
- "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+ "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-styles": "^3.2.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "ansi-styles": "^4.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
+ },
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "color-name": "~1.1.4"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+ "dev": true,
+ "requires": {
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
+ }
+ },
+ "pretty-format": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true
},
- "pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "has-flag": "^4.0.0"
}
}
}
@@ -7193,15 +9046,6 @@
"tiny-lru": "^2.0.0"
}
},
- "fastify-accepts": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/fastify-accepts/-/fastify-accepts-0.5.0.tgz",
- "integrity": "sha1-wXwgEnjyv8Ub+5P/5I78T8QP02M=",
- "requires": {
- "accepts": "^1.3.3",
- "fastify-plugin": "^0.2.1"
- }
- },
"fastify-cors": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/fastify-cors/-/fastify-cors-0.2.0.tgz",
@@ -7226,14 +9070,6 @@
}
}
},
- "fastify-plugin": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-0.2.2.tgz",
- "integrity": "sha512-oRJdjdudgCkQQUARNeh2rkbxFAmj2OhCJSVBNBLUbhS0orF+IMQ4u/bc661N1jh/wDI2J+YKmXmmHSVFQI4e7A==",
- "requires": {
- "semver": "^5.4.1"
- }
- },
"fastq": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
@@ -7252,10 +9088,17 @@
"bser": "^2.0.0"
}
},
+ "fecha": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+ "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==",
+ "dev": true
+ },
"figgy-pudding": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
- "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+ "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+ "dev": true
},
"figures": {
"version": "2.0.0",
@@ -7336,6 +9179,12 @@
"integrity": "sha512-qFlJnOBWDfIaunF54/lBqNKmXOI0HqNhu+mHkLmbaBXlS71PUd9OjFOdyevHt/aHoHB1+eW7eKHgRKOG5aHSpw==",
"dev": true
},
+ "flatted": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+ "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+ "dev": true
+ },
"flush-write-stream": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
@@ -7353,9 +9202,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -7443,9 +9292,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -7485,9 +9334,9 @@
},
"dependencies": {
"graceful-fs": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
- "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"dev": true
}
}
@@ -7547,15 +9396,11 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
- "version": "1.2.9",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
- "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+ "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
"dev": true,
- "optional": true,
- "requires": {
- "nan": "^2.12.1",
- "node-pre-gyp": "^0.12.0"
- }
+ "optional": true
},
"function-bind": {
"version": "1.1.1",
@@ -7576,23 +9421,6 @@
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
- "dev": true
- },
- "strip-ansi": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
- "dev": true,
- "requires": {
- "ansi-regex": "^2.0.0"
- }
- }
}
},
"genfun": {
@@ -7601,6 +9429,12 @@
"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
"dev": true
},
+ "gensync": {
+ "version": "1.0.0-beta.1",
+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+ "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+ "dev": true
+ },
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -7839,6 +9673,23 @@
"through2": "^2.0.0"
},
"dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "camelcase-keys": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+ "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+ "dev": true,
+ "requires": {
+ "camelcase": "^4.1.0",
+ "map-obj": "^2.0.0",
+ "quick-lru": "^1.0.0"
+ }
+ },
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -7848,6 +9699,12 @@
"locate-path": "^2.0.0"
}
},
+ "indent-string": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+ "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+ "dev": true
+ },
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -7858,6 +9715,12 @@
"path-exists": "^3.0.0"
}
},
+ "map-obj": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+ "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+ "dev": true
+ },
"meow": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
@@ -7875,6 +9738,16 @@
"trim-newlines": "^2.0.0"
}
},
+ "minimist-options": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+ "dev": true,
+ "requires": {
+ "arrify": "^1.0.1",
+ "is-plain-obj": "^1.1.0"
+ }
+ },
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -7899,6 +9772,12 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
+ "quick-lru": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+ "dev": true
+ },
"read-pkg-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
@@ -7908,6 +9787,28 @@
"find-up": "^2.0.0",
"read-pkg": "^3.0.0"
}
+ },
+ "redent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+ "dev": true,
+ "requires": {
+ "indent-string": "^3.0.0",
+ "strip-indent": "^2.0.0"
+ }
+ },
+ "strip-indent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+ "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+ "dev": true
+ },
+ "trim-newlines": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+ "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+ "dev": true
}
}
},
@@ -7939,6 +9840,23 @@
"semver": "^6.0.0"
},
"dependencies": {
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "camelcase-keys": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+ "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+ "dev": true,
+ "requires": {
+ "camelcase": "^4.1.0",
+ "map-obj": "^2.0.0",
+ "quick-lru": "^1.0.0"
+ }
+ },
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -7948,6 +9866,12 @@
"locate-path": "^2.0.0"
}
},
+ "indent-string": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+ "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+ "dev": true
+ },
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -7958,6 +9882,12 @@
"path-exists": "^3.0.0"
}
},
+ "map-obj": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+ "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+ "dev": true
+ },
"meow": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
@@ -7975,6 +9905,16 @@
"trim-newlines": "^2.0.0"
}
},
+ "minimist-options": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+ "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+ "dev": true,
+ "requires": {
+ "arrify": "^1.0.1",
+ "is-plain-obj": "^1.1.0"
+ }
+ },
"p-limit": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -7999,6 +9939,12 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
+ "quick-lru": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+ "dev": true
+ },
"read-pkg-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
@@ -8009,11 +9955,33 @@
"read-pkg": "^3.0.0"
}
},
+ "redent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+ "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+ "dev": true,
+ "requires": {
+ "indent-string": "^3.0.0",
+ "strip-indent": "^2.0.0"
+ }
+ },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
+ },
+ "strip-indent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+ "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+ "dev": true
+ },
+ "trim-newlines": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+ "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+ "dev": true
}
}
},
@@ -8059,9 +10027,9 @@
}
},
"glob-parent": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
- "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
"dev": true,
"requires": {
"is-glob": "^4.0.1"
@@ -8093,14 +10061,6 @@
"ignore": "^4.0.3",
"pify": "^4.0.1",
"slash": "^2.0.0"
- },
- "dependencies": {
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- }
}
},
"graceful-fs": {
@@ -8138,11 +10098,11 @@
"integrity": "sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="
},
"graphql-tools": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz",
- "integrity": "sha512-rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ==",
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz",
+ "integrity": "sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==",
"requires": {
- "apollo-link": "^1.2.3",
+ "apollo-link": "^1.2.14",
"apollo-utilities": "^1.0.1",
"deprecated-decorator": "^0.1.6",
"iterall": "^1.1.3",
@@ -8164,18 +10124,28 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"handlebars": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
- "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+ "version": "4.7.6",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+ "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
"dev": true,
"requires": {
+ "minimist": "^1.2.5",
"neo-async": "^2.6.0",
- "optimist": "^0.6.1",
"source-map": "^0.6.1",
- "uglify-js": "^3.1.4"
+ "uglify-js": "^3.1.4",
+ "wordwrap": "^1.0.0"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+ "dev": true
+ }
}
},
"hapi": {
@@ -8503,6 +10473,12 @@
"har-schema": "^2.0.0"
}
},
+ "hard-rejection": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+ "dev": true
+ },
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -8599,6 +10575,12 @@
"whatwg-encoding": "^1.0.1"
}
},
+ "html-escaper": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+ "dev": true
+ },
"http-assert": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz",
@@ -8661,6 +10643,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
"integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+ "dev": true,
"requires": {
"agent-base": "5",
"debug": "4"
@@ -8669,12 +10652,14 @@
"agent-base": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
- "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+ "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+ "dev": true
},
"debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
"requires": {
"ms": "^2.1.1"
}
@@ -8682,10 +10667,17 @@
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
}
}
},
+ "human-signals": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+ "dev": true
+ },
"humanize-ms": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
@@ -8714,9 +10706,9 @@
"dev": true
},
"ignore-walk": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
- "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+ "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
"dev": true,
"requires": {
"minimatch": "^3.0.4"
@@ -8730,6 +10722,14 @@
"requires": {
"caller-path": "^2.0.0",
"resolve-from": "^3.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
}
},
"import-local": {
@@ -8748,9 +10748,9 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
},
"indent-string": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
- "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true
},
"infer-owner": {
@@ -8837,6 +10837,12 @@
"supports-color": "^5.3.0"
}
},
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -8857,22 +10863,30 @@
}
}
}
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ }
+ }
}
}
},
- "invariant": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
- "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
- "dev": true,
- "requires": {
- "loose-envify": "^1.0.0"
- }
- },
"ioredis": {
- "version": "4.16.0",
- "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.0.tgz",
- "integrity": "sha512-tlalhtuvnxXJNtrPjec1nGicuOCpi9ErYV/fRfwaWSzktX9ESrzHlcFwj1pVAL326E8dmt7h9pPQZyyVPPksRA==",
+ "version": "4.17.3",
+ "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.3.tgz",
+ "integrity": "sha512-iRvq4BOYzNFkDnSyhx7cmJNOi1x/HWYe+A4VXHBu4qpwJaGT1Mp+D2bVGJntH9K/Z/GeOM/Nprb8gB3bmitz1Q==",
"requires": {
"cluster-key-slot": "^1.1.0",
"debug": "^4.1.1",
@@ -8905,6 +10919,12 @@
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
"integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
},
+ "ip-regex": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+ "dev": true
+ },
"ipaddr.js": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
@@ -9020,20 +11040,20 @@
"dev": true
},
"is-finite": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
- "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+ "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
"number-is-nan": "^1.0.0"
}
},
- "is-fullwidth-code-point": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
- },
"is-generator-fn": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.0.0.tgz",
@@ -9054,11 +11074,6 @@
"is-extglob": "^2.1.1"
}
},
- "is-lambda": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
- "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU="
- },
"is-number": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -9100,12 +11115,6 @@
"isobject": "^3.0.1"
}
},
- "is-promise": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
- "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
- "dev": true
- },
"is-regex": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -9164,10 +11173,11 @@
"dev": true
},
"is-wsl": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz",
- "integrity": "sha512-pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==",
- "dev": true
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
+ "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
+ "dev": true,
+ "optional": true
},
"isarray": {
"version": "0.0.1",
@@ -9202,80 +11212,279 @@
"dev": true
},
"istanbul-lib-coverage": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
- "integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+ "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
"dev": true
},
"istanbul-lib-instrument": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
- "integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
+ "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
"dev": true,
"requires": {
- "@babel/generator": "^7.0.0",
- "@babel/parser": "^7.0.0",
- "@babel/template": "^7.0.0",
- "@babel/traverse": "^7.0.0",
- "@babel/types": "^7.0.0",
- "istanbul-lib-coverage": "^2.0.3",
- "semver": "^5.5.0"
+ "@babel/core": "^7.7.5",
+ "@babel/parser": "^7.7.5",
+ "@babel/template": "^7.7.4",
+ "@babel/traverse": "^7.7.4",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-coverage": "^3.0.0",
+ "semver": "^6.3.0"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/core": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+ "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/generator": "^7.9.0",
+ "@babel/helper-module-transforms": "^7.9.0",
+ "@babel/helpers": "^7.9.0",
+ "@babel/parser": "^7.9.0",
+ "@babel/template": "^7.8.6",
+ "@babel/traverse": "^7.9.0",
+ "@babel/types": "^7.9.0",
+ "convert-source-map": "^1.7.0",
+ "debug": "^4.1.0",
+ "gensync": "^1.0.0-beta.1",
+ "json5": "^2.1.2",
+ "lodash": "^4.17.13",
+ "resolve": "^1.3.2",
+ "semver": "^5.4.1",
+ "source-map": "^0.5.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/generator": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
+ "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.9.5",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+ "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "^7.8.3",
+ "@babel/template": "^7.8.3",
+ "@babel/types": "^7.9.5"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+ "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+ "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.8.3"
+ }
+ },
+ "@babel/helpers": {
+ "version": "7.9.2",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+ "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "^7.8.3",
+ "@babel/traverse": "^7.9.0",
+ "@babel/types": "^7.9.0"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.9.4",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
+ "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/generator": "^7.9.5",
+ "@babel/helper-function-name": "^7.9.5",
+ "@babel/helper-split-export-declaration": "^7.8.3",
+ "@babel/parser": "^7.9.0",
+ "@babel/types": "^7.9.5",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "convert-source-map": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "json5": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "minimist": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+ "dev": true
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
}
},
"istanbul-lib-report": {
- "version": "2.0.8",
- "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
- "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+ "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
"dev": true,
"requires": {
- "istanbul-lib-coverage": "^2.0.5",
- "make-dir": "^2.1.0",
- "supports-color": "^6.1.0"
+ "istanbul-lib-coverage": "^3.0.0",
+ "make-dir": "^3.0.0",
+ "supports-color": "^7.1.0"
},
"dependencies": {
- "istanbul-lib-coverage": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
- "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"make-dir": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
- "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
"requires": {
- "pify": "^4.0.1",
- "semver": "^5.6.0"
+ "semver": "^6.0.0"
}
},
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
}
}
}
},
"istanbul-lib-source-maps": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
- "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+ "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
"dev": true,
"requires": {
"debug": "^4.1.1",
- "istanbul-lib-coverage": "^2.0.5",
- "make-dir": "^2.1.0",
- "rimraf": "^2.6.3",
+ "istanbul-lib-coverage": "^3.0.0",
"source-map": "^0.6.1"
},
"dependencies": {
@@ -9288,43 +11497,22 @@
"ms": "^2.1.1"
}
},
- "istanbul-lib-coverage": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
- "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
- "dev": true
- },
- "make-dir": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
- "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
- "dev": true,
- "requires": {
- "pify": "^4.0.1",
- "semver": "^5.6.0"
- }
- },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
}
}
},
"istanbul-reports": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
- "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+ "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
"dev": true,
"requires": {
- "handlebars": "^4.1.2"
+ "html-escaper": "^2.0.0",
+ "istanbul-lib-report": "^3.0.0"
}
},
"iterall": {
@@ -9348,189 +11536,297 @@
}
},
"jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
- "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-25.5.4.tgz",
+ "integrity": "sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ==",
"dev": true,
"requires": {
- "import-local": "^2.0.0",
- "jest-cli": "^24.9.0"
+ "@jest/core": "^25.5.4",
+ "import-local": "^3.0.2",
+ "jest-cli": "^25.5.4"
},
"dependencies": {
+ "@babel/highlight": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+ "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.0",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "@babel/parser": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+ "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+ "dev": true
+ },
+ "@babel/template": {
+ "version": "7.8.6",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+ "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.8.3",
+ "@babel/parser": "^7.8.6",
+ "@babel/types": "^7.8.6"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+ "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.8.3"
+ }
+ },
+ "@babel/types": {
+ "version": "7.9.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+ "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.9.5",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
+ }
+ },
"@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+ "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-message-util": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "slash": "^3.0.0"
}
},
"@jest/environment": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
- "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
+ "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^24.9.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0"
}
},
"@jest/fake-timers": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
- "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
+ "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "lolex": "^5.0.0"
}
},
"@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz",
+ "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==",
"dev": true,
"requires": {
"callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
+ "graceful-fs": "^4.2.4",
"source-map": "^0.6.0"
}
},
"@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+ "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
+ "@jest/console": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
}
},
"@jest/test-sequencer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
- "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz",
+ "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-runner": "^24.9.0",
- "jest-runtime": "^24.9.0"
+ "@jest/test-result": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-runner": "^25.5.4",
+ "jest-runtime": "^25.5.4"
}
},
"@jest/transform": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
- "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
+ "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/types": "^24.9.0",
- "babel-plugin-istanbul": "^5.1.0",
- "chalk": "^2.0.1",
+ "@jest/types": "^25.5.0",
+ "babel-plugin-istanbul": "^6.0.0",
+ "chalk": "^3.0.0",
"convert-source-map": "^1.4.0",
"fast-json-stable-stringify": "^2.0.0",
- "graceful-fs": "^4.1.15",
- "jest-haste-map": "^24.9.0",
- "jest-regex-util": "^24.9.0",
- "jest-util": "^24.9.0",
- "micromatch": "^3.1.10",
+ "graceful-fs": "^4.2.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-regex-util": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "micromatch": "^4.0.2",
"pirates": "^4.0.1",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
"source-map": "^0.6.1",
- "write-file-atomic": "2.4.1"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
- "dev": true
- }
+ "write-file-atomic": "^3.0.0"
}
},
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "anymatch": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "dev": true,
+ "requires": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
}
},
"babel-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
- "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
- "dev": true,
- "requires": {
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/babel__core": "^7.1.0",
- "babel-plugin-istanbul": "^5.1.0",
- "babel-preset-jest": "^24.9.0",
- "chalk": "^2.4.2",
- "slash": "^2.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz",
+ "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==",
+ "dev": true,
+ "requires": {
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/babel__core": "^7.1.7",
+ "babel-plugin-istanbul": "^6.0.0",
+ "babel-preset-jest": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "slash": "^3.0.0"
}
},
"babel-plugin-jest-hoist": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
- "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz",
+ "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==",
"dev": true,
"requires": {
+ "@babel/template": "^7.3.3",
+ "@babel/types": "^7.3.3",
"@types/babel__traverse": "^7.0.6"
}
},
"babel-preset-jest": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
- "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz",
+ "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==",
+ "dev": true,
+ "requires": {
+ "babel-plugin-jest-hoist": "^25.5.0",
+ "babel-preset-current-node-syntax": "^0.1.2"
+ }
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^24.9.0"
+ "fill-range": "^7.0.1"
}
},
"callsites": {
@@ -9539,444 +11835,567 @@
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
"dev": true
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
},
"cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true
+ },
+ "emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true
+ },
+ "expect": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+ "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-styles": "^4.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dev": true,
"requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
- "expect": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
- "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+ "import-local": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+ "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-styles": "^3.2.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.9.0"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
- "dev": true
- }
+ "pkg-dir": "^4.2.0",
+ "resolve-cwd": "^3.0.0"
}
},
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true
},
"jest-cli": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
- "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz",
+ "integrity": "sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw==",
"dev": true,
"requires": {
- "@jest/core": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/core": "^25.5.4",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"exit": "^0.1.2",
- "import-local": "^2.0.0",
+ "graceful-fs": "^4.2.4",
+ "import-local": "^3.0.2",
"is-ci": "^2.0.0",
- "jest-config": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
+ "jest-config": "^25.5.4",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
"prompts": "^2.0.1",
- "realpath-native": "^1.1.0",
- "yargs": "^13.3.0"
+ "realpath-native": "^2.0.0",
+ "yargs": "^15.3.1"
}
},
"jest-config": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
- "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz",
+ "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^24.9.0",
- "@jest/types": "^24.9.0",
- "babel-jest": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/test-sequencer": "^25.5.4",
+ "@jest/types": "^25.5.0",
+ "babel-jest": "^25.5.1",
+ "chalk": "^3.0.0",
+ "deepmerge": "^4.2.2",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^24.9.0",
- "jest-environment-node": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "micromatch": "^3.1.10",
- "pretty-format": "^24.9.0",
- "realpath-native": "^1.1.0"
+ "graceful-fs": "^4.2.4",
+ "jest-environment-jsdom": "^25.5.0",
+ "jest-environment-node": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-jasmine2": "^25.5.4",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "pretty-format": "^25.5.0",
+ "realpath-native": "^2.0.0"
}
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-each": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
- "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz",
+ "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0"
}
},
"jest-environment-jsdom": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
- "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz",
+ "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0",
- "jsdom": "^11.5.1"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jsdom": "^15.2.1"
}
},
"jest-environment-node": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
- "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz",
+ "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "semver": "^6.3.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-haste-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
- "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
+ "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "anymatch": "^2.0.0",
+ "@jest/types": "^25.5.0",
+ "@types/graceful-fs": "^4.1.2",
+ "anymatch": "^3.0.3",
"fb-watchman": "^2.0.0",
- "fsevents": "^1.2.7",
- "graceful-fs": "^4.1.15",
- "invariant": "^2.2.4",
- "jest-serializer": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.9.0",
- "micromatch": "^3.1.10",
+ "fsevents": "^2.1.2",
+ "graceful-fs": "^4.2.4",
+ "jest-serializer": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
+ "micromatch": "^4.0.2",
"sane": "^4.0.3",
- "walker": "^1.0.7"
+ "walker": "^1.0.7",
+ "which": "^2.0.2"
}
},
"jest-jasmine2": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
- "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz",
+ "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/environment": "^25.5.0",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"co": "^4.6.0",
- "expect": "^24.9.0",
+ "expect": "^25.5.0",
"is-generator-fn": "^2.0.0",
- "jest-each": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0",
- "throat": "^4.0.0"
+ "jest-each": "^25.5.0",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-runtime": "^25.5.4",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0",
+ "throat": "^5.0.0"
}
},
"jest-leak-detector": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
- "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz",
+ "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==",
"dev": true,
"requires": {
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-mock": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
- "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
+ "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0"
+ "@jest/types": "^25.5.0"
}
},
"jest-resolve": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
- "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+ "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"browser-resolve": "^1.11.3",
- "chalk": "^2.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "read-pkg-up": "^7.0.1",
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.17.0",
+ "slash": "^3.0.0"
}
},
"jest-runner": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
- "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz",
+ "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==",
"dev": true,
"requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.4.2",
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"exit": "^0.1.2",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-docblock": "^24.3.0",
- "jest-haste-map": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-leak-detector": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.6.0",
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-docblock": "^25.3.0",
+ "jest-haste-map": "^25.5.1",
+ "jest-jasmine2": "^25.5.4",
+ "jest-leak-detector": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "jest-runtime": "^25.5.4",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
"source-map-support": "^0.5.6",
- "throat": "^4.0.0"
- },
- "dependencies": {
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
+ "throat": "^5.0.0"
}
},
"jest-runtime": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
- "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
- "dev": true,
- "requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/source-map": "^24.3.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/yargs": "^13.0.0",
- "chalk": "^2.0.1",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
+ "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+ "dev": true,
+ "requires": {
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/globals": "^25.5.2",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0",
+ "collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
"glob": "^7.1.3",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "strip-bom": "^3.0.0",
- "yargs": "^13.3.0"
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
+ "strip-bom": "^4.0.0",
+ "yargs": "^15.3.1"
}
},
"jest-serializer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
- "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
- "dev": true
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
+ "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.2.4"
+ }
},
"jest-snapshot": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
- "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
+ "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "expect": "^24.9.0",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "mkdirp": "^0.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/prettier": "^1.19.0",
+ "chalk": "^3.0.0",
+ "expect": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "make-dir": "^3.0.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^24.9.0",
- "semver": "^6.2.0"
+ "pretty-format": "^25.5.0",
+ "semver": "^6.3.0"
}
},
"jest-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
- "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/source-map": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "callsites": "^3.0.0",
- "chalk": "^2.0.1",
- "graceful-fs": "^4.1.15",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"is-ci": "^2.0.0",
- "mkdirp": "^0.5.1",
- "slash": "^2.0.0",
- "source-map": "^0.6.0"
+ "make-dir": "^3.0.0"
}
},
"jest-validate": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
- "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
+ "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"camelcase": "^5.3.1",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
"leven": "^3.1.0",
- "pretty-format": "^24.9.0"
+ "pretty-format": "^25.5.0"
}
},
"jest-worker": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
- "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+ "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
"dev": true,
"requires": {
"merge-stream": "^2.0.0",
- "supports-color": "^6.1.0"
+ "supports-color": "^7.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
}
},
- "leven": {
+ "make-dir": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true
},
- "merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"dev": true
},
+ "pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.0.0"
+ }
+ },
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
- "require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
+ "resolve-cwd": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+ "dev": true,
+ "requires": {
+ "resolve-from": "^5.0.0"
+ }
+ },
+ "resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
"dev": true
},
"semver": {
@@ -9985,68 +12404,111 @@
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
"string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
"dev": true,
"requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.0"
}
},
"strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
"dev": true,
"requires": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "^5.0.0"
}
},
+ "strip-bom": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+ "dev": true
+ },
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "isexe": "^2.0.0"
}
},
"wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ }
+ },
+ "write-file-atomic": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
+ "imurmurhash": "^0.1.4",
+ "is-typedarray": "^1.0.0",
+ "signal-exit": "^3.0.2",
+ "typedarray-to-buffer": "^3.1.5"
}
},
"yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "version": "15.3.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+ "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
"dev": true,
"requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
+ "string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "yargs-parser": "^18.1.1"
}
},
"yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -10056,310 +12518,754 @@
}
},
"jest-changed-files": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
- "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.5.0.tgz",
+ "integrity": "sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "execa": "^1.0.0",
- "throat": "^4.0.0"
+ "@jest/types": "^25.5.0",
+ "execa": "^3.2.0",
+ "throat": "^5.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "cross-spawn": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+ "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+ "dev": true,
+ "requires": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ }
+ },
+ "execa": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+ "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^7.0.0",
+ "get-stream": "^5.0.0",
+ "human-signals": "^1.1.1",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^4.0.0",
+ "onetime": "^5.1.0",
+ "p-finally": "^2.0.0",
+ "signal-exit": "^3.0.2",
+ "strip-final-newline": "^2.0.0"
+ }
+ },
+ "get-stream": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+ "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+ "dev": true
+ },
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+ "dev": true
+ },
+ "npm-run-path": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+ "dev": true,
+ "requires": {
+ "path-key": "^3.0.0"
+ }
+ },
+ "onetime": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+ "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+ "dev": true,
+ "requires": {
+ "mimic-fn": "^2.1.0"
+ }
+ },
+ "p-finally": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+ "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+ "dev": true
+ },
+ "path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "dev": true
+ },
+ "shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "^3.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
}
}
}
},
"jest-config": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
- "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz",
+ "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^24.9.0",
- "@jest/types": "^24.9.0",
- "babel-jest": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/test-sequencer": "^25.5.4",
+ "@jest/types": "^25.5.0",
+ "babel-jest": "^25.5.1",
+ "chalk": "^3.0.0",
+ "deepmerge": "^4.2.2",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^24.9.0",
- "jest-environment-node": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "micromatch": "^3.1.10",
- "pretty-format": "^24.9.0",
- "realpath-native": "^1.1.0"
+ "graceful-fs": "^4.2.4",
+ "jest-environment-jsdom": "^25.5.0",
+ "jest-environment-node": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-jasmine2": "^25.5.4",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "micromatch": "^4.0.2",
+ "pretty-format": "^25.5.0",
+ "realpath-native": "^2.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-validate": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
- "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
+ "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"camelcase": "^5.3.1",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
"leven": "^3.1.0",
- "pretty-format": "^24.9.0"
+ "pretty-format": "^25.5.0"
+ }
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "pretty-format": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
- "leven": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true
},
- "pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "is-number": "^7.0.0"
}
}
}
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
}
},
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-docblock": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz",
- "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==",
+ "version": "25.3.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz",
+ "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==",
"dev": true,
"requires": {
- "detect-newline": "^2.1.0"
+ "detect-newline": "^3.0.0"
}
},
"jest-each": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
- "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz",
+ "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
}
},
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-environment-jsdom": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
- "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz",
+ "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0",
- "jsdom": "^11.5.1"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jsdom": "^15.2.1"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-environment-node": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
- "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz",
+ "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==",
"dev": true,
"requires": {
- "@jest/environment": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/types": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-util": "^24.9.0"
+ "@jest/environment": "^25.5.0",
+ "@jest/fake-timers": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "semver": "^6.3.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
@@ -10371,170 +13277,311 @@
"dev": true
},
"jest-haste-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
- "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
+ "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "anymatch": "^2.0.0",
+ "@jest/types": "^25.5.0",
+ "@types/graceful-fs": "^4.1.2",
+ "anymatch": "^3.0.3",
"fb-watchman": "^2.0.0",
- "fsevents": "^1.2.7",
- "graceful-fs": "^4.1.15",
- "invariant": "^2.2.4",
- "jest-serializer": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.9.0",
- "micromatch": "^3.1.10",
+ "fsevents": "^2.1.2",
+ "graceful-fs": "^4.2.4",
+ "jest-serializer": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
+ "micromatch": "^4.0.2",
"sane": "^4.0.3",
- "walker": "^1.0.7"
+ "walker": "^1.0.7",
+ "which": "^2.0.2"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "jest-worker": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
- "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+ "anymatch": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
"dev": true,
"requires": {
- "merge-stream": "^2.0.0",
- "supports-color": "^6.1.0"
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
}
},
- "merge-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
- "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true
},
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "isexe": "^2.0.0"
}
}
}
},
"jest-jasmine2": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
- "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz",
+ "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
+ "@jest/environment": "^25.5.0",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"co": "^4.6.0",
- "expect": "^24.9.0",
+ "expect": "^25.5.0",
"is-generator-fn": "^2.0.0",
- "jest-each": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "pretty-format": "^24.9.0",
- "throat": "^4.0.0"
+ "jest-each": "^25.5.0",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-runtime": "^25.5.4",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "pretty-format": "^25.5.0",
+ "throat": "^5.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-junit": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-9.0.0.tgz",
- "integrity": "sha512-jnABGjL5pd2lhE1w3RIslZSufFbWQZGx8O3eluDES7qKxQuonXMtsPIi+4AKl4rtjb4DvMAjwLi4eHukc2FP/Q==",
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-10.0.0.tgz",
+ "integrity": "sha512-dbOVRyxHprdSpwSAR9/YshLwmnwf+RSl5hf0kCGlhAcEeZY9aRqo4oNmaT0tLC16Zy9D0zekDjWkjHGjXlglaQ==",
"dev": true,
"requires": {
"jest-validate": "^24.9.0",
@@ -10554,180 +13601,427 @@
}
},
"uuid": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
- "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true
}
}
},
"jest-leak-detector": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
- "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz",
+ "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==",
"dev": true,
"requires": {
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
+ }
+ },
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "color-name": "~1.1.4"
}
},
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
}
},
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
"stack-utils": "^1.0.1"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
}
}
}
},
"jest-mock": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
- "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
+ "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0"
+ "@jest/types": "^25.5.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
@@ -10739,234 +14033,357 @@
"dev": true
},
"jest-regex-util": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
- "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
+ "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
"dev": true
},
"jest-resolve": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
- "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+ "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"browser-resolve": "^1.11.3",
- "chalk": "^2.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "read-pkg-up": "^7.0.1",
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.17.0",
+ "slash": "^3.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-resolve-dependencies": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
- "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz",
+ "integrity": "sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-snapshot": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "jest-regex-util": "^25.2.6",
+ "jest-snapshot": "^25.5.1"
},
"dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
+ "fill-range": "^7.0.1"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "color-name": "~1.1.4"
}
},
- "callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true
- },
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"expect": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
- "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+ "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-styles": "^3.2.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-regex-util": "^24.9.0"
- },
- "dependencies": {
- "jest-regex-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
- "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
- "dev": true
- }
+ "@jest/types": "^25.5.0",
+ "ansi-styles": "^4.0.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-regex-util": "^25.2.6"
}
},
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
"stack-utils": "^1.0.1"
}
},
"jest-resolve": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
- "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+ "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"browser-resolve": "^1.11.3",
- "chalk": "^2.0.1",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"jest-pnp-resolver": "^1.2.1",
- "realpath-native": "^1.1.0"
+ "read-pkg-up": "^7.0.1",
+ "realpath-native": "^2.0.0",
+ "resolve": "^1.17.0",
+ "slash": "^3.0.0"
}
},
"jest-snapshot": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
- "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
+ "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "expect": "^24.9.0",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "mkdirp": "^0.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/prettier": "^1.19.0",
+ "chalk": "^3.0.0",
+ "expect": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "make-dir": "^3.0.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^24.9.0",
- "semver": "^6.2.0"
+ "pretty-format": "^25.5.0",
+ "semver": "^6.3.0"
+ }
+ },
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
}
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+ "dev": true,
+ "requires": {
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
+ }
+ },
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "path-parse": "^1.0.6"
}
},
"semver": {
@@ -10974,240 +14391,399 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
}
}
},
"jest-runner": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
- "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz",
+ "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==",
"dev": true,
"requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.4.2",
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
"exit": "^0.1.2",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-docblock": "^24.3.0",
- "jest-haste-map": "^24.9.0",
- "jest-jasmine2": "^24.9.0",
- "jest-leak-detector": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "jest-runtime": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-worker": "^24.6.0",
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-docblock": "^25.3.0",
+ "jest-haste-map": "^25.5.1",
+ "jest-jasmine2": "^25.5.4",
+ "jest-leak-detector": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "jest-runtime": "^25.5.4",
+ "jest-util": "^25.5.0",
+ "jest-worker": "^25.5.0",
"source-map-support": "^0.5.6",
- "throat": "^4.0.0"
+ "throat": "^5.0.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
"chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
}
}
},
"jest-runtime": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
- "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
- "dev": true,
- "requires": {
- "@jest/console": "^24.7.1",
- "@jest/environment": "^24.9.0",
- "@jest/source-map": "^24.3.0",
- "@jest/transform": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/yargs": "^13.0.0",
- "chalk": "^2.0.1",
+ "version": "25.5.4",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
+ "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+ "dev": true,
+ "requires": {
+ "@jest/console": "^25.5.0",
+ "@jest/environment": "^25.5.0",
+ "@jest/globals": "^25.5.2",
+ "@jest/source-map": "^25.5.0",
+ "@jest/test-result": "^25.5.0",
+ "@jest/transform": "^25.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0",
+ "collect-v8-coverage": "^1.0.0",
"exit": "^0.1.2",
"glob": "^7.1.3",
- "graceful-fs": "^4.1.15",
- "jest-config": "^24.9.0",
- "jest-haste-map": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0",
- "jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.9.0",
- "jest-snapshot": "^24.9.0",
- "jest-util": "^24.9.0",
- "jest-validate": "^24.9.0",
- "realpath-native": "^1.1.0",
- "slash": "^2.0.0",
- "strip-bom": "^3.0.0",
- "yargs": "^13.3.0"
+ "graceful-fs": "^4.2.4",
+ "jest-config": "^25.5.4",
+ "jest-haste-map": "^25.5.1",
+ "jest-message-util": "^25.5.0",
+ "jest-mock": "^25.5.0",
+ "jest-regex-util": "^25.2.6",
+ "jest-resolve": "^25.5.1",
+ "jest-snapshot": "^25.5.1",
+ "jest-util": "^25.5.0",
+ "jest-validate": "^25.5.0",
+ "realpath-native": "^2.0.0",
+ "slash": "^3.0.0",
+ "strip-bom": "^4.0.0",
+ "yargs": "^15.3.1"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
},
"cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"dev": true,
"requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
}
},
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-validate": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
- "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
+ "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"camelcase": "^5.3.1",
- "chalk": "^2.0.1",
- "jest-get-type": "^24.9.0",
+ "chalk": "^3.0.0",
+ "jest-get-type": "^25.2.6",
"leven": "^3.1.0",
- "pretty-format": "^24.9.0"
+ "pretty-format": "^25.5.0"
}
},
- "leven": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
- "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"dev": true
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
- "require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
"dev": true
},
"string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
"dev": true,
"requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.0"
}
},
"strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
"dev": true,
"requires": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "^5.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
}
},
"wrap-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
- "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.0",
- "string-width": "^3.0.0",
- "strip-ansi": "^5.0.0"
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
}
},
"yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "version": "15.3.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+ "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
"dev": true,
"requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
+ "string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "yargs-parser": "^18.1.1"
}
},
"yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -11217,175 +14793,279 @@
}
},
"jest-serializer": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
- "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
- "dev": true
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
+ "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.2.4"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ }
+ }
},
"jest-snapshot": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
- "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
+ "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^24.9.0",
- "chalk": "^2.0.1",
- "expect": "^24.9.0",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "jest-matcher-utils": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-resolve": "^24.9.0",
- "mkdirp": "^0.5.1",
+ "@jest/types": "^25.5.0",
+ "@types/prettier": "^1.19.0",
+ "chalk": "^3.0.0",
+ "expect": "^25.5.0",
+ "graceful-fs": "^4.2.4",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "jest-matcher-utils": "^25.5.0",
+ "jest-message-util": "^25.5.0",
+ "jest-resolve": "^25.5.1",
+ "make-dir": "^3.0.0",
"natural-compare": "^1.4.0",
- "pretty-format": "^24.9.0",
- "semver": "^6.2.0"
+ "pretty-format": "^25.5.0",
+ "semver": "^6.3.0"
},
"dependencies": {
"@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "ansi-regex": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
}
},
- "diff-sequences": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
- "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"jest-diff": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
- "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+ "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "diff-sequences": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "chalk": "^3.0.0",
+ "diff-sequences": "^25.2.6",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
}
},
"jest-get-type": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
- "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+ "version": "25.2.6",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+ "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
"dev": true
},
"jest-matcher-utils": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
- "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+ "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+ "dev": true,
+ "requires": {
+ "chalk": "^3.0.0",
+ "jest-diff": "^25.5.0",
+ "jest-get-type": "^25.2.6",
+ "pretty-format": "^25.5.0"
+ }
+ },
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-diff": "^24.9.0",
- "jest-get-type": "^24.9.0",
- "pretty-format": "^24.9.0"
+ "semver": "^6.0.0"
}
},
"pretty-format": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
- "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+ "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "ansi-regex": "^4.0.0",
- "ansi-styles": "^3.2.0",
- "react-is": "^16.8.4"
+ "@jest/types": "^25.5.0",
+ "ansi-regex": "^5.0.0",
+ "ansi-styles": "^4.0.0",
+ "react-is": "^16.12.0"
}
},
+ "react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
}
}
},
"jest-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
- "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/source-map": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "callsites": "^3.0.0",
- "chalk": "^2.0.1",
- "graceful-fs": "^4.1.15",
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
"is-ci": "^2.0.0",
- "mkdirp": "^0.5.1",
- "slash": "^2.0.0",
- "source-map": "^0.6.0"
+ "make-dir": "^3.0.0"
},
"dependencies": {
- "@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "color-name": "~1.1.4"
}
},
- "callsites": {
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "make-dir": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
}
}
},
@@ -11400,166 +15080,249 @@
"chalk": "^2.0.1",
"jest-get-type": "^24.9.0",
"leven": "^3.1.0",
- "pretty-format": "^24.9.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "dev": true
- }
+ "pretty-format": "^24.9.0"
}
},
"jest-watcher": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
- "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz",
+ "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/yargs": "^13.0.0",
- "ansi-escapes": "^3.0.0",
- "chalk": "^2.0.1",
- "jest-util": "^24.9.0",
- "string-length": "^2.0.0"
+ "@jest/test-result": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^3.0.0",
+ "jest-util": "^25.5.0",
+ "string-length": "^3.1.0"
},
"dependencies": {
"@jest/console": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
- "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+ "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
"dev": true,
"requires": {
- "@jest/source-map": "^24.9.0",
- "chalk": "^2.0.1",
- "slash": "^2.0.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "jest-message-util": "^25.5.0",
+ "jest-util": "^25.5.0",
+ "slash": "^3.0.0"
}
},
- "@jest/fake-timers": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
- "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+ "@jest/test-result": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+ "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0",
- "jest-message-util": "^24.9.0",
- "jest-mock": "^24.9.0"
+ "@jest/console": "^25.5.0",
+ "@jest/types": "^25.5.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
}
},
- "@jest/source-map": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
- "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+ "@jest/types": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+ "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
"dev": true,
"requires": {
- "callsites": "^3.0.0",
- "graceful-fs": "^4.1.15",
- "source-map": "^0.6.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^1.1.1",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^3.0.0"
}
},
- "@jest/test-result": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
- "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+ "ansi-escapes": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/types": "^24.9.0",
- "@types/istanbul-lib-coverage": "^2.0.0"
+ "type-fest": "^0.11.0"
}
},
- "@jest/types": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
- "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^1.1.1",
- "@types/yargs": "^13.0.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
- "@types/yargs": {
- "version": "13.0.2",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
- "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"requires": {
- "@types/yargs-parser": "*"
+ "fill-range": "^7.0.1"
}
},
- "callsites": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "chalk": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true
},
"jest-message-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
- "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+ "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
+ "@jest/types": "^25.5.0",
"@types/stack-utils": "^1.0.1",
- "chalk": "^2.0.1",
- "micromatch": "^3.1.10",
- "slash": "^2.0.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "micromatch": "^4.0.2",
+ "slash": "^3.0.0",
"stack-utils": "^1.0.1"
}
},
- "jest-mock": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
- "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+ "jest-util": {
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+ "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
"dev": true,
"requires": {
- "@jest/types": "^24.9.0"
+ "@jest/types": "^25.5.0",
+ "chalk": "^3.0.0",
+ "graceful-fs": "^4.2.4",
+ "is-ci": "^2.0.0",
+ "make-dir": "^3.0.0"
}
},
- "jest-util": {
- "version": "24.9.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
- "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
"requires": {
- "@jest/console": "^24.9.0",
- "@jest/fake-timers": "^24.9.0",
- "@jest/source-map": "^24.9.0",
- "@jest/test-result": "^24.9.0",
- "@jest/types": "^24.9.0",
- "callsites": "^3.0.0",
- "chalk": "^2.0.1",
- "graceful-fs": "^4.1.15",
- "is-ci": "^2.0.0",
- "mkdirp": "^0.5.1",
- "slash": "^2.0.0",
- "source-map": "^0.6.0"
+ "semver": "^6.0.0"
+ }
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
}
+ },
+ "type-fest": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+ "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+ "dev": true
}
}
},
"jest-worker": {
- "version": "24.6.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
- "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+ "version": "25.5.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+ "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
"dev": true,
"requires": {
- "merge-stream": "^1.0.1",
- "supports-color": "^6.1.0"
+ "merge-stream": "^2.0.0",
+ "supports-color": "^7.0.0"
},
"dependencies": {
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
}
}
}
@@ -11593,47 +15356,55 @@
"dev": true
},
"jsdom": {
- "version": "11.12.0",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
- "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+ "version": "15.2.1",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
+ "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
"dev": true,
"requires": {
"abab": "^2.0.0",
- "acorn": "^5.5.3",
- "acorn-globals": "^4.1.0",
+ "acorn": "^7.1.0",
+ "acorn-globals": "^4.3.2",
"array-equal": "^1.0.0",
- "cssom": ">= 0.3.2 < 0.4.0",
- "cssstyle": "^1.0.0",
- "data-urls": "^1.0.0",
+ "cssom": "^0.4.1",
+ "cssstyle": "^2.0.0",
+ "data-urls": "^1.1.0",
"domexception": "^1.0.1",
- "escodegen": "^1.9.1",
+ "escodegen": "^1.11.1",
"html-encoding-sniffer": "^1.0.2",
- "left-pad": "^1.3.0",
- "nwsapi": "^2.0.7",
- "parse5": "4.0.0",
+ "nwsapi": "^2.2.0",
+ "parse5": "5.1.0",
"pn": "^1.1.0",
- "request": "^2.87.0",
- "request-promise-native": "^1.0.5",
- "sax": "^1.2.4",
+ "request": "^2.88.0",
+ "request-promise-native": "^1.0.7",
+ "saxes": "^3.1.9",
"symbol-tree": "^3.2.2",
- "tough-cookie": "^2.3.4",
+ "tough-cookie": "^3.0.1",
"w3c-hr-time": "^1.0.1",
+ "w3c-xmlserializer": "^1.1.2",
"webidl-conversions": "^4.0.2",
- "whatwg-encoding": "^1.0.3",
- "whatwg-mimetype": "^2.1.0",
- "whatwg-url": "^6.4.1",
- "ws": "^5.2.0",
+ "whatwg-encoding": "^1.0.5",
+ "whatwg-mimetype": "^2.3.0",
+ "whatwg-url": "^7.0.0",
+ "ws": "^7.0.0",
"xml-name-validator": "^3.0.0"
},
"dependencies": {
- "ws": {
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
- "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+ "tough-cookie": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+ "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
"dev": true,
"requires": {
- "async-limiter": "~1.0.0"
+ "ip-regex": "^2.1.0",
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
}
+ },
+ "ws": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
+ "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
+ "dev": true
}
}
},
@@ -11724,9 +15495,9 @@
"dev": true
},
"koa": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz",
- "integrity": "sha512-EpR9dElBTDlaDgyhDMiLkXrPwp6ZqgAIBvhhmxQ9XN4TFgW+gEz6tkcsNI6BnUbUftrKDjVFj4lW2/J2aNBMMA==",
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/koa/-/koa-2.12.0.tgz",
+ "integrity": "sha512-WlUBj6PXoVhjI5ljMmlyK+eqkbVFW5XQu8twz6bd4WM2E67IwKgPMu5wIFXGxAsZT7sW5xAB54KhY8WAEkLPug==",
"requires": {
"accepts": "^1.3.5",
"cache-content-type": "^1.0.0",
@@ -11738,7 +15509,6 @@
"depd": "^1.1.2",
"destroy": "^1.0.4",
"encodeurl": "^1.0.2",
- "error-inject": "^1.0.0",
"escape-html": "^1.0.3",
"fresh": "~0.5.2",
"http-assert": "^1.3.0",
@@ -11841,34 +15611,37 @@
}
}
},
- "left-pad": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
- "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
- "dev": true
+ "kuler": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
+ "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
+ "dev": true,
+ "requires": {
+ "colornames": "^1.1.1"
+ }
},
"lerna": {
- "version": "3.20.2",
- "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.20.2.tgz",
- "integrity": "sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA==",
+ "version": "3.22.0",
+ "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.22.0.tgz",
+ "integrity": "sha512-xWlHdAStcqK/IjKvjsSMHPZjPkBV1lS60PmsIeObU8rLljTepc4Sg/hncw4HWfQxPIewHAUTqhrxPIsqf9L2Eg==",
"dev": true,
"requires": {
- "@lerna/add": "3.20.0",
- "@lerna/bootstrap": "3.20.0",
- "@lerna/changed": "3.20.0",
- "@lerna/clean": "3.20.0",
+ "@lerna/add": "3.21.0",
+ "@lerna/bootstrap": "3.21.0",
+ "@lerna/changed": "3.21.0",
+ "@lerna/clean": "3.21.0",
"@lerna/cli": "3.18.5",
- "@lerna/create": "3.18.5",
- "@lerna/diff": "3.18.5",
- "@lerna/exec": "3.20.0",
- "@lerna/import": "3.18.5",
- "@lerna/info": "3.20.0",
- "@lerna/init": "3.18.5",
- "@lerna/link": "3.18.5",
- "@lerna/list": "3.20.0",
- "@lerna/publish": "3.20.2",
- "@lerna/run": "3.20.0",
- "@lerna/version": "3.20.2",
+ "@lerna/create": "3.22.0",
+ "@lerna/diff": "3.21.0",
+ "@lerna/exec": "3.21.0",
+ "@lerna/import": "3.22.0",
+ "@lerna/info": "3.21.0",
+ "@lerna/init": "3.21.0",
+ "@lerna/link": "3.21.0",
+ "@lerna/list": "3.21.0",
+ "@lerna/publish": "3.22.0",
+ "@lerna/run": "3.21.0",
+ "@lerna/version": "3.22.0",
"import-local": "^2.0.0",
"npmlog": "^4.1.2"
}
@@ -11899,16 +15672,23 @@
"readable-stream": "^3.1.1"
}
},
+ "lines-and-columns": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+ "dev": true
+ },
"load-json-file": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
- "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
+ "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
+ "graceful-fs": "^4.1.15",
"parse-json": "^4.0.0",
- "pify": "^3.0.0",
- "strip-bom": "^3.0.0"
+ "pify": "^4.0.1",
+ "strip-bom": "^3.0.0",
+ "type-fest": "^0.3.0"
}
},
"locate-path": {
@@ -12008,10 +15788,73 @@
"resolved": "https://registry.npmjs.org/lodash.xorby/-/lodash.xorby-4.7.0.tgz",
"integrity": "sha1-nBmm+fBjputT3QPBtocXmYAUY9c="
},
+ "log4js": {
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
+ "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
+ "dev": true,
+ "requires": {
+ "date-format": "^2.0.0",
+ "debug": "^4.1.1",
+ "flatted": "^2.0.0",
+ "rfdc": "^1.1.4",
+ "streamroller": "^1.0.6"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "rfdc": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+ "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+ "dev": true
+ }
+ }
+ },
+ "logform": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz",
+ "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==",
+ "dev": true,
+ "requires": {
+ "colors": "^1.2.1",
+ "fast-safe-stringify": "^2.0.4",
+ "fecha": "^2.3.3",
+ "ms": "^2.1.1",
+ "triple-beam": "^1.3.0"
+ },
+ "dependencies": {
+ "fast-safe-stringify": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+ "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+ "dev": true
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
"loglevel": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
- "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="
+ "version": "1.6.8",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
+ "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="
},
"loglevel-debug": {
"version": "0.0.1",
@@ -12021,20 +15864,20 @@
"loglevel": "^1.4.0"
}
},
+ "lolex": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
+ "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
+ "dev": true,
+ "requires": {
+ "@sinonjs/commons": "^1.7.0"
+ }
+ },
"long": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
"integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
},
- "loose-envify": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
- "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
- "dev": true,
- "requires": {
- "js-tokens": "^3.0.0 || ^4.0.0"
- }
- },
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -12066,12 +15909,20 @@
"dev": true,
"requires": {
"pify": "^3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ }
}
},
"make-error": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
- "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"make-fetch-happen": {
@@ -12093,15 +15944,6 @@
"ssri": "^6.0.0"
},
"dependencies": {
- "agent-base": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
- "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
- "dev": true,
- "requires": {
- "es6-promisify": "^5.0.0"
- }
- },
"debug": {
"version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -12151,123 +15993,95 @@
"dev": true
},
"map-obj": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
- "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
+ "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
"dev": true
},
"map-visit": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "dev": true,
- "requires": {
- "object-visit": "^1.0.0"
- }
- },
- "media-typer": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
- "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
- },
- "memcached": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
- "integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
- "requires": {
- "hashring": "3.2.x",
- "jackpot": ">=0.0.6"
- }
- },
- "memcached-mock": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/memcached-mock/-/memcached-mock-0.1.0.tgz",
- "integrity": "sha1-PVPX+7SsHnQXxMNj9Da5CdNlMTI=",
- "dev": true
- },
- "meow": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
- "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
- "dev": true,
- "requires": {
- "camelcase-keys": "^4.0.0",
- "decamelize-keys": "^1.0.0",
- "loud-rejection": "^1.0.0",
- "minimist-options": "^3.0.1",
- "normalize-package-data": "^2.3.4",
- "read-pkg-up": "^3.0.0",
- "redent": "^2.0.0",
- "trim-newlines": "^2.0.0",
- "yargs-parser": "^10.0.0"
- },
- "dependencies": {
- "camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
- "dev": true
- },
- "find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
- "dev": true,
- "requires": {
- "locate-path": "^2.0.0"
- }
- },
- "locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
- "dev": true,
- "requires": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
- "dev": true,
- "requires": {
- "p-try": "^1.0.0"
- }
- },
- "p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
- "dev": true,
- "requires": {
- "p-limit": "^1.1.0"
- }
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "dev": true,
+ "requires": {
+ "object-visit": "^1.0.0"
+ }
+ },
+ "media-typer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+ },
+ "memcached": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
+ "integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
+ "requires": {
+ "hashring": "3.2.x",
+ "jackpot": ">=0.0.6"
+ }
+ },
+ "memcached-mock": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/memcached-mock/-/memcached-mock-0.1.0.tgz",
+ "integrity": "sha1-PVPX+7SsHnQXxMNj9Da5CdNlMTI=",
+ "dev": true
+ },
+ "meow": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz",
+ "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==",
+ "dev": true,
+ "requires": {
+ "@types/minimist": "^1.2.0",
+ "arrify": "^2.0.1",
+ "camelcase": "^6.0.0",
+ "camelcase-keys": "^6.2.2",
+ "decamelize-keys": "^1.1.0",
+ "hard-rejection": "^2.1.0",
+ "minimist-options": "^4.0.2",
+ "normalize-package-data": "^2.5.0",
+ "read-pkg-up": "^7.0.1",
+ "redent": "^3.0.0",
+ "trim-newlines": "^3.0.0",
+ "type-fest": "^0.13.1",
+ "yargs-parser": "^18.1.3"
+ },
+ "dependencies": {
+ "arrify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+ "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+ "dev": true
},
- "p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "camelcase": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+ "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
"dev": true
},
- "read-pkg-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
- "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
- "dev": true,
- "requires": {
- "find-up": "^2.0.0",
- "read-pkg": "^3.0.0"
- }
+ "type-fest": {
+ "version": "0.13.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+ "dev": true
},
"yargs-parser": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
- "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
- "camelcase": "^4.1.0"
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true
+ }
}
}
}
@@ -12278,45 +16092,10 @@
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
},
"merge-stream": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
- "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
- "dev": true,
- "requires": {
- "readable-stream": "^2.0.1"
- },
- "dependencies": {
- "isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
- "dev": true
- },
- "readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
- "dev": true,
- "requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
- }
- },
- "string_decoder": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
- "requires": {
- "safe-buffer": "~5.1.0"
- }
- }
- }
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
},
"merge2": {
"version": "1.3.0",
@@ -12443,6 +16222,12 @@
"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
"dev": true
},
+ "min-indent": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
+ "integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=",
+ "dev": true
+ },
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -12464,13 +16249,22 @@
"dev": true
},
"minimist-options": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
- "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
"dev": true,
"requires": {
"arrify": "^1.0.1",
- "is-plain-obj": "^1.1.0"
+ "is-plain-obj": "^1.1.0",
+ "kind-of": "^6.0.3"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true
+ }
}
},
"minipass": {
@@ -12483,111 +16277,6 @@
"yallist": "^3.0.0"
}
},
- "minipass-collect": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
- "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
- "requires": {
- "minipass": "^3.0.0"
- },
- "dependencies": {
- "minipass": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
- "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "minipass-fetch": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz",
- "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
- "requires": {
- "encoding": "^0.1.12",
- "minipass": "^3.1.0",
- "minipass-pipeline": "^1.2.2",
- "minipass-sized": "^1.0.3",
- "minizlib": "^2.0.0"
- },
- "dependencies": {
- "minipass": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
- "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "minizlib": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
- "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
- "requires": {
- "minipass": "^3.0.0",
- "yallist": "^4.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "minipass-flush": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
- "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
- "requires": {
- "minipass": "^3.0.0"
- },
- "dependencies": {
- "minipass": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
- "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
- "minipass-pipeline": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
- "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
- "requires": {
- "minipass": "^3.0.0"
- },
- "dependencies": {
- "minipass": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
- "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
- }
- }
- },
"minipass-sized": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
@@ -12695,6 +16384,13 @@
"integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
"dev": true
},
+ "moment": {
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
+ "dev": true,
+ "optional": true
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -12731,6 +16427,44 @@
"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
"dev": true
},
+ "mv": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+ "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "mkdirp": "~0.5.1",
+ "ncp": "~2.0.0",
+ "rimraf": "~2.4.0"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "2 || 3",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "rimraf": {
+ "version": "2.4.5",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+ "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "glob": "^6.0.1"
+ }
+ }
+ }
+ },
"mz": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -12742,13 +16476,6 @@
"thenify-all": "^1.0.0"
}
},
- "nan": {
- "version": "2.13.2",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
- "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==",
- "dev": true,
- "optional": true
- },
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -12763,57 +16490,33 @@
"is-windows": "^1.0.2",
"kind-of": "^6.0.2",
"object.pick": "^1.3.0",
- "regex-not": "^1.0.0",
- "snapdragon": "^0.8.1",
- "to-regex": "^3.0.1"
- }
- },
- "natural-compare": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
- "dev": true
- },
- "needle": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
- "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "^3.2.6",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
- },
- "dependencies": {
- "debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "^2.1.1"
- }
- },
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true,
- "optional": true
- }
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
}
},
+ "natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+ "dev": true
+ },
+ "ncp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+ "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+ "dev": true,
+ "optional": true
+ },
"negotiator": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"neo-async": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
- "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
"dev": true
},
"nice-try": {
@@ -12862,9 +16565,9 @@
"integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA=="
},
"node-fetch-npm": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
- "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+ "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
"dev": true,
"requires": {
"encoding": "^0.1.11",
@@ -12873,9 +16576,9 @@
}
},
"node-gyp": {
- "version": "5.0.7",
- "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.7.tgz",
- "integrity": "sha512-K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz",
+ "integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==",
"dev": true,
"requires": {
"env-paths": "^2.2.0",
@@ -12906,9 +16609,9 @@
}
},
"graceful-fs": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
- "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"dev": true
},
"semver": {
@@ -12932,13 +16635,14 @@
"dev": true
},
"node-notifier": {
- "version": "5.4.2",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.2.tgz",
- "integrity": "sha512-85nkTziazE2dR4pyoLxMwz0b9MmxFQPVXYs/WlWI7CPtBkARJOV+89khdNjpbclXIJDECQYnTvh1xuZV3WHkCA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz",
+ "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==",
"dev": true,
+ "optional": true,
"requires": {
"growly": "^1.3.0",
- "is-wsl": "^2.1.0",
+ "is-wsl": "^2.1.1",
"semver": "^6.3.0",
"shellwords": "^0.1.1",
"which": "^1.3.1"
@@ -12948,46 +16652,15 @@
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
- }
- }
- },
- "node-pre-gyp": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
- "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
- "dev": true,
- "optional": true,
- "requires": {
- "detect-libc": "^1.0.2",
- "mkdirp": "^0.5.1",
- "needle": "^2.2.1",
- "nopt": "^4.0.1",
- "npm-packlist": "^1.1.6",
- "npmlog": "^4.0.2",
- "rc": "^1.2.7",
- "rimraf": "^2.6.1",
- "semver": "^5.3.0",
- "tar": "^4"
- },
- "dependencies": {
- "nopt": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
- "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
- "optional": true,
- "requires": {
- "abbrev": "1",
- "osenv": "^0.1.4"
- }
+ "optional": true
}
}
},
"nopt": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
- "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+ "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"dev": true,
"requires": {
"abbrev": "1",
@@ -13022,15 +16695,18 @@
"dev": true
},
"npm-bundled": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
- "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
- "dev": true
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+ "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+ "dev": true,
+ "requires": {
+ "npm-normalize-package-bin": "^1.0.1"
+ }
},
"npm-lifecycle": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz",
- "integrity": "sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz",
+ "integrity": "sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==",
"dev": true,
"requires": {
"byline": "^5.0.0",
@@ -13041,14 +16717,6 @@
"uid-number": "0.0.6",
"umask": "^1.1.0",
"which": "^1.3.1"
- },
- "dependencies": {
- "resolve-from": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true
- }
}
},
"npm-normalize-package-bin": {
@@ -13070,13 +16738,14 @@
}
},
"npm-packlist": {
- "version": "1.4.6",
- "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz",
- "integrity": "sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==",
+ "version": "1.4.8",
+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+ "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
"dev": true,
"requires": {
"ignore-walk": "^3.0.1",
- "npm-bundled": "^1.0.1"
+ "npm-bundled": "^1.0.1",
+ "npm-normalize-package-bin": "^1.0.1"
}
},
"npm-pick-manifest": {
@@ -13118,9 +16787,9 @@
"dev": true
},
"nwsapi": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz",
- "integrity": "sha512-T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+ "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
"dev": true
},
"oauth-sign": {
@@ -13224,6 +16893,12 @@
"wrappy": "1"
}
},
+ "one-time": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz",
+ "integrity": "sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=",
+ "dev": true
+ },
"onetime": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -13238,24 +16913,6 @@
"resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
"integrity": "sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q="
},
- "optimist": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
- "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
- "dev": true,
- "requires": {
- "minimist": "~0.0.1",
- "wordwrap": "~0.0.2"
- },
- "dependencies": {
- "minimist": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
- "dev": true
- }
- }
- },
"optionator": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -13311,13 +16968,10 @@
}
},
"p-each-series": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
- "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
- "dev": true,
- "requires": {
- "p-reduce": "^1.0.0"
- }
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
+ "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+ "dev": true
},
"p-finally": {
"version": "1.0.0",
@@ -13412,9 +17066,9 @@
"dev": true
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -13476,9 +17130,9 @@
}
},
"parse5": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
- "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+ "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
"dev": true
},
"parseurl": {
@@ -13533,6 +17187,14 @@
"dev": true,
"requires": {
"pify": "^3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ }
}
},
"pathval": {
@@ -13547,10 +17209,16 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"dev": true
},
+ "picomatch": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+ "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+ "dev": true
+ },
"pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
"dev": true
},
"pinkie": {
@@ -13640,15 +17308,16 @@
"dev": true
},
"prettier": {
- "version": "1.19.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
- "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+ "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
"dev": true
},
"pretty-format": {
"version": "24.9.0",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
"integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+ "dev": true,
"requires": {
"@jest/types": "^24.9.0",
"ansi-regex": "^4.0.0",
@@ -13683,13 +17352,13 @@
}
},
"prompts": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
- "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+ "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
"dev": true,
"requires": {
"kleur": "^3.0.3",
- "sisteransi": "^1.0.3"
+ "sisteransi": "^1.0.4"
}
},
"promzard": {
@@ -13821,9 +17490,9 @@
}
},
"quick-lru": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
- "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
"dev": true
},
"range-parser": {
@@ -13857,23 +17526,11 @@
}
}
},
- "rc": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
- "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
- "dev": true,
- "optional": true,
- "requires": {
- "deep-extend": "^0.6.0",
- "ini": "~1.3.0",
- "minimist": "^1.2.0",
- "strip-json-comments": "~2.0.1"
- }
- },
"react-is": {
"version": "16.8.4",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz",
- "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA=="
+ "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==",
+ "dev": true
},
"read": {
"version": "1.0.7",
@@ -13926,28 +17583,110 @@
"load-json-file": "^4.0.0",
"normalize-package-data": "^2.3.2",
"path-type": "^3.0.0"
+ },
+ "dependencies": {
+ "load-json-file": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "parse-json": "^4.0.0",
+ "pify": "^3.0.0",
+ "strip-bom": "^3.0.0"
+ }
+ },
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ }
}
},
"read-pkg-up": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
- "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"dev": true,
"requires": {
- "find-up": "^3.0.0",
- "read-pkg": "^3.0.0"
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
},
"dependencies": {
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "parse-json": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
+ "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-better-errors": "^1.0.1",
+ "lines-and-columns": "^1.1.6"
+ }
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
"read-pkg": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
- "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"dev": true,
"requires": {
- "load-json-file": "^4.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^3.0.0"
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true
+ }
}
+ },
+ "type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true
}
}
},
@@ -13975,22 +17714,19 @@
}
},
"realpath-native": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
- "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
- "dev": true,
- "requires": {
- "util.promisify": "^1.0.0"
- }
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz",
+ "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==",
+ "dev": true
},
"redent": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
- "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
"dev": true,
"requires": {
- "indent-string": "^3.0.0",
- "strip-indent": "^2.0.0"
+ "indent-string": "^4.0.0",
+ "strip-indent": "^3.0.0"
}
},
"redis-commands": {
@@ -14145,9 +17881,9 @@
"dev": true
},
"require-main-filename": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
- "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
"dev": true
},
"resolve": {
@@ -14166,12 +17902,20 @@
"dev": true,
"requires": {
"resolve-from": "^3.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
}
},
"resolve-from": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
- "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
"dev": true
},
"resolve-url": {
@@ -14228,13 +17972,10 @@
"dev": true
},
"run-async": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
- "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
- "dev": true,
- "requires": {
- "is-promise": "^2.1.0"
- }
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+ "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+ "dev": true
},
"run-queue": {
"version": "1.0.3",
@@ -14245,9 +17986,9 @@
}
},
"rxjs": {
- "version": "6.5.4",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
- "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+ "version": "6.5.5",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+ "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -14258,6 +17999,13 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
+ "safe-json-stringify": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
+ "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
+ "dev": true,
+ "optional": true
+ },
"safe-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -14289,16 +18037,20 @@
"walker": "~1.0.5"
}
},
- "sax": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
- "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
- "dev": true
+ "saxes": {
+ "version": "3.1.11",
+ "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+ "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+ "dev": true,
+ "requires": {
+ "xmlchars": "^2.1.1"
+ }
},
"semver": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
- "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+ "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+ "dev": true
},
"semver-store": {
"version": "0.3.0",
@@ -14427,7 +18179,8 @@
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
- "dev": true
+ "dev": true,
+ "optional": true
},
"signal-exit": {
"version": "3.0.2",
@@ -14440,10 +18193,27 @@
"resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0="
},
+ "simple-swizzle": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+ "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+ "dev": true,
+ "requires": {
+ "is-arrayish": "^0.3.1"
+ },
+ "dependencies": {
+ "is-arrayish": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+ "dev": true
+ }
+ }
+ },
"sisteransi": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
- "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
"dev": true
},
"slash": {
@@ -14589,9 +18359,21 @@
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+ "dev": true,
"requires": {
"agent-base": "~4.2.1",
"socks": "~2.3.2"
+ },
+ "dependencies": {
+ "agent-base": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+ "dev": true,
+ "requires": {
+ "es6-promisify": "^5.0.0"
+ }
+ }
}
},
"sort-keys": {
@@ -14729,6 +18511,12 @@
"figgy-pudding": "^3.5.1"
}
},
+ "stack-trace": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+ "dev": true
+ },
"stack-utils": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
@@ -14797,34 +18585,69 @@
"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
"dev": true
},
+ "streamroller": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
+ "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
+ "dev": true,
+ "requires": {
+ "async": "^2.6.2",
+ "date-format": "^2.0.0",
+ "debug": "^3.2.6",
+ "fs-extra": "^7.0.1",
+ "lodash": "^4.17.14"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "fs-extra": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
"streamsearch": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
"integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
},
"string-length": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
- "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz",
+ "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==",
"dev": true,
- "requires": {
- "astral-regex": "^1.0.0",
- "strip-ansi": "^4.0.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
- "dev": true
- },
+ "requires": {
+ "astral-regex": "^1.0.0",
+ "strip-ansi": "^5.2.0"
+ },
+ "dependencies": {
"strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "^4.1.0"
}
}
}
@@ -14838,32 +18661,6 @@
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
- "dev": true,
- "requires": {
- "number-is-nan": "^1.0.0"
- }
- },
- "strip-ansi": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
- "dev": true,
- "requires": {
- "ansi-regex": "^2.0.0"
- }
- }
}
},
"string_decoder": {
@@ -14876,12 +18673,20 @@
}
},
"strip-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz",
- "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "^4.1.0"
+ "ansi-regex": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+ }
}
},
"strip-bom": {
@@ -14896,18 +18701,20 @@
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
- "strip-indent": {
+ "strip-final-newline": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
- "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
"dev": true
},
- "strip-json-comments": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
- "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+ "strip-indent": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
"dev": true,
- "optional": true
+ "requires": {
+ "min-indent": "^1.0.0"
+ }
},
"strong-log-transformer": {
"version": "2.1.0",
@@ -15032,6 +18839,33 @@
"has-flag": "^3.0.0"
}
},
+ "supports-hyperlinks": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
+ "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0",
+ "supports-color": "^7.0.0"
+ },
+ "dependencies": {
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -15090,11 +18924,12 @@
}
},
"http-proxy-agent": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.0.tgz",
- "integrity": "sha512-GX0FA6+IcDf4Oxc/FBWgYj4zKgo/DnZrksaG9jyuQLExs6xlX+uI5lcA8ymM3JaZTRrF/4s2UX19wJolyo7OBA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
"dev": true,
"requires": {
+ "@tootallnate/once": "1",
"agent-base": "6",
"debug": "4"
}
@@ -15125,18 +18960,68 @@
"pify": "^3.0.0",
"temp-dir": "^1.0.0",
"uuid": "^3.0.1"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ }
+ }
+ },
+ "terminal-link": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+ "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+ "dev": true,
+ "requires": {
+ "ansi-escapes": "^4.2.1",
+ "supports-hyperlinks": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-escapes": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+ "dev": true,
+ "requires": {
+ "type-fest": "^0.11.0"
+ }
+ },
+ "type-fest": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+ "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+ "dev": true
+ }
}
},
"test-exclude": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz",
- "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
"dev": true,
"requires": {
- "arrify": "^1.0.1",
- "minimatch": "^3.0.4",
- "read-pkg-up": "^4.0.0",
- "require-main-filename": "^1.0.1"
+ "@istanbuljs/schema": "^0.1.2",
+ "glob": "^7.1.4",
+ "minimatch": "^3.0.4"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ }
}
},
"test-listen": {
@@ -15151,6 +19036,12 @@
"integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
"dev": true
},
+ "text-hex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+ "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
+ "dev": true
+ },
"thenify": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
@@ -15170,9 +19061,9 @@
}
},
"throat": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
- "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+ "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
"dev": true
},
"through": {
@@ -15317,9 +19208,9 @@
}
},
"trim-newlines": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
- "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
+ "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
"dev": true
},
"trim-off-newlines": {
@@ -15334,6 +19225,12 @@
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
"dev": true
},
+ "triple-beam": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+ "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==",
+ "dev": true
+ },
"ts-invariant": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz",
@@ -15343,9 +19240,9 @@
}
},
"ts-jest": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz",
- "integrity": "sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==",
+ "version": "25.5.1",
+ "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.1.tgz",
+ "integrity": "sha512-kHEUlZMK8fn8vkxDjwbHlxXRB9dHYpyzqKIGDNxbzs+Rz+ssNDSDNusEK8Fk/sDd4xE6iKoQLfFkFVaskmTJyw==",
"dev": true,
"requires": {
"bs-logger": "0.x",
@@ -15354,25 +19251,69 @@
"json5": "2.x",
"lodash.memoize": "4.x",
"make-error": "1.x",
+ "micromatch": "4.x",
"mkdirp": "0.x",
- "resolve": "1.x",
- "semver": "^5.5",
- "yargs-parser": "10.x"
+ "semver": "6.x",
+ "yargs-parser": "18.x"
},
"dependencies": {
- "camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.0.5"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
"yargs-parser": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
- "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
- "camelcase": "^4.1.0"
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
}
}
}
@@ -15438,21 +19379,29 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
+ "typedarray-to-buffer": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+ "dev": true,
+ "requires": {
+ "is-typedarray": "^1.0.0"
+ }
+ },
"typescript": {
- "version": "3.8.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
- "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+ "version": "3.9.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+ "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
"dev": true
},
"uglify-js": {
- "version": "3.4.9",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
- "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+ "version": "3.9.3",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.3.tgz",
+ "integrity": "sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==",
"dev": true,
"optional": true,
"requires": {
- "commander": "~2.17.1",
- "source-map": "~0.6.1"
+ "commander": "~2.20.3"
}
},
"uid-number": {
@@ -15496,9 +19445,9 @@
}
},
"universal-user-agent": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz",
- "integrity": "sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz",
+ "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==",
"dev": true,
"requires": {
"os-name": "^3.1.0"
@@ -15632,6 +19581,25 @@
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
},
+ "v8-to-istanbul": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz",
+ "integrity": "sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==",
+ "dev": true,
+ "requires": {
+ "@types/istanbul-lib-coverage": "^2.0.1",
+ "convert-source-map": "^1.6.0",
+ "source-map": "^0.7.3"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+ "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+ "dev": true
+ }
+ }
+ },
"validate-npm-package-license": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -15676,6 +19644,17 @@
"browser-process-hrtime": "^0.1.2"
}
},
+ "w3c-xmlserializer": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+ "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+ "dev": true,
+ "requires": {
+ "domexception": "^1.0.1",
+ "webidl-conversions": "^4.0.2",
+ "xml-name-validator": "^3.0.0"
+ }
+ },
"walker": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
@@ -15733,9 +19712,9 @@
"dev": true
},
"whatwg-url": {
- "version": "6.5.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
- "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+ "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
"dev": true,
"requires": {
"lodash.sortby": "^4.7.0",
@@ -15768,18 +19747,77 @@
}
},
"windows-release": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz",
- "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz",
+ "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==",
"dev": true,
"requires": {
"execa": "^1.0.0"
}
},
+ "winston": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz",
+ "integrity": "sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==",
+ "dev": true,
+ "requires": {
+ "async": "^2.6.1",
+ "diagnostics": "^1.1.1",
+ "is-stream": "^1.1.0",
+ "logform": "^2.1.1",
+ "one-time": "0.0.4",
+ "readable-stream": "^3.1.1",
+ "stack-trace": "0.0.x",
+ "triple-beam": "^1.3.0",
+ "winston-transport": "^4.3.0"
+ }
+ },
+ "winston-transport": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz",
+ "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "^2.3.6",
+ "triple-beam": "^1.2.0"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "dev": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
+ }
+ },
"wordwrap": {
- "version": "0.0.3",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
"dev": true
},
"wrap-ansi": {
@@ -15793,6 +19831,12 @@
"strip-ansi": "^5.0.0"
},
"dependencies": {
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -15803,6 +19847,15 @@
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^5.1.0"
}
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.1.0"
+ }
}
}
},
@@ -15812,9 +19865,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write-file-atomic": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
- "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.11",
@@ -15845,23 +19898,6 @@
"pify": "^4.0.1",
"semver": "^5.6.0"
}
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
- "write-file-atomic": {
- "version": "2.4.3",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
- "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.11",
- "imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.2"
- }
}
}
},
@@ -15875,6 +19911,12 @@
"write-json-file": "^2.2.0"
},
"dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ },
"write-json-file": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz",
@@ -15911,6 +19953,12 @@
"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
"dev": true
},
+ "xmlchars": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+ "dev": true
+ },
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -15929,9 +19977,9 @@
"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
},
"yargs": {
- "version": "14.2.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz",
- "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==",
+ "version": "14.2.3",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+ "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
"dev": true,
"requires": {
"cliui": "^5.0.0",
@@ -15944,13 +19992,13 @@
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^15.0.0"
+ "yargs-parser": "^15.0.1"
},
"dependencies": {
- "require-main-filename": {
+ "is-fullwidth-code-point": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
"string-width": {
@@ -15963,13 +20011,22 @@
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^5.1.0"
}
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.1.0"
+ }
}
}
},
"yargs-parser": {
- "version": "15.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz",
- "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==",
+ "version": "15.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
+ "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -15982,14 +20039,14 @@
"integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="
},
"zen-observable": {
- "version": "0.8.14",
- "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.14.tgz",
- "integrity": "sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g=="
+ "version": "0.8.15",
+ "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
+ "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="
},
"zen-observable-ts": {
- "version": "0.8.20",
- "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz",
- "integrity": "sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==",
+ "version": "0.8.21",
+ "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz",
+ "integrity": "sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==",
"requires": {
"tslib": "^1.9.3",
"zen-observable": "^0.8.0"
diff --git a/package.json b/package.json
index db049b5db6b..351e1dc9254 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,9 @@
"compile:clean": "tsc --build tsconfig.build.json --clean",
"watch": "tsc --build tsconfig.build.json --watch",
"release:version-bump": "lerna version -m 'Release'",
- "release:version-bump:server": "npm run release:version-bump -- --force-publish=apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro",
+ "release:version-bump:server": "npm run release:version-bump -- --force-publish=apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing",
"release:version-bump:federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway",
+ "release:version-bump:server-and-federation": "npm run release:version-bump -- --force-publish=@apollo/federation,@apollo/gateway,apollo-server,apollo-server-core,apollo-server-azure-functions,apollo-server-cloud-functions,apollo-server-cloudflare,apollo-server-express,apollo-server-fastify,apollo-server-hapi,apollo-server-koa,apollo-server-lambda,apollo-server-micro,apollo-server-integration-testsuite,apollo-server-testing",
"release:start-ci-publish": "node -p '`Publish (dist-tag:${process.env.APOLLO_DIST_TAG || \"latest\"})`' | git tag -F - \"publish/$(date -u '+%Y%m%d%H%M%S')\" && git push origin \"$(git describe --match='publish/*' --tags --exact-match HEAD)\"",
"postinstall": "lerna run prepare && npm run compile",
"test": "jest --verbose",
@@ -25,7 +26,7 @@
"node": ">=6"
},
"dependencies": {
- "@apollographql/apollo-tools": "0.4.3",
+ "@apollographql/apollo-tools": "0.4.8",
"@apollo/federation": "file:packages/apollo-federation",
"@apollo/gateway": "file:packages/apollo-gateway",
"apollo-cache-control": "file:packages/apollo-cache-control",
@@ -51,6 +52,7 @@
"apollo-server-lambda": "file:packages/apollo-server-lambda",
"apollo-server-micro": "file:packages/apollo-server-micro",
"apollo-server-plugin-base": "file:packages/apollo-server-plugin-base",
+ "apollo-server-plugin-operation-registry": "file:packages/apollo-server-plugin-operation-registry",
"apollo-server-plugin-response-cache": "file:packages/apollo-server-plugin-response-cache",
"apollo-server-testing": "file:packages/apollo-server-testing",
"apollo-server-types": "file:packages/apollo-server-types",
@@ -58,16 +60,17 @@
"graphql-extensions": "file:packages/graphql-extensions"
},
"devDependencies": {
- "@types/async-retry": "1.4.1",
- "@types/aws-lambda": "8.10.45",
+ "@types/async-retry": "1.4.2",
+ "@types/aws-lambda": "8.10.51",
"@types/body-parser": "1.19.0",
+ "@types/bunyan": "1.8.6",
"@types/connect": "3.4.33",
"@types/fast-json-stable-stringify": "2.0.0",
- "@types/hapi": "17.8.7",
- "@types/ioredis": "4.14.8",
- "@types/jest": "24.9.1",
- "@types/koa-router": "7.4.0",
- "@types/lodash": "4.14.149",
+ "@types/hapi": "17.8.8",
+ "@types/ioredis": "4.16.3",
+ "@types/jest": "25.2.3",
+ "@types/koa-router": "7.4.1",
+ "@types/lodash": "4.14.154",
"@types/lodash.sortby": "4.7.6",
"@types/lodash.xorby": "4.7.6",
"@types/loglevel": "1.5.4",
@@ -75,21 +78,24 @@
"@types/memcached": "2.2.6",
"@types/micro": "7.3.3",
"@types/nock": "10.0.3",
- "@types/node": "8.10.59",
+ "@types/node": "8.10.61",
"@types/node-fetch": "2.3.2",
"@types/qs-middleware": "1.0.1",
- "@types/request": "2.48.4",
- "@types/request-promise": "4.1.45",
+ "@types/request": "2.48.5",
+ "@types/request-promise": "4.1.46",
+ "@types/supertest": "^2.0.8",
"@types/test-listen": "1.1.0",
"@types/type-is": "1.6.3",
- "@types/ws": "6.0.4",
+ "@types/uuid": "^7.0.3",
+ "@types/ws": "7.2.4",
"apollo-fetch": "0.7.0",
- "apollo-link": "1.2.13",
- "apollo-link-http": "1.5.16",
+ "apollo-link": "1.2.14",
+ "apollo-link-http": "1.5.17",
"apollo-link-persisted-queries": "0.2.2",
"azure-functions-ts-essentials": "1.3.2",
"body-parser": "1.19.0",
- "codecov": "3.6.5",
+ "bunyan": "1.8.12",
+ "codecov": "3.7.0",
"connect": "3.7.0",
"deep-freeze": "0.0.1",
"express": "4.17.1",
@@ -98,29 +104,32 @@
"graphql": "14.6.0",
"graphql-subscriptions": "1.1.0",
"graphql-tag": "2.10.3",
- "graphql-tools": "4.0.7",
+ "graphql-tools": "4.0.8",
"hapi": "17.8.5",
- "ioredis": "4.16.0",
- "jest": "24.9.0",
- "jest-config": "24.9.0",
- "jest-junit": "9.0.0",
- "jest-matcher-utils": "24.9.0",
+ "ioredis": "4.17.3",
+ "jest": "25.5.4",
+ "jest-config": "25.5.4",
+ "jest-junit": "10.0.0",
+ "jest-matcher-utils": "25.5.0",
"js-sha256": "0.9.0",
- "koa": "2.11.0",
- "lerna": "3.20.2",
+ "koa": "2.12.0",
+ "lerna": "3.22.0",
+ "log4js": "4.5.1",
"memcached-mock": "0.1.0",
"mock-req": "0.2.0",
"nock": "10.0.6",
"node-fetch": "2.3.0",
- "prettier": "1.19.1",
+ "prettier": "2.0.5",
"qs-middleware": "1.0.3",
"request": "2.88.2",
"request-promise": "4.2.5",
"subscriptions-transport-ws": "0.9.16",
"supertest": "4.0.2",
"test-listen": "1.1.0",
- "ts-jest": "24.3.0",
- "typescript": "3.8.3",
+ "ts-jest": "25.5.1",
+ "typescript": "3.9.3",
+ "winston": "3.2.1",
+ "winston-transport": "4.3.0",
"ws": "6.2.1"
},
"jest": {
diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json
index 4fbb9715371..b0366f16e2a 100644
--- a/packages/apollo-cache-control/package.json
+++ b/packages/apollo-cache-control/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-cache-control",
- "version": "0.9.0",
+ "version": "0.11.0",
"description": "A GraphQL extension for cache control",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -12,9 +12,9 @@
},
"dependencies": {
"apollo-server-env": "file:../apollo-server-env",
- "graphql-extensions": "file:../graphql-extensions"
+ "apollo-server-plugin-base": "file:../apollo-server-plugin-base"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts b/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts
deleted file mode 100644
index 29a6e0d195d..00000000000
--- a/packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { ResponsePath, GraphQLError } from 'graphql';
-import { GraphQLResponse } from 'graphql-extensions';
-import { Headers } from 'apollo-server-env';
-import { CacheControlExtension, CacheScope } from '../';
-
-describe('CacheControlExtension', () => {
- let cacheControlExtension: CacheControlExtension;
-
- beforeEach(() => {
- cacheControlExtension = new CacheControlExtension();
- });
-
- describe('willSendResponse', () => {
- let graphqlResponse: GraphQLResponse;
-
- beforeEach(() => {
- cacheControlExtension.options.calculateHttpHeaders = true;
- cacheControlExtension.computeOverallCachePolicy = () => ({
- maxAge: 300,
- scope: CacheScope.Public,
- });
- graphqlResponse = {
- http: {
- headers: new Headers(),
- },
- data: { test: 'test' },
- };
- });
-
- it('sets cache-control header', () => {
- cacheControlExtension.willSendResponse &&
- cacheControlExtension.willSendResponse({ graphqlResponse });
- expect(graphqlResponse.http!.headers.get('Cache-Control')).toBe(
- 'max-age=300, public',
- );
- });
-
- const shouldNotSetCacheControlHeader = () => {
- cacheControlExtension.willSendResponse &&
- cacheControlExtension.willSendResponse({ graphqlResponse });
- expect(graphqlResponse.http!.headers.get('Cache-Control')).toBeNull();
- };
-
- it('does not set cache-control header if calculateHttpHeaders is set to false', () => {
- cacheControlExtension.options.calculateHttpHeaders = false;
- shouldNotSetCacheControlHeader();
- });
-
- it('does not set cache-control header if graphqlResponse has errors', () => {
- graphqlResponse.errors = [new GraphQLError('Test Error')];
- shouldNotSetCacheControlHeader();
- });
-
- it('does not set cache-control header if there is no overall cache policy', () => {
- cacheControlExtension.computeOverallCachePolicy = () => undefined;
- shouldNotSetCacheControlHeader();
- });
- });
-
- describe('computeOverallCachePolicy', () => {
- const responsePath: ResponsePath = {
- key: 'test',
- prev: undefined,
- };
- const responseSubPath: ResponsePath = {
- key: 'subTest',
- prev: responsePath,
- };
- const responseSubSubPath: ResponsePath = {
- key: 'subSubTest',
- prev: responseSubPath,
- };
-
- it('returns undefined without cache hints', () => {
- const cachePolicy = cacheControlExtension.computeOverallCachePolicy();
- expect(cachePolicy).toBeUndefined();
- });
-
- it('returns lowest max age value', () => {
- cacheControlExtension.addHint(responsePath, { maxAge: 10 });
- cacheControlExtension.addHint(responseSubPath, { maxAge: 20 });
-
- const cachePolicy = cacheControlExtension.computeOverallCachePolicy();
- expect(cachePolicy).toHaveProperty('maxAge', 10);
- });
-
- it('returns undefined if any cache hint has a maxAge of 0', () => {
- cacheControlExtension.addHint(responsePath, { maxAge: 120 });
- cacheControlExtension.addHint(responseSubPath, { maxAge: 0 });
- cacheControlExtension.addHint(responseSubSubPath, { maxAge: 20 });
-
- const cachePolicy = cacheControlExtension.computeOverallCachePolicy();
- expect(cachePolicy).toBeUndefined();
- });
-
- it('returns PUBLIC scope by default', () => {
- cacheControlExtension.addHint(responsePath, { maxAge: 10 });
-
- const cachePolicy = cacheControlExtension.computeOverallCachePolicy();
- expect(cachePolicy).toHaveProperty('scope', CacheScope.Public);
- });
-
- it('returns PRIVATE scope if any cache hint has PRIVATE scope', () => {
- cacheControlExtension.addHint(responsePath, {
- maxAge: 10,
- scope: CacheScope.Public,
- });
- cacheControlExtension.addHint(responseSubPath, {
- maxAge: 10,
- scope: CacheScope.Private,
- });
-
- const cachePolicy = cacheControlExtension.computeOverallCachePolicy();
- expect(cachePolicy).toHaveProperty('scope', CacheScope.Private);
- });
- });
-});
diff --git a/packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts b/packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts
new file mode 100644
index 00000000000..a29cbbf02b1
--- /dev/null
+++ b/packages/apollo-cache-control/src/__tests__/cacheControlPlugin.test.ts
@@ -0,0 +1,171 @@
+import { ResponsePath, GraphQLError } from 'graphql';
+import { Headers } from 'apollo-server-env';
+import {
+ CacheScope,
+ CacheControlExtensionOptions,
+ CacheHint,
+ __testing__,
+ plugin,
+} from '../';
+const { addHint, computeOverallCachePolicy } = __testing__;
+import {
+ GraphQLRequestContextWillSendResponse,
+ GraphQLResponse,
+} from 'apollo-server-plugin-base';
+import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness';
+
+describe('plugin', () => {
+ describe('willSendResponse', () => {
+ function makePluginWithOptions({
+ pluginInitializationOptions,
+ overallCachePolicy,
+ errors = false,
+ }: {
+ pluginInitializationOptions?: CacheControlExtensionOptions;
+ overallCachePolicy?: Required;
+ errors?: boolean;
+ } = Object.create(null)) {
+ const pluginInstance = plugin(pluginInitializationOptions);
+
+ return pluginTestHarness({
+ pluginInstance,
+ overallCachePolicy,
+ graphqlRequest: { query: 'does not matter' },
+ executor: () => {
+ const response: GraphQLResponse = {
+ http: {
+ headers: new Headers(),
+ },
+ data: { test: 'test' },
+ };
+
+ if (errors) {
+ response.errors = [new GraphQLError('Test Error')];
+ }
+
+ return response;
+ },
+ });
+ }
+
+ describe('HTTP cache-control header', () => {
+ const overallCachePolicy: Required = {
+ maxAge: 300,
+ scope: CacheScope.Public,
+ };
+
+ it('is set when calculateHttpHeaders is set to true', async () => {
+ const requestContext = await makePluginWithOptions({
+ pluginInitializationOptions: {
+ calculateHttpHeaders: true,
+ },
+ overallCachePolicy,
+ });
+ expect(requestContext.response.http!.headers.get('Cache-Control')).toBe(
+ 'max-age=300, public',
+ );
+ });
+
+ const shouldNotSetCacheControlHeader = (
+ requestContext: GraphQLRequestContextWillSendResponse,
+ ) => {
+ expect(
+ requestContext.response.http!.headers.get('Cache-Control'),
+ ).toBeNull();
+ };
+
+ it('is not set when calculateHttpHeaders is set to false', async () => {
+ const requestContext = await makePluginWithOptions({
+ pluginInitializationOptions: {
+ calculateHttpHeaders: false,
+ },
+ overallCachePolicy,
+ });
+ shouldNotSetCacheControlHeader(requestContext);
+ });
+
+ it('is not set if response has errors', async () => {
+ const requestContext = await makePluginWithOptions({
+ pluginInitializationOptions: {
+ calculateHttpHeaders: false,
+ },
+ overallCachePolicy,
+ errors: true,
+ });
+ shouldNotSetCacheControlHeader(requestContext);
+ });
+
+ it('does not set cache-control header if there is no overall cache policy', async () => {
+ const requestContext = await makePluginWithOptions({
+ pluginInitializationOptions: {
+ calculateHttpHeaders: false,
+ },
+ overallCachePolicy: undefined,
+ errors: true,
+ });
+ shouldNotSetCacheControlHeader(requestContext);
+ });
+ });
+ });
+
+ describe('computeOverallCachePolicy', () => {
+ const responsePath: ResponsePath = {
+ key: 'test',
+ prev: undefined,
+ };
+ const responseSubPath: ResponsePath = {
+ key: 'subTest',
+ prev: responsePath,
+ };
+ const responseSubSubPath: ResponsePath = {
+ key: 'subSubTest',
+ prev: responseSubPath,
+ };
+
+ const hints = new Map();
+ afterEach(() => hints.clear());
+
+ it('returns undefined without cache hints', () => {
+ const cachePolicy = computeOverallCachePolicy(hints);
+ expect(cachePolicy).toBeUndefined();
+ });
+
+ it('returns lowest max age value', () => {
+ addHint(hints, responsePath, { maxAge: 10 });
+ addHint(hints, responseSubPath, { maxAge: 20 });
+
+ const cachePolicy = computeOverallCachePolicy(hints);
+ expect(cachePolicy).toHaveProperty('maxAge', 10);
+ });
+
+ it('returns undefined if any cache hint has a maxAge of 0', () => {
+ addHint(hints, responsePath, { maxAge: 120 });
+ addHint(hints, responseSubPath, { maxAge: 0 });
+ addHint(hints, responseSubSubPath, { maxAge: 20 });
+
+ const cachePolicy = computeOverallCachePolicy(hints);
+ expect(cachePolicy).toBeUndefined();
+ });
+
+ it('returns PUBLIC scope by default', () => {
+ addHint(hints, responsePath, { maxAge: 10 });
+
+ const cachePolicy = computeOverallCachePolicy(hints);
+ expect(cachePolicy).toHaveProperty('scope', CacheScope.Public);
+ });
+
+ it('returns PRIVATE scope if any cache hint has PRIVATE scope', () => {
+ addHint(hints, responsePath, {
+ maxAge: 10,
+ scope: CacheScope.Public,
+ });
+ addHint(hints, responseSubPath, {
+ maxAge: 10,
+ scope: CacheScope.Private,
+ });
+
+ const cachePolicy = computeOverallCachePolicy(hints);
+ expect(cachePolicy).toHaveProperty('scope', CacheScope.Private);
+ });
+ });
+});
diff --git a/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts b/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts
index e69e8bc448e..fdadf7d7ca4 100644
--- a/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts
+++ b/packages/apollo-cache-control/src/__tests__/collectCacheControlHints.ts
@@ -1,38 +1,41 @@
import { GraphQLSchema, graphql } from 'graphql';
-
-import {
- enableGraphQLExtensions,
- GraphQLExtensionStack,
-} from 'graphql-extensions';
import {
- CacheControlExtension,
CacheHint,
CacheControlExtensionOptions,
+ plugin,
} from '../';
+import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness';
export async function collectCacheControlHints(
schema: GraphQLSchema,
source: string,
options?: CacheControlExtensionOptions,
): Promise {
- enableGraphQLExtensions(schema);
// Because this test helper looks at the formatted extensions, we always want
- // to include them.
- const cacheControlExtension = new CacheControlExtension({
+ // to include them in the response rather than allow them to be stripped
+ // out.
+ const pluginInstance = plugin({
...options,
stripFormattedExtensions: false,
});
- const response = await graphql({
+ const requestContext = await pluginTestHarness({
+ pluginInstance,
schema,
- source,
- contextValue: {
- _extensionStack: new GraphQLExtensionStack([cacheControlExtension]),
+ graphqlRequest: {
+ query: source,
},
+ executor: async (requestContext) => {
+ return await graphql({
+ schema,
+ source: requestContext.request.query,
+ contextValue: requestContext.context,
+ });
+ }
});
- expect(response.errors).toBeUndefined();
+ expect(requestContext.response.errors).toBeUndefined();
- return cacheControlExtension.format()[1].hints;
+ return requestContext.response.extensions!.cacheControl.hints;
}
diff --git a/packages/apollo-cache-control/src/index.ts b/packages/apollo-cache-control/src/index.ts
index fa37370f03e..53f8e4272fd 100644
--- a/packages/apollo-cache-control/src/index.ts
+++ b/packages/apollo-cache-control/src/index.ts
@@ -3,12 +3,10 @@ import {
getNamedType,
GraphQLInterfaceType,
GraphQLObjectType,
- GraphQLResolveInfo,
ResponsePath,
responsePathAsArray,
} from 'graphql';
-
-import { GraphQLExtension, GraphQLResponse } from 'graphql-extensions';
+import { ApolloServerPlugin } from "apollo-server-plugin-base";
export interface CacheControlFormat {
version: 1;
@@ -49,164 +47,148 @@ declare module 'apollo-server-types' {
}
}
-export class CacheControlExtension
- implements GraphQLExtension {
- private defaultMaxAge: number;
-
- constructor(public options: CacheControlExtensionOptions = {}) {
- this.defaultMaxAge = options.defaultMaxAge || 0;
- }
-
- private hints: Map = new Map();
- private overallCachePolicyOverride?: Required;
-
- willResolveField(
- _source: any,
- _args: { [argName: string]: any },
- _context: TContext,
- info: GraphQLResolveInfo,
- ) {
- let hint: CacheHint = {};
-
- // If this field's resolver returns an object or interface, look for hints
- // on that return type.
- const targetType = getNamedType(info.returnType);
- if (
- targetType instanceof GraphQLObjectType ||
- targetType instanceof GraphQLInterfaceType
- ) {
- if (targetType.astNode) {
- hint = mergeHints(
- hint,
- cacheHintFromDirectives(targetType.astNode.directives),
- );
- }
- }
-
- // Look for hints on the field itself (on its parent type), taking
- // precedence over previously calculated hints.
- const fieldDef = info.parentType.getFields()[info.fieldName];
- if (fieldDef.astNode) {
- hint = mergeHints(
- hint,
- cacheHintFromDirectives(fieldDef.astNode.directives),
- );
- }
-
- // If this resolver returns an object or is a root field and we haven't seen
- // an explicit maxAge hint, set the maxAge to 0 (uncached) or the default if
- // specified in the constructor. (Non-object fields by default are assumed
- // to inherit their cacheability from their parents. But on the other hand,
- // while root non-object fields can get explicit hints from their definition
- // on the Query/Mutation object, if that doesn't exist then there's no
- // parent field that would assign the default maxAge, so we do it here.)
- if (
- (targetType instanceof GraphQLObjectType ||
- targetType instanceof GraphQLInterfaceType ||
- !info.path.prev) &&
- hint.maxAge === undefined
- ) {
- hint.maxAge = this.defaultMaxAge;
- }
+type MapResponsePathHints = Map;
- if (hint.maxAge !== undefined || hint.scope !== undefined) {
- this.addHint(info.path, hint);
- }
+export const plugin = (
+ options: CacheControlExtensionOptions = Object.create(null),
+): ApolloServerPlugin => ({
+ requestDidStart(requestContext) {
+ const defaultMaxAge: number = options.defaultMaxAge || 0;
+ const hints: MapResponsePathHints = new Map();
- info.cacheControl = {
- setCacheHint: (hint: CacheHint) => {
- this.addHint(info.path, hint);
- },
- cacheHint: hint,
- };
- }
- addHint(path: ResponsePath, hint: CacheHint) {
- const existingCacheHint = this.hints.get(path);
- if (existingCacheHint) {
- this.hints.set(path, mergeHints(existingCacheHint, hint));
- } else {
- this.hints.set(path, hint);
+ function setOverallCachePolicyWhenUnset() {
+ if (!requestContext.overallCachePolicy) {
+ requestContext.overallCachePolicy = computeOverallCachePolicy(hints);
+ }
}
- }
- format(): [string, CacheControlFormat] | undefined {
- // We should have to explicitly ask to leave the formatted extension in, or
- // pass the old-school `cacheControl: true` (as interpreted by
- // apollo-server-core/ApolloServer), in order to include the
- // engineproxy-aimed extensions. Specifically, we want users of
- // apollo-server-plugin-response-cache to be able to specify
- // `cacheControl: {defaultMaxAge: 600}` without accidentally turning on the
- // extension formatting.
- if (this.options.stripFormattedExtensions !== false) return;
-
- return [
- 'cacheControl',
- {
- version: 1,
- hints: Array.from(this.hints).map(([path, hint]) => ({
- path: [...responsePathAsArray(path)],
- ...hint,
- })),
+ return {
+ executionDidStart: () => ({
+ executionDidEnd: () => setOverallCachePolicyWhenUnset(),
+ willResolveField({ info }) {
+ let hint: CacheHint = {};
+
+ // If this field's resolver returns an object or interface, look for
+ // hints on that return type.
+ const targetType = getNamedType(info.returnType);
+ if (
+ targetType instanceof GraphQLObjectType ||
+ targetType instanceof GraphQLInterfaceType
+ ) {
+ if (targetType.astNode) {
+ hint = mergeHints(
+ hint,
+ cacheHintFromDirectives(targetType.astNode.directives),
+ );
+ }
+ }
+
+ // Look for hints on the field itself (on its parent type), taking
+ // precedence over previously calculated hints.
+ const fieldDef = info.parentType.getFields()[info.fieldName];
+ if (fieldDef.astNode) {
+ hint = mergeHints(
+ hint,
+ cacheHintFromDirectives(fieldDef.astNode.directives),
+ );
+ }
+
+ // If this resolver returns an object or is a root field and we haven't
+ // seen an explicit maxAge hint, set the maxAge to 0 (uncached) or the
+ // default if specified in the constructor. (Non-object fields by
+ // default are assumed to inherit their cacheability from their parents.
+ // But on the other hand, while root non-object fields can get explicit
+ // hints from their definition on the Query/Mutation object, if that
+ // doesn't exist then there's no parent field that would assign the
+ // default maxAge, so we do it here.)
+ if (
+ (targetType instanceof GraphQLObjectType ||
+ targetType instanceof GraphQLInterfaceType ||
+ !info.path.prev) &&
+ hint.maxAge === undefined
+ ) {
+ hint.maxAge = defaultMaxAge;
+ }
+
+ if (hint.maxAge !== undefined || hint.scope !== undefined) {
+ addHint(hints, info.path, hint);
+ }
+
+ info.cacheControl = {
+ setCacheHint: (hint: CacheHint) => {
+ addHint(hints, info.path, hint);
+ },
+ cacheHint: hint,
+ };
+ },
+ }),
+
+ responseForOperation() {
+ // We are not supplying an answer, we are only setting the cache
+ // policy if it's not set! Therefore, we return null.
+ setOverallCachePolicyWhenUnset();
+ return null;
},
- ];
- }
- public willSendResponse?(o: { graphqlResponse: GraphQLResponse }) {
- if (
- !this.options.calculateHttpHeaders ||
- !o.graphqlResponse.http ||
- o.graphqlResponse.errors
- ) {
- return;
- }
+ willSendResponse(requestContext) {
+ const {
+ response,
+ overallCachePolicy: overallCachePolicyOverride,
+ } = requestContext;
- const overallCachePolicy = this.computeOverallCachePolicy();
+ // If there are any errors, we don't consider this cacheable.
+ if (response.errors) {
+ return;
+ }
- if (overallCachePolicy) {
- o.graphqlResponse.http.headers.set(
- 'Cache-Control',
- `max-age=${
- overallCachePolicy.maxAge
- }, ${overallCachePolicy.scope.toLowerCase()}`,
- );
- }
- }
+ // Use the override by default, but if it's not overridden, set our
+ // own computation onto the `requestContext` for other plugins to read.
+ const overallCachePolicy =
+ overallCachePolicyOverride ||
+ (requestContext.overallCachePolicy =
+ computeOverallCachePolicy(hints));
+
+ if (
+ overallCachePolicy &&
+ options.calculateHttpHeaders &&
+ response.http
+ ) {
+ response.http.headers.set(
+ 'Cache-Control',
+ `max-age=${
+ overallCachePolicy.maxAge
+ }, ${overallCachePolicy.scope.toLowerCase()}`,
+ );
+ }
- public overrideOverallCachePolicy(overallCachePolicy: Required) {
- this.overallCachePolicyOverride = overallCachePolicy;
- }
+ // We should have to explicitly ask to leave the formatted extension in,
+ // or pass the old-school `cacheControl: true` (as interpreted by
+ // apollo-server-core/ApolloServer), in order to include the
+ // engineproxy-aimed extensions. Specifically, we want users of
+ // apollo-server-plugin-response-cache to be able to specify
+ // `cacheControl: {defaultMaxAge: 600}` without accidentally turning on
+ // the extension formatting.
+ if (options.stripFormattedExtensions !== false) return;
- computeOverallCachePolicy(): Required | undefined {
- if (this.overallCachePolicyOverride) {
- return this.overallCachePolicyOverride;
- }
+ const extensions =
+ response.extensions || (response.extensions = Object.create(null));
- let lowestMaxAge: number | undefined = undefined;
- let scope: CacheScope = CacheScope.Public;
+ if (typeof extensions.cacheControl !== 'undefined') {
+ throw new Error("The cacheControl information already existed.");
+ }
- for (const hint of this.hints.values()) {
- if (hint.maxAge !== undefined) {
- lowestMaxAge =
- lowestMaxAge !== undefined
- ? Math.min(lowestMaxAge, hint.maxAge)
- : hint.maxAge;
- }
- if (hint.scope === CacheScope.Private) {
- scope = CacheScope.Private;
+ extensions.cacheControl = {
+ version: 1,
+ hints: Array.from(hints).map(([path, hint]) => ({
+ path: [...responsePathAsArray(path)],
+ ...hint,
+ })),
+ };
}
}
-
- // If maxAge is 0, then we consider it uncacheable so it doesn't matter what
- // the scope was.
- return lowestMaxAge
- ? {
- maxAge: lowestMaxAge,
- scope,
- }
- : undefined;
}
-}
+});
function cacheHintFromDirectives(
directives: ReadonlyArray | undefined,
@@ -255,3 +237,45 @@ function mergeHints(
scope: otherHint.scope || hint.scope,
};
}
+
+function computeOverallCachePolicy(
+ hints: MapResponsePathHints,
+): Required | undefined {
+ let lowestMaxAge: number | undefined = undefined;
+ let scope: CacheScope = CacheScope.Public;
+
+ for (const hint of hints.values()) {
+ if (hint.maxAge !== undefined) {
+ lowestMaxAge =
+ lowestMaxAge !== undefined
+ ? Math.min(lowestMaxAge, hint.maxAge)
+ : hint.maxAge;
+ }
+ if (hint.scope === CacheScope.Private) {
+ scope = CacheScope.Private;
+ }
+ }
+
+ // If maxAge is 0, then we consider it uncacheable so it doesn't matter what
+ // the scope was.
+ return lowestMaxAge
+ ? {
+ maxAge: lowestMaxAge,
+ scope,
+ }
+ : undefined;
+}
+
+function addHint(hints: MapResponsePathHints, path: ResponsePath, hint: CacheHint) {
+ const existingCacheHint = hints.get(path);
+ if (existingCacheHint) {
+ hints.set(path, mergeHints(existingCacheHint, hint));
+ } else {
+ hints.set(path, hint);
+ }
+}
+
+export const __testing__ = {
+ addHint,
+ computeOverallCachePolicy,
+};
diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json
index 0de28001c29..29dff935854 100644
--- a/packages/apollo-cache-control/tsconfig.json
+++ b/packages/apollo-cache-control/tsconfig.json
@@ -7,6 +7,6 @@
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
- { "path": "../graphql-extensions" },
+ { "path": "../apollo-server-plugin-base" },
]
}
diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
index da8a4f68237..2c70ce1a3c1 100644
--- a/packages/apollo-datasource-rest/package.json
+++ b/packages/apollo-datasource-rest/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-datasource-rest",
- "version": "0.8.0",
+ "version": "0.9.2",
"author": "opensource@apollographql.com",
"license": "MIT",
"repository": {
diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
index 90116794b51..96c6ceda088 100644
--- a/packages/apollo-datasource/package.json
+++ b/packages/apollo-datasource/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-datasource",
- "version": "0.7.0",
+ "version": "0.7.1",
"author": "opensource@apollographql.com",
"license": "MIT",
"repository": {
diff --git a/packages/apollo-engine-reporting-protobuf/README.md b/packages/apollo-engine-reporting-protobuf/README.md
index 8e2721f2e00..1a9129e974b 100644
--- a/packages/apollo-engine-reporting-protobuf/README.md
+++ b/packages/apollo-engine-reporting-protobuf/README.md
@@ -22,7 +22,7 @@ Currently, this package generates a majority of its code with
`reports.proto` file. The output is generated with the `prepare` npm script.
The root of the repository provides the `devDependencies` necessary to build
-these definitions (e.g. `pbjs`, `pbts`, `protobuf`, etc.) and the the `prepare`
+these definitions (e.g. `pbjs`, `pbts`, `protobuf`, etc.) and the `prepare`
npm script is invoked programmatically via the monorepo tooling (e.g. Lerna)
thanks to _this_ module's `postinstall` script. Therefore, when making
changes to this module, `npx lerna run prepare` should be run from the **root**
diff --git a/packages/apollo-engine-reporting-protobuf/package-lock.json b/packages/apollo-engine-reporting-protobuf/package-lock.json
new file mode 100644
index 00000000000..96f69fcc989
--- /dev/null
+++ b/packages/apollo-engine-reporting-protobuf/package-lock.json
@@ -0,0 +1,97 @@
+{
+ "name": "apollo-engine-reporting-protobuf",
+ "version": "0.5.1",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@apollo/protobufjs": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.3.tgz",
+ "integrity": "sha512-gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw==",
+ "requires": {
+ "@protobufjs/aspromise": "^1.1.2",
+ "@protobufjs/base64": "^1.1.2",
+ "@protobufjs/codegen": "^2.0.4",
+ "@protobufjs/eventemitter": "^1.1.0",
+ "@protobufjs/fetch": "^1.1.0",
+ "@protobufjs/float": "^1.0.2",
+ "@protobufjs/inquire": "^1.1.0",
+ "@protobufjs/path": "^1.1.2",
+ "@protobufjs/pool": "^1.1.0",
+ "@protobufjs/utf8": "^1.1.0",
+ "@types/long": "^4.0.0",
+ "@types/node": "^10.1.0",
+ "long": "^4.0.0"
+ }
+ },
+ "@protobufjs/aspromise": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+ "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
+ },
+ "@protobufjs/base64": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+ "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+ },
+ "@protobufjs/codegen": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+ "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+ },
+ "@protobufjs/eventemitter": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+ "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
+ },
+ "@protobufjs/fetch": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+ "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+ "requires": {
+ "@protobufjs/aspromise": "^1.1.1",
+ "@protobufjs/inquire": "^1.1.0"
+ }
+ },
+ "@protobufjs/float": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+ "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
+ },
+ "@protobufjs/inquire": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+ "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
+ },
+ "@protobufjs/path": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+ "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
+ },
+ "@protobufjs/pool": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+ "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
+ },
+ "@protobufjs/utf8": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+ "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
+ },
+ "@types/long": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
+ "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
+ },
+ "@types/node": {
+ "version": "10.17.17",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz",
+ "integrity": "sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q=="
+ },
+ "long": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+ }
+ }
+}
diff --git a/packages/apollo-engine-reporting-protobuf/package.json b/packages/apollo-engine-reporting-protobuf/package.json
index 51e3e80ba08..c022754150f 100644
--- a/packages/apollo-engine-reporting-protobuf/package.json
+++ b/packages/apollo-engine-reporting-protobuf/package.json
@@ -1,13 +1,17 @@
{
"name": "apollo-engine-reporting-protobuf",
- "version": "0.4.4",
+ "version": "0.5.1",
"description": "Protobuf format for Apollo Engine",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
- "prepare": "npm run pbjs && npm run pbts && cp src/* dist",
- "pbjs": "bash -c 'mkdir -p dist && apollo-pbjs --target static-module --out dist/protobuf.js --wrap commonjs --force-number <(grep -v \"package mdg.engine.proto\" src/reports.proto)'",
- "pbts": "apollo-pbts -o dist/protobuf.d.ts dist/protobuf.js"
+ "clean": "git clean -fdX -- dist",
+ "prepare": "npm run clean && mkdir dist && npm run prepare:proto && npm run pbjs && npm run pbts && cp src/* dist",
+ "pbjs": "apollo-pbjs --target static-module --out dist/protobuf.js --wrap commonjs --force-number dist/reports.proto",
+ "pbts": "apollo-pbts -o dist/protobuf.d.ts dist/protobuf.js",
+ "prepare:proto": "npm run prepare:proto:nix -s || npm run prepare:proto:win -s",
+ "prepare:proto:nix": "grep -v \"package mdg.engine.proto\" src/reports.proto > dist/reports.proto",
+ "prepare:proto:win": "type src\\reports.proto | findstr /V \"package mdg.engine.proto\" > dist/reports.proto"
},
"repository": {
"type": "git",
diff --git a/packages/apollo-engine-reporting-protobuf/src/index.js b/packages/apollo-engine-reporting-protobuf/src/index.js
index 3d29a88efd8..f50831c507c 100644
--- a/packages/apollo-engine-reporting-protobuf/src/index.js
+++ b/packages/apollo-engine-reporting-protobuf/src/index.js
@@ -15,9 +15,9 @@ protobufJS.configure();
// a casually noticeable effect on p50 times. This also makes it easier for us
// to implement maxUncompressedReportSize as we know the encoded size of traces
// as we go.
-const originalTracesEncode = protobuf.Traces.encode;
-protobuf.Traces.encode = function(message, originalWriter) {
- const writer = originalTracesEncode(message, originalWriter);
+const originalTracesAndStatsEncode = protobuf.TracesAndStats.encode;
+protobuf.TracesAndStats.encode = function(message, originalWriter) {
+ const writer = originalTracesAndStatsEncode(message, originalWriter);
const encodedTraces = message.encodedTraces;
if (encodedTraces != null && encodedTraces.length) {
for (let i = 0; i < encodedTraces.length; ++i) {
diff --git a/packages/apollo-engine-reporting-protobuf/src/reports.proto b/packages/apollo-engine-reporting-protobuf/src/reports.proto
index 55cb2b39c93..0c6bc319d78 100644
--- a/packages/apollo-engine-reporting-protobuf/src/reports.proto
+++ b/packages/apollo-engine-reporting-protobuf/src/reports.proto
@@ -24,15 +24,9 @@ message Trace {
map variables_json = 4;
// Deprecated. Engineproxy did not encode variable values as JSON, so you
// couldn't tell numbers from numeric strings. Send variables_json instead.
- map variables = 1;
- // Optional: this is the original full query before the signature algorithm
- // is applied. Engineproxy always sent this in all traces, which meant that
- // literal-masking done by the signature algorithm didn't fully hide
- // sensitive data from Engine servers. apollo-engine-reporting does not
- // include this by default. (The Engine frontend does not currently show
- // this field.)
- string raw_query = 2;
- // Don't include this in traces inside a FullTracesReport; the operation
+ map deprecated_variables = 1;
+ // This is deprecated and only used for legacy applications
+ // don't include this in traces inside a FullTracesReport; the operation
// name for these traces comes from the key of the traces_per_query map.
string operation_name = 3;
}
@@ -137,9 +131,9 @@ message Trace {
// XXX When we want to include more details about the sub-operation that was
// executed against this service, we should include that here in each fetch node.
// This might include an operation signature, requires directive, reference resolutions, etc.
- string serviceName = 1;
+ string service_name = 1;
- bool traceParsingFailed = 2;
+ bool trace_parsing_failed = 2;
// This Trace only contains start_time, end_time, duration_ns, and root;
// all timings were calculated **on the federated service**, and clock skew
@@ -240,9 +234,6 @@ message Trace {
// --------------------------------------------------------------
// Fields below this line are only set by the old Go engineproxy.
- google.protobuf.Timestamp origin_reported_start_time = 15;
- google.protobuf.Timestamp origin_reported_end_time = 16;
- uint64 origin_reported_duration_ns = 17;
// Older agents (eg the Go engineproxy) relied to some degree on the Engine
// backend to run their own semi-compatible implementation of a specific
@@ -252,7 +243,6 @@ message Trace {
// Deprecated and ignored in FullTracesReports.
string legacy_signature_needs_resigning = 5;
-
// removed: Node parse = 12; Node validate = 13;
// Id128 server_id = 1; Id128 client_id = 2;
reserved 12, 13, 1, 2;
@@ -266,7 +256,6 @@ message Trace {
// agent_version, etc.) is sent by the Apollo Engine Reporting agent, but we do not currently save that
// information to any of our persistent storage.
message ReportHeader {
- string service = 3;
// eg "host-01.example.com"
string hostname = 5;
@@ -280,8 +269,12 @@ message ReportHeader {
string uname = 9;
// eg "current", "prod"
string schema_tag = 10;
- // The hex representation of the sha512 of the introspection response
- string schema_hash = 11;
+ // An id that is used to represent the schema to Apollo Graph Manager
+ // Using this in place of what used to be schema_hash, since that is no longer
+ // attached to a schema in the backend.
+ string executable_schema_id = 11;
+
+ reserved 3; // removed string service = 3;
}
message PathErrorStats {
@@ -290,33 +283,6 @@ message PathErrorStats {
uint64 requests_with_errors_count = 5;
}
-message ClientNameStats {
- // Duration histogram for non-cache-hit queries.
- // (See docs/histograms.md for the histogram format.)
- repeated int64 latency_count = 1;
- reserved 2; // removed: repeated uint64 error_count = 2;
- // These per-version fields were used to understand what versions contributed to this sample
- // when we were implementing the aggregation of this information ourselves using BigTable.
- // However, since the per-version stats don't separate out latency, it makes more sense to
- // have stats reported with contextual information so we can have the specific breakdown we're
- // looking for. These fields are somewhat misleading as we never actually do any per-version
- // awareness with anything reporting in the legacy "per_client_name" stats, and instead use
- // "query_stats_with_context" to have more contextual information.
- map requests_count_per_version = 3; // required
- map cache_hits_per_version = 4;
- map persisted_query_hits_per_version = 10;
- map persisted_query_misses_per_version = 11;
- map registered_operation_count_per_version = 12;
- map forbidden_operation_count_per_version = 13;
- repeated int64 cache_latency_count = 5; // Duration histogram; see docs/histograms.md
- PathErrorStats root_error_stats = 6;
- uint64 requests_with_errors_count = 7;
- // TTL histograms for cache misses for the public cache.
- repeated int64 public_cache_ttl_count = 8;
- // TTL histograms for cache misses for the private cache.
- repeated int64 private_cache_ttl_count = 9;
-}
-
message QueryLatencyStats {
repeated int64 latency_count = 1;
uint64 request_count = 2;
@@ -349,39 +315,18 @@ message ContextualizedTypeStats {
}
message FieldStat {
- string name = 2; // deprecated; only set when stored in TypeStat.field
string return_type = 3; // required; eg "String!" for User.email:String!
uint64 errors_count = 4;
uint64 count = 5;
uint64 requests_with_errors_count = 6;
repeated int64 latency_count = 8; // Duration histogram; see docs/histograms.md
+ reserved 1, 2, 7;
}
message TypeStat {
- string name = 1; // deprecated; only set when stored in QueryStats.per_type
- repeated FieldStat field = 2; // deprecated; use per_field_stat instead
// Key is (eg) "email" for User.email:String!
map per_field_stat = 3;
-}
-
-message QueryStats {
- // Either per_client_name (for back-compat) or query_stats_with_context must be specified. If both are
- // specified, then query_stats_with_context will be used and per_client_name will be ignored. Although
- // the fields in ClientNameStats mention things "per-version," the information in the "per-version"
- // fields will only ever be over the default version, the empty String: "", if arrived at via the
- // FullTracesAggregator.
- map per_client_name = 1; // deprecated; use stats_with_context instead
- repeated ContextualizedQueryLatencyStats query_stats_with_context = 4;
- repeated TypeStat per_type = 2; // deprecated; use type_stats_with_context instead
- // Key is the parent type, e.g. "User" for User.email:String!
- map per_type_stat = 3; // deprecated; use type_stats_with_context instead
- repeated ContextualizedTypeStats type_stats_with_context = 5;
-}
-
-// Top-level message type for the server-side traces endpoint
-message TracesReport {
- ReportHeader header = 1; // required
- repeated Trace trace = 2; // required
+ reserved 1, 2;
}
message Field {
@@ -394,76 +339,15 @@ message Type {
repeated Field field = 2;
}
-message MemStats {
- uint64 total_bytes = 1; // MemStats.Sys
- uint64 stack_bytes = 2; // MemStats.StackSys
- uint64 heap_bytes = 3; // MemStats.HeapSys
- uint64 heap_released_bytes = 13; // MemStats.HeapReleased
- uint64 gc_overhead_bytes = 4; // MemStats.GCSys
-
- uint64 stack_used_bytes = 5; // MemStats.StackInuse
- uint64 heap_allocated_bytes = 6; // MemStats.HeapAlloc
- uint64 heap_allocated_objects = 7; // MemStats.HeapObjects
-
- uint64 heap_allocated_bytes_delta = 8; // MemStats.TotalAlloc delta
- uint64 heap_allocated_objects_delta = 9; // MemStats.Mallocs delta
- uint64 heap_freed_objects_delta = 10; // MemStats.Frees delta
-
- uint64 gc_stw_ns_delta = 11; // MemStats.PauseTotalNs delta
- uint64 gc_count_delta = 12; // MemStats.NumGC delta
-}
-
-message TimeStats {
- uint64 uptime_ns = 1;
- uint64 real_ns_delta = 2;
- uint64 user_ns_delta = 3;
- uint64 sys_ns_delta = 4;
-}
-
-// Top-level message type for the server-side stats endpoint
-message StatsReport {
- ReportHeader header = 1; // required
-
- // These fields are about properties of the engineproxy and are not generated
- // from FullTracesReports.
- MemStats mem_stats = 2;
- TimeStats time_stats = 3;
-
- // Beginning of the period over which stats are collected.
- google.protobuf.Timestamp start_time = 8;
- // End of the period of which stats are collected.
- google.protobuf.Timestamp end_time = 9;
- // Only used to interpret mem_stats and time_stats; not generated from
- // FullTracesReports.
- uint64 realtime_duration = 10;
-
-
- // Maps from query descriptor to QueryStats. Required unless
- // legacy_per_query_missing_operation_name is set. The keys are strings of the
- // form `# operationName\nsignature` (literal hash and space), with
- // operationName - if there is no operation name.
- map per_query = 14;
-
- // Older agents (Go engineproxy) didn't explicitly include the operation name
- // in the key of this map, and the server had to parse it out (after a
- // re-signing operation which is no longer performed). The key here is just the query
- // signature. Deprecated.
- map legacy_per_query_implicit_operation_name = 12;
-
- // Deprecated: it was useful in Optics where we had access to the whole schema
- // but has not been ever used in Engine. apollo-engine-reporting will not
- // send it.
- repeated Type type = 13;
-}
-
// This is the top-level message used by the new traces ingress. This
// is designed for the apollo-engine-reporting TypeScript agent and will
// eventually be documented as a public ingress API. This message consists
// solely of traces; the equivalent of the StatsReport is automatically
-// generated server-side from this message. Agents should send traces
-// for all requests in this report. Generally, buffering up until a large
+// generated server-side from this message. Agent should either send a trace or include it in the stats
+// for every request in this report. Generally, buffering up until a large
// size has been reached (say, 4MB) or 5-10 seconds has passed is appropriate.
-message FullTracesReport {
+// This message used to be know as FullTracesReport, but got renamed since it isn't just for traces anymore
+message Report {
ReportHeader header = 1;
// key is statsReportKey (# operationName\nsignature) Note that the nested
@@ -474,15 +358,24 @@ message FullTracesReport {
// legacy_per_query_implicit_operation_name, and we don't require them to have
// details.raw_query (which would consume a lot of space and has privacy/data
// access issues, and isn't currently exposed by our app anyway).
- map traces_per_query = 5;
+ map traces_per_query = 5;
+
+ // This is the time that the requests in this trace are considered to have taken place
+ // If this field is not present the max of the end_time of each trace will be used instead.
+ // If there are no traces and no end_time present the report will not be able to be processed.
+ // Note: This will override the end_time from traces.
+ google.protobuf.Timestamp end_time = 2; // required if no traces in this message
}
-// Just a sequence of traces with the same statsReportKey.
-message Traces {
- repeated Trace trace = 1;
+message ContextualizedStats {
+ StatsContext context = 1;
+ QueryLatencyStats query_latency_stats = 2;
+ // Key is type name.
+ map per_type_stat = 3;
}
-message TraceV1 {
- ReportHeader header = 1;
- Trace trace = 2;
+// A sequence of traces and stats. An individual trace should either be counted as a stat or trace
+message TracesAndStats {
+ repeated Trace trace = 1;
+ repeated ContextualizedStats stats_with_context = 2;
}
diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json
index 45b1eb2580f..5bdc6047d34 100644
--- a/packages/apollo-engine-reporting/package.json
+++ b/packages/apollo-engine-reporting/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-engine-reporting",
- "version": "1.7.0",
+ "version": "2.0.0",
"description": "Send reports about your GraphQL services to Apollo Graph Manager (previously known as Apollo Engine)",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -16,11 +16,12 @@
"apollo-server-caching": "file:../apollo-server-caching",
"apollo-server-env": "file:../apollo-server-env",
"apollo-server-errors": "file:../apollo-server-errors",
+ "apollo-server-plugin-base": "file:../apollo-server-plugin-base",
"apollo-server-types": "file:../apollo-server-types",
"async-retry": "^1.2.1",
- "graphql-extensions": "file:../graphql-extensions"
+ "uuid": "^8.0.0"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-engine-reporting/src/__tests__/agent.test.ts b/packages/apollo-engine-reporting/src/__tests__/agent.test.ts
index ff6ac43ab6a..565cc5e50d5 100644
--- a/packages/apollo-engine-reporting/src/__tests__/agent.test.ts
+++ b/packages/apollo-engine-reporting/src/__tests__/agent.test.ts
@@ -2,7 +2,9 @@ import {
signatureCacheKey,
handleLegacyOptions,
EngineReportingOptions,
-} from '../agent';
+ computeExecutableSchemaId
+} from "../agent";
+import { buildSchema } from "graphql";
describe('signature cache key', () => {
it('generates without the operationName', () => {
@@ -16,6 +18,59 @@ describe('signature cache key', () => {
});
});
+describe('Executable Schema Id', () => {
+ const unsortedGQLSchemaDocument = `
+ directive @example on FIELD
+ union AccountOrUser = Account | User
+ type Query {
+ userOrAccount(name: String, id: String): AccountOrUser
+ }
+
+ type User {
+ accounts: [Account!]
+ email: String
+ name: String!
+ }
+
+ type Account {
+ name: String!
+ id: ID!
+ }
+ `;
+
+ const sortedGQLSchemaDocument = `
+ directive @example on FIELD
+ union AccountOrUser = Account | User
+
+ type Account {
+ name: String!
+ id: ID!
+ }
+
+ type Query {
+ userOrAccount(id: String, name: String): AccountOrUser
+ }
+
+ type User {
+ accounts: [Account!]
+ email: String
+ name: String!
+ }
+
+ `;
+ it('does not normalize GraphQL schemas', () => {
+ expect(computeExecutableSchemaId(buildSchema(unsortedGQLSchemaDocument))).not.toEqual(
+ computeExecutableSchemaId(buildSchema(sortedGQLSchemaDocument))
+ );
+ });
+ it('does not normalize strings', () => {
+ expect(computeExecutableSchemaId(unsortedGQLSchemaDocument)).not.toEqual(
+ computeExecutableSchemaId(sortedGQLSchemaDocument)
+ );
+ });
+});
+
+
describe("test handleLegacyOptions(), which converts the deprecated privateVariable and privateHeaders options to the new options' formats", () => {
it('Case 1: privateVariables/privateHeaders == False; same as all', () => {
const optionsPrivateFalse: EngineReportingOptions = {
diff --git a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts
similarity index 70%
rename from packages/apollo-engine-reporting/src/__tests__/extension.test.ts
rename to packages/apollo-engine-reporting/src/__tests__/plugin.test.ts
index 14b50c73cfd..f56038aa375 100644
--- a/packages/apollo-engine-reporting/src/__tests__/extension.test.ts
+++ b/packages/apollo-engine-reporting/src/__tests__/plugin.test.ts
@@ -1,22 +1,13 @@
import { makeExecutableSchema, addMockFunctionsToSchema } from 'graphql-tools';
-import {
- GraphQLExtensionStack,
- enableGraphQLExtensions,
-} from 'graphql-extensions';
-import { graphql, GraphQLError } from 'graphql';
+import { graphql, GraphQLError, printSchema } from 'graphql';
import { Request } from 'node-fetch';
-import {
- EngineReportingExtension,
- makeTraceDetails,
- makeHTTPRequestHeaders,
-} from '../extension';
+import { makeTraceDetails, makeHTTPRequestHeaders, plugin } from '../plugin';
import { Headers } from 'apollo-server-env';
-import { InMemoryLRUCache } from 'apollo-server-caching';
-import { AddTraceArgs } from '../agent';
+import { AddTraceArgs, computeExecutableSchemaId } from '../agent';
import { Trace } from 'apollo-engine-reporting-protobuf';
+import pluginTestHarness from 'apollo-server-core/dist/utils/pluginTestHarness';
-it('trace construction', async () => {
- const typeDefs = `
+const typeDefs = `
type User {
id: Int
name: String
@@ -39,7 +30,7 @@ it('trace construction', async () => {
}
`;
- const query = `
+const query = `
query q {
author(id: 5) {
name
@@ -51,43 +42,194 @@ it('trace construction', async () => {
}
`;
+describe('schema reporting', () => {
const schema = makeExecutableSchema({ typeDefs });
addMockFunctionsToSchema({ schema });
- enableGraphQLExtensions(schema);
- const traces: Array = [];
- async function addTrace(args: AddTraceArgs) {
- traces.push(args);
- }
+ const addTrace = jest.fn().mockResolvedValue(undefined);
+ const startSchemaReporting = jest.fn();
+ const executableSchemaIdGenerator = jest.fn(computeExecutableSchemaId);
- const reportingExtension = new EngineReportingExtension(
- {},
- addTrace,
- 'schema-hash',
- );
- const stack = new GraphQLExtensionStack([reportingExtension]);
- const requestDidEnd = stack.requestDidStart({
- request: new Request('http://localhost:123/foo'),
- queryString: query,
- requestContext: {
- request: {
+ beforeEach(() => {
+ addTrace.mockClear();
+ startSchemaReporting.mockClear();
+ executableSchemaIdGenerator.mockClear();
+ });
+
+ it('starts reporting if enabled', async () => {
+ const pluginInstance = plugin(
+ {
+ experimental_schemaReporting: true,
+ },
+ addTrace,
+ {
+ startSchemaReporting,
+ executableSchemaIdGenerator,
+ },
+ );
+
+ await pluginTestHarness({
+ pluginInstance,
+ schema,
+ graphqlRequest: {
query,
operationName: 'q',
extensions: {
clientName: 'testing suite',
},
+ http: new Request('http://localhost:123/foo'),
},
- context: {},
- cache: new InMemoryLRUCache(),
- },
- context: {},
+ executor: async ({ request: { query: source } }) => {
+ return await graphql({
+ schema,
+ source,
+ });
+ },
+ });
+
+ expect(startSchemaReporting).toBeCalledTimes(1);
+ expect(startSchemaReporting).toBeCalledWith({
+ executableSchema: printSchema(schema),
+ executableSchemaId: executableSchemaIdGenerator(schema),
+ });
+ });
+
+ it('uses the override schema', async () => {
+ const pluginInstance = plugin(
+ {
+ experimental_schemaReporting: true,
+ experimental_overrideReportedSchema: typeDefs,
+ },
+ addTrace,
+ {
+ startSchemaReporting,
+ executableSchemaIdGenerator,
+ },
+ );
+
+ await pluginTestHarness({
+ pluginInstance,
+ schema,
+ graphqlRequest: {
+ query,
+ operationName: 'q',
+ extensions: {
+ clientName: 'testing suite',
+ },
+ http: new Request('http://localhost:123/foo'),
+ },
+ executor: async ({ request: { query: source } }) => {
+ return await graphql({
+ schema,
+ source,
+ });
+ },
+ });
+
+ const expectedExecutableSchemaId = executableSchemaIdGenerator(typeDefs);
+ expect(startSchemaReporting).toBeCalledTimes(1);
+ expect(startSchemaReporting).toBeCalledWith({
+ executableSchema: typeDefs,
+ executableSchemaId: expectedExecutableSchemaId,
+ });
+
+ // Get the first argument from the first time this is called.
+ // Not using called with because that has to be exhaustive and this isn't
+ // testing trace generation
+ expect(addTrace).toBeCalledWith(
+ expect.objectContaining({
+ executableSchemaId: expectedExecutableSchemaId,
+ }),
+ );
+ });
+
+ it('uses the same executable schema id for metric reporting', async () => {
+ const pluginInstance = plugin(
+ {
+ experimental_schemaReporting: true,
+ },
+ addTrace,
+ {
+ startSchemaReporting,
+ executableSchemaIdGenerator,
+ },
+ );
+
+ await pluginTestHarness({
+ pluginInstance,
+ schema,
+ graphqlRequest: {
+ query,
+ operationName: 'q',
+ extensions: {
+ clientName: 'testing suite',
+ },
+ http: new Request('http://localhost:123/foo'),
+ },
+ executor: async ({ request: { query: source } }) => {
+ return await graphql({
+ schema,
+ source,
+ });
+ },
+ });
+
+ const expectedExecutableSchemaId = executableSchemaIdGenerator(schema);
+ expect(startSchemaReporting).toBeCalledTimes(1);
+ expect(startSchemaReporting).toBeCalledWith({
+ executableSchema: printSchema(schema),
+ executableSchemaId: expectedExecutableSchemaId,
+ });
+ // Get the first argument from the first time this is called.
+ // Not using called with because that has to be exhaustive and this isn't
+ // testing trace generation
+ expect(addTrace.mock.calls[0][0].executableSchemaId).toBe(
+ expectedExecutableSchemaId,
+ );
});
- await graphql({
+});
+
+it('trace construction', async () => {
+ const schema = makeExecutableSchema({ typeDefs });
+ addMockFunctionsToSchema({ schema });
+
+ const traces: Array = [];
+ async function addTrace(args: AddTraceArgs) {
+ traces.push(args);
+ }
+ const startSchemaReporting = jest.fn();
+ const executableSchemaIdGenerator = jest.fn();
+
+ const pluginInstance = plugin(
+ {
+ /* no options!*/
+ },
+ addTrace,
+ {
+ startSchemaReporting,
+ executableSchemaIdGenerator,
+ },
+ );
+
+ await pluginTestHarness({
+ pluginInstance,
schema,
- source: query,
- contextValue: { _extensionStack: stack },
+ graphqlRequest: {
+ query,
+ operationName: 'q',
+ extensions: {
+ clientName: 'testing suite',
+ },
+ http: new Request('http://localhost:123/foo'),
+ },
+ executor: async ({ request: { query: source } }) => {
+ return await graphql({
+ schema,
+ source,
+ });
+ },
});
- requestDidEnd();
+
// XXX actually write some tests
});
@@ -276,7 +418,7 @@ describe('variableJson output for sendVariableValues transform: custom function
).toEqual(JSON.stringify(null));
});
- const errorThrowingModifier = (input: {
+ const errorThrowingModifier = (_input: {
variables: Record;
}): Record => {
throw new GraphQLError('testing error handling');
diff --git a/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts b/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts
new file mode 100644
index 00000000000..44b317c7fd0
--- /dev/null
+++ b/packages/apollo-engine-reporting/src/__tests__/schemaReporter.test.ts
@@ -0,0 +1,173 @@
+import nock from 'nock';
+import { reportServerInfoGql, SchemaReporter } from '../schemaReporter';
+
+function mockReporterRequest(url: any, variables?: any) {
+ if (variables)
+ return nock(url).post(
+ '/',
+ JSON.stringify({
+ query: reportServerInfoGql,
+ operationName: 'ReportServerInfo',
+ variables,
+ }),
+ );
+ return nock(url).post('/');
+}
+
+beforeEach(() => {
+ if (!nock.isActive()) nock.activate();
+});
+
+afterEach(() => {
+ expect(nock.isDone()).toBeTruthy();
+ nock.cleanAll();
+ nock.restore();
+});
+
+const serverInfo = {
+ bootId: 'string',
+ executableSchemaId: 'string',
+ graphVariant: 'string',
+};
+
+const url = 'http://localhost:4000';
+
+describe('Schema reporter', () => {
+ it('return correct values if no errors', async () => {
+ const schemaReporter = new SchemaReporter(
+ serverInfo,
+ 'schemaSdl',
+ 'apiKey',
+ url,
+ );
+ mockReporterRequest(url).reply(200, {
+ data: {
+ me: {
+ __typename: 'ServiceMutation',
+ reportServerInfo: {
+ __typename: 'ReportServerInfoResponse',
+ inSeconds: 30,
+ withExecutableSchema: false,
+ },
+ },
+ },
+ });
+
+ let {
+ inSeconds,
+ withExecutableSchema,
+ } = await schemaReporter.reportServerInfo(false);
+ expect(inSeconds).toBe(30);
+ expect(withExecutableSchema).toBe(false);
+
+ mockReporterRequest(url).reply(200, {
+ data: {
+ me: {
+ __typename: 'ServiceMutation',
+ reportServerInfo: {
+ __typename: 'ReportServerInfoResponse',
+ inSeconds: 60,
+ withExecutableSchema: true,
+ },
+ },
+ },
+ });
+ ({
+ inSeconds,
+ withExecutableSchema,
+ } = await schemaReporter.reportServerInfo(false));
+ expect(inSeconds).toBe(60);
+ expect(withExecutableSchema).toBe(true);
+ });
+
+ it('throws on 500 response', async () => {
+ const schemaReporter = new SchemaReporter(
+ serverInfo,
+ 'schemaSdl',
+ 'apiKey',
+ url,
+ );
+ mockReporterRequest(url).reply(500, {
+ data: {
+ me: {
+ reportServerInfo: {
+ __typename: 'ReportServerInfoResponse',
+ inSeconds: 30,
+ withExecutableSchema: false,
+ },
+ },
+ },
+ });
+
+ await expect(
+ schemaReporter.reportServerInfo(false),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"An unexpected HTTP status code (500) was encountered during schema reporting."`,
+ );
+ });
+
+ it('throws on 200 malformed response', async () => {
+ const schemaReporter = new SchemaReporter(
+ serverInfo,
+ 'schemaSdl',
+ 'apiKey',
+ url,
+ );
+ mockReporterRequest(url).reply(200, {
+ data: {
+ me: {
+ reportServerInfo: {
+ __typename: 'ReportServerInfoResponse',
+ },
+ },
+ },
+ });
+
+ await expect(
+ schemaReporter.reportServerInfo(false),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"Unexpected response shape from Apollo Graph Manager when reporting server information for schema reporting. If this continues, please reach out to support@apollographql.com. Received response: {\\"me\\":{\\"reportServerInfo\\":{\\"__typename\\":\\"ReportServerInfoResponse\\"}}}"`,
+ );
+
+ mockReporterRequest(url).reply(200, {
+ data: {
+ me: {
+ __typename: 'UserMutation',
+ },
+ },
+ });
+ await expect(
+ schemaReporter.reportServerInfo(false),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"This server was configured with an API key for a user. Only a service's API key may be used for schema reporting. Please visit the settings for this graph at https://engine.apollographql.com/ to obtain an API key for a service."`,
+ );
+ });
+
+ it('sends schema if withExecutableSchema is true.', async () => {
+ const schemaReporter = new SchemaReporter(
+ serverInfo,
+ 'schemaSdl',
+ 'apiKey',
+ url,
+ );
+
+ const variables = {
+ info: serverInfo,
+ executableSchema: 'schemaSdl'
+ };
+ mockReporterRequest(url, variables).reply(200, {
+ data: {
+ me: {
+ __typename: 'ServiceMutation',
+ reportServerInfo: {
+ __typename: 'ReportServerInfoResponse',
+ inSeconds: 30,
+ withExecutableSchema: false,
+ },
+ },
+ },
+ });
+
+ await schemaReporter.reportServerInfo(true);
+ });
+});
diff --git a/packages/apollo-engine-reporting/src/agent.ts b/packages/apollo-engine-reporting/src/agent.ts
index d3b0be2d1c4..b6b91f830d1 100644
--- a/packages/apollo-engine-reporting/src/agent.ts
+++ b/packages/apollo-engine-reporting/src/agent.ts
@@ -1,20 +1,31 @@
import os from 'os';
import { gzip } from 'zlib';
-import { DocumentNode, GraphQLError } from 'graphql';
import {
- FullTracesReport,
+ DocumentNode,
+ GraphQLError,
+ GraphQLSchema,
+ printSchema,
+} from 'graphql';
+import {
ReportHeader,
- Traces,
Trace,
+ Report,
+ TracesAndStats,
} from 'apollo-engine-reporting-protobuf';
import { fetch, RequestAgent, Response } from 'apollo-server-env';
import retry from 'async-retry';
-import { EngineReportingExtension } from './extension';
-import { GraphQLRequestContext } from 'apollo-server-types';
+import { plugin } from './plugin';
+import { GraphQLRequestContext, Logger } from 'apollo-server-types';
import { InMemoryLRUCache } from 'apollo-server-caching';
import { defaultEngineReportingSignature } from 'apollo-graphql';
+import { ApolloServerPlugin } from 'apollo-server-plugin-base';
+import { reportingLoop, SchemaReporter } from './schemaReporter';
+import { v4 as uuidv4 } from 'uuid';
+import { createHash } from 'crypto';
+
+let warnedOnDeprecatedApiKey = false;
export interface ClientInfo {
clientName?: string;
@@ -45,6 +56,75 @@ export type GenerateClientInfo = (
requestContext: GraphQLRequestContext,
) => ClientInfo;
+// AS3: Drop support for deprecated `ENGINE_API_KEY`.
+export function getEngineApiKey({
+ engine,
+ skipWarn = false,
+ logger = console,
+}: {
+ engine: EngineReportingOptions | boolean | undefined;
+ skipWarn?: boolean;
+ logger?: Logger;
+}) {
+ if (typeof engine === 'object') {
+ if (engine.apiKey) {
+ return engine.apiKey;
+ }
+ }
+ const legacyApiKeyFromEnv = process.env.ENGINE_API_KEY;
+ const apiKeyFromEnv = process.env.APOLLO_KEY;
+
+ if (legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) {
+ logger.warn(
+ 'Using `APOLLO_KEY` since `ENGINE_API_KEY` (deprecated) is also set in the environment.',
+ );
+ }
+ if (legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) {
+ logger.warn(
+ '[deprecated] The `ENGINE_API_KEY` environment variable has been renamed to `APOLLO_KEY`.',
+ );
+ warnedOnDeprecatedApiKey = true;
+ }
+ return apiKeyFromEnv || legacyApiKeyFromEnv || '';
+}
+
+// AS3: Drop support for deprecated `ENGINE_SCHEMA_TAG`.
+export function getEngineGraphVariant(
+ engine: EngineReportingOptions | boolean | undefined,
+ logger: Logger = console,
+): string | undefined {
+ if (engine === false) {
+ return;
+ } else if (
+ typeof engine === 'object' &&
+ (engine.graphVariant || engine.schemaTag)
+ ) {
+ if (engine.graphVariant && engine.schemaTag) {
+ throw new Error(
+ 'Cannot set both engine.graphVariant and engine.schemaTag. Please use engine.graphVariant.',
+ );
+ }
+ if (engine.schemaTag) {
+ logger.warn(
+ '[deprecated] The `schemaTag` property within `engine` configuration has been renamed to `graphVariant`.',
+ );
+ }
+ return engine.graphVariant || engine.schemaTag;
+ } else {
+ if (process.env.ENGINE_SCHEMA_TAG) {
+ logger.warn(
+ '[deprecated] The `ENGINE_SCHEMA_TAG` environment variable has been renamed to `APOLLO_GRAPH_VARIANT`.',
+ );
+ }
+ if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) {
+ throw new Error(
+ '`APOLLO_GRAPH_VARIANT` and `ENGINE_SCHEMA_TAG` (deprecated) environment variables must not both be set.',
+ );
+ }
+ return process.env.APOLLO_GRAPH_VARIANT || process.env.ENGINE_SCHEMA_TAG;
+ }
+}
+
export interface EngineReportingOptions {
/**
* API key for the service. Get this from
@@ -71,9 +151,15 @@ export interface EngineReportingOptions {
*/
maxUncompressedReportSize?: number;
/**
+ * [DEPRECATED] this option was replaced by tracesEndpointUrl
* The URL of the Engine report ingress server.
*/
endpointUrl?: string;
+ /**
+ * The URL to the Apollo Graph Manager ingress endpoint.
+ * (Previously, this was `endpointUrl`, which will be removed in AS3).
+ */
+ tracesEndpointUrl?: string;
/**
* If set, prints all reports as JSON when they are sent.
*/
@@ -178,22 +264,75 @@ export interface EngineReportingOptions {
*/
rewriteError?: (err: GraphQLError) => GraphQLError | null;
/**
- * A human readable name to tag this variant of a schema (i.e. staging, EU)
+ * [DEPRECATED: use graphVariant] A human readable name to tag this variant of a schema (i.e. staging, EU)
*/
schemaTag?: string;
+ /**
+ * A human readable name to refer to the variant of the graph for which metrics are reported
+ */
+ graphVariant?: string;
/**
* Creates the client information for operation traces.
*/
generateClientInfo?: GenerateClientInfo;
+
+ /**
+ * **(Experimental)** Enable schema reporting from this server with
+ * Apollo Graph Manager.
+ *
+ * The use of this option avoids the need to rgister schemas manually within
+ * CI deployment pipelines using `apollo schema:push` by periodically
+ * reporting this server's schema (when changes are detected) along with
+ * additional details about its runtime environment to Apollo Graph Manager.
+ *
+ * See [our _preview
+ * documentation_](https://github.com/apollographql/apollo-schema-reporting-preview-docs)
+ * for more information.
+ */
+ experimental_schemaReporting?: boolean;
+
+ /**
+ * Override the reported schema that is reported to AGM.
+ * This schema does not go through any normalizations and the string is directly sent to Apollo Graph Manager.
+ * This would be useful for comments or other ordering and whitespace changes that get stripped when generating a `GraphQLSchema`
+ */
+ experimental_overrideReportedSchema?: string;
+
+ /**
+ * The schema reporter waits before starting reporting.
+ * By default, the report waits some random amount of time between 0 and 10 seconds.
+ * A longer interval leads to more staggered starts which means it is less likely
+ * multiple servers will get asked to upload the same schema.
+ *
+ * If this server runs in lambda or in other constrained environments it would be useful
+ * to decrease the schema reporting max wait time to be less than default.
+ *
+ * This number will be the max for the range in ms that the schema reporter will
+ * wait before starting to report.
+ */
+ experimental_schemaReportingInitialDelayMaxMs?: number;
+
+ /**
+ * The URL to use for reporting schemas.
+ */
+ schemaReportingUrl?: string;
+
+ /**
+ * A logger interface to be used for output and errors. When not provided
+ * it will default to the server's own `logger` implementation and use
+ * `console` when that is not available.
+ */
+ logger?: Logger;
}
export interface AddTraceArgs {
trace: Trace;
operationName: string;
queryHash: string;
- schemaHash: string;
- queryString?: string;
- documentAST?: DocumentNode;
+ executableSchemaId: string;
+ source?: string;
+ document?: DocumentNode;
+ logger: Logger,
}
const serviceHeaderDefaults = {
@@ -204,39 +343,74 @@ const serviceHeaderDefaults = {
uname: `${os.platform()}, ${os.type()}, ${os.release()}, ${os.arch()})`,
};
+class ReportData {
+ report!: Report;
+ size!: number;
+ readonly header: ReportHeader;
+ constructor(executableSchemaId: string, graphVariant: string) {
+ this.header = new ReportHeader({
+ ...serviceHeaderDefaults,
+ executableSchemaId,
+ schemaTag: graphVariant,
+ });
+ this.reset();
+ }
+ reset() {
+ this.report = new Report({ header: this.header });
+ this.size = 0;
+ }
+}
+
// EngineReportingAgent is a persistent object which creates
// EngineReportingExtensions for each request and sends batches of trace reports
// to the Engine server.
export class EngineReportingAgent {
- private options: EngineReportingOptions;
- private apiKey: string;
- private reports: { [schemaHash: string]: FullTracesReport } = Object.create(
- null,
- );
- private reportSizes: { [schemaHash: string]: number } = Object.create(null);
+ private readonly options: EngineReportingOptions;
+ private readonly apiKey: string;
+ private readonly logger: Logger = console;
+ private readonly graphVariant: string;
+
+ private readonly reportDataByExecutableSchemaId: {
+ [executableSchemaId: string]: ReportData | undefined;
+ } = Object.create(null);
+
private reportTimer: any; // timer typing is weird and node-specific
- private sendReportsImmediately?: boolean;
+ private readonly sendReportsImmediately?: boolean;
private stopped: boolean = false;
- private reportHeaders: { [schemaHash: string]: ReportHeader } = Object.create(
- null,
- );
private signatureCache: InMemoryLRUCache;
private signalHandlers = new Map();
+ private currentSchemaReporter?: SchemaReporter;
+ private readonly bootId: string;
+ private lastSeenExecutableSchemaToId?: {
+ executableSchema: string | GraphQLSchema;
+ executableSchemaId: string;
+ };
+
+ private readonly tracesEndpointUrl: string;
+
public constructor(options: EngineReportingOptions = {}) {
this.options = options;
- this.apiKey = options.apiKey || process.env.ENGINE_API_KEY || '';
+ this.apiKey = getEngineApiKey({
+ engine: this.options,
+ skipWarn: false,
+ logger: this.logger,
+ });
+ if (options.logger) this.logger = options.logger;
+ this.bootId = uuidv4();
+ this.graphVariant = getEngineGraphVariant(options, this.logger) || '';
+
if (!this.apiKey) {
throw new Error(
- 'To use EngineReportingAgent, you must specify an API key via the apiKey option or the ENGINE_API_KEY environment variable.',
+ `To use EngineReportingAgent, you must specify an API key via the apiKey option or the APOLLO_KEY environment variable.`,
);
}
// Since calculating the signature for Engine reporting is potentially an
// expensive operation, we'll cache the signatures we generate and re-use
// them based on repeated traces for the same `queryHash`.
- this.signatureCache = createSignatureCache();
+ this.signatureCache = createSignatureCache({ logger: this.logger });
this.sendReportsImmediately = options.sendReportsImmediately;
if (!this.sendReportsImmediately) {
@@ -248,7 +422,7 @@ export class EngineReportingAgent {
if (this.options.handleSignals !== false) {
const signals: NodeJS.Signals[] = ['SIGINT', 'SIGTERM'];
- signals.forEach(signal => {
+ signals.forEach((signal) => {
// Note: Node only started sending signal names to signal events with
// Node v10 so we can't use that feature here.
const handler: NodeJS.SignalsListener = async () => {
@@ -261,42 +435,78 @@ export class EngineReportingAgent {
});
}
+ if (this.options.endpointUrl) {
+ this.logger.warn(
+ '[deprecated] The `endpointUrl` option within `engine` has been renamed to `tracesEndpointUrl`.',
+ );
+ }
+ this.tracesEndpointUrl =
+ (this.options.endpointUrl ||
+ this.options.tracesEndpointUrl ||
+ 'https://engine-report.apollodata.com') + '/api/ingress/traces';
+
// Handle the legacy options: privateVariables and privateHeaders
handleLegacyOptions(this.options);
}
- public newExtension(schemaHash: string): EngineReportingExtension {
- return new EngineReportingExtension(
- this.options,
- this.addTrace.bind(this),
- schemaHash,
- );
+ private executableSchemaIdGenerator(schema: string | GraphQLSchema) {
+ if (this.lastSeenExecutableSchemaToId?.executableSchema === schema) {
+ return this.lastSeenExecutableSchemaToId.executableSchemaId;
+ }
+ const id = computeExecutableSchemaId(schema);
+
+ // We override this variable every time we get a new schema so we cache
+ // the last seen value. It mostly a cached pair.
+ this.lastSeenExecutableSchemaToId = {
+ executableSchema: schema,
+ executableSchemaId: id,
+ };
+
+ return id;
+ }
+
+ public newPlugin(): ApolloServerPlugin {
+ return plugin(this.options, this.addTrace.bind(this), {
+ startSchemaReporting: this.startSchemaReporting.bind(this),
+ executableSchemaIdGenerator: this.executableSchemaIdGenerator.bind(this),
+ });
+ }
+
+ private getReportData(executableSchemaId: string): ReportData {
+ const existing = this.reportDataByExecutableSchemaId[executableSchemaId];
+ if (existing) {
+ return existing;
+ }
+ const reportData = new ReportData(executableSchemaId, this.graphVariant);
+ this.reportDataByExecutableSchemaId[executableSchemaId] = reportData;
+ return reportData;
}
public async addTrace({
trace,
queryHash,
- documentAST,
+ document,
operationName,
- queryString,
- schemaHash,
+ source,
+ executableSchemaId,
+ /**
+ * Since this agent instruments the plugin with its `options.logger`, but
+ * also passes off a reference to this `addTrace` method which is invoked
+ * with the availability of a per-request `logger`, this `logger` (in this
+ * destructuring) is already conditionally either:
+ *
+ * 1. The `logger` that was passed into the `options` for the agent.
+ * 2. The request-specific `logger`.
+ */
+ logger,
}: AddTraceArgs): Promise {
// Ignore traces that come in after stop().
if (this.stopped) {
return;
}
- if (!(schemaHash in this.reports)) {
- this.reportHeaders[schemaHash] = new ReportHeader({
- ...serviceHeaderDefaults,
- schemaHash,
- schemaTag:
- this.options.schemaTag || process.env.ENGINE_SCHEMA_TAG || '',
- });
- // initializes this.reports[reportHash]
- this.resetReport(schemaHash);
- }
- const report = this.reports[schemaHash];
+ const reportData = this.getReportData(executableSchemaId);
+ const { report } = reportData;
const protobufError = Trace.verify(trace);
if (protobufError) {
@@ -306,14 +516,15 @@ export class EngineReportingAgent {
const signature = await this.getTraceSignature({
queryHash,
- documentAST,
- queryString,
+ document,
+ source,
operationName,
+ logger,
});
const statsReportKey = `# ${operationName || '-'}\n${signature}`;
if (!report.tracesPerQuery.hasOwnProperty(statsReportKey)) {
- report.tracesPerQuery[statsReportKey] = new Traces();
+ report.tracesPerQuery[statsReportKey] = new TracesAndStats();
(report.tracesPerQuery[statsReportKey] as any).encodedTraces = [];
}
// See comment on our override of Traces.encode inside of
@@ -321,28 +532,30 @@ export class EngineReportingAgent {
(report.tracesPerQuery[statsReportKey] as any).encodedTraces.push(
encodedTrace,
);
- this.reportSizes[schemaHash] +=
- encodedTrace.length + Buffer.byteLength(statsReportKey);
+ reportData.size += encodedTrace.length + Buffer.byteLength(statsReportKey);
// If the buffer gets big (according to our estimate), send.
if (
this.sendReportsImmediately ||
- this.reportSizes[schemaHash] >=
+ reportData.size >=
(this.options.maxUncompressedReportSize || 4 * 1024 * 1024)
) {
- await this.sendReportAndReportErrors(schemaHash);
+ await this.sendReportAndReportErrors(executableSchemaId);
}
}
public async sendAllReports(): Promise {
await Promise.all(
- Object.keys(this.reports).map(hash => this.sendReport(hash)),
+ Object.keys(this.reportDataByExecutableSchemaId).map((id) =>
+ this.sendReport(id),
+ ),
);
}
- public async sendReport(schemaHash: string): Promise {
- const report = this.reports[schemaHash];
- this.resetReport(schemaHash);
+ public async sendReport(executableSchemaId: string): Promise {
+ const reportData = this.getReportData(executableSchemaId);
+ const { report } = reportData;
+ reportData.reset();
if (Object.keys(report.tracesPerQuery).length === 0) {
return;
@@ -353,14 +566,24 @@ export class EngineReportingAgent {
await Promise.resolve();
if (this.options.debugPrintReports) {
- console.log(`Engine sending report: ${JSON.stringify(report.toJSON())}`);
+ // In terms of verbosity, and as the name of this option suggests, this
+ // message is either an "info" or a "debug" level message. However,
+ // we are using `warn` here for compatibility reasons since the
+ // `debugPrintReports` flag pre-dated the existence of log-levels and
+ // changing this to also require `debug: true` (in addition to
+ // `debugPrintReports`) just to reach the level of verbosity to produce
+ // the output would be a breaking change. The "warn" level is on by
+ // default. There is a similar theory and comment applied below.
+ this.logger.warn(
+ `Engine sending report: ${JSON.stringify(report.toJSON())}`,
+ );
}
- const protobufError = FullTracesReport.verify(report);
+ const protobufError = Report.verify(report);
if (protobufError) {
throw new Error(`Error encoding report: ${protobufError}`);
}
- const message = FullTracesReport.encode(report).finish();
+ const message = Report.encode(report).finish();
const compressed = await new Promise((resolve, reject) => {
// The protobuf library gives us a Uint8Array. Node 8's zlib lets us
@@ -380,16 +603,12 @@ export class EngineReportingAgent {
});
});
- const endpointUrl =
- (this.options.endpointUrl || 'https://engine-report.apollodata.com') +
- '/api/ingress/traces';
-
// Wrap fetch with async-retry for automatic retrying
const response: Response = await retry(
// Retry on network errors and 5xx HTTP
// responses.
async () => {
- const curResponse = await fetch(endpointUrl, {
+ const curResponse = await fetch(this.tracesEndpointUrl, {
method: 'POST',
headers: {
'user-agent': 'apollo-engine-reporting',
@@ -402,8 +621,9 @@ export class EngineReportingAgent {
if (curResponse.status >= 500 && curResponse.status < 600) {
throw new Error(
- `HTTP status ${curResponse.status}, ${(await curResponse.text()) ||
- '(no body)'}`,
+ `HTTP status ${curResponse.status}, ${
+ (await curResponse.text()) || '(no body)'
+ }`,
);
} else {
return curResponse;
@@ -430,8 +650,69 @@ export class EngineReportingAgent {
);
}
if (this.options.debugPrintReports) {
- console.log(`Engine report: status ${response.status}`);
+ // In terms of verbosity, and as the name of this option suggests, this
+ // message is either an "info" or a "debug" level message. However,
+ // we are using `warn` here for compatibility reasons since the
+ // `debugPrintReports` flag pre-dated the existence of log-levels and
+ // changing this to also require `debug: true` (in addition to
+ // `debugPrintReports`) just to reach the level of verbosity to produce
+ // the output would be a breaking change. The "warn" level is on by
+ // default. There is a similar theory and comment applied above.
+ this.logger.warn(`Engine report: status ${response.status}`);
+ }
+ }
+
+ public startSchemaReporting({
+ executableSchemaId,
+ executableSchema,
+ }: {
+ executableSchemaId: string;
+ executableSchema: string;
+ }) {
+ if (this.currentSchemaReporter) {
+ this.currentSchemaReporter.stop();
}
+
+ const serverInfo = {
+ bootId: this.bootId,
+ graphVariant: this.graphVariant,
+ // The infra environment in which this edge server is running, e.g. localhost, Kubernetes
+ // Length must be <= 256 characters.
+ platform: process.env.APOLLO_SERVER_PLATFORM || 'local',
+ runtimeVersion: `node ${process.version}`,
+ executableSchemaId: executableSchemaId,
+ // An identifier used to distinguish the version of the server code such as git or docker sha.
+ // Length must be <= 256 charecters
+ userVersion: process.env.APOLLO_SERVER_USER_VERSION,
+ // "An identifier for the server instance. Length must be <= 256 characters.
+ serverId:
+ process.env.APOLLO_SERVER_ID || process.env.HOSTNAME || os.hostname(),
+ libraryVersion: `apollo-engine-reporting@${
+ require('../package.json').version
+ }`,
+ };
+
+ // Jitter the startup between 0 and 10 seconds
+ const delay = Math.floor(
+ Math.random() *
+ (this.options.experimental_schemaReportingInitialDelayMaxMs || 10_000),
+ );
+
+ const schemaReporter = new SchemaReporter(
+ serverInfo,
+ executableSchema,
+ this.apiKey,
+ this.options.schemaReportingUrl,
+ );
+
+ const fallbackReportingDelayInMs = 20_000;
+
+ this.currentSchemaReporter = schemaReporter;
+ const logger = this.logger;
+
+ setTimeout(function () {
+ reportingLoop(schemaReporter, logger, false, fallbackReportingDelayInMs);
+ }, delay);
}
// Stop prevents reports from being sent automatically due to time or buffer
@@ -448,23 +729,29 @@ export class EngineReportingAgent {
this.reportTimer = undefined;
}
+ if (this.currentSchemaReporter) {
+ this.currentSchemaReporter.stop();
+ }
+
this.stopped = true;
}
private async getTraceSignature({
queryHash,
operationName,
- documentAST,
- queryString,
+ document,
+ source,
+ logger,
}: {
queryHash: string;
operationName: string;
- documentAST?: DocumentNode;
- queryString?: string;
+ document?: DocumentNode;
+ source?: string;
+ logger: Logger;
}): Promise {
- if (!documentAST && !queryString) {
+ if (!document && !source) {
// This shouldn't happen: one of those options must be passed to runQuery.
- throw new Error('No queryString or parsedQuery?');
+ throw new Error('No document or source?');
}
const cacheKey = signatureCacheKey(queryHash, operationName);
@@ -479,7 +766,7 @@ export class EngineReportingAgent {
return cachedSignature;
}
- if (!documentAST) {
+ if (!document) {
// We didn't get an AST, possibly because of a parse failure. Let's just
// use the full query string.
//
@@ -487,49 +774,65 @@ export class EngineReportingAgent {
// hides literals, you might end up sending literals for queries
// that fail parsing or validation. Provide some way to mask them
// anyway?
- return queryString as string;
+ return source as string;
}
const generatedSignature = (
this.options.calculateSignature || defaultEngineReportingSignature
- )(documentAST, operationName);
+ )(document, operationName);
// Intentionally not awaited so the cache can be written to at leisure.
- this.signatureCache.set(cacheKey, generatedSignature);
+ //
+ // As of the writing of this comment, this signature cache is exclusively
+ // backed by an `InMemoryLRUCache` which cannot do anything
+ // non-synchronously, though that will probably change in the future,
+ // and a distributed cache store, like Redis, doesn't seem unfathomable.
+ //
+ // Due in part to the plugin being separate from the `EngineReportingAgent`,
+ // the loggers are difficult to track down here. Errors will be logged to
+ // either the request-specific logger on the request context (if available)
+ // or to the `logger` that was passed into `EngineReportingOptions` which
+ // is provided in the `EngineReportingAgent` constructor options.
+ this.signatureCache.set(cacheKey, generatedSignature)
+ .catch(err => {
+ logger.warn(
+ 'Could not store signature cache. ' +
+ (err && err.message) || err
+ )
+ });
return generatedSignature;
}
private async sendAllReportsAndReportErrors(): Promise {
await Promise.all(
- Object.keys(this.reports).map(schemaHash =>
- this.sendReportAndReportErrors(schemaHash),
+ Object.keys(
+ this.reportDataByExecutableSchemaId,
+ ).map((executableSchemaId) =>
+ this.sendReportAndReportErrors(executableSchemaId),
),
);
}
- private sendReportAndReportErrors(schemaHash: string): Promise {
- return this.sendReport(schemaHash).catch(err => {
+ private sendReportAndReportErrors(executableSchemaId: string): Promise {
+ return this.sendReport(executableSchemaId).catch((err) => {
// This catch block is primarily intended to catch network errors from
// the retried request itself, which include network errors and non-2xx
// HTTP errors.
if (this.options.reportErrorFunction) {
this.options.reportErrorFunction(err);
} else {
- console.error(err.message);
+ this.logger.error(err.message);
}
});
}
-
- private resetReport(schemaHash: string) {
- this.reports[schemaHash] = new FullTracesReport({
- header: this.reportHeaders[schemaHash],
- });
- this.reportSizes[schemaHash] = 0;
- }
}
-function createSignatureCache(): InMemoryLRUCache {
+function createSignatureCache({
+ logger,
+}: {
+ logger: Logger;
+}): InMemoryLRUCache {
let lastSignatureCacheWarn: Date;
let lastSignatureCacheDisposals: number = 0;
return new InMemoryLRUCache({
@@ -558,7 +861,7 @@ function createSignatureCache(): InMemoryLRUCache {
) {
// Log the time that we last displayed the message.
lastSignatureCacheWarn = new Date();
- console.warn(
+ logger.warn(
[
'This server is processing a high number of unique operations. ',
`A total of ${lastSignatureCacheDisposals} records have been `,
@@ -632,3 +935,13 @@ function makeSendValuesBaseOptionsFromLegacy(
? { none: true }
: { all: true };
}
+
+export function computeExecutableSchemaId(
+ schema: string | GraphQLSchema,
+): string {
+ // Can't call digest on this object twice. Creating new object each function call
+ const sha256 = createHash('sha256');
+ const schemaDocument =
+ typeof schema === 'string' ? schema : printSchema(schema);
+ return sha256.update(schemaDocument).digest('hex');
+}
diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts
deleted file mode 100644
index 0fd804df7f7..00000000000
--- a/packages/apollo-engine-reporting/src/extension.ts
+++ /dev/null
@@ -1,366 +0,0 @@
-import { GraphQLRequestContext, WithRequired } from 'apollo-server-types';
-import { Request, Headers } from 'apollo-server-env';
-import {
- GraphQLResolveInfo,
- DocumentNode,
- ExecutionArgs,
- GraphQLError,
-} from 'graphql';
-import { GraphQLExtension, EndHandler } from 'graphql-extensions';
-import { Trace } from 'apollo-engine-reporting-protobuf';
-
-import {
- EngineReportingOptions,
- GenerateClientInfo,
- AddTraceArgs,
- VariableValueOptions,
- SendValuesBaseOptions,
-} from './agent';
-import { EngineReportingTreeBuilder } from './treeBuilder';
-
-const clientNameHeaderKey = 'apollographql-client-name';
-const clientReferenceIdHeaderKey = 'apollographql-client-reference-id';
-const clientVersionHeaderKey = 'apollographql-client-version';
-
-// EngineReportingExtension is the per-request GraphQLExtension which creates a
-// trace (in protobuf Trace format) for a single request. When the request is
-// done, it passes the Trace back to its associated EngineReportingAgent via the
-// addTrace callback in its constructor. This class isn't for direct use; its
-// constructor is a private API for communicating with EngineReportingAgent.
-// Its public methods all implement the GraphQLExtension interface.
-export class EngineReportingExtension
- implements GraphQLExtension {
- private treeBuilder: EngineReportingTreeBuilder;
- private explicitOperationName?: string | null;
- private queryString?: string;
- private documentAST?: DocumentNode;
- private options: EngineReportingOptions;
- private addTrace: (args: AddTraceArgs) => Promise;
- private generateClientInfo: GenerateClientInfo;
-
- public constructor(
- options: EngineReportingOptions,
- addTrace: (args: AddTraceArgs) => Promise,
- private schemaHash: string,
- ) {
- this.options = {
- ...options,
- };
- this.addTrace = addTrace;
- this.generateClientInfo =
- options.generateClientInfo || defaultGenerateClientInfo;
-
- this.treeBuilder = new EngineReportingTreeBuilder({
- rewriteError: options.rewriteError,
- });
- }
-
- public requestDidStart(o: {
- request: Request;
- queryString?: string;
- parsedQuery?: DocumentNode;
- variables?: Record;
- context: TContext;
- extensions?: Record;
- requestContext: WithRequired<
- GraphQLRequestContext,
- 'metrics' | 'queryHash'
- >;
- }): EndHandler {
- this.treeBuilder.startTiming();
- o.requestContext.metrics.startHrTime = this.treeBuilder.startHrTime;
-
- // Generally, we'll get queryString here and not parsedQuery; we only get
- // parsedQuery if you're using an OperationStore. In normal cases we'll get
- // our documentAST in the execution callback after it is parsed.
- const queryHash = o.requestContext.queryHash;
- this.queryString = o.queryString;
- this.documentAST = o.parsedQuery;
-
- this.treeBuilder.trace.http = new Trace.HTTP({
- method:
- Trace.HTTP.Method[o.request.method as keyof typeof Trace.HTTP.Method] ||
- Trace.HTTP.Method.UNKNOWN,
- // Host and path are not used anywhere on the backend, so let's not bother
- // trying to parse request.url to get them, which is a potential
- // source of bugs because integrations have different behavior here.
- // On Node's HTTP module, request.url only includes the path
- // (see https://nodejs.org/api/http.html#http_message_url)
- // The same is true on Lambda (where we pass event.path)
- // But on environments like Cloudflare we do get a complete URL.
- host: null,
- path: null,
- });
-
- if (this.options.sendHeaders) {
- makeHTTPRequestHeaders(
- this.treeBuilder.trace.http,
- o.request.headers,
- this.options.sendHeaders,
- );
-
- if (o.requestContext.metrics.persistedQueryHit) {
- this.treeBuilder.trace.persistedQueryHit = true;
- }
- if (o.requestContext.metrics.persistedQueryRegister) {
- this.treeBuilder.trace.persistedQueryRegister = true;
- }
- }
-
- if (o.variables) {
- this.treeBuilder.trace.details = makeTraceDetails(
- o.variables,
- this.options.sendVariableValues,
- o.queryString,
- );
- }
-
- const clientInfo = this.generateClientInfo(o.requestContext);
- if (clientInfo) {
- // While clientAddress could be a part of the protobuf, we'll ignore it for
- // now, since the backend does not group by it and Engine frontend will not
- // support it in the short term
- const { clientName, clientVersion, clientReferenceId } = clientInfo;
- // the backend makes the choice of mapping clientName => clientReferenceId if
- // no custom reference id is provided
- this.treeBuilder.trace.clientVersion = clientVersion || '';
- this.treeBuilder.trace.clientReferenceId = clientReferenceId || '';
- this.treeBuilder.trace.clientName = clientName || '';
- }
-
- return () => {
- this.treeBuilder.stopTiming();
-
- this.treeBuilder.trace.fullQueryCacheHit = !!o.requestContext.metrics
- .responseCacheHit;
- this.treeBuilder.trace.forbiddenOperation = !!o.requestContext.metrics
- .forbiddenOperation;
- this.treeBuilder.trace.registeredOperation = !!o.requestContext.metrics
- .registeredOperation;
-
- // If the user did not explicitly specify an operation name (which we
- // would have saved in `executionDidStart`), but the request pipeline made
- // it far enough to figure out what the operation name must be and store
- // it on requestContext.operationName, use that name. (Note that this
- // depends on the assumption that the RequestContext passed to
- // requestDidStart, which does not yet have operationName, will be mutated
- // to add operationName later.)
- const operationName =
- this.explicitOperationName || o.requestContext.operationName || '';
- const documentAST = this.documentAST || o.requestContext.document;
-
- // If this was a federated operation and we're the gateway, add the query plan
- // to the trace.
- if (o.requestContext.metrics.queryPlanTrace) {
- this.treeBuilder.trace.queryPlan =
- o.requestContext.metrics.queryPlanTrace;
- }
-
- this.addTrace({
- operationName,
- queryHash,
- documentAST,
- queryString: this.queryString || '',
- trace: this.treeBuilder.trace,
- schemaHash: this.schemaHash,
- });
- };
- }
-
- public executionDidStart(o: { executionArgs: ExecutionArgs }) {
- // If the operationName is explicitly provided, save it. Note: this is the
- // operationName provided by the user. It might be empty if they're relying on
- // the "just use the only operation I sent" behavior, even if that operation
- // has a name.
- //
- // It's possible that execution is about to fail because this operation
- // isn't actually in the document. We want to know the name in that case
- // too, which is why it's important that we save the name now, and not just
- // rely on requestContext.operationName (which will be null in this case).
- if (o.executionArgs.operationName) {
- this.explicitOperationName = o.executionArgs.operationName;
- }
- this.documentAST = o.executionArgs.document;
- }
-
- public willResolveField(
- _source: any,
- _args: { [argName: string]: any },
- _context: TContext,
- info: GraphQLResolveInfo,
- ): ((error: Error | null, result: any) => void) | void {
- return this.treeBuilder.willResolveField(info);
- // We could save the error into the trace during the end handler, but it
- // won't have all the information that graphql-js adds to it later, like
- // 'locations'.
- }
-
- public didEncounterErrors(errors: GraphQLError[]) {
- this.treeBuilder.didEncounterErrors(errors);
- }
-}
-
-// Helpers for producing traces.
-
-function defaultGenerateClientInfo({ request }: GraphQLRequestContext) {
- // Default to using the `apollo-client-x` header fields if present.
- // If none are present, fallback on the `clientInfo` query extension
- // for backwards compatibility.
- // The default value if neither header values nor query extension is
- // set is the empty String for all fields (as per protobuf defaults)
- if (
- request.http &&
- request.http.headers &&
- (request.http.headers.get(clientNameHeaderKey) ||
- request.http.headers.get(clientVersionHeaderKey) ||
- request.http.headers.get(clientReferenceIdHeaderKey))
- ) {
- return {
- clientName: request.http.headers.get(clientNameHeaderKey),
- clientVersion: request.http.headers.get(clientVersionHeaderKey),
- clientReferenceId: request.http.headers.get(clientReferenceIdHeaderKey),
- };
- } else if (request.extensions && request.extensions.clientInfo) {
- return request.extensions.clientInfo;
- } else {
- return {};
- }
-}
-
-// Creates trace details from request variables, given a specification for modifying
-// values of private or sensitive variables.
-// The details will include all variable names and their (possibly hidden or modified) values.
-// If sendVariableValues is {all: bool}, {none: bool} or {exceptNames: Array}, the option will act similarly to
-// to the to-be-deprecated options.privateVariables, except that the redacted variable
-// names will still be visible in the UI even if the values are hidden.
-// If sendVariableValues is null or undefined, we default to the {none: true} case.
-export function makeTraceDetails(
- variables: Record,
- sendVariableValues?: VariableValueOptions,
- operationString?: string,
-): Trace.Details {
- const details = new Trace.Details();
- const variablesToRecord = (() => {
- if (sendVariableValues && 'transform' in sendVariableValues) {
- const originalKeys = Object.keys(variables);
- try {
- // Custom function to allow user to specify what variablesJson will look like
- const modifiedVariables = sendVariableValues.transform({
- variables: variables,
- operationString: operationString,
- });
- return cleanModifiedVariables(originalKeys, modifiedVariables);
- } catch (e) {
- // If the custom function provided by the user throws an exception,
- // change all the variable values to an appropriate error message.
- return handleVariableValueTransformError(originalKeys);
- }
- } else {
- return variables;
- }
- })();
-
- // Note: we explicitly do *not* include the details.rawQuery field. The
- // Engine web app currently does nothing with this other than store it in
- // the database and offer it up via its GraphQL API, and sending it means
- // that using calculateSignature to hide sensitive data in the query
- // string is ineffective.
- Object.keys(variablesToRecord).forEach(name => {
- if (
- !sendVariableValues ||
- ('none' in sendVariableValues && sendVariableValues.none) ||
- ('all' in sendVariableValues && !sendVariableValues.all) ||
- ('exceptNames' in sendVariableValues &&
- // We assume that most users will have only a few variables values to hide,
- // or will just set {none: true}; we can change this
- // linear-time operation if it causes real performance issues.
- sendVariableValues.exceptNames.includes(name)) ||
- ('onlyNames' in sendVariableValues &&
- !sendVariableValues.onlyNames.includes(name))
- ) {
- // Special case for private variables. Note that this is a different
- // representation from a variable containing the empty string, as that
- // will be sent as '""'.
- details.variablesJson![name] = '';
- } else {
- try {
- details.variablesJson![name] =
- typeof variablesToRecord[name] === 'undefined'
- ? ''
- : JSON.stringify(variablesToRecord[name]);
- } catch (e) {
- details.variablesJson![name] = JSON.stringify(
- '[Unable to convert value to JSON]',
- );
- }
- }
- });
- return details;
-}
-
-function handleVariableValueTransformError(
- variableNames: string[],
-): Record {
- const modifiedVariables = Object.create(null);
- variableNames.forEach(name => {
- modifiedVariables[name] = '[PREDICATE_FUNCTION_ERROR]';
- });
- return modifiedVariables;
-}
-
-// Helper for makeTraceDetails() to enforce that the keys of a modified 'variables'
-// matches that of the original 'variables'
-function cleanModifiedVariables(
- originalKeys: Array,
- modifiedVariables: Record,
-): Record {
- const cleanedVariables: Record = Object.create(null);
- originalKeys.forEach(name => {
- cleanedVariables[name] = modifiedVariables[name];
- });
- return cleanedVariables;
-}
-
-export function makeHTTPRequestHeaders(
- http: Trace.IHTTP,
- headers: Headers,
- sendHeaders?: SendValuesBaseOptions,
-): void {
- if (
- !sendHeaders ||
- ('none' in sendHeaders && sendHeaders.none) ||
- ('all' in sendHeaders && !sendHeaders.all)
- ) {
- return;
- }
- for (const [key, value] of headers) {
- const lowerCaseKey = key.toLowerCase();
- if (
- ('exceptNames' in sendHeaders &&
- // We assume that most users only have a few headers to hide, or will
- // just set {none: true} ; we can change this linear-time
- // operation if it causes real performance issues.
- sendHeaders.exceptNames.some(exceptHeader => {
- // Headers are case-insensitive, and should be compared as such.
- return exceptHeader.toLowerCase() === lowerCaseKey;
- })) ||
- ('onlyNames' in sendHeaders &&
- !sendHeaders.onlyNames.some(header => {
- return header.toLowerCase() === lowerCaseKey;
- }))
- ) {
- continue;
- }
-
- switch (key) {
- case 'authorization':
- case 'cookie':
- case 'set-cookie':
- break;
- default:
- http!.requestHeaders![key] = new Trace.HTTP.Values({
- value: [value],
- });
- }
- }
-}
diff --git a/packages/apollo-engine-reporting/src/federatedExtension.ts b/packages/apollo-engine-reporting/src/federatedExtension.ts
deleted file mode 100644
index 711c95fbf6e..00000000000
--- a/packages/apollo-engine-reporting/src/federatedExtension.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { GraphQLResolveInfo, GraphQLError } from 'graphql';
-import { GraphQLExtension } from 'graphql-extensions';
-import { Trace } from 'apollo-engine-reporting-protobuf';
-import { GraphQLRequestContext } from 'apollo-server-types';
-
-import { EngineReportingTreeBuilder } from './treeBuilder';
-
-export class EngineFederatedTracingExtension
- implements GraphQLExtension {
- private enabled = false;
- private done = false;
- private treeBuilder: EngineReportingTreeBuilder;
-
- public constructor(options: {
- rewriteError?: (err: GraphQLError) => GraphQLError | null;
- }) {
- this.treeBuilder = new EngineReportingTreeBuilder({
- rewriteError: options.rewriteError,
- });
- }
-
- public requestDidStart(o: {
- requestContext: GraphQLRequestContext;
- }) {
- // XXX Provide a mechanism to customize this logic.
- const http = o.requestContext.request.http;
- if (
- http &&
- http.headers.get('apollo-federation-include-trace') === 'ftv1'
- ) {
- this.enabled = true;
- }
-
- if (this.enabled) {
- this.treeBuilder.startTiming();
- }
- }
-
- public willResolveField(
- _source: any,
- _args: { [argName: string]: any },
- _context: TContext,
- info: GraphQLResolveInfo,
- ): ((error: Error | null, result: any) => void) | void {
- if (this.enabled) {
- return this.treeBuilder.willResolveField(info);
- }
- }
-
- public didEncounterErrors(errors: GraphQLError[]) {
- if (this.enabled) {
- this.treeBuilder.didEncounterErrors(errors);
- }
- }
-
- // The ftv1 extension is a base64'd Trace protobuf containing only the
- // durationNs, startTime, endTime, and root fields.
- //
- // Note: format() is only called after executing an operation, and
- // specifically isn't called for parse or validation errors. Parse and validation
- // errors in a federated backend will get reported to the end user as a downstream
- // error but will not get reported to Engine (because Engine filters out downstream
- // errors)! See #3091.
- public format(): [string, string] | undefined {
- if (!this.enabled) {
- return;
- }
- if (this.done) {
- throw Error('format called twice?');
- }
-
- // We record the end time at the latest possible time: right before serializing the trace.
- // If we wait any longer, the time we record won't actually be sent anywhere!
- this.treeBuilder.stopTiming();
- this.done = true;
-
- const encodedUint8Array = Trace.encode(this.treeBuilder.trace).finish();
- const encodedBuffer = Buffer.from(
- encodedUint8Array,
- encodedUint8Array.byteOffset,
- encodedUint8Array.byteLength,
- );
- return ['ftv1', encodedBuffer.toString('base64')];
- }
-}
diff --git a/packages/apollo-engine-reporting/src/federatedPlugin.ts b/packages/apollo-engine-reporting/src/federatedPlugin.ts
new file mode 100644
index 00000000000..ce2a5580668
--- /dev/null
+++ b/packages/apollo-engine-reporting/src/federatedPlugin.ts
@@ -0,0 +1,69 @@
+import { Trace } from 'apollo-engine-reporting-protobuf';
+import { EngineReportingTreeBuilder } from './treeBuilder';
+import { ApolloServerPlugin } from "apollo-server-plugin-base";
+import { EngineReportingOptions } from "./agent";
+
+type FederatedReportingOptions = Pick, 'rewriteError'>
+
+// This ftv1 plugin produces a base64'd Trace protobuf containing only the
+// durationNs, startTime, endTime, and root fields. This output is placed
+// on the `extensions`.`ftv1` property of the response. The Apollo Gateway
+// utilizes this data to construct the full trace and submit it to Apollo
+// Graph Manager ingress.
+const federatedPlugin = (
+ options: FederatedReportingOptions = Object.create(null),
+): ApolloServerPlugin => {
+ return {
+ requestDidStart({ request: { http } }) {
+ const treeBuilder: EngineReportingTreeBuilder =
+ new EngineReportingTreeBuilder({
+ rewriteError: options.rewriteError,
+ });
+
+ // XXX Provide a mechanism to customize this logic.
+ if (http?.headers.get('apollo-federation-include-trace') !== 'ftv1') {
+ return;
+ }
+
+ treeBuilder.startTiming();
+
+ return {
+ executionDidStart: () => ({
+ willResolveField({ info }) {
+ return treeBuilder.willResolveField(info);
+ },
+ }),
+
+ didEncounterErrors({ errors }) {
+ treeBuilder.didEncounterErrors(errors);
+ },
+
+ willSendResponse({ response }) {
+ // We record the end time at the latest possible time: right before serializing the trace.
+ // If we wait any longer, the time we record won't actually be sent anywhere!
+ treeBuilder.stopTiming();
+
+ const encodedUint8Array = Trace.encode(treeBuilder.trace).finish();
+ const encodedBuffer = Buffer.from(
+ encodedUint8Array,
+ encodedUint8Array.byteOffset,
+ encodedUint8Array.byteLength,
+ );
+
+ const extensions =
+ response.extensions || (response.extensions = Object.create(null));
+
+ // This should only happen if another plugin is using the same name-
+ // space within the `extensions` object and got to it before us.
+ if (typeof extensions.ftv1 !== "undefined") {
+ throw new Error("The `ftv1` extension was already present.");
+ }
+
+ extensions.ftv1 = encodedBuffer.toString('base64');
+ }
+ }
+ },
+ }
+};
+
+export default federatedPlugin;
diff --git a/packages/apollo-engine-reporting/src/index.ts b/packages/apollo-engine-reporting/src/index.ts
index 5770edf02c3..82b73e73ad9 100644
--- a/packages/apollo-engine-reporting/src/index.ts
+++ b/packages/apollo-engine-reporting/src/index.ts
@@ -1,2 +1,2 @@
export { EngineReportingOptions, EngineReportingAgent } from './agent';
-export { EngineFederatedTracingExtension } from './federatedExtension';
+export { default as federatedPlugin } from './federatedPlugin';
diff --git a/packages/apollo-engine-reporting/src/plugin.ts b/packages/apollo-engine-reporting/src/plugin.ts
new file mode 100644
index 00000000000..b960df381df
--- /dev/null
+++ b/packages/apollo-engine-reporting/src/plugin.ts
@@ -0,0 +1,420 @@
+import {
+ GraphQLRequestContext,
+ Logger,
+ GraphQLRequestContextDidEncounterErrors,
+ GraphQLRequestContextWillSendResponse,
+} from 'apollo-server-types';
+import { Headers } from 'apollo-server-env';
+import { GraphQLSchema, printSchema } from 'graphql';
+import { Trace } from 'apollo-engine-reporting-protobuf';
+
+import {
+ AddTraceArgs,
+ EngineReportingOptions,
+ GenerateClientInfo,
+ SendValuesBaseOptions,
+ VariableValueOptions,
+} from './agent';
+import { EngineReportingTreeBuilder } from './treeBuilder';
+import { ApolloServerPlugin } from 'apollo-server-plugin-base';
+
+const clientNameHeaderKey = 'apollographql-client-name';
+const clientReferenceIdHeaderKey = 'apollographql-client-reference-id';
+const clientVersionHeaderKey = 'apollographql-client-version';
+
+// This plugin is instantiated once at server start-up. Each request that the
+// server processes will invoke the `requestDidStart` method which will produce
+// a trace (in protobuf Trace format) for that single request. When the request
+// is done, it passes the Trace back to its associated EngineReportingAgent via
+// the addTrace callback. This class isn't for direct use; its constructor is a
+// private API for communicating with EngineReportingAgent.
+export const plugin = (
+ options: EngineReportingOptions = Object.create(null),
+ addTrace: (args: AddTraceArgs) => Promise,
+ {
+ startSchemaReporting,
+ executableSchemaIdGenerator,
+ }: {
+ startSchemaReporting: ({
+ executableSchema,
+ executableSchemaId,
+ }: {
+ executableSchema: string;
+ executableSchemaId: string;
+ }) => void;
+ executableSchemaIdGenerator: (schema: string | GraphQLSchema) => string;
+ },
+): ApolloServerPlugin => {
+ /**
+ * Non request-specific logging will go into this general logger. Request-
+ * specific log output (where the log output is only a result of a specific
+ * request) will go to the `logger` which we get from the request context.
+ */
+ const loggerForPlugin: Logger = options.logger || console;
+
+ const generateClientInfo: GenerateClientInfo =
+ options.generateClientInfo || defaultGenerateClientInfo;
+
+ return {
+ serverWillStart: function({ schema }) {
+ if (!options.experimental_schemaReporting) return;
+ startSchemaReporting({
+ executableSchema:
+ options.experimental_overrideReportedSchema || printSchema(schema),
+ executableSchemaId: executableSchemaIdGenerator(
+ options.experimental_overrideReportedSchema || schema,
+ ),
+ });
+ },
+ requestDidStart({
+ logger: requestLogger,
+ metrics,
+ schema,
+ request: { http, variables },
+ }) {
+ /**
+ * Request specific log output should go into the `logger` from the
+ * request context when it's provided.
+ */
+ const logger = requestLogger || loggerForPlugin;
+
+ const treeBuilder: EngineReportingTreeBuilder = new EngineReportingTreeBuilder(
+ {
+ rewriteError: options.rewriteError,
+ logger,
+ },
+ );
+
+ treeBuilder.startTiming();
+
+ metrics.startHrTime = treeBuilder.startHrTime;
+
+ if (http) {
+ treeBuilder.trace.http = new Trace.HTTP({
+ method:
+ Trace.HTTP.Method[http.method as keyof typeof Trace.HTTP.Method] ||
+ Trace.HTTP.Method.UNKNOWN,
+ // Host and path are not used anywhere on the backend, so let's not bother
+ // trying to parse request.url to get them, which is a potential
+ // source of bugs because integrations have different behavior here.
+ // On Node's HTTP module, request.url only includes the path
+ // (see https://nodejs.org/api/http.html#http_message_url)
+ // The same is true on Lambda (where we pass event.path)
+ // But on environments like Cloudflare we do get a complete URL.
+ host: null,
+ path: null,
+ });
+
+ if (options.sendHeaders) {
+ makeHTTPRequestHeaders(
+ treeBuilder.trace.http,
+ http.headers,
+ options.sendHeaders,
+ );
+ }
+ }
+
+ /**
+ * Due to a number of exceptions in the request pipeline — which are
+ * intended to preserve backwards compatible behavior with the
+ * first generation of the request pipeline plugins prior to the
+ * introduction of `didEncounterErrors` — we need to have this "didEnd"
+ * functionality invoked from two places. This accounts for the fact
+ * that sometimes, under some special-cased error conditions,
+ * `willSendResponse` is not invoked. To zoom in on some of these cases,
+ * check the `requestPipeline.ts` for `emitErrorAndThrow`.
+ */
+ let endDone: boolean = false;
+ function didEnd(
+ requestContext:
+ | GraphQLRequestContextWillSendResponse
+ | GraphQLRequestContextDidEncounterErrors,
+ ) {
+ if (endDone) return;
+ endDone = true;
+ treeBuilder.stopTiming();
+
+ treeBuilder.trace.fullQueryCacheHit = !!metrics.responseCacheHit;
+ treeBuilder.trace.forbiddenOperation = !!metrics.forbiddenOperation;
+ treeBuilder.trace.registeredOperation = !!metrics.registeredOperation;
+
+ // If operation resolution (parsing and validating the document followed
+ // by selecting the correct operation) resulted in the population of the
+ // `operationName`, we'll use that. (For anonymous operations,
+ // `requestContext.operationName` is null, which we represent here as
+ // the empty string.)
+ //
+ // If the user explicitly specified an `operationName` in their request
+ // but operation resolution failed (due to parse or validation errors or
+ // because there is no operation with that name in the document), we
+ // still put _that_ user-supplied `operationName` in the trace. This
+ // allows the error to be better understood in Graph Manager. (We are
+ // considering changing the behavior of `operationName` in these 3 error
+ // cases; https://github.com/apollographql/apollo-server/pull/3465)
+ const operationName =
+ requestContext.operationName ||
+ requestContext.request.operationName ||
+ '';
+
+ // If this was a federated operation and we're the gateway, add the query plan
+ // to the trace.
+ if (metrics.queryPlanTrace) {
+ treeBuilder.trace.queryPlan = metrics.queryPlanTrace;
+ }
+
+ // Intentionally un-awaited so as not to block the response. Any
+ // errors will be logged, but will not manifest a user-facing error.
+ // The logger in this case is a request specific logger OR the logger
+ // defined by the plugin if that's unavailable. The request-specific
+ // logger is preferred since this is very much coupled directly to a
+ // client-triggered action which might be more granularly tagged by
+ // logging implementations.
+ addTrace({
+ operationName,
+ queryHash: requestContext.queryHash!,
+ document: requestContext.document,
+ source: requestContext.source,
+ trace: treeBuilder.trace,
+ executableSchemaId: executableSchemaIdGenerator(
+ options.experimental_overrideReportedSchema || schema,
+ ),
+ logger,
+ }).catch(logger.error);
+ }
+
+ // While we start the tracing as soon as possible, we only actually report
+ // traces when we have resolved the source. This is largely because of
+ // the APQ negotiation that takes place before that resolution happens.
+ // This is effectively bypassing the reporting of:
+ // - PersistedQueryNotFoundError
+ // - PersistedQueryNotSupportedError
+ // - InvalidGraphQLRequestError
+ let didResolveSource: boolean = false;
+
+ return {
+ didResolveSource(requestContext) {
+ didResolveSource = true;
+
+ if (metrics.persistedQueryHit) {
+ treeBuilder.trace.persistedQueryHit = true;
+ }
+ if (metrics.persistedQueryRegister) {
+ treeBuilder.trace.persistedQueryRegister = true;
+ }
+
+ if (variables) {
+ treeBuilder.trace.details = makeTraceDetails(
+ variables,
+ options.sendVariableValues,
+ requestContext.source,
+ );
+ }
+
+ const clientInfo = generateClientInfo(requestContext);
+ if (clientInfo) {
+ // While clientAddress could be a part of the protobuf, we'll ignore
+ // it for now, since the backend does not group by it and Graph
+ // Manager will not support it in the short term
+ const { clientName, clientVersion, clientReferenceId } = clientInfo;
+ // the backend makes the choice of mapping clientName => clientReferenceId if
+ // no custom reference id is provided
+ treeBuilder.trace.clientVersion = clientVersion || '';
+ treeBuilder.trace.clientReferenceId = clientReferenceId || '';
+ treeBuilder.trace.clientName = clientName || '';
+ }
+ },
+
+ executionDidStart() {
+ return {
+ willResolveField({ info }) {
+ return treeBuilder.willResolveField(info);
+ // We could save the error into the trace during the end handler, but
+ // it won't have all the information that graphql-js adds to it later,
+ // like 'locations'.
+ },
+ };
+ },
+
+ willSendResponse(requestContext) {
+ // See comment above for why `didEnd` must be called in two hooks.
+ didEnd(requestContext);
+ },
+
+ didEncounterErrors(requestContext) {
+ // Search above for a comment about "didResolveSource" to see which
+ // of the pre-source-resolution errors we are intentionally avoiding.
+ if (!didResolveSource) return;
+ treeBuilder.didEncounterErrors(requestContext.errors);
+
+ // See comment above for why `didEnd` must be called in two hooks.
+ didEnd(requestContext);
+ },
+ };
+ },
+ };
+};
+
+// Helpers for producing traces.
+
+function defaultGenerateClientInfo({ request }: GraphQLRequestContext) {
+ // Default to using the `apollo-client-x` header fields if present.
+ // If none are present, fallback on the `clientInfo` query extension
+ // for backwards compatibility.
+ // The default value if neither header values nor query extension is
+ // set is the empty String for all fields (as per protobuf defaults)
+ if (
+ request.http &&
+ request.http.headers &&
+ (request.http.headers.get(clientNameHeaderKey) ||
+ request.http.headers.get(clientVersionHeaderKey) ||
+ request.http.headers.get(clientReferenceIdHeaderKey))
+ ) {
+ return {
+ clientName: request.http.headers.get(clientNameHeaderKey),
+ clientVersion: request.http.headers.get(clientVersionHeaderKey),
+ clientReferenceId: request.http.headers.get(clientReferenceIdHeaderKey),
+ };
+ } else if (request.extensions && request.extensions.clientInfo) {
+ return request.extensions.clientInfo;
+ } else {
+ return {};
+ }
+}
+
+// Creates trace details from request variables, given a specification for modifying
+// values of private or sensitive variables.
+// The details will include all variable names and their (possibly hidden or modified) values.
+// If sendVariableValues is {all: bool}, {none: bool} or {exceptNames: Array}, the option will act similarly to
+// to the to-be-deprecated options.privateVariables, except that the redacted variable
+// names will still be visible in the UI even if the values are hidden.
+// If sendVariableValues is null or undefined, we default to the {none: true} case.
+export function makeTraceDetails(
+ variables: Record,
+ sendVariableValues?: VariableValueOptions,
+ operationString?: string,
+): Trace.Details {
+ const details = new Trace.Details();
+ const variablesToRecord = (() => {
+ if (sendVariableValues && 'transform' in sendVariableValues) {
+ const originalKeys = Object.keys(variables);
+ try {
+ // Custom function to allow user to specify what variablesJson will look like
+ const modifiedVariables = sendVariableValues.transform({
+ variables: variables,
+ operationString: operationString,
+ });
+ return cleanModifiedVariables(originalKeys, modifiedVariables);
+ } catch (e) {
+ // If the custom function provided by the user throws an exception,
+ // change all the variable values to an appropriate error message.
+ return handleVariableValueTransformError(originalKeys);
+ }
+ } else {
+ return variables;
+ }
+ })();
+
+ // Note: we explicitly do *not* include the details.rawQuery field. The
+ // Engine web app currently does nothing with this other than store it in
+ // the database and offer it up via its GraphQL API, and sending it means
+ // that using calculateSignature to hide sensitive data in the query
+ // string is ineffective.
+ Object.keys(variablesToRecord).forEach(name => {
+ if (
+ !sendVariableValues ||
+ ('none' in sendVariableValues && sendVariableValues.none) ||
+ ('all' in sendVariableValues && !sendVariableValues.all) ||
+ ('exceptNames' in sendVariableValues &&
+ // We assume that most users will have only a few variables values to hide,
+ // or will just set {none: true}; we can change this
+ // linear-time operation if it causes real performance issues.
+ sendVariableValues.exceptNames.includes(name)) ||
+ ('onlyNames' in sendVariableValues &&
+ !sendVariableValues.onlyNames.includes(name))
+ ) {
+ // Special case for private variables. Note that this is a different
+ // representation from a variable containing the empty string, as that
+ // will be sent as '""'.
+ details.variablesJson![name] = '';
+ } else {
+ try {
+ details.variablesJson![name] =
+ typeof variablesToRecord[name] === 'undefined'
+ ? ''
+ : JSON.stringify(variablesToRecord[name]);
+ } catch (e) {
+ details.variablesJson![name] = JSON.stringify(
+ '[Unable to convert value to JSON]',
+ );
+ }
+ }
+ });
+ return details;
+}
+
+function handleVariableValueTransformError(
+ variableNames: string[],
+): Record {
+ const modifiedVariables = Object.create(null);
+ variableNames.forEach(name => {
+ modifiedVariables[name] = '[PREDICATE_FUNCTION_ERROR]';
+ });
+ return modifiedVariables;
+}
+
+// Helper for makeTraceDetails() to enforce that the keys of a modified 'variables'
+// matches that of the original 'variables'
+function cleanModifiedVariables(
+ originalKeys: Array,
+ modifiedVariables: Record,
+): Record {
+ const cleanedVariables: Record = Object.create(null);
+ originalKeys.forEach(name => {
+ cleanedVariables[name] = modifiedVariables[name];
+ });
+ return cleanedVariables;
+}
+
+export function makeHTTPRequestHeaders(
+ http: Trace.IHTTP,
+ headers: Headers,
+ sendHeaders?: SendValuesBaseOptions,
+): void {
+ if (
+ !sendHeaders ||
+ ('none' in sendHeaders && sendHeaders.none) ||
+ ('all' in sendHeaders && !sendHeaders.all)
+ ) {
+ return;
+ }
+ for (const [key, value] of headers) {
+ const lowerCaseKey = key.toLowerCase();
+ if (
+ ('exceptNames' in sendHeaders &&
+ // We assume that most users only have a few headers to hide, or will
+ // just set {none: true} ; we can change this linear-time
+ // operation if it causes real performance issues.
+ sendHeaders.exceptNames.some(exceptHeader => {
+ // Headers are case-insensitive, and should be compared as such.
+ return exceptHeader.toLowerCase() === lowerCaseKey;
+ })) ||
+ ('onlyNames' in sendHeaders &&
+ !sendHeaders.onlyNames.some(header => {
+ return header.toLowerCase() === lowerCaseKey;
+ }))
+ ) {
+ continue;
+ }
+
+ switch (key) {
+ case 'authorization':
+ case 'cookie':
+ case 'set-cookie':
+ break;
+ default:
+ http!.requestHeaders![key] = new Trace.HTTP.Values({
+ value: [value],
+ });
+ }
+ }
+}
diff --git a/packages/apollo-engine-reporting/src/reportingOperationTypes.ts b/packages/apollo-engine-reporting/src/reportingOperationTypes.ts
new file mode 100644
index 00000000000..1bf7b182d51
--- /dev/null
+++ b/packages/apollo-engine-reporting/src/reportingOperationTypes.ts
@@ -0,0 +1,64 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL mutation operation: AutoregReportServerInfo
+// ====================================================
+
+import { GraphQLFormattedError } from 'graphql';
+
+export interface ReportServerInfo_me_UserMutation {
+ __typename: 'UserMutation';
+}
+
+export interface ReportServerInfo_me_ServiceMutation_reportServerInfo {
+ __typename: 'ReportServerInfoResponse';
+ inSeconds: number;
+ withExecutableSchema: boolean;
+}
+
+export interface ReportServerInfo_me_ServiceMutation {
+ __typename: 'ServiceMutation';
+ /**
+ * Schema auto-registration. Private alpha.
+ */
+ reportServerInfo: ReportServerInfo_me_ServiceMutation_reportServerInfo | null;
+}
+
+export type ReportServerInfo_me =
+ | ReportServerInfo_me_UserMutation
+ | ReportServerInfo_me_ServiceMutation;
+
+export interface SchemaReportingServerInfo {
+ me: ReportServerInfo_me | null;
+}
+
+export interface SchemaReportingServerInfoResult {
+ data?: SchemaReportingServerInfo;
+ errors?: ReadonlyArray;
+}
+
+export interface ReportServerInfoVariables {
+ info: EdgeServerInfo;
+ executableSchema?: string | null;
+}
+
+/**
+ * Edge server info
+ */
+export interface EdgeServerInfo {
+ bootId: string;
+ executableSchemaId: string;
+ graphVariant: string;
+ libraryVersion?: string | null;
+ platform?: string | null;
+ runtimeVersion?: string | null;
+ serverId?: string | null;
+ userVersion?: string | null;
+}
+
+//==============================================================
+// END Enums and Input Objects
+//==============================================================
diff --git a/packages/apollo-engine-reporting/src/schemaReporter.ts b/packages/apollo-engine-reporting/src/schemaReporter.ts
new file mode 100644
index 00000000000..5dae15d7b61
--- /dev/null
+++ b/packages/apollo-engine-reporting/src/schemaReporter.ts
@@ -0,0 +1,190 @@
+import {
+ ReportServerInfoVariables,
+ EdgeServerInfo,
+ SchemaReportingServerInfoResult,
+} from './reportingOperationTypes';
+import { fetch, Headers, Request } from 'apollo-server-env';
+import { GraphQLRequest, Logger } from 'apollo-server-types';
+
+export const reportServerInfoGql = `
+ mutation ReportServerInfo($info: EdgeServerInfo!, $executableSchema: String) {
+ me {
+ __typename
+ ... on ServiceMutation {
+ reportServerInfo(info: $info, executableSchema: $executableSchema) {
+ inSeconds
+ withExecutableSchema
+ }
+ }
+ }
+ }
+`;
+
+export function reportingLoop(
+ schemaReporter: SchemaReporter,
+ logger: Logger,
+ sendNextWithExecutableSchema: boolean,
+ fallbackReportingDelayInMs: number,
+) {
+ function inner() {
+ // Bail out permanently
+ if (schemaReporter.stopped()) return;
+
+ // Not awaiting this. The callback is handled in the `then` and it calls inner()
+ // to report the server info in however many seconds we were told to wait from
+ // Apollo Graph Manager
+ schemaReporter
+ .reportServerInfo(sendNextWithExecutableSchema)
+ .then(({ inSeconds, withExecutableSchema }) => {
+ sendNextWithExecutableSchema = withExecutableSchema;
+ setTimeout(inner, inSeconds * 1000);
+ })
+ .catch((error: any) => {
+ // In the case of an error we want to continue looping
+ // We can add hardcoded backoff in the future,
+ // or on repeated failures stop responding reporting.
+ logger.error(
+ `Error reporting server info to Apollo Graph Manager during schema reporting: ${error}`,
+ );
+ sendNextWithExecutableSchema = false;
+ setTimeout(inner, fallbackReportingDelayInMs);
+ });
+ }
+
+ inner();
+}
+
+interface ReportServerInfoReturnVal {
+ inSeconds: number;
+ withExecutableSchema: boolean;
+}
+
+// This class is meant to be a thin shim around the gql mutations.
+export class SchemaReporter {
+ // These mirror the gql variables
+ private readonly serverInfo: EdgeServerInfo;
+ private readonly executableSchemaDocument: any;
+ private readonly url: string;
+
+ private isStopped: boolean;
+ private readonly headers: Headers;
+
+ constructor(
+ serverInfo: EdgeServerInfo,
+ schemaSdl: string,
+ apiKey: string,
+ schemaReportingEndpoint: string | undefined,
+ ) {
+ this.headers = new Headers();
+ this.headers.set('Content-Type', 'application/json');
+ this.headers.set('x-api-key', apiKey);
+ this.headers.set('apollographql-client-name', 'apollo-engine-reporting');
+ this.headers.set(
+ 'apollographql-client-version',
+ require('../package.json').version,
+ );
+
+ this.url =
+ schemaReportingEndpoint ||
+ 'https://engine-graphql.apollographql.com/api/graphql';
+
+ this.serverInfo = serverInfo;
+ this.executableSchemaDocument = schemaSdl;
+ this.isStopped = false;
+ }
+
+ public stopped(): Boolean {
+ return this.isStopped;
+ }
+
+ public stop() {
+ this.isStopped = true;
+ }
+
+ public async reportServerInfo(
+ withExecutableSchema: boolean,
+ ): Promise {
+ const { data, errors } = await this.graphManagerQuery({
+ info: this.serverInfo,
+ executableSchema: withExecutableSchema
+ ? this.executableSchemaDocument
+ : null,
+ });
+
+ if (errors) {
+ throw new Error((errors || []).map((x: any) => x.message).join('\n'));
+ }
+
+ function msgForUnexpectedResponse(data: any): string {
+ return [
+ 'Unexpected response shape from Apollo Graph Manager when',
+ 'reporting server information for schema reporting. If',
+ 'this continues, please reach out to support@apollographql.com.',
+ 'Received response:',
+ JSON.stringify(data),
+ ].join(' ');
+ }
+
+ if (!data || !data.me || !data.me.__typename) {
+ throw new Error(msgForUnexpectedResponse(data));
+ }
+
+ if (data.me.__typename === 'UserMutation') {
+ this.isStopped = true;
+ throw new Error(
+ [
+ 'This server was configured with an API key for a user.',
+ "Only a service's API key may be used for schema reporting.",
+ 'Please visit the settings for this graph at',
+ 'https://engine.apollographql.com/ to obtain an API key for a service.',
+ ].join(' '),
+ );
+ } else if (data.me.__typename === 'ServiceMutation') {
+ if (!data.me.reportServerInfo) {
+ throw new Error(msgForUnexpectedResponse(data));
+ }
+ return data.me.reportServerInfo;
+ } else {
+ throw new Error(msgForUnexpectedResponse(data));
+ }
+ }
+
+ private async graphManagerQuery(
+ variables: ReportServerInfoVariables,
+ ): Promise {
+ const request: GraphQLRequest = {
+ query: reportServerInfoGql,
+ operationName: 'ReportServerInfo',
+ variables: variables,
+ };
+ const httpRequest = new Request(this.url, {
+ method: 'POST',
+ headers: this.headers,
+ body: JSON.stringify(request),
+ });
+
+ const httpResponse = await fetch(httpRequest);
+
+ if (!httpResponse.ok) {
+ throw new Error([
+ `An unexpected HTTP status code (${httpResponse.status}) was`,
+ 'encountered during schema reporting.'
+ ].join(' '));
+ }
+
+ try {
+ // JSON parsing failure due to malformed data is the likely failure case
+ // here. Any non-JSON response (e.g. HTML) is usually the suspect.
+ return await httpResponse.json();
+ } catch (error) {
+ throw new Error(
+ [
+ "Couldn't report server info to Apollo Graph Manager.",
+ 'Parsing response as JSON failed.',
+ 'If this continues please reach out to support@apollographql.com',
+ error
+ ].join(' '),
+ );
+ }
+ }
+}
diff --git a/packages/apollo-engine-reporting/src/treeBuilder.ts b/packages/apollo-engine-reporting/src/treeBuilder.ts
index 448c180f81c..27bfe9376ba 100644
--- a/packages/apollo-engine-reporting/src/treeBuilder.ts
+++ b/packages/apollo-engine-reporting/src/treeBuilder.ts
@@ -1,15 +1,6 @@
-import {
- GraphQLResolveInfo,
- GraphQLError,
- ResponsePath,
- responsePathAsArray,
-} from 'graphql';
+import { GraphQLError, GraphQLResolveInfo, ResponsePath } from 'graphql';
import { Trace, google } from 'apollo-engine-reporting-protobuf';
-import {
- PersistedQueryNotFoundError,
- PersistedQueryNotSupportedError,
-} from 'apollo-server-errors';
-import { InvalidGraphQLRequestError } from 'apollo-server-types';
+import { Logger } from 'apollo-server-types';
function internalError(message: string) {
return new Error(`[internal apollo-server error] ${message}`);
@@ -17,18 +8,21 @@ function internalError(message: string) {
export class EngineReportingTreeBuilder {
private rootNode = new Trace.Node();
+ private logger: Logger = console;
public trace = new Trace({ root: this.rootNode });
public startHrTime?: [number, number];
private stopped = false;
private nodes = new Map([
- [rootResponsePath, this.rootNode],
+ [responsePathAsString(), this.rootNode],
]);
private rewriteError?: (err: GraphQLError) => GraphQLError | null;
public constructor(options: {
+ logger?: Logger;
rewriteError?: (err: GraphQLError) => GraphQLError | null;
}) {
this.rewriteError = options.rewriteError;
+ if (options.logger) this.logger = options.logger;
}
public startTiming() {
@@ -80,16 +74,8 @@ export class EngineReportingTreeBuilder {
};
}
- public didEncounterErrors(errors: GraphQLError[]) {
+ public didEncounterErrors(errors: readonly GraphQLError[]) {
errors.forEach(err => {
- if (
- err instanceof PersistedQueryNotFoundError ||
- err instanceof PersistedQueryNotSupportedError ||
- err instanceof InvalidGraphQLRequestError
- ) {
- return;
- }
-
// This is an error from a federated service. We will already be reporting
// it in the nested Trace in the query plan.
//
@@ -137,7 +123,7 @@ export class EngineReportingTreeBuilder {
if (specificNode) {
node = specificNode;
} else {
- console.warn(
+ this.logger.warn(
`Could not find node with path ${path.join(
'.',
)}; defaulting to put errors on root node.`,
@@ -246,14 +232,21 @@ function durationHrTimeToNanos(hrtime: [number, number]) {
// Convert from the linked-list ResponsePath format to a dot-joined
// string. Includes the full path (field names and array indices).
-function responsePathAsString(p: ResponsePath | undefined) {
+function responsePathAsString(p?: ResponsePath): string {
if (p === undefined) {
return '';
}
- return responsePathAsArray(p).join('.');
-}
-const rootResponsePath = responsePathAsString(undefined);
+ // A previous implementation used `responsePathAsArray` from `graphql-js/execution`,
+ // however, that employed an approach that created new arrays unnecessarily.
+ let res = String(p.key);
+
+ while ((p = p.prev) !== undefined) {
+ res = `${p.key}.${res}`;
+ }
+
+ return res;
+}
function errorToProtobufError(error: GraphQLError): Trace.Error {
return new Trace.Error({
diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json
index ca382f1094c..ea64c712362 100644
--- a/packages/apollo-engine-reporting/tsconfig.json
+++ b/packages/apollo-engine-reporting/tsconfig.json
@@ -7,8 +7,8 @@
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
- { "path": "../graphql-extensions" },
{ "path": "../apollo-server-errors" },
{ "path": "../apollo-server-types" },
+ { "path": "../apollo-server-plugin-base" },
]
}
diff --git a/packages/apollo-federation/CHANGELOG.md b/packages/apollo-federation/CHANGELOG.md
index a4f2d9e93dc..7e0f4a5da17 100644
--- a/packages/apollo-federation/CHANGELOG.md
+++ b/packages/apollo-federation/CHANGELOG.md
@@ -1,6 +1,50 @@
# CHANGELOG for `@apollo/federation`
-## 0.13.2 (pre-release; `@next` tag)
+### vNEXT
+
+> The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
+
+- _Nothing yet! Stay tuned._
+
+## 0.16.3
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.16.2
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.16.1
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.16.0
+
+- No changes. This package was major versioned to maintain lockstep versioning with @apollo/gateway.
+
+## 0.15.1
+
+- Export `defaultRootOperationNameLookup` and `normalizeTypeDefs`; needed by `@apollo/gateway` to normalize root operation types when reporting to Apollo Graph Manager. [#4071](https://github.com/apollographql/apollo-server/pull/4071)
+
+## 0.15.0
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7)
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.14.1
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/b898396e9fcd3b9092b168f9aac8466ca186fa6b)
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.14.0
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/71a3863f59f4ab2c9052c316479d94c6708c4309)
+
+- Only changes in the similarly versioned `@apollo/gateway` package.
+
+## 0.13.2
- Only changes in the similarly versioned `@apollo/gateway` package.
diff --git a/packages/apollo-federation/package.json b/packages/apollo-federation/package.json
index 5e0f8c8e2eb..db24384cdd6 100644
--- a/packages/apollo-federation/package.json
+++ b/packages/apollo-federation/package.json
@@ -1,12 +1,12 @@
{
"name": "@apollo/federation",
- "version": "0.13.2",
+ "version": "0.16.3",
"description": "Apollo Federation Utilities",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"keywords": [],
"author": "Apollo ",
- "license": "SEE LICENSE IN LICENSE.md",
+ "license": "MIT",
"engines": {
"node": ">=8"
},
@@ -20,6 +20,6 @@
"lodash.xorby": "^4.7.0"
},
"peerDependencies": {
- "graphql": "^14.0.2 || ^15.0.0-rc.2"
+ "graphql": "^14.0.2 || ^15.0.0"
}
}
diff --git a/packages/apollo-federation/src/composition/index.ts b/packages/apollo-federation/src/composition/index.ts
index 92f38fe9a62..1d30fd138bb 100644
--- a/packages/apollo-federation/src/composition/index.ts
+++ b/packages/apollo-federation/src/composition/index.ts
@@ -2,3 +2,4 @@ export * from './compose';
export * from './composeAndValidate';
export * from './types';
export { compositionRules } from './rules';
+export { defaultRootOperationNameLookup, normalizeTypeDefs } from './normalize';
diff --git a/packages/apollo-federation/src/composition/normalize.ts b/packages/apollo-federation/src/composition/normalize.ts
index 75f423c561a..36fe58d51fe 100644
--- a/packages/apollo-federation/src/composition/normalize.ts
+++ b/packages/apollo-federation/src/composition/normalize.ts
@@ -15,18 +15,18 @@ export function normalizeTypeDefs(typeDefs: DocumentNode) {
);
}
+// Map of OperationTypeNode to its respective default root operation type name
+export const defaultRootOperationNameLookup: {
+ [node in OperationTypeNode]: DefaultRootOperationTypeName;
+} = {
+ query: 'Query',
+ mutation: 'Mutation',
+ subscription: 'Subscription',
+};
+
export function defaultRootOperationTypes(
typeDefs: DocumentNode,
): DocumentNode {
- // Map of OperationTypeNode to its respective default root operation type name
- const defaultRootOperationNameLookup: {
- [node in OperationTypeNode]: DefaultRootOperationTypeName;
- } = {
- query: 'Query',
- mutation: 'Mutation',
- subscription: 'Subscription',
- };
-
// Array of default root operation names
const defaultRootOperationNames = Object.values(
defaultRootOperationNameLookup,
diff --git a/packages/apollo-gateway/CHANGELOG.md b/packages/apollo-gateway/CHANGELOG.md
index 7cfaed85024..211e9896aa0 100644
--- a/packages/apollo-gateway/CHANGELOG.md
+++ b/packages/apollo-gateway/CHANGELOG.md
@@ -1,6 +1,69 @@
# CHANGELOG for `@apollo/gateway`
-## 0.13.2 (pre-release; `@next` tag)
+## vNEXT
+
+> The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. When a release is being prepared, a new header will be (manually) created below and the appropriate changes within that release will be moved into the new section.
+
+- _Nothing yet! Stay tuned._
+
+## 0.16.3
+
+- This updates a dependency of `apollo-server-core` that is only used for its TypeScript typings, not for any runtime dependencies. The reason for the upgrade is that the `apollo-server-core` package (again, used only for types!) was affected by a GitHub Security Advisory. [See the related `CHANGELOG.md` for Apollo Server for more details, including a link to the advisory](https://github.com/apollographql/apollo-server/blob/354d9910e1c87af93c7d50263a28554b449e48db/CHANGELOG.md#v2142).
+
+## 0.16.2
+
+- __FIX__: Collapse nested required fields into a single body in the query plan. Before, some nested fields' selection sets were getting split, causing some of their subfields to be dropped when executing the query. This fix collapses the split selection sets into one. [#4064](https://github.com/apollographql/apollo-server/pull/4064)
+
+## 0.16.1
+
+- __NEW__: Provide the ability to pass a custom `fetcher` during `RemoteGraphQLDataSource` construction to be used when executing operations against downstream services. Providing a custom `fetcher` may be necessary to accommodate more advanced needs, e.g., configuring custom TLS certificates for internal services. [PR #4149](https://github.com/apollographql/apollo-server/pull/4149)
+
+ The `fetcher` specified should be a compliant implementor of the [Fetch API standard](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API). This addition compliments, though is still orthognonal to, similar behavior originally introduced in [#3783](https://github.com/apollographql/apollo-server/pull/3783), which allowed customization of the implementation used to fetch _gateway configuration and federated SDL from services_ in managed and unmanaged modes, but didn't affect the communication that takes place during _operation execution_.
+
+ For now, the default `fetcher` will remain the same ([`node-fetch`](https://npm.im/node-fetch)) implementation. A future major-version bump will update it to be consistent with other feature-rich implementations of the Fetch API which are used elsewhere in the Apollo Server stack where we use [`make-fetch-happen`](https://npm.im/make-fetch-happen). In all likelihood, `ApolloGateway` will pass its own `fetcher` to the `RemoteGraphQLDataSource` during service initialization.
+
+## 0.16.0
+
+- __BREAKING__: Use a content delivery network for managed configuration, fetch storage secrets and composition configuration from different domains: https://storage-secrets.api.apollographql.com and https://federation.api.apollographql.com. Please mind any firewall for outgoing traffic. [#4080](https://github.com/apollographql/apollo-server/pull/4080)
+
+## 0.15.1
+
+- __FIX__: Correctly handle unions with nested conditions that have no `possibleTypes` [#4071](https://github.com/apollographql/apollo-server/pull/4071)
+- __FIX__: Normalize root operation types when reporting to Apollo Graph Manager. Federation always uses the default names `Query`, `Mutation`, and `Subscription` for root operation types even if downstream services choose different names; now we properly normalize traces received from downstream services in the same way. [#4100](https://github.com/apollographql/apollo-server/pull/4100)
+
+## 0.15.0
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/e37384a49b2bf474eed0de3e9f4a1bebaeee64c7)
+
+- __BREAKING__: Drop support for Node.js 8 and Node.js 10. This is being done primarily for performance gains which stand to be seen by transpiling to a newer ECMAScript target. For more details, see the related PR. [#4031](https://github.com/apollographql/apollo-server/pull/4031)
+- __Performance:__ Cache stringified representations of downstream query bodies within the query plan to address performance cost incurred by repeatedly `print`ing the same`DocumentNode`s with the `graphql` printer. This improvement is more pronounced on larger documents. [PR #4018](https://github.com/apollographql/apollo-server/pull/4018)
+- __Deprecation:__ Deprecated the `ENGINE_API_KEY` environment variable in favor of its new name, `APOLLO_KEY`. The new name mirrors the name used within Apollo Graph Manager. Aside from the rename, the functionality remains otherwise identical. Continued use of `ENGINE_API_KEY` will result in deprecation warnings being printed to the server console. Support for `ENGINE_API_KEY` will be removed in a future, major update. [#3923](https://github.com/apollographql/apollo-server/pull/3923)
+- __Deprecation:__ Deprecated the `APOLLO_SCHEMA_TAG` environment variable in favor of its new name, `APOLLO_GRAPH_VARIANT`. The new name mirrors the name used within Apollo Graph Manager. Aside from the rename, the functionality remains otherwise identical. Use of the now-deprecated name will result in a deprecation warning being printed to the server console. Support will be removed entirely in a future, major update. To avoid misconfiguration, runtime errors will be thrown if the new and deprecated versions are _both_ set. [#3855](https://github.com/apollographql/apollo-server/pull/3855)
+- Add inadvertently excluded `apollo-server-errors` runtime dependency. [#3927](https://github.com/apollographql/apollo-server/pull/3927)
+
+## 0.14.1
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/b898396e9fcd3b9092b168f9aac8466ca186fa6b)
+
+- __FIX__: Resolve condition which surfaced in `0.14.0` which prevented loading the configuration using managed federation. [PR #3979](https://github.com/apollographql/apollo-server/pull/3979)
+
+## 0.14.0
+
+> [See complete versioning details.](https://github.com/apollographql/apollo-server/commit/71a3863f59f4ab2c9052c316479d94c6708c4309)
+
+- Several previously unhandled Promise rejection errors stemming from, e.g. connectivity, failures when communicating with Apollo Graph Manager within asynchronous code are now handled. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811)
+- Provide a more helpful error message when encountering expected errors. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811)
+- General improvements and clarity to error messages and logging. [PR #3811](https://github.com/apollographql/apollo-server/pull/3811)
+- Warn of a possible misconfiguration when local service configuration is provided (via `serviceList` or `localServiceList`) and a remote Apollo Graph Manager configuration is subsequently found as well. [PR #3868](https://github.com/apollographql/apollo-server/pull/3868)
+- During composition, the unavailability of a downstream service in unmanaged federation mode will no longer result in a partially composed schema which merely lacks the types provided by the downed service. This prevents unexpected validation errors for clients querying a graph which lacks types which were merely unavailable during the initial composition but were intended to be part of the graph. [PR #3867](https://github.com/apollographql/apollo-server/pull/3867)
+- Support providing a custom logger implementation (e.g. [`winston`](https://npm.im/winston), [`bunyan`](https://npm.im/bunyan), etc.) to capture gateway-sourced console output. This allows the use of existing, production logging facilities or the possibiltiy to use advanced structure in logging, such as console output which is encapsulated in JSON. The same PR that introduces this support also introduces a `logger` property to the `GraphQLRequestContext` that is exposed to `GraphQLDataSource`s and Apollo Server plugins, making it possible to attach additional properties (as supported by the logger implementation) to specific requests, if desired, by leveraging custom implementations in those components respectively. When not provided, these will still output to `console`. [PR #3894](https://github.com/apollographql/apollo-server/pull/3894)
+- Drop use of `loglevel-debug`. This removes the very long date and time prefix in front of each log line and also the support for the `DEBUG=apollo-gateway:` environment variable. Both of these were uncommonly necessary or seldom used (with the environment variable also being undocumented). The existing behavior can be preserved by providing a `logger` that uses `loglevel-debug`, if desired, and more details can be found in the PR. [PR #3896](https://github.com/apollographql/apollo-server/pull/3896)
+- Fix Typescript generic typing for datasource contexts [#3865](https://github.com/apollographql/apollo-server/pull/3865) This is a fix for the `TContext` typings of the gateway's exposed `GraphQLDataSource` implementations. In their current form, they don't work as intended, or in any manner that's useful for typing the `context` property throughout the class methods. This introduces a type argument `TContext` to the class itself (which defaults to `Record` for existing implementations) and removes the non-operational type arguments on the class methods themselves.
+- Implement retry logic for requests to GCS [PR #3836](https://github.com/apollographql/apollo-server/pull/3836) Note: coupled with this change is a small alteration in how the gateway polls GCS for updates in managed mode. Previously, the tick was on a specific interval. Now, every tick starts after the round of fetches to GCS completes. For more details, see the linked PR.
+- Gateway issues health checks to downstream services via `serviceHealthCheck` configuration option. Note: expected behavior differs between managed and unmanaged federation. See PR for new test cases and documentation. [#3930](https://github.com/apollographql/apollo-server/pull/3930)
+
+
+## 0.13.2
- __BREAKING__: The behavior and signature of `RemoteGraphQLDataSource`'s `didReceiveResponse` method has been changed. No changes are necessary _unless_ your implementation has overridden the default behavior of this method by either extending the class and overriding the method or by providing `didReceiveResponse` as a parameter to the `RemoteGraphQLDataSource`'s constructor options. Implementations which have provided their own `didReceiveResponse` using either of these methods should view the PR linked here for details on what has changed. [PR #3743](https://github.com/apollographql/apollo-server/pull/3743)
- __NEW__: Setting the `apq` option to `true` on the `RemoteGraphQLDataSource` will enable the use of [automated persisted queries (APQ)](https://www.apollographql.com/docs/apollo-server/performance/apq/) when sending queries to downstream services. Depending on the complexity of queries sent to downstream services, this technique can greatly reduce the size of the payloads being transmitted over the network. Downstream implementing services must also support APQ functionality to participate in this feature (Apollo Server does by default unless it has been explicitly disabled). As with normal APQ behavior, a downstream server must have received and registered a query once before it will be able to serve an APQ request. [#3744](https://github.com/apollographql/apollo-server/pull/3744)
diff --git a/packages/apollo-gateway/jest.config.js b/packages/apollo-gateway/jest.config.js
index 29528a49090..ae9d3e7cef4 100644
--- a/packages/apollo-gateway/jest.config.js
+++ b/packages/apollo-gateway/jest.config.js
@@ -10,7 +10,7 @@ const additionalConfig = {
setupFilesAfterEnv: [path.resolve(__dirname, './src/__tests__/testSetup.ts')],
testPathIgnorePatterns: [
...config.testPathIgnorePatterns,
- ...NODE_MAJOR_VERSION === 6 ? [""] : []
+ ...NODE_MAJOR_VERSION < 12 ? [""] : []
]
};
diff --git a/packages/apollo-gateway/package.json b/packages/apollo-gateway/package.json
index afb50536e78..e28a308f8d6 100644
--- a/packages/apollo-gateway/package.json
+++ b/packages/apollo-gateway/package.json
@@ -1,6 +1,6 @@
{
"name": "@apollo/gateway",
- "version": "0.13.2",
+ "version": "0.16.3",
"description": "Apollo Gateway",
"author": "opensource@apollographql.com",
"main": "dist/index.js",
@@ -12,9 +12,9 @@
"Javascript"
],
"engines": {
- "node": ">=8"
+ "node": ">=12.13.0"
},
- "license": "SEE LICENSE IN LICENSE.md",
+ "license": "MIT",
"publishConfig": {
"access": "public"
},
@@ -27,14 +27,14 @@
"apollo-server-caching": "file:../apollo-server-caching",
"apollo-server-core": "file:../apollo-server-core",
"apollo-server-env": "file:../apollo-server-env",
+ "apollo-server-errors": "file:../apollo-server-errors",
"apollo-server-types": "file:../apollo-server-types",
"graphql-extensions": "file:../graphql-extensions",
"loglevel": "^1.6.1",
- "loglevel-debug": "^0.0.1",
- "make-fetch-happen": "^7.1.1",
- "pretty-format": "^24.7.0"
+ "make-fetch-happen": "^8.0.0",
+ "pretty-format": "^26.0.0"
},
"peerDependencies": {
- "graphql": "^14.2.1 || ^15.0.0-rc.2"
+ "graphql": "^14.2.1 || ^15.0.0"
}
}
diff --git a/packages/apollo-gateway/src/FieldSet.ts b/packages/apollo-gateway/src/FieldSet.ts
index 02cf29a2ff5..7c792ea2a6b 100644
--- a/packages/apollo-gateway/src/FieldSet.ts
+++ b/packages/apollo-gateway/src/FieldSet.ts
@@ -10,6 +10,7 @@ import {
GraphQLObjectType,
} from 'graphql';
import { getResponseName } from './utilities/graphql';
+import { partition, groupBy } from './utilities/array';
export interface Field<
TParent extends GraphQLCompositeType = GraphQLCompositeType
@@ -45,25 +46,6 @@ export function matchesField(field: Field) {
};
}
-function groupBy(keyFunction: (element: T) => U) {
- return (iterable: Iterable) => {
- const result = new Map();
-
- for (const element of iterable) {
- const key = keyFunction(element);
- const group = result.get(key);
-
- if (group) {
- group.push(element);
- } else {
- result.set(key, [element]);
- }
- }
-
- return result;
- };
-}
-
export const groupByResponseName = groupBy(field =>
getResponseName(field.fieldNode)
);
@@ -147,6 +129,38 @@ function mergeSelectionSets(fieldNodes: FieldNode[]): SelectionSetNode {
return {
kind: 'SelectionSet',
- selections,
+ selections: mergeFieldNodeSelectionSets(selections),
};
}
+
+function mergeFieldNodeSelectionSets(
+ selectionNodes: SelectionNode[],
+): SelectionNode[] {
+ const [fieldNodes, fragmentNodes] = partition(
+ selectionNodes,
+ (node): node is FieldNode => node.kind === Kind.FIELD,
+ );
+
+ const [aliasedFieldNodes, nonAliasedFieldNodes] = partition(
+ fieldNodes,
+ node => !!node.alias,
+ );
+
+ const mergedFieldNodes = Array.from(
+ groupBy((node: FieldNode) => node.name.value)(
+ nonAliasedFieldNodes,
+ ).values(),
+ ).map((nodesWithSameName) => {
+ const node = nodesWithSameName[0];
+ if (node.selectionSet) {
+ node.selectionSet.selections = mergeFieldNodeSelectionSets(
+ nodesWithSameName.flatMap(
+ (node) => node.selectionSet?.selections || [],
+ ),
+ );
+ }
+ return node;
+ });
+
+ return [...mergedFieldNodes, ...aliasedFieldNodes, ...fragmentNodes];
+}
diff --git a/packages/apollo-gateway/src/QueryPlan.ts b/packages/apollo-gateway/src/QueryPlan.ts
index 0899b2a7653..07f38ae9a96 100644
--- a/packages/apollo-gateway/src/QueryPlan.ts
+++ b/packages/apollo-gateway/src/QueryPlan.ts
@@ -42,6 +42,7 @@ export interface FetchNode {
variableUsages?: { [name: string]: VariableDefinitionNode };
requires?: SelectionSetNode;
internalFragments: Set;
+ source: string;
}
export interface FlattenNode {
kind: 'Flatten';
diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts
index 12dcf6993de..375ea53b5e5 100644
--- a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts
+++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/accounts.ts
@@ -6,7 +6,12 @@ export const typeDefs = gql`
directive @stream on FIELD
directive @transform(from: String!) on FIELD
- extend type Query {
+ schema {
+ query: RootQuery
+ mutation: Mutation
+ }
+
+ extend type RootQuery {
user(id: ID!): User
me: User
}
@@ -36,7 +41,7 @@ export const typeDefs = gql`
metadata: [UserMetadata]
}
- extend type Mutation {
+ type Mutation {
login(username: String!, password: String!): User
}
@@ -80,7 +85,7 @@ const libraryUsers: { [name: string]: string[] } = {
};
export const resolvers: GraphQLResolverMap = {
- Query: {
+ RootQuery: {
user(_, args) {
return { id: args.id };
},
diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts
new file mode 100644
index 00000000000..6f04d2f5de1
--- /dev/null
+++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/documents.ts
@@ -0,0 +1,34 @@
+import gql from 'graphql-tag';
+
+export const name = 'documents';
+export const typeDefs = gql`
+ directive @stream on FIELD
+ directive @transform(from: String!) on FIELD
+
+ extend type Query {
+ body: Body!
+ }
+
+ union Body = Image | Text
+
+ type Image {
+ name: String!
+ # Same as option below but the type is different
+ attributes: ImageAttributes!
+ }
+
+ type Text {
+ name: String!
+ # Same as option above but the type is different
+ attributes: TextAttributes!
+ }
+
+ type ImageAttributes {
+ url: String!
+ }
+
+ type TextAttributes {
+ bold: Boolean
+ text: String
+ }
+`;
diff --git a/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts
new file mode 100644
index 00000000000..e051f45b76a
--- /dev/null
+++ b/packages/apollo-gateway/src/__tests__/__fixtures__/schemas/index.ts
@@ -0,0 +1,33 @@
+import * as accounts from './accounts';
+import * as books from './books';
+import * as documents from './documents';
+import * as inventory from './inventory';
+import * as product from './product';
+import * as reviews from './reviews';
+
+export {
+ accounts,
+ books,
+ documents,
+ inventory,
+ product,
+ reviews,
+};
+
+export const fixtures = [
+ accounts,
+ books,
+ documents,
+ inventory,
+ product,
+ reviews,
+];
+
+export const fixtureNames = [
+ accounts.name,
+ product.name,
+ inventory.name,
+ reviews.name,
+ books.name,
+ documents.name,
+];
diff --git a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts
index 71b1449a398..52abe4def87 100644
--- a/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts
+++ b/packages/apollo-gateway/src/__tests__/buildQueryPlan.test.ts
@@ -5,12 +5,17 @@ import {
GraphQLSchemaValidationError,
} from 'apollo-graphql';
import gql from 'graphql-tag';
-import { composeServices, buildFederatedSchema } from '@apollo/federation';
+import {
+ composeServices,
+ buildFederatedSchema,
+ normalizeTypeDefs,
+} from '@apollo/federation';
import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan';
import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource';
import { astSerializer, queryPlanSerializer } from '../snapshotSerializers';
+import { fixtureNames } from './__fixtures__/schemas';
expect.addSnapshotSerializer(astSerializer);
expect.addSnapshotSerializer(queryPlanSerializer);
@@ -25,27 +30,21 @@ describe('buildQueryPlan', () => {
beforeEach(() => {
const serviceMap = Object.fromEntries(
- ['accounts', 'product', 'inventory', 'reviews', 'books'].map(
- serviceName => {
- return [
- serviceName,
- buildLocalService([
- require(path.join(
- __dirname,
- '__fixtures__/schemas',
- serviceName,
- )),
- ]),
- ] as [string, LocalGraphQLDataSource];
- },
- ),
+ fixtureNames.map((serviceName) => {
+ return [
+ serviceName,
+ buildLocalService([
+ require(path.join(__dirname, '__fixtures__/schemas', serviceName)),
+ ]),
+ ] as [string, LocalGraphQLDataSource];
+ }),
);
let errors: GraphQLError[];
({ schema, errors } = composeServices(
Object.entries(serviceMap).map(([serviceName, service]) => ({
name: serviceName,
- typeDefs: service.sdl(),
+ typeDefs: normalizeTypeDefs(service.sdl()),
})),
));
@@ -54,6 +53,53 @@ describe('buildQueryPlan', () => {
}
});
+ it(`should not confuse union types with overlapping field names`, () => {
+ const query = gql`
+ query {
+ body {
+ ... on Image {
+ attributes {
+ url
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ `;
+
+ const queryPlan = buildQueryPlan(
+ buildOperationContext(schema, query, undefined),
+ );
+
+ expect(queryPlan).toMatchInlineSnapshot(`
+ QueryPlan {
+ Fetch(service: "documents") {
+ {
+ body {
+ __typename
+ ... on Image {
+ attributes {
+ url
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ },
+ }
+ `);
+ });
+
it(`should use a single fetch when requesting a root field from one service`, () => {
const query = gql`
query {
@@ -1188,4 +1234,158 @@ describe('buildQueryPlan', () => {
`);
});
});
+
+ it(`should properly expand nested unions with inline fragments`, () => {
+ const query = gql`
+ query {
+ body {
+ ... on Image {
+ ... on Body {
+ ... on Image {
+ attributes {
+ url
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ }
+ }
+ }
+ }
+ `;
+
+ const queryPlan = buildQueryPlan(
+ buildOperationContext(schema, query, undefined),
+ );
+
+ expect(queryPlan).toMatchInlineSnapshot(`
+ QueryPlan {
+ Fetch(service: "documents") {
+ {
+ body {
+ __typename
+ ... on Image {
+ attributes {
+ url
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ }
+ }
+ }
+ }
+ },
+ }
+ `);
+ });
+
+ describe('deduplicates fields / selections regardless of adjacency and type condition nesting', () => {
+ it('for inline fragments', () => {
+ const query = gql`
+ query {
+ body {
+ ... on Image {
+ ... on Text {
+ attributes {
+ bold
+ }
+ }
+ }
+ ... on Body {
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ `;
+
+ const queryPlan = buildQueryPlan(
+ buildOperationContext(schema, query, undefined),
+ );
+
+ expect(queryPlan).toMatchInlineSnapshot(`
+ QueryPlan {
+ Fetch(service: "documents") {
+ {
+ body {
+ __typename
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ },
+ }
+ `);
+ });
+
+ it('for named fragment spreads', () => {
+ const query = gql`
+ fragment TextFragment on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+
+ query {
+ body {
+ ... on Image {
+ ...TextFragment
+ }
+ ... on Body {
+ ...TextFragment
+ }
+ ...TextFragment
+ }
+ }
+ `;
+
+ const queryPlan = buildQueryPlan(
+ buildOperationContext(schema, query, undefined),
+ );
+
+ expect(queryPlan).toMatchInlineSnapshot(`
+ QueryPlan {
+ Fetch(service: "documents") {
+ {
+ body {
+ __typename
+ ... on Text {
+ attributes {
+ bold
+ text
+ }
+ }
+ }
+ }
+ },
+ }
+ `);
+ });
+ });
});
diff --git a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts
index a75f59eea97..cbf78b8ea5a 100644
--- a/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts
+++ b/packages/apollo-gateway/src/__tests__/executeQueryPlan.test.ts
@@ -9,13 +9,19 @@ import {
import gql from 'graphql-tag';
import { GraphQLRequestContext } from 'apollo-server-types';
import { AuthenticationError } from 'apollo-server-core';
-import { composeServices, buildFederatedSchema } from '@apollo/federation';
+import {
+ composeServices,
+ buildFederatedSchema,
+ normalizeTypeDefs,
+} from '@apollo/federation';
import { buildQueryPlan, buildOperationContext } from '../buildQueryPlan';
import { executeQueryPlan } from '../executeQueryPlan';
import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource';
import { astSerializer, queryPlanSerializer } from '../snapshotSerializers';
+import { fixtureNames } from './__fixtures__/schemas';
+
expect.addSnapshotSerializer(astSerializer);
expect.addSnapshotSerializer(queryPlanSerializer);
@@ -40,27 +46,21 @@ describe('executeQueryPlan', () => {
beforeEach(() => {
serviceMap = Object.fromEntries(
- ['accounts', 'product', 'inventory', 'reviews', 'books'].map(
- serviceName => {
- return [
- serviceName,
- buildLocalService([
- require(path.join(
- __dirname,
- '__fixtures__/schemas',
- serviceName,
- )),
- ]),
- ] as [string, LocalGraphQLDataSource];
- },
- ),
+ fixtureNames.map((serviceName) => {
+ return [
+ serviceName,
+ buildLocalService([
+ require(path.join(__dirname, '__fixtures__/schemas', serviceName)),
+ ]),
+ ] as [string, LocalGraphQLDataSource];
+ }),
);
let errors: GraphQLError[];
({ schema, errors } = composeServices(
Object.entries(serviceMap).map(([serviceName, service]) => ({
name: serviceName,
- typeDefs: service.sdl(),
+ typeDefs: normalizeTypeDefs(service.sdl()),
})),
));
@@ -104,7 +104,7 @@ describe('executeQueryPlan', () => {
it(`should include an error when a root-level field errors out`, async () => {
overrideResolversInService('accounts', {
- Query: {
+ RootQuery: {
me() {
throw new AuthenticationError('Something went wrong');
},
@@ -151,7 +151,7 @@ describe('executeQueryPlan', () => {
it(`should still include other root-level results if one root-level field errors out`, async () => {
overrideResolversInService('accounts', {
- Query: {
+ RootQuery: {
me() {
throw new Error('Something went wrong');
},
diff --git a/packages/apollo-gateway/src/__tests__/execution-utils.ts b/packages/apollo-gateway/src/__tests__/execution-utils.ts
index 6fe7328e3b0..92ff6102c13 100644
--- a/packages/apollo-gateway/src/__tests__/execution-utils.ts
+++ b/packages/apollo-gateway/src/__tests__/execution-utils.ts
@@ -1,10 +1,10 @@
-import { GraphQLSchema, GraphQLError, DocumentNode } from 'graphql';
+import { GraphQLSchema, GraphQLError } from 'graphql';
import {
GraphQLSchemaValidationError,
GraphQLSchemaModule,
GraphQLResolverMap,
} from 'apollo-graphql';
-import { GraphQLRequest, GraphQLExecutionResult } from 'apollo-server-types';
+import { GraphQLRequest, GraphQLExecutionResult, Logger } from 'apollo-server-types';
import {
composeAndValidate,
buildFederatedSchema,
@@ -22,6 +22,8 @@ import { mergeDeep } from 'apollo-utilities';
import queryPlanSerializer from '../snapshotSerializers/queryPlanSerializer';
import astSerializer from '../snapshotSerializers/astSerializer';
+import gql from 'graphql-tag';
+import { fixtures } from './__fixtures__/schemas';
const prettyFormat = require('pretty-format');
export type ServiceDefinitionModule = ServiceDefinition & GraphQLSchemaModule;
@@ -38,8 +40,9 @@ export function overrideResolversInService(
}
export async function execute(
- services: ServiceDefinitionModule[],
- request: GraphQLRequest & { query: DocumentNode },
+ request: GraphQLRequest,
+ services: ServiceDefinitionModule[] = fixtures,
+ logger: Logger = console,
): Promise {
let schema: GraphQLSchema;
const serviceMap = Object.fromEntries(
@@ -65,7 +68,7 @@ export async function execute(
if (errors && errors.length > 0) {
throw new GraphQLSchemaValidationError(errors);
}
- const operationContext = buildOperationContext(schema, request.query);
+ const operationContext = buildOperationContext(schema, gql`${request.query}`);
const queryPlan = buildQueryPlan(operationContext);
@@ -76,6 +79,7 @@ export async function execute(
cache: undefined as any,
context: {},
request,
+ logger
},
operationContext,
);
diff --git a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts
index 564d101962b..19bfe3ecbd1 100644
--- a/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts
+++ b/packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts
@@ -4,13 +4,9 @@ import { createTestClient } from 'apollo-server-testing';
import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
import { RemoteGraphQLDataSource } from '../../datasources/RemoteGraphQLDataSource';
-import { ApolloGateway } from '../../';
+import { ApolloGateway, SERVICE_DEFINITION_QUERY } from '../../';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
beforeEach(() => {
fetch.mockReset();
@@ -39,12 +35,12 @@ it('calls buildService only once per service', async () => {
it('correctly passes the context from ApolloServer to datasources', async () => {
const gateway = new ApolloGateway({
- localServiceList: [accounts, books, inventory, product, reviews],
- buildService: service => {
+ localServiceList: fixtures,
+ buildService: _service => {
return new RemoteGraphQLDataSource({
url: 'https://api.example.com/foo',
willSendRequest: ({ request, context }) => {
- request.http.headers.set('x-user-id', context.userId);
+ request.http?.headers.set('x-user-id', context.userId);
},
});
},
@@ -116,11 +112,11 @@ it('makes enhanced introspection request using datasource', async () => {
url: 'https://api.example.com/one',
},
],
- buildService: service => {
+ buildService: _service => {
return new RemoteGraphQLDataSource({
url: 'https://api.example.com/override',
willSendRequest: ({ request }) => {
- request.http.headers.set('custom-header', 'some-custom-value');
+ request.http?.headers.set('custom-header', 'some-custom-value');
},
});
},
@@ -133,7 +129,7 @@ it('makes enhanced introspection request using datasource', async () => {
expect(fetch).toHaveFetched({
url: 'https://api.example.com/override',
body: {
- query: `query GetServiceDefinition { _service { sdl } }`,
+ query: SERVICE_DEFINITION_QUERY,
},
headers: {
'custom-header': 'some-custom-value',
@@ -166,7 +162,7 @@ it('customizes request on a per-service basis', async () => {
return new RemoteGraphQLDataSource({
url: service.url,
willSendRequest: ({ request }) => {
- request.http.headers.set('service-name', service.name);
+ request.http?.headers.set('service-name', service.name);
},
});
},
@@ -179,7 +175,7 @@ it('customizes request on a per-service basis', async () => {
expect(fetch).toHaveFetched({
url: 'https://api.example.com/one',
body: {
- query: `query GetServiceDefinition { _service { sdl } }`,
+ query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
},
headers: {
'service-name': 'one',
@@ -189,7 +185,7 @@ it('customizes request on a per-service basis', async () => {
expect(fetch).toHaveFetched({
url: 'https://api.example.com/two',
body: {
- query: `query GetServiceDefinition { _service { sdl } }`,
+ query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
},
headers: {
'service-name': 'two',
@@ -199,7 +195,7 @@ it('customizes request on a per-service basis', async () => {
expect(fetch).toHaveFetched({
url: 'https://api.example.com/three',
body: {
- query: `query GetServiceDefinition { _service { sdl } }`,
+ query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
},
headers: {
'service-name': 'three',
@@ -209,7 +205,7 @@ it('customizes request on a per-service basis', async () => {
it('does not share service definition cache between gateways', async () => {
let updates = 0;
- const updateObserver: any = (...args: any[]) => {
+ const updateObserver: any = (..._args: any[]) => {
updates += 1;
};
diff --git a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts
index 9d73387ab14..ef63f1a7d01 100644
--- a/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts
+++ b/packages/apollo-gateway/src/__tests__/gateway/executor.test.ts
@@ -1,16 +1,12 @@
import gql from 'graphql-tag';
import { ApolloGateway } from '../../';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
+import { ApolloServer } from "apollo-server";
describe('ApolloGateway executor', () => {
it('validates requests prior to execution', async () => {
const gateway = new ApolloGateway({
- localServiceList: [accounts, books, inventory, product, reviews],
+ localServiceList: fixtures,
});
const { executor } = await gateway.load();
@@ -35,4 +31,24 @@ describe('ApolloGateway executor', () => {
'Variable "$first" got invalid value "3"; Expected type Int.',
);
});
+
+ it('still sets the ApolloServer executor on load rejection', async () => {
+ jest.spyOn(console, 'error').mockImplementation();
+
+ const gateway = new ApolloGateway({
+ // Empty service list will throw, which is what we want.
+ serviceList: [],
+ });
+
+ const server = new ApolloServer({
+ gateway,
+ subscriptions: false,
+ });
+
+ // Ensure the throw happens to maintain the correctness of this test.
+ await expect(
+ server.executeOperation({ query: '{ __typename }' })).rejects.toThrow();
+
+ expect(server.requestOptions.executor).toBe(gateway.executor);
+ });
});
diff --git a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts
index 3b3f31dd692..e7a20795056 100644
--- a/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts
+++ b/packages/apollo-gateway/src/__tests__/gateway/lifecycle-hooks.test.ts
@@ -2,16 +2,26 @@ import {
ApolloGateway,
GatewayConfig,
Experimental_UpdateServiceDefinitions,
- Experimental_DidUpdateCompositionCallback,
} from '../../index';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
-const services = [product, reviews, inventory, accounts, books];
-const serviceDefinitions = services.map((s, i) => ({
+import {
+ product,
+ reviews,
+ inventory,
+ accounts,
+ books,
+ documents,
+} from '../__fixtures__/schemas/';
+
+// The order of this was specified to preserve existing test coverage. Typically
+// we would just import and use the `fixtures` array.
+const serviceDefinitions = [
+ product,
+ reviews,
+ inventory,
+ accounts,
+ books,
+ documents,
+].map((s, i) => ({
name: s.name,
typeDefs: s.typeDefs,
url: `http://localhost:${i}`,
@@ -56,9 +66,7 @@ describe('lifecycle hooks', () => {
experimental_didFailComposition,
});
- try {
- await gateway.load();
- } catch {}
+ await expect(gateway.load()).rejects.toThrowError();
const callbackArgs = experimental_didFailComposition.mock.calls[0][0];
expect(callbackArgs.serviceList).toHaveLength(1);
@@ -71,8 +79,6 @@ describe('lifecycle hooks', () => {
});
it('calls experimental_didUpdateComposition on schema update', async () => {
- jest.useFakeTimers();
-
const compositionMetadata = {
formatVersion: 1,
id: 'abc',
@@ -113,26 +119,33 @@ describe('lifecycle hooks', () => {
};
});
- const didUpdate: Experimental_DidUpdateCompositionCallback = () => {};
- const mockDidUpdate = jest.fn(didUpdate);
+ const mockDidUpdate = jest.fn();
const gateway = new ApolloGateway({
experimental_updateServiceDefinitions: mockUpdate,
experimental_didUpdateComposition: mockDidUpdate,
- experimental_pollInterval: 10,
+ experimental_pollInterval: 100,
});
- await gateway.load();
+ let resolve1: Function;
+ let resolve2: Function;
+ const schemaChangeBlocker1 = new Promise(res => (resolve1 = res));
+ const schemaChangeBlocker2 = new Promise(res => (resolve2 = res));
+
+ gateway.onSchemaChange(
+ jest
+ .fn()
+ .mockImplementationOnce(() => resolve1())
+ .mockImplementationOnce(() => resolve2()),
+ );
+ gateway.load();
+
+ await schemaChangeBlocker1;
expect(mockUpdate).toBeCalledTimes(1);
expect(mockDidUpdate).toBeCalledTimes(1);
- gateway.onSchemaChange(() => {});
-
- jest.runOnlyPendingTimers();
- // XXX This allows the ApolloGateway.updateComposition() Promise to resolve
- // after the poll ticks, and is necessary for allowing mockDidUpdate to see the expected calls.
- await Promise.resolve();
+ await schemaChangeBlocker2;
expect(mockUpdate).toBeCalledTimes(2);
expect(mockDidUpdate).toBeCalledTimes(2);
@@ -181,8 +194,6 @@ describe('lifecycle hooks', () => {
});
it('registers schema change callbacks when experimental_pollInterval is set for unmanaged configs', async () => {
- jest.useFakeTimers();
-
const experimental_updateServiceDefinitions: Experimental_UpdateServiceDefinitions = jest.fn(
async (_config: GatewayConfig) => {
return { serviceDefinitions, isNewSchema: true };
@@ -192,18 +203,18 @@ describe('lifecycle hooks', () => {
const gateway = new ApolloGateway({
serviceList: [{ name: 'book', url: 'http://localhost:32542' }],
experimental_updateServiceDefinitions,
- experimental_pollInterval: 10,
+ experimental_pollInterval: 100,
});
- const schemaChangeCallback = jest.fn();
+ let resolve: Function;
+ const schemaChangeBlocker = new Promise(res => (resolve = res));
+ const schemaChangeCallback = jest.fn(() => resolve());
gateway.onSchemaChange(schemaChangeCallback);
+ gateway.load();
- jest.runOnlyPendingTimers();
- await Promise.resolve();
+ await schemaChangeBlocker;
expect(schemaChangeCallback).toBeCalledTimes(1);
-
- jest.useRealTimers();
});
});
diff --git a/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts b/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts
index 9aa51273f2a..247ee4dd7a2 100644
--- a/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts
+++ b/packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts
@@ -6,11 +6,7 @@ import { buildFederatedSchema } from '@apollo/federation';
import { LocalGraphQLDataSource } from '../../datasources/LocalGraphQLDataSource';
import { ApolloGateway } from '../../';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
it('caches the query plan for a request', async () => {
const planner = require('../../buildQueryPlan');
@@ -19,7 +15,7 @@ it('caches the query plan for a request', async () => {
planner.buildQueryPlan = jest.fn(originalPlanner);
const gateway = new ApolloGateway({
- localServiceList: [accounts, books, inventory, product, reviews],
+ localServiceList: fixtures,
buildService: service => {
return new LocalGraphQLDataSource(buildFederatedSchema([service]));
},
@@ -75,7 +71,7 @@ it('supports multiple operations and operationName', async () => {
`;
const gateway = new ApolloGateway({
- localServiceList: [accounts, books, inventory, product, reviews],
+ localServiceList: fixtures,
buildService: service => {
return new LocalGraphQLDataSource(buildFederatedSchema([service]));
},
diff --git a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts
index ebd8ef7ddee..85eb3c2732a 100644
--- a/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts
+++ b/packages/apollo-gateway/src/__tests__/gateway/reporting.test.ts
@@ -5,12 +5,13 @@ import { GraphQLSchemaModule } from 'apollo-graphql';
import gql from 'graphql-tag';
import { buildFederatedSchema } from '@apollo/federation';
import { ApolloServer } from 'apollo-server';
-import { FullTracesReport } from 'apollo-engine-reporting-protobuf';
import { execute, toPromise } from 'apollo-link';
import { createHttpLink } from 'apollo-link-http';
import fetch from 'node-fetch';
import { ApolloGateway } from '../..';
import { Plugin, Config, Refs } from 'pretty-format';
+import { Report } from 'apollo-engine-reporting-protobuf';
+import { fixtureNames } from '../__fixtures__/schemas';
// Normalize specific fields that change often (eg timestamps) to static values,
// to make snapshot testing viable. (If these helpers are more generally
@@ -105,13 +106,7 @@ describe('reporting', () => {
backendServers = [];
const serviceList = [];
- for (const serviceName of [
- 'accounts',
- 'product',
- 'inventory',
- 'reviews',
- 'books',
- ]) {
+ for (const serviceName of fixtureNames) {
const { server, url } = await startFederatedServer([
require(path.join(__dirname, '../__fixtures__/schemas', serviceName)),
]);
@@ -189,7 +184,7 @@ describe('reporting', () => {
// nock returns binary bodies as hex strings
const gzipReportBuffer = Buffer.from(reportBody, 'hex');
const reportBuffer = gunzipSync(gzipReportBuffer);
- const report = FullTracesReport.decode(reportBuffer);
+ const report = Report.decode(reportBuffer);
// Some handwritten tests to capture salient properties.
const statsReportKey = '# -\n{me{name}topProducts{name}}';
@@ -219,6 +214,7 @@ describe('reporting', () => {
expect(report).toMatchInlineSnapshot(`
Object {
+ "endTime": null,
"header": "",
"tracesPerQuery": Object {
"# -
diff --git a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts
index 78c012f8e08..2bad0c2710d 100644
--- a/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/abstract-types.test.ts
@@ -1,10 +1,5 @@
import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
@@ -12,7 +7,7 @@ expect.addSnapshotSerializer(astSerializer);
expect.addSnapshotSerializer(queryPlanSerializer);
it('handles an abstract type from the base service', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
upc
@@ -23,13 +18,10 @@ it('handles an abstract type from the base service', async () => {
`;
const upc = '1';
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({
product: {
@@ -102,7 +94,7 @@ it('handles an abstract type from the base service', async () => {
});
it('can request fields on extended interfaces', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
inStock
@@ -112,13 +104,10 @@ it('can request fields on extended interfaces', async () => {
const upc = '1';
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({ product: { inStock: true } });
expect(queryPlan).toCallService('product');
@@ -169,7 +158,7 @@ it('can request fields on extended interfaces', async () => {
});
it('can request fields on extended types that implement an interface', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
inStock
@@ -181,13 +170,10 @@ it('can request fields on extended types that implement an interface', async ()
`;
const upc = '1';
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({ product: { inStock: true, isHeavy: false } });
expect(queryPlan).toCallService('product');
@@ -239,7 +225,7 @@ it('can request fields on extended types that implement an interface', async ()
});
it('prunes unfilled type conditions', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
inStock
@@ -254,13 +240,10 @@ it('prunes unfilled type conditions', async () => {
`;
const upc = '1';
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({ product: { inStock: true, isHeavy: false } });
expect(queryPlan).toCallService('product');
@@ -313,7 +296,7 @@ it('prunes unfilled type conditions', async () => {
});
it('fetches interfaces returned from other services', async () => {
- const query = gql`
+ const query = `#graphql
query GetUserAndProducts {
me {
reviews {
@@ -328,12 +311,9 @@ it('fetches interfaces returned from other services', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -431,7 +411,7 @@ it('fetches interfaces returned from other services', async () => {
});
it('fetches composite fields from a foreign type casted to an interface [@provides field]', async () => {
- const query = gql`
+ const query = `#graphql
query GetUserAndProducts {
me {
reviews {
@@ -446,12 +426,9 @@ it('fetches composite fields from a foreign type casted to an interface [@provid
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -571,7 +548,7 @@ it('fetches composite fields from a foreign type casted to an interface [@provid
});
it('allows for extending an interface from another service with fields', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
reviews {
@@ -582,13 +559,10 @@ it('allows for extending an interface from another service with fields', async (
`;
const upc = '1';
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({
product: {
@@ -649,7 +623,7 @@ it('allows for extending an interface from another service with fields', async (
describe('unions', () => {
it('handles unions from the same service', async () => {
- const query = gql`
+ const query = `#graphql
query GetUserAndProducts {
me {
reviews {
@@ -671,12 +645,9 @@ describe('unions', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -771,7 +742,7 @@ describe('unions', () => {
});
it("doesn't expand interfaces with inline type conditions if all possibilities are fufilled by one service", async () => {
- const query = gql`
+ const query = `#graphql
query GetProducts {
topProducts {
name
@@ -779,31 +750,28 @@ describe('unions', () => {
}
`;
- const { queryPlan, errors } = await execute(
- [
- {
- name: 'products',
- typeDefs: gql`
- extend type Query {
- topProducts: [Product]
- }
+ const { queryPlan, errors } = await execute({ query }, [
+ {
+ name: 'products',
+ typeDefs: gql`
+ extend type Query {
+ topProducts: [Product]
+ }
- interface Product {
- name: String
- }
+ interface Product {
+ name: String
+ }
- type Shoe implements Product {
- name: String
- }
+ type Shoe implements Product {
+ name: String
+ }
- type Car implements Product {
- name: String
- }
- `,
- },
- ],
- { query },
- );
+ type Car implements Product {
+ name: String
+ }
+ `,
+ },
+ ]);
expect(errors).toBeUndefined();
expect(queryPlan).toMatchInlineSnapshot(`
@@ -841,7 +809,6 @@ describe('unions', () => {
// `;
// const { data, queryPlan } = await execute(
- // [accounts, books, inventory, product, reviews],
// {
// query,
// },
diff --git a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts
index f9937eadb83..35480636482 100644
--- a/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/aliases.test.ts
@@ -1,11 +1,6 @@
-import gql from 'graphql-tag';
-import { execute, printPlan } from '../execution-utils';
+import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
// FIXME: remove this when GraphQLExtensions is removed
import { createTestClient } from 'apollo-server-testing';
@@ -15,7 +10,7 @@ import { LocalGraphQLDataSource } from '../../datasources/LocalGraphQLDataSource
import { ApolloGateway } from '../../';
it('supports simple aliases', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
name
@@ -25,13 +20,10 @@ it('supports simple aliases', async () => {
`;
const upc = '1';
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({
product: {
@@ -44,7 +36,7 @@ it('supports simple aliases', async () => {
});
it('supports aliases of root fields on subservices', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
name
@@ -60,13 +52,10 @@ it('supports aliases of root fields on subservices', async () => {
`;
const upc = '1';
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({
product: {
@@ -95,7 +84,7 @@ it('supports aliases of root fields on subservices', async () => {
});
it('supports aliases of nested fields on subservices', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
name
@@ -115,13 +104,10 @@ it('supports aliases of nested fields on subservices', async () => {
`;
const upc = '1';
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(data).toEqual({
product: {
@@ -160,7 +146,7 @@ it('supports aliases of nested fields on subservices', async () => {
// TODO after we remove GraphQLExtensions from ApolloServer, this can go away
it('supports aliases when using ApolloServer', async () => {
const gateway = new ApolloGateway({
- localServiceList: [accounts, books, inventory, product, reviews],
+ localServiceList: fixtures,
buildService: service => {
return new LocalGraphQLDataSource(buildFederatedSchema([service]));
},
@@ -174,7 +160,7 @@ it('supports aliases when using ApolloServer', async () => {
const { query } = createTestClient(server);
const result = await query({
- query: gql`
+ query: `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
title: name
diff --git a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts
index 4940aac4202..08cdab71231 100644
--- a/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/boolean.test.ts
@@ -1,12 +1,4 @@
-import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
expect.addSnapshotSerializer(astSerializer);
@@ -16,7 +8,7 @@ expect.addSnapshotSerializer(queryPlanSerializer);
// eventually we want to do this to prevent downstream fetches that aren't needed
describe('@skip', () => {
it('supports @skip when a boolean condition is met', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body
@@ -27,12 +19,9 @@ describe('@skip', () => {
}
`;
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
topReviews: [
@@ -49,7 +38,7 @@ describe('@skip', () => {
});
it('supports @skip when a boolean condition is met (variable driven)', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers($skip: Boolean!) {
topReviews {
body
@@ -61,13 +50,10 @@ describe('@skip', () => {
`;
const skip = true;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { skip },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { skip },
+ });
expect(data).toEqual({
topReviews: [
@@ -85,7 +71,7 @@ describe('@skip', () => {
// Data looks good here, suspect the matcher is incorrect
it('supports @skip when a boolean condition is not met', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body
@@ -96,12 +82,9 @@ describe('@skip', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
topReviews: [
@@ -122,7 +105,7 @@ describe('@skip', () => {
// Data looks good here, suspect the matcher is incorrect
it('supports @skip when a boolean condition is not met (variable driven)', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers($skip: Boolean!) {
topReviews {
body
@@ -134,13 +117,10 @@ describe('@skip', () => {
`;
const skip = false;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { skip },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { skip },
+ });
expect(data).toEqual({
topReviews: [
@@ -162,7 +142,7 @@ describe('@skip', () => {
describe('@include', () => {
it('supports @include when a boolean condition is not met', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body
@@ -173,12 +153,9 @@ describe('@include', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
topReviews: [
@@ -195,7 +172,7 @@ describe('@include', () => {
});
it('supports @include when a boolean condition is not met (variable driven)', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers($include: Boolean!) {
topReviews {
body
@@ -207,13 +184,10 @@ describe('@include', () => {
`;
const include = false;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { include },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { include },
+ });
expect(data).toEqual({
topReviews: [
@@ -232,7 +206,7 @@ describe('@include', () => {
// Data looks good here, suspect the matcher is incorrect
// Added the query plan snapshot for a view.
it('supports @include when a boolean condition is met', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body
@@ -243,12 +217,9 @@ describe('@include', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
topReviews: [
@@ -270,7 +241,7 @@ describe('@include', () => {
// Data looks good here, suspect the matcher is incorrect
// Added the query plan snapshot for a view.
it('supports @include when a boolean condition is met (variable driven)', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers($include: Boolean!) {
topReviews {
body
@@ -282,13 +253,10 @@ describe('@include', () => {
`;
const include = true;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { include },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { include },
+ });
expect(data).toEqual({
topReviews: [
diff --git a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts
index 22244ce61b5..a413c3a7ad1 100644
--- a/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/complex-key.test.ts
@@ -103,7 +103,7 @@ const userService: ServiceDefinitionModule = {
};
it('works fetches data correctly with complex / nested @key fields', async () => {
- const query = gql`
+ const query = `#graphql
query Reviews {
reviews {
author {
@@ -116,9 +116,12 @@ it('works fetches data correctly with complex / nested @key fields', async () =>
}
`;
- const { data, queryPlan } = await execute([userService, reviewService], {
- query,
- });
+ const { data, queryPlan } = await execute(
+ {
+ query,
+ },
+ [userService, reviewService],
+ );
expect(data).toEqual({
reviews: [
@@ -168,7 +171,6 @@ it('works fetches data correctly with complex / nested @key fields', async () =>
organization {
id
__typename
- id
}
}
}
diff --git a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts
index 99c1fe370b1..3797c75c5c8 100644
--- a/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/custom-directives.test.ts
@@ -1,11 +1,7 @@
import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
@@ -14,7 +10,7 @@ expect.addSnapshotSerializer(queryPlanSerializer);
describe('custom executable directives', () => {
it('successfully passes directives along in requests to an underlying service', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body @stream
@@ -22,12 +18,9 @@ describe('custom executable directives', () => {
}
`;
- const { errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { errors, queryPlan } = await execute( {
+ query,
+ });
expect(errors).toBeUndefined();
expect(queryPlan).toCallService('reviews');
@@ -45,7 +38,7 @@ describe('custom executable directives', () => {
});
it('successfully passes directives and their variables along in requests to underlying services', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body @stream
@@ -56,12 +49,9 @@ describe('custom executable directives', () => {
}
`;
- const { errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { errors, queryPlan } = await execute( {
+ query,
+ });
expect(errors).toBeUndefined();
expect(queryPlan).toCallService('reviews');
@@ -108,7 +98,7 @@ describe('custom executable directives', () => {
`,
};
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body @stream
@@ -117,15 +107,18 @@ describe('custom executable directives', () => {
`;
expect(
- execute([accounts, books, inventory, product, reviews, invalidService], {
- query,
- }),
+ execute(
+ {
+ query,
+ },
+ [...fixtures, invalidService],
+ ),
).rejects.toThrowErrorMatchingInlineSnapshot(`
"[@stream] -> Custom directives must be implemented in every service. The following services do not implement the @stream directive: invalidService.
[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalidService.
-[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, inventory, product, reviews."
+[@invalid] -> Custom directives must be implemented in every service. The following services do not implement the @invalid directive: accounts, books, documents, inventory, product, reviews."
`);
});
@@ -137,7 +130,7 @@ describe('custom executable directives', () => {
`,
};
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
body @stream
@@ -146,15 +139,19 @@ describe('custom executable directives', () => {
`;
expect(
- execute([accounts, books, inventory, product, reviews, invalidService], {
- query,
- }),
+ execute(
+ {
+ query,
+ },
+ [...fixtures, invalidService],
+ ),
).rejects.toThrowErrorMatchingInlineSnapshot(`
"[@transform] -> Custom directives must be implemented in every service. The following services do not implement the @transform directive: invalid.
[@stream] -> custom directives must be defined identically across all services. See below for a list of current implementations:
accounts: directive @stream on FIELD
books: directive @stream on FIELD
+ documents: directive @stream on FIELD
inventory: directive @stream on FIELD
product: directive @stream on FIELD
reviews: directive @stream on FIELD
diff --git a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts
index 2bb9308559f..30a1088ac34 100644
--- a/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/execution-style.test.ts
@@ -1,19 +1,8 @@
-import gql from 'graphql-tag';
-import { execute, overrideResolversInService } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
-async function wait(amount: number): Promise {
- return new Promise(r => setTimeout(r, amount));
-}
+import { execute } from '../execution-utils';
describe('query', () => {
it('supports parallel root fields', async () => {
- const query = gql`
+ const query = `#graphql
query GetUserAndReviews {
me {
username
@@ -24,12 +13,9 @@ describe('query', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: { username: '@ada' },
diff --git a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts
index cbfaded3f0c..7fd265b6591 100644
--- a/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/fragments.test.ts
@@ -1,16 +1,11 @@
-import gql, { disableFragmentWarnings } from 'graphql-tag';
+import { disableFragmentWarnings } from 'graphql-tag';
import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
beforeAll(() => {
disableFragmentWarnings();
});
it('supports inline fragments (one level)', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
... on User {
@@ -20,12 +15,9 @@ it('supports inline fragments (one level)', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -37,7 +29,7 @@ it('supports inline fragments (one level)', async () => {
});
it('supports inline fragments (multi level)', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
... on User {
@@ -62,12 +54,9 @@ it('supports inline fragments (multi level)', async () => {
}
`;
- const { data, queryPlan, errors } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -87,7 +76,7 @@ it('supports inline fragments (multi level)', async () => {
});
it('supports named fragments (one level)', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
...userDetails
@@ -99,12 +88,9 @@ it('supports named fragments (one level)', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -116,7 +102,7 @@ it('supports named fragments (one level)', async () => {
});
it('supports multiple named fragments (one level, mixed ordering)', async () => {
- const query = gql`
+ const query = `#graphql
fragment userInfo on User {
name
}
@@ -132,12 +118,9 @@ it('supports multiple named fragments (one level, mixed ordering)', async () =>
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -150,7 +133,7 @@ it('supports multiple named fragments (one level, mixed ordering)', async () =>
});
it('supports multiple named fragments (multi level, mixed ordering)', async () => {
- const query = gql`
+ const query = `#graphql
fragment reviewDetails on Review {
body
}
@@ -168,12 +151,9 @@ it('supports multiple named fragments (multi level, mixed ordering)', async () =
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -190,7 +170,7 @@ it('supports multiple named fragments (multi level, mixed ordering)', async () =
});
it('supports variables within fragments', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser($format: Boolean) {
me {
...userDetails
@@ -206,13 +186,10 @@ it('supports variables within fragments', async () => {
`;
const format = true;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { format },
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables: { format },
+ });
expect(data).toEqual({
me: {
@@ -230,7 +207,7 @@ it('supports variables within fragments', async () => {
});
it('supports root fragments', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser {
... on Query {
me {
@@ -240,12 +217,9 @@ it('supports root fragments', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
diff --git a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts
index e0b38657987..1573ecd99fe 100644
--- a/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/list-key.test.ts
@@ -69,7 +69,7 @@ const userService: ServiceDefinitionModule = {
};
it('fetches data correctly list type @key fields', async () => {
- const query = gql`
+ const query = `#graphql
query Reviews {
reviews {
body
@@ -80,9 +80,12 @@ it('fetches data correctly list type @key fields', async () => {
}
`;
- const { data, queryPlan } = await execute([userService, reviewService], {
- query,
- });
+ const { data, queryPlan } = await execute(
+ {
+ query,
+ },
+ [userService, reviewService],
+ );
expect(data).toEqual({
reviews: [
diff --git a/packages/apollo-gateway/src/__tests__/integration/logger.test.ts b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts
new file mode 100644
index 00000000000..690c046d421
--- /dev/null
+++ b/packages/apollo-gateway/src/__tests__/integration/logger.test.ts
@@ -0,0 +1,125 @@
+import { ApolloGateway } from '../..';
+import { Logger } from "apollo-server-types";
+import { PassThrough } from "stream";
+
+import * as winston from "winston";
+import WinstonTransport from 'winston-transport';
+import * as bunyan from "bunyan";
+import * as loglevel from "loglevel";
+// We are testing an older version of `log4js` which uses older ECMAScript
+// in order to still support testing on Node.js 6.
+// This should be updated when bump the semver major for AS3.
+import * as log4js from "log4js";
+
+const LOWEST_LOG_LEVEL = "debug";
+
+const KNOWN_DEBUG_MESSAGE = "Checking service definitions...";
+
+async function triggerKnownDebugMessage(logger: Logger) {
+ // Trigger a known error.
+ // This is a bit brittle since it merely leverages a known debug log
+ // message outside of the constructor, but it seemed worth testing
+ // the compatibility with `ApolloGateway` itself rather than generically.
+ // The error does not matter, so it is caught and ignored.
+ await new ApolloGateway({ logger }).load().catch(_e => {});
+}
+
+describe("logger", () => {
+ it("works with 'winston'", async () => {
+ const sink = jest.fn();
+ const transport = new class extends WinstonTransport {
+ constructor() {
+ super({
+ format: winston.format.json(),
+ });
+ }
+
+ log(info: any) {
+ sink(info);
+ }
+ };
+
+ const logger = winston.createLogger({ level: 'debug' }).add(transport);
+
+ await triggerKnownDebugMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: LOWEST_LOG_LEVEL,
+ message: KNOWN_DEBUG_MESSAGE,
+ }));
+ });
+
+ it("works with 'bunyan'", async () => {
+ const sink = jest.fn();
+
+ // Bunyan uses streams for its logging implementations.
+ const writable = new PassThrough();
+ writable.on("data", data => sink(JSON.parse(data.toString())));
+
+ const logger = bunyan.createLogger({
+ name: "test-logger-bunyan",
+ streams: [{
+ level: LOWEST_LOG_LEVEL,
+ stream: writable,
+ }]
+ });
+
+ await triggerKnownDebugMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: bunyan.DEBUG,
+ msg: KNOWN_DEBUG_MESSAGE,
+ }));
+ });
+
+ it("works with 'loglevel'", async () => {
+ const sink = jest.fn();
+
+ const logger = loglevel.getLogger("test-logger-loglevel")
+ logger.methodFactory = (_methodName, level): loglevel.LoggingMethod =>
+ (message) => sink({ level, message });
+
+ // The `setLevel` method must be called after overwriting `methodFactory`.
+ // This is an intentional API design pattern of the loglevel package:
+ // https://www.npmjs.com/package/loglevel#writing-plugins
+ logger.setLevel(loglevel.levels.DEBUG);
+
+ await triggerKnownDebugMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith({
+ level: loglevel.levels.DEBUG,
+ message: KNOWN_DEBUG_MESSAGE,
+ });
+ });
+
+ it("works with 'log4js'", async () => {
+ const sink = jest.fn();
+
+ log4js.configure({
+ appenders: {
+ custom: {
+ type: {
+ configure: () =>
+ (loggingEvent: log4js.LoggingEvent) => sink(loggingEvent)
+ }
+ }
+ },
+ categories: {
+ default: {
+ appenders: ['custom'],
+ level: LOWEST_LOG_LEVEL,
+ }
+ }
+ });
+
+ const logger = log4js.getLogger();
+ logger.level = LOWEST_LOG_LEVEL;
+
+ await triggerKnownDebugMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: log4js.levels.DEBUG,
+ data: [KNOWN_DEBUG_MESSAGE],
+ }));
+ });
+});
diff --git a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts
index bbf668c9790..2748b0d5753 100644
--- a/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/merge-arrays.test.ts
@@ -1,19 +1,8 @@
-import gql from 'graphql-tag';
-import { execute, overrideResolversInService } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
-async function wait(amount: number): Promise {
- return new Promise(r => setTimeout(r, amount));
-}
+import { execute } from '../execution-utils';
describe('query', () => {
it('supports arrays', async () => {
- const query = gql`
+ const query = `#graphql
query MergeArrays {
me {
# goodAddress
@@ -25,12 +14,9 @@ describe('query', () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
diff --git a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts
index 64bfdca9472..60450252d46 100644
--- a/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/multiple-key.test.ts
@@ -115,7 +115,7 @@ const userService: ServiceDefinitionModule = {
};
it('fetches data correctly with multiple @key fields', async () => {
- const query = gql`
+ const query = `#graphql
query {
reviews {
body
@@ -128,10 +128,10 @@ it('fetches data correctly with multiple @key fields', async () => {
`;
const { data, queryPlan, errors } = await execute(
- [userService, reviewService, actuaryService],
{
query,
},
+ [userService, reviewService, actuaryService],
);
expect(errors).toBeFalsy();
@@ -220,7 +220,7 @@ it('fetches data correctly with multiple @key fields', async () => {
});
it('fetches keys as needed to reduce round trip queries', async () => {
- const query = gql`
+ const query = `#graphql
query {
users {
risk
@@ -232,10 +232,10 @@ it('fetches keys as needed to reduce round trip queries', async () => {
`;
const { data, queryPlan, errors } = await execute(
- [userService, reviewService, actuaryService],
{
query,
},
+ [userService, reviewService, actuaryService]
);
expect(errors).toBeFalsy();
diff --git a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts
index 880ac00970e..7544f131a7c 100644
--- a/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/mutations.test.ts
@@ -1,11 +1,5 @@
-import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { reviews, accounts } from '../__fixtures__/schemas/';
import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
@@ -17,7 +11,7 @@ function spyOnResolver(resolverMap: any, resolverName: T) {
}
it('supports mutations', async () => {
- const query = gql`
+ const query = `#graphql
mutation Login($username: String!, $password: String!) {
login(username: $username, password: $password) {
reviews {
@@ -30,13 +24,10 @@ it('supports mutations', async () => {
`;
const variables = { username: '@complete', password: 'css_completes_me' };
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables,
+ });
expect(data).toEqual({
login: {
@@ -55,7 +46,7 @@ it('supports mutations', async () => {
});
it('returning across service boundaries', async () => {
- const query = gql`
+ const query = `#graphql
mutation Review($upc: String!, $body: String!) {
reviewProduct(upc: $upc, body: $body) {
... on Furniture {
@@ -66,13 +57,10 @@ it('returning across service boundaries', async () => {
`;
const variables = { upc: '1', body: 'A great table' };
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables,
+ });
expect(data).toEqual({
reviewProduct: {
@@ -91,7 +79,7 @@ it('multiple root mutations', async () => {
'reviewProduct',
);
- const query = gql`
+ const query = `#graphql
mutation LoginAndReview(
$username: String!
$password: String!
@@ -119,13 +107,10 @@ it('multiple root mutations', async () => {
upc: '1',
body: 'A great table.',
};
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables,
+ });
expect(data).toEqual({
login: {
@@ -155,7 +140,7 @@ it('multiple root mutations with correct service order', async () => {
const updateReview = spyOnResolver(reviewsMutations, 'updateReview');
const deleteReview = spyOnResolver(reviewsMutations, 'deleteReview');
- const query = gql`
+ const query = `#graphql
mutation LoginAndReview(
$upc: String!
$body: String!
@@ -195,13 +180,10 @@ it('multiple root mutations with correct service order', async () => {
password: 'css_completes_me',
reviewId: '6',
};
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ variables,
+ });
expect(data).toEqual({
deleteReview: true,
diff --git a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts
index ddd11d60b61..dd42cd1a95c 100644
--- a/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/networkRequests.test.ts
@@ -1,27 +1,43 @@
import nock from 'nock';
-import { ApolloGateway } from '../..';
+import { fetch } from 'apollo-server-env';
+import { Logger } from 'apollo-server-types';
+import { ApolloGateway, GCS_RETRY_COUNT, getDefaultGcsFetcher } from '../..';
import {
- mockLocalhostSDLQuery,
+ mockSDLQuerySuccess,
+ mockServiceHealthCheckSuccess,
+ mockServiceHealthCheck,
mockStorageSecretSuccess,
+ mockStorageSecret,
mockCompositionConfigLinkSuccess,
+ mockCompositionConfigLink,
mockCompositionConfigsSuccess,
+ mockCompositionConfigs,
mockImplementingServicesSuccess,
+ mockImplementingServices,
mockRawPartialSchemaSuccess,
+ mockRawPartialSchema,
apiKeyHash,
graphId,
- mockImplementingServices,
- mockRawPartialSchema,
} from './nockMocks';
+import loadServicesFromStorage = require("../../loadServicesFromStorage");
+
// This is a nice DX hack for GraphQL code highlighting and formatting within the file.
// Anything wrapped within the gql tag within this file is just a string, not an AST.
const gql = String.raw;
-const service = {
- implementingServicePath: 'service-definition.json',
+export interface MockService {
+ gcsDefinitionPath: string;
+ partialSchemaPath: string;
+ url: string;
+ sdl: string;
+}
+
+const service: MockService = {
+ gcsDefinitionPath: 'service-definition.json',
partialSchemaPath: 'accounts-partial-schema.json',
- federatedServiceURL: 'http://localhost:4001',
- federatedServiceSchema: gql`
+ url: 'http://localhost:4001',
+ sdl: gql`
extend type Query {
me: User
everyone: [User]
@@ -33,14 +49,14 @@ const service = {
name: String
username: String
}
- `
+ `,
};
-const updatedService = {
- implementingServicePath: 'updated-service-definition.json',
+const updatedService: MockService = {
+ gcsDefinitionPath: 'updated-service-definition.json',
partialSchemaPath: 'updated-accounts-partial-schema.json',
- federatedServiceURL: 'http://localhost:4002',
- federatedServiceSchema: gql`
+ url: 'http://localhost:4002',
+ sdl: gql`
extend type Query {
me: User
everyone: [User]
@@ -52,94 +68,393 @@ const updatedService = {
name: String
username: String
}
- `
-}
+ `,
+};
+
+let fetcher: typeof fetch;
+let logger: Logger;
beforeEach(() => {
if (!nock.isActive()) nock.activate();
+
+ fetcher = getDefaultGcsFetcher().defaults({
+ retry: {
+ retries: GCS_RETRY_COUNT,
+ minTimeout: 0,
+ maxTimeout: 0,
+ },
+ });
+
+ const warn = jest.fn();
+ const debug = jest.fn();
+ const error = jest.fn();
+ const info = jest.fn();
+
+ logger = {
+ warn,
+ debug,
+ error,
+ info,
+ };
});
afterEach(() => {
expect(nock.isDone()).toBeTruthy();
nock.cleanAll();
nock.restore();
- jest.useRealTimers();
});
it('Queries remote endpoints for their SDLs', async () => {
- mockLocalhostSDLQuery({ url: service.federatedServiceURL }).reply(200, {
- data: { _service: { sdl: service.federatedServiceSchema } },
- });
+ mockSDLQuerySuccess(service);
const gateway = new ApolloGateway({
- serviceList: [
- { name: 'accounts', url: `${service.federatedServiceURL}/graphql` },
- ],
+ serviceList: [{ name: 'accounts', url: service.url }],
+ logger
});
await gateway.load();
expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
});
-// This test is maybe a bit terrible, but IDK a better way to mock all the requests
it('Extracts service definitions from remote storage', async () => {
mockStorageSecretSuccess();
mockCompositionConfigLinkSuccess();
- mockCompositionConfigsSuccess([service.implementingServicePath]);
+ mockCompositionConfigsSuccess([service]);
mockImplementingServicesSuccess(service);
mockRawPartialSchemaSuccess(service);
- const gateway = new ApolloGateway({});
+ const gateway = new ApolloGateway({ logger });
await gateway.load({ engine: { apiKeyHash, graphId } });
expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
});
+it.each([
+ ['warned', 'present'],
+ ['not warned', 'absent'],
+])('conflicting configurations are %s about when %s', async (_word, mode) => {
+ const isConflict = mode === 'present';
+ let blockerResolve: () => void;
+ const blocker = new Promise(resolve => (blockerResolve = resolve));
+ const original = loadServicesFromStorage.getServiceDefinitionsFromStorage;
+ const spyGetServiceDefinitionsFromStorage = jest
+ .spyOn(loadServicesFromStorage, 'getServiceDefinitionsFromStorage')
+ .mockImplementationOnce(async (...args) => {
+ try {
+ return await original(...args);
+ } catch (e) {
+ throw e;
+ } finally {
+ setImmediate(blockerResolve);
+ }
+ });
+
+ mockStorageSecretSuccess();
+ if (isConflict) {
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([service]);
+ mockImplementingServicesSuccess(service);
+ mockRawPartialSchemaSuccess(service);
+ } else {
+ mockCompositionConfigLink().reply(403);
+ }
+
+ mockSDLQuerySuccess(service);
+
+ const gateway = new ApolloGateway({
+ serviceList: [
+ { name: 'accounts', url: service.url },
+ ],
+ logger
+ });
+
+ await gateway.load({ engine: { apiKeyHash, graphId } });
+ await blocker; // Wait for the definitions to be "fetched".
+
+ (isConflict
+ ? expect(logger.warn)
+ : expect(logger.warn).not
+ ).toHaveBeenCalledWith(expect.stringMatching(
+ /A local gateway service list is overriding an Apollo Graph Manager managed configuration/));
+ spyGetServiceDefinitionsFromStorage.mockRestore();
+});
+
it('Rollsback to a previous schema when triggered', async () => {
// Init
mockStorageSecretSuccess();
mockCompositionConfigLinkSuccess();
- mockCompositionConfigsSuccess([service.implementingServicePath]);
+ mockCompositionConfigsSuccess([service]);
mockImplementingServicesSuccess(service);
mockRawPartialSchemaSuccess(service);
// Update 1
mockStorageSecretSuccess();
mockCompositionConfigLinkSuccess();
- mockCompositionConfigsSuccess([updatedService.implementingServicePath]);
+ mockCompositionConfigsSuccess([updatedService]);
mockImplementingServicesSuccess(updatedService);
mockRawPartialSchemaSuccess(updatedService);
// Rollback
mockStorageSecretSuccess();
mockCompositionConfigLinkSuccess();
- mockCompositionConfigsSuccess([service.implementingServicePath]);
+ mockCompositionConfigsSuccess([service]);
mockImplementingServices(service).reply(304);
mockRawPartialSchema(service).reply(304);
- jest.useFakeTimers();
+ let firstResolve: () => void;
+ let secondResolve: () => void;
+ let thirdResolve: () => void
+ const firstSchemaChangeBlocker = new Promise(res => (firstResolve = res));
+ const secondSchemaChangeBlocker = new Promise(res => (secondResolve = res));
+ const thirdSchemaChangeBlocker = new Promise(res => (thirdResolve = res));
- const onChange = jest.fn();
- const gateway = new ApolloGateway();
- await gateway.load({ engine: { apiKeyHash, graphId } });
- gateway.onSchemaChange(onChange);
+ const onChange = jest
+ .fn()
+ .mockImplementationOnce(() => firstResolve())
+ .mockImplementationOnce(() => secondResolve())
+ .mockImplementationOnce(() => thirdResolve());
- // 10000 ms is the default pollInterval
- jest.advanceTimersByTime(10000);
+ const gateway = new ApolloGateway({ logger });
+ // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here
+ gateway.experimental_pollInterval = 100;
- // This useReal/useFake is challenging to explain the need for, and I probably
- // don't have the _correct_ answer here, but it seems that pushing this process
- // to the back of the task queue is insufficient.
- jest.useRealTimers();
- await new Promise(resolve => setTimeout(resolve, 100));
- jest.useFakeTimers();
+ gateway.onSchemaChange(onChange);
+ await gateway.load({ engine: { apiKeyHash, graphId } });
+ await firstSchemaChangeBlocker;
expect(onChange.mock.calls.length).toBe(1);
- jest.advanceTimersByTime(10000);
+ await secondSchemaChangeBlocker;
+ expect(onChange.mock.calls.length).toBe(2);
- jest.useRealTimers();
- await new Promise(resolve => setTimeout(resolve, 100));
- jest.useFakeTimers();
+ await thirdSchemaChangeBlocker;
+ expect(onChange.mock.calls.length).toBe(3);
+});
- expect(onChange.mock.calls.length).toBe(2);
+function failNTimes(n: number, fn: () => nock.Interceptor) {
+ for (let i = 0; i < n; i++) {
+ fn().reply(500);
+ }
+}
+
+it(`Retries GCS (up to ${GCS_RETRY_COUNT} times) on failure for each request and succeeds`, async () => {
+ failNTimes(GCS_RETRY_COUNT, mockStorageSecret);
+ mockStorageSecretSuccess();
+
+ failNTimes(GCS_RETRY_COUNT, mockCompositionConfigLink);
+ mockCompositionConfigLinkSuccess();
+
+ failNTimes(GCS_RETRY_COUNT, mockCompositionConfigs);
+ mockCompositionConfigsSuccess([service]);
+
+ failNTimes(GCS_RETRY_COUNT, () => mockImplementingServices(service));
+ mockImplementingServicesSuccess(service);
+
+ failNTimes(GCS_RETRY_COUNT, () => mockRawPartialSchema(service));
+ mockRawPartialSchemaSuccess(service);
+
+ const gateway = new ApolloGateway({ fetcher, logger });
+
+ await gateway.load({ engine: { apiKeyHash, graphId } });
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
+});
+
+// This test is reliably failing in its current form. It's mostly testing that
+// `make-fetch-happen` is doing its retries properly and we have proof that,
+// generally speaking, retries are working, so we'll disable this until we can
+// re-visit it.
+it.skip(`Fails after the ${GCS_RETRY_COUNT + 1}th attempt to reach GCS`, async () => {
+ failNTimes(GCS_RETRY_COUNT + 1, mockStorageSecret);
+
+ const gateway = new ApolloGateway({ fetcher, logger });
+ await expect(
+ gateway.load({ engine: { apiKeyHash, graphId } }),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"Could not communicate with Apollo Graph Manager storage: "`,
+ );
+});
+
+it(`Errors when the secret isn't hosted on GCS`, async () => {
+ mockStorageSecret().reply(
+ 403,
+ `AccessDenied
+ Anonymous caller does not have storage.objects.get`,
+ { 'content-type': 'application/xml' },
+ );
+
+ const gateway = new ApolloGateway({ fetcher, logger });
+ await expect(
+ gateway.load({ engine: { apiKeyHash, graphId } }),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"Unable to authenticate with Apollo Graph Manager storage while fetching https://storage-secrets.api.apollographql.com/federated-service/storage-secret/dd55a79d467976346d229a7b12b673ce.json. Ensure that the API key is configured properly and that a federated service has been pushed. For details, see https://go.apollo.dev/g/resolve-access-denied."`,
+ );
+});
+
+describe('Downstream service health checks', () => {
+ describe('Unmanaged mode', () => {
+ it(`Performs health checks to downstream services on load`, async () => {
+ mockSDLQuerySuccess(service);
+ mockServiceHealthCheckSuccess(service);
+
+ const gateway = new ApolloGateway({
+ logger,
+ serviceList: [{ name: 'accounts', url: service.url }],
+ serviceHealthCheck: true,
+ });
+
+ await gateway.load();
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
+ });
+
+ it(`Rejects on initial load when health check fails`, async () => {
+ mockSDLQuerySuccess(service);
+ mockServiceHealthCheck(service).reply(500);
+
+ const gateway = new ApolloGateway({
+ serviceList: [{ name: 'accounts', url: service.url }],
+ serviceHealthCheck: true,
+ logger,
+ });
+
+ await expect(gateway.load()).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"500: Internal Server Error"`,
+ );
+ });
+ });
+
+ describe('Managed mode', () => {
+ it('Performs health checks to downstream services on load', async () => {
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([service]);
+ mockImplementingServicesSuccess(service);
+ mockRawPartialSchemaSuccess(service);
+
+ mockServiceHealthCheckSuccess(service);
+
+ const gateway = new ApolloGateway({ serviceHealthCheck: true, logger });
+
+ await gateway.load({ engine: { apiKeyHash, graphId } });
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
+ });
+
+ it('Rejects on initial load when health check fails', async () => {
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([service]);
+ mockImplementingServicesSuccess(service);
+ mockRawPartialSchemaSuccess(service);
+
+ mockServiceHealthCheck(service).reply(500);
+
+ const gateway = new ApolloGateway({ serviceHealthCheck: true, logger });
+
+ await expect(
+ gateway.load({ engine: { apiKeyHash, graphId } }),
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"500: Internal Server Error"`);
+ });
+
+ it('Rolls over to new schema when health check succeeds', async () => {
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([service]);
+ mockImplementingServicesSuccess(service);
+ mockRawPartialSchemaSuccess(service);
+ mockServiceHealthCheckSuccess(service);
+
+ // Update
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([updatedService]);
+ mockImplementingServicesSuccess(updatedService);
+ mockRawPartialSchemaSuccess(updatedService);
+ mockServiceHealthCheckSuccess(updatedService);
+
+ let resolve1: () => void;
+ let resolve2: () => void;
+ const schemaChangeBlocker1 = new Promise(res => (resolve1 = res));
+ const schemaChangeBlocker2 = new Promise(res => (resolve2 = res));
+ const onChange = jest
+ .fn()
+ .mockImplementationOnce(() => resolve1())
+ .mockImplementationOnce(() => resolve2());
+
+ const gateway = new ApolloGateway({
+ serviceHealthCheck: true,
+ logger,
+ });
+ // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here
+ gateway.experimental_pollInterval = 100;
+
+ gateway.onSchemaChange(onChange);
+ gateway.load({ engine: { apiKeyHash, graphId } });
+
+ await schemaChangeBlocker1;
+ expect(onChange.mock.calls.length).toBe(1);
+
+ await schemaChangeBlocker2;
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my updated User');
+ });
+
+ it('Preserves original schema when health check fails', async () => {
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([service]);
+ mockImplementingServicesSuccess(service);
+ mockRawPartialSchemaSuccess(service);
+ mockServiceHealthCheckSuccess(service);
+
+ // Update
+ mockStorageSecretSuccess();
+ mockCompositionConfigLinkSuccess();
+ mockCompositionConfigsSuccess([updatedService]);
+ mockImplementingServicesSuccess(updatedService);
+ mockRawPartialSchemaSuccess(updatedService);
+ mockServiceHealthCheck(updatedService).reply(500);
+
+ let resolve: () => void;
+ const schemaChangeBlocker = new Promise(res => (resolve = res));
+
+ const gateway = new ApolloGateway({ serviceHealthCheck: true, logger });
+ // @ts-ignore for testing purposes, a short pollInterval is ideal so we'll override here
+ gateway.experimental_pollInterval = 100;
+
+ // @ts-ignore for testing purposes, we'll call the original `updateComposition`
+ // function from our mock. The first call should mimic original behavior,
+ // but the second call needs to handle the PromiseRejection. Typically for tests
+ // like these we would leverage the `gateway.onSchemaChange` callback to drive
+ // the test, but in this case, that callback isn't triggered when the update
+ // fails (as expected) so we get creative with the second mock as seen below.
+ const original = gateway.updateComposition;
+ const mockUpdateComposition = jest
+ .fn(original)
+ .mockImplementationOnce(original)
+ .mockImplementationOnce(async opts => {
+ // mock the first poll and handle the error which would otherwise be caught
+ // and logged from within the `pollServices` class method
+ await expect(original.apply(gateway, [opts]))
+ .rejects
+ .toThrowErrorMatchingInlineSnapshot(
+ `"500: Internal Server Error"`,
+ );
+ // finally resolve the promise which drives this test
+ resolve();
+ });
+
+ // @ts-ignore for testing purposes, replace the `updateComposition`
+ // function on the gateway with our mock
+ gateway.updateComposition = mockUpdateComposition;
+
+ // load the gateway as usual
+ await gateway.load({ engine: { apiKeyHash, graphId } });
+
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
+
+ await schemaChangeBlocker;
+
+ // At this point, the mock update should have been called but the schema
+ // should not have updated to the new one.
+ expect(mockUpdateComposition.mock.calls.length).toBe(2);
+ expect(gateway.schema!.getType('User')!.description).toBe('This is my User');
+ });
+ });
});
diff --git a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts
index 8368fbf00a2..f5515f1e8e7 100644
--- a/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/nockMocks.ts
@@ -1,5 +1,38 @@
import nock from 'nock';
+import { HEALTH_CHECK_QUERY, SERVICE_DEFINITION_QUERY } from '../..';
+import { MockService } from './networkRequests.test';
+export const graphId = 'federated-service';
+export const apiKeyHash = 'dd55a79d467976346d229a7b12b673ce';
+const storageSecret = 'my-storage-secret';
+const accountsService = 'accounts';
+
+// Service mocks
+function mockSDLQuery({ url }: MockService) {
+ return nock(url).post('/', {
+ query: SERVICE_DEFINITION_QUERY,
+ });
+}
+
+export function mockSDLQuerySuccess(service: MockService) {
+ mockSDLQuery(service).reply(200, {
+ data: { _service: { sdl: service.sdl } },
+ });
+}
+
+export function mockServiceHealthCheck({ url }: MockService) {
+ return nock(url).post('/', {
+ query: HEALTH_CHECK_QUERY,
+ });
+}
+
+export function mockServiceHealthCheckSuccess(service: MockService) {
+ return mockServiceHealthCheck(service).reply(200, {
+ data: { __typename: 'Query' },
+ });
+}
+
+// GCS mocks
function gcsNock(url: Parameters[0]): nock.Scope {
return nock(url, {
reqheaders: {
@@ -10,100 +43,71 @@ function gcsNock(url: Parameters[0]): nock.Scope {
});
}
-export const mockLocalhostSDLQuery = ({ url }: { url: string }) =>
- nock(url).post('/graphql', {
- query: 'query GetServiceDefinition { _service { sdl } }',
- });
-
-export const graphId = 'federated-service';
-export const apiKeyHash = 'dd55a79d467976346d229a7b12b673ce';
-const storageSecret = 'my-storage-secret';
-const accountsService = 'accounts';
-
-export const mockStorageSecret = () =>
- gcsNock('https://storage.googleapis.com:443').get(
- `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`,
+export function mockStorageSecret() {
+ return gcsNock('https://storage-secrets.api.apollographql.com:443').get(
+ `/${graphId}/storage-secret/${apiKeyHash}.json`,
);
+}
-export const mockStorageSecretSuccess = () =>
- gcsNock('https://storage.googleapis.com:443')
+export function mockStorageSecretSuccess() {
+ return gcsNock('https://storage-secrets.api.apollographql.com:443')
.get(
- `/engine-partial-schema-prod/${graphId}/storage-secret/${apiKeyHash}.json`,
+ `/${graphId}/storage-secret/${apiKeyHash}.json`,
)
.reply(200, `"${storageSecret}"`);
+}
// get composition config link, using received storage secret
-export const mockCompositionConfigLink = () =>
- gcsNock('https://storage.googleapis.com:443').get(
- `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-config-link`,
+export function mockCompositionConfigLink() {
+ return gcsNock('https://federation.api.apollographql.com:443').get(
+ `/${storageSecret}/current/v1/composition-config-link`,
);
+}
-export const mockCompositionConfigLinkSuccess = () =>
- mockCompositionConfigLink().reply(200, {
+export function mockCompositionConfigLinkSuccess() {
+ return mockCompositionConfigLink().reply(200, {
configPath: `${storageSecret}/current/v1/composition-configs/composition-config-path.json`,
});
+}
// get composition configs, using received composition config link
-export const mockCompositionConfigs = () =>
- gcsNock('https://storage.googleapis.com:443').get(
- `/engine-partial-schema-prod/${storageSecret}/current/v1/composition-configs/composition-config-path.json`,
+export function mockCompositionConfigs() {
+ return gcsNock('https://federation.api.apollographql.com:443').get(
+ `/${storageSecret}/current/v1/composition-configs/composition-config-path.json`,
);
+}
-export const mockCompositionConfigsSuccess = (
- implementingServicePaths: string[],
-) =>
- mockCompositionConfigs().reply(200, {
- implementingServiceLocations: implementingServicePaths.map(servicePath => ({
+export function mockCompositionConfigsSuccess(services: MockService[]) {
+ return mockCompositionConfigs().reply(200, {
+ implementingServiceLocations: services.map(service => ({
name: accountsService,
- path: `${storageSecret}/current/v1/implementing-services/${accountsService}/${servicePath}`,
+ path: `${storageSecret}/current/v1/implementing-services/${accountsService}/${service.gcsDefinitionPath}`,
})),
});
+}
// get implementing service reference, using received composition-config
-export const mockImplementingServices = ({
- implementingServicePath,
-}: {
- implementingServicePath: string;
-}) =>
- gcsNock('https://storage.googleapis.com:443').get(
- `/engine-partial-schema-prod/${storageSecret}/current/v1/implementing-services/${accountsService}/${implementingServicePath}`,
+export function mockImplementingServices({ gcsDefinitionPath }: MockService) {
+ return gcsNock('https://federation.api.apollographql.com:443').get(
+ `/${storageSecret}/current/v1/implementing-services/${accountsService}/${gcsDefinitionPath}`,
);
+}
-export const mockImplementingServicesSuccess = ({
- implementingServicePath,
- partialSchemaPath,
- federatedServiceURL,
-}: {
- implementingServicePath: string;
- partialSchemaPath: string;
- federatedServiceURL: string;
-}) =>
- mockImplementingServices({
- implementingServicePath,
- }).reply(200, {
+export function mockImplementingServicesSuccess(service: MockService) {
+ return mockImplementingServices(service).reply(200, {
name: accountsService,
- partialSchemaPath: `${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`,
- url: federatedServiceURL,
+ partialSchemaPath: `${storageSecret}/current/raw-partial-schemas/${service.partialSchemaPath}`,
+ url: service.url,
});
+}
// get raw-partial-schema, using received composition-config
-export const mockRawPartialSchema = ({
- partialSchemaPath,
-}: {
- partialSchemaPath: string;
-}) =>
- gcsNock('https://storage.googleapis.com:443').get(
- `/engine-partial-schema-prod/${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`,
+export function mockRawPartialSchema({ partialSchemaPath }: MockService) {
+ return gcsNock('https://federation.api.apollographql.com:443').get(
+ `/${storageSecret}/current/raw-partial-schemas/${partialSchemaPath}`,
);
+}
-export const mockRawPartialSchemaSuccess = ({
- partialSchemaPath,
- federatedServiceSchema,
-}: {
- partialSchemaPath: string;
- federatedServiceSchema: string;
-}) =>
- mockRawPartialSchema({ partialSchemaPath }).reply(
- 200,
- federatedServiceSchema,
- );
+export function mockRawPartialSchemaSuccess(service: MockService) {
+ mockRawPartialSchema(service).reply(200, service.sdl);
+}
diff --git a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts
index 3370a3d7036..c6dda3ed1c8 100644
--- a/packages/apollo-gateway/src/__tests__/integration/provides.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/provides.test.ts
@@ -1,14 +1,8 @@
-import gql from 'graphql-tag';
import { execute, overrideResolversInService } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { fixtures } from '../__fixtures__/schemas/';
it('does not have to go to another service when field is given', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
author {
@@ -18,12 +12,9 @@ it('does not have to go to another service when field is given', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute( {
+ query,
+ });
expect(data).toEqual({
topReviews: [
@@ -40,6 +31,8 @@ it('does not have to go to another service when field is given', async () => {
});
it('does not load fields provided even when going to other service', async () => {
+ const [accounts, ...restFixtures] = fixtures;
+
const username = jest.fn();
const localAccounts = overrideResolversInService(accounts, {
User: {
@@ -47,7 +40,7 @@ it('does not load fields provided even when going to other service', async () =>
},
});
- const query = gql`
+ const query = `#graphql
query GetReviewers {
topReviews {
author {
@@ -59,10 +52,10 @@ it('does not load fields provided even when going to other service', async () =>
`;
const { data, queryPlan } = await execute(
- [localAccounts, books, inventory, product, reviews],
{
query,
},
+ [localAccounts, ...restFixtures],
);
expect(data).toEqual({
diff --git a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts
index c45ce25fd1a..d4a35bf0fb6 100644
--- a/packages/apollo-gateway/src/__tests__/integration/requires.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/requires.test.ts
@@ -1,13 +1,9 @@
import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
+import { serializeQueryPlan } from '../..';
it('supports passing additional fields defined by a requires', async () => {
- const query = gql`
+ const query = `#graphql
query GetReviwedBookNames {
me {
reviews {
@@ -21,12 +17,9 @@ it('supports passing additional fields defined by a requires', async () => {
}
`;
- const { data, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, queryPlan } = await execute({
+ query,
+ });
expect(data).toEqual({
me: {
@@ -47,3 +40,228 @@ it('supports passing additional fields defined by a requires', async () => {
expect(queryPlan).toCallService('product');
expect(queryPlan).toCallService('books');
});
+
+const serviceA = {
+ name: 'a',
+ typeDefs: gql`
+ type Query {
+ user: User
+ }
+
+ type User @key(fields: "id") {
+ id: ID!
+ preferences: Preferences
+ }
+
+ type Preferences {
+ favorites: Things
+ }
+
+ type Things {
+ color: String
+ animal: String
+ }
+ `,
+ resolvers: {
+ Query: {
+ user() {
+ return {
+ id: '1',
+ preferences: {
+ favorites: { color: 'limegreen', animal: 'platypus' },
+ },
+ };
+ },
+ },
+ },
+};
+
+const serviceB = {
+ name: 'b',
+ typeDefs: gql`
+ extend type User @key(fields: "id") {
+ id: ID! @external
+ preferences: Preferences @external
+ favoriteColor: String
+ @requires(fields: "preferences { favorites { color } }")
+ favoriteAnimal: String
+ @requires(fields: "preferences { favorites { animal } }")
+ }
+
+ extend type Preferences {
+ favorites: Things @external
+ }
+
+ extend type Things {
+ color: String @external
+ animal: String @external
+ }
+ `,
+ resolvers: {
+ User: {
+ favoriteColor(user: any) {
+ return user.preferences.favorites.color;
+ },
+ favoriteAnimal(user: any) {
+ return user.preferences.favorites.animal;
+ },
+ },
+ },
+};
+
+it('collapses nested requires', async () => {
+ const query = `#graphql
+ query UserFavorites {
+ user {
+ favoriteColor
+ favoriteAnimal
+ }
+ }
+ `;
+
+ const { data, errors, queryPlan } = await execute(
+ {
+ query,
+ },
+ [serviceA, serviceB],
+ );
+
+ expect(errors).toEqual(undefined);
+
+ expect(serializeQueryPlan(queryPlan)).toMatchInlineSnapshot(`
+ "QueryPlan {
+ Sequence {
+ Fetch(service: \\"a\\") {
+ {
+ user {
+ __typename
+ id
+ preferences {
+ favorites {
+ color
+ animal
+ }
+ }
+ }
+ }
+ },
+ Flatten(path: \\"user\\") {
+ Fetch(service: \\"b\\") {
+ {
+ ... on User {
+ __typename
+ id
+ preferences {
+ favorites {
+ color
+ animal
+ }
+ }
+ }
+ } =>
+ {
+ ... on User {
+ favoriteColor
+ favoriteAnimal
+ }
+ }
+ },
+ },
+ },
+ }"
+ `);
+
+ expect(data).toEqual({
+ user: {
+ favoriteAnimal: 'platypus',
+ favoriteColor: 'limegreen',
+ },
+ });
+
+ expect(queryPlan).toCallService('a');
+ expect(queryPlan).toCallService('b');
+});
+
+it('collapses nested requires with user-defined fragments', async () => {
+ const query = `#graphql
+ query UserFavorites {
+ user {
+ favoriteAnimal
+ ...favoriteColor
+ }
+ }
+
+ fragment favoriteColor on User {
+ preferences {
+ favorites {
+ color
+ }
+ }
+ }
+ `;
+
+ const { data, errors, queryPlan } = await execute(
+ {
+ query,
+ },
+ [serviceA, serviceB],
+ );
+
+ expect(errors).toEqual(undefined);
+
+ expect(serializeQueryPlan(queryPlan)).toMatchInlineSnapshot(`
+ "QueryPlan {
+ Sequence {
+ Fetch(service: \\"a\\") {
+ {
+ user {
+ __typename
+ id
+ preferences {
+ favorites {
+ animal
+ color
+ }
+ }
+ }
+ }
+ },
+ Flatten(path: \\"user\\") {
+ Fetch(service: \\"b\\") {
+ {
+ ... on User {
+ __typename
+ id
+ preferences {
+ favorites {
+ animal
+ color
+ }
+ }
+ }
+ } =>
+ {
+ ... on User {
+ favoriteAnimal
+ }
+ }
+ },
+ },
+ },
+ }"
+ `);
+
+ expect(data).toEqual({
+ user: {
+ favoriteAnimal: 'platypus',
+ preferences: {
+ favorites: {
+ color: 'limegreen',
+ },
+ },
+ },
+ });
+
+ expect(queryPlan).toCallService('a');
+ expect(queryPlan).toCallService('b');
+});
diff --git a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts
index 48b3c34e219..53ab513b0a6 100644
--- a/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/single-service.test.ts
@@ -29,7 +29,7 @@ it('executes a query plan over concrete types', async () => {
Query: { me },
});
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
id
@@ -37,9 +37,12 @@ it('executes a query plan over concrete types', async () => {
}
}
`;
- const { data, queryPlan } = await execute([localAccounts], {
- query,
- });
+ const { data, queryPlan } = await execute(
+ {
+ query,
+ },
+ [localAccounts],
+ );
expect(data).toEqual({ me: { id: 1, name: 'James' } });
expect(queryPlan).toCallService('accounts');
@@ -47,15 +50,18 @@ it('executes a query plan over concrete types', async () => {
});
it('does not remove __typename on root types', async () => {
- const query = gql`
+ const query = `#graphql
query GetUser {
__typename
}
`;
- const { data } = await execute([accounts], {
- query,
- });
+ const { data } = await execute(
+ {
+ query,
+ },
+ [accounts],
+ );
expect(data).toEqual({ __typename: 'Query' });
});
@@ -66,16 +72,19 @@ it('does not remove __typename if that is all that is requested on an entity', a
Query: { me },
});
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
__typename
}
}
`;
- const { data, queryPlan } = await execute([localAccounts], {
- query,
- });
+ const { data, queryPlan } = await execute(
+ {
+ query,
+ },
+ [localAccounts],
+ );
expect(data).toEqual({ me: { __typename: 'User' } });
expect(queryPlan).toCallService('accounts');
@@ -88,7 +97,7 @@ it('does not remove __typename if that is all that is requested on a value type'
Query: { me },
});
- const query = gql`
+ const query = `#graphql
query GetUser {
me {
account {
@@ -97,9 +106,12 @@ it('does not remove __typename if that is all that is requested on a value type'
}
}
`;
- const { data, queryPlan } = await execute([localAccounts], {
- query,
- });
+ const { data, queryPlan } = await execute(
+ {
+ query,
+ },
+ [localAccounts],
+ );
expect(data).toEqual({ me: { account: { __typename: 'Account' } } });
expect(queryPlan).toCallService('accounts');
diff --git a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts
index 9eb9d88d51b..42827bb3559 100644
--- a/packages/apollo-gateway/src/__tests__/integration/unions.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/unions.test.ts
@@ -6,7 +6,7 @@ expect.addSnapshotSerializer(astSerializer);
expect.addSnapshotSerializer(queryPlanSerializer);
it('handles multiple union type conditions that share a response name (media)', async () => {
- const query = gql`
+ const query = `#graphql
query {
content {
...Audio
@@ -25,6 +25,7 @@ it('handles multiple union type conditions that share a response name (media)',
`;
const { queryPlan, errors } = await execute(
+ { query },
[
{
name: 'contentService',
@@ -51,7 +52,6 @@ it('handles multiple union type conditions that share a response name (media)',
},
},
],
- { query },
);
expect(errors).toBeUndefined();
diff --git a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts
index 725dad6e343..58064ce1731 100644
--- a/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/value-types.test.ts
@@ -1,12 +1,5 @@
import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
import { astSerializer, queryPlanSerializer } from '../../snapshotSerializers';
expect.addSnapshotSerializer(astSerializer);
@@ -14,7 +7,7 @@ expect.addSnapshotSerializer(queryPlanSerializer);
describe('value types', () => {
it('resolves value types within their respective services', async () => {
- const query = gql`
+ const query = `#graphql
fragment Metadata on MetadataOrError {
... on KeyValue {
key
@@ -48,12 +41,9 @@ describe('value types', () => {
}
`;
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, errors, queryPlan } = await execute({
+ query,
+ });
expect(errors).toBeUndefined();
@@ -272,7 +262,7 @@ describe('value types', () => {
},
};
- const query = gql`
+ const query = `#graphql
query Hello {
valueType {
id
@@ -294,10 +284,10 @@ describe('value types', () => {
`;
const { data, errors, queryPlan } = await execute(
- [firstService, secondService, userService],
{
query,
},
+ [firstService, secondService, userService],
);
expect(errors).toBeUndefined();
diff --git a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts
index 186db2c5493..cce4b16e6d4 100644
--- a/packages/apollo-gateway/src/__tests__/integration/variables.test.ts
+++ b/packages/apollo-gateway/src/__tests__/integration/variables.test.ts
@@ -1,14 +1,7 @@
-import gql from 'graphql-tag';
import { execute } from '../execution-utils';
-import * as accounts from '../__fixtures__/schemas/accounts';
-import * as books from '../__fixtures__/schemas/books';
-import * as inventory from '../__fixtures__/schemas/inventory';
-import * as product from '../__fixtures__/schemas/product';
-import * as reviews from '../__fixtures__/schemas/reviews';
-
it('passes variables to root fields', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String!) {
product(upc: $upc) {
name
@@ -17,13 +10,10 @@ it('passes variables to root fields', async () => {
`;
const upc = '1';
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { upc },
- },
- );
+ const { data, errors, queryPlan } = await execute({
+ query,
+ variables: { upc },
+ });
expect(errors).toBeUndefined();
expect(data).toEqual({
@@ -36,7 +26,7 @@ it('passes variables to root fields', async () => {
});
it('supports default variables in a variable definition', async () => {
- const query = gql`
+ const query = `#graphql
query GetProduct($upc: String = "1") {
product(upc: $upc) {
name
@@ -44,12 +34,9 @@ it('supports default variables in a variable definition', async () => {
}
`;
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- },
- );
+ const { data, errors, queryPlan } = await execute({
+ query,
+ });
expect(errors).toBeUndefined();
expect(data).toEqual({
@@ -62,7 +49,7 @@ it('supports default variables in a variable definition', async () => {
});
it('passes variables to nested services', async () => {
- const query = gql`
+ const query = `#graphql
query GetProductsForUser($format: Boolean) {
me {
reviews {
@@ -73,13 +60,10 @@ it('passes variables to nested services', async () => {
`;
const format = true;
- const { data, errors, queryPlan } = await execute(
- [accounts, books, inventory, product, reviews],
- {
- query,
- variables: { format },
- },
- );
+ const { data, errors, queryPlan } = await execute({
+ query,
+ variables: { format },
+ });
expect(errors).toBeUndefined();
expect(data).toEqual({
@@ -99,7 +83,7 @@ it('passes variables to nested services', async () => {
});
it('works with default variables in the schema', async () => {
- const query = gql`
+ const query = `#graphql
query LibraryUser($libraryId: ID!, $userId: ID) {
library(id: $libraryId) {
userAccount(id: $userId) {
@@ -110,10 +94,10 @@ it('works with default variables in the schema', async () => {
}
`;
- const { data, queryPlan, errors } = await execute(
- [accounts, books, inventory, product, reviews],
- { query, variables: { libraryId: '1' } },
- );
+ const { data, queryPlan, errors } = await execute({
+ query,
+ variables: { libraryId: '1' },
+ });
expect(data).toEqual({
library: {
diff --git a/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts
new file mode 100644
index 00000000000..91f3b366478
--- /dev/null
+++ b/packages/apollo-gateway/src/__tests__/loadServicesFromRemoteEndpoint.test.ts
@@ -0,0 +1,38 @@
+import { getServiceDefinitionsFromRemoteEndpoint } from '../loadServicesFromRemoteEndpoint';
+import { mockLocalhostSDLQuery } from './integration/nockMocks';
+import { RemoteGraphQLDataSource } from '../datasources';
+import nock = require('nock');
+
+describe('getServiceDefinitionsFromRemoteEndpoint', () => {
+ it('errors when no URL was specified', async () => {
+ const serviceSdlCache = new Map();
+ const dataSource = new RemoteGraphQLDataSource({ url: '' });
+ const serviceList = [{ name: 'test', dataSource }];
+ await expect(
+ getServiceDefinitionsFromRemoteEndpoint({
+ serviceList,
+ serviceSdlCache,
+ }),
+ ).rejects.toThrowError(
+ "Tried to load schema for 'test' but no 'url' was specified.",
+ );
+ });
+
+ it('throws when the downstream service returns errors', async () => {
+ const serviceSdlCache = new Map();
+ const host = 'http://host-which-better-not-resolve';
+ const url = host + '/graphql';
+
+ const dataSource = new RemoteGraphQLDataSource({ url });
+ const serviceList = [{ name: 'test', url, dataSource }];
+ // Depending on the OS's resolver, the error may result in an error
+ // of `EAI_AGAIN` or `ENOTFOUND`. This `toThrowError` uses a Regex
+ // to match either case.
+ await expect(
+ getServiceDefinitionsFromRemoteEndpoint({
+ serviceList,
+ serviceSdlCache,
+ }),
+ ).rejects.toThrowError(/^Couldn't load service definitions for "test" at http:\/\/host-which-better-not-resolve\/graphql: request to http:\/\/host-which-better-not-resolve\/graphql failed, reason: getaddrinfo (ENOTFOUND|EAI_AGAIN)/);
+ });
+});
diff --git a/packages/apollo-gateway/src/buildQueryPlan.ts b/packages/apollo-gateway/src/buildQueryPlan.ts
index f6264408585..e36237cdc5b 100644
--- a/packages/apollo-gateway/src/buildQueryPlan.ts
+++ b/packages/apollo-gateway/src/buildQueryPlan.ts
@@ -26,6 +26,9 @@ import {
TypeNameMetaFieldDef,
visit,
VariableDefinitionNode,
+ OperationTypeNode,
+ print,
+ stripIgnoredCharacters,
} from 'graphql';
import {
Field,
@@ -104,34 +107,60 @@ export function buildQueryPlan(
function executionNodeForGroup(
context: QueryPlanningContext,
- group: FetchGroup,
+ {
+ serviceName,
+ fields,
+ requiredFields,
+ internalFragments,
+ mergeAt,
+ dependentGroups,
+ }: FetchGroup,
parentType?: GraphQLCompositeType,
): PlanNode {
- const selectionSet = selectionSetFromFieldSet(group.fields, parentType);
+ const selectionSet = selectionSetFromFieldSet(fields, parentType);
+ const requires =
+ requiredFields.length > 0
+ ? selectionSetFromFieldSet(requiredFields)
+ : undefined;
+ const variableUsages = context.getVariableUsages(
+ selectionSet,
+ internalFragments,
+ );
+
+ const operation = requires
+ ? operationForEntitiesFetch({
+ selectionSet,
+ variableUsages,
+ internalFragments,
+ })
+ : operationForRootFetch({
+ selectionSet,
+ variableUsages,
+ internalFragments,
+ operation: context.operation.operation,
+ });
const fetchNode: FetchNode = {
kind: 'Fetch',
- serviceName: group.serviceName,
+ serviceName,
selectionSet,
- requires:
- group.requiredFields && group.requiredFields.length > 0
- ? selectionSetFromFieldSet(group.requiredFields)
- : undefined,
- variableUsages: context.getVariableUsages(selectionSet, group.internalFragments),
- internalFragments: group.internalFragments
+ requires,
+ variableUsages,
+ internalFragments,
+ source: stripIgnoredCharacters(print(operation)),
};
const node: PlanNode =
- group.mergeAt && group.mergeAt.length > 0
+ mergeAt && mergeAt.length > 0
? {
kind: 'Flatten',
- path: group.mergeAt,
+ path: mergeAt,
node: fetchNode,
}
: fetchNode;
- if (group.dependentGroups.length > 0) {
- const dependentNodes = group.dependentGroups.map(dependentGroup =>
+ if (dependentGroups.length > 0) {
+ const dependentNodes = dependentGroups.map(dependentGroup =>
executionNodeForGroup(context, dependentGroup),
);
@@ -141,6 +170,108 @@ function executionNodeForGroup(
}
}
+interface VariableUsages {
+ [name: string]: VariableDefinitionNode
+}
+
+function mapFetchNodeToVariableDefinitions(
+ variableUsages: VariableUsages,
+): VariableDefinitionNode[] {
+ return variableUsages ? Object.values(variableUsages) : [];
+}
+
+function operationForRootFetch({
+ selectionSet,
+ variableUsages,
+ internalFragments,
+ operation = 'query',
+}: {
+ selectionSet: SelectionSetNode;
+ variableUsages: VariableUsages;
+ internalFragments: Set;
+ operation?: OperationTypeNode;
+}): DocumentNode {
+ return {
+ kind: Kind.DOCUMENT,
+ definitions: [
+ {
+ kind: Kind.OPERATION_DEFINITION,
+ operation,
+ selectionSet,
+ variableDefinitions: mapFetchNodeToVariableDefinitions(variableUsages),
+ },
+ ...internalFragments,
+ ],
+ };
+}
+
+function operationForEntitiesFetch({
+ selectionSet,
+ variableUsages,
+ internalFragments,
+}: {
+ selectionSet: SelectionSetNode;
+ variableUsages: VariableUsages;
+ internalFragments: Set;
+}): DocumentNode {
+ const representationsVariable = {
+ kind: Kind.VARIABLE,
+ name: { kind: Kind.NAME, value: 'representations' },
+ };
+
+ return {
+ kind: Kind.DOCUMENT,
+ definitions: [
+ {
+ kind: Kind.OPERATION_DEFINITION,
+ operation: 'query',
+ variableDefinitions: ([
+ {
+ kind: Kind.VARIABLE_DEFINITION,
+ variable: representationsVariable,
+ type: {
+ kind: Kind.NON_NULL_TYPE,
+ type: {
+ kind: Kind.LIST_TYPE,
+ type: {
+ kind: Kind.NON_NULL_TYPE,
+ type: {
+ kind: Kind.NAMED_TYPE,
+ name: { kind: Kind.NAME, value: '_Any' },
+ },
+ },
+ },
+ },
+ },
+ ] as VariableDefinitionNode[]).concat(
+ mapFetchNodeToVariableDefinitions(variableUsages),
+ ),
+ selectionSet: {
+ kind: Kind.SELECTION_SET,
+ selections: [
+ {
+ kind: Kind.FIELD,
+ name: { kind: Kind.NAME, value: '_entities' },
+ arguments: [
+ {
+ kind: Kind.ARGUMENT,
+ name: {
+ kind: Kind.NAME,
+ value: representationsVariable.name.value,
+ },
+ value: representationsVariable,
+ },
+ ],
+ selectionSet,
+ },
+ ],
+ },
+ },
+ ...internalFragments,
+ ],
+ };
+}
+
// Wraps the given nodes in a ParallelNode or SequenceNode, unless there's only
// one node, in which case it is returned directly. Any nodes of the same kind
// in the given list have their sub-nodes flattened into the list: ie,
@@ -382,9 +513,7 @@ function splitFields(
groupForField: (field: Field) => FetchGroup,
) {
for (const fieldsForResponseName of groupByResponseName(fields).values()) {
- for (const [parentType, fieldsForParentType] of groupByParentType(
- fieldsForResponseName,
- )) {
+ for (const [parentType, fieldsForParentType] of groupByParentType(fieldsForResponseName)) {
// Field nodes that share the same response name and parent type are guaranteed
// to have the same field name and arguments. We only need the other nodes when
// merging selection sets, to take node-specific subfields and directives
@@ -393,10 +522,6 @@ function splitFields(
const field = fieldsForParentType[0];
const { scope, fieldDef } = field;
- // If the length of possibleTypes is zero, we're nested inside a type condition
- // that's impossible to fulfill and can be excluded from the query plan altogether.
- if (scope.possibleTypes.length === 0) continue;
-
// We skip `__typename` for root types.
if (fieldDef.name === TypeNameMetaFieldDef.name) {
const { schema } = context;
@@ -645,7 +770,12 @@ function collectFields(
const fieldDef = context.getFieldDef(scope.parentType, selection);
fields.push({ scope, fieldNode: selection, fieldDef });
break;
- case Kind.INLINE_FRAGMENT:
+ case Kind.INLINE_FRAGMENT: {
+ const newScope = context.newScope(getFragmentCondition(selection), scope);
+ if (newScope.possibleTypes.length === 0) {
+ break;
+ }
+
collectFields(
context,
context.newScope(getFragmentCondition(selection), scope),
@@ -654,22 +784,28 @@ function collectFields(
visitedFragmentNames,
);
break;
+ }
case Kind.FRAGMENT_SPREAD:
const fragmentName = selection.name.value;
- if (visitedFragmentNames[fragmentName]) {
+ const fragment = context.fragments[fragmentName];
+ if (!fragment) {
continue;
}
- visitedFragmentNames[fragmentName] = true;
- const fragment = context.fragments[fragmentName];
- if (!fragment) {
+ const newScope = context.newScope(getFragmentCondition(fragment), scope);
+ if (newScope.possibleTypes.length === 0) {
continue;
}
+ if (visitedFragmentNames[fragmentName]) {
+ continue;
+ }
+ visitedFragmentNames[fragmentName] = true;
+
collectFields(
context,
- context.newScope(getFragmentCondition(fragment), scope),
+ newScope,
fragment.selectionSet,
fields,
visitedFragmentNames,
diff --git a/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts b/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts
index bcbaae7c408..979e3149791 100644
--- a/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts
+++ b/packages/apollo-gateway/src/datasources/LocalGraphQLDataSource.ts
@@ -9,14 +9,14 @@ import {
import { enableGraphQLExtensions } from 'graphql-extensions';
import { GraphQLDataSource } from './types';
-export class LocalGraphQLDataSource implements GraphQLDataSource {
+export class LocalGraphQLDataSource = Record> implements GraphQLDataSource {
constructor(public readonly schema: GraphQLSchema) {
// FIXME: This is needed to enable support for `resolveObject`, but we
// should move that to `apollo-graphql`
enableGraphQLExtensions(schema);
}
- async process({
+ async process({
request,
context,
}: Pick, 'request' | 'context'>): Promise<
diff --git a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts
index b9198aecf35..700e78e2f47 100644
--- a/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts
+++ b/packages/apollo-gateway/src/datasources/RemoteGraphQLDataSource.ts
@@ -19,11 +19,13 @@ import { isObject } from '../utilities/predicates';
import { GraphQLDataSource } from './types';
import createSHA from 'apollo-server-core/dist/utils/createSHA';
-export class RemoteGraphQLDataSource implements GraphQLDataSource {
+export class RemoteGraphQLDataSource = Record> implements GraphQLDataSource {
+ fetcher: typeof fetch = fetch;
+
constructor(
- config?: Partial &
+ config?: Partial> &
object &
- ThisType,
+ ThisType>,
) {
if (config) {
return Object.assign(this, config);
@@ -52,7 +54,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource {
*/
apq: boolean = false;
- async process({
+ async process({
request,
context,
}: Pick, 'request' | 'context'>): Promise<
@@ -123,7 +125,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource {
return respond(response, requestWithQuery);
}
- private async sendRequest(
+ private async sendRequest(
request: GraphQLRequest,
context: TContext,
): Promise {
@@ -144,7 +146,8 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource {
});
try {
- const httpResponse = await fetch(httpRequest);
+ // Use our local `fetcher` to allow for fetch injection
+ const httpResponse = await this.fetcher(httpRequest);
if (!httpResponse.ok) {
throw await this.errorFromResponse(httpResponse);
@@ -166,14 +169,14 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource {
}
}
- public willSendRequest?(
+ public willSendRequest?(
requestContext: Pick<
GraphQLRequestContext,
'request' | 'context'
>,
): ValueOrPromise;
- public didReceiveResponse?(
+ public didReceiveResponse?(
requestContext: Required,
'request' | 'response' | 'context'>
@@ -184,7 +187,7 @@ export class RemoteGraphQLDataSource implements GraphQLDataSource {
throw error;
}
- public parseBody(
+ public parseBody(
response: Response,
_request?: Request,
_context?: TContext,
diff --git a/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts b/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts
index ff5309dc000..f81b39afb18 100644
--- a/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts
+++ b/packages/apollo-gateway/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts
@@ -9,6 +9,7 @@ import {
import { RemoteGraphQLDataSource } from '../RemoteGraphQLDataSource';
import { Headers } from 'apollo-server-env';
import { GraphQLRequestContext } from 'apollo-server-types';
+import { Response } from '../../../../../../apollo-tooling/packages/apollo-env/lib';
beforeEach(() => {
fetch.mockReset();
@@ -238,6 +239,29 @@ describe('constructing requests', () => {
});
});
+describe('fetcher', () => {
+ it('uses a custom provided `fetcher`', async () => {
+ const injectedFetch = fetch.mockJSONResponseOnce({ data: { injected: true } });
+ const DataSource = new RemoteGraphQLDataSource({
+ url: 'https://api.example.com/foo',
+ fetcher: injectedFetch,
+ });
+
+ const { data } = await DataSource.process({
+ request: {
+ query: '{ me { name } }',
+ variables: { id: '1' },
+ },
+ context: {},
+ });
+
+ expect(injectedFetch).toHaveBeenCalled();
+ expect(data).toEqual({injected: true});
+
+ });
+
+});
+
describe('willSendRequest', () => {
it('allows for modifying variables', async () => {
const DataSource = new RemoteGraphQLDataSource({
diff --git a/packages/apollo-gateway/src/datasources/types.ts b/packages/apollo-gateway/src/datasources/types.ts
index d65e42dc0b9..c112c309692 100644
--- a/packages/apollo-gateway/src/datasources/types.ts
+++ b/packages/apollo-gateway/src/datasources/types.ts
@@ -1,7 +1,7 @@
import { GraphQLResponse, GraphQLRequestContext } from 'apollo-server-types';
-export interface GraphQLDataSource {
- process(
+export interface GraphQLDataSource = Record> {
+ process(
request: Pick, 'request' | 'context'>,
): Promise;
}
diff --git a/packages/apollo-gateway/src/executeQueryPlan.ts b/packages/apollo-gateway/src/executeQueryPlan.ts
index cb499dfdbd0..b92aec7d61e 100644
--- a/packages/apollo-gateway/src/executeQueryPlan.ts
+++ b/packages/apollo-gateway/src/executeQueryPlan.ts
@@ -7,16 +7,12 @@ import {
execute,
GraphQLError,
Kind,
- OperationTypeNode,
- print,
SelectionSetNode,
TypeNameMetaFieldDef,
- VariableDefinitionNode,
GraphQLFieldResolver,
- stripIgnoredCharacters,
- DocumentNode,
} from 'graphql';
import { Trace, google } from 'apollo-engine-reporting-protobuf';
+import { defaultRootOperationNameLookup } from '@apollo/federation';
import { GraphQLDataSource } from './datasources/types';
import {
FetchNode,
@@ -93,11 +89,9 @@ export async function executeQueryPlan(
},
rootValue: data,
variableValues: requestContext.request.variables,
- // FIXME: GraphQL extensions currentl wraps every field and creates
- // a field resolver. Because of this, when using with ApolloServer
- // the defaultFieldResolver isn't called. We keep this here
- // because it is the correct solution and when ApolloServer removes
- // GraphQLExtensions this will be how alias support is maintained
+ // We have a special field resolver which ensures we support aliases.
+ // FIXME: It's _possible_ this will change after `graphql-extensions` is
+ // deprecated, though not certain. See here, also: https://git.io/Jf8cS.
fieldResolver: defaultFieldResolverWithAliasSupport,
}));
} catch (error) {
@@ -202,13 +196,12 @@ async function executeFetch(
_path: ResponsePath,
traceNode: Trace.QueryPlanNode.FetchNode | null,
): Promise {
+ const logger = context.requestContext.logger || console;
const service = context.serviceMap[fetch.serviceName];
if (!service) {
throw new Error(`Couldn't find service with name "${fetch.serviceName}"`);
}
- const operationType = context.operationContext.operation.operation;
-
const entities = Array.isArray(results) ? results : [results];
if (entities.length < 1) return;
@@ -228,7 +221,7 @@ async function executeFetch(
if (!fetch.requires) {
const dataReceivedFromService = await sendOperation(
context,
- operationForRootFetch(fetch, operationType),
+ fetch.source,
variables,
);
@@ -255,7 +248,7 @@ async function executeFetch(
const dataReceivedFromService = await sendOperation(
context,
- operationForEntitiesFetch(fetch),
+ fetch.source,
{ ...variables, representations },
);
@@ -285,12 +278,11 @@ async function executeFetch(
}
}
- async function sendOperation(
+ async function sendOperation(
context: ExecutionContext,
- operation: DocumentNode,
+ source: string,
variables: Record,
): Promise {
- const source = stripIgnoredCharacters(print(operation));
// We declare this as 'any' because it is missing url and method, which
// GraphQLRequest.http is supposed to have if it exists.
let http: any;
@@ -313,7 +305,7 @@ async function executeFetch(
traceNode.sentTime = dateToProtoTimestamp(new Date());
}
- const response = await service.process({
+ const response = await service.process({
request: {
query: source,
variables,
@@ -351,7 +343,7 @@ async function executeFetch(
// supports that, but there's not a no-deps base64 implementation.
traceBuffer = Buffer.from(traceBase64, 'base64');
} catch (err) {
- console.error(
+ logger.error(
`error decoding base64 for federated trace from ${fetch.serviceName}: ${err}`,
);
traceParsingFailed = true;
@@ -362,12 +354,25 @@ async function executeFetch(
const trace = Trace.decode(traceBuffer);
traceNode.trace = trace;
} catch (err) {
- console.error(
+ logger.error(
`error decoding protobuf for federated trace from ${fetch.serviceName}: ${err}`,
);
traceParsingFailed = true;
}
}
+ if (traceNode.trace) {
+ // Federation requires the root operations in the composed schema
+ // to have the default names (Query, Mutation, Subscription) even
+ // if the implementing services choose different names, so we override
+ // whatever the implementing service reported here.
+ const rootTypeName =
+ defaultRootOperationNameLookup[
+ context.operationContext.operation.operation
+ ];
+ traceNode.trace.root?.child?.forEach((child) => {
+ child.parentType = rootTypeName;
+ });
+ }
traceNode.traceParsingFailed = traceParsingFailed;
}
}
@@ -479,89 +484,6 @@ function downstreamServiceError(
);
}
-function mapFetchNodeToVariableDefinitions(
- node: FetchNode,
-): VariableDefinitionNode[] {
- return node.variableUsages ? Object.values(node.variableUsages) : [];
-}
-
-function operationForRootFetch(
- fetch: FetchNode,
- operation: OperationTypeNode = 'query',
-): DocumentNode {
- return {
- kind: Kind.DOCUMENT,
- definitions: [
- {
- kind: Kind.OPERATION_DEFINITION,
- operation,
- selectionSet: fetch.selectionSet,
- variableDefinitions: mapFetchNodeToVariableDefinitions(fetch),
- },
- ...fetch.internalFragments,
- ],
- };
-}
-
-function operationForEntitiesFetch(fetch: FetchNode): DocumentNode {
- const representationsVariable = {
- kind: Kind.VARIABLE,
- name: { kind: Kind.NAME, value: 'representations' },
- };
-
- return {
- kind: Kind.DOCUMENT,
- definitions: [
- {
- kind: Kind.OPERATION_DEFINITION,
- operation: 'query',
- variableDefinitions: ([
- {
- kind: Kind.VARIABLE_DEFINITION,
- variable: representationsVariable,
- type: {
- kind: Kind.NON_NULL_TYPE,
- type: {
- kind: Kind.LIST_TYPE,
- type: {
- kind: Kind.NON_NULL_TYPE,
- type: {
- kind: Kind.NAMED_TYPE,
- name: { kind: Kind.NAME, value: '_Any' },
- },
- },
- },
- },
- },
- ] as VariableDefinitionNode[]).concat(
- mapFetchNodeToVariableDefinitions(fetch),
- ),
- selectionSet: {
- kind: Kind.SELECTION_SET,
- selections: [
- {
- kind: Kind.FIELD,
- name: { kind: Kind.NAME, value: '_entities' },
- arguments: [
- {
- kind: Kind.ARGUMENT,
- name: {
- kind: Kind.NAME,
- value: representationsVariable.name.value,
- },
- value: representationsVariable,
- },
- ],
- selectionSet: fetch.selectionSet,
- },
- ],
- },
- },
- ...fetch.internalFragments
- ],
- };
-}
-
export const defaultFieldResolverWithAliasSupport: GraphQLFieldResolver<
any,
any
diff --git a/packages/apollo-gateway/src/index.ts b/packages/apollo-gateway/src/index.ts
index a34db0a362d..d74269f0299 100644
--- a/packages/apollo-gateway/src/index.ts
+++ b/packages/apollo-gateway/src/index.ts
@@ -6,8 +6,8 @@ import {
} from 'apollo-server-core';
import {
GraphQLExecutionResult,
- GraphQLRequestContext,
- WithRequired,
+ Logger,
+ GraphQLRequestContextExecutionDidStart,
} from 'apollo-server-types';
import { InMemoryLRUCache } from 'apollo-server-caching';
import {
@@ -19,8 +19,7 @@ import {
} from 'graphql';
import { GraphQLSchemaValidationError } from 'apollo-graphql';
import { composeAndValidate, ServiceDefinition } from '@apollo/federation';
-import loglevel, { Logger } from 'loglevel';
-import loglevelDebug from 'loglevel-debug';
+import loglevel from 'loglevel';
import { buildQueryPlan, buildOperationContext } from './buildQueryPlan';
import {
@@ -48,6 +47,7 @@ export type ServiceEndpointDefinition = Pick;
interface GatewayConfigBase {
debug?: boolean;
+ logger?: Logger;
// TODO: expose the query plan in a more flexible JSON format in the future
// and remove this config option in favor of `exposeQueryPlan`. Playground
// should cutover to use the new option when it's built.
@@ -63,6 +63,7 @@ interface GatewayConfigBase {
experimental_approximateQueryPlanStoreMiB?: number;
experimental_autoFragmentization?: boolean;
fetcher?: typeof fetch;
+ serviceHealthCheck?: boolean;
}
interface RemoteGatewayConfig extends GatewayConfigBase {
@@ -82,7 +83,7 @@ export type GatewayConfig =
| LocalGatewayConfig
| ManagedGatewayConfig;
-type DataSourceCache = {
+type DataSourceMap = {
[serviceName: string]: { url?: string; dataSource: GraphQLDataSource };
};
@@ -147,16 +148,47 @@ export type Experimental_UpdateServiceDefinitions = (
type Await = T extends Promise ? U : T;
-type RequestContext = WithRequired<
- GraphQLRequestContext,
- 'document' | 'queryHash'
->;
+// Local state to track whether particular UX-improving warning messages have
+// already been emitted. This is particularly useful to prevent recurring
+// warnings of the same type in, e.g. repeating timers, which don't provide
+// additional value when they are repeated over and over during the life-time
+// of a server.
+type WarnedStates = {
+ remoteWithLocalConfig?: boolean;
+};
+
+export const GCS_RETRY_COUNT = 5;
+
+export function getDefaultGcsFetcher() {
+ return fetcher.defaults({
+ cacheManager: new HttpRequestCache(),
+ // All headers should be lower-cased here, as `make-fetch-happen`
+ // treats differently cased headers as unique (unlike the `Headers` object).
+ // @see: https://git.io/JvRUa
+ headers: {
+ 'user-agent': `apollo-gateway/${require('../package.json').version}`,
+ },
+ retry: {
+ retries: GCS_RETRY_COUNT,
+ // The default factor: expected attempts at 0, 1, 3, 7, 15, and 31 seconds elapsed
+ factor: 2,
+ // 1 second
+ minTimeout: 1000,
+ randomize: true,
+ },
+ });
+}
+
+export const HEALTH_CHECK_QUERY =
+ 'query __ApolloServiceHealthCheck__ { __typename }';
+export const SERVICE_DEFINITION_QUERY =
+ 'query __ApolloGetServiceDefinition__ { _service { sdl } }';
export class ApolloGateway implements GraphQLService {
public schema?: GraphQLSchema;
- protected serviceMap: DataSourceCache = Object.create(null);
+ protected serviceMap: DataSourceMap = Object.create(null);
protected config: GatewayConfig;
- protected logger: Logger;
+ private logger: Logger;
protected queryPlanStore?: InMemoryLRUCache;
private engineConfig: GraphQLServiceEngineConfig | undefined;
private pollingTimer?: NodeJS.Timer;
@@ -164,16 +196,9 @@ export class ApolloGateway implements GraphQLService {
private serviceDefinitions: ServiceDefinition[] = [];
private compositionMetadata?: CompositionMetadata;
private serviceSdlCache = new Map();
+ private warnedStates: WarnedStates = Object.create(null);
- private fetcher: typeof fetch = fetcher.defaults({
- cacheManager: new HttpRequestCache(),
- // All headers should be lower-cased here, as `make-fetch-happen`
- // treats differently cased headers as unique (unlike the `Headers` object).
- // @see: https://git.io/JvRUa
- headers: {
- 'user-agent': `apollo-gateway/${require('../package.json').version}`
- }
- });
+ private fetcher: typeof fetch = getDefaultGcsFetcher();
// Observe query plan, service info, and operation info prior to execution.
// The information made available here will give insight into the resulting
@@ -203,15 +228,21 @@ export class ApolloGateway implements GraphQLService {
...config,
};
- // Setup logging facilities, scoped under the appropriate name.
- this.logger = loglevel.getLogger(`apollo-gateway:`);
+ // Setup logging facilities
+ if (this.config.logger) {
+ this.logger = this.config.logger;
+ } else {
+ // If the user didn't provide their own logger, we'll initialize one.
+ const loglevelLogger = loglevel.getLogger(`apollo-gateway`);
- // Support DEBUG environment variable, à la https://npm.im/debug/.
- loglevelDebug(this.logger);
+ // And also support the `debug` option, if it's truthy.
+ if (this.config.debug === true) {
+ loglevelLogger.setLevel(loglevelLogger.levels.DEBUG);
+ } else {
+ loglevelLogger.setLevel(loglevelLogger.levels.WARN);
+ }
- // And also support the `debug` option, if it's truthy.
- if (this.config.debug === true) {
- this.logger.enableAll();
+ this.logger = loglevelLogger;
}
if (isLocalConfig(this.config)) {
@@ -251,7 +282,7 @@ export class ApolloGateway implements GraphQLService {
this.experimental_pollInterval = config.experimental_pollInterval;
}
- // Warn against using the pollInterval and a serviceList simulatenously
+ // Warn against using the pollInterval and a serviceList simultaneously
if (config.experimental_pollInterval && isRemoteConfig(config)) {
this.logger.warn(
'Polling running services is dangerous and not recommended in production. ' +
@@ -268,6 +299,11 @@ export class ApolloGateway implements GraphQLService {
public async load(options?: { engine?: GraphQLServiceEngineConfig }) {
await this.updateComposition(options);
+
+ if (isManagedConfig(this.config) || this.experimental_pollInterval) {
+ if (!this.pollingTimer) this.pollServices();
+ }
+
const { graphId, graphVariant } = (options && options.engine) || {};
const mode = isManagedConfig(this.config) ? 'managed' : 'unmanaged';
@@ -288,7 +324,7 @@ export class ApolloGateway implements GraphQLService {
protected async updateComposition(options?: {
engine?: GraphQLServiceEngineConfig;
}): Promise {
- // The options argument and internal config update coule be handled by this.load()
+ // The options argument and internal config update could be handled by this.load()
// instead of here. We can remove this as a breaking change in the future.
if (options && options.engine) {
if (!options.engine.graphVariant)
@@ -296,20 +332,16 @@ export class ApolloGateway implements GraphQLService {
this.engineConfig = options.engine;
}
- const previousSchema = this.schema;
- const previousServiceDefinitions = this.serviceDefinitions;
- const previousCompositionMetadata = this.compositionMetadata;
-
let result: Await>;
- this.logger.debug('Loading configuration for gateway');
+ this.logger.debug('Checking service definitions...');
try {
result = await this.updateServiceDefinitions(this.config);
} catch (e) {
- this.logger.warn(
- 'Error checking for schema updates. Falling back to existing schema.',
- e,
+ this.logger.error(
+ "Error checking for changes to service definitions: " +
+ (e && e.message || e)
);
- return;
+ throw e;
}
if (
@@ -317,12 +349,43 @@ export class ApolloGateway implements GraphQLService {
JSON.stringify(this.serviceDefinitions) ===
JSON.stringify(result.serviceDefinitions)
) {
- this.logger.debug('No change in service definitions since last check');
+ this.logger.debug('No change in service definitions since last check.');
return;
}
+ const previousSchema = this.schema;
+ const previousServiceDefinitions = this.serviceDefinitions;
+ const previousCompositionMetadata = this.compositionMetadata;
+
if (previousSchema) {
- this.logger.info('Gateway config has changed, updating schema');
+ this.logger.info("New service definitions were found.");
+ }
+
+ // Run service health checks before we commit and update the new schema.
+ // This is the last chance to bail out of a schema update.
+ if (this.config.serviceHealthCheck) {
+ // Here we need to construct new datasources based on the new schema info
+ // so we can check the health of the services we're _updating to_.
+ const serviceMap = result.serviceDefinitions.reduce(
+ (serviceMap, serviceDef) => {
+ serviceMap[serviceDef.name] = {
+ url: serviceDef.url,
+ dataSource: this.createDataSource(serviceDef),
+ };
+ return serviceMap;
+ },
+ Object.create(null) as DataSourceMap,
+ );
+
+ try {
+ await this.serviceHealthCheck(serviceMap);
+ } catch (e) {
+ this.logger.error(
+ 'The gateway did not update its schema due to failed service health checks. ' +
+ 'The gateway will continue to operate with the previous schema and reattempt updates.' + e
+ );
+ throw e;
+ }
}
this.compositionMetadata = result.compositionMetadata;
@@ -331,13 +394,14 @@ export class ApolloGateway implements GraphQLService {
if (this.queryPlanStore) this.queryPlanStore.flush();
this.schema = this.createSchema(result.serviceDefinitions);
+
+ // Notify the schema listeners of the updated schema
try {
this.onSchemaChangeListeners.forEach(listener => listener(this.schema!));
} catch (e) {
this.logger.error(
- 'Error notifying schema change listener of update to schema.',
- e,
- );
+ "An error was thrown from an 'onSchemaChange' listener. " +
+ "The schema will still update: " + (e && e.message || e));
}
if (this.experimental_didUpdateComposition) {
@@ -361,6 +425,31 @@ export class ApolloGateway implements GraphQLService {
}
}
+ /**
+ * This can be used without an argument in order to perform an ad-hoc health check
+ * of the downstream services like so:
+ *
+ * @example
+ * ```
+ * try {
+ * await gateway.serviceHealthCheck();
+ * } catch(e) {
+ * /* your error handling here *\/
+ * }
+ * ```
+ * @throws
+ * @param serviceMap {DataSourceMap}
+ */
+ public serviceHealthCheck(serviceMap: DataSourceMap = this.serviceMap) {
+ return Promise.all(
+ Object.entries(serviceMap).map(([name, { dataSource }]) =>
+ dataSource
+ .process({ request: { query: HEALTH_CHECK_QUERY }, context: {} })
+ .then(response => ({ name, response })),
+ ),
+ );
+ }
+
protected createSchema(serviceList: ServiceDefinition[]) {
this.logger.debug(
`Composing schema from service list: \n${serviceList
@@ -387,42 +476,48 @@ export class ApolloGateway implements GraphQLService {
this.logger.debug('Schema loaded and ready for execution');
+ // FIXME: The comment below may change when `graphql-extensions` is
+ // removed, as it will be soon. It's not clear if this will be temporary,
+ // as is suggested, after that time, because we still very much need to
+ // do this special alias resolving. Original comment:
// this is a temporary workaround for GraphQLFieldExtensions automatic
// wrapping of all fields when using ApolloServer. Here we wrap all fields
// with support for resolving aliases as part of the root value which
- // happens because alises are resolved by sub services and the shape
- // of the rootvalue already contains the aliased fields as responseNames
+ // happens because aliases are resolved by sub services and the shape
+ // of the root value already contains the aliased fields as responseNames
return wrapSchemaWithAliasResolver(schema);
}
public onSchemaChange(callback: SchemaChangeCallback): Unsubscriber {
- if (!isManagedConfig(this.config) && !this.experimental_pollInterval) {
- return () => {};
- }
-
this.onSchemaChangeListeners.add(callback);
- if (!this.pollingTimer) this.startPollingServices();
return () => {
this.onSchemaChangeListeners.delete(callback);
- if (this.onSchemaChangeListeners.size === 0 && this.pollingTimer) {
- clearInterval(this.pollingTimer!);
- this.pollingTimer = undefined;
- }
};
}
- private startPollingServices() {
- if (this.pollingTimer) clearInterval(this.pollingTimer);
+ private async pollServices() {
+ if (this.pollingTimer) clearTimeout(this.pollingTimer);
- this.pollingTimer = setInterval(() => {
- this.updateComposition();
- }, this.experimental_pollInterval || 10000);
+ try {
+ await this.updateComposition();
+ } catch (err) {
+ this.logger.error(err && err.message || err);
+ }
+
+ // Sleep for the specified pollInterval before kicking off another round of polling
+ await new Promise(res => {
+ this.pollingTimer = setTimeout(
+ res,
+ this.experimental_pollInterval || 10000,
+ );
+ // Prevent the Node.js event loop from remaining active (and preventing,
+ // e.g. process shutdown) by calling `unref` on the `Timeout`. For more
+ // information, see https://nodejs.org/api/timers.html#timers_timeout_unref.
+ this.pollingTimer?.unref();
+ });
- // Prevent the Node.js event loop from remaining active (and preventing,
- // e.g. process shutdown) by calling `unref` on the `Timeout`. For more
- // information, see https://nodejs.org/api/timers.html#timers_timeout_unref.
- this.pollingTimer.unref();
+ this.pollServices();
}
private createAndCacheDataSource(
@@ -435,22 +530,28 @@ export class ApolloGateway implements GraphQLService {
)
return this.serviceMap[serviceDef.name].dataSource;
+ const dataSource = this.createDataSource(serviceDef);
+
+ // Cache the created DataSource
+ this.serviceMap[serviceDef.name] = { url: serviceDef.url, dataSource };
+
+ return dataSource;
+ }
+
+ private createDataSource(
+ serviceDef: ServiceEndpointDefinition,
+ ): GraphQLDataSource {
if (!serviceDef.url && !isLocalConfig(this.config)) {
this.logger.error(
`Service definition for service ${serviceDef.name} is missing a url`,
);
}
- const dataSource = this.config.buildService
+ return this.config.buildService
? this.config.buildService(serviceDef)
: new RemoteGraphQLDataSource({
url: serviceDef.url,
});
-
- // Cache the created DataSource
- this.serviceMap[serviceDef.name] = { url: serviceDef.url, dataSource };
-
- return dataSource;
}
protected createServices(services: ServiceEndpointDefinition[]) {
@@ -462,6 +563,38 @@ export class ApolloGateway implements GraphQLService {
protected async loadServiceDefinitions(
config: GatewayConfig,
): ReturnType {
+ // This helper avoids the repetition of options in the two cases this method
+ // is invoked below. It is a helper, rather than an options object, since it
+ // depends on the presence of `this.engineConfig`, which is guarded against
+ // further down in this method in two separate places.
+ const getManagedConfig = (engineConfig: GraphQLServiceEngineConfig) => {
+ return getServiceDefinitionsFromStorage({
+ graphId: engineConfig.graphId,
+ apiKeyHash: engineConfig.apiKeyHash,
+ graphVariant: engineConfig.graphVariant,
+ federationVersion:
+ (config as ManagedGatewayConfig).federationVersion || 1,
+ fetcher: this.fetcher,
+ });
+ };
+
+ if (isLocalConfig(config) || isRemoteConfig(config)) {
+ if (this.engineConfig && !this.warnedStates.remoteWithLocalConfig) {
+ // Only display this warning once per start-up.
+ this.warnedStates.remoteWithLocalConfig = true;
+ // This error helps avoid common misconfiguration.
+ // We don't await this because a local configuration should assume
+ // remote is unavailable for one reason or another.
+ getManagedConfig(this.engineConfig).then(() => {
+ this.logger.warn(
+ "A local gateway service list is overriding an Apollo Graph " +
+ "Manager managed configuration. To use the managed " +
+ "configuration, do not specify a service list locally.",
+ );
+ }).catch(() => {}); // Don't mind errors if managed config is missing.
+ }
+ }
+
if (isLocalConfig(config)) {
return { isNewSchema: false };
}
@@ -487,13 +620,7 @@ export class ApolloGateway implements GraphQLService {
);
}
- return getServiceDefinitionsFromStorage({
- graphId: this.engineConfig.graphId,
- apiKeyHash: this.engineConfig.apiKeyHash,
- graphVariant: this.engineConfig.graphVariant,
- federationVersion: config.federationVersion || 1,
- fetcher: this.fetcher
- });
+ return getManagedConfig(this.engineConfig);
}
// XXX Nothing guarantees that the only errors thrown or returned in
@@ -502,7 +629,7 @@ export class ApolloGateway implements GraphQLService {
// are unlikely to show up as GraphQLErrors. Do we need to use
// formatApolloErrors or something?
public executor = async (
- requestContext: RequestContext,
+ requestContext: GraphQLRequestContextExecutionDidStart,
): Promise => {
const { request, document, queryHash } = requestContext;
const queryPlanStoreKey = queryHash + (request.operationName || '');
@@ -549,7 +676,11 @@ export class ApolloGateway implements GraphQLService {
// is returning a non-native `Promise` (e.g. Bluebird, etc.).
Promise.resolve(
this.queryPlanStore.set(queryPlanStoreKey, queryPlan),
- ).catch(err => this.logger.warn('Could not store queryPlan', err));
+ ).catch(err =>
+ this.logger.warn(
+ 'Could not store queryPlan' + ((err && err.message) || err),
+ ),
+ );
}
}
@@ -611,7 +742,7 @@ export class ApolloGateway implements GraphQLService {
};
protected validateIncomingRequest(
- requestContext: RequestContext,
+ requestContext: GraphQLRequestContextExecutionDidStart,
operationContext: OperationContext,
) {
// casting out of `readonly`
@@ -645,7 +776,7 @@ export class ApolloGateway implements GraphQLService {
public async stop() {
if (this.pollingTimer) {
- clearInterval(this.pollingTimer);
+ clearTimeout(this.pollingTimer);
this.pollingTimer = undefined;
}
}
diff --git a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts
index a11840c7911..c4dd8b9f3c8 100644
--- a/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts
+++ b/packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts
@@ -2,7 +2,7 @@ import { GraphQLRequest } from 'apollo-server-types';
import { parse } from 'graphql';
import { Headers, HeadersInit } from 'node-fetch';
import { GraphQLDataSource } from './datasources/types';
-import { Experimental_UpdateServiceDefinitions } from './';
+import { Experimental_UpdateServiceDefinitions, SERVICE_DEFINITION_QUERY } from './';
import { ServiceDefinition } from '@apollo/federation';
export async function getServiceDefinitionsFromRemoteEndpoint({
@@ -26,57 +26,51 @@ export async function getServiceDefinitionsFromRemoteEndpoint({
let isNewSchema = false;
// for each service, fetch its introspection schema
- const serviceDefinitions: ServiceDefinition[] = (await Promise.all(
- serviceList.map(({ name, url, dataSource }) => {
- if (!url) {
- throw new Error(`Tried to load schema from ${name} but no url found`);
- }
+ const promiseOfServiceList = serviceList.map(({ name, url, dataSource }) => {
+ if (!url) {
+ throw new Error(
+ `Tried to load schema for '${name}' but no 'url' was specified.`);
+ }
- const request: GraphQLRequest = {
- query: 'query GetServiceDefinition { _service { sdl } }',
- http: {
- url,
- method: 'POST',
- headers: new Headers(headers),
- },
- };
+ const request: GraphQLRequest = {
+ query: SERVICE_DEFINITION_QUERY,
+ http: {
+ url,
+ method: 'POST',
+ headers: new Headers(headers),
+ },
+ };
- return dataSource
- .process({ request, context: {} })
- .then(({ data, errors }) => {
- if (data && !errors) {
- const typeDefs = data._service.sdl as string;
- const previousDefinition = serviceSdlCache.get(name);
- // this lets us know if any downstream service has changed
- // and we need to recalculate the schema
- if (previousDefinition !== typeDefs) {
- isNewSchema = true;
- }
- serviceSdlCache.set(name, typeDefs);
- return {
- name,
- url,
- typeDefs: parse(typeDefs),
- };
+ return dataSource
+ .process({ request, context: {} })
+ .then(({ data, errors }): ServiceDefinition => {
+ if (data && !errors) {
+ const typeDefs = data._service.sdl as string;
+ const previousDefinition = serviceSdlCache.get(name);
+ // this lets us know if any downstream service has changed
+ // and we need to recalculate the schema
+ if (previousDefinition !== typeDefs) {
+ isNewSchema = true;
}
+ serviceSdlCache.set(name, typeDefs);
+ return {
+ name,
+ url,
+ typeDefs: parse(typeDefs),
+ };
+ }
- // XXX handle local errors better for local development
- if (errors) {
- errors.forEach(console.error);
- }
+ throw new Error(errors?.map(e => e.message).join("\n"));
+ })
+ .catch(err => {
+ const errorMessage =
+ `Couldn't load service definitions for "${name}" at ${url}` +
+ (err && err.message ? ": " + err.message || err : "");
- return false;
- })
- .catch(error => {
- console.warn(
- `Encountered error when loading ${name} at ${url}: ${error.message}`,
- );
- return false;
- });
- }),
- ).then(serviceDefinitions =>
- serviceDefinitions.filter(Boolean),
- )) as ServiceDefinition[];
+ throw new Error(errorMessage);
+ });
+ });
+ const serviceDefinitions = await Promise.all(promiseOfServiceList);
return { serviceDefinitions, isNewSchema }
}
diff --git a/packages/apollo-gateway/src/loadServicesFromStorage.ts b/packages/apollo-gateway/src/loadServicesFromStorage.ts
index 89d8f5bf260..08ada2fdff5 100644
--- a/packages/apollo-gateway/src/loadServicesFromStorage.ts
+++ b/packages/apollo-gateway/src/loadServicesFromStorage.ts
@@ -38,18 +38,69 @@ const urlFromEnvOrDefault = (envKey: string, fallback: string) =>
// Generate and cache our desired operation manifest URL.
const urlPartialSchemaBase = urlFromEnvOrDefault(
envOverridePartialSchemaBaseUrl,
- 'https://storage.googleapis.com/engine-partial-schema-prod/',
+ 'https://federation.api.apollographql.com/',
);
const urlStorageSecretBase: string = urlFromEnvOrDefault(
envOverrideStorageSecretBaseUrl,
- 'https://storage.googleapis.com/engine-partial-schema-prod/',
+ 'https://storage-secrets.api.apollographql.com/',
);
function getStorageSecretUrl(graphId: string, apiKeyHash: string): string {
return `${urlStorageSecretBase}/${graphId}/storage-secret/${apiKeyHash}.json`;
}
+function fetchApolloGcs(
+ fetcher: typeof fetch,
+ ...args: Parameters
+): ReturnType {
+ const [input, init] = args;
+
+ // Used in logging.
+ const url = typeof input === 'object' && input.url || input;
+
+ return fetcher(input, init)
+ .catch(fetchError => {
+ throw new Error(
+ "Cannot access Apollo Graph Manager storage: " + fetchError)
+ })
+ .then(async (response) => {
+ // If the fetcher has a cache and has implemented ETag validation, then
+ // a 304 response may be returned. Either way, we will return the
+ // non-JSON-parsed version and let the caller decide if that's important
+ // to their needs.
+ if (response.ok || response.status === 304) {
+ return response;
+ }
+
+ // We won't make any assumptions that the body is anything but text, to
+ // avoid parsing errors in this unknown condition.
+ const body = await response.text();
+
+ // Google Cloud Storage returns an `application/xml` error under error
+ // conditions. We'll special-case our known errors, and resort to
+ // printing the body for others.
+ if (
+ response.headers.get('content-type') === 'application/xml' &&
+ response.status === 403 &&
+ body.includes("AccessDenied") &&
+ body.includes("Anonymous caller does not have storage.objects.get")
+ ) {
+ throw new Error(
+ "Unable to authenticate with Apollo Graph Manager storage " +
+ "while fetching " + url + ". Ensure that the API key is " +
+ "configured properly and that a federated service has been " +
+ "pushed. For details, see " +
+ "https://go.apollo.dev/g/resolve-access-denied.");
+ }
+
+ // Normally, we'll try to keep the logs clean with errors we expect.
+ // If it's not a known error, reveal the full body for debugging.
+ throw new Error(
+ "Could not communicate with Apollo Graph Manager storage: " + body);
+ });
+};
+
export async function getServiceDefinitionsFromStorage({
graphId,
apiKeyHash,
@@ -66,9 +117,9 @@ export async function getServiceDefinitionsFromStorage({
// fetch the storage secret
const storageSecretUrl = getStorageSecretUrl(graphId, apiKeyHash);
- const secret: string = await fetcher(storageSecretUrl).then(response =>
- response.json(),
- );
+ // The storage secret is a JSON string (e.g. `"secret"`).
+ const secret: string =
+ await fetchApolloGcs(fetcher, storageSecretUrl).then(res => res.json());
if (!graphVariant) {
graphVariant = 'current';
@@ -76,17 +127,19 @@ export async function getServiceDefinitionsFromStorage({
const baseUrl = `${urlPartialSchemaBase}/${secret}/${graphVariant}/v${federationVersion}`;
- const response = await fetcher(`${baseUrl}/composition-config-link`);
+ const compositionConfigResponse =
+ await fetchApolloGcs(fetcher, `${baseUrl}/composition-config-link`);
- if (response.status === 304) {
+ if (compositionConfigResponse.status === 304) {
return { isNewSchema: false };
}
- const linkFileResult: LinkFileResult = await response.json();
+ const linkFileResult: LinkFileResult = await compositionConfigResponse.json();
- const compositionMetadata: CompositionMetadata = await fetcher(
+ const compositionMetadata: CompositionMetadata = await fetchApolloGcs(
+ fetcher,
`${urlPartialSchemaBase}/${linkFileResult.configPath}`,
- ).then(response => response.json());
+ ).then(res => res.json());
// It's important to maintain the original order here
const serviceDefinitions = await Promise.all(
diff --git a/packages/apollo-gateway/src/utilities/array.ts b/packages/apollo-gateway/src/utilities/array.ts
index 5e94a539ebb..2aaea1d5e9c 100644
--- a/packages/apollo-gateway/src/utilities/array.ts
+++ b/packages/apollo-gateway/src/utilities/array.ts
@@ -16,6 +16,14 @@ export function compactMap(
);
}
+export function partition(
+ array: T[],
+ predicate: (element: T, index: number, array: T[]) => element is U,
+): [U[], T[]];
+export function partition(
+ array: T[],
+ predicate: (element: T, index: number, array: T[]) => boolean,
+): [T[], T[]];
export function partition(
array: T[],
predicate: (element: T, index: number, array: T[]) => boolean,
@@ -48,3 +56,22 @@ export function findAndExtract(
return [array[index], remaining];
}
+
+export function groupBy(keyFunction: (element: T) => U) {
+ return (iterable: Iterable) => {
+ const result = new Map();
+
+ for (const element of iterable) {
+ const key = keyFunction(element);
+ const group = result.get(key);
+
+ if (group) {
+ group.push(element);
+ } else {
+ result.set(key, [element]);
+ }
+ }
+
+ return result;
+ };
+}
diff --git a/packages/apollo-gateway/tsconfig.json b/packages/apollo-gateway/tsconfig.json
index 36be67985df..a97b77c7ebd 100644
--- a/packages/apollo-gateway/tsconfig.json
+++ b/packages/apollo-gateway/tsconfig.json
@@ -1,6 +1,7 @@
{
"extends": "../../tsconfig.base",
"compilerOptions": {
+ "target": "es2019",
"rootDir": "./src",
"outDir": "./dist"
},
diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json
index eb569b7eed8..e023cbfce12 100644
--- a/packages/apollo-server-azure-functions/package.json
+++ b/packages/apollo-server-azure-functions/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-azure-functions",
- "version": "2.11.0",
+ "version": "2.14.2",
"description": "Production-ready Node.js GraphQL server for Azure Functions",
"keywords": [
"GraphQL",
@@ -26,7 +26,7 @@
},
"dependencies": {
"@apollographql/graphql-playground-html": "1.6.24",
- "@azure/functions": "1.2.0",
+ "@azure/functions": "1.2.2",
"apollo-server-core": "file:../apollo-server-core",
"apollo-server-env": "file:../apollo-server-env",
"apollo-server-types": "file:../apollo-server-types",
@@ -36,6 +36,6 @@
"apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
index b445be473e3..233ac509ecd 100644
--- a/packages/apollo-server-cache-memcached/package.json
+++ b/packages/apollo-server-cache-memcached/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-cache-memcached",
- "version": "0.6.4",
+ "version": "0.6.5",
"author": "opensource@apollographql.com",
"license": "MIT",
"repository": {
diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
index d51436b5f18..3d1cef1cdef 100644
--- a/packages/apollo-server-cache-redis/package.json
+++ b/packages/apollo-server-cache-redis/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-cache-redis",
- "version": "1.1.5",
+ "version": "1.2.1",
"author": "opensource@apollographql.com",
"license": "MIT",
"repository": {
@@ -19,7 +19,7 @@
"dependencies": {
"apollo-server-caching": "file:../apollo-server-caching",
"apollo-server-env": "file:../apollo-server-env",
- "dataloader": "^1.4.0",
+ "dataloader": "^2.0.0",
"ioredis": "^4.0.0"
}
}
diff --git a/packages/apollo-server-cache-redis/src/RedisCache.ts b/packages/apollo-server-cache-redis/src/RedisCache.ts
index b45998dea98..22fe9a1977f 100644
--- a/packages/apollo-server-cache-redis/src/RedisCache.ts
+++ b/packages/apollo-server-cache-redis/src/RedisCache.ts
@@ -11,13 +11,13 @@ export class RedisCache implements TestableKeyValueCache {
ttl: 300,
};
- private loader: DataLoader;
+ private loader: DataLoader;
constructor(options?: RedisOptions) {
const client = new Redis(options);
this.client = client;
- this.loader = new DataLoader(keys => this.client.mget(keys), {
+ this.loader = new DataLoader(keys => client.mget(...keys), {
cache: false,
});
}
diff --git a/packages/apollo-server-cache-redis/src/RedisClusterCache.ts b/packages/apollo-server-cache-redis/src/RedisClusterCache.ts
index 79bd73c83f0..401799a9d52 100644
--- a/packages/apollo-server-cache-redis/src/RedisClusterCache.ts
+++ b/packages/apollo-server-cache-redis/src/RedisClusterCache.ts
@@ -12,14 +12,14 @@ export class RedisClusterCache implements KeyValueCache {
ttl: 300,
};
- private loader: DataLoader;
+ private loader: DataLoader;
constructor(nodes: ClusterNode[], options?: ClusterOptions) {
- this.client = new Redis.Cluster(nodes, options);
+ const client = this.client = new Redis.Cluster(nodes, options);
this.loader = new DataLoader(
(keys = []) =>
- Promise.all(keys.map(key => this.client.get(key).catch(() => null))),
+ Promise.all(keys.map(key => client.get(key).catch(() => null))),
{ cache: false },
);
}
diff --git a/packages/apollo-server-cloud-functions/package.json b/packages/apollo-server-cloud-functions/package.json
index e07a8d0c305..86abe93d65d 100644
--- a/packages/apollo-server-cloud-functions/package.json
+++ b/packages/apollo-server-cloud-functions/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-cloud-functions",
- "version": "2.11.0",
+ "version": "2.14.2",
"description": "Production-ready Node.js GraphQL server for Google Cloud Functions",
"keywords": [
"GraphQL",
@@ -35,6 +35,6 @@
"apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts b/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts
index fa7d20b4d6e..ea311f6b869 100644
--- a/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts
+++ b/packages/apollo-server-cloud-functions/src/__tests__/googleCloudApollo.test.ts
@@ -6,7 +6,7 @@ import testSuite, {
import { Config } from 'apollo-server-core';
import express = require('express');
import bodyParser = require('body-parser');
-import request = require('supertest');
+import request from 'supertest';
type GcfRequest = {
path: string | null;
diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json
index 835cb36ad94..902af196b47 100644
--- a/packages/apollo-server-cloudflare/package.json
+++ b/packages/apollo-server-cloudflare/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-cloudflare",
- "version": "2.11.0",
+ "version": "2.14.2",
"description": "Production-ready Node.js GraphQL server for Cloudflare workers",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@@ -26,6 +26,6 @@
"apollo-server-types": "file:../apollo-server-types"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
index 1f666b46952..d58b891e2cd 100644
--- a/packages/apollo-server-core/package.json
+++ b/packages/apollo-server-core/package.json
@@ -1,6 +1,6 @@
{
"name": "apollo-server-core",
- "version": "2.11.0",
+ "version": "2.14.2",
"description": "Core engine for Apollo GraphQL server",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
"@apollographql/apollo-tools": "^0.4.3",
"@apollographql/graphql-playground-html": "1.6.24",
"@types/graphql-upload": "^8.0.0",
- "@types/ws": "^6.0.0",
+ "@types/ws": "^7.0.0",
"apollo-cache-control": "file:../apollo-cache-control",
"apollo-datasource": "file:../apollo-datasource",
"apollo-engine-reporting": "file:../apollo-engine-reporting",
@@ -42,11 +42,12 @@
"graphql-tag": "^2.9.2",
"graphql-tools": "^4.0.0",
"graphql-upload": "^8.0.2",
+ "loglevel": "^1.6.7",
"sha.js": "^2.4.11",
"subscriptions-transport-ws": "^0.9.11",
"ws": "^6.0.0"
},
"peerDependencies": {
- "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc.2"
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
}
}
diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts
index 6c21d422fc1..fd8b6098e96 100644
--- a/packages/apollo-server-core/src/ApolloServer.ts
+++ b/packages/apollo-server-core/src/ApolloServer.ts
@@ -4,6 +4,7 @@ import {
GraphQLParseOptions,
} from 'graphql-tools';
import { Server as HttpServer } from 'http';
+import loglevel from 'loglevel';
import {
execute,
GraphQLSchema,
@@ -34,6 +35,8 @@ import {
ExecutionParams,
} from 'subscriptions-transport-ws';
+import WebSocket from 'ws';
+
import { formatApolloErrors } from 'apollo-server-errors';
import {
GraphQLServerOptions,
@@ -68,6 +71,14 @@ import {
import { Headers } from 'apollo-server-env';
import { buildServiceDefinition } from '@apollographql/apollo-tools';
+import { plugin as pluginTracing } from "apollo-tracing";
+import { Logger, SchemaHash } from "apollo-server-types";
+import {
+ plugin as pluginCacheControl,
+ CacheControlExtensionOptions,
+} from 'apollo-cache-control';
+import { getEngineApiKey, getEngineGraphVariant } from "apollo-engine-reporting/dist/agent";
+import { cloneObject } from "./runHttpQuery";
const NoIntrospection = (context: ValidationContext) => ({
Field(node: FieldDefinitionNode) {
@@ -82,30 +93,8 @@ const NoIntrospection = (context: ValidationContext) => ({
},
});
-function getEngineApiKey(engine: Config['engine']): string | undefined {
- const keyFromEnv = process.env.ENGINE_API_KEY || '';
- if (engine === false) {
- return;
- } else if (typeof engine === 'object' && engine.apiKey) {
- return engine.apiKey;
- } else if (keyFromEnv) {
- return keyFromEnv;
- }
- return;
-}
-
-function getEngineGraphVariant(engine: Config['engine']): string | undefined {
- if (engine === false) {
- return;
- } else if (typeof engine === 'object' && engine.schemaTag) {
- return engine.schemaTag;
- } else {
- return process.env.ENGINE_SCHEMA_TAG;
- }
-}
-
-function getEngineServiceId(engine: Config['engine']): string | undefined {
- const engineApiKey = getEngineApiKey(engine);
+function getEngineServiceId(engine: Config['engine'], logger: Logger): string | undefined {
+ const engineApiKey = getEngineApiKey({engine, skipWarn: true, logger} );
if (engineApiKey) {
return engineApiKey.split(':', 2)[1];
}
@@ -126,11 +115,12 @@ type SchemaDerivedData = {
// on the same operation to be executed immediately.
documentStore?: InMemoryLRUCache;
schema: GraphQLSchema;
- schemaHash: string;
+ schemaHash: SchemaHash;
extensions: Array<() => GraphQLExtension>;
};
export class ApolloServerBase {
+ private logger: Logger;
public subscriptionsPath?: string;
public graphqlPath: string = '/graphql';
public requestOptions: Partial> = Object.create(null);
@@ -181,12 +171,34 @@ export class ApolloServerBase {
playground,
plugins,
gateway,
+ cacheControl,
experimental_approximateDocumentStoreMiB,
...requestOptions
} = config;
+ // Setup logging facilities
+ if (config.logger) {
+ this.logger = config.logger;
+ } else {
+ // If the user didn't provide their own logger, we'll initialize one.
+ const loglevelLogger = loglevel.getLogger("apollo-server");
+
+ // We don't do much logging in Apollo Server right now. There's a notion
+ // of a `debug` flag, but it doesn't do much besides change stack traces
+ // in some error messages, but it would be odd for it to not introduce
+ // debug or higher level errors (which includes `info`, if we happen to
+ // start introducing those. We'll default to `warn` as a sensible default
+ // of things you'd probably want to be alerted to.
+ if (this.config.debug === true) {
+ loglevelLogger.setLevel(loglevel.levels.DEBUG);
+ } else {
+ loglevelLogger.setLevel(loglevel.levels.WARN);
+ }
+
+ this.logger = loglevelLogger;
+ }
+
if (gateway && (modules || schema || typeDefs || resolvers)) {
- // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs seprate.
throw new Error(
'Cannot define both `gateway` and any of: `modules`, `schema`, `typeDefs`, or `resolvers`',
);
@@ -195,15 +207,11 @@ export class ApolloServerBase {
this.parseOptions = parseOptions;
this.context = context;
- // Plugins will be instantiated if they aren't already, and this.plugins
- // is populated accordingly.
- this.ensurePluginInstantiation(plugins);
-
// While reading process.env is slow, a server should only be constructed
// once per run, so we place the env check inside the constructor. If env
// should be used outside of the constructor context, place it as a private
// or protected field of the class instead of a global. Keeping the read in
- // the contructor enables testing of different environments
+ // the constructor enables testing of different environments
const isDev = process.env.NODE_ENV !== 'production';
// if this is local dev, introspection should turned on
@@ -219,31 +227,6 @@ export class ApolloServerBase {
: noIntro;
}
- if (requestOptions.cacheControl !== false) {
- if (
- typeof requestOptions.cacheControl === 'boolean' &&
- requestOptions.cacheControl === true
- ) {
- // cacheControl: true means that the user needs the cache-control
- // extensions. This means we are running the proxy, so we should not
- // strip out the cache control extension and not add cache-control headers
- requestOptions.cacheControl = {
- stripFormattedExtensions: false,
- calculateHttpHeaders: false,
- defaultMaxAge: 0,
- };
- } else {
- // Default behavior is to run default header calculation and return
- // no cacheControl extensions
- requestOptions.cacheControl = {
- stripFormattedExtensions: true,
- calculateHttpHeaders: true,
- defaultMaxAge: 0,
- ...requestOptions.cacheControl,
- };
- }
- }
-
if (!requestOptions.cache) {
requestOptions.cache = new InMemoryLRUCache();
}
@@ -268,7 +251,7 @@ export class ApolloServerBase {
if (uploads !== false && !forbidUploadsForTesting) {
if (this.supportsUploads()) {
if (!runtimeSupportsUploads) {
- printNodeFileUploadsMessage();
+ printNodeFileUploadsMessage(this.logger);
throw new Error(
'`graphql-upload` is no longer supported on Node.js < v8.5.0. ' +
'See https://bit.ly/gql-upload-node-6.',
@@ -289,8 +272,13 @@ export class ApolloServerBase {
}
}
- // Normalize the legacy option maskErrorDetails.
if (engine && typeof engine === 'object') {
+ // Use the `ApolloServer` logger unless a more granular logger is set.
+ if (!engine.logger) {
+ engine.logger = this.logger;
+ }
+
+ // Normalize the legacy option maskErrorDetails.
if (engine.maskErrorDetails && engine.rewriteError) {
throw new Error("Can't set both maskErrorDetails and rewriteError!");
} else if (
@@ -306,10 +294,10 @@ export class ApolloServerBase {
// In an effort to avoid over-exposing the API key itself, extract the
// service ID from the API key for plugins which only needs service ID.
- // The truthyness of this value can also be used in other forks of logic
+ // The truthiness of this value can also be used in other forks of logic
// related to Engine, as is the case with EngineReportingAgent just below.
- this.engineServiceId = getEngineServiceId(engine);
- const apiKey = getEngineApiKey(engine);
+ this.engineServiceId = getEngineServiceId(engine, this.logger);
+ const apiKey = getEngineApiKey({engine, skipWarn: true, logger: this.logger});
if (apiKey) {
this.engineApiKeyHash = createSHA('sha512')
.update(apiKey)
@@ -319,13 +307,15 @@ export class ApolloServerBase {
if (this.engineServiceId) {
const { EngineReportingAgent } = require('apollo-engine-reporting');
this.engineReportingAgent = new EngineReportingAgent(
- typeof engine === 'object' ? engine : Object.create(null),
+ typeof engine === 'object' ? engine : Object.create({
+ logger: this.logger,
+ }),
);
// Don't add the extension here (we want to add it later in generateSchemaDerivedData).
}
if (gateway && subscriptions !== false) {
- // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs seprate.
+ // TODO: this could be handled by adjusting the typings to keep gateway configs and non-gateway configs separate.
throw new Error(
[
'Subscriptions are not yet compatible with the gateway.',
@@ -376,6 +366,11 @@ export class ApolloServerBase {
} else {
throw new Error("Unexpected error: Unable to resolve a valid GraphQLSchema. Please file an issue with a reproduction of this error, if possible.");
}
+
+ // Plugins will be instantiated if they aren't already, and this.plugins
+ // is populated accordingly.
+ this.ensurePluginInstantiation(plugins);
+
}
// used by integrations to synchronize the path with subscriptions, some
@@ -407,7 +402,7 @@ export class ApolloServerBase {
),
);
- const graphVariant = getEngineGraphVariant(engine);
+ const graphVariant = getEngineGraphVariant(engine, this.logger);
const engineConfig =
this.engineApiKeyHash && this.engineServiceId
? {
@@ -417,13 +412,27 @@ export class ApolloServerBase {
}
: undefined;
- return gateway.load({ engine: engineConfig }).then(config => {
- this.requestOptions.executor = config.executor;
- return config.schema;
- });
+ // Set the executor whether the gateway 'load' call succeeds or not.
+ // If the schema becomes available eventually (after a setInterval retry)
+ // this executor will still be necessary in order to be able to support
+ // a federated schema!
+ this.requestOptions.executor = gateway.executor;
+
+ return gateway.load({ engine: engineConfig })
+ .then(config => config.schema)
+ .catch(err => {
+ // We intentionally do not re-throw the exact error from the gateway
+ // configuration as it may contain implementation details and this
+ // error will propagate to the client. We will, however, log the error
+ // for observation in the logs.
+ const message = "This data graph is missing a valid configuration.";
+ this.logger.error(message + " " + (err && err.message || err));
+ throw new Error(
+ message + " More details may be available in the server logs.");
+ });
}
- let constructedSchema;
+ let constructedSchema: GraphQLSchema;
if (schema) {
constructedSchema = schema;
} else if (modules) {
@@ -511,39 +520,6 @@ export class ApolloServerBase {
const extensions = [];
- const schemaIsFederated = this.schemaIsFederated(schema);
- const { engine } = this.config;
- // Keep this extension second so it wraps everything, except error formatting
- if (this.engineReportingAgent) {
- if (schemaIsFederated) {
- // XXX users can configure a federated Apollo Server to send metrics, but the
- // Gateway should be responsible for that. It's possible that users are running
- // their own gateway or running a federated service on its own. Nonetheless, in
- // the likely case it was accidental, we warn users that they should only report
- // metrics from the Gateway.
- console.warn(
- "It looks like you're running a federated schema and you've configured your service " +
- 'to report metrics to Apollo Graph Manager. You should only configure your Apollo gateway ' +
- 'to report metrics to Apollo Graph Manager.',
- );
- }
- extensions.push(() =>
- this.engineReportingAgent!.newExtension(schemaHash),
- );
- } else if (engine !== false && schemaIsFederated) {
- // We haven't configured this app to use Engine directly. But it looks like
- // we are a federated service backend, so we should be capable of including
- // our trace in a response extension if we are asked to by the gateway.
- const {
- EngineFederatedTracingExtension,
- } = require('apollo-engine-reporting');
- const rewriteError =
- engine && typeof engine === 'object' ? engine.rewriteError : undefined;
- extensions.push(
- () => new EngineFederatedTracingExtension({ rewriteError }),
- );
- }
-
// Note: doRunQuery will add its own extensions if you set tracing,
// or cacheControl.
extensions.push(...(_extensions || []));
@@ -560,8 +536,22 @@ export class ApolloServerBase {
}
protected async willStart() {
- const { schema, schemaHash } = await this.schemaDerivedData;
+ try {
+ var { schema, schemaHash } = await this.schemaDerivedData;
+ } catch (err) {
+ // The `schemaDerivedData` can throw if the Promise it points to does not
+ // resolve with a `GraphQLSchema`. As errors from `willStart` are start-up
+ // errors, other Apollo middleware after us will not be called, including
+ // our health check, CORS, etc.
+ //
+ // Returning here allows the integration's other Apollo middleware to
+ // function properly in the event of a failure to obtain the data graph
+ // configuration from the gateway's `load` method during initialization.
+ return;
+ }
+
const service: GraphQLServiceContext = {
+ logger: this.logger,
schema: schema,
schemaHash: schemaHash,
engine: {
@@ -584,7 +574,6 @@ export class ApolloServerBase {
}
}
- persistedQueries: this.requestOptions.persistedQueries,
await Promise.all(
this.plugins.map(
plugin =>
@@ -603,7 +592,7 @@ export class ApolloServerBase {
}
}
- public installSubscriptionHandlers(server: HttpServer) {
+ public installSubscriptionHandlers(server: HttpServer | WebSocket.Server) {
if (!this.subscriptionServerOptions) {
if (this.config.gateway) {
throw Error(
@@ -677,11 +666,14 @@ export class ApolloServerBase {
return { ...connection, context };
},
keepAlive,
+ validationRules: this.requestOptions.validationRules
},
- {
- server,
- path,
- },
+ server instanceof WebSocket.Server
+ ? server
+ : {
+ server,
+ path,
+ },
);
}
@@ -718,12 +710,77 @@ export class ApolloServerBase {
return sdlFieldType.name == 'String';
}
- private ensurePluginInstantiation(plugins?: PluginDefinition[]): void {
- if (!plugins || !plugins.length) {
- return;
+ private ensurePluginInstantiation(plugins: PluginDefinition[] = []): void {
+ const pluginsToInit: PluginDefinition[] = [];
+
+ // Internal plugins should be added to `pluginsToInit` here.
+ // User's plugins, provided as an argument to this method, will be added
+ // at the end of that list so they take precedence.
+
+ // If the user has enabled it explicitly, add our tracing lugin.
+ if (this.config.tracing) {
+ pluginsToInit.push(pluginTracing())
}
- this.plugins = plugins.map(plugin => {
+ // Enable cache control unless it was explicitly disabled.
+ if (this.config.cacheControl !== false) {
+ let cacheControlOptions: CacheControlExtensionOptions = {};
+ if (
+ typeof this.config.cacheControl === 'boolean' &&
+ this.config.cacheControl === true
+ ) {
+ // cacheControl: true means that the user needs the cache-control
+ // extensions. This means we are running the proxy, so we should not
+ // strip out the cache control extension and not add cache-control headers
+ cacheControlOptions = {
+ stripFormattedExtensions: false,
+ calculateHttpHeaders: false,
+ defaultMaxAge: 0,
+ };
+ } else {
+ // Default behavior is to run default header calculation and return
+ // no cacheControl extensions
+ cacheControlOptions = {
+ stripFormattedExtensions: true,
+ calculateHttpHeaders: true,
+ defaultMaxAge: 0,
+ ...this.config.cacheControl,
+ };
+ }
+
+ pluginsToInit.push(pluginCacheControl(cacheControlOptions));
+ }
+
+ const federatedSchema = this.schema && this.schemaIsFederated(this.schema);
+ const { engine } = this.config;
+ // Keep this extension second so it wraps everything, except error formatting
+ if (this.engineReportingAgent) {
+ if (federatedSchema) {
+ // XXX users can configure a federated Apollo Server to send metrics, but the
+ // Gateway should be responsible for that. It's possible that users are running
+ // their own gateway or running a federated service on its own. Nonetheless, in
+ // the likely case it was accidental, we warn users that they should only report
+ // metrics from the Gateway.
+ this.logger.warn(
+ "It looks like you're running a federated schema and you've configured your service " +
+ 'to report metrics to Apollo Graph Manager. You should only configure your Apollo gateway ' +
+ 'to report metrics to Apollo Graph Manager.',
+ );
+ }
+ pluginsToInit.push(this.engineReportingAgent!.newPlugin());
+ } else if (engine !== false && federatedSchema) {
+ // We haven't configured this app to use Engine directly. But it looks like
+ // we are a federated service backend, so we should be capable of including
+ // our trace in a response extension if we are asked to by the gateway.
+ const { federatedPlugin } = require('apollo-engine-reporting');
+ const rewriteError =
+ engine && typeof engine === 'object' ? engine.rewriteError : undefined;
+ pluginsToInit.push(federatedPlugin({ rewriteError }));
+ }
+
+ pluginsToInit.push(...plugins);
+
+ this.plugins = pluginsToInit.map(plugin => {
if (typeof plugin === 'function') {
return plugin();
}
@@ -751,7 +808,12 @@ export class ApolloServerBase {
protected async graphQLServerOptions(
integrationContextArgument?: Record,
): Promise {
- const { schema, documentStore, extensions } = await this.schemaDerivedData;
+ const {
+ schema,
+ schemaHash,
+ documentStore,
+ extensions,
+ } = await this.schemaDerivedData;
let context: Context = this.context ? this.context : {};
@@ -769,6 +831,8 @@ export class ApolloServerBase {
return {
schema,
+ schemaHash,
+ logger: this.logger,
plugins: this.plugins,
documentStore,
extensions,
@@ -789,23 +853,29 @@ export class ApolloServerBase {
}
public async executeOperation(request: GraphQLRequest) {
- let options;
-
- try {
- options = await this.graphQLServerOptions();
- } catch (e) {
- e.message = `Invalid options provided to ApolloServer: ${e.message}`;
- throw new Error(e);
- }
+ const options = await this.graphQLServerOptions();
if (typeof options.context === 'function') {
options.context = (options.context as () => never)();
+ } else if (typeof options.context === 'object') {
+ // FIXME: We currently shallow clone the context for every request,
+ // but that's unlikely to be what people want.
+ // We allow passing in a function for `context` to ApolloServer,
+ // but this only runs once for a batched request (because this is resolved
+ // in ApolloServer#graphQLServerOptions, before runHttpQuery is invoked).
+ // NOTE: THIS IS DUPLICATED IN runHttpQuery.ts' buildRequestContext.
+ options.context = cloneObject(options.context);
}
+
const requestCtx: GraphQLRequestContext = {
+ logger: this.logger,
+ schema: options.schema,
+ schemaHash: options.schemaHash,
request,
context: options.context || Object.create(null),
cache: options.cache!,
+ metrics: {},
response: {
http: {
headers: new Headers(),
@@ -817,8 +887,8 @@ export class ApolloServerBase {
}
}
-function printNodeFileUploadsMessage() {
- console.error(
+function printNodeFileUploadsMessage(logger: Logger) {
+ logger.error(
[
'*****************************************************************',
'* *',
diff --git a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts
index 27af9c3347f..52013e02fe6 100644
--- a/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts
+++ b/packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts
@@ -30,6 +30,52 @@ describe('ApolloServerBase construction', () => {
).not.toThrow();
});
+ it('succeeds when passed a graphVariant in construction', () => {
+ let serverBase;
+ expect(
+ () =>
+ new ApolloServerBase({
+ typeDefs,
+ resolvers,
+ engine: {
+ graphVariant: 'foo',
+ apiKey: 'not:real:key',
+ },
+ }).stop()
+ ).not.toThrow();
+ });
+
+ it('spits out a deprecation warning when passed a schemaTag in construction', () => {
+ const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
+ expect(
+ () =>
+ new ApolloServerBase({
+ typeDefs,
+ resolvers,
+ engine: {
+ schemaTag: 'foo',
+ apiKey: 'not:real:key',
+ },
+ }).stop()
+ ).not.toThrow();
+ expect(spyConsoleWarn).toBeCalled();
+ spyConsoleWarn.mockRestore();
+ });
+
+ it('throws when passed a schemaTag and graphVariant in construction', () => {
+ expect(
+ () =>
+ new ApolloServerBase({
+ schema: buildServiceDefinition([{ typeDefs, resolvers }]).schema,
+ engine: {
+ schemaTag: 'foo',
+ graphVariant: 'heck',
+ apiKey: 'not:real:key',
+ },
+ }),
+ ).toThrow();
+ });
+
it('throws when a GraphQLSchema is not provided to the schema configuration option', () => {
expect(() => {
new ApolloServerBase({
@@ -48,3 +94,50 @@ describe('ApolloServerBase construction', () => {
);
});
});
+
+describe('environment variables', () => {
+ const OLD_ENV = process.env;
+
+ beforeEach(() => {
+ jest.resetModules();
+ process.env = { ...OLD_ENV };
+ delete process.env.ENGINE_API_KEY;
+ delete process.env.APOLLO_KEY;
+ });
+
+ afterEach(() => {
+ process.env = OLD_ENV;
+ });
+
+ it('constructs a reporting agent with the ENGINE_API_KEY (deprecated) environment variable and warns', async () => {
+ // set the variables
+ process.env.ENGINE_API_KEY = 'just:fake:stuff';
+ const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
+
+ const server = new ApolloServerBase({
+ typeDefs,
+ resolvers
+ });
+
+ await server.stop();
+ expect(spyConsoleWarn).toHaveBeenCalledTimes(1);
+ spyConsoleWarn.mockReset();
+ });
+
+ it('warns with both the legacy env var and new env var set', async () => {
+ // set the variables
+ process.env.ENGINE_API_KEY = 'just:fake:stuff';
+ process.env.APOLLO_KEY = 'also:fake:stuff';
+ const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
+
+ const server = new ApolloServerBase({
+ typeDefs,
+ resolvers
+ });
+
+ await server.stop();
+ // Once for deprecation, once for double-set
+ expect(spyConsoleWarn).toHaveBeenCalledTimes(2);
+ spyConsoleWarn.mockReset();
+ });
+});
diff --git a/packages/apollo-server-core/src/__tests__/logger.test.ts b/packages/apollo-server-core/src/__tests__/logger.test.ts
new file mode 100644
index 00000000000..a4a34b45b30
--- /dev/null
+++ b/packages/apollo-server-core/src/__tests__/logger.test.ts
@@ -0,0 +1,137 @@
+import { ApolloServerBase } from '../..';
+import { Logger } from "apollo-server-types";
+import { PassThrough } from "stream";
+import gql from "graphql-tag";
+
+import * as winston from "winston";
+import WinstonTransport from 'winston-transport';
+import * as bunyan from "bunyan";
+import * as loglevel from "loglevel";
+// We are testing an older version of `log4js` which uses older ECMAScript
+// in order to still support testing on Node.js 6.
+// This should be updated when bump the semver major for AS3.
+import * as log4js from "log4js";
+
+const LOWEST_LOG_LEVEL = "debug";
+
+const KNOWN_DEBUG_MESSAGE = "The request has started.";
+
+async function triggerLogMessage(loggerToUse: Logger) {
+ await (new ApolloServerBase({
+ typeDefs: gql`
+ type Query {
+ field: String!
+ }
+ `,
+ logger: loggerToUse,
+ plugins: [
+ {
+ requestDidStart({ logger }) {
+ logger.debug(KNOWN_DEBUG_MESSAGE);
+ }
+ }
+ ]
+ })).executeOperation({
+ query: '{ field }'
+ });
+}
+
+describe("logger", () => {
+ it("works with 'winston'", async () => {
+ const sink = jest.fn();
+ const transport = new class extends WinstonTransport {
+ constructor() {
+ super({
+ format: winston.format.json(),
+ });
+ }
+
+ log(info: any) {
+ sink(info);
+ }
+ };
+
+ const logger = winston.createLogger({ level: 'debug' }).add(transport);
+
+ await triggerLogMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: LOWEST_LOG_LEVEL,
+ message: KNOWN_DEBUG_MESSAGE,
+ }));
+ });
+
+ it("works with 'bunyan'", async () => {
+ const sink = jest.fn();
+
+ // Bunyan uses streams for its logging implementations.
+ const writable = new PassThrough();
+ writable.on("data", data => sink(JSON.parse(data.toString())));
+
+ const logger = bunyan.createLogger({
+ name: "test-logger-bunyan",
+ streams: [{
+ level: LOWEST_LOG_LEVEL,
+ stream: writable,
+ }]
+ });
+
+ await triggerLogMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: bunyan.DEBUG,
+ msg: KNOWN_DEBUG_MESSAGE,
+ }));
+ });
+
+ it("works with 'loglevel'", async () => {
+ const sink = jest.fn();
+
+ const logger = loglevel.getLogger("test-logger-loglevel")
+ logger.methodFactory = (_methodName, level): loglevel.LoggingMethod =>
+ (message) => sink({ level, message });
+
+ // The `setLevel` method must be called after overwriting `methodFactory`.
+ // This is an intentional API design pattern of the loglevel package:
+ // https://www.npmjs.com/package/loglevel#writing-plugins
+ logger.setLevel(loglevel.levels.DEBUG);
+
+ await triggerLogMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith({
+ level: loglevel.levels.DEBUG,
+ message: KNOWN_DEBUG_MESSAGE,
+ });
+ });
+
+ it("works with 'log4js'", async () => {
+ const sink = jest.fn();
+
+ log4js.configure({
+ appenders: {
+ custom: {
+ type: {
+ configure: () =>
+ (loggingEvent: log4js.LoggingEvent) => sink(loggingEvent)
+ }
+ }
+ },
+ categories: {
+ default: {
+ appenders: ['custom'],
+ level: LOWEST_LOG_LEVEL,
+ }
+ }
+ });
+
+ const logger = log4js.getLogger();
+ logger.level = LOWEST_LOG_LEVEL;
+
+ await triggerLogMessage(logger);
+
+ expect(sink).toHaveBeenCalledWith(expect.objectContaining({
+ level: log4js.levels.DEBUG,
+ data: [KNOWN_DEBUG_MESSAGE],
+ }));
+ });
+});
diff --git a/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts b/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts
index 758e38c154f..e383dfbc334 100644
--- a/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts
+++ b/packages/apollo-server-core/src/__tests__/runHttpQuery.test.ts
@@ -78,7 +78,7 @@ describe('runHttpQuery', () => {
}
});
- it('should not add no-cache headers if error is not a PersitedQuery error', () => {
+ it('should not add no-cache headers if error is not a PersistedQuery error', () => {
try {
throwHttpGraphQLError(200, [new ForbiddenError('401')]);
} catch (err) {
diff --git a/packages/apollo-server-core/src/__tests__/runQuery.test.ts b/packages/apollo-server-core/src/__tests__/runQuery.test.ts
index d4f4640ca2c..ec6d83477dc 100644
--- a/packages/apollo-server-core/src/__tests__/runQuery.test.ts
+++ b/packages/apollo-server-core/src/__tests__/runQuery.test.ts
@@ -19,16 +19,29 @@ import {
import { processGraphQLRequest, GraphQLRequest } from '../requestPipeline';
import { Request } from 'apollo-server-env';
import { GraphQLOptions, Context as GraphQLContext } from 'apollo-server-core';
-import { ApolloServerPlugin } from 'apollo-server-plugin-base';
-import { GraphQLRequestListener } from 'apollo-server-plugin-base';
+import {
+ ApolloServerPlugin,
+ GraphQLRequestExecutionListener,
+ GraphQLRequestListener,
+ GraphQLRequestListenerDidResolveField,
+ GraphQLRequestListenerExecutionDidEnd,
+ GraphQLRequestListenerParsingDidEnd,
+ GraphQLRequestListenerValidationDidEnd,
+ GraphQLRequestContext,
+} from 'apollo-server-plugin-base';
import { InMemoryLRUCache } from 'apollo-server-caching';
+import { generateSchemaHash } from "../utils/schemaHash";
+import { Logger } from "apollo-server-types";
// This is a temporary kludge to ensure we preserve runQuery behavior with the
// GraphQLRequestProcessor refactoring.
// These tests will be rewritten as GraphQLRequestProcessor tests after the
// refactoring is complete.
-function runQuery(options: QueryOptions): Promise {
+function runQuery(
+ options: QueryOptions,
+ requestContextExtra?: Partial,
+): Promise {
const request: GraphQLRequest = {
query: options.queryString,
operationName: options.operationName,
@@ -37,11 +50,18 @@ function runQuery(options: QueryOptions): Promise {
http: options.request,
};
+ const schemaHash = generateSchemaHash(schema);
+
return processGraphQLRequest(options, {
request,
+ schema: options.schema,
+ schemaHash,
+ metrics: {},
+ logger: console,
context: options.context || {},
debug: options.debug,
cache: {} as any,
+ ...requestContextExtra,
});
}
@@ -380,6 +400,88 @@ describe('runQuery', () => {
}
}
+ describe('deprecation warnings', () => {
+ const queryString = `{ testString }`;
+ async function runWithExtAndReturnLogger(
+ extensions: QueryOptions['extensions'],
+ ): Promise {
+ const logger = {
+ warn: jest.fn(() => {}),
+ info: console.info,
+ debug: console.debug,
+ error: console.error,
+ };
+
+ await runQuery(
+ {
+ schema,
+ queryString,
+ extensions,
+ request: new MockReq(),
+ },
+ {
+ logger,
+ },
+ );
+
+ return logger;
+ }
+
+ it('warns about named extensions', async () => {
+ const logger = await runWithExtAndReturnLogger([
+ () => new (class NamedExtension implements GraphQLExtension {})(),
+ ]);
+ expect(logger.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "NamedExtension" was/));
+ });
+
+ it('warns about anonymous extensions', async () => {
+ const logger = await runWithExtAndReturnLogger([
+ () => new (class implements GraphQLExtension {})(),
+ ]);
+ expect(logger.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] An anonymous extension was/));
+ });
+
+ it('warns about anonymous class expressions', async () => {
+ // In other words, when the name is the name of the variable.
+ const anon = class implements GraphQLExtension {};
+ const logger = await runWithExtAndReturnLogger([
+ () => new anon(),
+ ]);
+ expect(logger.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "anon" was/));
+ });
+
+ it('warns for multiple extensions', async () => {
+ const logger = await runWithExtAndReturnLogger([
+ () => new (class Name1Ext implements GraphQLExtension {})(),
+ () => new (class Name2Ext implements GraphQLExtension {})(),
+ ]);
+ expect(logger.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "Name1Ext" was/));
+ expect(logger.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "Name2Ext" was/));
+ });
+
+ it('warns only once', async () => {
+ // Will use the same extension across two invocations.
+ class NameExt implements GraphQLExtension {};
+
+ const logger1 = await runWithExtAndReturnLogger([
+ () => new NameExt,
+ ]);
+ expect(logger1.warn).toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "NameExt" was/));
+
+ const logger2 = await runWithExtAndReturnLogger([
+ () => new NameExt,
+ ]);
+ expect(logger2.warn).not.toHaveBeenCalledWith(
+ expect.stringMatching(/^\[deprecated\] A "NameExt" was/));
+ });
+ });
+
it('creates the extension stack', async () => {
const queryString = `{ testString }`;
const extensions = [() => new CustomExtension()];
@@ -469,6 +571,57 @@ describe('runQuery', () => {
await runOnce();
expect(requestDidStart.mock.calls.length).toBe(2);
});
+
+ it('is called with the schema and schemaHash', async () => {
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart,
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ const invocation = requestDidStart.mock.calls[0][0];
+ expect(invocation).toHaveProperty('schema', schema);
+ expect(invocation).toHaveProperty( /* Shorter as a RegExp */
+ 'schemaHash', expect.stringMatching(/^8ff87f3e0/));
+ });
+ });
+
+ /**
+ * This tests the simple invocation of the "didResolveSource" hook, but
+ * doesn't test one of the primary reasons why "source" isn't guaranteed
+ * sooner in the request life-cycle: when "source" is populated via an APQ
+ * cache HIT.
+ *
+ * That functionality is tested in `apollo-server-integration-testsuite`,
+ * within the "Persisted Queries" tests. (Search for "didResolveSource").
+ */
+ describe('didResolveSource', () => {
+ const didResolveSource = jest.fn();
+ it('called with the source', async () => {
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ didResolveSource,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(didResolveSource).toHaveBeenCalled();
+ expect(didResolveSource.mock.calls[0][0])
+ .toHaveProperty('source', '{ testString }');
+ });
});
describe('parsingDidStart', () => {
@@ -512,6 +665,407 @@ describe('runQuery', () => {
});
});
+ describe('executionDidStart', () => {
+ it('called when execution starts', async () => {
+ const executionDidStart = jest.fn();
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ });
+
+ describe('executionDidEnd', () => {
+ it('works as a function returned from "executionDidStart"', async () => {
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestListenerExecutionDidEnd => executionDidEnd);
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ it('works as a listener on an object returned from "executionDidStart"',
+ async () => {
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => ({
+ executionDidEnd,
+ }),
+ );
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ }
+ );
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ });
+
+ describe('willResolveField', () => {
+ it('called when resolving a field starts', async () => {
+ const willResolveField = jest.fn();
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => ({
+ willResolveField,
+ executionDidEnd,
+ }),
+ );
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ it('called once for each field being resolved', async () => {
+ const willResolveField = jest.fn();
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => ({
+ willResolveField,
+ executionDidEnd,
+ }),
+ );
+
+ await runQuery({
+ schema,
+ queryString: '{ testString again:testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(willResolveField).toHaveBeenCalledTimes(2);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ describe('receives correct resolver parameter object', () => {
+ it('receives undefined parent when there is no parent', async () => {
+ const willResolveField = jest.fn();
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart: () => ({
+ willResolveField,
+ }),
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ // It is called only once.
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ const call = willResolveField.mock.calls[0];
+ expect(call[0]).toHaveProperty("source", undefined);
+ expect(call[0]).toHaveProperty("info.path.key", "testString");
+ expect(call[0]).toHaveProperty("info.path.prev", undefined);
+ });
+
+ it('receives the parent when there is one', async () => {
+ const willResolveField = jest.fn();
+
+ await runQuery({
+ schema,
+ queryString: '{ testObject { testString } }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart: () => ({
+ willResolveField,
+ }),
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ // It is called 1st for `testObject` and then 2nd for `testString`.
+ expect(willResolveField).toHaveBeenCalledTimes(2);
+ const [firstCall, secondCall] = willResolveField.mock.calls;
+ expect(firstCall[0]).toHaveProperty("source", undefined);
+ expect(firstCall[0]).toHaveProperty("info.path.key", "testObject");
+ expect(firstCall[0]).toHaveProperty("info.path.prev", undefined);
+
+ expect(secondCall[0]).toHaveProperty('source', {
+ testString: 'a very test string',
+ });
+ expect(secondCall[0]).toHaveProperty("info.path.key", "testString");
+ expect(secondCall[0]).toHaveProperty('info.path.prev', {
+ key: 'testObject',
+ prev: undefined,
+ });
+ });
+
+ it('receives context', async () => {
+ const willResolveField = jest.fn();
+
+ await runQuery({
+ schema,
+ context: { ourSpecialContext: true },
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart: () => ({
+ willResolveField,
+ }),
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(willResolveField.mock.calls[0][0]).toHaveProperty("context",
+ expect.objectContaining({ ourSpecialContext: true }),
+ );
+ });
+
+ it('receives arguments', async () => {
+ const willResolveField = jest.fn();
+
+ await runQuery({
+ schema,
+ queryString: '{ testArgumentValue(base: 99) }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart: () => ({
+ willResolveField,
+ }),
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(willResolveField.mock.calls[0][0])
+ .toHaveProperty("args.base", 99);
+ });
+ });
+
+ it('calls the end handler', async () => {
+ const didResolveField: GraphQLRequestListenerDidResolveField =
+ jest.fn();
+ const willResolveField = jest.fn(() => didResolveField);
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => ({
+ willResolveField,
+ executionDidEnd,
+ }),
+ );
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(didResolveField).toHaveBeenCalledTimes(1);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ it('calls the end handler for each field being resolved', async () => {
+ const didResolveField: GraphQLRequestListenerDidResolveField =
+ jest.fn();
+ const willResolveField = jest.fn(() => didResolveField);
+ const executionDidEnd = jest.fn();
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => ({
+ willResolveField,
+ executionDidEnd,
+ }),
+ );
+
+ await runQuery({
+ schema,
+ queryString: '{ testString again: testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(willResolveField).toHaveBeenCalledTimes(2);
+ expect(didResolveField).toHaveBeenCalledTimes(2);
+ expect(executionDidEnd).toHaveBeenCalledTimes(1);
+ });
+
+ it('uses the custom "fieldResolver" when defined', async () => {
+ const schemaWithResolver = new GraphQLSchema({
+ query: new GraphQLObjectType({
+ name: 'QueryType',
+ fields: {
+ testString: {
+ type: GraphQLString,
+ resolve() {
+ return "using schema-defined resolver";
+ },
+ },
+ }
+ })
+ });
+
+ const schemaWithoutResolver = new GraphQLSchema({
+ query: new GraphQLObjectType({
+ name: 'QueryType',
+ fields: {
+ testString: {
+ type: GraphQLString,
+ },
+ }
+ })
+ });
+
+ const differentFieldResolver = () => "I'm diffrnt, ya, I'm diffrnt.";
+
+ const queryString = `{ testString } `;
+
+ const didResolveField: GraphQLRequestListenerDidResolveField =
+ jest.fn();
+ const willResolveField = jest.fn(() => didResolveField);
+
+ const plugins: ApolloServerPlugin[] = [
+ {
+ requestDidStart: () => ({
+ executionDidStart: () => ({
+ willResolveField,
+ }),
+ })
+ },
+ ];
+
+ const resultFromSchemaWithResolver = await runQuery({
+ schema: schemaWithResolver,
+ queryString,
+ plugins,
+ request: new MockReq(),
+ fieldResolver: differentFieldResolver,
+ });
+
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(didResolveField).toHaveBeenCalledTimes(1);
+
+ expect(resultFromSchemaWithResolver.data).toEqual({
+ testString: "using schema-defined resolver"
+ });
+
+ const resultFromSchemaWithoutResolver = await runQuery({
+ schema: schemaWithoutResolver,
+ queryString,
+ plugins,
+ request: new MockReq(),
+ fieldResolver: differentFieldResolver,
+ });
+
+ expect(willResolveField).toHaveBeenCalledTimes(2);
+ expect(didResolveField).toHaveBeenCalledTimes(2);
+
+ expect(resultFromSchemaWithoutResolver.data).toEqual({
+ testString: "I'm diffrnt, ya, I'm diffrnt."
+ });
+ });
+ });
+ });
+
+
describe('didEncounterErrors', () => {
const didEncounterErrors = jest.fn();
const plugins: ApolloServerPlugin[] = [
@@ -569,6 +1123,109 @@ describe('runQuery', () => {
expect(didEncounterErrors).not.toBeCalled();
});
});
+
+ describe("ordering", () => {
+ it('calls hooks in the expected order', async () => {
+ const callOrder: string[] = [];
+ let stopAwaiting: Function;
+ const toBeAwaited = new Promise(resolve => stopAwaiting = resolve);
+
+ const parsingDidEnd: GraphQLRequestListenerParsingDidEnd =
+ jest.fn(() => callOrder.push('parsingDidEnd'));
+ const parsingDidStart: GraphQLRequestListener['parsingDidStart'] =
+ jest.fn(() => {
+ callOrder.push('parsingDidStart');
+ return parsingDidEnd;
+ });
+
+ const validationDidEnd: GraphQLRequestListenerValidationDidEnd =
+ jest.fn(() => callOrder.push('validationDidEnd'));
+ const validationDidStart: GraphQLRequestListener['validationDidStart'] =
+ jest.fn(() => {
+ callOrder.push('validationDidStart');
+ return validationDidEnd;
+ });
+
+ const didResolveSource: GraphQLRequestListener['didResolveSource'] =
+ jest.fn(() => { callOrder.push('didResolveSource') });
+
+ const didResolveField: GraphQLRequestListenerDidResolveField =
+ jest.fn(() => callOrder.push("didResolveField"));
+
+ const willResolveField = jest.fn(() => {
+ callOrder.push("willResolveField");
+ return didResolveField;
+ });
+
+ const executionDidEnd: GraphQLRequestListenerExecutionDidEnd =
+ jest.fn(() => callOrder.push('executionDidEnd'));
+
+ const executionDidStart = jest.fn(
+ (): GraphQLRequestExecutionListener => {
+ callOrder.push("executionDidStart");
+ return { willResolveField, executionDidEnd };
+ },
+ );
+
+ const schema = new GraphQLSchema({
+ query: new GraphQLObjectType({
+ name: 'QueryType',
+ fields: {
+ testString: {
+ type: GraphQLString,
+ async resolve() {
+ callOrder.push("beforeAwaiting");
+ await toBeAwaited;
+ callOrder.push("afterAwaiting");
+ return "it works";
+ },
+ },
+ }
+ })
+ });
+
+ Promise.resolve().then(() => stopAwaiting());
+
+ await runQuery({
+ schema,
+ queryString: '{ testString }',
+ plugins: [
+ {
+ requestDidStart() {
+ return {
+ parsingDidStart,
+ validationDidStart,
+ didResolveSource,
+ executionDidStart,
+ };
+ },
+ },
+ ],
+ request: new MockReq(),
+ });
+
+ expect(parsingDidStart).toHaveBeenCalledTimes(1);
+ expect(parsingDidEnd).toHaveBeenCalledTimes(1);
+ expect(validationDidStart).toHaveBeenCalledTimes(1);
+ expect(validationDidEnd).toHaveBeenCalledTimes(1);
+ expect(executionDidStart).toHaveBeenCalledTimes(1);
+ expect(willResolveField).toHaveBeenCalledTimes(1);
+ expect(didResolveField).toHaveBeenCalledTimes(1);
+ expect(callOrder).toStrictEqual([
+ "didResolveSource",
+ "parsingDidStart",
+ "parsingDidEnd",
+ "validationDidStart",
+ "validationDidEnd",
+ "executionDidStart",
+ "willResolveField",
+ "beforeAwaiting",
+ "afterAwaiting",
+ "didResolveField",
+ "executionDidEnd",
+ ]);
+ });
+ })
});
describe('parsing and validation cache', () => {
diff --git a/packages/apollo-server-core/src/graphqlOptions.ts b/packages/apollo-server-core/src/graphqlOptions.ts
index b9abdd0f949..b4c6f1a7b86 100644
--- a/packages/apollo-server-core/src/graphqlOptions.ts
+++ b/packages/apollo-server-core/src/graphqlOptions.ts
@@ -17,12 +17,15 @@ import {
ValueOrPromise,
GraphQLResponse,
GraphQLRequestContext,
+ Logger,
+ SchemaHash,
} from 'apollo-server-types';
/*
* GraphQLServerOptions
*
* - schema: an executable GraphQL schema used to fulfill requests.
+ * - (optional) logger: a `Logger`-compatible implementation to be used for server-level messages.
* - (optional) formatError: Formatting function applied to all errors before response is sent
* - (optional) rootValue: rootValue passed to GraphQL execution, or a function to resolving the rootValue from the DocumentNode
* - (optional) context: the context passed to GraphQL execution
@@ -40,6 +43,8 @@ export interface GraphQLServerOptions<
TRootValue = any
> {
schema: GraphQLSchema;
+ schemaHash: SchemaHash;
+ logger?: Logger;
formatError?: (error: GraphQLError) => GraphQLFormattedError;
rootValue?: ((parsedQuery: DocumentNode) => TRootValue) | TRootValue;
context?: TContext | (() => never);
diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts
index 786ade95b37..d3588f04e1a 100644
--- a/packages/apollo-server-core/src/requestPipeline.ts
+++ b/packages/apollo-server-core/src/requestPipeline.ts
@@ -7,20 +7,22 @@ import {
ExecutionArgs,
GraphQLError,
GraphQLFormattedError,
+ validate as graphqlValidate,
+ parse as graphqlParse,
+ execute as graphqlExecute,
} from 'graphql';
-import * as graphql from 'graphql';
import {
GraphQLExtension,
GraphQLExtensionStack,
enableGraphQLExtensions,
} from 'graphql-extensions';
import { DataSource } from 'apollo-datasource';
-import { PersistedQueryOptions } from '.';
+import { PersistedQueryOptions } from './graphqlOptions';
import {
- CacheControlExtension,
- CacheControlExtensionOptions,
-} from 'apollo-cache-control';
-import { TracingExtension } from 'apollo-tracing';
+ symbolExecutionDispatcherWillResolveField,
+ enablePluginsForSchemaResolvers,
+ symbolUserFieldResolver,
+} from "./utils/schemaInstrumentation"
import {
ApolloError,
fromGraphQLError,
@@ -43,6 +45,15 @@ import {
import {
ApolloServerPlugin,
GraphQLRequestListener,
+ GraphQLRequestContextDidResolveSource,
+ GraphQLRequestContextExecutionDidStart,
+ GraphQLRequestContextResponseForOperation,
+ GraphQLRequestContextDidResolveOperation,
+ GraphQLRequestContextParsingDidStart,
+ GraphQLRequestContextValidationDidStart,
+ GraphQLRequestContextWillSendResponse,
+ GraphQLRequestContextDidEncounterErrors,
+ GraphQLRequestExecutionListener,
} from 'apollo-server-plugin-base';
import { Dispatcher } from './utils/dispatcher';
@@ -82,9 +93,7 @@ export interface GraphQLRequestPipelineConfig {
dataSources?: () => DataSources;
extensions?: Array<() => GraphQLExtension>;
- tracing?: boolean;
persistedQueries?: PersistedQueryOptions;
- cacheControl?: CacheControlExtensionOptions;
formatError?: (error: GraphQLError) => GraphQLFormattedError;
formatResponse?: (
@@ -104,23 +113,39 @@ export type DataSources = {
type Mutable = { -readonly [P in keyof T]: T[P] };
+/**
+ * We attach this symbol to the constructor of extensions to mark that we've
+ * already warned about the deprecation of the `graphql-extensions` API for that
+ * particular definition.
+ */
+const symbolExtensionDeprecationDone =
+ Symbol("apolloServerExtensionDeprecationDone");
+
export async function processGraphQLRequest(
config: GraphQLRequestPipelineConfig,
requestContext: Mutable>,
): Promise {
- let cacheControlExtension: CacheControlExtension | undefined;
+ // For legacy reasons, this exported method may exist without a `logger` on
+ // the context. We'll need to make sure we account for that, even though
+ // all of our own machinery will certainly set it now.
+ const logger = requestContext.logger || console;
+
+ // If request context's `metrics` already exists, preserve it, but _ensure_ it
+ // exists there and shorthand it for use throughout this function. As of this
+ // comment, the sole known case where `metrics` already exists is when the
+ // `captureTraces` property is present and set to the result of the boolean
+ // `reporting` option on the legacy (V1) server options, here:
+ // https://git.io/Jfmsb. I suspect this disappears when this is the direct
+ // entry into request processing, rather than through, e.g. `runHttpQuery`.
+ const metrics = requestContext.metrics =
+ requestContext.metrics || Object.create(null);
+
const extensionStack = initializeExtensionStack();
(requestContext.context as any)._extensionStack = extensionStack;
const dispatcher = initializeRequestListenerDispatcher();
-
await initializeDataSources();
- const metrics = requestContext.metrics || Object.create(null);
- if (!requestContext.metrics) {
- requestContext.metrics = metrics;
- }
-
const request = requestContext.request;
let { query, extensions } = request;
@@ -135,8 +160,16 @@ export async function processGraphQLRequest
-
- To implement this behavior, we define a `didReceiveResponse` callback and an `ApolloServerPlugin` in our gateway:
-
-```javascript
-const { ApolloServer } = require('apollo-server');
-const { ApolloGateway, RemoteGraphQLDataSource } = require('@apollo/gateway');
-
-class DataSourceWithServerId extends RemoteGraphQLDataSource {
- // highlight-start
- async didReceiveResponse({ response, request, context }) {
- // Parse the Server-Id header and add it to the array on context
- const serverId = response.http.headers.get('Server-Id');
- if (serverId) {
- context.serverIds.push(serverId);
- }
-
- // Return the response, even when unchanged.
- return response;
- }
- // highlight-end
-}
-
-const gateway = new ApolloGateway({
- serviceList: [
- { name: 'products', url: 'http://localhost:4001' }
- // other services
- ],
- // highlight-start
- buildService({ url }) {
- return new DataSourceWithServerId({ url });
- }
- // highlight-end
-});
-
-const server = new ApolloServer({
- gateway,
- subscriptions: false, // Must be disabled with the gateway; see above.
- context() {
- return { serverIds: [] };
- },
- plugins: [
- // highlight-start
- {
- requestDidStart() {
- return {
- willSendResponse({ context, response }) {
- // Append our final result to the outgoing response headers
- response.http.headers.append(
- 'Server-Id',
- context.serverIds.join(',')
- );
- }
- };
- }
- }
- // highlight-end
- ]
-});
-
-server.listen().then(({ url }) => {
- console.log(`🚀 Server ready at ${url}`);
-});
-```
-
-To learn more about `buildService` and `RemoteGraphQLDataSource`, see the [API docs](/api/apollo-gateway/).
-
-## Implementing custom directives
-
-> Note: Apollo Server does not currently support executable directives, however they are supported by the gateway.
-
-The gateway currently provides limited support for custom, service-level directives. To use this feature, there are a few requirements that must be met in order to compose a valid graph:
-
-* Directives can only implement executable locations. Executable directive locations are documented in the [spec](https://graphql.github.io/graphql-spec/June2018/#ExecutableDirectiveLocation).
-> The following locations are considered valid to the gateway: QUERY, MUTATION, SUBSCRIPTION, FIELD, FRAGMENT\_DEFINITION, FRAGMENT\_SPREAD, INLINE\_FRAGMENT
-* Directives must be implemented by *every* service that's part of the graph. It's acceptable for a service to do nothing with a particular directive, but a directive definition must exist within every service's schema.
-* Directive definitions must be identical across all services. A directive definition is identical if its name, arguments and their types, and locations are all the same.
-
-## Managing a federated graph
-
-With Apollo Federation, teams are able to move quickly as they build out their GraphQL services. However, distributed systems introduce complexities that require special tooling and coordination across teams to safely roll out changes. [Apollo Graph Manager](https://engine.apollographql.com) provides solutions to problems like schema change validation, graph update coordination, and metrics collection. For more information on Graph Manager see [Managed federation](https://www.apollographql.com/docs/graph-manager/federation/).
diff --git a/docs/source/federation/introduction.mdx b/docs/source/federation/introduction.mdx
index 74c8e5ae767..396abf77c96 100644
--- a/docs/source/federation/introduction.mdx
+++ b/docs/source/federation/introduction.mdx
@@ -4,6 +4,8 @@ sidebar_title: Overview
description: Implement a single data graph across multiple services
---
+import FederationArchitecture from '../../shared/diagrams/federation-architecture.mdx';
+
To get the most out of GraphQL, your organization should expose a [single data
graph](https://principledgraphql.com/integrity#1-one-graph) that provides a
unified interface for querying all of your backing data sources. This
@@ -22,6 +24,23 @@ implement _only_ the part of your data graph that it should be responsible for.
This way, your organization can represent an enterprise-scale data graph as a
collection of separately maintained GraphQL services.
+## Architecture
+
+An Apollo Federation architecture consists of:
+
+* A collection of **implementing services** that each define a distinct GraphQL schema
+* A **gateway** that composes the distinct schemas into a **federated data graph** and executes queries across the services in the graph
+
+