htmlnano 2.0.1 → 2.0.3

package/lib/modules/normalizeAttributeValues.js

@@ -17,7 +17,7 @@ const caseInsensitiveAttributes = {
   kind: ['track'],
   method: ['form'],
   preload: ['audio', 'video'],
-  referrerpolicy: ['a', 'area', 'iframe', 'img', 'link'],
+  referrerpolicy: null,
   sandbox: ['iframe'],
   spellcheck: null,
   scope: ['th'],
@@ -29,13 +29,96 @@ const caseInsensitiveAttributes = {
   wrap: ['textarea']
 };
 
+// https://html.spec.whatwg.org/#invalid-value-default
+/** @typedef { [key: string]: { tag: null | string[], default: string, valid: string[] } } */
+const invalidValueDefault = {
+  crossorigin: {
+    tag: null,
+    default: 'anonymous',
+    valid: ['', 'anonymous', 'use-credentials']
+  },
+  // https://html.spec.whatwg.org/#referrer-policy-attributes
+  // The attribute's invalid value default and missing value default are both the empty string state.
+  referrerpolicy: {
+    tag: null,
+    default: '',
+    valid: ['', 'url', 'origin', 'no-referrer', 'no-referrer-when-downgrade', 'same-origin', 'origin-when-cross-origin', 'strict-origin-when-cross-origin', 'unsafe-url']
+  },
+  // https://html.spec.whatwg.org/#lazy-loading-attributes
+  loading: {
+    tag: ['img', 'iframe'],
+    default: 'eager',
+    valid: ['lazy', 'eager']
+  },
+  // https://html.spec.whatwg.org/#the-img-element
+  // https://html.spec.whatwg.org/#image-decoding-hint
+  decoding: {
+    tag: ['img'],
+    default: 'auto',
+    valid: ['auto', 'sync', 'async']
+  },
+  // https://html.spec.whatwg.org/#the-track-element
+  kind: {
+    tag: ['track'],
+    default: 'metadata',
+    valid: ['subtitles', 'captions', 'descriptions', 'chapters', 'metadata']
+  },
+  autocomplete: {
+    tag: null,
+    default: 'on',
+    valid: ['on', 'off']
+  },
+  type: {
+    tag: ['button'],
+    default: 'submit',
+    valid: ['submit', 'reset', 'button']
+  },
+  wrap: {
+    tag: ['textarea'],
+    default: 'soft',
+    valid: ['soft', 'hard']
+  },
+  // https://html.spec.whatwg.org/#the-hidden-attribute
+  hidden: {
+    tag: null,
+    default: 'hidden',
+    valid: ['hidden', 'until-found']
+  },
+  // https://html.spec.whatwg.org/#autocapitalization
+  autocapitalize: {
+    tag: null,
+    default: 'sentences',
+    valid: ['none', 'off', 'on', 'sentences', 'words', 'characters']
+  },
+  // https://html.spec.whatwg.org/#the-marquee-element
+  behavior: {
+    tag: ['marquee'],
+    default: 'scroll',
+    valid: ['scroll', 'slide', 'alternate']
+  },
+  direction: {
+    tag: ['marquee'],
+    default: 'left',
+    valid: ['left', 'right', 'up', 'down']
+  }
+};
 function onAttrs() {
   return (attrs, node) => {
     const newAttrs = attrs;
     Object.entries(attrs).forEach(([attrName, attrValue]) => {
+      let newAttrValue = attrValue;
       if (Object.hasOwnProperty.call(caseInsensitiveAttributes, attrName) && (caseInsensitiveAttributes[attrName] === null || caseInsensitiveAttributes[attrName].includes(node.tag))) {
-        newAttrs[attrName] = attrValue.toLowerCase ? attrValue.toLowerCase() : attrValue;
+        newAttrValue = typeof attrValue.toLowerCase === 'function' ? attrValue.toLowerCase() : attrValue;
+      }
+      if (Object.hasOwnProperty.call(invalidValueDefault, attrName)) {
+        const meta = invalidValueDefault[attrName];
+        if (meta.tag === null || node && node.tag && meta.tag.includes(node.tag)) {
+          if (!meta.valid.includes(newAttrValue)) {
+            newAttrValue = meta.default;
+          }
+        }
       }
+      newAttrs[attrName] = newAttrValue;
     });
     return newAttrs;
   };

package/lib/modules/removeAttributeQuotes.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = removeAttributeQuotes;
-
 // Specification: https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // See also: https://github.com/posthtml/posthtml-render/pull/30
 // See also: https://github.com/posthtml/htmlnano/issues/6#issuecomment-707105334
@@ -14,6 +13,5 @@ function removeAttributeQuotes(tree) {
   if (tree.options && typeof tree.options.quoteAllAttributes === 'undefined') {
     tree.options.quoteAllAttributes = false;
   }
-
   return tree;
 }

package/lib/modules/removeComments.js

@@ -5,100 +5,82 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onContent = onContent;
 exports.onNode = onNode;
-
 var _helpers = require("../helpers");
-
 const MATCH_EXCERPT_REGEXP = /<!-- ?more ?-->/i;
-/** Removes HTML comments */
 
+/** Removes HTML comments */
 function onNode(options, removeType) {
   if (removeType !== 'all' && removeType !== 'safe' && !isMatcher(removeType)) {
     removeType = 'safe';
   }
-
   return node => {
     if (isCommentToRemove(node, removeType)) {
       return '';
     }
-
     return node;
   };
 }
-
 function onContent(options, removeType) {
   if (removeType !== 'all' && removeType !== 'safe' && !isMatcher(removeType)) {
     removeType = 'safe';
   }
-
   return contents => {
     return contents.filter(content => !isCommentToRemove(content, removeType));
   };
 }
-
 function isCommentToRemove(text, removeType) {
   if (typeof text !== 'string') {
     return false;
   }
-
   if (!(0, _helpers.isComment)(text)) {
     // Not HTML comment
     return false;
   }
-
   if (removeType === 'safe') {
-    const isNoindex = text === '<!--noindex-->' || text === '<!--/noindex-->'; // Don't remove noindex comments.
+    const isNoindex = text === '<!--noindex-->' || text === '<!--/noindex-->';
+    // Don't remove noindex comments.
     // See: https://yandex.com/support/webmaster/controlling-robot/html.xml
-
     if (isNoindex) {
       return false;
     }
-
-    const isServerSideExclude = text === '<!--sse-->' || text === '<!--/sse-->'; // Don't remove sse comments.
+    const isServerSideExclude = text === '<!--sse-->' || text === '<!--/sse-->';
+    // Don't remove sse comments.
     // See: https://support.cloudflare.com/hc/en-us/articles/200170036-What-does-Server-Side-Excludes-SSE-do-
-
     if (isServerSideExclude) {
       return false;
-    } // https://en.wikipedia.org/wiki/Conditional_comment
-
+    }
 
+    // https://en.wikipedia.org/wiki/Conditional_comment
     if ((0, _helpers.isConditionalComment)(text)) {
       return false;
-    } // Hexo: https://hexo.io/docs/tag-plugins#Post-Excerpt
+    }
+
+    // Hexo: https://hexo.io/docs/tag-plugins#Post-Excerpt
     // Hugo: https://gohugo.io/content-management/summaries/#manual-summary-splitting
     // WordPress: https://wordpress.com/support/wordpress-editor/blocks/more-block/2/
     // Jekyll: https://jekyllrb.com/docs/posts/#post-excerpts
-
-
     const isCMSExcerptComment = MATCH_EXCERPT_REGEXP.test(text);
-
     if (isCMSExcerptComment) {
       return false;
     }
   }
-
   if (isMatcher(removeType)) {
     return isMatch(text, removeType);
   }
-
   return true;
 }
-
 function isMatch(input, matcher) {
   if (matcher instanceof RegExp) {
     return matcher.test(input);
   }
-
   if (typeof matcher === 'function') {
     return Boolean(matcher(input));
   }
-
   return false;
 }
-
 function isMatcher(matcher) {
   if (matcher instanceof RegExp || typeof matcher === 'function') {
     return true;
   }
-
   return false;
 }

package/lib/modules/removeEmptyAttributes.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.onAttrs = onAttrs;
-
 var _helpers = require("../helpers");
-
 const safeToRemoveAttrs = {
   id: null,
   class: null,
@@ -55,15 +53,17 @@ const safeToRemoveAttrs = {
   value: ['button', 'input', 'li'],
   width: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video']
 };
-
 function onAttrs() {
   return (attrs, node) => {
-    const newAttrs = { ...attrs
+    const newAttrs = {
+      ...attrs
     };
     Object.entries(attrs).forEach(([attrName, attrValue]) => {
       if ((0, _helpers.isEventHandler)(attrName) || Object.hasOwnProperty.call(safeToRemoveAttrs, attrName) && (safeToRemoveAttrs[attrName] === null || safeToRemoveAttrs[attrName].includes(node.tag))) {
-        if (attrValue === '' || (attrValue || '').match(/^\s+$/)) {
-          delete newAttrs[attrName];
+        if (typeof attrValue === 'string') {
+          if (attrValue === '' || attrValue.trim() === '') {
+            delete newAttrs[attrName];
+          }
         }
       }
     });

package/lib/modules/removeOptionalTags.js

@@ -4,34 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = removeOptionalTags;
-
 var _helpers = require("../helpers");
-
 const startWithWhitespacePattern = /^\s+/;
 const bodyStartTagCantBeOmittedWithFirstChildTags = new Set(['meta', 'link', 'script', 'style']);
 const tbodyStartTagCantBeOmittedWithPrecededTags = new Set(['tbody', 'thead', 'tfoot']);
 const tbodyEndTagCantBeOmittedWithFollowedTags = new Set(['tbody', 'tfoot']);
-
 function isEmptyTextNode(node) {
   if (typeof node === 'string' && node.trim() === '') {
     return true;
   }
-
   return false;
 }
-
 function isEmptyNode(node) {
   if (!node.content) {
     return true;
   }
-
   if (node.content.length) {
     return !node.content.filter(n => typeof n === 'string' && isEmptyTextNode(n) ? false : true).length;
   }
-
   return true;
 }
-
 function getFirstChildTag(node, nonEmpty = true) {
   if (node.content && node.content.length) {
     if (nonEmpty) {
@@ -43,10 +35,8 @@ function getFirstChildTag(node, nonEmpty = true) {
       return node.content[0] || null;
     }
   }
-
   return null;
 }
-
 function getPrevNode(tree, currentNodeIndex, nonEmpty = false) {
   if (nonEmpty) {
     for (let i = currentNodeIndex - 1; i >= 0; i--) {
@@ -57,10 +47,8 @@ function getPrevNode(tree, currentNodeIndex, nonEmpty = false) {
   } else {
     return tree[currentNodeIndex - 1] || null;
   }
-
   return null;
 }
-
 function getNextNode(tree, currentNodeIndex, nonEmpty = false) {
   if (nonEmpty) {
     for (let i = currentNodeIndex + 1; i < tree.length; i++) {
@@ -71,149 +59,124 @@ function getNextNode(tree, currentNodeIndex, nonEmpty = false) {
   } else {
     return tree[currentNodeIndex + 1] || null;
   }
-
   return null;
-} // Specification https://html.spec.whatwg.org/multipage/syntax.html#optional-tags
+}
 
+// Specification https://html.spec.whatwg.org/multipage/syntax.html#optional-tags
 /** Remove optional tag in the DOM */
-
-
 function removeOptionalTags(tree) {
   tree.forEach((node, index) => {
     if (!node.tag) return node;
-    if (node.attrs && Object.keys(node.attrs).length) return node; // const prevNode = getPrevNode(tree, index);
+    if (node.attrs && Object.keys(node.attrs).length) return node;
 
+    // const prevNode = getPrevNode(tree, index);
     const prevNonEmptyNode = getPrevNode(tree, index, true);
     const nextNode = getNextNode(tree, index);
     const nextNonEmptyNode = getNextNode(tree, index, true);
     const firstChildNode = getFirstChildTag(node, false);
     const firstNonEmptyChildNode = getFirstChildTag(node);
+
     /**
      * An "html" element's start tag may be omitted if the first thing inside the "html" element is not a comment.
      * An "html" element's end tag may be omitted if the "html" element is not IMMEDIATELY followed by a comment.
      */
-
     if (node.tag === 'html') {
       let isHtmlStartTagCanBeOmitted = true;
       let isHtmlEndTagCanBeOmitted = true;
-
       if (typeof firstNonEmptyChildNode === 'string' && (0, _helpers.isComment)(firstNonEmptyChildNode)) {
         isHtmlStartTagCanBeOmitted = false;
       }
-
       if (typeof nextNonEmptyNode === 'string' && (0, _helpers.isComment)(nextNonEmptyNode)) {
         isHtmlEndTagCanBeOmitted = false;
       }
-
       if (isHtmlStartTagCanBeOmitted && isHtmlEndTagCanBeOmitted) {
         node.tag = false;
       }
     }
+
     /**
      * A "head" element's start tag may be omitted if the element is empty, or if the first thing inside the "head" element is an element.
      * A "head" element's end tag may be omitted if the "head" element is not IMMEDIATELY followed by ASCII whitespace or a comment.
      */
-
-
     if (node.tag === 'head') {
       let isHeadStartTagCanBeOmitted = false;
       let isHeadEndTagCanBeOmitted = true;
-
       if (isEmptyNode(node) || firstNonEmptyChildNode && firstNonEmptyChildNode.tag) {
         isHeadStartTagCanBeOmitted = true;
       }
-
       if (nextNode && typeof nextNode === 'string' && startWithWhitespacePattern.test(nextNode) || nextNonEmptyNode && typeof nextNonEmptyNode === 'string' && (0, _helpers.isComment)(nextNode)) {
         isHeadEndTagCanBeOmitted = false;
       }
-
       if (isHeadStartTagCanBeOmitted && isHeadEndTagCanBeOmitted) {
         node.tag = false;
       }
     }
+
     /**
      * A "body" element's start tag may be omitted if the element is empty, or if the first thing inside the "body" element is not ASCII whitespace or a comment, except if the first thing inside the "body" element is a "meta", "link", "script", "style", or "template" element.
      * A "body" element's end tag may be omitted if the "body" element is not IMMEDIATELY followed by a comment.
      */
-
-
     if (node.tag === 'body') {
       let isBodyStartTagCanBeOmitted = true;
       let isBodyEndTagCanBeOmitted = true;
-
       if (typeof firstChildNode === 'string' && startWithWhitespacePattern.test(firstChildNode) || typeof firstNonEmptyChildNode === 'string' && (0, _helpers.isComment)(firstNonEmptyChildNode)) {
         isBodyStartTagCanBeOmitted = false;
       }
-
       if (firstNonEmptyChildNode && firstNonEmptyChildNode.tag && bodyStartTagCantBeOmittedWithFirstChildTags.has(firstNonEmptyChildNode.tag)) {
         isBodyStartTagCanBeOmitted = false;
       }
-
       if (nextNode && typeof nextNode === 'string' && (0, _helpers.isComment)(nextNode)) {
         isBodyEndTagCanBeOmitted = false;
       }
-
       if (isBodyStartTagCanBeOmitted && isBodyEndTagCanBeOmitted) {
         node.tag = false;
       }
     }
+
     /**
      * A "colgroup" element's start tag may be omitted if the first thing inside the "colgroup" element is a "col" element, and if the element is not IMMEDIATELY preceded by another "colgroup" element. It can't be omitted if the element is empty.
      * A "colgroup" element's end tag may be omitted if the "colgroup" element is not IMMEDIATELY followed by ASCII whitespace or a comment.
      */
-
-
     if (node.tag === 'colgroup') {
       let isColgroupStartTagCanBeOmitted = false;
       let isColgroupEndTagCanBeOmitted = true;
-
       if (firstNonEmptyChildNode && firstNonEmptyChildNode.tag && firstNonEmptyChildNode.tag === 'col') {
         isColgroupStartTagCanBeOmitted = true;
       }
-
       if (prevNonEmptyNode && prevNonEmptyNode.tag && prevNonEmptyNode.tag === 'colgroup') {
         isColgroupStartTagCanBeOmitted = false;
       }
-
       if (nextNode && typeof nextNode === 'string' && startWithWhitespacePattern.test(nextNode) || nextNonEmptyNode && typeof nextNonEmptyNode === 'string' && (0, _helpers.isComment)(nextNonEmptyNode)) {
         isColgroupEndTagCanBeOmitted = false;
       }
-
       if (isColgroupStartTagCanBeOmitted && isColgroupEndTagCanBeOmitted) {
         node.tag = false;
       }
     }
+
     /**
      * A "tbody" element's start tag may be omitted if the first thing inside the "tbody" element is a "tr" element, and if the element is not immediately preceded by another "tbody", "thead" or "tfoot" element. It can't be omitted if the element is empty.
      * A "tbody" element's end tag may be omitted if the "tbody" element is not IMMEDIATELY followed by a "tbody" or "tfoot" element.
      */
-
-
     if (node.tag === 'tbody') {
       let isTbodyStartTagCanBeOmitted = false;
       let isTbodyEndTagCanBeOmitted = true;
-
       if (firstNonEmptyChildNode && firstNonEmptyChildNode.tag && firstNonEmptyChildNode.tag === 'tr') {
         isTbodyStartTagCanBeOmitted = true;
       }
-
       if (prevNonEmptyNode && prevNonEmptyNode.tag && tbodyStartTagCantBeOmittedWithPrecededTags.has(prevNonEmptyNode.tag)) {
         isTbodyStartTagCanBeOmitted = false;
       }
-
       if (nextNonEmptyNode && nextNonEmptyNode.tag && tbodyEndTagCantBeOmittedWithFollowedTags.has(nextNonEmptyNode.tag)) {
         isTbodyEndTagCanBeOmitted = false;
       }
-
       if (isTbodyStartTagCanBeOmitted && isTbodyEndTagCanBeOmitted) {
         node.tag = false;
       }
     }
-
     if (node.content && node.content.length) {
       removeOptionalTags(node.content);
     }
-
     return node;
   });
   return tree;

package/lib/modules/removeRedundantAttributes.js

@@ -7,16 +7,19 @@ exports.onAttrs = onAttrs;
 exports.redundantScriptTypes = void 0;
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#JavaScript_types
 const redundantScriptTypes = new Set(['application/javascript', 'application/ecmascript', 'application/x-ecmascript', 'application/x-javascript', 'text/javascript', 'text/ecmascript', 'text/javascript1.0', 'text/javascript1.1', 'text/javascript1.2', 'text/javascript1.3', 'text/javascript1.4', 'text/javascript1.5', 'text/jscript', 'text/livescript', 'text/x-ecmascript', 'text/x-javascript']);
+
+// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#missing-value-default
 exports.redundantScriptTypes = redundantScriptTypes;
-const redundantAttributes = {
+const missingValueDefaultAttributes = {
   'form': {
     'method': 'get'
   },
-  'input': {
-    'type': 'text'
+  input: {
+    type: 'text'
   },
-  'button': {
-    'type': 'submit'
+  button: {
+    // https://html.spec.whatwg.org/multipage/form-elements.html#attr-button-type
+    type: 'submit'
   },
   'script': {
     'language': 'javascript',
@@ -25,10 +28,8 @@ const redundantAttributes = {
         if (attrName.toLowerCase() !== 'type') {
           continue;
         }
-
         return redundantScriptTypes.has(attrValue);
       }
-
       return false;
     },
     // Remove attribute if the function returns false
@@ -43,55 +44,37 @@ const redundantAttributes = {
     'type': 'text/css'
   },
   'link': {
-    'media': 'all',
+    media: 'all',
     'type': attrs => {
       // https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet
       let isRelStyleSheet = false;
       let isTypeTextCSS = false;
-
       if (attrs) {
         for (const [attrName, attrValue] of Object.entries(attrs)) {
           if (attrName.toLowerCase() === 'rel' && attrValue === 'stylesheet') {
             isRelStyleSheet = true;
           }
-
           if (attrName.toLowerCase() === 'type' && attrValue === 'text/css') {
             isTypeTextCSS = true;
           }
         }
-      } // Only "text/css" is redudant for link[rel=stylesheet]. Otherwise "type" shouldn't be removed
-
+      }
 
+      // Only "text/css" is redudant for link[rel=stylesheet]. Otherwise "type" shouldn't be removed
       return isRelStyleSheet && isTypeTextCSS;
     }
   },
   // See: https://html.spec.whatwg.org/#lazy-loading-attributes
-  'img': {
-    'loading': 'eager'
-  },
-  'iframe': {
-    'loading': 'eager'
-  }
-}; // See: https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#missing-value-default
-
-const canBeReplacedWithEmptyStringAttributes = {
-  audio: {
-    // https://html.spec.whatwg.org/#attr-media-preload
-    preload: 'auto'
-  },
-  video: {
-    preload: 'auto'
-  },
-  form: {
-    // https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute
-    autocomplete: 'on'
-  },
   img: {
+    'loading': 'eager',
     // https://html.spec.whatwg.org/multipage/embedded-content.html#dom-img-decoding
     decoding: 'auto'
   },
+  iframe: {
+    'loading': 'eager'
+  },
+  // https://html.spec.whatwg.org/multipage/media.html#htmltrackelement
   track: {
-    // https://html.spec.whatwg.org/multipage/media.html#htmltrackelement
     kind: 'subtitles'
   },
   textarea: {
@@ -101,61 +84,30 @@ const canBeReplacedWithEmptyStringAttributes = {
   area: {
     // https://html.spec.whatwg.org/multipage/image-maps.html#attr-area-shape
     shape: 'rect'
-  },
-  button: {
-    // https://html.spec.whatwg.org/multipage/form-elements.html#attr-button-type
-    type: 'submit'
-  },
-  input: {
-    // https://html.spec.whatwg.org/multipage/input.html#states-of-the-type-attribute
-    type: 'text'
   }
 };
-const tagsHaveRedundantAttributes = new Set(Object.keys(redundantAttributes));
-const tagsHaveMissingValueDefaultAttributes = new Set(Object.keys(canBeReplacedWithEmptyStringAttributes));
-/** Removes redundant attributes */
+const tagsHaveMissingValueDefaultAttributes = new Set(Object.keys(missingValueDefaultAttributes));
 
+/** Removes redundant attributes */
 function onAttrs() {
   return (attrs, node) => {
     if (!node.tag) return attrs;
     const newAttrs = attrs;
-
-    if (tagsHaveRedundantAttributes.has(node.tag)) {
-      const tagRedundantAttributes = redundantAttributes[node.tag];
-
+    if (tagsHaveMissingValueDefaultAttributes.has(node.tag)) {
+      const tagRedundantAttributes = missingValueDefaultAttributes[node.tag];
       for (const redundantAttributeName of Object.keys(tagRedundantAttributes)) {
         let tagRedundantAttributeValue = tagRedundantAttributes[redundantAttributeName];
         let isRemove = false;
-
         if (typeof tagRedundantAttributeValue === 'function') {
           isRemove = tagRedundantAttributeValue(attrs);
         } else if (attrs[redundantAttributeName] === tagRedundantAttributeValue) {
           isRemove = true;
         }
-
         if (isRemove) {
           delete newAttrs[redundantAttributeName];
         }
       }
     }
-
-    if (tagsHaveMissingValueDefaultAttributes.has(node.tag)) {
-      const tagMissingValueDefaultAttributes = canBeReplacedWithEmptyStringAttributes[node.tag];
-
-      for (const canBeReplacedWithEmptyStringAttributeName of Object.keys(tagMissingValueDefaultAttributes)) {
-        let tagMissingValueDefaultAttribute = tagMissingValueDefaultAttributes[canBeReplacedWithEmptyStringAttributeName];
-        let isReplace = false;
-
-        if (attrs[canBeReplacedWithEmptyStringAttributeName] === tagMissingValueDefaultAttribute) {
-          isReplace = true;
-        }
-
-        if (isReplace) {
-          newAttrs[canBeReplacedWithEmptyStringAttributeName] = '';
-        }
-      }
-    }
-
     return newAttrs;
   };
 }