@cantoo/fontkit 2.0.4 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cantoo/fontkit",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "An advanced font engine for Node and the browser",
   "keywords": [
     "opentype",
@@ -82,6 +82,7 @@
     "@babel/eslint-parser": "^8.0.1",
     "@babel/plugin-proposal-decorators": "^8.0.2",
     "@eslint/js": "^10.0.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
     "@vitest/coverage-v8": "^5.0.0",
     "codepoints": "^1.3.0",
     "esbuild": "^0.28.2",

package/src/CmapProcessor.js

@@ -34,7 +34,7 @@ export default class CmapProcessor {
     }
 
     if (!this.cmap) {
-      throw new Error("Could not find a supported cmap table");
+      throw new Error('Could not find a supported cmap table');
     }
 
     this.uvs = this.findSubtable(cmapTable, [[0, 5]]);
@@ -155,7 +155,7 @@ export default class CmapProcessor {
       return 0;
     }
 
-    let {defaultUVS, nonDefaultUVS} = selectors[i];
+    let { defaultUVS, nonDefaultUVS } = selectors[i];
 
     // Default UVS: fall back to the base character's normal cmap glyph.
     if (defaultUVS && binarySearch(defaultUVS, x =>

package/src/DFont.js

@@ -86,11 +86,11 @@ export default class DFont {
       let stream = new r.DecodeStream(this.stream.buffer.slice(pos));
       let font = new TTFFont(stream);
       if (
-        font.postscriptName === name ||
-        (
-          font.postscriptName instanceof Uint8Array && 
-          name instanceof Uint8Array && 
-          font.postscriptName.every((v, i) => name[i] === v)
+        font.postscriptName === name
+        || (
+          font.postscriptName instanceof Uint8Array
+          && name instanceof Uint8Array
+          && font.postscriptName.every((v, i) => name[i] === v)
         )
       ) {
         return font;

package/src/TTFFont.js

@@ -1,4 +1,3 @@
-import * as r from 'restructure';
 import { cache } from './decorators';
 import * as fontkit from './base';
 import Directory from './tables/directory';
@@ -82,7 +81,7 @@ export default class TTFFont {
   }
 
   _decodeDirectory() {
-    return this.directory = Directory.decode(this.stream, {_startOffset: 0});
+    return this.directory = Directory.decode(this.stream, { _startOffset: 0 });
   }
 
   _decodeTable(table) {
@@ -108,14 +107,14 @@ export default class TTFFont {
     let ascent, descent, lineGap;
 
     if (hasTypo && os2.fsSelection.useTypoMetrics) {
-      ({typoAscender: ascent, typoDescender: descent, typoLineGap: lineGap} = os2);
+      ({ typoAscender: ascent, typoDescender: descent, typoLineGap: lineGap } = os2);
     } else {
-      ({ascent, descent, lineGap} = this.hhea);
+      ({ ascent, descent, lineGap } = this.hhea);
 
       // Only when both hhea values are zero — FreeType uses !(ascender || descender)
       if (!(ascent || descent) && hasTypo) {
         if (os2.typoAscender || os2.typoDescender) {
-          ({typoAscender: ascent, typoDescender: descent, typoLineGap: lineGap} = os2);
+          ({ typoAscender: ascent, typoDescender: descent, typoLineGap: lineGap } = os2);
         } else {
           ascent = os2.winAscent;
           descent = -os2.winDescent;
@@ -142,12 +141,12 @@ export default class TTFFont {
     if (record) {
       // Attempt to retrieve the entry, depending on which translation is available:
       return (
-          record[lang]
-          || record[this.defaultLanguage]
-          || record[fontkit.defaultLanguage]
-          || record['en']
-          || record[Object.keys(record)[0]] // Seriously, ANY language would be fine
-          || null
+        record[lang]
+        || record[this.defaultLanguage]
+        || record[fontkit.defaultLanguage]
+        || record['en']
+        || record[Object.keys(record)[0]] // Seriously, ANY language would be fine
+        || null
       );
     }
 
@@ -467,13 +466,10 @@ export default class TTFFont {
     if (!this._glyphs[glyph]) {
       if (this.directory.tables.sbix) {
         this._glyphs[glyph] = new SBIXGlyph(glyph, characters, this);
-
       } else if ((this.directory.tables.COLR) && (this.directory.tables.CPAL)) {
         this._glyphs[glyph] = new COLRGlyph(glyph, characters, this);
-
       } else if (this.directory.tables.CBLC || this.directory.tables.EBLC) {
         this._glyphs[glyph] = new CBDTGlyph(glyph, characters, this);
-
       } else {
         this._getBaseGlyph(glyph, characters);
       }
@@ -569,7 +565,7 @@ export default class TTFFont {
     }
 
     // normalize the coordinates
-    let coords = this.fvar.axis.map(axis => {
+    let coords = this.fvar.axis.map((axis) => {
       let axisTag = axis.axisTag.trim();
       if (axisTag in settings) {
         return Math.max(axis.minValue, Math.min(axis.maxValue, settings[axisTag]));

package/src/TrueTypeCollection.js

@@ -4,13 +4,13 @@ import { asciiDecoder } from './utils';
 
 let TTCHeader = new r.VersionedStruct(r.uint32, {
   0x00010000: {
-    numFonts:   r.uint32,
-    offsets:    new r.Array(r.uint32, 'numFonts')
+    numFonts: r.uint32,
+    offsets: new r.Array(r.uint32, 'numFonts')
   },
   0x00020000: {
-    numFonts:   r.uint32,
-    offsets:    new r.Array(r.uint32, 'numFonts'),
-    dsigTag:    r.uint32,
+    numFonts: r.uint32,
+    offsets: new r.Array(r.uint32, 'numFonts'),
+    dsigTag: r.uint32,
     dsigLength: r.uint32,
     dsigOffset: r.uint32
   }
@@ -38,11 +38,11 @@ export default class TrueTypeCollection {
       stream.pos = offset;
       let font = new TTFFont(stream);
       if (
-        font.postscriptName === name ||
-        (
-          font.postscriptName instanceof Uint8Array && 
-          name instanceof Uint8Array && 
-          font.postscriptName.every((v, i) => name[i] === v)
+        font.postscriptName === name
+        || (
+          font.postscriptName instanceof Uint8Array
+          && name instanceof Uint8Array
+          && font.postscriptName.every((v, i) => name[i] === v)
         )
       ) {
         return font;

package/src/WOFF2Font.js

@@ -97,7 +97,6 @@ export default class WOFF2Font extends TTFFont {
         }
 
         read255UInt16(table.glyphs);
-
       } else if (nContours < 0) { // composite glyph
         let haveInstructions = TTFGlyph.prototype._decodeComposite.call({ _font: this }, glyph, table.composites);
         if (haveInstructions) {
@@ -186,28 +185,23 @@ function decodeTriplet(flags, glyphs, nPoints) {
     if (flag < 10) {
       dx = 0;
       dy = withSign(flag, ((flag & 14) << 7) + glyphs.readUInt8());
-
     } else if (flag < 20) {
       dx = withSign(flag, (((flag - 10) & 14) << 7) + glyphs.readUInt8());
       dy = 0;
-
     } else if (flag < 84) {
       let b0 = flag - 20;
       let b1 = glyphs.readUInt8();
       dx = withSign(flag, 1 + (b0 & 0x30) + (b1 >> 4));
       dy = withSign(flag >> 1, 1 + ((b0 & 0x0c) << 2) + (b1 & 0x0f));
-
     } else if (flag < 120) {
       let b0 = flag - 84;
       dx = withSign(flag, 1 + ((b0 / 12) << 8) + glyphs.readUInt8());
       dy = withSign(flag >> 1, 1 + (((b0 % 12) >> 2) << 8) + glyphs.readUInt8());
-
     } else if (flag < 124) {
       let b1 = glyphs.readUInt8();
       let b2 = glyphs.readUInt8();
       dx = withSign(flag, (b1 << 4) + (b2 >> 4));
       dy = withSign(flag >> 1, ((b2 & 0x0f) << 8) + glyphs.readUInt8());
-
     } else {
       dx = withSign(flag, glyphs.readUInt16BE());
       dy = withSign(flag >> 1, glyphs.readUInt16BE());

package/src/aat/AATFeatureMap.js

@@ -32,12 +32,12 @@ const features = {
     code: 3,
     exclusive: true
   },
-    // upperAndLowerCase: 0          # deprecated
-    // allCaps: 1                    # deprecated
-    // allLowerCase: 2               # deprecated
-    // smallCaps: 3                  # deprecated
-    // initialCaps: 4                # deprecated
-    // initialCapsAndSmallCaps: 5    # deprecated
+  // upperAndLowerCase: 0          # deprecated
+  // allCaps: 1                    # deprecated
+  // allLowerCase: 2               # deprecated
+  // smallCaps: 3                  # deprecated
+  // initialCaps: 4                # deprecated
+  // initialCapsAndSmallCaps: 5    # deprecated
   verticalSubstitution: {
     code: 4,
     exclusive: false,
@@ -100,9 +100,9 @@ const features = {
     // hyphenToEnDash: 2
     slashedZero: 4
   },
-    // formInterrobang: 6
-    // smartQuotes: 8
-    // periodsToEllipsis: 10
+  // formInterrobang: 6
+  // smartQuotes: 8
+  // periodsToEllipsis: 10
   mathematicalExtras: {
     code: 15,
     exclusive: false,
@@ -129,7 +129,7 @@ const features = {
     exclusive: true,
     noAlternates: 0
   },
-    // user defined options
+  // user defined options
   designComplexity: {
     code: 18,
     exclusive: true,
@@ -190,15 +190,15 @@ const features = {
     exclusive: true,
     noTransliteration: 0
   },
-    // hanjaToHangul: 1
-    // hiraganaToKatakana: 2
-    // katakanaToHiragana: 3
-    // kanaToRomanization: 4
-    // romanizationToHiragana: 5
-    // romanizationToKatakana: 6
-    // hanjaToHangulAltOne: 7
-    // hanjaToHangulAltTwo: 8
-    // hanjaToHangulAltThree: 9
+  // hanjaToHangul: 1
+  // hiraganaToKatakana: 2
+  // katakanaToHiragana: 3
+  // kanaToRomanization: 4
+  // romanizationToHiragana: 5
+  // romanizationToKatakana: 6
+  // hanjaToHangulAltOne: 7
+  // hanjaToHangulAltTwo: 8
+  // hanjaToHangulAltThree: 9
   annotation: {
     code: 24,
     exclusive: true,
@@ -418,7 +418,7 @@ const OTMapping = {
   hwid: feature('textSpacing', 'halfWidthText'),
   qwid: feature('textSpacing', 'quarterWidthText'), // also QuarterWidthNumbers?
   twid: feature('textSpacing', 'thirdWidthText'), // also ThirdWidthNumbers?
-  fwid: feature('textSpacing', 'proportionalText'), //??
+  fwid: feature('textSpacing', 'proportionalText'), // ??
   palt: feature('textSpacing', 'altProportionalText'),
   trad: feature('characterShape', 'traditionalCharacters'),
   smpl: feature('characterShape', 'simplifiedCharacters'),
@@ -456,7 +456,7 @@ const OTMapping = {
   ss20: feature('stylisticAlternatives', 'stylisticAltTwenty')
 };
 
-  // salt: feature 'stylisticAlternatives', 'stylisticAltOne' # hmm, which one to choose
+// salt: feature 'stylisticAlternatives', 'stylisticAltOne' # hmm, which one to choose
 
 // Add cv01-cv99 features
 for (let i = 1; i <= 99; i++) {
@@ -527,7 +527,6 @@ export function mapAATToOT(features) {
         res[r] = true;
       }
     }
-
   } else if (typeof features === 'object') {
     for (let type in features) {
       let feature = features[type];

package/src/aat/AATLayoutEngine.js

@@ -24,7 +24,7 @@ export default class AATLayoutEngine {
 
   stringsForGlyph(gid) {
     let glyphStrings = this.morxProcessor.generateInputs(gid);
-    let result = new Set;
+    let result = new Set();
 
     for (let glyphs of glyphStrings) {
       this._addStrings(glyphs, 0, result, '');

package/src/aat/AATLookupTable.js

@@ -1,5 +1,5 @@
-import {cache} from '../decorators';
-import {range} from '../utils';
+import { cache } from '../decorators';
+import { range } from '../utils';
 
 export default class AATLookupTable {
   constructor(table) {

package/src/aat/AATMorxProcessor.js

@@ -1,35 +1,35 @@
 import AATStateMachine from './AATStateMachine';
 import AATLookupTable from './AATLookupTable';
-import {cache} from '../decorators';
+import { cache } from '../decorators';
 
 // indic replacement flags
 const MARK_FIRST = 0x8000;
-const MARK_LAST  = 0x2000;
-const VERB       = 0x000F;
+const MARK_LAST = 0x2000;
+const VERB = 0x000F;
 
 // contextual substitution and glyph insertion flag
 const SET_MARK = 0x8000;
 
 // ligature entry flags
-const SET_COMPONENT  = 0x8000;
+const SET_COMPONENT = 0x8000;
 const PERFORM_ACTION = 0x2000;
 
 // ligature action masks
-const LAST_MASK   = 0x80000000;
-const STORE_MASK  = 0x40000000;
+const LAST_MASK = 0x80000000;
+const STORE_MASK = 0x40000000;
 const OFFSET_MASK = 0x3FFFFFFF;
 
-const _VERTICAL_ONLY           = 0x800000;
-const REVERSE_DIRECTION        = 0x400000;
+const _VERTICAL_ONLY = 0x800000;
+const REVERSE_DIRECTION = 0x400000;
 const _HORIZONTAL_AND_VERTICAL = 0x200000;
 
 // glyph insertion flags
 const _CURRENT_IS_KASHIDA_LIKE = 0x2000;
-const _MARKED_IS_KASHIDA_LIKE  = 0x1000;
-const CURRENT_INSERT_BEFORE   = 0x0800;
-const MARKED_INSERT_BEFORE    = 0x0400;
-const CURRENT_INSERT_COUNT    = 0x03E0;
-const MARKED_INSERT_COUNT     = 0x001F;
+const _MARKED_IS_KASHIDA_LIKE = 0x1000;
+const CURRENT_INSERT_BEFORE = 0x0800;
+const MARKED_INSERT_BEFORE = 0x0400;
+const CURRENT_INSERT_COUNT = 0x03E0;
+const MARKED_INSERT_COUNT = 0x001F;
 
 export default class AATMorxProcessor {
   constructor(font) {
@@ -348,7 +348,7 @@ export default class AATMorxProcessor {
       },
 
       exit: () => {
-        ({glyphs: this.glyphs, ligatureStack: this.ligatureStack} = stack.pop());
+        ({ glyphs: this.glyphs, ligatureStack: this.ligatureStack } = stack.pop());
         input.pop();
       }
     });

package/src/aat/AATStateMachine.js

@@ -44,7 +44,7 @@ export default class AATStateMachine {
       let entryIndex = row[classCode];
       let entry = this.stateTable.entryTable.getItem(entryIndex);
 
-      if (classCode !== END_OF_TEXT_CLASS && classCode !==  DELETED_GLYPH_CLASS) {
+      if (classCode !== END_OF_TEXT_CLASS && classCode !== DELETED_GLYPH_CLASS) {
         processEntry(glyph, entry, index);
         shouldAdvance = !(entry.flags & DONT_ADVANCE);
       }
@@ -62,14 +62,14 @@ export default class AATStateMachine {
    * Performs a depth-first traversal of the glyph strings
    * represented by the state machine.
    */
-  traverse(opts, state = 0, visited = new Set) {
+  traverse(opts, state = 0, visited = new Set()) {
     if (visited.has(state)) {
       return;
     }
 
     visited.add(state);
 
-    let {nClasses, stateArray, entryTable} = this.stateTable;
+    let { nClasses, stateArray, entryTable } = this.stateTable;
     let row = stateArray.getItem(state);
 
     // Skip predefined classes

package/src/base.js

@@ -1,4 +1,4 @@
-import {DecodeStream} from 'restructure';
+import { DecodeStream } from 'restructure';
 
 export let logErrors = false;
 

package/src/cff/CFFDict.js

@@ -54,8 +54,8 @@ export default class CFFDict {
 
     // define hidden properties
     Object.defineProperties(ret, {
-      parent:         { value: parent },
-      _startOffset:   { value: stream.pos }
+      parent: { value: parent },
+      _startOffset: { value: stream.pos }
     });
 
     // fill in defaults

package/src/cff/CFFFont.js

@@ -20,7 +20,7 @@ class CFFFont {
 
     if (this.version < 2) {
       if (this.topDictIndex.length !== 1) {
-        throw new Error("Only a single font is allowed in CFF");
+        throw new Error('Only a single font is allowed in CFF');
       }
 
       this.topDict = this.topDictIndex[0];

package/src/cff/CFFIndex.js

@@ -71,7 +71,7 @@ export default class CFFIndex {
       return size;
     }
 
-    let type = this.type || new r.Buffer;
+    let type = this.type || new r.Buffer();
 
     // find maximum offset to detminine offset type
     let offset = 1;
@@ -90,7 +90,7 @@ export default class CFFIndex {
     } else if (offset <= 0xffffffff) {
       offsetType = r.uint32;
     } else {
-      throw new Error("Bad offset in CFFIndex");
+      throw new Error('Bad offset in CFFIndex');
     }
 
     size += 1 + offsetType.size() * (arr.length + 1);
@@ -105,7 +105,7 @@ export default class CFFIndex {
       return;
     }
 
-    let type = this.type || new r.Buffer;
+    let type = this.type || new r.Buffer();
 
     // find maximum offset to detminine offset type
     let sizes = [];
@@ -126,7 +126,7 @@ export default class CFFIndex {
     } else if (offset <= 0xffffffff) {
       offsetType = r.uint32;
     } else {
-      throw new Error("Bad offset in CFFIndex");
+      throw new Error('Bad offset in CFFIndex');
     }
 
     // write offset size

package/src/cff/CFFOperand.js

@@ -6,7 +6,7 @@ const FLOAT_LOOKUP = [
 
 const FLOAT_ENCODE_LOOKUP = {
   '.': 10,
-  'E': 11,
+  E: 11,
   'E-': 12,
   '-': 14
 };
@@ -63,16 +63,12 @@ export default class CFFOperand {
     if ((value | 0) !== value) { // floating point
       let str = '' + value;
       return 1 + Math.ceil((str.length + 1) / 2);
-
     } else if (-107 <= value && value <= 107) {
       return 1;
-
     } else if (108 <= value && value <= 1131 || -1131 <= value && value <= -108) {
       return 2;
-
     } else if (-32768 <= value && value <= 32767) {
       return 3;
-
     } else {
       return 5;
     }
@@ -86,7 +82,6 @@ export default class CFFOperand {
     if (value.forceLarge) {
       stream.writeUInt8(29);
       return stream.writeInt32BE(val);
-
     } else if ((val | 0) !== val) { // floating point
       stream.writeUInt8(30);
 
@@ -109,24 +104,19 @@ export default class CFFOperand {
       if (n2 !== FLOAT_EOF) {
         return stream.writeUInt8((FLOAT_EOF << 4));
       }
-
     } else if (-107 <= val && val <= 107) {
       return stream.writeUInt8(val + 139);
-
     } else if (108 <= val && val <= 1131) {
       val -= 108;
       stream.writeUInt8((val >> 8) + 247);
       return stream.writeUInt8(val & 0xff);
-
     } else if (-1131 <= val && val <= -108) {
       val = -val - 108;
       stream.writeUInt8((val >> 8) + 251);
       return stream.writeUInt8(val & 0xff);
-
     } else if (-32768 <= val && val <= 32767) {
       stream.writeUInt8(28);
       return stream.writeInt16BE(val);
-
     } else {
       stream.writeUInt8(29);
       return stream.writeInt32BE(val);

package/src/cff/CFFPrivateDict.js

@@ -16,24 +16,24 @@ class CFFBlendOp {
 
 export default new CFFDict([
   // key       name                    type                                          default
-  [6,         'BlueValues',           'delta',                                       null],
-  [7,         'OtherBlues',           'delta',                                       null],
-  [8,         'FamilyBlues',          'delta',                                       null],
-  [9,         'FamilyOtherBlues',     'delta',                                       null],
-  [[12, 9],   'BlueScale',            'number',                                      0.039625],
-  [[12, 10],  'BlueShift',            'number',                                      7],
-  [[12, 11],  'BlueFuzz',             'number',                                      1],
-  [10,        'StdHW',                'number',                                      null],
-  [11,        'StdVW',                'number',                                      null],
-  [[12, 12],  'StemSnapH',            'delta',                                       null],
-  [[12, 13],  'StemSnapV',            'delta',                                       null],
-  [[12, 14],  'ForceBold',            'boolean',                                     false],
-  [[12, 17],  'LanguageGroup',        'number',                                      0],
-  [[12, 18],  'ExpansionFactor',      'number',                                      0.06],
-  [[12, 19],  'initialRandomSeed',    'number',                                      0],
-  [20,        'defaultWidthX',        'number',                                      0],
-  [21,        'nominalWidthX',        'number',                                      0],
-  [22,        'vsindex',              'number',                                      0],
-  [23,        'blend',                CFFBlendOp,                                    null],
-  [19,        'Subrs',                new CFFPointer(new CFFIndex, {type: 'local'}), null]
+  [6, 'BlueValues', 'delta', null],
+  [7, 'OtherBlues', 'delta', null],
+  [8, 'FamilyBlues', 'delta', null],
+  [9, 'FamilyOtherBlues', 'delta', null],
+  [[12, 9], 'BlueScale', 'number', 0.039625],
+  [[12, 10], 'BlueShift', 'number', 7],
+  [[12, 11], 'BlueFuzz', 'number', 1],
+  [10, 'StdHW', 'number', null],
+  [11, 'StdVW', 'number', null],
+  [[12, 12], 'StemSnapH', 'delta', null],
+  [[12, 13], 'StemSnapV', 'delta', null],
+  [[12, 14], 'ForceBold', 'boolean', false],
+  [[12, 17], 'LanguageGroup', 'number', 0],
+  [[12, 18], 'ExpansionFactor', 'number', 0.06],
+  [[12, 19], 'initialRandomSeed', 'number', 0],
+  [20, 'defaultWidthX', 'number', 0],
+  [21, 'nominalWidthX', 'number', 0],
+  [22, 'vsindex', 'number', 0],
+  [23, 'blend', CFFBlendOp, null],
+  [19, 'Subrs', new CFFPointer(new CFFIndex(), { type: 'local' }), null]
 ]);