@turntrout/subfont 1.8.3 → 1.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CLAUDE.md +1 -1
- package/lib/codepointMaps.d.ts.map +1 -1
- package/lib/codepointMaps.js +10 -0
- package/lib/codepointMaps.js.map +1 -1
- package/lib/fontConverter.d.ts +1 -0
- package/lib/fontConverter.d.ts.map +1 -1
- package/lib/fontConverter.js +101 -15
- package/lib/fontConverter.js.map +1 -1
- package/lib/subsetGeneration.js +1 -1
- package/package.json +1 -1
package/CLAUDE.md
CHANGED
|
@@ -48,7 +48,7 @@ pnpm run check-coverage # Verify coverage thresholds
|
|
|
48
48
|
- Tests have a 5-minute timeout (configured in `.mocharc.yml`)
|
|
49
49
|
- Tests use `httpception` for HTTP mocking and `unexpected` for assertions
|
|
50
50
|
- Some tests require puppeteer browser binaries (installed via `pnpm install`)
|
|
51
|
-
- Coverage thresholds: branches
|
|
51
|
+
- Coverage thresholds: branches 75%, lines 82%, functions 78%, statements 82%
|
|
52
52
|
- Coverage excludes: `lib/cli.js`, `lib/fontConverterWorker.js`, `lib/fontTracerWorker.js`
|
|
53
53
|
|
|
54
54
|
## Conventions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codepointMaps.d.ts","sourceRoot":"","sources":["../src/codepointMaps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codepointMaps.d.ts","sourceRoot":"","sources":["../src/codepointMaps.ts"],"names":[],"mappings":"AAwGA,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAwBD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAUrD"}
|
package/lib/codepointMaps.js
CHANGED
|
@@ -34,6 +34,7 @@ const EMOJI_RANGES = [
|
|
|
34
34
|
const SCRIPT_RANGES = [
|
|
35
35
|
{ min: 0x0370, max: 0x03ff, tag: 'grek' }, // Greek and Coptic
|
|
36
36
|
{ min: 0x0400, max: 0x052f, tag: 'cyrl' }, // Cyrillic + Supplement
|
|
37
|
+
{ min: 0x0530, max: 0x058f, tag: 'armn' }, // Armenian
|
|
37
38
|
{ min: 0x0590, max: 0x05ff, tag: 'hebr' }, // Hebrew
|
|
38
39
|
{ min: 0x0600, max: 0x06ff, tag: 'arab' }, // Arabic
|
|
39
40
|
{ min: 0x0750, max: 0x077f, tag: 'arab' }, // Arabic Supplement
|
|
@@ -45,8 +46,17 @@ const SCRIPT_RANGES = [
|
|
|
45
46
|
{ min: 0x0c00, max: 0x0c7f, tag: 'telu' }, // Telugu
|
|
46
47
|
{ min: 0x0c80, max: 0x0cff, tag: 'knda' }, // Kannada
|
|
47
48
|
{ min: 0x0d00, max: 0x0d7f, tag: 'mlym' }, // Malayalam
|
|
49
|
+
{ min: 0x0d80, max: 0x0dff, tag: 'sinh' }, // Sinhala
|
|
50
|
+
{ min: 0x0e00, max: 0x0e7f, tag: 'thai' }, // Thai
|
|
51
|
+
{ min: 0x0e80, max: 0x0eff, tag: 'lao ' }, // Lao
|
|
52
|
+
{ min: 0x0f00, max: 0x0fff, tag: 'tibt' }, // Tibetan
|
|
53
|
+
{ min: 0x1000, max: 0x109f, tag: 'mymr' }, // Myanmar
|
|
54
|
+
{ min: 0x10a0, max: 0x10ff, tag: 'geor' }, // Georgian
|
|
48
55
|
{ min: 0x1100, max: 0x11ff, tag: 'hang' }, // Hangul Jamo
|
|
56
|
+
{ min: 0x1200, max: 0x137f, tag: 'ethi' }, // Ethiopic
|
|
57
|
+
{ min: 0x1780, max: 0x17ff, tag: 'khmr' }, // Khmer
|
|
49
58
|
{ min: 0x1f00, max: 0x1fff, tag: 'grek' }, // Greek Extended
|
|
59
|
+
{ min: 0x2d00, max: 0x2d2f, tag: 'geor' }, // Georgian Supplement
|
|
50
60
|
{ min: 0x2de0, max: 0x2dff, tag: 'cyrl' }, // Cyrillic Extended-A
|
|
51
61
|
{ min: 0x3040, max: 0x30ff, tag: 'kana' }, // Hiragana / Katakana
|
|
52
62
|
{ min: 0x3130, max: 0x318f, tag: 'hang' }, // Hangul Compatibility Jamo
|
package/lib/codepointMaps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codepointMaps.js","sourceRoot":"","sources":["../src/codepointMaps.ts"],"names":[],"mappings":";AAAA,yEAAyE;AACzE,sEAAsE;AACtE,wEAAwE;AACxE,yEAAyE;AACzE,wCAAwC;;
|
|
1
|
+
{"version":3,"file":"codepointMaps.js","sourceRoot":"","sources":["../src/codepointMaps.ts"],"names":[],"mappings":"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"}
|
package/lib/fontConverter.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fontConverter.d.ts","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fontConverter.d.ts","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":"AA8IA,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,UAAU,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAI7C"}
|
package/lib/fontConverter.js
CHANGED
|
@@ -1,44 +1,130 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convert = convert;
|
|
4
|
+
exports.destroy = destroy;
|
|
4
5
|
const pathModule = require("path");
|
|
6
|
+
const os = require("os");
|
|
5
7
|
const worker_threads_1 = require("worker_threads");
|
|
6
8
|
const workerPath = pathModule.join(__dirname, 'fontConverterWorker.js');
|
|
7
9
|
const CONVERT_TIMEOUT_MS = 120_000;
|
|
8
|
-
|
|
10
|
+
const POOL_SIZE = Math.max(1, Math.min(os.cpus().length, 8));
|
|
11
|
+
const _pool = [];
|
|
12
|
+
const _waiters = [];
|
|
13
|
+
function createEntry() {
|
|
14
|
+
const worker = new worker_threads_1.Worker(workerPath);
|
|
15
|
+
worker.unref();
|
|
16
|
+
return { worker, busy: false };
|
|
17
|
+
}
|
|
18
|
+
function acquire() {
|
|
19
|
+
const idle = _pool.find((e) => !e.busy);
|
|
20
|
+
if (idle) {
|
|
21
|
+
idle.busy = true;
|
|
22
|
+
return idle;
|
|
23
|
+
}
|
|
24
|
+
if (_pool.length < POOL_SIZE) {
|
|
25
|
+
const entry = createEntry();
|
|
26
|
+
entry.busy = true;
|
|
27
|
+
_pool.push(entry);
|
|
28
|
+
return entry;
|
|
29
|
+
}
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
function release(entry) {
|
|
33
|
+
entry.busy = false;
|
|
34
|
+
if (_waiters.length > 0) {
|
|
35
|
+
entry.busy = true;
|
|
36
|
+
const waiter = _waiters.shift();
|
|
37
|
+
waiter(entry);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function replaceEntry(entry) {
|
|
41
|
+
const idx = _pool.indexOf(entry);
|
|
42
|
+
if (idx === -1)
|
|
43
|
+
return;
|
|
44
|
+
const replacement = createEntry();
|
|
45
|
+
_pool[idx] = replacement;
|
|
46
|
+
if (_waiters.length > 0) {
|
|
47
|
+
replacement.busy = true;
|
|
48
|
+
const waiter = _waiters.shift();
|
|
49
|
+
waiter(replacement);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
function doConvert(entry, buffer, targetFormat, sourceFormat) {
|
|
9
53
|
return new Promise((resolve, reject) => {
|
|
10
54
|
let settled = false;
|
|
11
|
-
const worker =
|
|
55
|
+
const { worker } = entry;
|
|
12
56
|
const timer = setTimeout(() => {
|
|
13
|
-
if (
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
57
|
+
if (settled)
|
|
58
|
+
return;
|
|
59
|
+
settled = true;
|
|
60
|
+
cleanup();
|
|
61
|
+
worker.terminate();
|
|
62
|
+
replaceEntry(entry);
|
|
63
|
+
reject(new Error(`Font conversion to ${targetFormat} timed out after ${CONVERT_TIMEOUT_MS}ms`));
|
|
18
64
|
}, CONVERT_TIMEOUT_MS);
|
|
19
65
|
timer.unref();
|
|
20
|
-
|
|
66
|
+
const cleanup = () => {
|
|
67
|
+
clearTimeout(timer);
|
|
68
|
+
worker.off('message', onMessage);
|
|
69
|
+
worker.off('error', onError);
|
|
70
|
+
worker.off('exit', onExit);
|
|
71
|
+
};
|
|
72
|
+
const onMessage = (msg) => {
|
|
21
73
|
if (settled)
|
|
22
74
|
return;
|
|
23
75
|
settled = true;
|
|
24
|
-
|
|
25
|
-
|
|
76
|
+
cleanup();
|
|
77
|
+
release(entry);
|
|
26
78
|
if (msg.type === 'result' && msg.buffer) {
|
|
27
79
|
resolve(Buffer.from(msg.buffer));
|
|
28
80
|
}
|
|
29
81
|
else {
|
|
30
82
|
reject(new Error(msg.error || `Font conversion to ${targetFormat} failed`));
|
|
31
83
|
}
|
|
32
|
-
}
|
|
33
|
-
|
|
84
|
+
};
|
|
85
|
+
const onError = (err) => {
|
|
34
86
|
if (settled)
|
|
35
87
|
return;
|
|
36
88
|
settled = true;
|
|
37
|
-
|
|
89
|
+
cleanup();
|
|
38
90
|
worker.terminate();
|
|
91
|
+
replaceEntry(entry);
|
|
39
92
|
reject(err);
|
|
40
|
-
}
|
|
41
|
-
|
|
93
|
+
};
|
|
94
|
+
const onExit = (code) => {
|
|
95
|
+
if (settled)
|
|
96
|
+
return;
|
|
97
|
+
settled = true;
|
|
98
|
+
cleanup();
|
|
99
|
+
replaceEntry(entry);
|
|
100
|
+
reject(new Error(`Font converter worker exited unexpectedly with code ${code}`));
|
|
101
|
+
};
|
|
102
|
+
worker.on('message', onMessage);
|
|
103
|
+
worker.on('error', onError);
|
|
104
|
+
worker.on('exit', onExit);
|
|
105
|
+
try {
|
|
106
|
+
worker.postMessage({ buffer, targetFormat, sourceFormat });
|
|
107
|
+
}
|
|
108
|
+
catch (err) {
|
|
109
|
+
settled = true;
|
|
110
|
+
cleanup();
|
|
111
|
+
release(entry);
|
|
112
|
+
reject(err);
|
|
113
|
+
}
|
|
42
114
|
});
|
|
43
115
|
}
|
|
116
|
+
function convert(buffer, targetFormat, sourceFormat) {
|
|
117
|
+
const entry = acquire();
|
|
118
|
+
if (entry) {
|
|
119
|
+
return doConvert(entry, buffer, targetFormat, sourceFormat);
|
|
120
|
+
}
|
|
121
|
+
return new Promise((resolve) => {
|
|
122
|
+
_waiters.push(resolve);
|
|
123
|
+
}).then((e) => doConvert(e, buffer, targetFormat, sourceFormat));
|
|
124
|
+
}
|
|
125
|
+
async function destroy() {
|
|
126
|
+
_waiters.length = 0;
|
|
127
|
+
await Promise.all(_pool.map((e) => e.worker.terminate()));
|
|
128
|
+
_pool.length = 0;
|
|
129
|
+
}
|
|
44
130
|
//# sourceMappingURL=fontConverter.js.map
|
package/lib/fontConverter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fontConverter.js","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fontConverter.js","sourceRoot":"","sources":["../src/fontConverter.ts"],"names":[],"mappings":"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"}
|
package/lib/subsetGeneration.js
CHANGED
|
@@ -47,7 +47,7 @@ const subsetFontWithGlyphs = require("./subsetFontWithGlyphs");
|
|
|
47
47
|
const codepointMaps_1 = require("./codepointMaps");
|
|
48
48
|
// Bump when subsetting behaviour changes to invalidate stale disk-cache
|
|
49
49
|
// entries (e.g. after adding hinting removal or table stripping).
|
|
50
|
-
const SUBSET_CACHE_VERSION = '
|
|
50
|
+
const SUBSET_CACHE_VERSION = '6';
|
|
51
51
|
// Cache the SHA-256 hash state after feeding SUBSET_CACHE_VERSION + fontBuffer.
|
|
52
52
|
// For a font with 2 target formats this halves the hashing work on large buffers.
|
|
53
53
|
// Uses WeakMap so entries are garbage-collected when the buffer is released.
|
package/package.json
CHANGED