@textlint/fixer-formatter 15.0.1 → 15.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/formatters/compats.js.map +1 -1
- package/lib/src/formatters/diff.d.ts +3 -1
- package/lib/src/formatters/diff.d.ts.map +1 -1
- package/lib/src/formatters/diff.js +40 -6
- package/lib/src/formatters/diff.js.map +1 -1
- package/lib/src/formatters/stylish.d.ts +3 -1
- package/lib/src/formatters/stylish.d.ts.map +1 -1
- package/lib/src/formatters/stylish.js +23 -4
- package/lib/src/formatters/stylish.js.map +1 -1
- package/lib/src/index.js.map +1 -1
- package/package.json +8 -7
- package/src/formatters/compats.ts +1 -1
- package/src/formatters/diff.ts +16 -9
- package/src/formatters/stylish.ts +24 -5
- package/src/index.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compats.js","sourceRoot":"","sources":["../../../src/formatters/compats.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,YAAY,CAAC;;AAUb,4BAyBC;AAjCD,SAAS,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"compats.js","sourceRoot":"","sources":["../../../src/formatters/compats.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,YAAY,CAAC;;AAUb,4BAyBC;AAjCD,SAAS,cAAc,CAAC,OAA4E;IAChG,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1C,OAAO,OAAO,CAAC;IACnB,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED,mBAAyB,OAA4B;IACjD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACzC,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC;QAEzB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACzB,MAAM,IAAI,SAAS,CAAC;YACpB,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC;YACjC,MAAM,IAAI,QAAQ,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,SAAS,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YAClC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,IAAI,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACZ,MAAM,IAAI,aAAa,KAAK,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACpE,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { TextlintFixResult } from "@textlint/types";
|
|
2
|
-
export default function (results: TextlintFixResult[], options
|
|
2
|
+
export default function (results: TextlintFixResult[], options?: {
|
|
3
|
+
color?: boolean;
|
|
4
|
+
}): string;
|
|
3
5
|
//# sourceMappingURL=diff.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/formatters/diff.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/formatters/diff.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAkDzD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,iBAAiB,EAAE,EAAE,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,UAqGvF"}
|
|
@@ -1,16 +1,49 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
39
|
exports.default = default_1;
|
|
7
|
-
const
|
|
40
|
+
const fs = __importStar(require("node:fs"));
|
|
8
41
|
const diff_1 = require("diff");
|
|
9
42
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
43
|
const strip_ansi_1 = __importDefault(require("strip-ansi"));
|
|
11
44
|
const isFile = (filePath) => {
|
|
12
45
|
try {
|
|
13
|
-
const stats =
|
|
46
|
+
const stats = fs.statSync(filePath);
|
|
14
47
|
return stats.isFile();
|
|
15
48
|
}
|
|
16
49
|
catch (error) {
|
|
@@ -30,7 +63,7 @@ function isModified(part) {
|
|
|
30
63
|
if (!part) {
|
|
31
64
|
return false;
|
|
32
65
|
}
|
|
33
|
-
return typeof part === "object" && (part.removed || part.added);
|
|
66
|
+
return typeof part === "object" && part !== null && (!!part.removed || !!part.added);
|
|
34
67
|
}
|
|
35
68
|
function addMarkEachLine(mark, text) {
|
|
36
69
|
if (text.length === 0) {
|
|
@@ -44,7 +77,7 @@ function addMarkEachLine(mark, text) {
|
|
|
44
77
|
});
|
|
45
78
|
return `${markedLines.join("\n")}\n`;
|
|
46
79
|
}
|
|
47
|
-
function default_1(results, options) {
|
|
80
|
+
function default_1(results, options = {}) {
|
|
48
81
|
// default: true
|
|
49
82
|
const useColor = options.color !== undefined ? options.color : true;
|
|
50
83
|
let output = "\n";
|
|
@@ -66,12 +99,13 @@ function default_1(results, options) {
|
|
|
66
99
|
return;
|
|
67
100
|
}
|
|
68
101
|
output += `${chalk_1.default.underline(result.filePath)}\n`;
|
|
69
|
-
const originalContent =
|
|
102
|
+
const originalContent = fs.readFileSync(filePath, "utf-8");
|
|
70
103
|
const diff = (0, diff_1.diffLines)(originalContent, result.output);
|
|
71
104
|
diff.forEach(function (part, index) {
|
|
105
|
+
var _a;
|
|
72
106
|
const prevLine = diff[index - 1];
|
|
73
107
|
const nextLine = diff[index + 1];
|
|
74
|
-
if (!isModified(part) && part.count > 1) {
|
|
108
|
+
if (!isModified(part) && ((_a = part.count) !== null && _a !== void 0 ? _a : 0) > 1) {
|
|
75
109
|
const greyColor = "grey";
|
|
76
110
|
/*
|
|
77
111
|
<MODIFIED>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../src/formatters/diff.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../src/formatters/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { TextlintFixResult } from "@textlint/types";
|
|
2
|
-
export default function (results: TextlintFixResult[], options:
|
|
2
|
+
export default function (results: TextlintFixResult[], options: {
|
|
3
|
+
color?: boolean;
|
|
4
|
+
}): string;
|
|
3
5
|
//# sourceMappingURL=stylish.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylish.d.ts","sourceRoot":"","sources":["../../../src/formatters/stylish.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAkBzD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"stylish.d.ts","sourceRoot":"","sources":["../../../src/formatters/stylish.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAkBzD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,UA2GlF"}
|
|
@@ -24,6 +24,8 @@ function default_1(results, options) {
|
|
|
24
24
|
let output = "\n";
|
|
25
25
|
let totalFixed = 0;
|
|
26
26
|
let errors = 0;
|
|
27
|
+
let warnings = 0;
|
|
28
|
+
let infos = 0;
|
|
27
29
|
const summaryColor = "yellow";
|
|
28
30
|
const greenColor = "green";
|
|
29
31
|
results.forEach(function (result) {
|
|
@@ -33,7 +35,19 @@ function default_1(results, options) {
|
|
|
33
35
|
const messages = result.applyingMessages;
|
|
34
36
|
// still error count
|
|
35
37
|
const remainingMessages = result.remainingMessages;
|
|
36
|
-
|
|
38
|
+
// Count remaining messages by severity
|
|
39
|
+
remainingMessages.forEach(function (message) {
|
|
40
|
+
const fatal = message.fatal;
|
|
41
|
+
if (fatal || message.severity === 2) {
|
|
42
|
+
errors++;
|
|
43
|
+
}
|
|
44
|
+
else if (message.severity === 1) {
|
|
45
|
+
warnings++;
|
|
46
|
+
}
|
|
47
|
+
else if (message.severity === 3) {
|
|
48
|
+
infos++;
|
|
49
|
+
}
|
|
50
|
+
});
|
|
37
51
|
if (messages.length === 0) {
|
|
38
52
|
return;
|
|
39
53
|
}
|
|
@@ -76,12 +90,17 @@ function default_1(results, options) {
|
|
|
76
90
|
"\n"
|
|
77
91
|
].join(""));
|
|
78
92
|
}
|
|
79
|
-
|
|
93
|
+
const totalRemaining = errors + warnings + infos;
|
|
94
|
+
if (totalRemaining > 0) {
|
|
95
|
+
const summaryParts = [
|
|
96
|
+
`${errors} ${pluralize("error", errors)}`,
|
|
97
|
+
`${warnings} ${pluralize("warning", warnings)}`,
|
|
98
|
+
`${infos} ${pluralize("info", infos)}`
|
|
99
|
+
];
|
|
80
100
|
output += chalk_1.default[summaryColor].bold([
|
|
81
101
|
// http://www.fileformat.info/info/unicode/char/2716/index.htm
|
|
82
102
|
"\u2716 Remaining ",
|
|
83
|
-
|
|
84
|
-
pluralize(" problem", errors),
|
|
103
|
+
summaryParts.join(", "),
|
|
85
104
|
"\n"
|
|
86
105
|
].join(""));
|
|
87
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylish.js","sourceRoot":"","sources":["../../../src/formatters/stylish.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AAmBb,
|
|
1
|
+
{"version":3,"file":"stylish.js","sourceRoot":"","sources":["../../../src/formatters/stylish.ts"],"names":[],"mappings":"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"}
|
package/lib/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,YAAY,CAAC;;;;;AA+Bb,sCAsDC;AAMD,sDAMC;AA/FD,6DAAyD;AACzD,sDAAyB;AACzB,0DAA6B;AAC7B,kDAA2B;AAC3B,iDAA+D;AAC/D,aAAa;AACb,yEAAuD;AACvD,mEAAiD;AACjD,mFAAgE;AAChE,mEAAiD;AACjD,yEAAuD;AAEvD,MAAM,oBAAoB,GAAG;IACzB,OAAO,EAAE,oBAAgB;IACzB,IAAI,EAAE,iBAAa;IACnB,cAAc,EAAE,yBAAoB;IACpC,IAAI,EAAE,iBAAa;IACnB,OAAO,EAAE,oBAAgB;CACnB,CAAC;AAEX,MAAM,mBAAmB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@textlint/fixer-formatter",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.1.1",
|
|
4
4
|
"description": "textlint output formatter for fixer",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"AST",
|
|
@@ -35,12 +35,13 @@
|
|
|
35
35
|
"clean": "rimraf lib/",
|
|
36
36
|
"prepack": "npm run build",
|
|
37
37
|
"test": "vitest run",
|
|
38
|
+
"updateSnapshot": "UPDATE_SNAPSHOT=true vitest run -u",
|
|
38
39
|
"test:watch": "vitest watch"
|
|
39
40
|
},
|
|
40
41
|
"dependencies": {
|
|
41
|
-
"@textlint/module-interop": "15.
|
|
42
|
-
"@textlint/resolver": "15.
|
|
43
|
-
"@textlint/types": "15.
|
|
42
|
+
"@textlint/module-interop": "15.1.1",
|
|
43
|
+
"@textlint/resolver": "15.1.1",
|
|
44
|
+
"@textlint/types": "15.1.1",
|
|
44
45
|
"chalk": "^4.1.2",
|
|
45
46
|
"debug": "^4.4.1",
|
|
46
47
|
"diff": "^5.2.0",
|
|
@@ -51,13 +52,13 @@
|
|
|
51
52
|
"devDependencies": {
|
|
52
53
|
"@types/debug": "^4.1.12",
|
|
53
54
|
"@types/diff": "^4.0.2",
|
|
54
|
-
"@types/node": "^18.19.
|
|
55
|
+
"@types/node": "^18.19.112",
|
|
55
56
|
"rimraf": "^6.0.1",
|
|
56
57
|
"typescript": "~5.8.3",
|
|
57
|
-
"vitest": "^3.2.
|
|
58
|
+
"vitest": "^3.2.4"
|
|
58
59
|
},
|
|
59
60
|
"publishConfig": {
|
|
60
61
|
"access": "public"
|
|
61
62
|
},
|
|
62
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "1b3a571938c6bd73aac938266ef3315058077c81"
|
|
63
64
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// LICENSE : MIT
|
|
2
2
|
"use strict";
|
|
3
3
|
import type { TextlintFixResult } from "@textlint/types";
|
|
4
|
-
function getMessageType(message:
|
|
4
|
+
function getMessageType(message: TextlintFixResult["applyingMessages"][number] & { fatal?: boolean }) {
|
|
5
5
|
if (message.fatal || message.severity === 2) {
|
|
6
6
|
return "Error";
|
|
7
7
|
} else {
|
package/src/formatters/diff.ts
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
import type { TextlintFixResult } from "@textlint/types";
|
|
3
|
-
import fs from "node:fs";
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
4
|
import { diffLines } from "diff";
|
|
5
5
|
import chalk from "chalk";
|
|
6
6
|
import stripAnsi from "strip-ansi";
|
|
7
|
+
|
|
8
|
+
type DiffPart = {
|
|
9
|
+
value: string;
|
|
10
|
+
count?: number;
|
|
11
|
+
added?: boolean;
|
|
12
|
+
removed?: boolean;
|
|
13
|
+
};
|
|
7
14
|
const isFile = (filePath: string) => {
|
|
8
15
|
try {
|
|
9
16
|
const stats = fs.statSync(filePath);
|
|
@@ -22,14 +29,14 @@ function pluralize(word: string, count: number): string {
|
|
|
22
29
|
return count === 1 ? word : `${word}s`;
|
|
23
30
|
}
|
|
24
31
|
|
|
25
|
-
function isModified(part:
|
|
32
|
+
function isModified(part: DiffPart): boolean {
|
|
26
33
|
if (!part) {
|
|
27
34
|
return false;
|
|
28
35
|
}
|
|
29
|
-
return typeof part === "object" && (part.removed || part.added);
|
|
36
|
+
return typeof part === "object" && part !== null && (!!part.removed || !!part.added);
|
|
30
37
|
}
|
|
31
38
|
|
|
32
|
-
function addMarkEachLine(mark: string, text:
|
|
39
|
+
function addMarkEachLine(mark: string, text: string) {
|
|
33
40
|
if (text.length === 0) {
|
|
34
41
|
return "\n";
|
|
35
42
|
}
|
|
@@ -42,7 +49,7 @@ function addMarkEachLine(mark: string, text: any) {
|
|
|
42
49
|
return `${markedLines.join("\n")}\n`;
|
|
43
50
|
}
|
|
44
51
|
|
|
45
|
-
export default function (results: TextlintFixResult[], options:
|
|
52
|
+
export default function (results: TextlintFixResult[], options: { color?: boolean } = {}) {
|
|
46
53
|
// default: true
|
|
47
54
|
const useColor = options.color !== undefined ? options.color : true;
|
|
48
55
|
let output = "\n";
|
|
@@ -69,10 +76,10 @@ export default function (results: TextlintFixResult[], options: any) {
|
|
|
69
76
|
const originalContent = fs.readFileSync(filePath, "utf-8");
|
|
70
77
|
const diff = diffLines(originalContent, result.output);
|
|
71
78
|
|
|
72
|
-
diff.forEach(function (part:
|
|
73
|
-
const prevLine = diff[index - 1];
|
|
74
|
-
const nextLine = diff[index + 1];
|
|
75
|
-
if (!isModified(part) && part.count > 1) {
|
|
79
|
+
diff.forEach(function (part: DiffPart, index: number) {
|
|
80
|
+
const prevLine = diff[index - 1] as DiffPart;
|
|
81
|
+
const nextLine = diff[index + 1] as DiffPart;
|
|
82
|
+
if (!isModified(part) && (part.count ?? 0) > 1) {
|
|
76
83
|
const greyColor = "grey";
|
|
77
84
|
/*
|
|
78
85
|
<MODIFIED>
|
|
@@ -17,12 +17,14 @@ function pluralize(word: string, count: number): string {
|
|
|
17
17
|
return count === 1 ? word : `${word}s`;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
export default function (results: TextlintFixResult[], options:
|
|
20
|
+
export default function (results: TextlintFixResult[], options: { color?: boolean }) {
|
|
21
21
|
// default: true
|
|
22
22
|
const useColor = options.color !== undefined ? options.color : true;
|
|
23
23
|
let output = "\n";
|
|
24
24
|
let totalFixed = 0;
|
|
25
25
|
let errors = 0;
|
|
26
|
+
let warnings = 0;
|
|
27
|
+
let infos = 0;
|
|
26
28
|
const summaryColor = "yellow";
|
|
27
29
|
const greenColor = "green";
|
|
28
30
|
|
|
@@ -33,7 +35,19 @@ export default function (results: TextlintFixResult[], options: any) {
|
|
|
33
35
|
const messages = result.applyingMessages;
|
|
34
36
|
// still error count
|
|
35
37
|
const remainingMessages = result.remainingMessages;
|
|
36
|
-
|
|
38
|
+
|
|
39
|
+
// Count remaining messages by severity
|
|
40
|
+
remainingMessages.forEach(function (message) {
|
|
41
|
+
const fatal = (message as { fatal?: boolean }).fatal;
|
|
42
|
+
if (fatal || message.severity === 2) {
|
|
43
|
+
errors++;
|
|
44
|
+
} else if (message.severity === 1) {
|
|
45
|
+
warnings++;
|
|
46
|
+
} else if (message.severity === 3) {
|
|
47
|
+
infos++;
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
|
|
37
51
|
if (messages.length === 0) {
|
|
38
52
|
return;
|
|
39
53
|
}
|
|
@@ -88,13 +102,18 @@ export default function (results: TextlintFixResult[], options: any) {
|
|
|
88
102
|
);
|
|
89
103
|
}
|
|
90
104
|
|
|
91
|
-
|
|
105
|
+
const totalRemaining = errors + warnings + infos;
|
|
106
|
+
if (totalRemaining > 0) {
|
|
107
|
+
const summaryParts = [
|
|
108
|
+
`${errors} ${pluralize("error", errors)}`,
|
|
109
|
+
`${warnings} ${pluralize("warning", warnings)}`,
|
|
110
|
+
`${infos} ${pluralize("info", infos)}`
|
|
111
|
+
];
|
|
92
112
|
output += chalk[summaryColor].bold(
|
|
93
113
|
[
|
|
94
114
|
// http://www.fileformat.info/info/unicode/char/2716/index.htm
|
|
95
115
|
"\u2716 Remaining ",
|
|
96
|
-
|
|
97
|
-
pluralize(" problem", errors),
|
|
116
|
+
summaryParts.join(", "),
|
|
98
117
|
"\n"
|
|
99
118
|
].join("")
|
|
100
119
|
);
|
package/src/index.ts
CHANGED
|
@@ -21,7 +21,7 @@ const builtinFormatterList = {
|
|
|
21
21
|
stylish: stylishFormatter
|
|
22
22
|
} as const;
|
|
23
23
|
type FormatterFunction = (results: TextlintFixResult[], formatterConfig: FormatterConfig) => string;
|
|
24
|
-
const isFormatterFunction = (formatter:
|
|
24
|
+
const isFormatterFunction = (formatter: unknown): formatter is FormatterFunction => {
|
|
25
25
|
return typeof formatter === "function";
|
|
26
26
|
};
|
|
27
27
|
type BuiltInFormatterName = keyof typeof builtinFormatterList;
|