refactor: better type for 'constructor', 'create' and 'call' of AppCo…

…ntext
gravity-ui · Apr 3, 2023 · 9a1bcd4 · 9a1bcd4
1 parent e804097
commit 9a1bcd4
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/src/lib/context.ts b/src/lib/context.ts
@@ -7,18 +7,28 @@ import {AppError} from './app-error';
 import {extractErrorInfo} from './error-parser';
 import {IncomingHttpHeaders} from 'http';
 
-interface ContextParams {
+type ContextParams = ContextInitialParams | ContextParentParams;
+
+interface ContextInitialParams {
     contextId?: string;
-    config?: AppConfig;
-    logger?: pino.Logger;
-    tracer?: JaegerTracer;
-    parentContext?: AppContext;
+    config: AppConfig;
+    logger: pino.Logger;
+    tracer: JaegerTracer;
     parentSpanContext?: SpanContext;
-    utils?: NodeKit['utils'];
+    utils: NodeKit['utils'];
     loggerPostfix?: string;
     tags?: Dict;
 }
 
+interface ContextParentParams
+    extends Pick<ContextInitialParams, 'parentSpanContext' | 'loggerPostfix' | 'tags'> {
+    parentContext: AppContext;
+}
+
+function isContextParentParams(v: ContextParams): v is ContextParentParams {
+    return Boolean((v as ContextParentParams).parentContext);
+}
+
 type ContextCallbackFunction<T> = (ctx: AppContext) => T;
 
 export class AppContext {
@@ -40,7 +50,7 @@ export class AppContext {
         this.name = name;
         this.startTime = Date.now();
 
-        if (params.parentContext) {
+        if (isContextParentParams(params)) {
             this.config = params.parentContext.config;
             this.logger = params.parentContext.logger;
             this.tracer = params.parentContext.tracer;
@@ -102,20 +112,24 @@ export class AppContext {
         );
     }
 
-    create(name: string, params?: ContextParams) {
+    create(name: string, params?: Omit<ContextParentParams, 'parentContext'>) {
         return new AppContext(name, {parentContext: this, ...params});
     }
 
-    call<T>(name: string, fn: ContextCallbackFunction<T>, params?: ContextParams): T;
+    call<T>(
+        name: string,
+        fn: ContextCallbackFunction<T>,
+        params?: Omit<ContextParentParams, 'parentContext'>,
+    ): T;
     call<T>(
         name: string,
         fn: ContextCallbackFunction<Promise<T>>,
-        params?: ContextParams,
+        params?: Omit<ContextParentParams, 'parentContext'>,
     ): Promise<T>;
     call<T>(
         name: string,
         fn: ContextCallbackFunction<T | Promise<T>>,
-        params?: ContextParams,
+        params?: Omit<ContextParentParams, 'parentContext'>,
     ): T | Promise<T> {
         const ctx = this.create(name, params);