maplibre-gl 2.2.1 → 2.3.1-pre.2

package/build/generate-query-test-fixtures.ts

@@ -26,9 +26,10 @@ function generateFixtureJson(rootDirectory: string, suiteDirectory: string, outp
     const imagePaths = globs[1];
     //Extract the filedata into a flat dictionary
     const allFiles = {};
-    let allPaths = glob.sync(jsonPaths);
+    // Using replace() to fixup Windows paths so they are compatible with glob sync.
+    let allPaths = glob.sync(jsonPaths.replace(/\\/g, '/'));
     if (includeImages) {
-        allPaths = allPaths.concat(glob.sync(imagePaths));
+        allPaths = allPaths.concat(glob.sync(imagePaths.replace(/\\/g, '/')));
     }
 
     //A Set that stores test names that are malformed so they can be removed later

package/build/generate-struct-arrays.ts

@@ -409,7 +409,6 @@ export class ${structArrayClass} extends ${structArrayLayoutClass} {`);
      * @private
      */
     get(index: number): ${structTypeClass} {
-        assert(!this.isTransferred);
         return new ${structTypeClass}(this, index);
     }`);
     }
@@ -425,7 +424,6 @@ register('${structArrayClass}', ${structArrayClass});
 fs.writeFileSync('src/data/array_types.g.ts',
     `// This file is generated. Edit build/generate-struct-arrays.ts, then run \`npm run codegen\`.
 
-import assert from 'assert';
 import {Struct, StructArray} from '../util/struct_array';
 import {register} from '../util/web_worker_transfer';
 import Point from '@mapbox/point-geometry';

package/build/generate-style-spec.ts

@@ -141,7 +141,7 @@ export type InterpolationSpecification =
     | ['linear'] 
     | ['exponential', number | ExpressionSpecification] 
     | ['cubic-bezier', number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification, number | ExpressionSpecification]
-    
+
 export type ExpressionSpecification = 
     // types
     | ['array', unknown | ExpressionSpecification] // array
@@ -187,31 +187,26 @@ export type ExpressionSpecification =
     | ['any', ...(boolean | ExpressionSpecification)[]] // boolean
     | ['case', boolean | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
         ...(boolean | ExpressionInputType | ExpressionSpecification)[], ExpressionInputType | ExpressionSpecification]
-    | ['coalesce', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(ExpressionInputType | ExpressionSpecification)[]]
+    | ['coalesce', ...(ExpressionInputType | ExpressionSpecification)[]] // at least two inputs required
     | ['match', ExpressionInputType | ExpressionSpecification, 
         ExpressionInputType | ExpressionInputType[], ExpressionInputType | ExpressionSpecification, 
         ...(ExpressionInputType | ExpressionInputType[] | ExpressionSpecification)[], // repeated as above
         ExpressionInputType]
     | ['within', unknown | ExpressionSpecification]
     // Ramps, scales, curves
-    | ['interpolate', InterpolationSpecification, 
-        number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(number | ExpressionInputType | ExpressionSpecification)[]]
-    | ['interpolate-hcl', InterpolationSpecification,
-        number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(number | ColorSpecification | ExpressionSpecification)[]]
-    | ['interpolate-lab', InterpolationSpecification,
-        number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(number | ColorSpecification | ExpressionSpecification)[]]
-    | ['step', number | ExpressionSpecification, number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(number | ExpressionInputType | ExpressionSpecification)[]]
+    | ['interpolate', InterpolationSpecification, number | ExpressionSpecification, 
+        ...(number | number[] | ColorSpecification)[]] // alternating number and number | number[] | ColorSpecification
+    | ['interpolate-hcl', InterpolationSpecification, number | ExpressionSpecification, 
+        ...(number | ColorSpecification)[]] // alternating number and ColorSpecificaton
+    | ['interpolate-lab', InterpolationSpecification, number | ExpressionSpecification, 
+        ...(number | ColorSpecification)[]] // alternating number and ColorSpecification
+    | ['step', number | ExpressionSpecification, ExpressionInputType | ExpressionSpecification,
+        ...(number | ExpressionInputType | ExpressionSpecification)[]] // alternating number and ExpressionInputType | ExpressionSpecification
     // Variable binding
     | ['let', string, ExpressionInputType | ExpressionSpecification, ...(string | ExpressionInputType | ExpressionSpecification)[]]
     | ['var', string]
     // String
-    | ['concat', ExpressionInputType | ExpressionSpecification, ExpressionInputType | ExpressionSpecification, 
-        ...(ExpressionInputType | ExpressionSpecification)[]] // string
+    | ['concat', ...(ExpressionInputType | ExpressionSpecification)[]] // at least two inputs required -> string
     | ['downcase', string | ExpressionSpecification] // string
     | ['is-supported-script', string | ExpressionSpecification] // boolean
     | ['resolved-locale', CollatorExpressionSpecification] // string
@@ -226,7 +221,7 @@ export type ExpressionSpecification =
     | ['/', number | ExpressionSpecification, number | ExpressionSpecification] // number
     | ['%', number | ExpressionSpecification, number | ExpressionSpecification] // number
     | ['^', number | ExpressionSpecification, number | ExpressionSpecification] // number
-    | ['+', number | ExpressionSpecification, number | ExpressionSpecification, ...(number | ExpressionSpecification)[]] // number
+    | ['+', ...(number | ExpressionSpecification)[]] // at least two inputs required -> number
     | ['abs', number | ExpressionSpecification] // number
     | ['acos', number | ExpressionSpecification] // number
     | ['asin', number | ExpressionSpecification] // number

package/build/generate-typings.ts

@@ -7,10 +7,20 @@ if (!fs.existsSync('dist')) {
 }
 
 console.log('Starting bundling types');
-const outputFile = './dist/maplibre-gl.d.ts';
+let outputFile = './dist/maplibre-gl.d.ts';
 childProcess.execSync(`dts-bundle-generator --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('Finifhed bundling types for maplibre-gl starting style-spec');
+
+const outputPath = './dist/style-spec';
+if (!fs.existsSync(outputPath)) {
+    fs.mkdirSync(outputPath);
+}
+outputFile = `${outputPath}/index.d.ts`;
+childProcess.execSync(`dts-bundle-generator -o ${outputFile} ./src/style-spec/style-spec.ts`);
+
 console.log('Finished bundling types');

package/build/rollup_plugins.ts

@@ -3,7 +3,6 @@ import typescript from '@rollup/plugin-typescript';
 import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 import commonjs from '@rollup/plugin-commonjs';
-import unassert from 'unassert-rollup-plugin';
 import json from '@rollup/plugin-json';
 import {terser} from 'rollup-plugin-terser';
 import minifyStyleSpec from './rollup_plugin_minify_style_spec';
@@ -43,9 +42,6 @@ export const plugins = (production: boolean): Plugin[] => [
             passes: 3
         }
     }),
-    production && unassert({
-        include: ['**/*'], // by default, unassert only includes .js files
-    }),
     nodeResolve,
     typescript(),
     commonjs({