markuplint - npm Package Compare versions

Comparing version 1.0.0-alpha.13 to 1.0.0-alpha.14

lib/cli/index.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -41,2 +40,3 @@ });
 };
+var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -81,3 +81,3 @@ var get_stdin_1 = __importDefault(require("get-stdin"));
 }
-get_stdin_1.default().then(function (stdin) { return __awaiter(void 0, void 0, void 0, function () {
+get_stdin_1.default().then(function (stdin) { return __awaiter(_this, void 0, void 0, function () {
     var html;
@@ -84,0 +84,0 @@ return __generator(this, function (_a) {

lib/cli/output.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -9,0 +8,0 @@ });

lib/cli/verify.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -41,54 +40,36 @@ });
 var output_1 = require("./output");
-var fs_1 = require("fs");
 function verify(filesOrGlobPatterns, fix, format, noColor, problemOnly) {
     return __awaiter(this, void 0, void 0, function () {
-        var _i, filesOrGlobPatterns_1, filesOrGlobPattern, reports, _loop_1, _a, reports_1, report, reports, _b, reports_2, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var _i, filesOrGlobPatterns_1, filesOrGlobPattern, reports, _a, reports_1, result;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     _i = 0, filesOrGlobPatterns_1 = filesOrGlobPatterns;
-                    _c.label = 1;
+                    _b.label = 1;
                 case 1:
-                    if (!(_i < filesOrGlobPatterns_1.length)) return [3 /*break*/, 9];
+                    if (!(_i < filesOrGlobPatterns_1.length)) return [3 /*break*/, 8];
                     filesOrGlobPattern = filesOrGlobPatterns_1[_i];
-                    if (!fix) return [3 /*break*/, 3];
-                    return [4 /*yield*/, __1.exec({
-                            files: filesOrGlobPattern,
-                        })];
-                case 2:
-                    reports = _c.sent();
-                    _loop_1 = function (report) {
-                        fs_1.writeFile(report.filePath, report.fixedCode, { encoding: 'utf8' }, function (err) {
-                            if (err) {
-                                throw err;
-                            }
-                            process.stdout.write("markuplint: Fix \"" + report.filePath + "\"\n");
-                        });
-                    };
-                    for (_a = 0, reports_1 = reports; _a < reports_1.length; _a++) {
-                        report = reports_1[_a];
-                        _loop_1(report);
-                    }
-                    return [3 /*break*/, 8];
-                case 3: return [4 /*yield*/, __1.exec({
+                    if (!fix) return [3 /*break*/, 2];
+                    return [3 /*break*/, 7];
+                case 2: return [4 /*yield*/, __1.exec({
                         files: filesOrGlobPattern,
                     })];
+                case 3:
+                    reports = _b.sent();
+                    _a = 0, reports_1 = reports;
+                    _b.label = 4;
                 case 4:
-                    reports = _c.sent();
-                    _b = 0, reports_2 = reports;
-                    _c.label = 5;
+                    if (!(_a < reports_1.length)) return [3 /*break*/, 7];
+                    result = reports_1[_a];
+                    return [4 /*yield*/, output_1.output(result.filePath, result.results, result.sourceCode, format, noColor, problemOnly)];
                 case 5:
-                    if (!(_b < reports_2.length)) return [3 /*break*/, 8];
-                    result = reports_2[_b];
-                    return [4 /*yield*/, output_1.output(result.filePath, result.results, result.sourceCode, format, noColor, problemOnly)];
+                    _b.sent();
+                    _b.label = 6;
                 case 6:
-                    _c.sent();
-                    _c.label = 7;
+                    _a++;
+                    return [3 /*break*/, 4];
                 case 7:
-                    _b++;
-                    return [3 /*break*/, 5];
-                case 8:
                     _i++;
                     return [3 /*break*/, 1];
-                case 9: return [2 /*return*/];
+                case 8: return [2 /*return*/];
             }
@@ -95,0 +76,0 @@ });

lib/get-messenger.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -60,3 +59,2 @@ });
                 case 1:
-                    // eslint-disable-next-line require-atomic-updates
                     cachedLocale = _a.sent();
@@ -63,0 +61,0 @@ _a.label = 2;

lib/index.d.ts

 import { Config, RuleConfigValue, VerifiedResult } from '@markuplint/ml-config';
-import { Document, MLRule, Ruleset } from '@markuplint/ml-core';
+import { MLRule } from '@markuplint/ml-core';
 import { MLMLSpec } from '@markuplint/ml-spec';
 export declare function verify(html: string, config: Config, rules: MLRule<RuleConfigValue, unknown>[], locale?: string): Promise<VerifiedResult[]>;
-export declare function fix(html: string, config: Config, rules: MLRule<RuleConfigValue, unknown>[], locale?: string): Promise<string>;
 export interface MLCLIOption {
     files?: string;
     sourceCodes?: string | string[];
-    workspace?: string;
     config?: string | Config;
@@ -15,3 +13,2 @@ specs?: string | MLMLSpec;
     locale?: string;
-    fix?: boolean;
 }
@@ -23,7 +20,4 @@ export declare function exec(options: MLCLIOption): Promise<MLResultInfo[]>;
     sourceCode: string;
-    fixedCode: string;
-    document: Document<any, unknown>;
     parser: string;
     locale?: string;
-    ruleset: Ruleset;
     configSet: {
@@ -30,0 +24,0 @@ config: Config;

lib/index.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -49,3 +48,3 @@ });
 Object.defineProperty(exports, "__esModule", { value: true });
-var file_resolver_1 = require("@markuplint/file-resolver");
+var file_resoliver_1 = require("@markuplint/file-resoliver");
 var ml_core_1 = require("@markuplint/ml-core");
@@ -57,3 +56,3 @@ var get_messenger_1 = require("./get-messenger");
     return __awaiter(this, void 0, void 0, function () {
-        var totalResults;
+        var results;
         return __generator(this, function (_a) {
@@ -68,4 +67,4 @@ switch (_a.label) {
                 case 1:
-                    totalResults = _a.sent();
-                    return [2 /*return*/, totalResults[0] ? totalResults[0].results : []];
+                    results = _a.sent();
+                    return [2 /*return*/, results[0] ? results[0].results : []];
             }
@@ -76,26 +75,2 @@ });
 exports.verify = verify;
-function fix(html, config, rules, locale) {
-    return __awaiter(this, void 0, void 0, function () {
-        var totalResults, result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, exec({
-                        sourceCodes: html,
-                        config: config,
-                        rules: rules,
-                        locale: locale,
-                        fix: true,
-                    })];
-                case 1:
-                    totalResults = _a.sent();
-                    result = totalResults[0];
-                    if (!result) {
-                        return [2 /*return*/, html];
-                    }
-                    return [2 /*return*/, result.fixedCode];
-            }
-        });
-    });
-}
-exports.fix = fix;
 function exec(options) {
@@ -111,3 +86,3 @@ return __awaiter(this, void 0, void 0, function () {
                     _c = [files];
-                    return [4 /*yield*/, file_resolver_1.getFiles(options.files)];
+                    return [4 /*yield*/, file_resoliver_1.getFiles(options.files)];
                 case 1:
@@ -122,3 +97,3 @@ _b.apply(_a, _c.concat([(_h.sent())]));
                         codes = Array.isArray(options.sourceCodes) ? options.sourceCodes : [options.sourceCodes];
-                        files.push.apply(files, codes.map(function (code) { return file_resolver_1.getAnonymousFile(code, options.workspace); }));
+                        files.push.apply(files, codes.map(function (code) { return file_resoliver_1.getAnonymousFile(code); }));
                     }
@@ -131,3 +106,3 @@ _h.label = 3;
                     if (!(typeof options.config === 'string')) return [3 /*break*/, 5];
-                    return [4 /*yield*/, file_resolver_1.loadConfigFile(options.config)];
+                    return [4 /*yield*/, file_resoliver_1.loadConfigFile(options.config)];
                 case 4:
@@ -139,3 +114,3 @@ configSet = _h.sent();
                     _files = new Set([filePath]);
-                    return [4 /*yield*/, file_resolver_1.recursiveLoad(options.config, filePath, _files, true)];
+                    return [4 /*yield*/, file_resoliver_1.recursiveLoad(options.config, filePath, _files, true)];
                 case 6:
@@ -159,3 +134,3 @@ configSet = _h.sent();
                     file = files_2[_d];
-                    return [4 /*yield*/, file_resolver_1.searchConfigFile(file.path)];
+                    return [4 /*yield*/, file_resoliver_1.searchConfigFile(file.path)];
                 case 10:
@@ -167,4 +142,4 @@ configSet = _h.sent();
                 case 11:
-                    if (!!configSetNearbyCWD) return [3 /*break*/, 13];
-                    return [4 /*yield*/, file_resolver_1.searchConfigFile(process.cwd())];
+                    if (!configSetNearbyCWD) return [3 /*break*/, 13];
+                    return [4 /*yield*/, file_resoliver_1.searchConfigFile(process.cwd())];
                 case 12:
@@ -240,3 +215,3 @@ configSetNearbyCWD = _h.sent();
                     core = new ml_core_1.MLCore(parser, sourceCode, specs, ruleset, rules, messenger);
-                    return [4 /*yield*/, core.verify(!!options.fix)];
+                    return [4 /*yield*/, core.verify()];
                 case 28:
@@ -248,7 +223,4 @@ results = _h.sent();
                         sourceCode: sourceCode,
-                        fixedCode: core.document.toString(),
-                        document: core.document,
                         parser: parserModName,
                         locale: options.locale,
-                        ruleset: ruleset,
                         configSet: {
@@ -255,0 +227,0 @@ config: configSet.config,

lib/reporter/reporter.js

 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -9,0 +8,0 @@ });

package.json

 {
 	"name": "markuplint",
-	"version": "1.0.0-alpha.13",
+	"version": "1.0.0-alpha.14",
 	"description": "A Linter for All Markup Languages.",
@@ -37,3 +37,3 @@ "author": "Yusuke Hirao",
 		"@markuplint/ml-spec": "^1.0.0-alpha.3",
-		"@markuplint/rules": "^1.0.0-alpha.7",
+		"@markuplint/rules": "^1.0.0-alpha.8",
 		"cli-color": "^1.4.0",
@@ -46,3 +46,3 @@ "eastasianwidth": "^0.2.0",
 	},
-	"gitHead": "f5aac1a89a1de8e937caf49a23244e72638c6ca1"
+	"gitHead": "3d479569e6abbba0da3f7851d72f2e902509dad6"
 }

Fixed alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

280461

increased by29.9%

Number of low supply chain risk alerts

4

decreased by-20%

Worsened metrics

Lines of code

813

decreased by-6.55%

Dependency changes

• Updated@markuplint/rules@^1.0.0-alpha.8