Skip to content

Allow loading non-XML fonts in web-worker #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow loading non-XML fonts in web-worker #1360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions plugins/plugin-print/src/load-bitmap-font.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,42 +55,11 @@ function parseFont(file: string, data: Buffer | string): LoadedFont {
}

if (/.xml$/.test(file) || data.charAt(0) === "<") {
return parseXML(data);
}

return parseASCII(data);
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
function parseNumbersInObject<T extends Record<string, any>>(obj: T) {
for (const key in obj) {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj as any)[key] = parseInt(obj[key], 10);
} catch {
// do nothing
}

if (typeof obj[key] === "object") {
parseNumbersInObject(obj[key]);
if (!isWebWorker) {
return parseXML(data);
}
}

return obj;
}

/**
*
* @param bufferOrUrl A URL to a file or a buffer
* @returns
*/
export async function loadBitmapFontData(
bufferOrUrl: string | Buffer
): Promise<LoadedFont> {
if (isWebWorker && typeof bufferOrUrl === "string") {
const res = await fetch(bufferOrUrl);
const text = await res.text();
const json = convertXML(text);

const json = convertXML(data);

const font = json.font.children.reduce(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down Expand Up @@ -122,7 +91,38 @@ export async function loadBitmapFontData(
chars,
kernings,
} satisfies LoadedFont;
} else if (typeof bufferOrUrl === "string") {
}

return parseASCII(data);
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
function parseNumbersInObject<T extends Record<string, any>>(obj: T) {
for (const key in obj) {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(obj as any)[key] = parseInt(obj[key], 10);
} catch {
// do nothing
}

if (typeof obj[key] === "object") {
parseNumbersInObject(obj[key]);
}
}

return obj;
}

/**
*
* @param bufferOrUrl A URL to a file or a buffer
* @returns
*/
export async function loadBitmapFontData(
bufferOrUrl: string | Buffer
): Promise<LoadedFont> {
if (typeof bufferOrUrl === "string") {
const res = await fetch(bufferOrUrl);
const text = await res.text();

Expand Down