@mapwhit/tilerenderer 0.52.1 → 1.1.0

package/src/util/script_detection.js

@@ -1,73 +1,118 @@
-const isChar = require('./is_char_in_unicode_block');
+import isChar from './is_char_in_unicode_block.js';
 
-module.exports = {
-  allowsIdeographicBreaking,
-  allowsVerticalWritingMode,
-  allowsLetterSpacing,
-  charAllowsLetterSpacing,
-  charAllowsIdeographicBreaking,
-  charHasUprightVerticalOrientation,
-  charHasNeutralVerticalOrientation,
-  charHasRotatedVerticalOrientation,
-  charInSupportedScript,
-  isStringInSupportedScript
-};
-
-function allowsIdeographicBreaking(chars) {
+export function allowsIdeographicBreaking(chars) {
   for (const char of chars) {
-    if (!charAllowsIdeographicBreaking(char.charCodeAt(0))) return false;
+    if (!charAllowsIdeographicBreaking(char.charCodeAt(0))) {
+      return false;
+    }
   }
   return true;
 }
 
-function allowsVerticalWritingMode(chars) {
+export function allowsVerticalWritingMode(chars) {
   for (const char of chars) {
-    if (charHasUprightVerticalOrientation(char.charCodeAt(0))) return true;
+    if (charHasUprightVerticalOrientation(char.charCodeAt(0))) {
+      return true;
+    }
   }
   return false;
 }
 
-function allowsLetterSpacing(chars) {
+export function allowsLetterSpacing(chars) {
   for (const char of chars) {
-    if (!charAllowsLetterSpacing(char.charCodeAt(0))) return false;
+    if (!charAllowsLetterSpacing(char.charCodeAt(0))) {
+      return false;
+    }
   }
   return true;
 }
 
-function charAllowsLetterSpacing(char) {
-  if (isChar['Arabic'](char)) return false;
-  if (isChar['Arabic Supplement'](char)) return false;
-  if (isChar['Arabic Extended-A'](char)) return false;
-  if (isChar['Arabic Presentation Forms-A'](char)) return false;
-  if (isChar['Arabic Presentation Forms-B'](char)) return false;
+export function charAllowsLetterSpacing(char) {
+  if (isChar['Arabic'](char)) {
+    return false;
+  }
+  if (isChar['Arabic Supplement'](char)) {
+    return false;
+  }
+  if (isChar['Arabic Extended-A'](char)) {
+    return false;
+  }
+  if (isChar['Arabic Presentation Forms-A'](char)) {
+    return false;
+  }
+  if (isChar['Arabic Presentation Forms-B'](char)) {
+    return false;
+  }
 
   return true;
 }
 
-function charAllowsIdeographicBreaking(char) {
+export function charAllowsIdeographicBreaking(char) {
   // Return early for characters outside all ideographic ranges.
-  if (char < 0x2e80) return false;
+  if (char < 0x2e80) {
+    return false;
+  }
 
-  if (isChar['Bopomofo Extended'](char)) return true;
-  if (isChar['Bopomofo'](char)) return true;
-  if (isChar['CJK Compatibility Forms'](char)) return true;
-  if (isChar['CJK Compatibility Ideographs'](char)) return true;
-  if (isChar['CJK Compatibility'](char)) return true;
-  if (isChar['CJK Radicals Supplement'](char)) return true;
-  if (isChar['CJK Strokes'](char)) return true;
-  if (isChar['CJK Symbols and Punctuation'](char)) return true;
-  if (isChar['CJK Unified Ideographs Extension A'](char)) return true;
-  if (isChar['CJK Unified Ideographs'](char)) return true;
-  if (isChar['Enclosed CJK Letters and Months'](char)) return true;
-  if (isChar['Halfwidth and Fullwidth Forms'](char)) return true;
-  if (isChar['Hiragana'](char)) return true;
-  if (isChar['Ideographic Description Characters'](char)) return true;
-  if (isChar['Kangxi Radicals'](char)) return true;
-  if (isChar['Katakana Phonetic Extensions'](char)) return true;
-  if (isChar['Katakana'](char)) return true;
-  if (isChar['Vertical Forms'](char)) return true;
-  if (isChar['Yi Radicals'](char)) return true;
-  if (isChar['Yi Syllables'](char)) return true;
+  if (isChar['Bopomofo Extended'](char)) {
+    return true;
+  }
+  if (isChar['Bopomofo'](char)) {
+    return true;
+  }
+  if (isChar['CJK Compatibility Forms'](char)) {
+    return true;
+  }
+  if (isChar['CJK Compatibility Ideographs'](char)) {
+    return true;
+  }
+  if (isChar['CJK Compatibility'](char)) {
+    return true;
+  }
+  if (isChar['CJK Radicals Supplement'](char)) {
+    return true;
+  }
+  if (isChar['CJK Strokes'](char)) {
+    return true;
+  }
+  if (isChar['CJK Symbols and Punctuation'](char)) {
+    return true;
+  }
+  if (isChar['CJK Unified Ideographs Extension A'](char)) {
+    return true;
+  }
+  if (isChar['CJK Unified Ideographs'](char)) {
+    return true;
+  }
+  if (isChar['Enclosed CJK Letters and Months'](char)) {
+    return true;
+  }
+  if (isChar['Halfwidth and Fullwidth Forms'](char)) {
+    return true;
+  }
+  if (isChar['Hiragana'](char)) {
+    return true;
+  }
+  if (isChar['Ideographic Description Characters'](char)) {
+    return true;
+  }
+  if (isChar['Kangxi Radicals'](char)) {
+    return true;
+  }
+  if (isChar['Katakana Phonetic Extensions'](char)) {
+    return true;
+  }
+  if (isChar['Katakana'](char)) {
+    return true;
+  }
+  if (isChar['Vertical Forms'](char)) {
+    return true;
+  }
+  if (isChar['Yi Radicals'](char)) {
+    return true;
+  }
+  if (isChar['Yi Syllables'](char)) {
+    return true;
+  }
 
   return false;
 }
@@ -92,7 +137,7 @@ function charAllowsIdeographicBreaking(char) {
  * “neutral” character to be drawn upright as well.
  * @private
  */
-function charHasUprightVerticalOrientation(char) {
+export function charHasUprightVerticalOrientation(char) {
   if (
     char === 0x02ea /* modifier letter yin departing tone mark */ ||
     char === 0x02eb /* modifier letter yang departing tone mark */
@@ -102,19 +147,33 @@ function charHasUprightVerticalOrientation(char) {
 
   // Return early for characters outside all ranges whose characters remain
   // upright in vertical writing mode.
-  if (char < 0x1100) return false;
+  if (char < 0x1100) {
+    return false;
+  }
 
-  if (isChar['Bopomofo Extended'](char)) return true;
-  if (isChar['Bopomofo'](char)) return true;
+  if (isChar['Bopomofo Extended'](char)) {
+    return true;
+  }
+  if (isChar['Bopomofo'](char)) {
+    return true;
+  }
   if (isChar['CJK Compatibility Forms'](char)) {
     if (!((char >= 0xfe49 /* dashed overline */ && char <= 0xfe4f) /* wavy low line */)) {
       return true;
     }
   }
-  if (isChar['CJK Compatibility Ideographs'](char)) return true;
-  if (isChar['CJK Compatibility'](char)) return true;
-  if (isChar['CJK Radicals Supplement'](char)) return true;
-  if (isChar['CJK Strokes'](char)) return true;
+  if (isChar['CJK Compatibility Ideographs'](char)) {
+    return true;
+  }
+  if (isChar['CJK Compatibility'](char)) {
+    return true;
+  }
+  if (isChar['CJK Radicals Supplement'](char)) {
+    return true;
+  }
+  if (isChar['CJK Strokes'](char)) {
+    return true;
+  }
   if (isChar['CJK Symbols and Punctuation'](char)) {
     if (
       !((char >= 0x3008 /* left angle bracket */ && char <= 0x3011) /* right black lenticular bracket */) &&
@@ -124,19 +183,45 @@ function charHasUprightVerticalOrientation(char) {
       return true;
     }
   }
-  if (isChar['CJK Unified Ideographs Extension A'](char)) return true;
-  if (isChar['CJK Unified Ideographs'](char)) return true;
-  if (isChar['Enclosed CJK Letters and Months'](char)) return true;
-  if (isChar['Hangul Compatibility Jamo'](char)) return true;
-  if (isChar['Hangul Jamo Extended-A'](char)) return true;
-  if (isChar['Hangul Jamo Extended-B'](char)) return true;
-  if (isChar['Hangul Jamo'](char)) return true;
-  if (isChar['Hangul Syllables'](char)) return true;
-  if (isChar['Hiragana'](char)) return true;
-  if (isChar['Ideographic Description Characters'](char)) return true;
-  if (isChar['Kanbun'](char)) return true;
-  if (isChar['Kangxi Radicals'](char)) return true;
-  if (isChar['Katakana Phonetic Extensions'](char)) return true;
+  if (isChar['CJK Unified Ideographs Extension A'](char)) {
+    return true;
+  }
+  if (isChar['CJK Unified Ideographs'](char)) {
+    return true;
+  }
+  if (isChar['Enclosed CJK Letters and Months'](char)) {
+    return true;
+  }
+  if (isChar['Hangul Compatibility Jamo'](char)) {
+    return true;
+  }
+  if (isChar['Hangul Jamo Extended-A'](char)) {
+    return true;
+  }
+  if (isChar['Hangul Jamo Extended-B'](char)) {
+    return true;
+  }
+  if (isChar['Hangul Jamo'](char)) {
+    return true;
+  }
+  if (isChar['Hangul Syllables'](char)) {
+    return true;
+  }
+  if (isChar['Hiragana'](char)) {
+    return true;
+  }
+  if (isChar['Ideographic Description Characters'](char)) {
+    return true;
+  }
+  if (isChar['Kanbun'](char)) {
+    return true;
+  }
+  if (isChar['Kangxi Radicals'](char)) {
+    return true;
+  }
+  if (isChar['Katakana Phonetic Extensions'](char)) {
+    return true;
+  }
   if (isChar['Katakana'](char)) {
     if (char !== 0x30fc /* katakana-hiragana prolonged sound mark */) {
       return true;
@@ -166,12 +251,24 @@ function charHasUprightVerticalOrientation(char) {
       return true;
     }
   }
-  if (isChar['Unified Canadian Aboriginal Syllabics'](char)) return true;
-  if (isChar['Unified Canadian Aboriginal Syllabics Extended'](char)) return true;
-  if (isChar['Vertical Forms'](char)) return true;
-  if (isChar['Yijing Hexagram Symbols'](char)) return true;
-  if (isChar['Yi Syllables'](char)) return true;
-  if (isChar['Yi Radicals'](char)) return true;
+  if (isChar['Unified Canadian Aboriginal Syllabics'](char)) {
+    return true;
+  }
+  if (isChar['Unified Canadian Aboriginal Syllabics Extended'](char)) {
+    return true;
+  }
+  if (isChar['Vertical Forms'](char)) {
+    return true;
+  }
+  if (isChar['Yijing Hexagram Symbols'](char)) {
+    return true;
+  }
+  if (isChar['Yi Syllables'](char)) {
+    return true;
+  }
+  if (isChar['Yi Radicals'](char)) {
+    return true;
+  }
 
   return false;
 }
@@ -188,7 +285,7 @@ function charHasUprightVerticalOrientation(char) {
  * adjacent character is drawn upright or rotated.
  * @private
  */
-function charHasNeutralVerticalOrientation(char) {
+export function charHasNeutralVerticalOrientation(char) {
   if (isChar['Latin-1 Supplement'](char)) {
     if (
       char === 0x00a7 /* section sign */ ||
@@ -222,8 +319,12 @@ function charHasNeutralVerticalOrientation(char) {
       return true;
     }
   }
-  if (isChar['Letterlike Symbols'](char)) return true;
-  if (isChar['Number Forms'](char)) return true;
+  if (isChar['Letterlike Symbols'](char)) {
+    return true;
+  }
+  if (isChar['Number Forms'](char)) {
+    return true;
+  }
   if (isChar['Miscellaneous Technical'](char)) {
     if (
       (char >= 0x2300 /* diameter sign */ && char <= 0x2307) /* wavy line */ ||
@@ -239,10 +340,18 @@ function charHasNeutralVerticalOrientation(char) {
       return true;
     }
   }
-  if (isChar['Control Pictures'](char) && char !== 0x2423 /* open box */) return true;
-  if (isChar['Optical Character Recognition'](char)) return true;
-  if (isChar['Enclosed Alphanumerics'](char)) return true;
-  if (isChar['Geometric Shapes'](char)) return true;
+  if (isChar['Control Pictures'](char) && char !== 0x2423 /* open box */) {
+    return true;
+  }
+  if (isChar['Optical Character Recognition'](char)) {
+    return true;
+  }
+  if (isChar['Enclosed Alphanumerics'](char)) {
+    return true;
+  }
+  if (isChar['Geometric Shapes'](char)) {
+    return true;
+  }
   if (isChar['Miscellaneous Symbols'](char)) {
     if (!((char >= 0x261a /* black left pointing index */ && char <= 0x261f) /* white down pointing index */)) {
       return true;
@@ -257,12 +366,24 @@ function charHasNeutralVerticalOrientation(char) {
       return true;
     }
   }
-  if (isChar['CJK Symbols and Punctuation'](char)) return true;
-  if (isChar['Katakana'](char)) return true;
-  if (isChar['Private Use Area'](char)) return true;
-  if (isChar['CJK Compatibility Forms'](char)) return true;
-  if (isChar['Small Form Variants'](char)) return true;
-  if (isChar['Halfwidth and Fullwidth Forms'](char)) return true;
+  if (isChar['CJK Symbols and Punctuation'](char)) {
+    return true;
+  }
+  if (isChar['Katakana'](char)) {
+    return true;
+  }
+  if (isChar['Private Use Area'](char)) {
+    return true;
+  }
+  if (isChar['CJK Compatibility Forms'](char)) {
+    return true;
+  }
+  if (isChar['Small Form Variants'](char)) {
+    return true;
+  }
+  if (isChar['Halfwidth and Fullwidth Forms'](char)) {
+    return true;
+  }
 
   if (
     char === 0x221e /* infinity */ ||
@@ -290,11 +411,11 @@ function charHasNeutralVerticalOrientation(char) {
  * character causes an adjacent “neutral” character to be drawn rotated as well.
  * @private
  */
-function charHasRotatedVerticalOrientation(char) {
+export function charHasRotatedVerticalOrientation(char) {
   return !(charHasUprightVerticalOrientation(char) || charHasNeutralVerticalOrientation(char));
 }
 
-function charInSupportedScript(char, canRenderRTL) {
+export function charInSupportedScript(char, canRenderRTL) {
   // This is a rough heuristic: whether we "can render" a script
   // actually depends on the properties of the font being used
   // and whether differences from the ideal rendering are considered
@@ -327,7 +448,7 @@ function charInSupportedScript(char, canRenderRTL) {
   return true;
 }
 
-function isStringInSupportedScript(chars, canRenderRTL) {
+export function isStringInSupportedScript(chars, canRenderRTL) {
   for (const char of chars) {
     if (!charInSupportedScript(char.charCodeAt(0), canRenderRTL)) {
       return false;

package/src/util/struct_array.js

@@ -1,8 +1,8 @@
 // Note: all "sizes" are measured in bytes
 
-const assert = require('assert');
+import assert from 'assert';
 
-const viewTypes = {
+export const viewTypes = {
   Int8: Int8Array,
   Uint8: Uint8Array,
   Int16: Int16Array,
@@ -15,7 +15,7 @@ const viewTypes = {
 /**
  * @private
  */
-class Struct {
+export class Struct {
   // The following properties are defined on the prototype of sub classes.
 
   /**
@@ -56,45 +56,14 @@ const RESIZE_MULTIPLIER = 5;
  *
  * @private
  */
-class StructArray {
+export class StructArray {
   // The following properties are defined on the prototype.
 
   constructor() {
-    this.isTransferred = false;
     this.capacity = -1;
     this.resize(0);
   }
 
-  /**
-   * Serialize a StructArray instance.  Serializes both the raw data and the
-   * metadata needed to reconstruct the StructArray base class during
-   * deserialization.
-   */
-  static serialize(array, transferables) {
-    assert(!array.isTransferred);
-
-    array._trim();
-
-    if (transferables) {
-      array.isTransferred = true;
-      transferables.push(array.arrayBuffer);
-    }
-
-    return {
-      length: array.length,
-      arrayBuffer: array.arrayBuffer
-    };
-  }
-
-  static deserialize(input) {
-    const structArray = Object.create(this.prototype);
-    structArray.arrayBuffer = input.arrayBuffer;
-    structArray.length = input.length;
-    structArray.capacity = input.arrayBuffer.byteLength / structArray.bytesPerElement;
-    structArray._refreshViews();
-    return structArray;
-  }
-
   /**
    * Resize the array to discard unused capacity.
    */
@@ -120,7 +89,6 @@ class StructArray {
    * @param {number} n The new size of the array.
    */
   resize(n) {
-    assert(!this.isTransferred);
     this.reserve(n);
     this.length = n;
   }
@@ -137,7 +105,9 @@ class StructArray {
 
       const oldUint8Array = this.uint8;
       this._refreshViews();
-      if (oldUint8Array) this.uint8.set(oldUint8Array);
+      if (oldUint8Array) {
+        this.uint8.set(oldUint8Array);
+      }
     }
   }
 
@@ -157,7 +127,7 @@ class StructArray {
  *
  * @private
  */
-function createLayout(members, alignment = 1) {
+export function createLayout(members, alignment = 1) {
   let offset = 0;
   let maxSize = 0;
   const layoutMembers = members.map(member => {
@@ -193,5 +163,3 @@ function sizeOf(type) {
 function align(offset, size) {
   return Math.ceil(offset / size) * size;
 }
-
-module.exports = { StructArray, Struct, viewTypes, createLayout };

package/src/util/task_queue.js

@@ -1,8 +1,6 @@
-const assert = require('assert');
+import assert from 'assert';
 
-module.exports = taskQueue;
-
-function taskQueue(thisArg) {
+export default function taskQueue(thisArg) {
   const queues = {
     running: [],
     later: []
@@ -18,7 +16,9 @@ function taskQueue(thisArg) {
   };
 
   function add(fn) {
-    if (id === Number.MAX_SAFE_INTEGER) id = Number.MIN_SAFE_INTEGER;
+    if (id === Number.MAX_SAFE_INTEGER) {
+      id = Number.MIN_SAFE_INTEGER;
+    }
     id += 1;
     queues.later.push({ fn, id, cancelled: false });
     return id;
@@ -36,9 +36,13 @@ function taskQueue(thisArg) {
     queues.running = queues.later;
     queues.later = [];
     for (const { fn, cancelled } of queues.running) {
-      if (cancelled) continue;
+      if (cancelled) {
+        continue;
+      }
       fn.call(thisArg);
-      if (cleared) break;
+      if (cleared) {
+        break;
+      }
     }
     queues.running.length = 0;
     cleared = false;

package/src/util/throttle.js

@@ -3,7 +3,7 @@
  Throttle the given function to run at most every period milliseconds.
  * @private
  */
-module.exports = function throttle(fn, time) {
+export default function throttle(fn, time) {
   let pending = false;
   let timerId = 0;
 
@@ -23,4 +23,4 @@ module.exports = function throttle(fn, time) {
     }
     return timerId;
   };
-};
+}

package/src/util/tile_cover.js

@@ -1,6 +1,5 @@
-const { OverscaledTileID } = require('../source/tile_id');
-
-module.exports = tileCover;
+import { OverscaledTileID } from '../source/tile_id.js';
+export default tileCover;
 
 function tileCover(z, bounds, actualZ, renderWorldCopies) {
   if (renderWorldCopies === undefined) {
@@ -109,6 +108,10 @@ function scanTriangle(a, b, c, ymin, ymax, scanLine) {
   }
 
   // scan span! scan span!
-  if (ab.dy) scanSpans(ca, ab, ymin, ymax, scanLine);
-  if (bc.dy) scanSpans(ca, bc, ymin, ymax, scanLine);
+  if (ab.dy) {
+    scanSpans(ca, ab, ymin, ymax, scanLine);
+  }
+  if (bc.dy) {
+    scanSpans(ca, bc, ymin, ymax, scanLine);
+  }
 }

package/src/util/token.js

@@ -1,4 +1,4 @@
-module.exports = resolveTokens;
+export default resolveTokens;
 
 /**
  * Replace tokens in a string template with values in an object

package/src/util/unique_id.js

@@ -7,6 +7,6 @@ let id = 1;
  * @returns unique numeric id.
  * @private
  */
-module.exports = function uniqueId() {
+export default function uniqueId() {
   return id++;
-};
+}