Build with std::map support

Author: linev

build/jsroot.js

@@ -14,7 +14,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '12/02/2026',
+version_date = '13/02/2026',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -178365,17 +178365,20 @@ class ReaderItem {
 
    constructor(column, name) {
       this.column = column;
-      this.id = column.index;
-      this.coltype = column.coltype;
-      this.splittype = 0;
-      this.page = -1; // current page for the reading
       this.name = name;
+      this.id = -1;
+      this.coltype = 0;
       this.sz = 0;
       this.simple = true;
+      this.page = -1; // current page for the reading
+
+      if (this.column) {
+         this.id = column.index;
+         this.coltype = column.coltype;
+      }
 
       // special handling of split types
       if ((this.coltype >= ENTupleColumnType.kSplitInt16) && (this.coltype <= ENTupleColumnType.kSplitIndex64)) {
-         this.splittype = this.coltype;
          this.coltype -= (ENTupleColumnType.kSplitInt16 - ENTupleColumnType.kInt16);
          this.simple = false;
       }
@@ -178390,8 +178393,10 @@ class ReaderItem {
    init_o() {
       this.o = 0;
       this.o2 = 0; // for bit count
-      this.view = this.views.shift();
-      this.view_len = this.view.byteLength;
+      if (this.column && this.views?.length) {
+         this.view = this.views.shift();
+         this.view_len = this.view.byteLength;
+      }
    }
 
    shift_o(sz) {
@@ -178566,8 +178571,8 @@ class ReaderItem {
       };
    }
 
-   /** @summary implement reading of std::vector where itemv provides element reading */
-   assignVectorReader(itemv) {
+   /** @summary implement reading of std collection where itemv provides element reading */
+   assignCollectionReader(itemv) {
       this.itemv = itemv;
       this.offv0 = 0;
 
@@ -178607,7 +178612,40 @@ class ReaderItem {
       };
    }
 
+   /** @summary implement reading of std::pair where item1 reads first (key) element */
+   assignPairReader(item_p1, item_p2) {
+      this.item_p1 = item_p1;
+      this.item_p2 = item_p2;
+
+      item_p1.func_p1 = item_p1.func;
+      item_p1.shift_p1 = item_p1.shift;
+      item_p2.func_p2 = item_p2.func;
+      item_p2.shift_p2 = item_p2.shift;
+      // assign noop
+      item_p1.func = item_p1.shift = item_p2.func = item_p2.shift = () => {};
+
+      // remember own read function - they need to be used
+      this.func = function(tgtobj) {
+         const res = {};
+         this.item_p1.func_p1(res);
+         this.item_p2.func_p2(res);
+         tgtobj[this.name] = res;
+      };
+
+      this.shift = function(entries) {
+         if (entries > 0) {
+            this.item_p1.shift_p1(entries);
+            this.item_p2.shift_p2(entries);
+         }
+      };
+   }
+
+
    collectPages(cluster_locations, dataToRead, itemsToRead, pagesToRead, emin, emax, elist) {
+      // no pages without real column id
+      if (!this.column || (this.id < 0))
+         return;
+
       const pages = cluster_locations[this.id].pages;
 
       this.views = new Array(pages.length);
@@ -178772,25 +178810,35 @@ async function rntupleProcess(rntuple, selector, args = {}) {
    }
 
    function addFieldReading(field, tgtname) {
-      const columns = rntuple.builder.findColumns(field);
-      if (!columns?.length)
+      const columns = rntuple.builder.findColumns(field),
+            childs = rntuple.builder.findChildFields(field);
+      if (!columns?.length) {
+         if ((childs.length === 2) && (field.typeName.indexOf('std::pair') === 0)) {
+            const item1 = addFieldReading(childs[0], 'first'),
+                  item2 = addFieldReading(childs[1], 'second'),
+                  item = new ReaderItem(null, tgtname);
+            handle.arr.push(item);
+            item.assignPairReader(item1, item2);
+            return item;
+         }
+
          throw new Error(`No columns found for field '${field.fieldName}' in RNTuple`);
+      }
 
-      let item = new ReaderItem(columns[0], tgtname);
+      const item = new ReaderItem(columns[0], tgtname);
       item.assignReadFunc();
       handle.arr.push(item);
 
       if ((columns.length === 2) && (field.typeName === 'std::string')) {
          const items = new ReaderItem(columns[1], tgtname);
          items.assignStringReader(item);
          handle.arr.push(items);
-         item = items; // second item performs complete reading of the string
+         return items; // second item performs complete reading of the string
       }
 
-      const childs = rntuple.builder.findChildFields(field);
-      if ((childs.length === 1) && (field.typeName.indexOf('std::vector') === 0)) {
+      if ((childs.length === 1) && (field.typeName.indexOf('std::vector') === 0 || field.typeName.indexOf('std::map') === 0)) {
          const itemv = addFieldReading(childs[0], tgtname);
-         item.assignVectorReader(itemv);
+         item.assignCollectionReader(itemv);
       }
 
       return item;

modules/core.mjs

@@ -6,7 +6,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '12/02/2026',
+version_date = '13/02/2026',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}