@deck.gl/jupyter-widget 8.9.0-alpha.2 → 8.9.0-alpha.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/jupyter-widget",
   "description": "Jupyter widget for rendering deck.gl in a Jupyter notebook",
   "license": "MIT",
-  "version": "8.9.0-alpha.2",
+  "version": "8.9.0-alpha.3",
   "keywords": [
     "jupyter",
     "jupyterlab",
@@ -29,12 +29,12 @@
     "prepublishOnly": "webpack -p"
   },
   "dependencies": {
-    "@deck.gl/aggregation-layers": "^8.8.0",
-    "@deck.gl/geo-layers": "^8.8.0",
-    "@deck.gl/google-maps": "^8.8.0",
-    "@deck.gl/json": "^8.8.0",
-    "@deck.gl/layers": "^8.8.0",
-    "@deck.gl/mesh-layers": "^8.8.0",
+    "@deck.gl/aggregation-layers": "8.9.0-alpha.3",
+    "@deck.gl/geo-layers": "8.9.0-alpha.3",
+    "@deck.gl/google-maps": "8.9.0-alpha.3",
+    "@deck.gl/json": "8.9.0-alpha.3",
+    "@deck.gl/layers": "8.9.0-alpha.3",
+    "@deck.gl/mesh-layers": "8.9.0-alpha.3",
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4",
     "@loaders.gl/3d-tiles": "^3.2.5",
     "@loaders.gl/core": "^3.2.5",
@@ -51,5 +51,5 @@
       }
     }
   },
-  "gitHead": "9d9d51e600b437ce1933d42b4289a3e67db61349"
+  "gitHead": "1a42362a310b39b5b26d46354d388e2319a90af3"
 }

package/src/playground/create-deck.js

@@ -15,19 +15,22 @@ import {addSupportComponents} from '../lib/components/index';
 
 import * as deck from '../deck-bundle';
 
-function extractClasses(library = {}) {
-  // Extracts exported class constructors as a dictionary from a library
-  const classesDict = {};
-  const classes = Object.keys(library).filter(x => x.charAt(0) === x.charAt(0).toUpperCase());
-  for (const cls of classes) {
-    classesDict[cls] = library[cls];
+const classesFilter = x => x.charAt(0) === x.charAt(0).toUpperCase();
+const functionsFilter = x => x.charAt(0) === x.charAt(0).toLowerCase() && x.charAt(0) != '_';
+
+function extractElements(library = {}, filter) {
+  // Extracts exported elements as a dictionary from a library
+  const dict = {};
+  const elements = Object.keys(library).filter(filter);
+  for (const el of elements) {
+    dict[el] = library[el];
   }
-  return classesDict;
+  return dict;
 }
 
 // Handle JSONConverter and loaders configuration
 const jsonConverterConfiguration = {
-  classes: extractClasses(deck),
+  classes: extractElements(deck, classesFilter),
   // Will be resolved as `<enum-name>.<enum-value>`
   enumerations: {
     COORDINATE_SYSTEM: deck.COORDINATE_SYSTEM,
@@ -43,7 +46,8 @@ const jsonConverter = new deck.JSONConverter({
 
 function addModuleToConverter(module, converter) {
   const newConfiguration = {
-    classes: extractClasses(module)
+    classes: extractElements(module, classesFilter),
+    functions: extractElements(module, functionsFilter)
   };
   converter.mergeConfiguration(newConfiguration);
 }
@@ -177,10 +181,15 @@ function createDeck({
   jsonInput,
   tooltip,
   handleEvent,
-  customLibraries
+  customLibraries,
+  configuration
 }) {
   let deckgl;
   try {
+    if (configuration) {
+      jsonConverter.mergeConfiguration(configuration);
+    }
+
     const oldLayers = jsonInput.layers || [];
     const props = jsonConverter.convert(jsonInput);
 

package/src/playground/widget-tooltip.js

@@ -111,9 +111,37 @@ export function toText(jsonValue) {
 }
 
 export function substituteIn(template, json) {
+  /*
+   * Flexible substitution of templates using a json:
+   * - if the json contains the key, use [key]
+   * - if the json does not contain the key, try ['properties'][key]
+   * - if the key contains several keys separated with dots, use them all in a row:
+   *   e.g. 'a.b.c' will read json['a']['b']['c']
+   */
+  let value;
   let output = template;
-  for (const key in json) {
-    output = output.replace(`{${key}}`, json[key]);
+  const propsKey = 'properties';
+  const keyPattern = /{[^}]*}/g;
+  const cleanKey = k => k.replace(/[{}]/g, '');
+  const keys = [...new Set(template.match(keyPattern).map(cleanKey))];
+
+  for (const key of keys) {
+    if (key.includes('.')) {
+      value = json;
+      const subkeys = key.split('.');
+      for (const subkey of subkeys) {
+        if (value.hasOwnProperty(subkey)) {
+          value = value[subkey];
+        }
+      }
+    } else if (json.hasOwnProperty(key)) {
+      value = json[key];
+    } else if (json[propsKey] && json[propsKey].hasOwnProperty(key)) {
+      value = json[propsKey][key];
+    }
+    if (value) {
+      output = output.replaceAll(`{${key}}`, value);
+    }
   }
 
   return output;