From b873e0df31dbfa3dca5828492aa5c752b3471f2e Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 29 Apr 2019 07:11:50 -0700
Subject: [PATCH] Type getSpriteUrisFromFilename

---
 js/skinParser.js      | 10 +---------
 js/skinParserUtils.ts | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/js/skinParser.js b/js/skinParser.js
index d431446b..c95bc3c2 100644
--- a/js/skinParser.js
+++ b/js/skinParser.js
@@ -51,14 +51,6 @@ const CURSORS = [
    */
 ];
 
-async function genSpriteUrisFromFilename(zip, fileName) {
-  const img = await SkinParserUtils.getImgFromFilename(zip, fileName);
-  if (img == null) {
-    return {};
-  }
-  return SkinParserUtils.getSpriteUrisFromImg(img, SKIN_SPRITES[fileName]);
-}
-
 async function getCursorFromFilename(zip, fileName) {
   const file = await SkinParserUtils.getFileFromZip(
     zip,
@@ -113,7 +105,7 @@ async function genVizColors(zip) {
 async function genImages(zip) {
   const imageObjs = await Promise.all(
     Object.keys(SKIN_SPRITES).map(fileName =>
-      genSpriteUrisFromFilename(zip, fileName)
+      SkinParserUtils.getSpriteUrisFromFilename(zip, fileName)
     )
   );
   // Merge all the objects into a single object. Tests assert that sprite keys are unique.
diff --git a/js/skinParserUtils.ts b/js/skinParserUtils.ts
index 8aaa2de4..17cba266 100644
--- a/js/skinParserUtils.ts
+++ b/js/skinParserUtils.ts
@@ -1,5 +1,5 @@
 import JSZip from "jszip";
-import { Sprite } from "./skinSprites";
+import SKIN_SPRITES, { Sprite } from "./skinSprites";
 
 export const getFileExtension = (fileName: string): string | null => {
   const matches = /\.([a-z]{3,4})$/i.exec(fileName);
@@ -95,3 +95,14 @@ export async function getImgFromFilename(
   const typedBlob = new Blob([file.contents], { type: mimeType });
   return getImgFromBlob(typedBlob);
 }
+
+export async function getSpriteUrisFromFilename(
+  zip: JSZip,
+  fileName: string
+): Promise<{ [spriteName: string]: string }> {
+  const img = await getImgFromFilename(zip, fileName);
+  if (img == null) {
+    return {};
+  }
+  return getSpriteUrisFromImg(img, SKIN_SPRITES[fileName]);
+}