feature(@putout/processor-yaml) js-yaml -> yaml: useless quotes (node…

…ca/js-yaml#645)
coderaiser · Oct 28, 2021 · e207f0e · e207f0e
1 parent 0e0a84b
commit e207f0e
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 31 deletions.
diff --git a/packages/engine-processor/test/processor.js b/packages/engine-processor/test/processor.js
@@ -469,11 +469,11 @@ test('putout: engine-processor: yaml: duplicate', async (t) => {
 
     const expected = [{
         position: {
-            column: 1,
-            line: 4,
+            column: 3,
+            line: 2,
         },
-        message: 'Duplicated mapping key (4:3)',
-        rule: 'duplicated-mapping-key (yaml)',
+        message: `Map keys must be unique; "only" is repeated`,
+        rule: 'yaml-semantic-error (yaml)',
     }];
 
     t.deepEqual(places, expected);

diff --git a/packages/processor-yaml/lib/yaml.js b/packages/processor-yaml/lib/yaml.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const tryCatch = require('try-catch');
+const justKebabCase = require('just-kebab-case');
 
-const bigFirst = (a) => a[0].toUpperCase() + a.slice(1);
+const parseRule = (a) => justKebabCase(a.replace('YAML', 'Yaml'));
 const {stringify, parse} = JSON;
 
 module.exports.files = [
@@ -11,11 +12,11 @@ module.exports.files = [
 ];
 
 module.exports.branch = (rawSource) => {
-    const yaml = require('js-yaml');
+    const yaml = require('yaml');
     const jsonProcessor = require('@putout/processor-json');
 
     const list = [];
-    const [error, value] = tryCatch(yaml.load, rawSource);
+    const [error, value] = tryCatch(yaml.parse, rawSource);
 
     if (error)
         return [];
@@ -32,40 +33,57 @@ module.exports.branch = (rawSource) => {
 };
 
 module.exports.find = (rawSource) => {
-    const yaml = require('js-yaml');
+    const yaml = require('yaml');
 
-    const [error] = tryCatch(yaml.load, rawSource);
-    const places = parsePlaces(error);
+    const [error] = tryCatch(yaml.parse, rawSource);
+    const places = parsePlaces({
+        error,
+        rawSource,
+    });
 
     return places;
 };
 
 module.exports.merge = (rawSource, list) => {
-    const yaml = require('js-yaml');
+    const yaml = require('yaml');
     const jsonProcessor = require('@putout/processor-json');
     const source = jsonProcessor.merge(rawSource, list);
 
-    return yaml.dump(parse(source));
+    return yaml.stringify(parse(source));
 };
 
-function parsePlaces(error) {
+function parsePlaces({error, rawSource}) {
     if (!error)
         return [];
 
-    const {mark, reason} = error;
-    const {line} = mark;
-    const position = {
-        line: line + 1,
-        column: 1,
-    };
-
-    const [message] = error.message.split('\n');
+    const {message, source} = error;
+    const {start} = source.range;
+    const [rule] = String(error).split(':');
     const place = {
-        message: bigFirst(message),
-        position,
-        rule: `${reason.replace(/\s/g, '-')} (yaml)`,
+        message,
+        rule: `${parseRule(rule)} (yaml)`,
+        position: parsePosition({
+            start,
+            rawSource,
+        }),
     };
 
     return [place];
 }
 
+function parsePosition({start, rawSource}) {
+    let line = 1;
+    let lastLineStart = 0;
+
+    for (let i = 0; i <= start; i++) {
+        if (rawSource[i] === '\n') {
+            ++line;
+            lastLineStart = i;
+        }
+    }
+
+    return {
+        line,
+        column: start - lastLineStart,
+    };
+}
diff --git a/packages/processor-yaml/package.json b/packages/processor-yaml/package.json
@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "@putout/processor-json": "^3.0.0",
-    "fullstore": "^3.0.0",
-    "js-yaml": "^4.0.0",
-    "try-catch": "^3.0.0"
+    "just-kebab-case": "^3.0.0",
+    "try-catch": "^3.0.0",
+    "yaml": "^1.10.2"
   },
   "keywords": [
     "putout",

diff --git a/packages/processor-yaml/test/fixture/actions.yml b/packages/processor-yaml/test/fixture/actions.yml
@@ -0,0 +1,11 @@
+name: Node CI
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version:
+          - 14.x
diff --git a/packages/processor-yaml/test/yaml.js b/packages/processor-yaml/test/yaml.js
@@ -11,14 +11,18 @@ test('putout: processor: yaml', async ({process}) => {
     await process('travis.yml', ['travis/disable-cache']);
 });
 
+test('putout: processor: yaml: actions', async ({noProcess}) => {
+    await noProcess('actions.yml');
+});
+
 test('putout: processor: yaml: duplicate', async ({comparePlaces}) => {
     await comparePlaces('duplicate.yml', [{
         position: {
-            column: 1,
-            line: 4,
+            column: 3,
+            line: 2,
         },
-        message: 'Duplicated mapping key (4:3)',
-        rule: 'duplicated-mapping-key (yaml)',
+        message: `Map keys must be unique; "only" is repeated`,
+        rule: 'yaml-semantic-error (yaml)',
     }]);
 });