Merge pull request #70 from glaciyan/fix-schema

Fix import schema to include completed Items

package.json

@@ -1,7 +1,7 @@
 {
   "name": "gscale",
   "license": "MIT",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "scripts": {
     "pre": "npm run gen:version",
     "dev": "npm run pre && vite",

src/lib/data/contracts/IItem.ts

@@ -4,18 +4,21 @@ import { INamed } from "./INamed";
 export interface IItem extends INamed {
   rarity: number;
   groupId?: ItemGroupsKey;
-  category:
-    | "boss"
-    | "common"
-    | "none"
-    | "weaponCommon"
-    | "weaponAscension"
-    | "local"
-    | "weekly"
-    | "book"
-    | "special_talent"
-    | "weapon_leveling"
-    | "character_leveling"
-    | "gem"
-    | "currency";
+  category: typeof Categories[-1];
 }
+
+export const Categories = [
+  "boss",
+  "common",
+  "none",
+  "weaponCommon",
+  "weaponAscension",
+  "local",
+  "weekly",
+  "book",
+  "special_talent",
+  "weapon_leveling",
+  "character_leveling",
+  "gem",
+  "currency",
+] as const;

src/lib/data/keys/ItemGroupsKey.ts

@@ -1,3 +1,48 @@
-
-type ItemGroupsKey = "unknown" | "sentinel_gear" | "prism" | "oni_mask" | "coral" | "claw" | "narukami" | "spectral" | "light" | "transience" | "handguard" | "elegance" | "pyro_gem" | "geo_gem" | "cryo_gem" | "electro_gem" | "hydro_gem" | "anemo_gem" | "traveler_gem" | "scroll" | "arrowhead" | "treasure_hoarder_insignia" | "mask" | "fatui_insignia" | "nectar" | "slime" | "ballad" | "freedom" | "gold" | "resistance" | "diligence" | "prosperity" | "chaos" | "horn" | "bone_shard" | "sacrificial_knife" | "mist_grass" | "ley_line" | "dandelion_gladiator" | "decarabians" | "aerosiderite" | "guyun" | "mist_elixir" | "wolf_tooth";
-export default ItemGroupsKey;
+export const PhysicalItemGroupsKey = [
+  "unknown",
+  "sentinel_gear",
+  "prism",
+  "oni_mask",
+  "coral",
+  "claw",
+  "narukami",
+  "spectral",
+  "light",
+  "transience",
+  "handguard",
+  "elegance",
+  "pyro_gem",
+  "geo_gem",
+  "cryo_gem",
+  "electro_gem",
+  "hydro_gem",
+  "anemo_gem",
+  "traveler_gem",
+  "scroll",
+  "arrowhead",
+  "treasure_hoarder_insignia",
+  "mask",
+  "fatui_insignia",
+  "nectar",
+  "slime",
+  "ballad",
+  "freedom",
+  "gold",
+  "resistance",
+  "diligence",
+  "prosperity",
+  "chaos",
+  "horn",
+  "bone_shard",
+  "sacrificial_knife",
+  "mist_grass",
+  "ley_line",
+  "dandelion_gladiator",
+  "decarabians",
+  "aerosiderite",
+  "guyun",
+  "mist_elixir",
+  "wolf_tooth",
+] as const;
+type ItemGroupsKey = typeof PhysicalItemGroupsKey[-1];
+export default ItemGroupsKey;

src/lib/types/GDataFileFormat.ts

@@ -1,4 +1,6 @@
 import { z } from "zod";
+import { Categories } from "../data/contracts/IItem";
+import { PhysicalItemGroupsKey } from "../data/keys/ItemGroupsKey";
 import { Build } from "../offlineDatabase/db";
 
 export class GDataFileFormat {
@@ -53,6 +55,20 @@ const schema = z.object({
           goal: z.number(),
           upgraded: z.boolean(),
         }),
+        completed: z
+          .array(
+            z.object({
+              item: z.object({
+                name: z.string(),
+                normalizedName: z.string(),
+                rarity: z.number(),
+                groupId: z.enum(PhysicalItemGroupsKey).optional(),
+                category: z.enum(Categories),
+              }),
+              amount: z.number(),
+            })
+          )
+          .optional(),
       })
     ),
   }),