eslint-plugin-lube 0.4.3 → 0.5.1

package/rules/pretty-sequence.js

@@ -1,17 +1,17 @@
 "use strict"
 
-let indent_regex = /[ \t]*(?=[^\n]*$)/
-let left_space_regex = /\s+$/
-let right_space_regex = /^\s+/
-let __n_regex = /(?<=\n)/g
-let _r_regex = /\r/g
+const indent_regex = /[ \t]*(?=[^\n]*$)/
+const left_space_regex = /\s+$/
+const right_space_regex = /^\s+/
+const __n_regex = /(?<=\n)/g
+const _r_regex = /\r/g
 
 /**
  * @param {number} length
  * @returns {number[]}
  */
 function get_indexed_array(length) {
-	let array = []
+	const array = []
 	while (length) array[--length] = length
 	return array
 }
@@ -49,33 +49,33 @@ module.exports = {
 	},
 	create(context) {
 		/** @type {import("../private").RuleOptions["pretty-sequence"]} */
-		let option = context.options[0]
-		let array_bracket_spacing = option?.arrayBracketSpacing ?? true
-		let check_array = option?.checkArray ?? true
-		let check_call = option?.checkCall ?? true
-		let check_object = option?.checkObject ?? true
-		let check_sequence = option?.checkSequence ?? true
-		let func_call_spacing = option?.funcCallSpacing ?? false
-		let ignore_template_literal = option?.ignoreTemplateLiteral ?? true
-		let indent = option?.indent ?? "\t"
-		let max_length = option?.maxLength ?? 30
-		let object_curly_spacing = option?.objectCurlySpacing ?? true
+		const option = context.options[0]
+		const array_bracket_spacing = option?.arrayBracketSpacing ?? true
+		const check_array = option?.checkArray ?? true
+		const check_call = option?.checkCall ?? true
+		const check_object = option?.checkObject ?? true
+		const check_sequence = option?.checkSequence ?? true
+		const func_call_spacing = option?.funcCallSpacing ?? false
+		const ignore_template_literal = option?.ignoreTemplateLiteral ?? true
+		const indent = option?.indent ?? "\t"
+		const max_length = option?.maxLength ?? 30
+		const object_curly_spacing = option?.objectCurlySpacing ?? true
 
-		let source_code = context.sourceCode
-		let origin_text = source_code.text
+		const source_code = context.sourceCode
+		const origin_text = source_code.text
 		let fixed_text = origin_text
-		let text_length = fixed_text.length + 1
-		let text_indexes = get_indexed_array(text_length)
+		const text_length = fixed_text.length + 1
+		const text_indexes = get_indexed_array(text_length)
 		/** @type {import("../private").Comment[]} */
-		let comments = []
-		for (let comment of /** @type {import("../private").Comment[]} */(source_code.getAllComments())/**/) {
+		const comments = []
+		for (const comment of /** @type {import("../private").Comment[]} */(source_code.getAllComments())/**/) {
 			let [ start, end ] = comment.range
 			while (start < end) comments[start++] = comment
 		}
 		/** @type {true[]} */
-		let ignored_indexes = []
+		const ignored_indexes = []
 		/** @type {import("../private").AstNode[] & import("estree").Expression[]} */
-		let nodes = []
+		const nodes = []
 
 		/**
 		 * @param {import("../private").AstNode} node
@@ -87,21 +87,23 @@ module.exports = {
 		function get_text(node, start, end, add_indentation) {
 			let open_paren = false
 			let [ left, right ] = node.range
+			let comment
 			W: while (left > start) {
-				if (comments[left - 1]) {
-					left = comments[left - 1].range[0]
+				comment = comments[left - 1]
+				if (comment) {
+					left = comment.range[0]
 				} else {
-					let left_space = left_space_regex.exec(origin_text.slice(0, left))?.[0].length
+					const left_space = left_space_regex.exec(origin_text.slice(0, left))?.[0].length
 					if (left_space) {
 						left -= left_space
 					} else if (origin_text[left - 1] == "(") {
 						open_paren = true
 						while (right < end) {
-							if (comments[right]) {
-								let comment = comments[right]
+							comment = comments[right]
+							if (comment) {
 								right = comment.range[1]
 							} else {
-								let right_space = right_space_regex.exec(origin_text.slice(right))?.[0].length
+								const right_space = right_space_regex.exec(origin_text.slice(right))?.[0].length
 								if (right_space) {
 									right += right_space
 								} else {
@@ -121,11 +123,11 @@ module.exports = {
 				}
 			}
 			while (right < end) {
-				if (comments[right]) {
-					let comment = comments[right]
+				comment = comments[right]
+				if (comment) {
 					right = comment.range[1]
 				} else {
-					let right_space = right_space_regex.exec(origin_text.slice(right))?.[0].length
+					const right_space = right_space_regex.exec(origin_text.slice(right))?.[0].length
 					if (right_space) {
 						right += right_space
 					} else {
@@ -133,7 +135,7 @@ module.exports = {
 					}
 				}
 			}
-			let substr = fixed_text.slice(
+			const substr = fixed_text.slice(
 				text_indexes[left],
 				text_indexes[right]
 			)
@@ -162,8 +164,11 @@ module.exports = {
 		 * @returns {void}
 		 */
 		function report(node, start, end, corrected_text) {
-			fixed_text = fixed_text.slice(0, text_indexes[start]) + corrected_text + fixed_text.slice(text_indexes[end])
-			let gap = corrected_text.length + text_indexes[start] - text_indexes[end]
+			const s = text_indexes[start]
+			const e = text_indexes[end]
+			if (s == null || e == null) return
+			fixed_text = fixed_text.slice(0, s) + corrected_text + fixed_text.slice(e)
+			const gap = corrected_text.length + s - e
 			if (gap) {
 				for (let i = end; i < text_length; i++) {
 					text_indexes[i] += gap
@@ -202,21 +207,21 @@ module.exports = {
 			let line_indent = get_indent(node.range[0])
 			switch (node.type) {
 			case "ArrayExpression":
-			case "ArrayPattern":
+			case "ArrayPattern": {
 				start = node.range[0] + 1
 				end = node.range[1] - 1
 				let null_anchor = start
-				let elements = node.elements.map(
+				const elements = node.elements.map(
 					v => {
-						let n = v ?? {
+						const n = v ?? {
 							range: [ null_anchor, null_anchor ]
 						}
-						let text = get_text(n, start, end)
+						const text = get_text(n, start, end)
 						null_anchor += text.length + 1
 						return n
 					}
 				)
-				for (let text of elements.map(v => get_text(v, start, end))) {
+				for (const text of elements.map(v => get_text(v, start, end))) {
 					if (text.includes("\n")) {
 						length = max_length + 1
 						break
@@ -239,26 +244,30 @@ module.exports = {
 						elements.map(v => get_text(v, start, end)).join(", ")
 					}${length && array_bracket_spacing ? " " : ""}`
 				break
+			}
 			case "ArrowFunctionExpression":
 			case "FunctionDeclaration":
 			case "FunctionExpression":
 				if (node.type == "ArrowFunctionExpression") {
 					if (
-						node.params.length != 1
+						node.params.length > 1
 						|| origin_text.slice(
 							node.range[0],
-							node.params[0].range[0]
+							node.params[0]?.range[0]
 						).includes("(")
 					) {
 						start = origin_text.indexOf("(", node.range[0]) + 1
 						end = origin_text.indexOf(
 							")",
 							node.params.length
-								? node.params[node.params.length - 1].range[1]
+								? node.params[node.params.length - 1]?.range[1]
 								: start
 						)
 					} else {
-						[ start, end ] = node.params[0].range
+						const range = node.params[0]?.range
+						if (range) {
+							[ start, end ] = range
+						}
 					}
 				} else {
 					start = node.id
@@ -267,11 +276,11 @@ module.exports = {
 					end = origin_text.indexOf(
 						")",
 						node.params.length
-							? node.params[node.params.length - 1].range[1]
+							? node.params[node.params.length - 1]?.range[1]
 							: start
 					)
 				}
-				for (let text of node.params.map(v => get_text(v, start, end))) {
+				for (const text of node.params.map(v => get_text(v, start, end))) {
 					if (text.includes("\n")) {
 						length = max_length + 1
 						break
@@ -300,7 +309,7 @@ module.exports = {
 				line_indent = get_indent(node.callee.range[1])
 				start = origin_text.indexOf("(", node.callee.range[1]) + 1
 				end = node.range[1] - 1
-				for (let text of node.arguments.map(v => get_text(v, start, end))) {
+				for (const text of node.arguments.map(v => get_text(v, start, end))) {
 					if (text.includes("\n")) {
 						length = max_length + 1
 						break
@@ -327,7 +336,7 @@ module.exports = {
 			case "ObjectPattern":
 				start = node.range[0] + 1
 				end = node.range[1] - 1
-				for (let text of node.properties.map(v => get_text(v, start, end))) {
+				for (const text of node.properties.map(v => get_text(v, start, end))) {
 					if (text.includes("\n")) {
 						length = max_length + 1
 						break
@@ -354,7 +363,7 @@ module.exports = {
 			case "SequenceExpression":
 				start = node.range[0]
 				end = node.range[1]
-				for (let text of node.expressions.map(v => get_text(v, start, end))) {
+				for (const text of node.expressions.map(v => get_text(v, start, end))) {
 					if (text.includes("\n")) {
 						length = max_length + 1
 						break
@@ -384,7 +393,7 @@ module.exports = {
 		}
 		return /** @type {import("../private").RuleListener} */({
 			"Program:exit": () => {
-				for (let node of nodes.reverse()) {
+				for (const node of nodes.reverse()) {
 					try {
 						verify_correct(node)
 					} catch (error) {

package/rules/svelte-naming-convention.js

@@ -23,21 +23,21 @@ module.exports = {
 	},
 	create(context) {
 		/** @type {import("../private").RuleOptions["svelte-naming-convention"]} */
-		let option = context.options[0]
-		let fix_same_names = option?.fixSameNames ?? true
+		const option = context.options[0]
+		const fix_same_names = option?.fixSameNames ?? true
 
 		// let name | let name | class name
-		let allow_regex = /^[_$]?[_$]?(?:[\da-z]+(?:_[\da-z]+)*\$?\$?)?$|^[A-Z](?:_?[\dA-Z]+)*$|^(?:[\dA-Z][\da-z]*)+$/
-		let fixable_name_regex = /^[_$]?[_$]?(?:[\dA-Za-z]+(?:_[\dA-Za-z]+)*\$?\$?)?$/
-		let fix_regex = /([\da-z]?)([A-Z][\dA-Z]*)/g
-		let camel_case_regex = /^[\da-z]+([A-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]*)*$/
 
 		/** @type {Map<string, import("../private").AstNode[]>} */
-		let pending_usages = new Map()
+		const pending_usages = new Map()
 		/** @type {Set<string>} */
-		let reported_declarations = new Set()
+		const reported_declarations = new Set()
 		/** @type {Set<import("../private").AstNode>} */
-		let shortand_properties = new Set()
+		const shortand_properties = new Set()
 
 		/**
 		 * @param {import("../private").AstNode & import("estree").Identifier} node
@@ -45,7 +45,7 @@ module.exports = {
 		 */
 		function defer(node) {
 			if (fix_same_names) {
-				let name = node.name
+				const name = node.name
 				if (reported_declarations.has(name)) report(node)
 				else {
 					let usages = pending_usages.get(name)
@@ -71,7 +71,7 @@ module.exports = {
 		 * @returns {void}
 		 */
 		function report(node) {
-			let name = node.name
+			const name = node.name
 			context.report(
 				{
 					data: { name },
@@ -90,7 +90,7 @@ module.exports = {
 				}
 			)
 			if (fix_same_names) {
-				let usages = pending_usages.get(name)
+				const usages = pending_usages.get(name)
 				while (usages?.length) {
 					report(
 						/** @type {import("../private").AstNode & import("estree").Identifier} */(usages.pop())/**/
@@ -103,9 +103,9 @@ module.exports = {
 		return {
 			/** @param {import("../private").AstNode & import("estree").Identifier} node */
 			Identifier(node) {
-				let name = node.name
+				const name = node.name
 				if (allow_regex.test(name)) return
-				let parent = node.parent
+				const parent = node.parent
 				switch (parent.type) {
 				case "ArrayExpression":
 					// var value = [ camelCase ]
@@ -227,7 +227,7 @@ module.exports = {
 					break
 				case "ImportSpecifier":
 					// import { imported as local, local2 } from "module"
-					if (parent.local == node && parent.imported.name != parent.local.name) {
+					if (parent.local == node && parent.imported.type == "Identifier" && parent.imported.name != parent.local.name) {
 						// import { imported as camelCase } from "module"
 						report(node)
 					}
@@ -346,10 +346,10 @@ module.exports = {
 					// while (camelCase) {}
 					defer(node)
 					break
-				case "WithStatement":
-					// with (camelCase) {}
-					defer(node)
-					break
+				// case "WithStatement":
+				// 	// with (camelCase) {}
+				// 	defer(node)
+				// 	break
 				case "YieldExpression":
 					// function* func() { yield camelCase }
 					defer(node)

package/test/pretty-imports/ExportNamedDeclaration.js

@@ -11,9 +11,11 @@ exports.module = (valid, invalid) => {
 			export { fff, ggg, hhh, iii, jjj, kkk, lll } from 'module/2'
 			`,
 			options: [ { maxLength: 30 } ],
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		},
 		{
@@ -22,9 +24,11 @@ exports.module = (valid, invalid) => {
 			export { a, b, c };
 			`,
 			options: [ { semicolon: true } ],
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		}
 	)
@@ -37,16 +41,16 @@ exports.module = (valid, invalid) => {
 			`,
 			errors: [
 				{
-					messageId: "exports",
-					type: "ExportNamedDeclaration",
+					column: 4,
 					line: 3,
-					column: 4
+					messageId: "exports",
+					type: "ExportNamedDeclaration"
 				},
 				{
-					messageId: "exports",
-					type: "ExportNamedDeclaration",
+					column: 7,
 					line: 4,
-					column: 7
+					messageId: "exports",
+					type: "ExportNamedDeclaration"
 				}
 			],
 			options: [
@@ -65,9 +69,11 @@ exports.module = (valid, invalid) => {
 		    	lll
 		    } from 'module/2';
 			`,
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		},
 		{
@@ -78,16 +84,16 @@ exports.module = (valid, invalid) => {
 			`,
 			errors: [
 				{
-					messageId: "exports",
-					type: "ExportNamedDeclaration",
+					column: 4,
 					line: 3,
-					column: 4
+					messageId: "exports",
+					type: "ExportNamedDeclaration"
 				},
 				{
-					messageId: "exports",
-					type: "ExportNamedDeclaration",
+					column: 7,
 					line: 4,
-					column: 7
+					messageId: "exports",
+					type: "ExportNamedDeclaration"
 				}
 			],
 			options: [
@@ -106,9 +112,11 @@ exports.module = (valid, invalid) => {
 		      lll
 		    } from 'module/2'
 			`,
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		}
 	)

package/test/pretty-imports/ImportDeclaration.js

@@ -11,9 +11,11 @@ exports.module = (valid, invalid) => {
 			import { fff, ggg, hhh, iii, jjj, kkk, lll } from 'module/2'
 			`,
 			options: [ { maxLength: 30 } ],
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		},
 		{
@@ -24,9 +26,11 @@ import {
 	aaaaa_ddddd
 } from "module";`,
 			options: [ { semicolon: true } ],
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		}
 	)
@@ -39,16 +43,16 @@ import {
 			`,
 			errors: [
 				{
-					messageId: "imports",
-					type: "ImportDeclaration",
+					column: 4,
 					line: 3,
-					column: 4
+					messageId: "imports",
+					type: "ImportDeclaration"
 				},
 				{
-					messageId: "imports",
-					type: "ImportDeclaration",
+					column: 7,
 					line: 4,
-					column: 7
+					messageId: "imports",
+					type: "ImportDeclaration"
 				}
 			],
 			options: [
@@ -67,9 +71,11 @@ import {
 		    	lll
 		    } from 'module/2';
 			`,
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		},
 		{
@@ -80,16 +86,16 @@ import {
 			`,
 			errors: [
 				{
-					messageId: "imports",
-					type: "ImportDeclaration",
+					column: 4,
 					line: 3,
-					column: 4
+					messageId: "imports",
+					type: "ImportDeclaration"
 				},
 				{
-					messageId: "imports",
-					type: "ImportDeclaration",
+					column: 7,
 					line: 4,
-					column: 7
+					messageId: "imports",
+					type: "ImportDeclaration"
 				}
 			],
 			options: [
@@ -108,9 +114,11 @@ import {
 		      lll
 		    } from 'module/2'
 			`,
-			parserOptions: {
-				ecmaVersion: "latest",
-				sourceType: "module"
+			languageOptions: {
+				parserOptions: {
+					ecmaVersion: "latest",
+					sourceType: "module"
+				}
 			}
 		}
 	)

package/test/pretty-imports.js

@@ -1,10 +1,10 @@
 "use strict"
-let { RuleTester } = require("eslint")
+const { RuleTester } = require("eslint")
 
 /** @type {RuleTester.ValidTestCase[]} */
-let valid = []
+const valid = []
 /** @type {RuleTester.InvalidTestCase[]} */
-let invalid = []
+const invalid = []
 
 require(
 	"./pretty-imports/ExportNamedDeclaration"