@maplibre/maplibre-react-native 10.0.0-alpha.18 → 10.0.0-alpha.19

package/javascript/utils/styleMap.ts

@@ -178,6 +178,7 @@ const styleMap = {
   fillExtrusionHeightTransition: StyleTypes.Transition,
   fillExtrusionBase: StyleTypes.Constant,
   fillExtrusionBaseTransition: StyleTypes.Transition,
+  fillExtrusionVerticalGradient: StyleTypes.Constant,
 
   rasterOpacity: StyleTypes.Constant,
   rasterOpacityTransition: StyleTypes.Transition,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "10.0.0-alpha.18",
+  "version": "10.0.0-alpha.19",
   "publishConfig": {
     "access": "public"
   },
@@ -22,8 +22,8 @@
   },
   "scripts": {
     "fetch:style:spec": "./scripts/download-style-spec.sh",
-    "generate": "yarn node ./scripts/autogenerate",
-    "test": "npm run lint && npm run unittest",
+    "generate": "yarn fetch:style:spec && yarn node ./scripts/autogenerate",
+    "test": "yarn lint && yarn unittest",
     "unittest": "jest",
     "unittest:single": "jest --testNamePattern",
     "lint": "eslint .",

package/scripts/autogenHelpers/globals.js

@@ -263,73 +263,30 @@ global.getEnums = function (layers) {
 };
 
 global.dtsInterfaceType = function (prop) {
-  let propTypes = [];
-
-  if (prop.name.indexOf('Translate') !== -1 && prop.type != 'enum') {
-    propTypes.push('Translation');
-  } else if (prop.type === 'color') {
-    propTypes.push('string');
-    // propTypes.push('ConstantPropType');
-  } else if (prop.type === 'array') {
-    switch (prop.value) {
-      case 'number':
-        propTypes.push('number[]');
-        break;
-      case 'boolean':
-        propTypes.push('boolean[]');
-        break;
-      case 'string':
-        propTypes.push('string[]');
-        break;
-      case 'enum':
-        propTypes.push(
-          `Enum<${pascelCase(prop.name)}Enum, ${pascelCase(
-            prop.name,
-          )}EnumValues>[]`,
-        );
-        break;
-    }
-    // propTypes.push('ConstantPropType');
-  } else if (prop.type === 'number') {
-    propTypes.push('number');
-  } else if (prop.type === 'enum') {
-    propTypes.push(
-      `Enum<${pascelCase(prop.name)}Enum, ${pascelCase(prop.name)}EnumValues>`,
-    );
-  } else if (prop.type === 'boolean') {
-    propTypes.push('boolean');
-  } else if (prop.type === 'resolvedImage') {
-    propTypes.push('ResolvedImageType');
-  } else if (prop.type === 'formatted') {
-    propTypes.push('FormattedString');
-  } else if (prop.type === 'string') {
-    propTypes.push('string');
-  } else {
-    console.error('Unexpected type:', prop.type);
-    throw new Error(`Unexpected type: ${prop.type} for ${prop.name}`);
-  }
-
-  /*
-  if (prop.allowedFunctionTypes && prop.allowedFunctionTypes.length > 0) {
-    propTypes.push('StyleFunctionProps');
-  }
-  */
-
-  if (propTypes.length > 1) {
-    return `${propTypes.map((p) => startAtSpace(4, p)).join(' | ')},
-${startAtSpace(2, '')}`;
-  } else {
-    if (prop.expressionSupported) {
-      let params = '';
-      if (prop.expression && prop.expression.parameters) {
-        params = `,[${prop.expression.parameters
-          .map((v) => `'${v}'`)
-          .join(',')}]`;
-      }
-      return `Value<${propTypes[0]}${params}>`;
-    } else {
-      return propTypes[0];
-    }
+  switch (prop.type) {
+    case 'number':
+      return 'number';
+    case 'string':
+      return 'string';
+    case 'boolean':
+      return 'boolean';
+    case 'array':
+      return 'any[]';
+    case 'padding':
+      return 'number[]';
+    case 'enum':
+      return prop.doc && prop.doc.values ? 
+        Object.keys(prop.doc.values).map(value => `'${value}'`).join(' | ') : 
+        'string';
+    case 'color':
+      return 'string';
+    case 'resolvedImage':
+      return 'string';
+    case 'formatted':
+      return 'string';
+    // ... other cases ...
+    default:
+      throw new Error(`Unexpected type: ${prop.type} for ${prop.name}`);
   }
 };
 

package/scripts/autogenerate.js

@@ -139,7 +139,12 @@ function getPropertiesForLayer(layerName) {
     ) {
       prop.allowedFunctionTypes = ['camera'];
     }
-
+    // Overide type padding
+    if(prop.type === 'padding') {
+      prop.type = 'array';
+      prop.value = 'number';
+      prop.length = 4;
+    }
     return prop;
   });
 
@@ -325,10 +330,6 @@ async function generate() {
       input: path.join(TMPL_PATH, 'RCTMLNStyle.h.ejs'),
       output: path.join(IOS_OUTPUT_PATH, 'RCTMLNStyle.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'), 
@@ -356,6 +357,12 @@ async function generate() {
     let results = tmpl({layers});
     if (filename.endsWith('ts')) {
       results = await prettier.format(results, { ...prettierrc, filepath: filename});
+      // Ensure all enums are exported
+      results = results.replace(/enum (\w+Enum) \{[^}]+\}\n/g, 'export $&');
+      // Replace Array<any> with any[]
+      results = results.replace(/Array<any>/g, 'any[]');
+      // Replace padding type with float array
+      results = results.replace(/padding: string;/g, 'padding: number[];');
     }
     fs.writeFileSync(output, results);
   }));