refactor: unify queue error handling

src/api-parser-v1.ts

@@ -9,16 +9,15 @@ import { compile } from 'stylis';
 
 import { apiv1 as userAgents } from '../data/user-agents.json';
 import { APIDirect, APIv1 } from './data';
+import { LOOP_LIMIT, addError, checkErrors } from './errors';
 import type { APIResponse, FontObjectV1 } from './types';
 import { orderObject, weightListGen } from './utils';
 import { validate } from './validate';
 
 const baseurl = 'https://fonts.googleapis.com/css?subset=';
+const queue = Limiter(18);
 
 const results: FontObjectV1[] = [];
-const errs: string[] = [];
-
-const queue = Limiter(18);
 
 export const fetchCSS = async (
 	font: APIResponse,
@@ -203,7 +202,7 @@ const processQueue = async (
 		}
 		consola.success(`Parsed ${id}`);
 	} catch (error) {
-		errs.push(`${font.family} experienced an error. ${String(error)}`);
+		addError(`${font.family} experienced an error. ${String(error)}`);
 	}
 };
 
@@ -214,18 +213,12 @@ const processQueue = async (
  */
 export const parsev1 = async (force: boolean, noValidate: boolean) => {
 	for (const font of APIDirect) {
+		checkErrors(LOOP_LIMIT);
 		queue.add(() => processQueue(font, force));
 	}
 
 	await queue.flush();
-
-	if (errs.length > 0) {
-		for (const error of errs) {
-			consola.error(error);
-		}
-
-		throw new Error('Some fonts experienced errors during parsing.');
-	}
+	checkErrors();
 
 	// Order the font objects alphabetically for consistency and not create huge diffs
 	const unordered: FontObjectV1 = Object.assign({}, ...results);

src/api-parser-v2.ts

@@ -9,16 +9,15 @@ import { compile } from 'stylis';
 
 import { apiv2 as userAgents } from '../data/user-agents.json';
 import { APIDirect, APIv2 } from './data';
+import { LOOP_LIMIT, addError, checkErrors } from './errors';
 import type { APIResponse, FontObjectV2 } from './types';
 import { orderObject, weightListGen } from './utils';
 import { validate } from './validate';
 
 const baseurl = 'https://fonts.googleapis.com/css2?family=';
+const queue = Limiter(18);
 
 const results: FontObjectV2[] = [];
-const errs: string[] = [];
-
-const queue = Limiter(18);
 
 export const fetchCSS = async (
 	fontFamily: string,
@@ -261,7 +260,7 @@ const processQueue = async (
 		}
 		consola.success(`Parsed ${id}`);
 	} catch (error) {
-		errs.push(`${font.family} experienced an error. ${String(error)}`);
+		addError(`${font.family} experienced an error. ${String(error)}`);
 	}
 };
 
@@ -272,18 +271,12 @@ const processQueue = async (
  */
 export const parsev2 = async (force: boolean, noValidate: boolean) => {
 	for (const font of APIDirect) {
+		checkErrors(LOOP_LIMIT);
 		queue.add(() => processQueue(font, force));
 	}
 
 	await queue.flush();
-
-	if (errs.length > 0) {
-		for (const err of errs) {
-			consola.error(err);
-		}
-
-		throw new Error('Some fonts experienced errors during parsing.');
-	}
+	checkErrors();
 
 	// Order the font objects alphabetically for consistency and not create huge diffs
 	const unordered: FontObjectV2 = Object.assign({}, ...results);

src/errors.ts

@@ -0,0 +1,23 @@
+import consola from 'consola';
+
+const errs: string[] = [];
+
+export const LOOP_LIMIT = 5;
+
+export const addError = (error: string) => {
+	errs.push(error);
+};
+
+export const checkErrors = (limit = 0) => {
+	if (errs.length > limit) {
+		for (const err of errs) {
+			consola.error(err);
+		}
+
+		if (limit > 0) {
+			throw new Error('Too many errors occurred during parsing. Stopping...');
+		}
+
+		throw new Error('Some fonts experienced errors during parsing.');
+	}
+};

src/icons-parser.ts

@@ -11,6 +11,7 @@ import {
 	processCSS as processV2CSS,
 } from './api-parser-v2';
 import { APIIconDirect, APIIconStatic, APIIconVariable } from './data';
+import { LOOP_LIMIT, addError, checkErrors } from './errors';
 import type {
 	APIIconResponse,
 	FontObjectV2,
@@ -23,11 +24,10 @@ import {
 	parseCSS as parseVariableCSS,
 } from './variable-parser';
 
+const queue = Limiter(18);
+
 const resultsStatic: FontObjectV2[] = [];
 const resultsVariable: FontObjectVariable = {};
-const errs: string[] = [];
-
-const queue = Limiter(18);
 
 const processQueue = async (icon: APIIconResponse, force: boolean) => {
 	try {
@@ -76,7 +76,7 @@ const processQueue = async (icon: APIIconResponse, force: boolean) => {
 		}
 		consola.success(`Parsed ${id}`);
 	} catch (error) {
-		errs.push(`${icon.family} experienced an error. ${String(error)}`);
+		addError(`${icon.family} experienced an error. ${String(error)}`);
 	}
 };
 
@@ -87,18 +87,12 @@ const processQueue = async (icon: APIIconResponse, force: boolean) => {
  */
 export const parseIcons = async (force: boolean) => {
 	for (const icon of APIIconDirect) {
+		checkErrors(LOOP_LIMIT);
 		queue.add(() => processQueue(icon, force));
 	}
 
 	await queue.flush();
-
-	if (errs.length > 0) {
-		for (const err of errs) {
-			consola.error(err);
-		}
-
-		throw new Error('Some icons experienced errors during parsing.');
-	}
+	checkErrors();
 
 	// Order the font objects alphabetically for consistency and not create huge diffs
 	const unorderedStatic: FontObjectV2 = Object.assign({}, ...resultsStatic);

src/variable-parser.ts

@@ -9,6 +9,7 @@ import { compile } from 'stylis';
 
 import { apiv2 as userAgents } from '../data/user-agents.json';
 import { APIVariableDirect } from './data';
+import { LOOP_LIMIT, addError, checkErrors } from './errors';
 import type {
 	FontObjectVariable,
 	FontObjectVariableDirect,
@@ -20,11 +21,10 @@ import { validate } from './validate';
 
 export type Links = Record<string, string>;
 
-const results: FontObjectVariable = {};
-const errs: string[] = [];
-
 const queue = Limiter(10);
 
+const results: FontObjectVariable = {};
+
 // CSS API needs axes to given in alphabetical order or request throws e.g. (a,b,c,A,B,C)
 export const sortAxes = (axesArr: string[]) => {
 	const upper = axesArr
@@ -264,7 +264,7 @@ const processQueue = async (font: FontObjectVariableDirect) => {
 		results[font.id] = { ...font, variants: variantsObject };
 		consola.success(`Parsed ${font.id}`);
 	} catch (error) {
-		errs.push(`${font.family} experienced an error. ${String(error)}`);
+		addError(`${font.family} experienced an error. ${String(error)}`);
 	}
 };
 
@@ -274,18 +274,12 @@ const processQueue = async (font: FontObjectVariableDirect) => {
  */
 export const parseVariable = async (noValidate: boolean) => {
 	for (const font of APIVariableDirect) {
+		checkErrors(LOOP_LIMIT);
 		queue.add(() => processQueue(font));
 	}
 
 	await queue.flush();
-
-	if (errs.length > 0) {
-		for (const err of errs) {
-			consola.error(err);
-		}
-
-		throw new Error('Some fonts experienced errors during parsing.');
-	}
+	checkErrors();
 
 	if (!noValidate) {
 		validate('variable', results);