@yegor256/dogent 0.7.0 → 0.7.2

package/package.json

@@ -40,7 +40,7 @@
     "lint": "eslint .",
     "test": "mocha 'test/**/*.js' --timeout 60000"
   },
-  "version": "0.7.0",
+  "version": "0.7.2",
   "dependencies": {
     "minimist": "^1.2.8"
   }

package/src/rules/polite.js

@@ -38,8 +38,9 @@ class Polite {
   }
   scan(text, line, uri) {
     const found = [];
+    const masked = this.mask(text);
     const regex = /\b(?:please|kindly|feel free to|make sure to|be sure to|don't forget to|remember to|note that|it is important to)\b/giu;
-    let hit = regex.exec(text);
+    let hit = regex.exec(masked);
     while (hit !== null) {
       found.push(new Violation(
         this.id,
@@ -47,10 +48,13 @@ class Polite {
         `courtesy phrase "${hit[0]}" must be removed`,
         new Region(uri, line, hit.index + 1)
       ));
-      hit = regex.exec(text);
+      hit = regex.exec(masked);
     }
     return found;
   }
+  mask(text) {
+    return text.replace(/`[^`]*`/gu, (span) => ' '.repeat(span.length));
+  }
 }
 
 module.exports = Polite;

package/src/yaml.js

@@ -10,8 +10,9 @@
  *
  * A frontmatter block read as a flat YAML mapping. Splits itself line by
  * line and emits one pair per top-level "key: value", carrying the key,
- * the value, and the absolute line the key sits on. Nested mappings,
- * blank lines, and comments hold no keys and yield nothing.
+ * the value, and the absolute line the key sits on. Folds a block scalar
+ * value ("|" or ">") from its indented continuation lines into one value.
+ * Nested mappings, blank lines, and comments hold no keys and yield nothing.
  */
 class Yaml {
   constructor(text, base) {
@@ -19,18 +20,30 @@ class Yaml {
     this.base = base;
   }
   pairs() {
-    return this.text
-      .split('\n')
-      .map((line, index) => ({line, row: this.base + index}))
-      .filter((spot) => /^[^\s#][^:]*:/u.test(spot.line))
-      .map((spot) => {
-        const colon = spot.line.indexOf(':');
-        return {
-          key: spot.line.slice(0, colon).trim(),
-          value: spot.line.slice(colon + 1).trim(),
-          row: spot.row
-        };
-      });
+    const lines = this.text.split('\n');
+    return lines
+      .map((line, index) => index)
+      .filter((index) => /^[^\s#][^:]*:/u.test(lines[index]))
+      .map((index) => this.pair(lines, index));
+  }
+  pair(lines, index) {
+    const colon = lines[index].indexOf(':');
+    const value = lines[index].slice(colon + 1).trim();
+    return {
+      key: lines[index].slice(0, colon).trim(),
+      value: /^[|>][+-]?\d*$/u.test(value) ? Yaml.fold(lines, index) : value,
+      row: this.base + index
+    };
+  }
+  static fold(lines, index) {
+    const rest = lines.slice(index + 1);
+    const stop = rest.findIndex((line) => line.trim() !== '' && !/^\s/u.test(line));
+    const end = stop === -1 ? rest.length : stop;
+    return rest
+      .slice(0, end)
+      .map((line) => line.trim())
+      .join(' ')
+      .trim();
   }
 }