eslint-plugin-lube 0.2.2 → 0.2.4

package/package.json

@@ -22,5 +22,5 @@
 		"test": "mocha"
 	},
 	"type": "commonjs",
-	"version": "0.2.2"
+	"version": "0.2.4"
 }

package/rules/pretty-imports.js

@@ -49,11 +49,33 @@ module.exports = {
 		const text = source_code.text
 
 		const indent_regex = /[ \t]*(?=[^\n]*$)/
+		const _r_regex = /\r/g
 		/** @param {number} index */
 		function get_indent(index) {
 			return text.slice(0, index).match(indent_regex)?.[0] || ""
 		}
 
+		/**
+		 * @overload
+		 * @param {number} start
+		 * @param {number} end
+		 * @returns {string}
+		 *//**
+		 * @overload
+		 * @param {import("../private").ASTNode} node
+		 * @returns {string}
+		 *//**
+		 * @param {import("../private").ASTNode|number} node_or_start
+		 * @param {number} [end]
+		 * @returns {string}
+		 */
+		function get_text(node_or_start, end) {
+			const substr = typeof node_or_start == "number"
+				? text.slice(node_or_start, end)
+				: text.slice(node_or_start.range[0], node_or_start.range[1])
+			return substr.replace(_r_regex, "")
+		}
+
 		/**
 		 * @param {import("../private").ASTNode} node
 		 * @param {string} corrected_text
@@ -80,12 +102,12 @@ module.exports = {
 					let corrected_text = length > max_length
 						? `export {\n${line_indent + indent}${
 							/** @type {import("../private").ASTNode[]} v */
-							(node.specifiers).map(v => text.slice(v.range[0], v.range[1]))
+							(node.specifiers).map(get_text)
 								.join(",\n" + line_indent + indent)
 						}\n${line_indent}}`
 						: `export { ${
 							/** @type {import("../private").ASTNode[]} v */
-							(node.specifiers).map(v => text.slice(v.range[0], v.range[1])).join(", ")
+							(node.specifiers).map(get_text).join(", ")
 						} }`
 					if (node.source) {
 						corrected_text += " from " + node.source.raw
@@ -107,17 +129,17 @@ module.exports = {
 					let corrected_text = length > max_length
 						? `import {\n${line_indent + indent}${
 							/** @type {import("../private").ASTNode[]} v */
-							(node.specifiers).map(v => text.slice(v.range[0], v.range[1]))
+							(node.specifiers).map(get_text)
 								.join(",\n" + line_indent + indent)
 						}\n${line_indent}} from ${node.source.raw}`
 						: `import { ${
 							/** @type {import("../private").ASTNode[]} v */
-							(node.specifiers).map(v => text.slice(v.range[0], v.range[1])).join(", ")
+							(node.specifiers).map(get_text).join(", ")
 						} } from ${node.source.raw}`
 					if (semicolon) {
 						corrected_text += ";"
 					}
-					if (corrected_text != text.slice(node.range[0], node.range[1])) report(node, corrected_text)
+					if (corrected_text != get_text(node)) report(node, corrected_text)
 				}
 			}
 		}

package/rules/svelte-naming-convention.js

@@ -26,7 +26,7 @@ module.exports = {
 		const fix_same_names = /** @type {boolean} */ (context.options[0]?.fixSameNames) ?? true
 
 		// let name | const name | class name
-		const allow_regex = /^[_$]?[_$]?(?:[\da-z]+(?:_[\da-z]+)*\$?\$?)?$|^[A-Z][\dA-Z_]*$|^(?:[\dA-Z][\da-z]*)+$/
+		const allow_regex = /^[_$]?[_$]?(?:[\da-z]+(?:_[\da-z]+)*\$?\$?)?$|^[A-Z](?:_?[\dA-Z]+)*$|^(?:[\dA-Z][\da-z]*)+$/
 		const fixable_name_regex = /^[_$]?[_$]?(?:[\dA-Za-z]+(?:_[\dA-Za-z]+)*\$?\$?)?$/
 		const fix_regex = /([\da-z]?)([A-Z][\dA-Z]*)/g
 		const camel_case_regex = /^[\da-z]+([A-Z][\da-z]*)*$/

package/test/svelte-naming-convention/basic_snake_case.js

@@ -30,5 +30,23 @@ exports.module = (valid, invalid) => {
 			}],
 			output: "var camel_case = 'Hello'"
 		},
+		{
+			code: "var NO_SNAKE__CASE = 'Hello'",
+			errors: [{
+				...error,
+				line: 1,
+				column: 5
+			}],
+			output: "var NO_SNAKE__CASE = 'Hello'"
+		},
+		{
+			code: "var NO_SNAKE_CASE_ = 'Hello'",
+			errors: [{
+				...error,
+				line: 1,
+				column: 5
+			}],
+			output: "var NO_SNAKE_CASE_ = 'Hello'"
+		},
 	)
 }