eslint-plugin-toml 0.1.0 → 0.3.1

package/lib/rules/tables-order.js

@@ -9,18 +9,18 @@ const utils_1 = require("../utils");
 function getFirst(keys) {
     const first = keys[0];
     if (first) {
-        return getFirst(first.keys) || first.firstNode;
+        return getFirst(first.keys) || first.node;
     }
     return null;
 }
 function getLast(keys) {
     const last = lodash_1.default.last(keys);
     if (last) {
-        return getLast(last.keys) || last.lastNode;
+        return getLast(last.keys) || last.node;
     }
     return null;
 }
-exports.default = utils_1.createRule("tables-order", {
+exports.default = (0, utils_1.createRule)("tables-order", {
     meta: {
         docs: {
             description: "disallow defining tables out-of-order",
@@ -41,40 +41,27 @@ exports.default = utils_1.createRule("tables-order", {
         }
         const sourceCode = context.getSourceCode();
         function applyKey(rootKeys, node) {
-            const keyNames = toml_eslint_parser_1.getStaticTOMLValue(node.key);
+            const keyNames = [...node.resolvedKey];
             let before = null;
             let keys = rootKeys;
             while (keyNames.length) {
                 const key = keyNames.shift();
                 const isLast = !keyNames.length;
-                const nextIndex = keys.findIndex((e) => e.key === key);
-                if (nextIndex < 0) {
-                    const targetNode = isLast ? node : null;
-                    const next = {
+                let next = keys.find((e) => e.key === key);
+                if (!next) {
+                    next = {
                         key,
-                        array: node.kind === "array" && isLast,
-                        firstNode: targetNode,
-                        lastNode: targetNode,
+                        node,
                         keys: [],
                     };
                     if (isLast) {
                         before = getLast(keys);
                     }
                     keys.push(next);
-                    keys = next.keys;
                 }
                 else {
-                    const next = keys[nextIndex];
-                    if (next.array) {
-                        if (isLast) {
-                            before = getLast(next.keys) || next.lastNode;
-                            next.lastNode = node;
-                            next.keys = [];
-                            break;
-                        }
-                    }
                     if (isLast) {
-                        if (!next.firstNode && next.keys.length > 0) {
+                        if (next.keys.length > 0) {
                             const after = getFirst(next.keys);
                             return {
                                 before: null,
@@ -83,8 +70,8 @@ exports.default = utils_1.createRule("tables-order", {
                         }
                         before = getLast(keys);
                     }
-                    keys = next.keys;
                 }
+                keys = next.keys;
             }
             return {
                 before,
@@ -104,8 +91,8 @@ exports.default = utils_1.createRule("tables-order", {
                         node: body.key,
                         messageId: "outOfOrderToBefore",
                         data: {
-                            target: toml_eslint_parser_1.getStaticTOMLValue(body.key).join("."),
-                            after: toml_eslint_parser_1.getStaticTOMLValue(after.key).join("."),
+                            target: (0, toml_eslint_parser_1.getStaticTOMLValue)(body.key).join("."),
+                            after: (0, toml_eslint_parser_1.getStaticTOMLValue)(after.key).join("."),
                         },
                         fix(fixer) {
                             const startToken = sourceCode.getTokenBefore(body);
@@ -125,8 +112,8 @@ exports.default = utils_1.createRule("tables-order", {
                         node: body.key,
                         messageId: "outOfOrder",
                         data: {
-                            target: toml_eslint_parser_1.getStaticTOMLValue(body.key).join("."),
-                            before: toml_eslint_parser_1.getStaticTOMLValue(before.key).join("."),
+                            target: (0, toml_eslint_parser_1.getStaticTOMLValue)(body.key).join("."),
+                            before: (0, toml_eslint_parser_1.getStaticTOMLValue)(before.key).join("."),
                         },
                         fix(fixer) {
                             const startToken = sourceCode.getTokenBefore(body);

package/lib/rules/vue-custom-block/no-parsing-error.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
-exports.default = utils_1.createRule("vue-custom-block/no-parsing-error", {
+exports.default = (0, utils_1.createRule)("vue-custom-block/no-parsing-error", {
     meta: {
         docs: {
             description: "disallow parsing errors in Vue custom blocks",

package/lib/types.d.ts

@@ -35,7 +35,7 @@ export interface RuleMetaData {
         url: string;
         ruleId: string;
         ruleName: string;
-        replacedBy?: [];
+        replacedBy?: string[];
         default?: "error" | "warn";
         extensionRule: string | false;
     };
@@ -43,6 +43,7 @@ export interface RuleMetaData {
         [messageId: string]: string;
     };
     fixable?: "code" | "whitespace";
+    hasSuggestions?: boolean;
     schema: JSONSchema4 | JSONSchema4[];
     deprecated?: boolean;
     type: "problem" | "suggestion" | "layout";
@@ -57,7 +58,7 @@ export interface PartialRuleMetaData {
     docs: {
         description: string;
         categories: ("recommended" | "standard")[] | null;
-        replacedBy?: [];
+        replacedBy?: string[];
         default?: "error" | "warn";
         extensionRule: string | false;
     };
@@ -65,6 +66,7 @@ export interface PartialRuleMetaData {
         [messageId: string]: string;
     };
     fixable?: "code" | "whitespace";
+    hasSuggestions?: boolean;
     schema: JSONSchema4 | JSONSchema4[];
     deprecated?: boolean;
     type: "problem" | "suggestion" | "layout";

package/lib/utils/casing.js

@@ -12,13 +12,13 @@ function capitalize(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
 function hasSymbols(str) {
-    return /[!"#%&'()*+,./:;<=>?@[\\\]^`{|}]/u.exec(str);
+    return /[\u0021-\u0023\u0025-\u002c./\u003a-\u0040\u005b-\u005e`\u007b-\u007d]/u.test(str);
 }
 function hasUpper(str) {
-    return /[A-Z]/u.exec(str);
+    return /[A-Z]/u.test(str);
 }
 function hasLower(str) {
-    return /[a-z]/u.exec(str);
+    return /[a-z]/u.test(str);
 }
 function kebabCase(str) {
     let res = str.replace(/_/gu, "-");
@@ -31,8 +31,8 @@ exports.kebabCase = kebabCase;
 function isKebabCase(str) {
     if (hasUpper(str) ||
         hasSymbols(str) ||
-        /^-/u.exec(str) ||
-        /_|--|\s/u.exec(str)) {
+        str.startsWith("-") ||
+        /_|--|\s/u.test(str)) {
         return false;
     }
     return true;
@@ -47,7 +47,7 @@ function snakeCase(str) {
 }
 exports.snakeCase = snakeCase;
 function isSnakeCase(str) {
-    if (hasUpper(str) || hasSymbols(str) || /-|__|\s/u.exec(str)) {
+    if (hasUpper(str) || hasSymbols(str) || /-|__|\s/u.test(str)) {
         return false;
     }
     return true;
@@ -62,7 +62,7 @@ function screamingSnakeCase(str) {
 }
 exports.screamingSnakeCase = screamingSnakeCase;
 function isScreamingSnakeCase(str) {
-    if (hasLower(str) || hasSymbols(str) || /-|__|\s/u.exec(str)) {
+    if (hasLower(str) || hasSymbols(str) || /-|__|\s/u.test(str)) {
         return false;
     }
     return true;
@@ -81,8 +81,8 @@ function camelCase(str) {
 exports.camelCase = camelCase;
 function isCamelCase(str) {
     if (hasSymbols(str) ||
-        /^[A-Z]/u.exec(str) ||
-        /-|_|\s/u.exec(str)) {
+        /^[A-Z]/u.test(str) ||
+        /[\s\-_]/u.test(str)) {
         return false;
     }
     return true;
@@ -94,8 +94,8 @@ function pascalCase(str) {
 exports.pascalCase = pascalCase;
 function isPascalCase(str) {
     if (hasSymbols(str) ||
-        /^[a-z]/u.exec(str) ||
-        /-|_|\s/u.exec(str)) {
+        /^[a-z]/u.test(str) ||
+        /[\s\-_]/u.test(str)) {
         return false;
     }
     return true;

package/lib/utils/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -26,7 +30,7 @@ exports.getCoreRule = exports.convertESNode = exports.getProxyNode = exports.def
 const tomlESLintParser = __importStar(require("toml-eslint-parser"));
 const debug_1 = __importDefault(require("debug"));
 const path_1 = __importDefault(require("path"));
-const log = debug_1.default("eslint-plugin-toml:utils/index");
+const log = (0, debug_1.default)("eslint-plugin-toml:utils/index");
 function createRule(ruleName, rule) {
     return {
         meta: Object.assign(Object.assign({}, rule.meta), { docs: Object.assign(Object.assign({}, rule.meta.docs), { url: `https://ota-meshi.github.io/eslint-plugin-toml/rules/${ruleName}.html`, ruleId: `toml/${ruleName}`, ruleName }) }),

package/lib/utils/rules.js

@@ -10,6 +10,7 @@ const array_element_newline_1 = __importDefault(require("../rules/array-element-
 const comma_style_1 = __importDefault(require("../rules/comma-style"));
 const indent_1 = __importDefault(require("../rules/indent"));
 const inline_table_curly_spacing_1 = __importDefault(require("../rules/inline-table-curly-spacing"));
+const key_spacing_1 = __importDefault(require("../rules/key-spacing"));
 const keys_order_1 = __importDefault(require("../rules/keys-order"));
 const no_mixed_type_in_array_1 = __importDefault(require("../rules/no-mixed-type-in-array"));
 const no_non_decimal_integer_1 = __importDefault(require("../rules/no-non-decimal-integer"));
@@ -32,6 +33,7 @@ exports.rules = [
     comma_style_1.default,
     indent_1.default,
     inline_table_curly_spacing_1.default,
+    key_spacing_1.default,
     keys_order_1.default,
     no_mixed_type_in_array_1.default,
     no_non_decimal_integer_1.default,

package/package.json

@@ -1,18 +1,21 @@
 {
     "name": "eslint-plugin-toml",
-    "version": "0.1.0",
+    "version": "0.3.1",
     "description": "This ESLint plugin provides linting rules for TOML.",
     "main": "lib/index.js",
     "files": [
         "lib"
     ],
+    "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+    },
     "scripts": {
         "prebuild": "npm run -s clean",
         "build": "npm run build:ts",
         "build:ts": "tsc --project ./tsconfig.build.json",
         "clean": "rimraf .nyc_output dist coverage",
-        "lint": "eslint \"tests\" \"src\" \"docs\" --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml",
-        "eslint-fix": "eslint \"tests\" \"src\" \"docs\" --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml --fix",
+        "lint": "eslint . --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml --ignore-pattern playground",
+        "eslint-fix": "eslint . --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml --ignore-pattern playground --fix",
         "pretest:base": "cross-env DEBUG=eslint-plugin-toml*",
         "test:base": "mocha --require ts-node/register \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
         "test": "npm run test:base",
@@ -23,8 +26,8 @@
         "predocs:watch": "npm run build:ts",
         "docs:watch": "vuepress dev --debug docs",
         "docs:build": "npm run build:ts && vuepress build docs --no-cache",
-        "preversion": "npm test && npm run update && git add .",
-        "version": "npm run eslint-fix && git add ."
+        "preversion": "npm test && git add .",
+        "version": "env-cmd -e version npm run update && git add ."
     },
     "repository": {
         "type": "git",
@@ -39,6 +42,7 @@
         "formatter"
     ],
     "author": "Yosuke Ota",
+    "funding": "https://github.com/sponsors/ota-meshi",
     "license": "MIT",
     "bugs": {
         "url": "https://github.com/ota-meshi/eslint-plugin-toml/issues"
@@ -50,48 +54,50 @@
     "dependencies": {
         "debug": "^4.1.1",
         "lodash": "^4.17.19",
-        "toml-eslint-parser": "^0.1.1"
+        "toml-eslint-parser": "^0.4.0"
     },
     "devDependencies": {
-        "@ota-meshi/eslint-plugin": "^0.0.11",
+        "@ota-meshi/eslint-plugin": "^0.10.0",
         "@types/debug": "^4.1.5",
-        "@types/eslint": "^7.2.0",
+        "@types/eslint": "^8.0.0",
         "@types/eslint-scope": "^3.7.0",
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@types/estree": "^0.0.46",
+        "@types/estree": "^0.0.51",
         "@types/lodash": "^4.14.158",
-        "@types/mocha": "^8.0.0",
-        "@types/node": "^14.0.13",
+        "@types/mocha": "^9.0.0",
+        "@types/node": "^16.11.3",
         "@types/semver": "^7.3.1",
-        "@typescript-eslint/eslint-plugin": "^4.4.1",
-        "@typescript-eslint/parser": "^4.4.1",
-        "babel-eslint": "^10.1.0",
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "@typescript-eslint/parser": "^5.0.0",
         "cross-env": "^7.0.2",
-        "eslint": "^7.3.0",
-        "eslint-config-prettier": "^7.0.0",
+        "env-cmd": "^10.1.0",
+        "eslint": "^8.0.0",
+        "eslint-config-prettier": "^8.0.0",
         "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-eslint-plugin": "^2.3.0",
-        "eslint-plugin-jsonc": "^0.8.1",
+        "eslint-plugin-eslint-plugin": "^4.0.0",
+        "eslint-plugin-json-schema-validator": "^2.0.0",
+        "eslint-plugin-jsonc": "^2.0.0",
         "eslint-plugin-markdown": "^2.0.0-0",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-prettier": "^3.1.4",
-        "eslint-plugin-regexp": "^0.1.1",
-        "eslint-plugin-vue": "^7.0.1",
-        "eslint-plugin-yml": "^0.6.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "eslint-plugin-regexp": "^1.0.0",
+        "eslint-plugin-vue": "^8.0.0",
+        "eslint-plugin-yml": "^0.14.0",
         "eslint4b": "^7.3.1",
-        "espree": "^7.1.0",
-        "mocha": "^8.0.0",
+        "espree": "^9.0.0",
+        "mocha": "^9.0.0",
         "nyc": "^15.1.0",
         "prettier": "^2.2.1",
         "raw-loader": "^4.0.1",
         "semver": "^7.3.2",
-        "stylelint": "^13.6.1",
-        "stylelint-config-standard": "^20.0.0",
-        "stylelint-plugin-stylus": "^0.9.0",
-        "ts-node": "^9.0.0",
-        "typescript": "^4.0.0",
+        "stylelint": "^14.0.0",
+        "stylelint-config-recommended-vue": "^1.0.0",
+        "stylelint-config-standard": "^25.0.0",
+        "stylelint-plugin-stylus": "^0.13.0",
+        "ts-node": "^10.0.0",
+        "typescript": "~4.6.0",
         "vue-eslint-editor": "^1.1.0",
-        "vue-eslint-parser": "^7.3.0",
+        "vue-eslint-parser": "^8.0.0",
         "vuepress": "^1.5.2"
     }
 }