Merge branch 'main' into core/CSMDict

Author: “chae-dahee”

package-lock.json

@@ -73,7 +73,7 @@
     "@octokit/plugin-throttling": "^4.1.0",
     "@octokit/rest": "^19.0.3",
     "@octokit/types": "^13.5.0",
-    "reflect-metadata": "^0.1.13",
-    "tsyringe": "^4.7.0"
+    "inversify": "^7.10.0",
+    "reflect-metadata": "^0.2.2"
   }
 }

packages/analysis-engine/package.json

@@ -0,0 +1,8 @@
+import "reflect-metadata";
+
+import { Container } from "inversify";
+
+import PluginOctokit from "./pluginOctokit";
+
+export const diContainer = new Container();
+diContainer.bind(PluginOctokit).toSelf().inSingletonScope();

packages/analysis-engine/src/container.ts

@@ -0,0 +1,3 @@
+export const DI_IDENTIFIERS = {
+  OctokitOptions: Symbol.for("OctokitOptions"),
+} as const;

packages/analysis-engine/src/diIdentifiers.ts

@@ -1,7 +1,7 @@
 import "reflect-metadata";
 
-import { container } from "tsyringe";
-
+import { diContainer } from "./container";
+import { DI_IDENTIFIERS } from "./diIdentifiers";
 import { buildCommitDict } from "./commit.util";
 import { buildCSMDict, buildPaginatedCSMDict } from "./csm";
 import getCommitRaws from "./parser";
@@ -45,16 +45,12 @@ export class AnalysisEngine {
     this.gitLog = gitLog;
     this.baseBranchName = baseBranchName;
     this.isDebugMode = isDebugMode;
-    container.register("OctokitOptions", {
-      useValue: {
-        owner,
-        repo,
-        options: {
-          auth,
-        },
-      },
+    diContainer.rebindSync(DI_IDENTIFIERS.OctokitOptions).toConstantValue({
+      owner,
+      repo,
+      options: { auth },
     });
-    this.octokit = container.resolve(PluginOctokit);
+    this.octokit = diContainer.get(PluginOctokit);
   };
 
   public init = async () => {
@@ -132,7 +128,6 @@ export class AnalysisEngine {
   };
 
   public updateArgs = (args: AnalysisEngineArgs) => {
-    if (container.isRegistered("OctokitOptions")) container.clearInstances();
     this.insertArgs(args);
     // Clear cached data
     this.commitDict = undefined;

packages/analysis-engine/src/index.ts

@@ -2,19 +2,21 @@ import type { OctokitOptions } from "@octokit/core/dist-types/types";
 import { throttling } from "@octokit/plugin-throttling";
 import type { ThrottlingOptions } from "@octokit/plugin-throttling/dist-types/types";
 import { Octokit, type RestEndpointMethodTypes } from "@octokit/rest";
-import { inject, singleton } from "tsyringe";
+import { inject, injectable } from "inversify";
+
+import { DI_IDENTIFIERS } from "./diIdentifiers";
 
 type PullsListResponseData = RestEndpointMethodTypes["pulls"]["get"]["response"];
 type PullsListCommitsResponseData = RestEndpointMethodTypes["pulls"]["listCommits"]["response"];
 
-@singleton()
+@injectable()
 export class PluginOctokit extends Octokit.plugin(throttling) {
   private owner: string;
 
   private repo: string;
 
   constructor(
-    @inject("OctokitOptions")
+    @inject(DI_IDENTIFIERS.OctokitOptions)
     props: {
       owner: string;
       repo: string;
@@ -55,13 +57,13 @@ export class PluginOctokit extends Octokit.plugin(throttling) {
   private _getPullRequest = async (pullNumber: number) => {
     const { owner, repo } = this;
 
-    const pullRequestDetail:PullsListResponseData = await this.rest.pulls.get({
+    const pullRequestDetail: PullsListResponseData = await this.rest.pulls.get({
       owner,
       repo,
       pull_number: pullNumber,
     });
 
-    const pullRequestCommits:PullsListCommitsResponseData = await this.rest.pulls.listCommits({
+    const pullRequestCommits: PullsListCommitsResponseData = await this.rest.pulls.listCommits({
       owner,
       repo,
       pull_number: pullNumber,
@@ -73,11 +75,12 @@ export class PluginOctokit extends Octokit.plugin(throttling) {
     };
   };
 
-
-  public getPullRequests = async (): Promise<{
-    detail: PullsListResponseData,
-    commitDetails: PullsListCommitsResponseData
-  }[]> => {
+  public getPullRequests = async (): Promise<
+    {
+      detail: PullsListResponseData;
+      commitDetails: PullsListCommitsResponseData;
+    }[]
+  > => {
     const { owner, repo } = this;
 
     const { data } = await this.rest.pulls.list({

packages/analysis-engine/src/pluginOctokit.ts

@@ -76,7 +76,14 @@
     "react/react-in-jsx-scope": "off",
     "react/require-default-props": "off",
     "react/prop-types": "off",
-    "consistent-return": "off"
+    "consistent-return": "off",
+    "no-param-reassign": [
+      "error",
+      {
+        "props": true,
+        "ignorePropertyModificationsFor": ["acc", "accumulator", "state"]
+      }
+    ]
   },
   "settings": {
     "import/resolver": {

packages/view/.eslintrc.json

@@ -101,17 +101,18 @@
     "classnames": "^2.3.2",
     "d3": "^7.6.1",
     "dayjs": "^1.11.5",
+    "immer": "^10.1.3",
+    "inversify": "^7.10.0",
     "jest": "^29.6.4",
     "md5": "^2.3.0",
     "nanoid": "^4.0.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-spinners": "^0.13.8",
     "react-virtualized": "^9.22.5",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.2.2",
     "svg-parser": "^2.0.4",
     "ts-jest": "^29.1.1",
-    "tsyringe": "^4.7.0",
     "zustand": "^4.5.5"
   }
 }