Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,542 changes: 5,375 additions & 167 deletions dist/index.js

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"dependencies": {
"@actions/core": "^3.0.0",
"@actions/github": "^9.0.0",
"inversify": "^7.11.0",
"inversify": "^8.1.0",
"reflect-metadata": "^0.2.2",
"zod": "^4.3.6",
"zod-validation-error": "^5.0.0"
Expand Down
58 changes: 36 additions & 22 deletions src/container.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container } from "inversify";
import { Container, ContainerModule } from "inversify";
import { LoggerService } from "./services/logger.service.js";
import { CORE_SERVICE_IDENTIFIER, coreService, CoreService } from "./services/core.service.js";
import { InputService } from "./services/input.service.js";
Expand All @@ -17,26 +17,40 @@ import { DriveLinkLinterAdapter } from "./linter/adapter/drive-link-linter.adapt
import { CNCFLinkLinterAdapter } from "./linter/adapter/cncf-link-linter.adapter.js";
import { LabelsLinterAdapter } from "./linter/adapter/labels-linter.adapter.js";

const container = new Container();

container.bind<CoreService>(CORE_SERVICE_IDENTIFIER).toConstantValue(coreService);

container.bind(GitHubService).toSelf();
container.bind(InputService).toSelf();
container.bind(LinterService).toSelf();
container.bind(LoggerService).toSelf();
container.bind(MeetupIssueService).toSelf();

// Linters
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(EventDateLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(EventTitleLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(TitleLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(HosterLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(EventDescriptionLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(AgendaLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(MeetupLinkLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(CNCFLinkLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(DriveLinkLinterAdapter);
container.bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(LabelsLinterAdapter);
const linterAdapters = [
EventDateLinterAdapter,
EventTitleLinterAdapter,
TitleLinterAdapter,
HosterLinterAdapter,
EventDescriptionLinterAdapter,
AgendaLinterAdapter,
MeetupLinkLinterAdapter,
CNCFLinkLinterAdapter,
DriveLinkLinterAdapter,
LabelsLinterAdapter,
] as const;

const applicationModule = new ContainerModule(({ bind }) => {
bind<CoreService>(CORE_SERVICE_IDENTIFIER).toConstantValue(coreService);

bind(GitHubService).toSelf();
bind(InputService).toSelf();
bind(LinterService).toSelf();
bind(LoggerService).toSelf();
bind(MeetupIssueService).toSelf();

for (const linterAdapter of linterAdapters) {
bind<LinterAdapter>(LINTER_ADAPTER_IDENTIFIER).to(linterAdapter);
}
});

export function createContainer(): Container {
const container = new Container();
container.load(applicationModule);

return container;
}

const container = createContainer();

export { container };
11 changes: 4 additions & 7 deletions src/index-runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe("run", () => {
const hosters = getHostersFixture();
const speakers = getSpeakersFixture();

beforeEach(async () => {
beforeEach(() => {
jest.clearAllMocks();

setFailedMock = jest.spyOn(core, "setFailed").mockImplementation();
Expand All @@ -45,12 +45,9 @@ describe("run", () => {

container.snapshot();

await container.unbind(InputService);
container.bind(InputService).toConstantValue(inputServiceMock);
await container.unbind(CORE_SERVICE_IDENTIFIER);
container.bind<CoreService>(CORE_SERVICE_IDENTIFIER).toConstantValue(coreServiceMock);
await container.unbind(GitHubService);
container.bind<GitHubService>(GitHubService).toConstantValue(githubServiceMock);
container.rebind(InputService).toConstantValue(inputServiceMock);
container.rebind<CoreService>(CORE_SERVICE_IDENTIFIER).toConstantValue(coreServiceMock);
container.rebind<GitHubService>(GitHubService).toConstantValue(githubServiceMock);

inputServiceMock.getIssueNumber.mockReturnValue(1);
inputServiceMock.getShouldFix.mockReturnValue(true);
Expand Down
11 changes: 4 additions & 7 deletions src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe("index", () => {
let coreServiceMock: MockProxy<CoreService>;
let githubServiceMock: MockProxy<GitHubService>;

beforeEach(async () => {
beforeEach(() => {
jest.clearAllMocks();

setFailedMock = jest.spyOn(core, "setFailed").mockImplementation();
Expand All @@ -41,12 +41,9 @@ describe("index", () => {

container.snapshot();

await container.unbind(InputService);
container.bind(InputService).toConstantValue(inputServiceMock);
await container.unbind(CORE_SERVICE_IDENTIFIER);
container.bind(CORE_SERVICE_IDENTIFIER).toConstantValue(coreServiceMock);
await container.unbind(GitHubService);
container.bind(GitHubService).toConstantValue(githubServiceMock);
container.rebind(InputService).toConstantValue(inputServiceMock);
container.rebind(CORE_SERVICE_IDENTIFIER).toConstantValue(coreServiceMock);
container.rebind(GitHubService).toConstantValue(githubServiceMock);
});

afterEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/linter/linter.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { inject, injectable, multiInject } from "inversify";
import { injectable, multiInject } from "inversify";
import { LINTER_ADAPTER_IDENTIFIER, LinterAdapter } from "./adapter/linter.adapter.js";
import { MeetupIssue, MeetupIssueService } from "../services/meetup-issue.service.js";
import { LintError } from "./lint.error.js";
Expand All @@ -13,7 +13,7 @@ type LintResult = {
export class LinterService {
constructor(
@multiInject(LINTER_ADAPTER_IDENTIFIER) private readonly linters: LinterAdapter[],
@inject(MeetupIssueService) private readonly meetupIssueService: MeetupIssueService
private readonly meetupIssueService: MeetupIssueService
) {}

async lint(meetupIssue: MeetupIssue, shouldFix: boolean): Promise<void> {
Expand Down
4 changes: 2 additions & 2 deletions src/services/github.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { context, getOctokit } from "@actions/github";
import { GitHub } from "@actions/github/lib/utils";
import { inject, injectable } from "inversify";
import { injectable } from "inversify";

import { InputService } from "./input.service.js";

Expand All @@ -25,7 +25,7 @@ export const UpdatableGithubIssueFields = Object.keys({
export class GitHubService {
private octokit: Octokit | undefined;

constructor(@inject(InputService) private readonly inputService: InputService) {}
constructor(private readonly inputService: InputService) {}

async getIssue(issueNumber: number): Promise<GithubIssue> {
const { data: issue } = await this.getOctokit().rest.issues.get({
Expand Down
4 changes: 2 additions & 2 deletions src/services/meetup-issue.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { inject, injectable } from "inversify";
import { injectable } from "inversify";
import {
GitHubService,
UpdatableGithubIssue,
Expand Down Expand Up @@ -39,7 +39,7 @@ export const MEETUP_ISSUE_BODY_FIELD_LABELS: Record<MeetupIssueBodyFields, strin

@injectable()
export class MeetupIssueService {
constructor(@inject(GitHubService) private readonly githubService: GitHubService) {}
constructor(private readonly githubService: GitHubService) {}

async getMeetupIssue(
issueNumber: number,
Expand Down
Loading