@maplibre/maplibre-react-native 10.0.0-alpha.24 → 10.0.0-alpha.25

package/scripts/utils/{template-globals.js → TemplateHelpers.ts}

@@ -1,6 +1,6 @@
-const iosPropNameOverrides = {};
+const iosPropNameOverrides: Record<string, string> = {};
 
-const iosSpecOverrides = {
+const iosSpecOverrides: Record<string, string> = {
   "icon-allow-overlap": "icon-allows-overlap",
   "icon-image": "icon-image-name",
   "icon-ignore-placement": "icon-ignores-placement",
@@ -40,19 +40,18 @@ const iosSpecOverrides = {
   "text-writing-mode": "text-writing-modes",
 };
 
-function exists(value) {
+export function exists<T>(value: T): value is NonNullable<T> {
   return typeof value !== "undefined" && value !== null;
 }
-global.exists = exists;
 
-global.getValue = function (value, defaultValue) {
+export function getValue(value: any, defaultValue: any) {
   if (!exists(value) || value === "") {
     return defaultValue;
   }
   return value;
-};
+}
 
-function camelCase(str, delimiter = "-") {
+export function camelCase(str: string, delimiter = "-") {
   const parts = str.split(delimiter);
   return parts
     .map((part, index) => {
@@ -63,9 +62,8 @@ function camelCase(str, delimiter = "-") {
     })
     .join("");
 }
-global.camelCase = camelCase;
 
-function pascalCase(str, delimiter = "-") {
+export function pascalCase(str: string, delimiter = "-") {
   const parts = str.split(delimiter);
   return parts
     .map((part) => {
@@ -73,16 +71,15 @@ function pascalCase(str, delimiter = "-") {
     })
     .join("");
 }
-global.pascalCase = pascalCase;
 
-global.setLayerMethodName = function (layer, platform) {
+export function setLayerMethodName(layer: any, platform: "android" | "ios") {
   if (platform === "ios") {
     return `${camelCase(layer.name)}Layer`;
   }
   return `set${pascalCase(layer.name)}LayerStyle`;
-};
+}
 
-global.getLayerType = function (layer, platform) {
+export function getLayerType(layer: any, platform: "android" | "ios") {
   const isIOS = platform === "ios";
 
   switch (layer.name) {
@@ -111,20 +108,20 @@ global.getLayerType = function (layer, platform) {
         `Is ${layer.name} a new layer? We should add support for it!`,
       );
   }
-};
+}
 
-global.ifOrElseIf = function (index) {
+export function ifOrElseIf(index: number) {
   if (index === 0) {
     return "if";
   }
   return "} else if";
-};
+}
 
-global.iosStringArrayLiteral = function (arr) {
-  return `@[@${arr.map((item) => `"${item}"`).join(", @")}]`;
-};
+export function iosStringArrayLiteral(array: string[]) {
+  return `@[@${array.map((item) => `"${item}"`).join(", @")}]`;
+}
 
-function iosPropName(name) {
+export function iosPropName(name: string) {
   if (name.indexOf("visibility") !== -1) {
     return "visible";
   }
@@ -137,24 +134,22 @@ function iosPropName(name) {
   return name;
 }
 
-global.iosPropName = iosPropName;
-
-global.iosMapLibrePropName = function (name) {
+export function iosMapLibrePropName(name: string) {
   const result = iosPropName(name);
   if (result === "fillExtrusionVerticalGradient") {
     return "fillExtrusionHasVerticalGradient";
   }
   return undefined;
-};
+}
 
-global.iosPropMethodName = function (layer, name) {
+export function iosPropMethodName(layer: any, name: string) {
   if (name.indexOf("Visibility") !== -1) {
     return pascalCase(layer.name) + "StyleLayer" + name;
   }
   return name;
-};
+}
 
-function androidInputType(type, value) {
+export function androidInputType(type: string, value?: string): string {
   if (type === "array" && value) {
     return `${androidInputType(value)}[]`;
   }
@@ -171,9 +166,7 @@ function androidInputType(type, value) {
   }
 }
 
-global.androidInputType = androidInputType;
-
-function androidOutputType(type, value) {
+export function androidOutputType(type: string, value?: any): string {
   if (type === "array" && value) {
     return `${androidOutputType(value)}[]`;
   }
@@ -190,9 +183,7 @@ function androidOutputType(type, value) {
   }
 }
 
-global.androidOutputType = androidOutputType;
-
-global.androidGetConfigType = function (androidType, prop) {
+export function androidGetConfigType(androidType: string, prop: any) {
   switch (androidType) {
     case "Integer":
       return "styleValue.getInt(VALUE_KEY)";
@@ -211,9 +202,9 @@ global.androidGetConfigType = function (androidType, prop) {
         return "styleValue.getString(VALUE_KEY)";
       }
   }
-};
+}
 
-global.jsStyleType = function (prop) {
+export function jsStyleType(prop: any) {
   if (prop.type === "color") {
     return "StyleTypes.Color";
   }
@@ -235,9 +226,9 @@ global.jsStyleType = function (prop) {
   }
 
   return "StyleTypes.Constant";
-};
+}
 
-global.jsDocPropRequires = function (prop) {
+export function jsDocPropRequires(prop: any) {
   if (!prop.doc.requires) {
     return;
   }
@@ -250,13 +241,13 @@ global.jsDocPropRequires = function (prop) {
   }
 
   return desc;
-};
+}
 
-global.getEnums = function (layers) {
-  const result = {};
+export function getEnums(layers: any[]) {
+  const result: Record<string, any> = {};
 
   layers.forEach((layer) => {
-    layer.properties.forEach((property) => {
+    layer.properties.forEach((property: any) => {
       if (
         property.type === "enum" ||
         (property.type === "array" && property.value === "enum")
@@ -269,10 +260,10 @@ global.getEnums = function (layers) {
     });
   });
   return Object.values(result);
-};
+}
 
-global.dtsInterfaceType = function (prop) {
-  const propTypes = [];
+export function dtsInterfaceType(prop: any) {
+  const propTypes: string[] = [];
 
   if (prop.name.indexOf("Translate") !== -1 && prop.type !== "enum") {
     propTypes.push("Translation");
@@ -332,7 +323,7 @@ ${startAtSpace(2, "")}`;
       let params = "";
       if (prop.expression && prop.expression.parameters) {
         params = `,[${prop.expression.parameters
-          .map((v) => `'${v}'`)
+          .map((v: string) => `'${v}'`)
           .join(",")}]`;
       }
       return `Value<${propTypes[0]}${params}>`;
@@ -340,9 +331,9 @@ ${startAtSpace(2, "")}`;
       return propTypes[0];
     }
   }
-};
+}
 
-global.jsDocReactProp = function (prop) {
+export function jsDocReactProp(prop: any) {
   const propTypes = [];
 
   if (prop.type === "color") {
@@ -394,9 +385,9 @@ ${startAtSpace(2, "])")}`;
   } else {
     return propTypes[0];
   }
-};
+}
 
-function startAtSpace(spaceCount, str) {
+export function startAtSpace(spaceCount: number, str: string) {
   let value = "";
 
   for (let i = 0; i < spaceCount; i++) {
@@ -406,31 +397,21 @@ function startAtSpace(spaceCount, str) {
   return `${value}${str}`;
 }
 
-global.startAtSpace = startAtSpace;
-
-function replaceNewLine(str) {
-  if (str === undefined) {
-    return undefined;
-  }
-  if (str === null) {
-    return null;
-  }
-  return str.replace(/\n/g, "<br/>");
+export function replaceNewLine(str: string) {
+  return str?.replace(/\n/g, "<br/>");
 }
 
-global.replaceNewLine = replaceNewLine;
-
-global.styleMarkdownTableRow = function (style) {
+export function styleMarkdownTableRow(style: any) {
   return `| \`${style.name}\` | \`${style.type}\` | \`${
     style.requires.join(", ") || "none"
   }\` | \`${style.disabledBy.join(", ") || "none"}\` | ${replaceNewLine(
     style.description,
   )} |`;
-};
+}
 
-global.methodMarkdownTableRow = function (method) {
+export function methodMarkdownTableRow(method: any) {
   return method.params
-    .map((param) => {
+    .map((param: any) => {
       return `| \`${param.name}\` | \`${
         (param.type && param.type.name) || "n/a"
       }\` | \`${param.optional ? "No" : "Yes"}\` | ${replaceNewLine(
@@ -438,9 +419,9 @@ global.methodMarkdownTableRow = function (method) {
       )} |`;
     })
     .join("\n");
-};
+}
 
-function _propMarkdownTableRows(props, prefix = "") {
+function _propMarkdownTableRows(props: any[], prefix = "") {
   return props
     .map((prop) => {
       let { type } = prop;
@@ -449,51 +430,46 @@ function _propMarkdownTableRows(props, prefix = "") {
       }
       const defaultValue = prop.default || "";
       const { description = "" } = prop;
+
       let result = `| ${prefix}${
         prop.name
       } | \`${type.replace(/^\\\| /, "").replace(/\n/g, " ")}\` | \`${defaultValue}\` | \`${
         prop.required
       }\` | ${replaceNewLine(description)} |`;
+
       if (type === "shape") {
         result = `${result}\n${_propMarkdownTableRows(
           prop.type.value,
           `&nbsp;&nbsp;${prefix}`,
         )}`;
       }
+
       return result;
     })
     .join("\n");
 }
 
-global.propMarkdownTableRows = function (component) {
+export function propMarkdownTableRows(component: any) {
   return _propMarkdownTableRows(component.props, "");
-};
+}
 
-global.getMarkdownMethodSignature = function (method) {
+export function getMarkdownMethodSignature(method: {
+  name: string;
+  params: { name: string; optional: boolean }[];
+}) {
   const params = method.params
-    .map((param, i) => {
-      const isOptional = param.optional;
-
-      let name = "";
-
-      if (i !== 0) {
-        name += ", ";
-      }
-
-      name += param.name;
-      return isOptional ? `[${name}]` : name;
-    })
-    .join("");
+    .map((param) => (param.optional ? `[${param.name}]` : param.name))
+    .join(", ");
 
   return `${method.name}(${params})`;
-};
+}
 
-global.getMarkdownMethodExamples = function (method) {
+export function getMarkdownMethodExamples(method: any) {
   if (method.examples == null) {
     return null;
   }
   return method.examples
-    .map((example) => {
+    .map((example: string) => {
       return `
 
 \`\`\`javascript
@@ -503,9 +479,9 @@ ${example.trim()}
 `;
     })
     .join("");
-};
+}
 
-global.getStyleDefaultValue = function (style) {
+export function getStyleDefaultValue(style: any) {
   if (style.type === "string" && style.default === "") {
     return "empty string";
   } else if (style.type.includes("array")) {
@@ -513,7 +489,7 @@ global.getStyleDefaultValue = function (style) {
   } else {
     return style.default;
   }
-};
+}
 
 Object.keys(iosSpecOverrides).forEach((propName) => {
   const camelCasePropName = camelCase(propName);
@@ -521,8 +497,3 @@ Object.keys(iosSpecOverrides).forEach((propName) => {
     iosSpecOverrides[propName],
   );
 });
-
-module.exports = {
-  camelCase,
-  pascalCase,
-};

package/scripts/utils/getNativeVersion.ts

@@ -0,0 +1,53 @@
+import { promises as fs } from "fs";
+import path from "node:path";
+
+async function getNativeVersion(pathSegments: string[], regex: RegExp) {
+  const resolvedFilePath = path.join(__dirname, "..", "..", ...pathSegments);
+  const lines = (await fs.readFile(resolvedFilePath, "utf8")).split("\n");
+  const line = lines.filter((i) => regex.exec(i))[0];
+  const version = regex.exec(line)?.[1];
+
+  if (!version) {
+    throw new Error("Could not find native version from " + resolvedFilePath);
+  }
+
+  return version;
+}
+
+let cachedAndroidVersion: string;
+let cachedIosVersion: string;
+
+export const getAndroidVersion = async () => {
+  if (!cachedAndroidVersion) {
+    cachedAndroidVersion = await getNativeVersion(
+      ["android", "rctmln", "build.gradle"],
+      /^\s+implementation\s+"org.maplibre.gl:android-sdk:(\d+\.\d+\.\d+)"$/,
+    );
+  }
+
+  return cachedAndroidVersion;
+};
+
+export const getIosVersion = async () => {
+  if (!cachedIosVersion) {
+    cachedIosVersion = await getNativeVersion(
+      ["maplibre-react-native.podspec"],
+      /^\s+version:\s*"(\d+\.\d+\.\d+)"$/,
+    );
+  }
+
+  return cachedIosVersion;
+};
+
+export function isVersionGTE(
+  version: string,
+  otherVersion: string | undefined,
+) {
+  return (
+    !!otherVersion?.match(/^(\d+\.\d+\.\d+)$/) &&
+    version.localeCompare(otherVersion, undefined, {
+      numeric: true,
+      sensitivity: "base",
+    }) >= 0
+  );
+}

package/tsconfig.json

@@ -10,6 +10,7 @@
     "isolatedModules": true,
     "skipLibCheck": true,
     "strict": true,
+    "strictNullChecks": true,
     "types": ["node", "react-native", "geojson", "jest"],
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,
@@ -17,7 +18,5 @@
     "noUnusedLocals": true,
     "noImplicitReturns": true
   },
-  "include": [
-    "javascript/**/*", "index.ts"
-  ],
+  "include": ["javascript/**/*", "index.ts"]
 }

package/docs/OfflineManager.md

@@ -1,246 +0,0 @@
-<!-- This file was autogenerated from offlineManager.js do not modify -->
-## <MapLibreGL.offlineManager />
-### OfflineManager implements a singleton (shared object) that manages offline packs.<br/>All of this class’s instance methods are asynchronous, reflecting the fact that offline resources are stored in a database.<br/>The shared object maintains a canonical collection of offline packs.
-
-
-### methods
-#### createPack(options[, progressListener][, errorListener])
-
-Creates and registers an offline pack that downloads the resources needed to use the given region offline.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `options` | `OfflineCreatePackOptions` | `Yes` | Create options for a offline pack that specifices zoom levels, style url, and the region to download. |
-| `progressListener` | `Callback` | `No` | Callback that listens for status events while downloading the offline resource. |
-| `errorListener` | `Callback` | `No` | Callback that listens for status events while downloading the offline resource. |
-
-
-
-```javascript
-const progressListener = (offlineRegion, status) => console.log(offlineRegion, status);
-const errorListener = (offlineRegion, err) => console.log(offlineRegion, err);
-
-await MapLibreGL.offlineManager.createPack({
-  name: 'offlinePack',
-  styleURL: 'mapbox://...',
-  minZoom: 14,
-  maxZoom: 20,
-  bounds: [[neLng, neLat], [swLng, swLat]]
-}, progressListener, errorListener)
-```
-
-
-#### invalidatePack(name)
-
-Invalidates the specified offline pack. This method checks that the tiles in the specified offline pack match those from the server. Local tiles that do not match the latest version on the server are updated.This is more efficient than deleting the offline pack and downloading it again. If the data stored locally matches that on the server, new data will not be downloaded.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `name` | `String` | `Yes` | Name of the offline pack. |
-
-
-
-```javascript
-await MapLibreGL.offlineManager.invalidatePack('packName')
-```
-
-
-#### deletePack(name)
-
-Unregisters the given offline pack and allows resources that are no longer required by any remaining packs to be potentially freed.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `name` | `String` | `Yes` | Name of the offline pack. |
-
-
-
-```javascript
-await MapLibreGL.offlineManager.deletePack('packName')
-```
-
-
-#### invalidateAmbientCache()
-
-Forces a revalidation of the tiles in the ambient cache and downloads a fresh version of the tiles from the tile server.<br/>This is the recommend method for clearing the cache.<br/>This is the most efficient method because tiles in the ambient cache are re-downloaded to remove outdated data from a device.<br/>It does not erase resources from the ambient cache or delete the database, which can be computationally expensive operations that may carry unintended side effects.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-
-
-
-
-```javascript
-await MapLibreGL.offlineManager.invalidateAmbientCache();
-```
-
-
-#### clearAmbientCache()
-
-Erases resources from the ambient cache.<br/>This method clears the cache and decreases the amount of space that map resources take up on the device.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-
-
-
-
-```javascript
-await MapLibreGL.offlineManager.clearAmbientCache();
-```
-
-
-#### setMaximumAmbientCacheSize(size)
-
-Sets the maximum size of the ambient cache in bytes. Disables the ambient cache if set to 0.<br/>This method may be computationally expensive because it will erase resources from the ambient cache if its size is decreased.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `size` | `Number` | `Yes` | Size of ambient cache. |
-
-
-
-```javascript
-await MapLibreGL.offlineManager.setMaximumAmbientCacheSize(5000000);
-```
-
-
-#### resetDatabase()
-
-Deletes the existing database, which includes both the ambient cache and offline packs, then reinitializes it.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-
-
-
-
-```javascript
-await MapLibreGL.offlineManager.resetDatabase();
-```
-
-
-#### getPacks()
-
-Retrieves all the current offline packs that are stored in the database.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-
-
-
-
-```javascript
-const offlinePacks = await MapLibreGL.offlineManager.getPacks();
-```
-
-
-#### getPack(name)
-
-Retrieves an offline pack that is stored in the database by name.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `name` | `String` | `Yes` | Name of the offline pack. |
-
-
-
-```javascript
-const offlinePack = await MapLibreGL.offlineManager.getPack();
-```
-
-
-#### mergeOfflineRegions(path)
-
-Sideloads offline db
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `path` | `String` | `Yes` | Path to offline tile db on file system. |
-
-
-
-```javascript
-await MapLibreGL.offlineManager.mergeOfflineRegions(path);
-```
-
-
-#### setTileCountLimit(limit)
-
-Sets the maximum number of tiles that may be downloaded and stored on the current device.<br/>Consult the Terms of Service for your map tile host before changing this value.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `limit` | `Number` | `Yes` | Map tile limit count. |
-
-
-
-```javascript
-MapLibreGL.offlineManager.setTileCountLimit(1000);
-```
-
-
-#### setProgressEventThrottle(throttleValue)
-
-Sets the period at which download status events will be sent over the React Native bridge.<br/>The default is 500ms.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `throttleValue` | `Number` | `Yes` | event throttle value in ms. |
-
-
-
-```javascript
-MapLibreGL.offlineManager.setProgressEventThrottle(500);
-```
-
-
-#### subscribe(packName, progressListener, errorListener)
-
-Subscribe to download status/error events for the requested offline pack.<br/>Note that createPack calls this internally if listeners are provided.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `packName` | `String` | `Yes` | Name of the offline pack. |
-| `progressListener` | `Callback` | `Yes` | Callback that listens for status events while downloading the offline resource. |
-| `errorListener` | `Callback` | `Yes` | Callback that listens for status events while downloading the offline resource. |
-
-
-
-```javascript
-const progressListener = (offlinePack, status) => console.log(offlinePack, status)
-const errorListener = (offlinePack, err) => console.log(offlinePack, err)
-MapLibreGL.offlineManager.subscribe('packName', progressListener, errorListener)
-```
-
-
-#### unsubscribe(packName)
-
-Unsubscribes any listeners associated with the offline pack.<br/>It's a good idea to call this on componentWillUnmount.
-
-##### arguments
-| Name | Type | Required | Description  |
-| ---- | :--: | :------: | :----------: |
-| `packName` | `String` | `Yes` | Name of the offline pack. |
-
-
-
-```javascript
-MapLibreGL.offlineManager.unsubscribe('packName')
-```
-
-
-

package/scripts/download-style-spec.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-echo "Downloading MapLibre Style Spec"
-cd style-spec/
-
-FILENAME=v8.json
-
-if [ -e "./${FILENAME}" ]; then
-  echo "Removing old style spec ${FILENAME}"
-  rm "./${FILENAME}"
-fi
-
-echo "Fetching new style spec ${FILENAME}"
-curl -sS https://raw.githubusercontent.com/maplibre/maplibre-style-spec/main/src/reference/${FILENAME} -o ${FILENAME}
-cd ..