review-fix:ハイフンがない郵便番号とハイフンがある郵便場号を区別するよう型を修正

src/test/constants/address.ts

@@ -1,6 +1,6 @@
-import { Address, UnHyphenatedZipCode } from '../type/type';
+import { UnHyphenatedZipCodeAddress } from '../type/type';
 
-export const addresses: Address<UnHyphenatedZipCode>[] = [
+export const addresses: UnHyphenatedZipCodeAddress[] = [
   {
     zipcode: '7340001',
     pref: '広島県',

src/test/constants/addressIncludingHyphenDataList.ts

@@ -1,6 +1,6 @@
-import type { Address, HyphenatedZipCode } from '../type/type';
+import type { HyphenatedZipCodeAddress } from '../type/type';
 
-export const addressIncludingHyphenDataList: Address<HyphenatedZipCode>[] = [
+export const addressIncludingHyphenDataList: HyphenatedZipCodeAddress[] = [
   {
     zipcode: '734-0001',
     pref: '広島県',

src/test/type/type.ts

@@ -1,9 +1,16 @@
-export type Address<ZipCode extends string> = {
-  zipcode: ZipCode;
+export type UnHyphenatedZipCodeAddress = {
+  zipcode: string;
   pref: string;
   city: string;
   town: string;
 };
 
-export type UnHyphenatedZipCode = `${string}`;
-export type HyphenatedZipCode = `${string}-${string}`;
+export type HyphenatedZipCodeAddress = {
+  zipcode: `${string}-${string}`;
+  pref: string;
+  city: string;
+  town: string;
+};
+
+export type UnHyphenatedZipCode = `${number}`;
+export type HyphenatedZipCode = `${number}-${number}`;

src/test/utils/goqZipCode.ts

@@ -1,7 +1,6 @@
 import type {
-  Address,
-  HyphenatedZipCode,
-  UnHyphenatedZipCode,
+  HyphenatedZipCodeAddress,
+  UnHyphenatedZipCodeAddress,
 } from '../type/type';
 
 export const goqZipCode = {
@@ -33,8 +32,8 @@ export const goqZipCode = {
 
   convertHyphenatedZipCode: function (
     hasOptionHyphen: boolean,
-    addresses: Address<string>[]
-  ): Address<UnHyphenatedZipCode | HyphenatedZipCode>[] {
+    addresses: UnHyphenatedZipCodeAddress[]
+  ): HyphenatedZipCodeAddress[] | UnHyphenatedZipCodeAddress[] {
     if (hasOptionHyphen === false) {
       return addresses;
     }