Make HintKeyRepository

6 files changed, 84 insertions, 94 deletions

diff --git a/src/content/di.ts b/src/content/di.ts
index cc10c78..9779e19 100644
--- a/src/content/di.ts
+++ b/src/content/di.ts
@@ -17,6 +17,7 @@ import { FollowMasterRepositoryImpl } from "./repositories/FollowMasterRepositor
 import { FollowPresenterImpl } from "./presenters/FollowPresenter";
 import { FollowSlaveClientFactoryImpl } from "./client/FollowSlaveClientFactory";
 import { FollowSlaveRepositoryImpl } from "./repositories/FollowSlaveRepository";
+import { HintKeyRepositoryImpl } from "./repositories/HintKeyRepository";
 import { KeymapRepositoryImpl } from "./repositories/KeymapRepository";
 import { MarkClientImpl } from "./client/MarkClient";
 import { MarkKeyRepositoryImpl } from "./repositories/MarkKeyRepository";
@@ -64,6 +65,9 @@ container.register("FollowSlaveClientFactory", {
 container.register("FollowSlaveRepository", {
   useClass: FollowSlaveRepositoryImpl,
 });
+container.register("HintKeyRepository", {
+  useClass: HintKeyRepositoryImpl,
+});
 container.register("KeymapRepository", { useClass: KeymapRepositoryImpl });
 container.register("MarkClient", { useClass: MarkClientImpl });
 container.register("MarkKeyRepository", { useClass: MarkKeyRepositoryImpl });
diff --git a/src/content/hint-key-producer.ts b/src/content/hint-key-producer.ts
deleted file mode 100644
index a5e2877..0000000
--- a/src/content/hint-key-producer.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export default class HintKeyProducer {
-  private charset: string;
-
-  private counter: number[];
-
-  constructor(charset: string) {
-    if (charset.length === 0) {
-      throw new TypeError("charset is empty");
-    }
-
-    this.charset = charset;
-    this.counter = [];
-  }
-
-  produce(): string {
-    this.increment();
-
-    return this.counter.map((x) => this.charset[x]).join("");
-  }
-
-  private increment(): void {
-    const max = this.charset.length - 1;
-    if (this.counter.every((x) => x === max)) {
-      this.counter = new Array(this.counter.length + 1).fill(0);
-      return;
-    }
-
-    this.counter.reverse();
-    const len = this.charset.length;
-    let num = this.counter.reduce((x, y, index) => x + y * len ** index) + 1;
-    for (let i = 0; i < this.counter.length; ++i) {
-      this.counter[i] = num % len;
-      num = ~~(num / len);
-    }
-    this.counter.reverse();
-  }
-}
diff --git a/src/content/repositories/HintKeyRepository.ts b/src/content/repositories/HintKeyRepository.ts
new file mode 100644
index 0000000..342b003
--- /dev/null
+++ b/src/content/repositories/HintKeyRepository.ts
@@ -0,0 +1,49 @@
+export default interface HintKeyRepository {
+  reset(charset: string): void;
+
+  produce(): string;
+}
+
+const current: {
+  charset: string;
+  counter: number[];
+} = {
+  charset: "",
+  counter: [],
+};
+
+export class HintKeyRepositoryImpl implements HintKeyRepository {
+  reset(charset: string): void {
+    if (charset.length === 0) {
+      throw new TypeError("charset is empty");
+    }
+    current.charset = charset;
+    current.counter = [];
+  }
+
+  produce(): string {
+    if (current.charset === "") {
+      throw new Error("charset is not set");
+    }
+    this.increment();
+
+    return current.counter.map((x) => current.charset[x]).join("");
+  }
+
+  private increment(): void {
+    const max = current.charset.length - 1;
+    if (current.counter.every((x) => x === max)) {
+      current.counter = new Array(current.counter.length + 1).fill(0);
+      return;
+    }
+
+    current.counter.reverse();
+    const len = current.charset.length;
+    let num = current.counter.reduce((x, y, index) => x + y * len ** index) + 1;
+    for (let i = 0; i < current.counter.length; ++i) {
+      current.counter[i] = num % len;
+      num = ~~(num / len);
+    }
+    current.counter.reverse();
+  }
+}
diff --git a/src/content/usecases/FollowMasterUseCase.ts b/src/content/usecases/FollowMasterUseCase.ts
index 88c682e..f4705e1 100644
--- a/src/content/usecases/FollowMasterUseCase.ts
+++ b/src/content/usecases/FollowMasterUseCase.ts
@@ -4,13 +4,10 @@ import FollowMasterRepository from "../repositories/FollowMasterRepository";
 import FollowSlaveClient from "../client/FollowSlaveClient";
 import FollowSlaveClientFactory from "../client/FollowSlaveClientFactory";
 import SettingRepository from "../repositories/SettingRepository";
-import HintKeyProducer from "./HintKeyProducer";
+import HintKeyRepository from "../repositories/HintKeyRepository";
 
 @injectable()
 export default class FollowMasterUseCase {
-  // TODO Make repository
-  private producer: HintKeyProducer | null;
-
   constructor(
     @inject("FollowKeyRepository")
     private followKeyRepository: FollowKeyRepository,
@@ -22,14 +19,15 @@ export default class FollowMasterUseCase {
     private settingRepository: SettingRepository,
 
     @inject("FollowSlaveClientFactory")
-    private followSlaveClientFactory: FollowSlaveClientFactory
-  ) {
-    this.producer = null;
-  }
+    private followSlaveClientFactory: FollowSlaveClientFactory,
+
+    @inject("HintKeyRepository")
+    private hintKeyRepository: HintKeyRepository
+  ) {}
 
   startFollow(newTab: boolean, background: boolean): void {
     const hintchars = this.settingRepository.get().properties.hintchars;
-    this.producer = new HintKeyProducer(hintchars);
+    this.hintKeyRepository.reset(hintchars);
 
     this.followKeyRepository.clearKeys();
     this.followMasterRepository.setCurrentFollowMode(newTab, background);
@@ -59,7 +57,7 @@ export default class FollowMasterUseCase {
   createSlaveHints(count: number, sender: Window): void {
     const produced = [];
     for (let i = 0; i < count; ++i) {
-      const tag = this.producer!.produce();
+      const tag = this.hintKeyRepository.produce();
       produced.push(tag);
       this.followMasterRepository.addTag(tag);
     }
diff --git a/src/content/usecases/HintKeyProducer.ts b/src/content/usecases/HintKeyProducer.ts
deleted file mode 100644
index a5e2877..0000000
--- a/src/content/usecases/HintKeyProducer.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export default class HintKeyProducer {
-  private charset: string;
-
-  private counter: number[];
-
-  constructor(charset: string) {
-    if (charset.length === 0) {
-      throw new TypeError("charset is empty");
-    }
-
-    this.charset = charset;
-    this.counter = [];
-  }
-
-  produce(): string {
-    this.increment();
-
-    return this.counter.map((x) => this.charset[x]).join("");
-  }
-
-  private increment(): void {
-    const max = this.charset.length - 1;
-    if (this.counter.every((x) => x === max)) {
-      this.counter = new Array(this.counter.length + 1).fill(0);
-      return;
-    }
-
-    this.counter.reverse();
-    const len = this.charset.length;
-    let num = this.counter.reduce((x, y, index) => x + y * len ** index) + 1;
-    for (let i = 0; i < this.counter.length; ++i) {
-      this.counter[i] = num % len;
-      num = ~~(num / len);
-    }
-    this.counter.reverse();
-  }
-}
diff --git a/test/content/usecases/HintKeyProducer.test.ts b/test/content/usecases/HintKeyProducer.test.ts
index f7e02ea..9d320b4 100644
--- a/test/content/usecases/HintKeyProducer.test.ts
+++ b/test/content/usecases/HintKeyProducer.test.ts
@@ -1,13 +1,7 @@
-import HintKeyProducer from "../../../src/content/usecases/HintKeyProducer";
+import { HintKeyRepositoryImpl } from "../../../src/content/repositories/HintKeyRepository";
 import { expect } from "chai";
 
-describe("HintKeyProducer class", () => {
-  describe("#constructor", () => {
-    it("throws an exception on empty charset", () => {
-      expect(() => new HintKeyProducer("")).to.throw(TypeError);
-    });
-  });
-
+describe("HintKeyProducerImpl class", () => {
   describe("#produce", () => {
     it("produce incremented keys", () => {
       const charset = "abc";
@@ -30,10 +24,29 @@ describe("HintKeyProducer class", () => {
         "aba",
       ];
 
-      const producer = new HintKeyProducer(charset);
+      const sut = new HintKeyRepositoryImpl();
+      sut.reset(charset);
       for (let i = 0; i < sequences.length; ++i) {
-        expect(producer.produce()).to.equal(sequences[i]);
+        expect(sut.produce()).to.equal(sequences[i]);
       }
     });
   });
+
+  describe("#reset", () => {
+    it("resets charset", () => {
+      const sut = new HintKeyRepositoryImpl();
+
+      sut.reset("ab");
+      expect(sut.produce()).to.equal("a");
+      expect(sut.produce()).to.equal("b");
+
+      sut.reset("xy");
+      expect(sut.produce()).to.equal("x");
+      expect(sut.produce()).to.equal("y");
+    });
+    it("throws an exception on empty charset", () => {
+      const sut = new HintKeyRepositoryImpl();
+      expect(() => sut.reset("")).to.throw(TypeError);
+    });
+  });
 });