erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-07 22:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix(developer): getFontFamily now returns null if ttfMeta.promise errors (plus test)

Browse source
This commit is contained in:
Dr Mark C. Sinclair 2024-03-12 18:47:31 +00:00
parent 4d4d5a6407
commit 90c028e1b0
3 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
developer/src/kmc-keyboard-info/src/font-family.ts
View file

@ -16,7 +16,12 @@ export async function getFontFamily(source: Uint8Array) {
}
const buffer = Buffer.from(source);
const font = await ttfMeta.promise(buffer);
let font = null;
try {
font = await ttfMeta.promise(buffer);
} catch(e) {
return null;
}
/* c8 ignore next 3 */
if(!font) {
return null;

1
developer/src/kmc-keyboard-info/test/fixtures/font-file-cannot-be-read/shared/fonts/khmer/mondulkiri/font_file_cannot_be_read.ttf vendored Normal file
View file

@ -0,0 +1 @@
This is a file used to test the font file cannot be read error (see keyboard-info-compiler-messages.ts)

46
developer/src/kmc-keyboard-info/test/test-keyboard-info-compiler-messages.ts
View file

@ -1,10 +1,52 @@
import { assert } from 'chai';
import 'mocha';
import { KeyboardInfoCompilerMessages } from '../src/keyboard-info-compiler-messages.js';
import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers';
import { CompilerErrorNamespace } from '@keymanapp/common-types';
import { TestCompilerCallbacks, verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers';
import { CompilerErrorNamespace, KmpJsonFile } from '@keymanapp/common-types';
import { makePathToFixture } from './helpers/index.js';
import { KeyboardInfoCompiler } from '../src/keyboard-info-compiler.js';
const callbacks = new TestCompilerCallbacks();
beforeEach(function() {
callbacks.clear();
});
describe('KeyboardInfoCompilerMessages', function () {
it('should have a valid KeyboardInfoCompilerMessages object', function() {
return verifyCompilerMessagesObject(KeyboardInfoCompilerMessages, CompilerErrorNamespace.KeyboardInfoCompiler);
});
// ERROR_FontFileCannotBeRead
it('should generate ERROR_FontFileCannotBeRead error if font family cannot be obtained from file', async function() {
const jsFilename = makePathToFixture('font-file-cannot-be-read', 'build', 'khmer_angkor.js');
const kpsFilename = makePathToFixture('font-file-cannot-be-read', 'source', 'khmer_angkor.kps');
const kmpFilename = makePathToFixture('font-file-cannot-be-read', 'build', 'khmer_angkor.kmp');
const sources = {
kmpFilename,
sourcePath: 'release/k/font-file-cannot-be-read',
kpsFilename,
jsFilename: jsFilename,
forPublishing: true,
};
const compiler = new KeyboardInfoCompiler();
assert.isTrue(await compiler.init(callbacks, {sources}));
const kmpJsonData: KmpJsonFile.KmpJsonFile = {system: {fileVersion: "7.0", keymanDeveloperVersion: "17.0.204"},
options: {},
files: [{name: "../shared/fonts/khmer/mondulkiri/font_file_cannot_be_read.ttf", description: ""}]}
const source = ["font_file_cannot_be_read.ttf"]
const result = await compiler['fontSourceToKeyboardInfoFont'](kpsFilename, kmpJsonData, source)
assert.isNull(result);
assert.isTrue(callbacks.hasMessage(KeyboardInfoCompilerMessages.ERROR_FontFileCannotBeRead),
`ERROR_FontFileCannotBeRead not generated, instead got: `+JSON.stringify(callbacks.messages,null,2));
assert.isTrue(nodeCompilerMessage(callbacks, KeyboardInfoCompilerMessages.ERROR_FontFileCannotBeRead).includes(kmpJsonData.files[0].name),
kmpJsonData.files[0].name+' not found in the message');
});
});
function nodeCompilerMessage(ncb: TestCompilerCallbacks, code: number): string {
return ncb.messages.find((item) => item.code == code).message ?? '';
}