@gmb/bitmark-parser-generator 5.36.0 → 5.38.0

package/dist/browser/cjs/index.cjs

@@ -1263,6 +1263,7 @@ var import_superenum14 = require("@ncoderz/superenum");
 // src/model/enum/GroupKey.ts
 var import_superenum10 = require("@ncoderz/superenum");
 var groupKeys = {
+  group_accessibilityDecorative: "group_accessibilityDecorative",
   group_standardAllBits: "group_standardAllBits",
   group_standardItemLead: "group_standardItemLead",
   group_standardItemLeadInstructionHint: "group_standardItemLeadInstructionHint",
@@ -1328,6 +1329,8 @@ var groupKeys = {
 // src/model/enum/PropertyKey.ts
 var import_superenum11 = require("@ncoderz/superenum");
 var propertyKeys = {
+  property_accessibilityGroupTag: "@accessibilityGroupTag",
+  property_accessibilityTag: "@accessibilityTag",
   property_action: "@action",
   property_activityType: "@activityType",
   property_additionalSolutions: "@additionalSolutions",
@@ -1615,6 +1618,8 @@ var propertyKeys = {
   property_trim: "@trim",
   property_unit: "@unit",
   property_unitAbbr: "@unitAbbr",
+  property_unitAbbrPlural: "@unitAbbrPlural",
+  property_unitPlural: "@unitPlural",
   property_vendorDashboardId: "@vendorDashboardId",
   property_vendorSurveyId: "@vendorSurveyId",
   property_vendorUrl: "@vendorUrl",
@@ -4428,12 +4433,22 @@ var CARDSETS = {
               },
               {
                 key: ConfigKey.property_unit,
-                description: "Unit of measurement for the ingredient.",
+                description: "Unit of measurement for the ingredient (singular).",
+                format: TagFormat.plainText
+              },
+              {
+                key: ConfigKey.property_unitPlural,
+                description: "Unit of measurement for the ingredient (plural).",
                 format: TagFormat.plainText
               },
               {
                 key: ConfigKey.property_unitAbbr,
-                description: "Abbreviation for the unit of measurement.",
+                description: "Abbreviation for the unit of measurement (singular).",
+                format: TagFormat.plainText
+              },
+              {
+                key: ConfigKey.property_unitAbbrPlural,
+                description: "Abbreviation for the unit of measurement (plural).",
                 format: TagFormat.plainText
               },
               {
@@ -4506,6 +4521,7 @@ var CARDSETS = {
 };
 
 // src/config/raw/groups.ts
+var ACCESSIBILITY_TAG_VALUES = ["complex", "functional", "decorative", "standard"];
 var GROUPS = {
   [ConfigKey.group_standardAllBits]: {
     name: "Standard",
@@ -4609,6 +4625,12 @@ var GROUPS = {
         description: "Translation source reference",
         format: TagFormat.plainText
       },
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible",
+        format: TagFormat.boolean,
+        nullable: true
+      },
       {
         key: ConfigKey.property_spansPageBreak,
         description: "If true, the bit spans a page break",
@@ -4772,6 +4794,36 @@ var GROUPS = {
           }
         ]
       },
+      {
+        key: ConfigKey.property_accessibilityTag,
+        description: "The accessibility classification(s) for the bit",
+        format: TagFormat.enumeration,
+        values: ACCESSIBILITY_TAG_VALUES,
+        nullable: true,
+        maxCount: Count.infinity
+      },
+      {
+        key: ConfigKey.property_accessibilityGroupTag,
+        jsonKey: "accessibilityGroupTag.name",
+        // Entity-merge semantics, as for `@groupTag`: repeated
+        // `[@accessibilityGroupTag: name]` occurrences with the same value fold
+        // into one entry; chained `@accessibilityTag` children's arrays merge as sets.
+        exportJsonKey: { accessibilityGroupTag: [{ "@id": "name", name: "$" }] },
+        description: "The accessibility group tag(s) for the bit",
+        format: TagFormat.plainText,
+        maxCount: Count.infinity,
+        chain: [
+          {
+            key: ConfigKey.property_accessibilityTag,
+            exportJsonKey: { tags: ["$"] },
+            description: "The accessibility classification(s) for the group",
+            format: TagFormat.enumeration,
+            values: ACCESSIBILITY_TAG_VALUES,
+            nullable: true,
+            maxCount: Count.infinity
+          }
+        ]
+      },
       {
         key: ConfigKey.property_reviewTag,
         description: "The review tag(s) for the bit",
@@ -4902,6 +4954,37 @@ var GROUPS = {
       }
     ]
   },
+  [ConfigKey.group_accessibilityDecorative]: {
+    name: "Accessibility (decorative)",
+    description: "Accessibility tags defaulting to a decorative image, for bits that are decorative by definition",
+    type: GroupConfigType.standard,
+    // Re-declares `@accessibilityGroupTag` (in full — tag hydration is last-wins
+    // per config key, it does not merge) with the decorative defaults. The
+    // standalone `@accessibilityTag` is deliberately NOT re-declared: the default
+    // belongs to the group structure only.
+    tags: [
+      {
+        key: ConfigKey.property_accessibilityGroupTag,
+        jsonKey: "accessibilityGroupTag.name",
+        exportJsonKey: { accessibilityGroupTag: [{ "@id": "name", name: "$" }] },
+        description: "The accessibility group tag(s) for the bit",
+        format: TagFormat.plainText,
+        defaultValue: "image",
+        maxCount: Count.infinity,
+        chain: [
+          {
+            key: ConfigKey.property_accessibilityTag,
+            exportJsonKey: { tags: ["$"] },
+            description: "The accessibility classification(s) for the group",
+            format: TagFormat.enumeration,
+            values: ACCESSIBILITY_TAG_VALUES,
+            defaultValue: "decorative",
+            maxCount: Count.infinity
+          }
+        ]
+      }
+    ]
+  },
   [ConfigKey.group_standardItemLead]: {
     type: GroupConfigType.standard,
     description: "Standard group for item, lead, page number, and margin number tags",
@@ -7662,13 +7745,31 @@ var BITS = {
   },
   [BitType2.smartStandardArticleNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardArticleNormative,
-    description: "Smart standard normative article bit that is collapsible"
+    description: "Smart standard normative article bit that is collapsible",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardArticleNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardArticleNonNormative,
-    description: "Smart standard non-normative article bit that is collapsible"
+    description: "Smart standard non-normative article bit that is collapsible",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.statement]: {
     since: "1.3.0",
@@ -8790,7 +8891,7 @@ var BITS = {
       },
       {
         key: ConfigKey.property_isCollapsible,
-        description: "If true, the chapter is collapsible",
+        description: "If true, the chapter is collapsible (always emitted; defaults false)",
         format: TagFormat.boolean,
         defaultValue: "false"
       }
@@ -9399,12 +9500,22 @@ var BITS = {
         chain: [
           {
             key: ConfigKey.property_unit,
-            description: "The unit of measurement for the ingredients",
+            description: "The unit of measurement for the ingredients (singular)",
+            format: TagFormat.plainText
+          },
+          {
+            key: ConfigKey.property_unitPlural,
+            description: "The unit of measurement for the ingredients (plural)",
             format: TagFormat.plainText
           },
           {
             key: ConfigKey.property_unitAbbr,
-            description: "The abbreviation for the unit of measurement",
+            description: "The abbreviation for the unit of measurement (singular)",
+            format: TagFormat.plainText
+          },
+          {
+            key: ConfigKey.property_unitAbbrPlural,
+            description: "The abbreviation for the unit of measurement (plural)",
             format: TagFormat.plainText
           },
           {
@@ -9683,13 +9794,31 @@ var BITS = {
   },
   [BitType2.smartStandardExampleNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardExampleNormative,
-    description: "Smart standard normative example collapsible bit, used to provide normative examples in smart standards that can be collapsed"
+    description: "Smart standard normative example collapsible bit, used to provide normative examples in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardExampleNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardExampleNonNormative,
-    description: "Smart standard non-normative example collapsible bit, used to provide non-normative examples in smart standards that can be collapsed"
+    description: "Smart standard non-normative example collapsible bit, used to provide non-normative examples in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.authorContentBitGenerator]: {
     since: "4.2.0",
@@ -10025,8 +10154,17 @@ var BITS = {
   },
   [BitType2.smartStandardListCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardList,
-    description: "Smart standard list collapsible bit, used to create collapsible smart standard lists in articles or books"
+    description: "Smart standard list collapsible bit, used to create collapsible smart standard lists in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.message]: {
     since: "1.3.0",
@@ -10080,13 +10218,31 @@ var BITS = {
   },
   [BitType2.smartStandardNoteNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardNoteNormative,
-    description: "Smart standard normative note collapsible bit, used to provide normative notes in smart standards that can be collapsed"
+    description: "Smart standard normative note collapsible bit, used to provide normative notes in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardNoteNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardNoteNonNormative,
-    description: "Smart standard non-normative note collapsible bit, used to provide non-normative notes in smart standards that can be collapsed"
+    description: "Smart standard non-normative note collapsible bit, used to provide non-normative notes in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.noteAi]: {
     since: "1.3.0",
@@ -10147,7 +10303,9 @@ var BITS = {
   },
   [BitType2.printPageBreak]: {
     since: "5.4.0",
-    baseBitType: BitType2.separator,
+    // Based on `article`, not `separator`: `separator` adds nothing over `article`,
+    // and basing on it would inherit the decorative accessibility defaults.
+    baseBitType: BitType2.article,
     description: "Print page break bit, used to create page breaks for printing in articles or books"
   },
   [BitType2.releaseNotesSummary]: {
@@ -10199,13 +10357,31 @@ var BITS = {
   },
   [BitType2.smartStandardRemarkNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkNormative,
-    description: "Smart standard normative remark collapsible bit, used to provide normative remarks in smart standards that can be collapsed"
+    description: "Smart standard normative remark collapsible bit, used to provide normative remarks in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkNonNormative,
-    description: "Smart standard non-normative remark collapsible bit, used to provide non-normative remarks in smart standards that can be collapsed"
+    description: "Smart standard non-normative remark collapsible bit, used to provide non-normative remarks in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.selfAssessment]: {
     since: "1.3.0",
@@ -10215,12 +10391,24 @@ var BITS = {
   [BitType2.separator]: {
     since: "1.4.15",
     baseBitType: BitType2.article,
-    description: "Separator bit, used to create visual separators in articles or books"
+    description: "Separator bit, used to create visual separators in articles or books",
+    tags: [
+      {
+        key: ConfigKey.group_accessibilityDecorative,
+        description: "Accessibility tags, defaulting to a decorative image"
+      }
+    ]
   },
   [BitType2.separatorAlt]: {
     since: "1.16.0",
     baseBitType: BitType2.separator,
-    description: "Alternative separator bit, used to create visual separators in articles or books with alternative styling"
+    description: "Alternative separator bit, used to create visual separators in articles or books with alternative styling",
+    tags: [
+      {
+        key: ConfigKey.group_accessibilityDecorative,
+        description: "Accessibility tags, defaulting to a decorative image"
+      }
+    ]
   },
   [BitType2.sticker]: {
     since: "1.5.28",
@@ -10276,53 +10464,143 @@ var BITS = {
   },
   [BitType2.collapsible]: {
     since: "1.21.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.article,
-    description: "Collapsible bit, used to create collapsible sections in articles or books"
+    description: "Collapsible bit, used to create collapsible sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.sideNoteCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Side note collapsible bit, used to create collapsible side notes in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.sideNote,
+    description: "Side note collapsible bit, used to create collapsible side notes in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.infoCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Info collapsible bit, used to create collapsible informational sections in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.info,
+    description: "Info collapsible bit, used to create collapsible informational sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.remarkCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Remark collapsible bit, used to create collapsible remarks in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.remark,
+    description: "Remark collapsible bit, used to create collapsible remarks in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.warningCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Warning collapsible bit, used to create collapsible warnings in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.warning,
+    description: "Warning collapsible bit, used to create collapsible warnings in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.dangerCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Danger collapsible bit, used to create collapsible danger sections in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.danger,
+    description: "Danger collapsible bit, used to create collapsible danger sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.noteCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Note collapsible bit, used to create collapsible notes in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.note,
+    description: "Note collapsible bit, used to create collapsible notes in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.exampleCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Example collapsible bit, used to create collapsible examples in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.example,
+    description: "Example collapsible bit, used to create collapsible examples in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.hintCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Hint collapsible bit, used to create collapsible hints in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.hint,
+    description: "Hint collapsible bit, used to create collapsible hints in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.bugCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Bug collapsible bit, used to create collapsible bug reports in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.bug,
+    description: "Bug collapsible bit, used to create collapsible bug reports in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.platformPath]: {
     since: "3.14.1",
@@ -10544,8 +10822,17 @@ var BITS = {
   },
   [BitType2.extractorPageCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPage,
-    description: "Collapsible extractor page bit, used to extract pages from images with collapsible functionality"
+    description: "Collapsible extractor page bit, used to extract pages from images with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageWithBlocks]: {
     since: "1.5.21",
@@ -10554,8 +10841,17 @@ var BITS = {
   },
   [BitType2.extractorPageWithBlocksCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageWithBlocks,
-    description: "Collapsible extractor page with blocks bit, used to extract pages with blocks from images with collapsible functionality"
+    description: "Collapsible extractor page with blocks bit, used to extract pages with blocks from images with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorConfiguration]: {
     since: "1.7.1",
@@ -10595,8 +10891,17 @@ var BITS = {
   },
   [BitType2.extractorImageCollapsible]: {
     since: "4.3.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorImage,
-    description: "Collapsible extractor images bit, used for  images extracted from PDFs"
+    description: "Collapsible extractor images bit, used for  images extracted from PDFs",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorBlueprint]: {
     since: "5.12.0",
@@ -10733,8 +11038,17 @@ var BITS = {
   },
   [BitType2.extractorPageNumberCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageNumber,
-    description: "Collapsible extractor page number bit, used to define page numbers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page number bit, used to define page numbers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageHeader]: {
     since: "1.5.21",
@@ -10743,8 +11057,17 @@ var BITS = {
   },
   [BitType2.extractorPageHeaderCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageHeader,
-    description: "Collapsible extractor page header bit, used to define headers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page header bit, used to define headers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageFooter]: {
     since: "1.5.21",
@@ -10753,8 +11076,17 @@ var BITS = {
   },
   [BitType2.extractorPageFooterCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageFooter,
-    description: "Collapsible extractor page footer bit, used to define footers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page footer bit, used to define footers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.pageOpenBook]: {
     since: "1.5.10",
@@ -11044,8 +11376,17 @@ var BITS = {
   },
   [BitType2.definitionListCollapsible]: {
     since: "5.25.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.definitionList,
-    description: "Collapsible definition list bit, used to create collapsible lists of definitions in articles or books"
+    description: "Collapsible definition list bit, used to create collapsible lists of definitions in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.standardDefinitionListNormative]: {
     since: "5.24.0",
@@ -11269,13 +11610,31 @@ var BITS = {
   },
   [BitType2.smartStandardImageFigureNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardImageFigureNormative,
-    description: "Collapsible smart standard normative image figure bit, used to create collapsible smart standard normative image figures in articles or books"
+    description: "Collapsible smart standard normative image figure bit, used to create collapsible smart standard normative image figures in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardImageFigureNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardImageFigureNonNormative,
-    description: "Collapsible smart standard non-normative image figure bit, used to create collapsible smart standard non-normative image figures in articles or books"
+    description: "Collapsible smart standard non-normative image figure bit, used to create collapsible smart standard non-normative image figures in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.imageLandscape]: {
     since: "1.3.0",
@@ -11285,7 +11644,13 @@ var BITS = {
   [BitType2.imageMood]: {
     since: "1.3.0",
     baseBitType: BitType2.image,
-    description: "Image mood bit, used to create mood images in articles or books"
+    description: "Image mood bit, used to create mood images in articles or books",
+    tags: [
+      {
+        key: ConfigKey.group_accessibilityDecorative,
+        description: "Accessibility tags, defaulting to a decorative image"
+      }
+    ]
   },
   [BitType2.imagePortrait]: {
     since: "1.3.0",
@@ -11305,6 +11670,10 @@ var BITS = {
       {
         key: ConfigKey.group_imageNoZoom,
         description: "Image no zoom tags for images, used to define whether images should have zoom functionality"
+      },
+      {
+        key: ConfigKey.group_accessibilityDecorative,
+        description: "Accessibility tags, defaulting to a decorative image"
       }
     ],
     resourceAttachmentAllowed: false
@@ -11312,7 +11681,13 @@ var BITS = {
   [BitType2.imageSeparatorAlt]: {
     since: "1.16.0",
     baseBitType: BitType2.imageSeparator,
-    description: "Alternative image separator bit, used to create alternative separators in articles or books"
+    description: "Alternative image separator bit, used to create alternative separators in articles or books",
+    tags: [
+      {
+        key: ConfigKey.group_accessibilityDecorative,
+        description: "Accessibility tags, defaulting to a decorative image"
+      }
+    ]
   },
   [BitType2.imageScreenshot]: {
     since: "1.3.0",
@@ -11487,43 +11862,115 @@ var BITS = {
   },
   [BitType2.smartStandardTableImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableImageNormative,
-    description: "Collapsible smart standard normative table image bit, used to create collapsible smart standard normative images in tables in articles or books"
+    description: "Collapsible smart standard normative table image bit, used to create collapsible smart standard normative images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableImageNonNormative,
-    description: "Collapsible smart standard non-normative table image bit, used to create collapsible smart standard non-normative images in tables in articles or books"
+    description: "Collapsible smart standard non-normative table image bit, used to create collapsible smart standard non-normative images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableImageNormative,
-    description: "Collapsible smart standard normative remark table image bit, used to create collapsible smart standard normative remark images in tables in articles or books"
+    description: "Collapsible smart standard normative remark table image bit, used to create collapsible smart standard normative remark images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableImageNonNormative,
-    description: "Collapsible smart standard non-normative remark table image bit, used to create collapsible smart standard non-normative remark images in tables in articles or books"
+    description: "Collapsible smart standard non-normative remark table image bit, used to create collapsible smart standard non-normative remark images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedImageNormative,
-    description: "Collapsible smart standard normative extended table image bit, used to create collapsible smart standard normative extended images in tables in articles or books"
+    description: "Collapsible smart standard normative extended table image bit, used to create collapsible smart standard normative extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedImageNonNormative,
-    description: "Collapsible smart standard non-normative extended table image bit, used to create collapsible smart standard non-normative extended images in tables in articles or books"
+    description: "Collapsible smart standard non-normative extended table image bit, used to create collapsible smart standard non-normative extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedImageNormative,
-    description: "Collapsible smart standard normative remark extended table image bit, used to create collapsible smart standard normative remark extended images in tables in articles or books"
+    description: "Collapsible smart standard normative remark extended table image bit, used to create collapsible smart standard normative remark extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedImageNonNormative,
-    description: "Collapsible smart standard non-normative remark extended table image bit, used to create collapsible smart standard non-normative remark extended images in tables in articles or books"
+    description: "Collapsible smart standard non-normative remark extended table image bit, used to create collapsible smart standard non-normative remark extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.imageLink]: {
     since: "1.3.0",
@@ -12004,8 +12451,17 @@ var BITS = {
   },
   [BitType2.smartStandardListItemCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardListItem,
-    description: "Collapsible smart standard list item bit, used to create collapsible smart standard list items in articles or books"
+    description: "Collapsible smart standard list item bit, used to create collapsible smart standard list items in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.mark]: {
     since: "1.3.0",
@@ -12338,8 +12794,17 @@ var BITS = {
   },
   [BitType2.pageCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.page,
-    description: "Collapsible page bit, used to create collapsible sections in pages"
+    description: "Collapsible page bit, used to create collapsible sections in pages",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.pageCoverImage]: {
     since: "1.22.0",
@@ -13314,43 +13779,115 @@ var BITS = {
   },
   [BitType2.smartStandardTableNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableNormative,
-    description: "Collapsible smart standard normative table bit, used to create collapsible smart standard normative tables in articles or books"
+    description: "Collapsible smart standard normative table bit, used to create collapsible smart standard normative tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableNonNormative,
-    description: "Collapsible smart standard non-normative table bit, used to create collapsible smart standard non-normative tables in articles or books"
+    description: "Collapsible smart standard non-normative table bit, used to create collapsible smart standard non-normative tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableNormative,
-    description: "Collapsible smart standard normative remark table bit, used to create collapsible smart standard normative remark tables in articles or books"
+    description: "Collapsible smart standard normative remark table bit, used to create collapsible smart standard normative remark tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableNonNormative,
-    description: "Collapsible smart standard non-normative remark table bit, used to create collapsible smart standard non-normative remark tables in articles or books"
+    description: "Collapsible smart standard non-normative remark table bit, used to create collapsible smart standard non-normative remark tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedNormative,
-    description: "Collapsible smart standard normative extended table bit, used to create collapsible smart standard normative extended tables in articles or books"
+    description: "Collapsible smart standard normative extended table bit, used to create collapsible smart standard normative extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedNonNormative,
-    description: "Collapsible smart standard non-normative extended table bit, used to create collapsible smart standard non-normative extended tables in articles or books"
+    description: "Collapsible smart standard non-normative extended table bit, used to create collapsible smart standard non-normative extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedNormative,
-    description: "Collapsible smart standard normative remark extended table bit, used to create collapsible smart standard normative remark extended tables in articles or books"
+    description: "Collapsible smart standard normative remark extended table bit, used to create collapsible smart standard normative remark extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedNonNormative,
-    description: "Collapsible smart standard non-normative remark extended table bit, used to create collapsible smart standard non-normative remark extended tables in articles or books"
+    description: "Collapsible smart standard non-normative remark extended table bit, used to create collapsible smart standard non-normative remark extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.parameters]: {
     since: "1.18.0",
@@ -14062,11 +14599,13 @@ var BITS = {
 };
 
 // src/config/Config.ts
+var COLLAPSIBLE_BIT_TYPE_SUFFIX = "-collapsible";
 var Config = class {
   constructor() {
     __publicField(this, "bitLevelMin", 1);
     __publicField(this, "bitLevelMax", 7);
     __publicField(this, "bitCache", /* @__PURE__ */ new Map());
+    __publicField(this, "migratedBitCache", /* @__PURE__ */ new Map());
     __publicField(this, "allResourcesCache");
     __publicField(this, "comboResourcesCache", /* @__PURE__ */ new Map());
   }
@@ -14082,6 +14621,29 @@ var Config = class {
     if (bitType?.startsWith("|")) bitType = bitType.substring(1);
     return (0, import_superenum16.Enum)(BitType2).fromValue(bitType) ?? BitType2._error;
   }
+  /**
+   * PLAN-017: Return the migration target for a deprecated `*-collapsible` bit type.
+   *
+   * Every `*-collapsible` bit type declares its non-collapsible cousin as its `baseBitType`, so the
+   * target is read from the config rather than a hand-maintained table — a new `*-collapsible` bit
+   * type is covered automatically.
+   *
+   * `BitType.collapsible` is the one exclusion: it has no non-collapsible cousin (its `baseBitType`
+   * is `article`, which is not a migration target).
+   *
+   * @param bitType the bit type
+   * @returns the bit type to migrate to, or undefined if the bit type does not migrate
+   */
+  getMigratedBitType(bitType) {
+    const cached = this.migratedBitCache.get(bitType);
+    if (cached !== void 0 || this.migratedBitCache.has(bitType)) return cached;
+    let target;
+    if (bitType !== BitType2.collapsible && bitType.endsWith(COLLAPSIBLE_BIT_TYPE_SUFFIX)) {
+      target = BITS[bitType]?.baseBitType;
+    }
+    this.migratedBitCache.set(bitType, target);
+    return target;
+  }
   /**
    * Check if a bit type is and instance of the given root bit type.
    *
@@ -14404,7 +14966,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "5.36.0",
+  "version": "5.38.0",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -14758,6 +15320,10 @@ var NodeType = {
   // unknown
   __isDefaultExample: "__isDefaultExample",
   __typeAlias: "__typeAlias",
+  accessibilityGroupTag: "accessibilityGroupTag",
+  accessibilityGroupTagValue: "accessibilityGroupTagValue",
+  accessibilityTag: "accessibilityTag",
+  accessibilityTagValue: "accessibilityTagValue",
   action: "action",
   actionValue: "actionValue",
   activityType: "activityType",
@@ -15463,6 +16029,8 @@ var NodeType = {
   type: "type",
   unit: "unit",
   unitAbbr: "unitAbbr",
+  unitAbbrPlural: "unitAbbrPlural",
+  unitPlural: "unitPlural",
   url: "url",
   validationDate: "validationDate",
   validationDateValue: "validationDateValue",
@@ -27080,6 +27648,12 @@ var BaseBuilder = class {
         case TagFormat.plainText:
           if (instance6.asNumber(v) != null) v = `${v}`;
           return stringUtils.isString(v) ? stringUtils.trimmedString(v) : void 0;
+        case TagFormat.enumeration: {
+          if (instance6.asNumber(v) != null) v = `${v}`;
+          const enumValue = stringUtils.isString(v) ? stringUtils.trimmedString(v) : void 0;
+          if (enumValue == null || enumValue === "") return propertyConfig?.defaultValue ?? "";
+          return enumValue;
+        }
         case TagFormat.number:
           return instance6.asNumber(v);
         case TagFormat.boolean:
@@ -28638,8 +29212,18 @@ var Builder = class extends BaseBuilder {
    */
   buildBit(data, options) {
     data = structuredClone(data);
+    const migratedBitType = instance2.getMigratedBitType(data.bitType);
+    if (migratedBitType) {
+      data.bitType = migratedBitType;
+      data.isCollapsible = data.isCollapsible ?? true;
+    }
     const bitType = data.bitType;
     const bitConfig = instance2.getBitConfig(bitType);
+    const isCollapsibleDefaultsTrue = bitConfig.tags[ConfigKey.property_isCollapsible]?.defaultValue === "true";
+    const accessibilityGroupTag = this.resolveAccessibilityGroupTag(
+      bitConfig,
+      data.accessibilityGroupTag
+    );
     const deprecatedTextFormat = (0, import_superenum30.Enum)(DeprecatedTextFormat).fromValue(data.textFormat);
     let textFormat = (0, import_superenum30.Enum)(TextFormat2).fromValue(data.textFormat) ?? bitConfig.textFormatDefault;
     if (deprecatedTextFormat === DeprecatedTextFormat.bitmarkMinusMinus) {
@@ -28875,6 +29459,13 @@ var Builder = class extends BaseBuilder {
       slug: this.toAstProperty(bitType, ConfigKey.property_slug, data.slug, options),
       tag: this.toAstProperty(bitType, ConfigKey.property_tag, data.tag, options),
       groupTag: this.buildGroupTags(context, data.groupTag),
+      accessibilityTag: this.toAstProperty(
+        bitType,
+        ConfigKey.property_accessibilityTag,
+        data.accessibilityTag,
+        options
+      ),
+      accessibilityGroupTag: this.buildGroupTags(context, accessibilityGroupTag),
       reviewTag: this.toAstProperty(bitType, ConfigKey.property_reviewTag, data.reviewTag, options),
       reviewerTag: this.toAstProperty(
         bitType,
@@ -29772,7 +30363,7 @@ var Builder = class extends BaseBuilder {
       isCollapsible: this.toAstProperty(
         bitType,
         ConfigKey.property_isCollapsible,
-        data.isCollapsible,
+        data.isCollapsible ?? (isCollapsibleDefaultsTrue ? true : void 0),
         options
       ),
       anchor: data.anchor,
@@ -29927,6 +30518,26 @@ var Builder = class extends BaseBuilder {
     });
     return node;
   }
+  /**
+   * Resolve the accessibilityGroupTag data, materialising the bit type's default when absent.
+   *
+   * PLAN-019: `group_accessibilityDecorative` re-declares `@accessibilityGroupTag` with a
+   * `defaultValue`, and its chained `@accessibilityTag` likewise. When the bit carries no
+   * authored value, synthesize the default group so it reaches both generators. An authored
+   * value always wins.
+   *
+   * @param bitConfig - the resolved config for the bit
+   * @param data - authored data for the node, if any
+   * @returns
+   */
+  resolveAccessibilityGroupTag(bitConfig, data) {
+    if (data != null && (!Array.isArray(data) || data.length > 0)) return data;
+    const groupConfig = bitConfig.tags[ConfigKey.property_accessibilityGroupTag];
+    const name = groupConfig?.defaultValue;
+    if (name == null) return data;
+    const tag = groupConfig?.chain?.[ConfigKey.property_accessibilityTag]?.defaultValue;
+    return [{ name, tags: tag != null ? [tag] : [] }];
+  }
   /**
    * Build groupTag[] node
    *
@@ -30541,7 +31152,9 @@ var Builder = class extends BaseBuilder {
       ingredient: this.handleJsonText(context, TextLocation2.tag, data.ingredient),
       quantity: data.quantity ?? 0,
       unit: data.unit ?? "",
+      unitPlural: data.unitPlural ?? "",
       unitAbbr: data.unitAbbr ?? "",
+      unitAbbrPlural: data.unitAbbrPlural ?? "",
       decimalPlaces: data.decimalPlaces ?? 1,
       disableCalculation: data.disableCalculation ?? false,
       item: this.handleJsonText(context, TextLocation2.tag, data.item),
@@ -31138,11 +31751,22 @@ var Builder = class extends BaseBuilder {
    */
   buildServings(_context, data) {
     if (!data) return void 0;
-    const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = data;
+    const {
+      servings,
+      unit,
+      unitPlural,
+      unitAbbr,
+      unitAbbrPlural,
+      decimalPlaces,
+      disableCalculation,
+      hint
+    } = data;
     const node = {
       servings: servings ?? 0,
       unit: unit ?? "",
+      unitPlural: unitPlural ?? "",
       unitAbbr: unitAbbr ?? "",
+      unitAbbrPlural: unitAbbrPlural ?? "",
       decimalPlaces: decimalPlaces ?? 1,
       disableCalculation: disableCalculation ?? false,
       hint: hint ?? ""
@@ -31996,6 +32620,29 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     }
     return false;
   }
+  // bitmarkAst -> bits -> bitsValue -> accessibilityGroupTag
+  enter_accessibilityGroupTag(node, route) {
+    const accessibilityGroupTag = node.value;
+    const parent = this.getParentNode(route);
+    if (parent?.key !== NodeType.bitsValue) return true;
+    for (const gt of accessibilityGroupTag) {
+      const { name, tags: tags2 } = gt;
+      this.writeProperty("accessibilityGroupTag", name, route, {
+        format: TagFormat.plainText,
+        writeEmpty: true
+      });
+      if (tags2 && tags2.length > 0) {
+        for (const t of tags2) {
+          this.writeProperty("accessibilityTag", t, route, {
+            format: TagFormat.plainText,
+            writeEmpty: true,
+            forceChain: true
+          });
+        }
+      }
+    }
+    return false;
+  }
   // bitmarkAst -> bits -> bitsValue -> labelTrue / labelFalse
   leaf_labelTrue(node, route) {
     const value = node.value;
@@ -32079,7 +32726,16 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     const nodeValue = node.value;
     const parent = this.getParentNode(route);
     if (parent?.key !== NodeType.bitsValue) return true;
-    const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = nodeValue;
+    const {
+      servings,
+      unit,
+      unitPlural,
+      unitAbbr,
+      unitAbbrPlural,
+      decimalPlaces,
+      disableCalculation,
+      hint
+    } = nodeValue;
     this.writeProperty("servings", servings, route, {
       format: TagFormat.plainText
     });
@@ -32089,12 +32745,24 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
         forceChain: true
       });
     }
+    if (unitPlural != null) {
+      this.writeProperty("unitPlural", unitPlural, route, {
+        format: TagFormat.plainText,
+        forceChain: true
+      });
+    }
     if (unitAbbr != null) {
       this.writeProperty("unitAbbr", unitAbbr, route, {
         format: TagFormat.plainText,
         forceChain: true
       });
     }
+    if (unitAbbrPlural != null) {
+      this.writeProperty("unitAbbrPlural", unitAbbrPlural, route, {
+        format: TagFormat.plainText,
+        forceChain: true
+      });
+    }
     if (decimalPlaces != null) {
       this.writeProperty("decimalPlaces", decimalPlaces, route, {
         format: TagFormat.plainText,
@@ -32941,10 +33609,18 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
         this.writeProperty("unit", ingredient.unit, route, {
           format: TagFormat.plainText
         });
+      if (ingredient.unitPlural != null)
+        this.writeProperty("unitPlural", ingredient.unitPlural, route, {
+          format: TagFormat.plainText
+        });
       if (ingredient.unitAbbr != null)
         this.writeProperty("unitAbbr", ingredient.unitAbbr, route, {
           format: TagFormat.plainText
         });
+      if (ingredient.unitAbbrPlural != null)
+        this.writeProperty("unitAbbrPlural", ingredient.unitAbbrPlural, route, {
+          format: TagFormat.plainText
+        });
       if (ingredient.decimalPlaces != null)
         this.writeProperty("decimalPlaces", ingredient.decimalPlaces, route, {
           format: TagFormat.plainText
@@ -34723,6 +35399,29 @@ var JsonGenerator = class extends AstWalkerGenerator {
     }
     return false;
   }
+  // bitmarkAst -> bits -> bitsValue -> isCollapsible
+  /**
+   * `isCollapsible` is emitted only when explicitly set on the bit — an explicit
+   * `true`/`false` in the source is emitted as-is, and an absent tag yields no
+   * JSON key (the tag is nullable in the config: no default, unset when absent).
+   *
+   * Two exceptions always carry a value: chapter bits default to `false`
+   * (`defaultValue: 'false'` in the bit config, applied in `cleanBitJson()`),
+   * and the deprecated `*-collapsible` bit types default to `true` (materialised
+   * into the AST by the Builder).
+   *
+   * Defining these handlers suppresses the generic property handlers that
+   * `generatePropertyHandlers()` would otherwise install for this tag.
+   */
+  leaf_isCollapsible(node, route) {
+    const parent = this.getParentNode(route);
+    if (parent?.key !== NodeType.bitsValue) return false;
+    if (node.value != null) this.bitJson.isCollapsible = node.value === true;
+    return false;
+  }
+  enter_isCollapsible(node, route) {
+    return this.leaf_isCollapsible(node, route);
+  }
   // bitmarkAst -> bits -> bitsValue -> markConfig
   enter_markConfig(_node, _route) {
     return true;
@@ -38557,7 +39256,9 @@ function parseIngredients(_context, _bitType, cardSet) {
           title: titleArray,
           __instructionString,
           unit,
+          unitPlural,
           unitAbbr,
+          unitAbbrPlural,
           decimalPlaces,
           disableCalculation,
           cardBodyStr,
@@ -38587,7 +39288,9 @@ function parseIngredients(_context, _bitType, cardSet) {
           ingredient: cardBodyStr,
           quantity,
           unit: unit ?? instance3.EMPTY_STRING,
+          unitPlural,
           unitAbbr: unitAbbr ?? instance3.EMPTY_STRING,
+          unitAbbrPlural,
           decimalPlaces: decimalPlaces ?? 1,
           disableCalculation,
           ...tags2
@@ -39089,19 +39792,25 @@ function handleStandardStringExample(context, _content, example, target) {
 }
 
 // src/parser/bitmark/peg/contentProcessors/GroupTagChainContentProcessor.ts
-function groupTagChainContentProcessor(context, _contentDepth, tagsConfig, content, target) {
+var GROUP_TAG = { groupKey: "groupTag", memberKey: "tag" };
+var ACCESSIBILITY_GROUP_TAG = {
+  groupKey: "accessibilityGroupTag",
+  memberKey: "accessibilityTag"
+};
+function groupTagChainContentProcessor(context, _contentDepth, tagsConfig, content, target, keys = GROUP_TAG) {
   const { value } = content;
-  if (context.DEBUG_CHAIN_CONTENT) context.debugPrint("groupTag content", content);
+  const { groupKey, memberKey } = keys;
+  if (context.DEBUG_CHAIN_CONTENT) context.debugPrint(`${groupKey} content`, content);
   const tags2 = context.bitContentProcessor(ContentDepth.Chain, tagsConfig, content.chain);
-  if (context.DEBUG_CHAIN_TAGS) context.debugPrint("groupTag TAGS", tags2);
-  const { tag } = tags2;
+  if (context.DEBUG_CHAIN_TAGS) context.debugPrint(`${groupKey} TAGS`, tags2);
+  const memberTags = tags2[memberKey];
   const name = stringUtils.trimmedString(value) ?? "";
   const node = {
     name,
-    tags: tag ?? []
+    tags: memberTags ?? []
   };
-  if (!Array.isArray(target.groupTag)) target.groupTag = [];
-  target.groupTag.push(node);
+  if (!Array.isArray(target[groupKey])) target[groupKey] = [];
+  target[groupKey].push(node);
 }
 
 // src/parser/bitmark/peg/contentProcessors/ImageSourceChainContentProcessor.ts
@@ -39258,12 +39967,22 @@ function servingsChainContentProcessor(context, _contentDepth, tagsConfig, conte
   if (context.DEBUG_CHAIN_CONTENT) context.debugPrint("servings content", content);
   const tags2 = context.bitContentProcessor(ContentDepth.Chain, tagsConfig, content.chain);
   if (context.DEBUG_CHAIN_TAGS) context.debugPrint("servings TAGS", tags2);
-  const { unit, unitAbbr, decimalPlaces, disableCalculation, __hintString } = tags2;
+  const {
+    unit,
+    unitPlural,
+    unitAbbr,
+    unitAbbrPlural,
+    decimalPlaces,
+    disableCalculation,
+    __hintString
+  } = tags2;
   const servings = instance6.asNumber(content.value) ?? 1;
   const node = {
     servings,
     unit,
+    unitPlural,
     unitAbbr,
+    unitAbbrPlural,
     decimalPlaces: decimalPlaces ?? 1,
     disableCalculation,
     hint: __hintString
@@ -39311,6 +40030,16 @@ function propertyContentProcessor(context, contentDepth, tagsConfig, content, ta
     } else if (configKey === ConfigKey.property_groupTag) {
       groupTagChainContentProcessor(context, contentDepth, propertyConfig.chain, content, target);
       return;
+    } else if (configKey === ConfigKey.property_accessibilityGroupTag) {
+      groupTagChainContentProcessor(
+        context,
+        contentDepth,
+        propertyConfig.chain,
+        content,
+        target,
+        ACCESSIBILITY_GROUP_TAG
+      );
+      return;
     } else if (configKey === ConfigKey.property_ratingLevelStart || configKey === ConfigKey.property_ratingLevelEnd) {
       ratingLevelChainContentProcessor(
         context,
@@ -39363,6 +40092,23 @@ function propertyContentProcessor(context, contentDepth, tagsConfig, content, ta
                 location: TextLocation2.tag
               }
             );
+          case TagFormat.enumeration: {
+            const enumValue = instance3.unbreakscape(
+              stringUtils.isString(v2) ? stringUtils.trimmedString(v2) : void 0,
+              {
+                format: TextFormat2.plainText,
+                location: TextLocation2.tag
+              }
+            );
+            if (enumValue == null || enumValue === "") return c.defaultValue ?? "";
+            if (c.values && !c.values.includes(enumValue)) {
+              context.addWarning(
+                `Invalid value '${enumValue}' for property [@${tag}]. Valid values: ${c.values.join(" | ")}`,
+                content
+              );
+            }
+            return enumValue;
+          }
           case TagFormat.number:
             return instance6.asNumber(
               instance3.unbreakscape(v2, {