fix typing and tests

moleculerjs · Dec 3, 2023 · fead976 · fead976
1 parent 9305930
commit fead976
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/tracing/span.d.ts b/src/tracing/span.d.ts
@@ -26,6 +26,12 @@ declare namespace Span {
  time: number;
  elapsed: number;
  }
+
+ export interface SpanServiceInfo {
+ name: string;
+ version?: string | number;
+ fullName?: string;
+ }
 }
 
 declare class Span {
@@ -42,11 +48,7 @@ declare class Span {
  traceID: string;
  parentID: string | null;
 
- service?: {
- name: string;
- version?: string | number;
- fullName?: string;
- };
+ service: Span.SpanServiceInfo;
 
  priority: number;
  sampled: boolean;
@@ -56,7 +58,7 @@ declare class Span {
  finishTime: number | null;
  duration: number | null;
 
- error: Error | null;
+ error: Error | boolean | null;
 
  logs: Span.SpanLogEntry[];
  tags: Record<string, any>;

diff --git a/src/tracing/span.js b/src/tracing/span.js
@@ -22,6 +22,8 @@ function defProp(instance, propName, value, readOnly = false) {
  * @typedef {import("./tracer")} Tracer
  * @typedef {import("./span")} SpanClass
  * @typedef {import("./span").SpanOptions} SpanOptions
+ * @typedef {import("./span").SpanServiceInfo} SpanServiceInfo
+ * @typedef {import("../logger-factory").Logger} Logger
  */
 
 /**
@@ -32,6 +34,17 @@ function defProp(instance, propName, value, readOnly = false) {
  * @implements {SpanClass}
  */
 class Span {
+ /** @type {Tracer} */
+ tracer;
+ /** @type {SpanOptions} */
+ opts;
+ /** @type {Object} */
+ meta;
+ /** @type {Logger} */
+ logger;
+ /** @type {SpanServiceInfo} */
+ service;
+
  /**
  * Creates an instance of Span.
  * @param {Tracer} tracer

diff --git a/test/typescript/tsd/ServiceActions.test-d.ts b/test/typescript/tsd/ServiceActions.test-d.ts
@@ -7,7 +7,7 @@ import {
  ServiceSettingSchema,
 } from "../../../index";
 
-const broker = new ServiceBroker({ logger: false, transporter: "fake" });
+const broker = new ServiceBroker({ logger: false, transporter: "Fake" });
 
 class TestService extends Service {
  constructor(broker: ServiceBroker) {

diff --git a/test/typescript/tsd/ServiceSchema_lifecycles.test-d.ts b/test/typescript/tsd/ServiceSchema_lifecycles.test-d.ts
@@ -1,7 +1,7 @@
 import { expectType } from "tsd";
 import { Service, ServiceBroker, ServiceSchema } from "../../../index";
 
-const broker = new ServiceBroker({ logger: false, transporter: "fake" });
+const broker = new ServiceBroker({ logger: false, transporter: "Fake" });
 
 class TestService1 extends Service {
  constructor(broker: ServiceBroker) {

diff --git a/test/typescript/tsd/ServiceSettings.test-d.ts b/test/typescript/tsd/ServiceSettings.test-d.ts
@@ -7,7 +7,7 @@ import {
 } from "../../../index";
 
 // set up some test globals
-const broker = new ServiceBroker({ logger: false, transporter: "fake" });
+const broker = new ServiceBroker({ logger: false, transporter: "Fake" });
 interface ExtendedSettings extends ServiceSettingSchema {
  foo: string;
 }