Fix remaining TS errors

leopard-js · Mar 9, 2023 · 82b33c0 · 82b33c0
1 parent d2ab10a
commit 82b33c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Block.ts b/src/Block.ts
@@ -381,7 +381,7 @@ const KnownBlockInputMap = {
   },
   [OpCode.motion_ifonedgebounce]: {},
   [OpCode.motion_setrotationstyle]: {
-    STYLE: { type: "rotationStyle", initial: "leftRight" }
+    STYLE: { type: "rotationStyle", initial: "left-right" }
   },
   [OpCode.motion_xposition]: {},
   [OpCode.motion_yposition]: {},

diff --git a/src/io/sb3/fromSb3.ts b/src/io/sb3/fromSb3.ts
@@ -487,9 +487,14 @@ export async function fromSb3JSON(json: sb3.ProjectJSON, options: { getAsset: Ge
 
 export default async function fromSb3(fileData: Parameters<typeof JSZip.loadAsync>[0]): Promise<Project> {
   const inZip = await JSZip.loadAsync(fileData);
-  const json = await inZip.file("project.json").async("text");
-  const getAsset = async ({ md5, ext }: { md5: string; ext: string }): Promise<ArrayBuffer> => {
-    return inZip.file(`${md5}.${ext}`).async("arraybuffer");
+  const projectFile = inZip.file("project.json");
+  if (!projectFile) {
+    throw new Error("Missing project.json");
+  }
+  const json = await projectFile.async("text");
+  const getAsset = async ({ md5, ext }: { md5: string; ext: string }): Promise<ArrayBuffer | undefined> => {
+    // TODO: figure out how to handle missing assets
+    return inZip.file(`${md5}.${ext}`)?.async("arraybuffer");
   };
   return fromSb3JSON(JSON.parse(json) as sb3.ProjectJSON, { getAsset });
 }