Skip to content

Commit cbeb0d0

Browse files
committed
fix typing issues
1 parent c64707c commit cbeb0d0

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

template/services/greeter.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { Context, Service, ServiceSchema } from "moleculer";
1+
import type { Context, Service, ServiceSchema, ServiceSettingSchema } from "moleculer";
22

33
export interface ActionHelloParams {
44
name: string;
55
}
66

7-
interface GreeterSettings {
7+
interface GreeterSettings extends ServiceSettingSchema {
88
defaultName: string;
99
}
1010

template/test/integration/products.service.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { afterAll, beforeAll, describe, expect, test } from "@jest/globals";
22
import { ServiceBroker } from "moleculer";
3+
import type { ServiceSchema } from "moleculer";
34
import type { ProductEntity } from "../../services/products.service";
45
import TestService from "../../services/products.service";
56

67
describe("Test 'products' service", () => {
78
describe("Test actions", () => {
89
const broker = new ServiceBroker({ logger: false });
9-
const service = broker.createService(TestService);
10+
const service = broker.createService(TestService as unknown as ServiceSchema);
1011
service.seedDB = null; // Disable seeding
1112

1213
beforeAll(() => broker.start());

template/test/unit/mixins/db.mixin.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Context, ServiceBroker } from "moleculer";
2-
import type { ServiceEventHandler, StartedStoppedHandler } from "moleculer";
2+
import type { Service, ServiceAsyncLifecycleHandler, ServiceEventHandler } from "moleculer";
33
import DbService from "moleculer-db";
44
import DbMixin from "../../../mixins/db.mixin";
55

@@ -43,12 +43,12 @@ describe("Test DB mixin", () => {
4343
schema.adapter!.count = jest.fn(() => Promise.resolve(10));
4444
const seedDBFn = jest.fn();
4545

46-
await (schema.started as StartedStoppedHandler).call({
46+
await (schema.started as ServiceAsyncLifecycleHandler).call({
4747
broker,
4848
logger: broker.logger,
4949
adapter: schema.adapter,
5050
seedDB: seedDBFn,
51-
});
51+
} as unknown as Service);
5252

5353
expect(schema.adapter!.count).toHaveBeenCalledTimes(1);
5454
expect(schema.adapter!.count).toHaveBeenCalledWith();
@@ -62,12 +62,12 @@ describe("Test DB mixin", () => {
6262
schema.adapter!.count = jest.fn(() => Promise.resolve(0));
6363
const seedDBFn = jest.fn();
6464

65-
await (schema.started as StartedStoppedHandler).call({
65+
await (schema.started as ServiceAsyncLifecycleHandler).call({
6666
broker,
6767
logger: broker.logger,
6868
adapter: schema.adapter,
6969
seedDB: seedDBFn,
70-
});
70+
} as unknown as Service);
7171

7272
expect(schema.adapter!.count).toHaveBeenCalledTimes(2);
7373
expect(schema.adapter!.count).toHaveBeenCalledWith();

template/test/unit/services/greeter.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { Errors, ServiceBroker } from "moleculer";
2+
import type { ServiceSchema } from "moleculer";
23
import TestService from "../../../services/greeter.service";
34

45
describe("Test 'greeter' service", () => {
56
const broker = new ServiceBroker({ logger: false });
6-
broker.createService(TestService);
7+
broker.createService(TestService as unknown as ServiceSchema);
78

89
beforeAll(() => broker.start());
910
afterAll(() => broker.stop());

template/test/unit/services/products.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { Context, Errors, ServiceBroker } from "moleculer";
2+
import type { ServiceSchema } from "moleculer";
23
import TestService from "../../../services/products.service";
34

45
describe("Test 'products' service", () => {
56
describe("Test actions", () => {
67
const broker = new ServiceBroker({ logger: false });
7-
const service = broker.createService(TestService);
8+
const service = broker.createService(TestService as unknown as ServiceSchema);
89

910
jest.spyOn(service.adapter, "updateById");
1011
jest.spyOn(service, "transformDocuments");
@@ -126,7 +127,7 @@ describe("Test 'products' service", () => {
126127

127128
describe("Test methods", () => {
128129
const broker = new ServiceBroker({ logger: false });
129-
const service = broker.createService(TestService);
130+
const service = broker.createService(TestService as unknown as ServiceSchema);
130131

131132
jest.spyOn(service.adapter, "insertMany");
132133
jest.spyOn(service, "seedDB");
@@ -156,7 +157,7 @@ describe("Test 'products' service", () => {
156157
const createActionFn = jest.fn();
157158
broker.createService({
158159
name: "products",
159-
mixins: [TestService],
160+
mixins: [TestService as unknown as ServiceSchema],
160161
actions: {
161162
create: {
162163
handler: createActionFn,

0 commit comments

Comments
 (0)