@maplibre/maplibre-react-native 9.1.0 → 10.0.0-alpha.1

package/javascript/utils/geoUtils.ts

@@ -0,0 +1,79 @@
+import {
+  featureCollection,
+  point,
+  feature,
+  lineString,
+  Id,
+  Properties,
+} from '@turf/helpers';
+import distance from '@turf/distance';
+import along from '@turf/along';
+import geoViewport from '@mapbox/geo-viewport';
+
+const VECTOR_TILE_SIZE = 512;
+
+export const makePoint = point;
+
+export const makeLineString = lineString;
+
+export function makeLatLngBounds(
+  northEastCoordinates: GeoJSON.Position,
+  southWestCoordinates: GeoJSON.Position,
+): GeoJSON.FeatureCollection {
+  return featureCollection([
+    point(northEastCoordinates),
+    point(southWestCoordinates),
+  ]);
+}
+
+export const makeFeature = feature;
+
+export function makeFeatureCollection(
+  features: GeoJSON.Feature[] = [],
+  options?: {bbox?: GeoJSON.BBox; id?: Id},
+): GeoJSON.FeatureCollection {
+  return featureCollection(features, options);
+}
+
+export function addToFeatureCollection<T extends GeoJSON.Geometry>(
+  newFeatureCollection: GeoJSON.FeatureCollection<T, Properties>,
+  newFeature: GeoJSON.Feature<T, Properties>,
+): GeoJSON.FeatureCollection<T, Properties> {
+  return {
+    ...newFeatureCollection,
+    features: [...newFeatureCollection.features, newFeature],
+  };
+}
+
+export const calculateDistance = distance;
+
+export const pointAlongLine = along;
+
+export function getOrCalculateVisibleRegion(
+  coord: [number, number] | {lon: number; lat: number},
+  zoomLevel: number,
+  width: number,
+  height: number,
+  nativeRegion: {properties: {visibleBounds: [number, number][]}},
+): {ne: [number, number]; sw: [number, number]} {
+  const region = {
+    ne: [0, 0] as [number, number],
+    sw: [0, 0] as [number, number],
+  };
+
+  if (!nativeRegion || !Array.isArray(nativeRegion.properties.visibleBounds)) {
+    const bounds = geoViewport.bounds(
+      coord,
+      zoomLevel,
+      [width, height],
+      VECTOR_TILE_SIZE,
+    );
+    region.ne = [bounds[3], bounds[2]];
+    region.sw = [bounds[1], bounds[0]];
+  } else {
+    region.ne = nativeRegion.properties.visibleBounds[0];
+    region.sw = nativeRegion.properties.visibleBounds[1];
+  }
+
+  return region;
+}

package/javascript/utils/{index.js → index.ts}

@@ -1,9 +1,13 @@
-import React from 'react';
-import {View, NativeModules, findNodeHandle, Platform} from 'react-native';
-import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
-import {ViewPropTypes} from 'deprecated-react-native-prop-types';
-
-function getAndroidManagerInstance(module) {
+import React, {Component, ReactElement} from 'react';
+import {
+  Image,
+  NativeModules,
+  findNodeHandle,
+  Platform,
+  ImageSourcePropType,
+} from 'react-native';
+
+function getAndroidManagerInstance(module: string): any {
   const haveViewManagerConfig =
     NativeModules.UIManager && NativeModules.UIManager.getViewManagerConfig;
   return haveViewManagerConfig
@@ -11,48 +15,61 @@ function getAndroidManagerInstance(module) {
     : NativeModules.UIManager[module];
 }
 
-function getIosManagerInstance(module) {
+function getIosManagerInstance(module: string): any {
   return NativeModules[getIOSModuleName(module)];
 }
 
-export const viewPropTypes = ViewPropTypes || View.props;
-
-export function isAndroid() {
+export function isAndroid(): boolean {
   return Platform.OS === 'android';
 }
 
-export function existenceChange(cur, next) {
+export function existenceChange(cur: boolean, next: boolean): boolean {
   if (!cur && !next) {
     return false;
   }
   return (!cur && next) || (cur && !next);
 }
 
-export function isFunction(fn) {
+export function isFunction(fn: unknown): fn is boolean {
   return typeof fn === 'function';
 }
 
-export function isNumber(num) {
+export function isNumber(num: unknown): num is number {
   return typeof num === 'number' && !Number.isNaN(num);
 }
 
-export function isUndefined(obj) {
+export function isUndefined(obj: unknown): obj is undefined {
   return typeof obj === 'undefined';
 }
 
-export function isString(str) {
+export function isString(str: unknown): str is string {
   return typeof str === 'string';
 }
 
-export function isBoolean(bool) {
+export function isBoolean(bool: unknown): bool is boolean {
   return typeof bool === 'boolean';
 }
 
-export function isPrimitive(value) {
+export function isPrimitive(
+  value: unknown,
+): value is string | number | boolean {
   return isString(value) || isNumber(value) || isBoolean(value);
 }
 
-export function runNativeCommand(module, name, nativeRef, args = []) {
+export type NativeArg =
+  | string
+  | number
+  | boolean
+  | null
+  | {[k: string]: NativeArg}
+  | NativeArg[];
+
+export function runNativeCommand<ReturnType = NativeArg>(
+  module: string,
+  name: string,
+  nativeRef: Component,
+  args: NativeArg[] = [],
+): ReturnType {
   const handle = findNodeHandle(nativeRef);
   if (!handle) {
     throw new Error(`Could not find handle for native ref ${module}.${name}`);
@@ -77,9 +94,12 @@ export function runNativeCommand(module, name, nativeRef, args = []) {
   return managerInstance[name](handle, ...args);
 }
 
-export function cloneReactChildrenWithProps(children, propsToAdd = {}) {
+export function cloneReactChildrenWithProps(
+  children: Parameters<typeof React.Children.map>[0],
+  propsToAdd: {[key: string]: string} = {},
+): ReactElement[] | undefined {
   if (!children) {
-    return null;
+    return undefined;
   }
 
   let foundChildren = null;
@@ -96,18 +116,18 @@ export function cloneReactChildrenWithProps(children, propsToAdd = {}) {
   );
 }
 
-export function resolveImagePath(imageRef) {
-  const res = resolveAssetSource(imageRef);
+export function resolveImagePath(imageRef: ImageSourcePropType): string {
+  const res = Image.resolveAssetSource(imageRef);
   return res.uri;
 }
 
-export function getIOSModuleName(moduleName) {
+export function getIOSModuleName(moduleName: string): string {
   if (moduleName.startsWith('RCT')) {
     return moduleName.substring(3);
   }
   return moduleName;
 }
 
-export function toJSONString(json = '') {
+export function toJSONString(json: object | string = ''): string {
   return JSON.stringify(json);
 }

package/javascript/utils/styleMap.ts

@@ -0,0 +1,264 @@
+/* eslint-disable */
+// DO NOT MODIFY
+// THIS FILE IS AUTOGENERATED
+
+import {isAndroid} from './index';
+
+export const StyleTypes = {
+  Constant: 'constant',
+  Color: 'color',
+  Transition: 'transition',
+  Translation: 'translation',
+  Function: 'function',
+  Image: 'image',
+  Enum: 'enum',
+};
+
+export function getStyleType(styleProp: keyof typeof styleExtras): string {
+  if (!isAndroid() && styleExtras[styleProp]) {
+    return styleExtras[styleProp].iosType;
+  }
+
+  if (styleMap[styleProp]) {
+    return styleMap[styleProp];
+  }
+
+  throw new Error(`${styleProp} is not a valid MapLibre layer style`);
+}
+
+const styleMap = {
+  fillSortKey: StyleTypes.Constant,
+  fillAntialias: StyleTypes.Constant,
+  fillOpacity: StyleTypes.Constant,
+  fillOpacityTransition: StyleTypes.Transition,
+  fillColor: StyleTypes.Color,
+  fillColorTransition: StyleTypes.Transition,
+  fillOutlineColor: StyleTypes.Color,
+  fillOutlineColorTransition: StyleTypes.Transition,
+  fillTranslate: StyleTypes.Translation,
+  fillTranslateTransition: StyleTypes.Transition,
+  fillTranslateAnchor: StyleTypes.Enum,
+  fillPattern: StyleTypes.Image,
+  fillPatternTransition: StyleTypes.Transition,
+
+  lineCap: StyleTypes.Enum,
+  lineJoin: StyleTypes.Enum,
+  lineMiterLimit: StyleTypes.Constant,
+  lineRoundLimit: StyleTypes.Constant,
+  lineSortKey: StyleTypes.Constant,
+  lineOpacity: StyleTypes.Constant,
+  lineOpacityTransition: StyleTypes.Transition,
+  lineColor: StyleTypes.Color,
+  lineColorTransition: StyleTypes.Transition,
+  lineTranslate: StyleTypes.Translation,
+  lineTranslateTransition: StyleTypes.Transition,
+  lineTranslateAnchor: StyleTypes.Enum,
+  lineWidth: StyleTypes.Constant,
+  lineWidthTransition: StyleTypes.Transition,
+  lineGapWidth: StyleTypes.Constant,
+  lineGapWidthTransition: StyleTypes.Transition,
+  lineOffset: StyleTypes.Constant,
+  lineOffsetTransition: StyleTypes.Transition,
+  lineBlur: StyleTypes.Constant,
+  lineBlurTransition: StyleTypes.Transition,
+  lineDasharray: StyleTypes.Constant,
+  lineDasharrayTransition: StyleTypes.Transition,
+  linePattern: StyleTypes.Image,
+  linePatternTransition: StyleTypes.Transition,
+  lineGradient: StyleTypes.Color,
+
+  symbolPlacement: StyleTypes.Enum,
+  symbolSpacing: StyleTypes.Constant,
+  symbolAvoidEdges: StyleTypes.Constant,
+  symbolSortKey: StyleTypes.Constant,
+  symbolZOrder: StyleTypes.Enum,
+  iconAllowOverlap: StyleTypes.Constant,
+  iconIgnorePlacement: StyleTypes.Constant,
+  iconOptional: StyleTypes.Constant,
+  iconRotationAlignment: StyleTypes.Enum,
+  iconSize: StyleTypes.Constant,
+  iconTextFit: StyleTypes.Enum,
+  iconTextFitPadding: StyleTypes.Constant,
+  iconImage: StyleTypes.Image,
+  iconRotate: StyleTypes.Constant,
+  iconPadding: StyleTypes.Constant,
+  iconKeepUpright: StyleTypes.Constant,
+  iconOffset: StyleTypes.Constant,
+  iconAnchor: StyleTypes.Enum,
+  iconPitchAlignment: StyleTypes.Enum,
+  textPitchAlignment: StyleTypes.Enum,
+  textRotationAlignment: StyleTypes.Enum,
+  textField: StyleTypes.Constant,
+  textFont: StyleTypes.Constant,
+  textSize: StyleTypes.Constant,
+  textMaxWidth: StyleTypes.Constant,
+  textLineHeight: StyleTypes.Constant,
+  textLetterSpacing: StyleTypes.Constant,
+  textJustify: StyleTypes.Enum,
+  textRadialOffset: StyleTypes.Constant,
+  textVariableAnchor: StyleTypes.Constant,
+  textAnchor: StyleTypes.Enum,
+  textMaxAngle: StyleTypes.Constant,
+  textWritingMode: StyleTypes.Constant,
+  textRotate: StyleTypes.Constant,
+  textPadding: StyleTypes.Constant,
+  textKeepUpright: StyleTypes.Constant,
+  textTransform: StyleTypes.Enum,
+  textOffset: StyleTypes.Constant,
+  textAllowOverlap: StyleTypes.Constant,
+  textIgnorePlacement: StyleTypes.Constant,
+  textOptional: StyleTypes.Constant,
+  iconOpacity: StyleTypes.Constant,
+  iconOpacityTransition: StyleTypes.Transition,
+  iconColor: StyleTypes.Color,
+  iconColorTransition: StyleTypes.Transition,
+  iconHaloColor: StyleTypes.Color,
+  iconHaloColorTransition: StyleTypes.Transition,
+  iconHaloWidth: StyleTypes.Constant,
+  iconHaloWidthTransition: StyleTypes.Transition,
+  iconHaloBlur: StyleTypes.Constant,
+  iconHaloBlurTransition: StyleTypes.Transition,
+  iconTranslate: StyleTypes.Translation,
+  iconTranslateTransition: StyleTypes.Transition,
+  iconTranslateAnchor: StyleTypes.Enum,
+  textOpacity: StyleTypes.Constant,
+  textOpacityTransition: StyleTypes.Transition,
+  textColor: StyleTypes.Color,
+  textColorTransition: StyleTypes.Transition,
+  textHaloColor: StyleTypes.Color,
+  textHaloColorTransition: StyleTypes.Transition,
+  textHaloWidth: StyleTypes.Constant,
+  textHaloWidthTransition: StyleTypes.Transition,
+  textHaloBlur: StyleTypes.Constant,
+  textHaloBlurTransition: StyleTypes.Transition,
+  textTranslate: StyleTypes.Translation,
+  textTranslateTransition: StyleTypes.Transition,
+  textTranslateAnchor: StyleTypes.Enum,
+
+  circleSortKey: StyleTypes.Constant,
+  circleRadius: StyleTypes.Constant,
+  circleRadiusTransition: StyleTypes.Transition,
+  circleColor: StyleTypes.Color,
+  circleColorTransition: StyleTypes.Transition,
+  circleBlur: StyleTypes.Constant,
+  circleBlurTransition: StyleTypes.Transition,
+  circleOpacity: StyleTypes.Constant,
+  circleOpacityTransition: StyleTypes.Transition,
+  circleTranslate: StyleTypes.Translation,
+  circleTranslateTransition: StyleTypes.Transition,
+  circleTranslateAnchor: StyleTypes.Enum,
+  circlePitchScale: StyleTypes.Enum,
+  circlePitchAlignment: StyleTypes.Enum,
+  circleStrokeWidth: StyleTypes.Constant,
+  circleStrokeWidthTransition: StyleTypes.Transition,
+  circleStrokeColor: StyleTypes.Color,
+  circleStrokeColorTransition: StyleTypes.Transition,
+  circleStrokeOpacity: StyleTypes.Constant,
+  circleStrokeOpacityTransition: StyleTypes.Transition,
+
+  heatmapRadius: StyleTypes.Constant,
+  heatmapRadiusTransition: StyleTypes.Transition,
+  heatmapWeight: StyleTypes.Constant,
+  heatmapIntensity: StyleTypes.Constant,
+  heatmapIntensityTransition: StyleTypes.Transition,
+  heatmapColor: StyleTypes.Color,
+  heatmapOpacity: StyleTypes.Constant,
+  heatmapOpacityTransition: StyleTypes.Transition,
+
+  fillExtrusionOpacity: StyleTypes.Constant,
+  fillExtrusionOpacityTransition: StyleTypes.Transition,
+  fillExtrusionColor: StyleTypes.Color,
+  fillExtrusionColorTransition: StyleTypes.Transition,
+  fillExtrusionTranslate: StyleTypes.Translation,
+  fillExtrusionTranslateTransition: StyleTypes.Transition,
+  fillExtrusionTranslateAnchor: StyleTypes.Enum,
+  fillExtrusionPattern: StyleTypes.Image,
+  fillExtrusionPatternTransition: StyleTypes.Transition,
+  fillExtrusionHeight: StyleTypes.Constant,
+  fillExtrusionHeightTransition: StyleTypes.Transition,
+  fillExtrusionBase: StyleTypes.Constant,
+  fillExtrusionBaseTransition: StyleTypes.Transition,
+
+  rasterOpacity: StyleTypes.Constant,
+  rasterOpacityTransition: StyleTypes.Transition,
+  rasterHueRotate: StyleTypes.Constant,
+  rasterHueRotateTransition: StyleTypes.Transition,
+  rasterBrightnessMin: StyleTypes.Constant,
+  rasterBrightnessMinTransition: StyleTypes.Transition,
+  rasterBrightnessMax: StyleTypes.Constant,
+  rasterBrightnessMaxTransition: StyleTypes.Transition,
+  rasterSaturation: StyleTypes.Constant,
+  rasterSaturationTransition: StyleTypes.Transition,
+  rasterContrast: StyleTypes.Constant,
+  rasterContrastTransition: StyleTypes.Transition,
+  rasterResampling: StyleTypes.Enum,
+  rasterFadeDuration: StyleTypes.Constant,
+
+  hillshadeIlluminationDirection: StyleTypes.Constant,
+  hillshadeIlluminationAnchor: StyleTypes.Enum,
+  hillshadeExaggeration: StyleTypes.Constant,
+  hillshadeExaggerationTransition: StyleTypes.Transition,
+  hillshadeShadowColor: StyleTypes.Color,
+  hillshadeShadowColorTransition: StyleTypes.Transition,
+  hillshadeHighlightColor: StyleTypes.Color,
+  hillshadeHighlightColorTransition: StyleTypes.Transition,
+  hillshadeAccentColor: StyleTypes.Color,
+  hillshadeAccentColorTransition: StyleTypes.Transition,
+
+  backgroundColor: StyleTypes.Color,
+  backgroundColorTransition: StyleTypes.Transition,
+  backgroundPattern: StyleTypes.Image,
+  backgroundPatternTransition: StyleTypes.Transition,
+  backgroundOpacity: StyleTypes.Constant,
+  backgroundOpacityTransition: StyleTypes.Transition,
+
+  anchor: StyleTypes.Enum,
+  position: StyleTypes.Constant,
+  positionTransition: StyleTypes.Transition,
+  color: StyleTypes.Color,
+  colorTransition: StyleTypes.Transition,
+  intensity: StyleTypes.Constant,
+  intensityTransition: StyleTypes.Transition,
+
+  visibility: StyleTypes.Constant,
+};
+
+export const styleExtras = {
+  // padding
+  iconTextFitPadding: {
+    iosType: 'edgeinsets',
+  },
+
+  // offsets
+  iconOffset: {
+    iosType: 'vector',
+  },
+  textOffset: {
+    iosType: 'vector',
+  },
+  lineOffset: {
+    iosType: 'vector',
+  },
+
+  // translates
+  fillTranslate: {
+    iosType: 'vector',
+  },
+  lineTranslate: {
+    iosType: 'vector',
+  },
+  iconTranslate: {
+    iosType: 'vector',
+  },
+  textTranslate: {
+    iosType: 'vector',
+  },
+  circleTranslate: {
+    iosType: 'vector',
+  },
+  fillExtrusionTranslate: {
+    iosType: 'vector',
+  },
+};
+
+export default styleMap;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "9.1.0",
+  "version": "10.0.0-alpha.1",
   "publishConfig": {
     "access": "public"
   },
   "author": "MapLibre",
-  "main": "./javascript/index.js",
+  "main": "./javascript/index.ts",
   "keywords": [
     "maps",
     "ios",
@@ -28,64 +28,77 @@
     "unittest:single": "jest --testNamePattern",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "prepack": "yarn build:plugin",
+    "prepack": "pinst --disable && yarn build:plugin",
     "test:plugin": "jest plugin",
     "build:plugin": "tsc --build plugin",
-    "lint:plugin": "eslint plugin/src/*"
+    "lint:plugin": "eslint plugin/src/*",
+    "_postinstall": "husky install",
+    "postpack": "pinst --enable"
+  },
+  "peerDependenciesMeta": {
+    "@expo/config-plugins": {
+      "optional": true
+    }
   },
   "peerDependencies": {
-    "prop-types": "^15.8.1",
+    "@expo/config-plugins": ">=7",
     "react": ">=16.6.1",
     "react-native": ">=0.59.9"
   },
   "dependencies": {
-    "@expo/config-plugins": "^4.0.3",
     "@mapbox/geo-viewport": ">= 0.4.0",
     "@turf/along": "6.5.0",
     "@turf/distance": "6.5.0",
     "@turf/helpers": "6.5.0",
     "@turf/length": "6.5.0",
     "@turf/nearest-point-on-line": "6.5.0",
-    "@types/geojson": "^7946.0.7",
-    "@types/node": "^18.11.18",
-    "debounce": "^1.2.0",
-    "deprecated-react-native-prop-types": "^4.1.0"
+    "@types/geojson": "^7946.0.10",
+    "@types/react-native": "0.67.8",
+    "debounce": "^1.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.5",
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/eslint-parser": "^7.22.9",
     "@babel/plugin-proposal-class-properties": "7.16.7",
     "@babel/runtime": "7.17.2",
+    "@expo/config-plugins": "^7.2.5",
     "@react-native-community/eslint-config": "^3.0.1",
     "@react-native-community/eslint-plugin": "^1.3.0",
     "@react-native/metro-config": "^0.72.7",
-    "@sinonjs/fake-timers": "^8.0.1",
+    "@sinonjs/fake-timers": "^11.1.0",
     "@testing-library/react-native": "^8.0.0",
+    "@tsconfig/node14": "14.1.0",
+    "@types/debounce": "^1.2.1",
+    "@types/jest": "^27.4.1",
+    "@types/mapbox__geo-viewport": "^0.4.1",
+    "@types/node": "^18.11.18",
+    "@types/react": "^18.2.15",
     "@typescript-eslint/eslint-plugin": "^5.2.0",
-    "@typescript-eslint/parser": "^5.8.0",
+    "@typescript-eslint/parser": "^6.7.4",
     "babel-jest": "^29.6.0",
     "documentation": "^14.0.0",
     "ejs": "^3.1.3",
-    "ejs-lint": "^1.1.0",
-    "eslint": "^8.29.0",
+    "ejs-lint": "^2.0.0",
+    "eslint": "^8.45.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-fp": "^2.3.0",
     "eslint-plugin-ft-flow": "^2.0.3",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.28.1",
     "eslint-plugin-jest": "^27.1.7",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-native": "^4.0.0",
-    "expo-module-scripts": "^3.0.4",
-    "husky": "4.3.8",
+    "expo-module-scripts": "^3.1.0",
+    "husky": "^8.0.3",
     "jest": "^29.6.0",
     "jest-cli": "^29.6.0",
-    "lint-staged": "^12.1.2",
+    "lint-staged": "^14.0.1",
     "metro-react-native-babel-preset": "^0.76.7",
     "node-dir": "0.1.17",
-    "prettier": "^2.0.4",
+    "pinst": "^3.0.0",
+    "prettier": "^3.0.3",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-docgen": "rnmapbox/react-docgen#rnmapbox-dist",
@@ -109,13 +122,8 @@
       "fixtures"
     ]
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged && npm run generate"
-    }
-  },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": "yarn lint"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.6.1"
 }

package/plugin/build/withMapLibre.js

@@ -96,10 +96,11 @@ function setExcludedArchitectures(project) {
     const configurations = project.pbxXCBuildConfigurationSection();
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    for (const { buildSettings } of Object.values(configurations || {})) {
+    for (const { name, buildSettings } of Object.values(configurations || {})) {
         // Guessing that this is the best way to emulate Xcode.
         // Using `project.addToBuildSettings` modifies too many targets.
-        if (typeof buildSettings?.PRODUCT_NAME !== 'undefined') {
+        if (name === 'Release' &&
+            typeof buildSettings?.PRODUCT_NAME !== 'undefined') {
             buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
         }
     }

package/scripts/autogenHelpers/globals.js

@@ -265,7 +265,7 @@ global.getEnums = function (layers) {
 global.dtsInterfaceType = function (prop) {
   let propTypes = [];
 
-  if (prop.name.indexOf('Translate') !== -1) {
+  if (prop.name.indexOf('Translate') !== -1 && prop.type != 'enum') {
     propTypes.push('Translation');
   } else if (prop.type === 'color') {
     propTypes.push('string');

package/scripts/autogenerate.js

@@ -8,6 +8,7 @@ const ejs = require('ejs');
 const {execSync} = require('child_process');
 
 const prettier = require('prettier');
+const prettierrc = require('../.prettierrc.js');
 
 const styleSpecJSON = require('../style-spec/v8.json');
 
@@ -252,6 +253,9 @@ function isTranslate(attrName) {
 
 function isAttrSupported(attr) {
   const support = getAttributeSupport(attr['sdk-support']);
+  if (attr.private) {
+    return false
+  }
   return support.basic.android && support.basic.ios;
 }
 
@@ -321,9 +325,13 @@ async function generate() {
       input: path.join(TMPL_PATH, 'RCTMGLStyle.h.ejs'),
       output: path.join(IOS_OUTPUT_PATH, 'RCTMGLStyle.h'),
     },
-    {
+    /*{
       input: path.join(TMPL_PATH, 'index.d.ts.ejs'),
       output: path.join(IOS_OUTPUT_PATH, 'index.d.ts'),
+    },*/
+    {
+      input: path.join(TMPL_PATH, 'MaplibreStyles.ts.ejs'),
+      output: path.join(JS_OUTPUT_PATH, 'MaplibreStyles.d.ts'), 
     },
     {
       input: path.join(TMPL_PATH, 'RCTMGLStyle.m.ejs'),
@@ -334,23 +342,23 @@ async function generate() {
       output: path.join(ANDROID_OUTPUT_PATH, 'RCTMGLStyleFactory.java'),
     },
     {
-      input: path.join(TMPL_PATH, 'styleMap.js.ejs'),
-      output: path.join(JS_OUTPUT_PATH, 'styleMap.js'),
+      input: path.join(TMPL_PATH, 'styleMap.ts.ejs'),
+      output: path.join(JS_OUTPUT_PATH, 'styleMap.ts'),
     },
   ];
   const outputPaths = templateMappings.map(m => m.output);
 
   // autogenerate code
-  templateMappings.forEach(({input, output}) => {
+  await Promise.all(templateMappings.map(async ({input, output}) => {
     const filename = output.split('/').pop();
     console.log(`Generating ${filename}`);
     const tmpl = ejs.compile(fs.readFileSync(input, 'utf8'), {strict: true});
     let results = tmpl({layers});
     if (filename.endsWith('ts')) {
-      results = prettier.format(results, {filepath: filename});
+      results = await prettier.format(results, { ...prettierrc, filepath: filename});
     }
     fs.writeFileSync(output, results);
-  });
+  }));
 
   // autogenerate docs
   const docBuilder = new DocJSONBuilder(layers);