include all tags of a preset in the taginfo output (#223)

instead of only the last key-value pair in the object

Author: k-yle

lib/build.js

@@ -486,6 +486,19 @@ function generateTranslations(fields, presets, tstrings, searchableFieldIDs) {
 }
 
 
+/**
+ * @import * as Taginfo from 'taginfo-projects'
+ *
+ * this library doesn't follow the type-defintions strictly, it uses `string[]` instead
+ * of `string` for the description field.
+ *
+ * @typedef {Omit<Taginfo.Tag, "description"> & { description?: string[] }} TaginfoTag
+ * @typedef {Omit<Taginfo.Schema, "tags"> & { tags: TaginfoTag[] }} TaginfoSchema
+ */
+
+/**
+ * @param {Taginfo.Project} projectInfo
+ */
 function generateTaginfo(presets, fields, deprecated, discarded, tstrings, projectInfo) {
 
   const packageInfo = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
@@ -504,6 +517,7 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
     }
   }
 
+  /** @type {TaginfoSchema} */
   let taginfo = {
     data_format: 1,
     project: projectInfo,
@@ -515,43 +529,51 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
     if (preset.suggestion) return;
     if (id.startsWith('@')) return;
 
-    let keys = Object.keys(preset.tags);
-    let last = keys[keys.length - 1];
-    let tag = { key: last };
+    /** @type {Record<string, Set<string>>} */
+    const everyTag = {};
+    for (const group of [preset.tags, preset.addTags, preset.removeTags]) {
+      for (const key in group) {
+          everyTag[key] ||= new Set();
+          everyTag[key].add(preset.tags[key]);
+      }
+    }
 
-    if (!last) return;
+    for (const key in everyTag) {
+      for (const value of everyTag[key]) {
+        /** @type {TaginfoTag} */
+        let tag = { key };
+        if (value !== '*') tag.value = value;
 
-    if (preset.tags[last] !== '*') {
-      tag.value = preset.tags[last];
-    }
 
-    let name = tstrings.presets[id].name;
-    if (!name && preset.name.startsWith('{')) {
-      name = tstrings.presets[preset.name.slice(1, -1)].name;
-    }
-    let legacy = (preset.searchable === false) ? ' (unsearchable)' : '';
-    tag.description = [ `🄿 ${name}${legacy}` ];
+        let name = tstrings.presets[id].name;
+        if (!name && preset.name.startsWith('{')) {
+          name = tstrings.presets[preset.name.slice(1, -1)].name;
+        }
+        let legacy = (preset.searchable === false) ? ' (unsearchable)' : '';
+        tag.description = [ `🄿 ${name}${legacy}` ];
 
-    if (preset.geometry) {
-      setObjectType(tag, preset);
-    }
+        if (preset.geometry) {
+          setObjectType(tag, preset);
+        }
 
-    // add icon
-    if (/^maki-/.test(preset.icon)) {
-      tag.icon_url = 'https://cdn.jsdelivr.net/gh/mapbox/maki/icons/' +
-        preset.icon.replace(/^maki-/, '') + '.svg';
-    } else if (/^temaki-/.test(preset.icon)) {
-      tag.icon_url = 'https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/' +
-        preset.icon.replace(/^temaki-/, '') + '.svg';
-    } else if (/^fa[srb]-/.test(preset.icon)) {
-      tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/' +
-        preset.icon + '.svg';
-    } else if (/^iD-/.test(preset.icon)) {
-      tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/' +
-        preset.icon.replace(/^iD-/, '') + '.svg';
-    }
+        // add icon
+        if (/^maki-/.test(preset.icon)) {
+          tag.icon_url = 'https://cdn.jsdelivr.net/gh/mapbox/maki/icons/' +
+            preset.icon.replace(/^maki-/, '') + '.svg';
+        } else if (/^temaki-/.test(preset.icon)) {
+          tag.icon_url = 'https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/' +
+            preset.icon.replace(/^temaki-/, '') + '.svg';
+        } else if (/^fa[srb]-/.test(preset.icon)) {
+          tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/' +
+            preset.icon + '.svg';
+        } else if (/^iD-/.test(preset.icon)) {
+          tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/' +
+            preset.icon.replace(/^iD-/, '') + '.svg';
+        }
 
-    coalesceTags(taginfo, tag);
+        coalesceTags(taginfo, tag);
+      }
+    }
   });
 
   Object.keys(fields).forEach(id => {
@@ -567,6 +589,7 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
     }
 
     keys.forEach(key => {
+      /** @type {TaginfoTag} */
       let tag = { key: key };
 
       let label = tstrings.fields[id].label;
@@ -580,6 +603,7 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
       if (field.options && !isRadio && field.type !== 'manyCombo') {
         field.options.forEach(value => {
           if (value === 'undefined' || value === '*' || value === '') return;
+          /** @type {TaginfoTag} */
           let tag;
           if (field.type === 'multiCombo') {
             tag = { key: key + value };
@@ -607,6 +631,7 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
     let oldKeys = Object.keys(old);
     if (oldKeys.length === 1) {
       let oldKey = oldKeys[0];
+      /** @type {TaginfoTag} */
       let tag = { key: oldKey };
 
       let oldValue = old[oldKey];
@@ -629,6 +654,7 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
   if (!discarded) discarded = {};
   Object.keys(discarded).forEach(key => {
     let description = '🄳🄳 (discarded tag)';
+    /** @type {TaginfoTag} */
     let tag = {
       key,
       description: [description]
@@ -643,6 +669,10 @@ function generateTaginfo(presets, fields, deprecated, discarded, tstrings, proje
   });
 
 
+  /**
+   * @param {TaginfoSchema} taginfo
+   * @param {TaginfoTag} tag
+   */
   function coalesceTags(taginfo, tag) {
     if (!tag.key) return;
 

package-lock.json

@@ -22,6 +22,7 @@
     "shelljs": "^0.9.2"
   },
   "devDependencies": {
+    "@types/taginfo-projects": "github:taginfo/taginfo-projects#6daafd2e30a86a8bfb9615855af2c2d73bd98279",
     "eslint": "^9.0.0",
     "jest": "^29.1.1"
   },