From 714e6c1beba0d9cb8aa2912d593881f53ac3061e Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Sun, 15 Jan 2023 17:44:43 +0200 Subject: [PATCH] ci: fix lint (#1355) --- metapackages/auto-instrumentations-node/src/utils.ts | 2 +- metapackages/auto-instrumentations-web/src/utils.ts | 2 +- .../node/instrumentation-dataloader/src/instrumentation.ts | 4 ++-- plugins/node/instrumentation-fs/src/types.ts | 2 +- .../src/internal-types.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts index dfb7a511a4..6e8e6ecfae 100644 --- a/metapackages/auto-instrumentations-node/src/utils.ts +++ b/metapackages/auto-instrumentations-node/src/utils.ts @@ -98,7 +98,7 @@ const InstrumentationMap = { type ConfigArg = T extends new (...args: infer U) => unknown ? U[0] : never; export type InstrumentationConfigMap = { [Name in keyof typeof InstrumentationMap]?: ConfigArg< - typeof InstrumentationMap[Name] + (typeof InstrumentationMap)[Name] >; }; diff --git a/metapackages/auto-instrumentations-web/src/utils.ts b/metapackages/auto-instrumentations-web/src/utils.ts index ed0a4d98ec..b033b020f1 100644 --- a/metapackages/auto-instrumentations-web/src/utils.ts +++ b/metapackages/auto-instrumentations-web/src/utils.ts @@ -34,7 +34,7 @@ const InstrumentationMap = { type ConfigArg = T extends new (...args: infer U) => unknown ? U[0] : never; export type InstrumentationConfigMap = { [Name in keyof typeof InstrumentationMap]?: ConfigArg< - typeof InstrumentationMap[Name] + (typeof InstrumentationMap)[Name] >; }; diff --git a/plugins/node/instrumentation-dataloader/src/instrumentation.ts b/plugins/node/instrumentation-dataloader/src/instrumentation.ts index 7103e3e641..a7acddf805 100644 --- a/plugins/node/instrumentation-dataloader/src/instrumentation.ts +++ b/plugins/node/instrumentation-dataloader/src/instrumentation.ts @@ -38,8 +38,8 @@ type DataloaderInternal = typeof Dataloader.prototype & { _batch: { spanLinks?: Link[] } | null; }; -type LoadFn = typeof Dataloader.prototype['load']; -type LoadManyFn = typeof Dataloader.prototype['loadMany']; +type LoadFn = (typeof Dataloader.prototype)['load']; +type LoadManyFn = (typeof Dataloader.prototype)['loadMany']; export class DataloaderInstrumentation extends InstrumentationBase { constructor(config: DataloaderInstrumentationConfig = {}) { diff --git a/plugins/node/instrumentation-fs/src/types.ts b/plugins/node/instrumentation-fs/src/types.ts index d531cae43c..b68ac5f2db 100644 --- a/plugins/node/instrumentation-fs/src/types.ts +++ b/plugins/node/instrumentation-fs/src/types.ts @@ -24,7 +24,7 @@ export type FunctionPropertyNames = { export type FunctionProperties = Pick>; export type FMember = FunctionPropertyNames; -export type FPMember = FunctionPropertyNames; +export type FPMember = FunctionPropertyNames<(typeof fs)['promises']>; export type CreateHook = ( functionName: FMember | FPMember, diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts index 4fb6b5858d..3242ea94e4 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts @@ -18,8 +18,8 @@ import { InstrumentationConfig } from '@opentelemetry/instrumentation'; import type * as graphqlTypes from 'graphql'; import type * as api from '@opentelemetry/api'; import type { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue'; -import { DocumentNode } from 'graphql/language/ast'; -import { +import type { DocumentNode } from 'graphql/language/ast'; +import type { GraphQLFieldResolver, GraphQLTypeResolver, } from 'graphql/type/definition';