@gouvfr/dsfr-roller 1.0.25 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gouvfr/dsfr-roller",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "Le module `dsfr-roller` permet de publier le site de documentation du Système de Design de l’État - DSFR",
   "keywords": [
     "Système de Design de l'État",
@@ -56,7 +56,7 @@
   ],
   "main": "./index.js",
   "dependencies": {
-    "@gouvfr/dsfr-forge": "=1.0.25",
+    "@gouvfr/dsfr-forge": "=1.0.26",
     "@gouvfr/dsfr-publisher": "npm:@gouvfr/dsfr@1.13.1",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",

package/src/component/components/button.js

@@ -13,7 +13,7 @@ class Button extends Component {
   async format () {
     const index = [, , 'secondary', 'tertiary', 'tertiary-no-outline'].indexOf(this.data.kind);
     const url = this.data.url ?? this.data.href;
-    const blank = this.data.blank === 'true' || /^(http|www)/.test(url);
+    const blank = Boolean(this.data.blank) || /^(http|www)/.test(url);
     return {
       markup: url ? 'a' : this.data.markup,
       kind: index > -1 ? index : parseInt(this.data.kind),
@@ -24,10 +24,10 @@ class Button extends Component {
       href: url,
       type: this.data.type,
       blank,
-      self: !blank || this.data.self === 'true',
-      disabled: this.data.disabled === 'true',
-      classes: typeof this.data.classes === 'string' ? this.data.classes.split(',') : this.data.classes,
-      attributes: typeof this.data.attributes === 'string' ? yaml.parse(this.data.attributes) : this.data.attributes,
+      self: !blank || Boolean(this.data.self),
+      disabled: this.data.disabled,
+      classes: this.data.classes,
+      attributes: this.data.attributes,
       icon: this.data.icon,
       iconPlace: this.data['icon-place'],
     }

package/src/node/directive/components/card/card-container-directive.js

@@ -32,8 +32,8 @@ class CardContainerDirective extends Node {
     const hintEnd = this.structureHintEnd;
     const classes = ['fr-card'];
     switch (true) {
-      case data.properties.enlargeLink === 'true':
-      case data.properties.enlargeLink !== 'false' && contentTitle?.children[0]?.type === 'link':
+      case data.properties.enlargeLink === true:
+      case data.properties.enlargeLink !== false && contentTitle?.children[0]?.type === 'link':
         classes.push('fr-enlarge-link');
         break;
     }

package/src/node/directive/components/tile/tile-container-directive.js

@@ -31,8 +31,8 @@ class TileContainerDirective extends Node {
     const details = contentChildren[2];
     const classes = ['fr-tile'];
     switch (true) {
-      case data.properties.enlargeLink === 'true':
-      case data.properties.enlargeLink !== 'false' && title?.children[0]?.type === 'link':
+      case data.properties.enlargeLink === true:
+      case data.properties.enlargeLink !== false && title?.children[0]?.type === 'link':
         classes.push('fr-enlarge-link');
         break;
     }

package/src/node/directive/doc/guidance/guideline-container-directive.js

@@ -10,7 +10,7 @@ class GuidelineContainerDirective extends Node {
       return data;
     }
 
-    const valid = data.properties.valid.toLowerCase() === 'true';
+    const valid = data.properties.valid === true;
     const col = data.properties.col || '12';
     const description = data.children.filter(child => {
       switch (true) {

package/src/node/directive/doc/guidance/pin-leaf-directive.js

@@ -7,7 +7,7 @@ class PinLeafDirective extends Node {
     const titleChildren = data?.children[0];
     const requiredFragment = data.fragments?.anatomy?.required;
     const optionalFragment = data.fragments?.anatomy?.optional;
-    let descriptionValue = ` — ${required === 'true' ? requiredFragment : optionalFragment}`;
+    let descriptionValue = ` — ${required === true ? requiredFragment : optionalFragment}`;
     if (add) descriptionValue = `, ${add}${descriptionValue}`;
 
     if (!titleChildren) {
@@ -17,7 +17,7 @@ class PinLeafDirective extends Node {
     return {
       type: 'htmlContainer',
       tagName: 'li',
-      classes: ['dsfr-doc-anatomy__pin', required === 'true' ? 'dsfr-doc-anatomy__pin--required' : ''],
+      classes: ['dsfr-doc-anatomy__pin', required === true ? 'dsfr-doc-anatomy__pin--required' : ''],
       children: [
         {
           type: 'htmlContainer',