From 98c9f9106db7d90e8858a4039ac4bfb9227fb164 Mon Sep 17 00:00:00 2001
From: Tau <tau@nowhere>
Date: Sun, 28 Apr 2019 21:16:27 -0400
Subject: [PATCH] Share AimeId typedef

---
 src/aimedb/db.ts                   | 2 +-
 src/aimedb/repo.ts                 | 2 +-
 src/aimedb/response.ts             | 2 +-
 src/idz/decoder/discoverProfile.ts | 2 +-
 src/idz/decoder/loadProfile.ts     | 2 +-
 src/idz/file/profile.ts            | 3 ++-
 src/idz/model/base.ts              | 1 -
 src/idz/model/index.ts             | 2 +-
 src/idz/repo.ts                    | 5 +++--
 src/idz/request/discoverProfile.ts | 2 +-
 src/idz/request/loadProfile.ts     | 2 +-
 src/{aimedb => }/model.ts          | 0
 12 files changed, 13 insertions(+), 12 deletions(-)
 rename src/{aimedb => }/model.ts (100%)

diff --git a/src/aimedb/db.ts b/src/aimedb/db.ts
index dc5f71b..ae49fa0 100644
--- a/src/aimedb/db.ts
+++ b/src/aimedb/db.ts
@@ -1,9 +1,9 @@
 import { PoolClient } from "pg";
 import * as sql from "sql-bricks";
 
-import { AimeId } from "./model";
 import { CardRepository, Transaction } from "./repo";
 import { connect, generateId, generateExtId } from "../db";
+import { AimeId } from "../model";
 
 class CardRepositoryImpl implements CardRepository {
   constructor(private readonly _conn: PoolClient) {}
diff --git a/src/aimedb/repo.ts b/src/aimedb/repo.ts
index 3fbda1d..8deb52a 100644
--- a/src/aimedb/repo.ts
+++ b/src/aimedb/repo.ts
@@ -1,4 +1,4 @@
-import { AimeId } from "./model";
+import { AimeId } from "../model";
 
 export interface CardRepository {
   lookup(luid: string, now: Date): Promise<AimeId | undefined>;
diff --git a/src/aimedb/response.ts b/src/aimedb/response.ts
index 745df19..c201f98 100644
--- a/src/aimedb/response.ts
+++ b/src/aimedb/response.ts
@@ -1,4 +1,4 @@
-import { AimeId } from "./model";
+import { AimeId } from "../model";
 
 export type RegisterLevel = "none" | "portal" | "segaid";
 
diff --git a/src/idz/decoder/discoverProfile.ts b/src/idz/decoder/discoverProfile.ts
index 511d548..9d5ee2e 100644
--- a/src/idz/decoder/discoverProfile.ts
+++ b/src/idz/decoder/discoverProfile.ts
@@ -1,6 +1,6 @@
 import { RequestCode } from "./_defs";
-import { AimeId } from "../model/base";
 import { DiscoverProfileRequest } from "../request/discoverProfile";
+import { AimeId } from "../../model";
 
 discoverProfile.msgCode = 0x006b as RequestCode;
 discoverProfile.msgLen = 0x0010;
diff --git a/src/idz/decoder/loadProfile.ts b/src/idz/decoder/loadProfile.ts
index 8a4fdc2..69b91be 100644
--- a/src/idz/decoder/loadProfile.ts
+++ b/src/idz/decoder/loadProfile.ts
@@ -1,6 +1,6 @@
 import { RequestCode } from "./_defs";
-import { AimeId } from "../model/base";
 import { LoadProfileRequest } from "../request/loadProfile";
+import { AimeId } from "../../model";
 
 loadProfile.msgCode = 0x0067 as RequestCode;
 loadProfile.msgLen = 0x0020;
diff --git a/src/idz/file/profile.ts b/src/idz/file/profile.ts
index fe64ed9..3f2aa48 100644
--- a/src/idz/file/profile.ts
+++ b/src/idz/file/profile.ts
@@ -3,8 +3,9 @@ import { promisify } from "util";
 
 import { loadJson, saveJson } from "./_util";
 import { ProfileRepository } from "../repo";
-import { AimeId, Id } from "../model/base";
+import { Id } from "../model/base";
 import { Profile } from "../model/profile";
+import { AimeId } from "../../model";
 
 const exists = promisify(fs.exists);
 
diff --git a/src/idz/model/base.ts b/src/idz/model/base.ts
index b6b81c8..567d656 100644
--- a/src/idz/model/base.ts
+++ b/src/idz/model/base.ts
@@ -1,7 +1,6 @@
 // Quasi-nominative "brands". These double-underscore properties never actually
 // exist at run time, we just pretend they do.
 
-export type AimeId = number & { __brand: "aimeId" };
 export type BackgroundCode = number & { __brand: "backgroundCode" };
 export type Id<T> = number & { __id: T };
 export type TitleCode = number & { __brand: "titleCode" };
diff --git a/src/idz/model/index.ts b/src/idz/model/index.ts
index 2dc2be7..802eff4 100644
--- a/src/idz/model/index.ts
+++ b/src/idz/model/index.ts
@@ -1,4 +1,4 @@
-export { AimeId, BackgroundCode, Id, TitleCode } from "./base";
+export { BackgroundCode, Id, TitleCode } from "./base";
 export { Car, CarSelector } from "./car";
 export { Chara } from "./chara";
 export { MissionState, MissionGrid } from "./mission";
diff --git a/src/idz/repo.ts b/src/idz/repo.ts
index 948446f..dfefa75 100644
--- a/src/idz/repo.ts
+++ b/src/idz/repo.ts
@@ -1,4 +1,5 @@
 import * as Model from "./model";
+import { AimeId } from "../model";
 
 export interface CarRepository {
   countCars(profileId: Model.Id<Model.Profile>): Promise<number>;
@@ -40,9 +41,9 @@ export interface ProfileRepository {
   // Might want to come up with something better here
   generateId(): Promise<Model.Id<Model.Profile>>;
 
-  discoverByAimeId(id: Model.AimeId): Promise<boolean>;
+  discoverByAimeId(id: AimeId): Promise<boolean>;
 
-  loadByAimeId(id: Model.AimeId): Promise<Model.Profile>;
+  loadByAimeId(id: AimeId): Promise<Model.Profile>;
 
   load(id: Model.Id<Model.Profile>): Promise<Model.Profile>;
 
diff --git a/src/idz/request/discoverProfile.ts b/src/idz/request/discoverProfile.ts
index 5d9001f..0cdc5b6 100644
--- a/src/idz/request/discoverProfile.ts
+++ b/src/idz/request/discoverProfile.ts
@@ -1,4 +1,4 @@
-import { AimeId } from "../model";
+import { AimeId } from "../../model";
 
 export interface DiscoverProfileRequest {
   type: "discover_profile_req";
diff --git a/src/idz/request/loadProfile.ts b/src/idz/request/loadProfile.ts
index 067aee2..d9f9535 100644
--- a/src/idz/request/loadProfile.ts
+++ b/src/idz/request/loadProfile.ts
@@ -1,4 +1,4 @@
-import { AimeId } from "../model/base";
+import { AimeId } from "../../model";
 
 export interface LoadProfileRequest {
   type: "load_profile_req";
diff --git a/src/aimedb/model.ts b/src/model.ts
similarity index 100%
rename from src/aimedb/model.ts
rename to src/model.ts