fix tagged compatibility description in feature doc

Author: fasttime

dev/internal/engine-data.mjs

@@ -1,4 +1,5 @@
-import { Feature } from '../../lib/jscrewit.js';
+import { isDeepStrictEqual }    from 'node:util';
+import { Feature }              from '../../lib/jscrewit.js';
 
 const AND_FORMATTER = new Intl.ListFormat('en');
 const OR_FORMATTER  = new Intl.ListFormat('en', { type: 'disjunction' });
@@ -37,9 +38,10 @@ export const getAvailabilityByFeature =
     return availabilityInfo;
 };
 
-export function getDescription(compatibilities, compatibilityIndex, appendPlus)
+export function getDescription(compatibilities, start, end, appendPlus)
 {
-    const { tag, versions } = compatibilities[compatibilityIndex];
+    const describedCompatibilities = compatibilities.slice(start, end);
+    const [{ tag, versions }] = describedCompatibilities;
     const [firstVersion] = versions;
     let description = typeof firstVersion === 'string' ? firstVersion : firstVersion.from;
     if (isOldAndLatestVersion(versions))
@@ -51,11 +53,10 @@ export function getDescription(compatibilities, compatibilityIndex, appendPlus)
     }
     if (tag != null)
     {
-        const taggableCompatibilities = compatibilities.slice(compatibilityIndex);
-        const tags = taggableCompatibilities.map(({ tag }) => tag).filter(tag => tag != null);
+        const tags = describedCompatibilities.map(({ tag }) => tag).filter(tag => tag != null);
         description += ` ${joinWithAnd(tags)}`;
     }
-    if (appendPlus && !isLastVersion(compatibilities, compatibilityIndex))
+    if (appendPlus && !isLastVersion(describedCompatibilities, 0))
         description += '+';
     return description;
 }
@@ -98,3 +99,12 @@ export function joinWithOr(array)
     const returnValue = OR_FORMATTER.format(array);
     return returnValue;
 }
+
+export function needsUnavailNote(compatibilities, firstAvail, firstUnavail)
+{
+    const returnValue =
+    firstUnavail &&
+    !isDeepStrictEqual
+    (compatibilities[firstAvail].versions, compatibilities[firstUnavail].versions);
+    return returnValue;
+}

dev/make-feature-doc.mjs

@@ -1,6 +1,6 @@
 import { Feature } from '../lib/jscrewit.js';
 
-import { getAvailabilityByFeature, getDescription, joinWithAnd }
+import { getAvailabilityByFeature, getDescription, joinWithAnd, needsUnavailNote }
 from './internal/engine-data.mjs';
 
 function formatFeatureName(featureName)
@@ -11,12 +11,12 @@ function formatFeatureName(featureName)
     return result;
 }
 
-function getCombinedDescription(families, compatibilityIndex = 0)
+function getCombinedDescription(families, start, end)
 {
     function getVersionedName(name)
     {
         const compatibilities = Feature.FAMILIES[name];
-        const description = getDescription(compatibilities, compatibilityIndex, true);
+        const description = getDescription(compatibilities, start, end, true);
         const versionedName = description ? `${name} ${description}` : name;
         return versionedName;
     }
@@ -44,14 +44,15 @@ function getVersioningFor(featureName, families)
     const { firstAvail } = availabilityInfo;
     if (firstAvail != null)
     {
+        const { firstUnavail } = availabilityInfo;
         const notes = [];
         if (firstAvail)
         {
-            const availNote = getCombinedDescription(families, firstAvail);
+            const availNote = getCombinedDescription(families, firstAvail, firstUnavail);
             notes.push(availNote);
         }
-        const { firstUnavail } = availabilityInfo;
-        if (firstUnavail)
+        const compatibilities = Feature.FAMILIES[anyFamily];
+        if (needsUnavailNote(compatibilities, firstAvail, firstUnavail))
         {
             const unavailNote = `not in ${getCombinedDescription(families, firstUnavail)}`;
             notes.push(unavailNote);

dev/make-feature-types.mjs

@@ -1,8 +1,14 @@
-import { isDeepStrictEqual }    from 'node:util';
-import { Feature }              from '../lib/jscrewit.js';
+import { Feature } from '../lib/jscrewit.js';
 
 import
-{ calculateAvailabilityInfo, getAvailabilityByFeature, getDescription, joinWithAnd, joinWithOr }
+{
+    calculateAvailabilityInfo,
+    getAvailabilityByFeature,
+    getDescription,
+    joinWithAnd,
+    joinWithOr,
+    needsUnavailNote,
+}
 from './internal/engine-data.mjs';
 
 const INDENT = '    ';
@@ -130,24 +136,14 @@ export default
                     let availEntry = family;
                     if (firstAvail)
                     {
-                        const preUnavailCompatibilities =
-                        firstUnavail == null ?
-                        compatibilities : compatibilities.slice(0, firstUnavail);
                         const description =
-                        getDescription(preUnavailCompatibilities, firstAvail, true);
+                        getDescription(compatibilities, firstAvail, firstUnavail, true);
                         availEntry += ` ${description}`;
                     }
-                    if
-                    (
-                        firstUnavail &&
-                        !isDeepStrictEqual
-                        (
-                            compatibilities[firstUnavail].versions,
-                            compatibilities[firstAvail].versions,
-                        )
-                    )
+                    if (needsUnavailNote(compatibilities, firstAvail, firstUnavail))
                     {
-                        const description = getDescription(compatibilities, firstUnavail, false);
+                        const description =
+                        getDescription(compatibilities, firstUnavail, undefined, false);
                         if (description)
                             availEntry += ` before ${description}`;
                     }