Unify items/pokemon data accessors

data/lib/index.ts

@@ -5,75 +5,106 @@ import root from '@smogon/sprite-root';
 
 const libdir = path.join(root, "data");
 
+export type Id = string;
+
 export type SpecieEntry = {
+    type : 'specie',
     num: number,
     formeNum: number,
     base: string,
     forme: string,
-    sid: number
+    sid: string
 };
 
 export type ItemEntry = {
-    sid : number,
+    type : 'item',
+    sid : string,
     name : string
 };
 
-const species : Record<number, SpecieEntry> = JSON.parse(fs.readFileSync(path.join(libdir, "species.json"), 'utf8'));
-const speciesMap = new Map<number, SpecieEntry>();
-for (const entry of Object.values(species)) {
-    speciesMap.set(entry.sid, entry);
+export type Entry = SpecieEntry | ItemEntry;
+
+const objects : Record<Id, Entry> = {};
+Object.assign(objects, JSON.parse(fs.readFileSync(path.join(libdir, "species.json"), 'utf8')));
+Object.assign(objects, JSON.parse(fs.readFileSync(path.join(libdir, "items.json"), 'utf8')));
+
+const map = new Map<Id, Entry>();
+for (const entry of Object.values(objects)) {
+    map.set(entry.sid, entry);
 }
 
-export function get(id : number) : SpecieEntry {
-    const entry = speciesMap.get(id);
+export function get(id : Id) : Entry {
+    const entry = map.get(id);
     if (entry === undefined)
         throw new Error(`No id for ${id}`);
     return entry;
 }
 
-export function entries() : [number, SpecieEntry][] {
-    return Array.from(speciesMap.entries());
-}
-
-
-// TODO: needs cleanup!!!
-const items : Record<number, ItemEntry> = JSON.parse(fs.readFileSync(path.join(libdir, "items.json"), 'utf8'));
-const itemsMap = new Map<number, ItemEntry>();
-for (const entry of Object.values(items)) {
-    itemsMap.set(entry.sid, entry);
-}
-export function getItem(id : number) : ItemEntry {
-    const entry = itemsMap.get(id);
-    if (entry === undefined)
-        throw new Error(`No id for ${id}`);
-    return entry;
-}
-export function itemEntries() : [number, ItemEntry][] {
-    return Array.from(itemsMap.entries());
+export function entries() : Entry[] {
+    return Array.from(map.values());
 }
 
 
 // TODO Moved here from deploy/spritename.ts, better place to put these??
-export type SpriteFilename = {id : number | string, extra : Map<string, string>};
+export type SpriteFilename = ({
+    extension : true,
+    name : string
+} | {
+    extension : false,
+    id : Id
+}) & {
+    extra : Map<string, string>
+};
+
+export type InputSpriteFilename = ({
+    extension : true,
+    name : string
+} | {
+    extension? : false,
+    id : Id
+}) & {
+    extra? : Map<string, string>
+};
 
 export function parseFilename(s : string) : SpriteFilename {
+    if (s.length < 2)
+        throw new Error(`Filename ${s} needs to be at least 2 characters'`);
+
+    const prefix = s[0];
+    if (!prefix.match(/[a-z]/))
+        throw new Error(`Filename ${s} must start with alpha character`);
+
     const parts = s.split("-");
-    const id = parts[0].match(/^[0-9]+$/) ? parseInt(parts[0], 10) : parts[0];
     const extra = new Map<string, string>();
     for (const part of parts.slice(1)) {
         if (part.length === 0)
             throw new Error(`Can't parse ${s}`);
         extra.set(part[0], part.slice(1));
     }
-    return {id, extra};
+    
+    if (prefix === 'x') {
+        const name = parts[0].slice(1);
+        return {extension: true, name, extra};
+    } else {
+        const id = parts[0];
+        return {extension: false, id, extra};
+    }
 }
 
-export function formatFilename(si : SpriteFilename) {
-    let s = si.id.toString();
+export function formatFilename(si : InputSpriteFilename) {
+    let s : string;
+    if (si.extension) {
+        s = `x${si.name}`;
+    } else {
+        s = si.id;
+    }
     const extra = [];
-    for (const [k, v] of si.extra.entries()) {
-        extra.push(`-${k}${v}`);
+    if (si.extra) {
+        for (const [k, v] of si.extra.entries()) {
+            extra.push(`-${k}${v}`);
+        }
     }
     extra.sort();
-    return s + extra.join('');
+    s += extra.join();
+    return s;
 }

ps-items.sheet.mjs

@@ -529,9 +529,11 @@ const ITEMS = {
 
 const found = new Map;
 
-for (const [num, {sid, name}] of spritedata.itemEntries()) {
+for (const {type, sid, name} of spritedata.entries()) {
+    if (type !== 'item') continue;
     const id = toPSID(name);
-    found.set(id, path.join(root, "newsrc/minisprites/items", sid + ".png"));
+    const filename = spritedata.formatFilename({id: sid});
+    found.set(id, path.join(root, "newsrc/minisprites/items", filename + ".png"));
 }
 
 const entries = [];

ps-pokemon.sheet.mjs

@@ -508,15 +508,12 @@ const entries = [];
 for (const name of fs.readdirSync(spritesDir)) {
     const parsed = path.parse(name);
     const sn = spritedata.parseFilename(parsed.name);
-    if (!sn) {
-        throw new Error(`can't parse ${name}`);
-    }
-    
+
     let entry;
-    try {
-        entry = spritedata.get(parseInt(sn.id));
-    } catch(e) {}
-    let id = toPSID(entry ? entry.base + entry.forme : sn.id);
+    if (!sn.extension) {
+        entry = spritedata.get(sn.id);
+    }
+    let id = toPSID(entry ? entry.base + entry.forme : sn.name);
     
     if (sn.extra.has("f")) id += 'f';
     if (sn.extra.has("g")) id += 'gmax';

ps.deploy.js

@@ -6,8 +6,8 @@ function toID(name) {
 function spritecopy(f, {dir, ext}) {
     const sn = spritedata.parseFilename(f.name);
     let name;
-    if (typeof sn.id === 'string') {
-        name = toID(sn.id);
+    if (sn.extension) {
+        name = toID(sn.name);
     } else {
         const sd = spritedata.get(sn.id);
         debug(sd);

smogon.deploy.js

@@ -14,7 +14,7 @@ function spritecopy(f, {dir, ext}) {
         return;
     }
     
-    if (typeof sn.id === 'string') {
+    if (sn.extension) {
         // Skip this, we don't use Unknown/Substitute
         return;
     } else {
@@ -37,7 +37,7 @@ function spritecopy(f, {dir, ext}) {
 // TODO: merge with above
 function itemspritecopy(f, {dir, ext}) {
     const sn = spritedata.parseFilename(f.name);
-    const sd = spritedata.getItem(sn.id);
+    const sd = spritedata.get(sn.id);
     const name = toSmogonAlias(sd.name);
     copy(f, {dir, ext, name});
 }