maplibre-gl 2.0.4 → 2.1.2

package/src/util/web_worker_transfer.ts

@@ -6,30 +6,31 @@ import {StylePropertyFunction, StyleExpression, ZoomDependentExpression, ZoomCon
 import CompoundExpression from '../style-spec/expression/compound_expression';
 import expressions from '../style-spec/expression/definitions';
 import ResolvedImage from '../style-spec/expression/types/resolved_image';
+import {AJAXError} from './ajax';
 
 import type {Transferable} from '../types/transferable';
 import {isImageBitmap} from './util';
 
 type SerializedObject = {
-  [_: string]: Serialized;
+    [_: string]: Serialized;
 }; // eslint-disable-line
 
-export type Serialized = null | void | boolean | number | string | Boolean | Number | String | Date | RegExp | ArrayBuffer | ArrayBufferView | ImageData | ImageBitmap | Array<Serialized> | SerializedObject;
+export type Serialized = null | void | boolean | number | string | Boolean | Number | String | Date | RegExp | ArrayBuffer | ArrayBufferView | ImageData | ImageBitmap | Blob | Array<Serialized> | SerializedObject;
 
 type Registry = {
-  [_: string]: {
-    klass: {
-      new (...args: any): any;
-      deserialize?: (input: Serialized) => unknown;
+    [_: string]: {
+        klass: {
+            new (...args: any): any;
+            deserialize?: (input: Serialized) => unknown;
+        };
+        omit: ReadonlyArray<string>;
+        shallow: ReadonlyArray<string>;
     };
-    omit: ReadonlyArray<string>;
-    shallow: ReadonlyArray<string>;
-  };
 };
 
 type RegisterOptions<T> = {
-  omit?: ReadonlyArray<keyof T>;
-  shallow?: ReadonlyArray<keyof T>;
+    omit?: ReadonlyArray<keyof T>;
+    shallow?: ReadonlyArray<keyof T>;
 };
 
 const registry: Registry = {};
@@ -44,11 +45,11 @@ const registry: Registry = {};
  * @private
  */
 export function register<T extends any>(
-  name: string,
-  klass: {
-    new (...args: any): T;
-  },
-  options: RegisterOptions<T> = {}
+    name: string,
+    klass: {
+        new (...args: any): T;
+    },
+    options: RegisterOptions<T> = {}
 ) {
     assert(!registry[name], `${name} is already registered.`);
     ((Object.defineProperty as any))(klass, '_classRegistryKey', {
@@ -67,6 +68,7 @@ register('TransferableGridIndex', TransferableGridIndex);
 
 register('Color', Color);
 register('Error', Error);
+register('AJAXError', AJAXError);
 register('ResolvedImage', ResolvedImage);
 
 register('StylePropertyFunction', StylePropertyFunction);
@@ -109,7 +111,8 @@ export function serialize(input: unknown, transferables?: Array<Transferable> |
         input instanceof Number ||
         input instanceof String ||
         input instanceof Date ||
-        input instanceof RegExp) {
+        input instanceof RegExp ||
+        input instanceof Blob) {
         return input;
     }
 
@@ -210,6 +213,7 @@ export function deserialize(input: Serialized): unknown {
         input instanceof String ||
         input instanceof Date ||
         input instanceof RegExp ||
+        input instanceof Blob ||
         isArrayBuffer(input) ||
         isImageBitmap(input) ||
         ArrayBuffer.isView(input) ||

package/src/util/worker_pool.ts

@@ -12,7 +12,7 @@ export default class WorkerPool {
     static workerCount: number;
 
     active: {
-      [_ in number | string]: boolean;
+        [_ in number | string]: boolean;
     };
     workers: Array<WorkerInterface>;
 

package/build/.eslintrc

@@ -1,21 +0,0 @@
-{
-  // TODO: most of these overrides should be removed,
-  // but for now this documents the exceptions used by the code in this dir
-  "rules": {
-    "import/no-commonjs": "off",
-    "flowtype/require-valid-file-annotation": [0],
-    "prefer-arrow-callback": "off",
-    "no-var": "off",
-    "strict": "off",
-    "no-restricted-properties": "off",
-    "no-unused-vars": "off",
-    "prefer-template": "off",
-    "camelcase": "off",
-    "prefer-const": "off",
-    "indent": "off",
-    "no-case-declarations": "off",
-    "semi": "off",
-    "object-curly-spacing": "off",
-    "no-undef": "off"
-  }
-}

package/build/glsl_to_js.js

@@ -1,12 +0,0 @@
-export default function glsl_to_js(code, minify) {
-    if (minify) {
-        code = code.trim() // strip whitespace at the start/end
-            .replace(/\s*\/\/[^\n]*\n/g, '\n') // strip double-slash comments
-            .replace(/\n+/g, '\n') // collapse multi line breaks
-            .replace(/\n\s+/g, '\n') // strip identation
-            .replace(/\s?([+-\/*=,])\s?/g, '$1') // strip whitespace around operators
-            .replace(/([;\(\),\{\}])\n(?=[^#])/g, '$1'); // strip more line breaks
-
-    }
-    return `export default ${JSON.stringify(code)};`;
-}

package/build/post-ts-build.js

@@ -1,43 +0,0 @@
-import fs from 'fs';
-import glob from 'glob';
-import child_process from 'child_process';
-import glsl_to_js from './glsl_to_js.js';
-
-let args = process.argv.slice(2);
-let outputBaseDir = args[0];
-let minify = args[1];
-
-console.log(`Copying glsl files to ${outputBaseDir}, minify: ${minify}`);
-
-/**
- * This script is intended to copy the glsl file to the compilation output folder,
- * change their extension to .js and export the shaders as strings in javascript.
- * It will also minify them a bit if needed and change the extension to .js
- * After that it will create a combined typescript definition file and manipulate it a bit
- * It will also create a simple package.json file to allow importing this package in webpack
- */
-
-glob("./src/**/*.glsl", null, (err, files) => {
-    for (let file of files) {
-        let code = fs.readFileSync(file, 'utf8');
-        let content = glsl_to_js(code, minify);
-        let fileName = outputBaseDir + '/' + file.split('/').splice(-1) + ".js";
-        fs.writeFileSync(fileName, content);
-    }
-    console.log(`Finished converting ${files.length} glsl files`);
-});
-
-if (!fs.existsSync("dist")) {
-    fs.mkdirSync("dist");
-}
-
-console.log(`Starting bundling types`);
-const outputFile = "./dist/maplibre-gl.d.ts";
-child_process.execSync(`dts-bundle-generator --no-check --umd-module-name=maplibregl -o ${outputFile} ./src/index.ts`);
-let types = fs.readFileSync(outputFile, 'utf8');
-// Classes are not exported but should be since this is exported as UMD - fixing...
-types = types.replace(/declare class/g, "export declare class");
-fs.writeFileSync(outputFile, types);
-console.log(`Finished bundling types`);
-
-fs.writeFileSync("./dist/package.json", '{ "type": "commonjs" }');

package/build/release-notes.md.ejs

@@ -1,8 +0,0 @@
-https://github.com/maplibre/maplibre-gl-js
-[Changes](https://github.com/maplibre/maplibre-gl-js/compare/v<%-PREVIOUSVERSION%>...v<%-CURRENTVERSION%>) since [MapLibre GL JS v<%-PREVIOUSVERSION%>](https://github.com/maplibre/releases/tag/v<%-PREVIOUSVERSION%>):
-
-<%-CHANGELOG-%>
-
-<% if (isPrerelease) { %>
-Pre-release version
-<% } -%>

package/build/test/build-tape.js

@@ -1,17 +0,0 @@
-import browserify from 'browserify';
-import fs from 'fs';
-
-export default function() {
-    return new Promise((resolve, reject) => {
-        browserify('./test/util/tape_config.js', { standalone: 'tape' })
-            .transform('babelify', {presets: ['@babel/preset-env'], global: true})
-            .bundle((err, buff) => {
-                if (err) { throw err; }
-
-                fs.writeFile('test/integration/dist/tape.js', buff, { encoding: 'utf8'}, (err) => {
-                    if (err) { reject(err); }
-                    resolve();
-                });
-            });
-    });
-}

package/build/web_worker_replacement.js

@@ -1,5 +0,0 @@
-import maplibregl from '../rollup/build/tsc/src/index'
-
-export default function () {
-    return new Worker(maplibregl.workerUrl);
-}

package/dist/package.json

@@ -1 +0,0 @@
-{ "type": "commonjs" }

package/src/style-spec/validate_spec.test.ts

@@ -1,29 +0,0 @@
-import glob from 'glob';
-import fs from 'fs';
-import path from 'path';
-import validate from '../style-spec/validate_style';
-import reference from './reference/latest';
-
-const UPDATE = !!process.env.UPDATE;
-
-describe('validate_spec', () => {
-    glob.sync('test/unit/style-spec/fixture/*.input.json').forEach((file) => {
-        test(path.basename(file), () => {
-            const outputfile = file.replace('.input', '.output');
-            const style = fs.readFileSync(file);
-            const result = validate(style);
-            if (UPDATE) fs.writeFileSync(outputfile, JSON.stringify(result, null, 2));
-            const expectedOutput = JSON.parse(fs.readFileSync(outputfile).toString());
-            expect(result).toEqual(expectedOutput);
-        });
-    });
-
-    test('errors from validate do not contain line numbers', () => {
-        const fixtures = glob.sync('test/unit/style-spec/fixture/*.input.json');
-        const style = JSON.parse(fs.readFileSync(fixtures[0]).toString());
-
-        const result = validate(style, reference);
-        expect(result[0].line).toBeUndefined();
-    });
-
-});

package/src/symbol/shaping.test.ts

@@ -1,392 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import {WritingMode, shapeIcon, shapeText, fitIconToText, PositionedIcon, Shaping} from './shaping';
-import Formatted, {FormattedSection} from '../style-spec/expression/types/formatted';
-import ResolvedImage from '../style-spec/expression/types/resolved_image';
-import expectedJson from '../../test/expected/text-shaping-linebreak.json';
-import {ImagePosition} from '../render/image_atlas';
-import {StyleImage} from '../style/style_image';
-
-let UPDATE = false;
-if (typeof process !== 'undefined' && process.env !== undefined) {
-    UPDATE = !!process.env.UPDATE;
-}
-
-describe('shaping', () => {
-    const oneEm = 24;
-    const layoutTextSize = 16;
-    const layoutTextSizeThisZoom = 16;
-    const fontStack = 'Test';
-    const glyphs = {
-        'Test': require('../../test/fixtures/fontstack-glyphs.json')
-    };
-    const glyphPositions = glyphs;
-
-    const images = {
-        'square': new ImagePosition({x: 0, y: 0, w: 16, h: 16}, {pixelRatio: 1, version: 1} as StyleImage),
-        'tall': new ImagePosition({x: 0, y: 0, w: 16, h: 32}, {pixelRatio: 1, version: 1} as StyleImage),
-        'wide': new ImagePosition({x: 0, y: 0, w: 32, h: 16}, {pixelRatio: 1, version: 1} as StyleImage),
-    };
-
-    const sectionForImage = (name) => {
-        return new FormattedSection('', ResolvedImage.fromString(name), null, null, null);
-    };
-
-    const sectionForText = (name, scale?) => {
-        return new FormattedSection(name, null, scale, null, null);
-    };
-
-    let shaped;
-
-    JSON.parse('{}');
-
-    shaped = shapeText(Formatted.fromString(`hi${String.fromCharCode(0)}`), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-null.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(
-        require('../../test/expected/text-shaping-null.json')
-    );
-
-    // Default shaping.
-    shaped = shapeText(Formatted.fromString('abcde'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-default.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(
-        require('../../test/expected/text-shaping-default.json')
-    );
-
-    // Letter spacing.
-    shaped = shapeText(Formatted.fromString('abcde'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0.125 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-spacing.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(
-        require('../../test/expected/text-shaping-spacing.json')
-    );
-
-    // Line break.
-    shaped = shapeText(Formatted.fromString('abcde abcde'), glyphs, glyphPositions, images, fontStack, 4 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-linebreak.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(expectedJson);
-
-    const expectedNewLine = require('../../test/expected/text-shaping-newline.json');
-
-    shaped = shapeText(Formatted.fromString('abcde\nabcde'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-newline.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(expectedNewLine);
-
-    shaped = shapeText(Formatted.fromString('abcde\r\nabcde'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    expect(shaped.positionedLines).toEqual(expectedNewLine.positionedLines);
-
-    const expectedNewLinesInMiddle = require('../../test/expected/text-shaping-newlines-in-middle.json');
-
-    shaped = shapeText(Formatted.fromString('abcde\n\nabcde'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-newlines-in-middle.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(expectedNewLinesInMiddle);
-
-    // Prefer zero width spaces when breaking lines. Zero width spaces are used by MapLibre data sources as a hint that
-    // a position is ideal for breaking.
-    const expectedZeroWidthSpaceBreak = require('../../test/expected/text-shaping-zero-width-space.json');
-
-    shaped = shapeText(Formatted.fromString('三三\u200b三三\u200b三三\u200b三三三三三三\u200b三三'), glyphs, glyphPositions, images, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-zero-width-space.json'), JSON.stringify(shaped, null, 2));
-    expect(shaped).toEqual(expectedZeroWidthSpaceBreak);
-
-    // Null shaping.
-    shaped = shapeText(Formatted.fromString(''), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    expect(false).toBe(shaped);
-
-    shaped = shapeText(Formatted.fromString(String.fromCharCode(0)), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    expect(false).toBe(shaped);
-
-    // https://github.com/mapbox/mapbox-gl-js/issues/3254
-    shaped = shapeText(Formatted.fromString('   foo bar\n'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-    const shaped2 = shapeText(Formatted.fromString('foo bar'), glyphs, glyphPositions, images, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom) as Shaping;
-    expect(shaped.positionedLines).toEqual(shaped2.positionedLines);
-
-    test('basic image shaping', () => {
-        const shaped = shapeText(new Formatted([sectionForImage('square')]), glyphs, glyphPositions, images, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom) as Shaping;
-        expect(shaped.top).toEqual(-12);    // 1em line height
-        expect(shaped.left).toEqual(-10.5); // 16 - 2px border * 1.5 scale factor
-
-    });
-
-    test('images in horizontal layout', () => {
-        const expectedImagesHorizontal = require('../../test/expected/text-shaping-images-horizontal.json');
-        const horizontalFormatted = new Formatted([
-            sectionForText('Foo'),
-            sectionForImage('square'),
-            sectionForImage('wide'),
-            sectionForText('\n'),
-            sectionForImage('tall'),
-            sectionForImage('square'),
-            sectionForText(' bar'),
-        ]);
-        const shaped = shapeText(horizontalFormatted, glyphs, glyphPositions, images, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point', layoutTextSize, layoutTextSizeThisZoom);
-        if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-images-horizontal.json'), JSON.stringify(shaped, null, 2));
-        expect(shaped).toEqual(expectedImagesHorizontal);
-
-    });
-
-    test('images in vertical layout', () => {
-        const expectedImagesVertical = require('../../test/expected/text-shaping-images-vertical.json');
-        const horizontalFormatted = new Formatted([
-            sectionForText('三'),
-            sectionForImage('square'),
-            sectionForImage('wide'),
-            sectionForText('\u200b'),
-            sectionForImage('tall'),
-            sectionForImage('square'),
-            sectionForText('三'),
-        ]);
-        const shaped = shapeText(horizontalFormatted, glyphs, glyphPositions, images, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.vertical, true, 'point', layoutTextSize, layoutTextSizeThisZoom);
-        if (UPDATE) fs.writeFileSync(path.resolve(__dirname, '../../test/expected/text-shaping-images-vertical.json'), JSON.stringify(shaped, null, 2));
-        expect(shaped).toEqual(expectedImagesVertical);
-
-    });
-
-});
-
-describe('shapeIcon', () => {
-    const imagePosition = new ImagePosition({x: 0, y: 0, w: 22, h: 22}, {pixelRatio: 1, version: 1} as StyleImage);
-    const image = Object.freeze({
-        content: undefined,
-        stretchX: undefined,
-        stretchY: undefined,
-        paddedRect: Object.freeze({x: 0, y: 0, w: 22, h: 22}),
-        pixelRatio: 1,
-        version: 1
-    });
-
-    test('text-anchor: center', () => {
-        expect(shapeIcon(imagePosition, [ 0, 0 ], 'center')).toEqual({
-            top: -10,
-            bottom: 10,
-            left: -10,
-            right: 10,
-            image
-        });
-
-        expect(shapeIcon(imagePosition, [ 4, 7 ], 'center')).toEqual({
-            top: -3,
-            bottom: 17,
-            left: -6,
-            right: 14,
-            image
-        });
-
-    });
-
-    test('text-anchor: left', () => {
-        expect(shapeIcon(imagePosition, [ 0, 0 ], 'left')).toEqual({
-            top: -10,
-            bottom: 10,
-            left: 0,
-            right: 20,
-            image
-        });
-
-        expect(shapeIcon(imagePosition, [ 4, 7 ], 'left')).toEqual({
-            top: -3,
-            bottom: 17,
-            left: 4,
-            right: 24,
-            image
-        });
-
-    });
-
-    test('text-anchor: bottom-right', () => {
-        expect(shapeIcon(imagePosition, [ 0, 0 ], 'bottom-right')).toEqual({
-            top: -20,
-            bottom: 0,
-            left: -20,
-            right: 0,
-            image
-        });
-
-        expect(shapeIcon(imagePosition, [ 4, 7 ], 'bottom-right')).toEqual({
-            top: -13,
-            bottom: 7,
-            left: -16,
-            right: 4,
-            image
-        });
-
-    });
-
-});
-
-describe('fitIconToText', () => {
-    const glyphSize = 24;
-    const shapedIcon = Object.freeze({
-        top: -10,
-        bottom: 10,
-        left: -10,
-        right: 10,
-        collisionPadding: undefined,
-        image: Object.freeze({
-            pixelRatio: 1,
-            displaySize: [ 20, 20 ],
-            paddedRect: Object.freeze({x: 0, y: 0, w: 22, h: 22})
-        })
-    }) as PositionedIcon;
-
-    const shapedText = Object.freeze({
-        top: -10,
-        bottom: 30,
-        left: -60,
-        right: 20
-    }) as Shaping;
-
-    test('icon-text-fit: width', () => {
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'width', [0, 0, 0, 0], [0, 0], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: 0,
-            right: 20,
-            bottom: 20,
-            left: -60
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'width', [0, 0, 0, 0], [3, 7], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: 7,
-            right: 23,
-            bottom: 27,
-            left: -57
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'width', [0, 0, 0, 0], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -5,
-            right: 10,
-            bottom: 15,
-            left: -30
-        });
-
-        // Ignores padding for top/bottom, since the icon is only stretched to the text's width but not height
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'width', [ 5, 10, 5, 10 ], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -5,
-            right: 20,
-            bottom: 15,
-            left: -40
-        });
-
-    });
-
-    test('icon-text-fit: height', () => {
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'height', [0, 0, 0, 0], [0, 0], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -10,
-            right: -10,
-            bottom: 30,
-            left: -30
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'height', [0, 0, 0, 0], [3, 7], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -3,
-            right: -7,
-            bottom: 37,
-            left: -27
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'height', [0, 0, 0, 0], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -5,
-            right: 0,
-            bottom: 15,
-            left: -20
-        });
-
-        // Ignores padding for left/right, since the icon is only stretched to the text's height but not width
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'height', [ 5, 10, 5, 10 ], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -10,
-            right: 0,
-            bottom: 20,
-            left: -20
-        });
-
-    });
-
-    test('icon-text-fit: both', () => {
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'both', [0, 0, 0, 0], [0, 0], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -10,
-            right: 20,
-            bottom: 30,
-            left: -60
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'both', [0, 0, 0, 0], [3, 7], 24 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -3,
-            right: 23,
-            bottom: 37,
-            left: -57
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'both', [0, 0, 0, 0], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -5,
-            right: 10,
-            bottom: 15,
-            left: -30
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'both', [ 5, 10, 5, 10 ], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -10,
-            right: 20,
-            bottom: 20,
-            left: -40
-        });
-
-        expect(
-            fitIconToText(shapedIcon, shapedText, 'both', [ 0, 5, 10, 15 ], [0, 0], 12 / glyphSize)
-        ).toEqual({
-            image: shapedIcon.image,
-            collisionPadding: undefined,
-            top: -5,
-            right: 15,
-            bottom: 25,
-            left: -45
-        });
-
-    });
-
-});

package/src/types/glsl.d.ts

@@ -1,4 +0,0 @@
-declare module '*.glsl' {
-    const value: string;
-    export default value;
-}