fix test and simplify logic

wvbe · Jan 17, 2024 · dae737e · dae737e
1 parent 14662e0
commit dae737e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 55 deletions.
diff --git a/src/files/ThemeXml.test.ts b/src/files/ThemeXml.test.ts
@@ -24,44 +24,45 @@ describe('Themes', () => {
 			</a:themeElements>
 		</a:theme>`;
 		const fakeThemeDocument = parse(fakeThemeXml);
-		const themeXml = await ThemeXml.fromArchive(fakeArchive, undefined);
-		const testFontScheme: FontScheme = {
-			majorFont: {
-				latinFont: {
-					typeface: "Calibri Light",
-					panose: "020F0302020204030204",
-				} as LatinFont,
-				otherFonts: [
-					{
-						script: "Jpan",
-						typeface: "Light"
-					} as Font,
-					{
-						script: "Hang",
-						typeface: "this"
-					} as Font
-				]
-			},
-			minorFont: {
-				latinFont: {
-					typeface: "Calibri",
-					panose: "020F0502020204030204"
-				} as LatinFont,
-				otherFonts: [
-					{
-						script: "Jpan",
-						typeface: "this"
-					} as Font,
-					{
-						script: "Hang",
-						typeface: "this"
-					} as Font
-				]
-			}
-		};
-		expect(await ThemeXml.fromArchive(fakeArchive)).rejects.toThrow();
-		// expect(themeXml.fontScheme).toEqual(testFontScheme);
-		// expect(serialize(themeXml.toNode())).toEqual(fakeThemeXml.replace(/\n|\t/g, ''));
+		expect(ThemeXml.fromArchive(fakeArchive, undefined)).rejects.toThrow();
+		// const themeXml = await ThemeXml.fromArchive(fakeArchive, undefined);
+		// const testFontScheme: FontScheme = {
+		// 	majorFont: {
+		// 		latinFont: {
+		// 			typeface: "Calibri Light",
+		// 			panose: "020F0302020204030204",
+		// 		} as LatinFont,
+		// 		otherFonts: [
+		// 			{
+		// 				script: "Jpan",
+		// 				typeface: "Light"
+		// 			} as Font,
+		// 			{
+		// 				script: "Hang",
+		// 				typeface: "this"
+		// 			} as Font
+		// 		]
+		// 	},
+		// 	minorFont: {
+		// 		latinFont: {
+		// 			typeface: "Calibri",
+		// 			panose: "020F0502020204030204"
+		// 		} as LatinFont,
+		// 		otherFonts: [
+		// 			{
+		// 				script: "Jpan",
+		// 				typeface: "this"
+		// 			} as Font,
+		// 			{
+		// 				script: "Hang",
+		// 				typeface: "this"
+		// 			} as Font
+		// 		]
+		// 	}
+		// };
+		// expect(await ThemeXml.fromArchive(fakeArchive)).rejects.toThrow();
+		// // expect(themeXml.fontScheme).toEqual(testFontScheme);
+		// // expect(serialize(themeXml.toNode())).toEqual(fakeThemeXml.replace(/\n|\t/g, ''));
 	});
 });
 

diff --git a/src/files/ThemeXml.ts b/src/files/ThemeXml.ts
@@ -155,22 +155,8 @@ export class ThemeXml extends XmlFile {
 	 */
 	public static async fromArchive(archive: Archive, location?: string): Promise<ThemeXml> {
 		// If a location is supplied, use that, otherwise use the default location for theme files.
-		location = location ?? 'word/theme/theme1.xml';
-		let themeDocument: Document;
-		let newTheme: ThemeXml;
-
-		// Check to make sure the files in the archive can be accessed.
-		try {
-			themeDocument = await archive.readXml(location);
-			newTheme = await this.fromDom(themeDocument!, location);
-		} catch (error: unknown) {
-			if (error instanceof Error) {
-				throw error;
-			}
-		}
-
-		themeDocument = await archive.readXml(location);
-		newTheme = await this.fromDom(themeDocument!, location);
-		return Promise.resolve(newTheme!);
+		location = location ?? 'word/theme/theme1.xml';		
+		const themeDocument = await archive.readXml(location);
+		return this.fromDom(themeDocument!, location);
 	}
 }