Type updates

devstein · devstein · commit 11cc0d058d57 · 2022-01-15T17:00:53.000-08:00
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -1,11 +1,13 @@
 import { ethers } from "hardhat";
 
 import { deployAll } from "./contracts";
+import { initializeUnicodeData } from "./initialization";
 
 async function main() {
   console.log("starting deployment...");
-  await deployAll();
+  const [unicodeData] = await deployAll();
   console.log("deployment complete.");
+  await initializeUnicodeData(unicodeData);
 }
 
 // We recommend this pattern to be able to use async/await everywhere
diff --git a/scripts/parsers/unicode.ts b/scripts/parsers/unicode.ts
@@ -71,7 +71,7 @@ const parseUnicodeData = (data: string): Character[] =>
       ] = line.split(";");
 
       // initialize the character with required fields
-      const character: Character = {
+      const character: Partial<Character> = {
         // code is hexadecimal
         code: parseInt(code, HEXADECIMAL),
         // name is a string
@@ -117,7 +117,7 @@ const parseUnicodeData = (data: string): Character[] =>
           ? parseInt(titlecase, HEXADECIMAL)
           : character.uppercase;
 
-      return character;
+      return character as Character;
     });
 
 export default parseUnicodeData;
diff --git a/scripts/types.ts b/scripts/types.ts
@@ -30,18 +30,18 @@ export interface Character {
     Otherwise, if field 8 is non-empty, then Numeric_Type=Numeric.
     For characters listed in the Unihan data files, Numeric_Type=Numeric for characters that have kPrimaryNumeric, kAccountingNumeric, or kOtherNumeric tags. The default value is Numeric_Type=None.
   */
-  decimal?: number;
-  digit?: number;
+  decimal: number;
+  digit: number;
   /** numeric value of character (may be a fraction, so it not unevaluated) */
-  numeric?: Numeric;
+  numeric: Numeric;
   /** true if character is mirrored in bidirectional text (missing otherwise) */
-  mirrored?: boolean;
+  mirrored: boolean;
   /** simple uppercase mapping */
-  uppercase?: number;
+  uppercase: number;
   /** simple lowercase mapping */
-  lowercase?: number;
+  lowercase: number;
   /** simple titlecase mapping */
-  titlecase?: number;
+  titlecase: number;
 }
 
 export type JamoShortNames = Record<string, string>;
diff --git a/scripts/unicode-data.ts b/scripts/unicode-data.ts
@@ -98,16 +98,3 @@ export const getUnicodeData = async (): Promise<Character[]> => {
 
   return characters;
 };
-
-async function main() {
-  await getUnicodeData();
-}
-
-// We recommend this pattern to be able to use async/await everywhere
-// and properly handle errors.
-main()
-  .then(() => process.exit(0))
-  .catch((error) => {
-    console.error(error);
-    process.exit(1);
-  });
