maplibre-gl 2.1.1 → 2.1.2

package/src/util/web_worker.ts

@@ -1,13 +1,8 @@
-// When Rollup builds the main bundle this file is replaced with ./build/web_worker_replacement.js
-// See package.json 'browser' field and rollup documentation.
-// This file is intended for use in the GL-JS test suite when they run on node since node doesn't support workers.
-// It implements a MessageBus main thread interface
-
-import MaplibreWorker from '../source/worker';
+import maplibregl from '../index';
 
 import type {WorkerSource} from '../source/worker_source';
 
-type MessageListener = (
+export type MessageListener = (
     a: {
         data: any;
         target: any;
@@ -15,7 +10,6 @@ type MessageListener = (
 ) => unknown;
 
 // The main thread interface. Provided by Worker in a browser environment,
-// and MessageBus below in a node environment.
 export interface WorkerInterface {
     addEventListener(type: 'message', listener: MessageListener): void;
     removeEventListener(type: 'message', listener: MessageListener): void;
@@ -34,64 +28,6 @@ export interface WorkerGlobalScopeInterface {
     registerRTLTextPlugin: (_: any) => void;
 }
 
-class MessageBus implements WorkerInterface, WorkerGlobalScopeInterface {
-    addListeners: Array<MessageListener>;
-    postListeners: Array<MessageListener>;
-    target: MessageBus;
-    registerWorkerSource: any;
-    registerRTLTextPlugin: any;
-
-    constructor(addListeners: Array<MessageListener>, postListeners: Array<MessageListener>) {
-        this.addListeners = addListeners;
-        this.postListeners = postListeners;
-    }
-
-    addEventListener(event: 'message', callback: MessageListener) {
-        if (event === 'message') {
-            this.addListeners.push(callback);
-        }
-    }
-
-    removeEventListener(event: 'message', callback: MessageListener) {
-        const i = this.addListeners.indexOf(callback);
-        if (i >= 0) {
-            this.addListeners.splice(i, 1);
-        }
-    }
-
-    postMessage(data: any) {
-        setTimeout(() => {
-            try {
-                for (const listener of this.postListeners) {
-                    listener({data, target: this.target});
-                }
-            } catch (e) {
-                console.error(e);
-            }
-        }, 0);
-    }
-
-    terminate() {
-        this.addListeners.splice(0, this.addListeners.length);
-        this.postListeners.splice(0, this.postListeners.length);
-    }
-
-    importScripts() { }
-}
-
-export default function workerFactory(): WorkerInterface {
-    const parentListeners = [],
-        workerListeners = [],
-        parentBus = new MessageBus(workerListeners, parentListeners),
-        workerBus = new MessageBus(parentListeners, workerListeners);
-
-    parentBus.target = workerBus;
-    workerBus.target = parentBus;
-
-    new workerFactory.Worker(workerBus);
-
-    return parentBus;
+export default function workerFactory() {
+    return new Worker(maplibregl.workerUrl);
 }
-
-// expose to allow stubbing in unit tests
-workerFactory.Worker = MaplibreWorker;

package/src/util/web_worker_transfer.test.ts

@@ -5,11 +5,13 @@ describe('web worker transfer', () => {
         class SerializableMock {
             n;
             buffer;
+            blob;
             _cached;
 
             constructor(n) {
                 this.n = n;
                 this.buffer = new ArrayBuffer(100);
+                this.blob = new Blob();
                 this.squared();
             }
 
@@ -33,6 +35,7 @@ describe('web worker transfer', () => {
         expect(deserialized.constructor === SerializableMock).toBeTruthy();
         expect(deserialized.n === 10).toBeTruthy();
         expect(deserialized.buffer === serializableMock.buffer).toBeTruthy();
+        expect(deserialized.blob === serializableMock.blob).toBeTruthy();
         expect(transferables[0] === serializableMock.buffer).toBeTruthy();
         expect(deserialized._cached === undefined).toBeTruthy();
         expect(deserialized.squared() === 100).toBeTruthy();

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();
-    });
-
-});