eslint-plugin-lube 0.1.4 → 0.1.6

package/package.json

@@ -23,5 +23,5 @@
 		"test": "mocha"
 	},
 	"type": "commonjs",
-	"version": "0.1.4"
+	"version": "0.1.6"
 }

package/rules/svelte-naming-convention.js

@@ -9,8 +9,7 @@ module.exports = {
 		},
 		fixable: "code",
 		messages: {
-			not_match: "Identifier '{{name}}' does not match for svelte's naming conventions.",
-			not_match_private: "PrivateIdentifier '#{{name}}' does not match for svelte's naming conventions."
+			not_match: "Identifier '{{name}}' does not match for svelte's naming conventions."
 		},
 		schema: [{
 			properties: {
@@ -45,6 +44,8 @@ module.exports = {
 		const reported_declarations = new Set()
 		/** @type {Map<string, import("../private").ASTNode[]>} */
 		const pending_usages = new Map()
+		/** @type {Set<import("../private").ASTNode>} */
+		const shortand_properties = new Set()
 
 		/** @param {import("../private").ASTNode} node */
 		function defer(node) {
@@ -71,7 +72,8 @@ module.exports = {
 					if (fixable_name_regex.test(name)) {
 						return fixer.replaceTextRange(
 							node.range,
-							node.name.replace(fix_regex, fix_callback)
+							(shortand_properties.has(node) ? node.name + ": " : "")
+								+ node.name.replace(fix_regex, fix_callback)
 						)
 					}
 					return null
@@ -265,7 +267,6 @@ module.exports = {
 				/* MetaProperty */
 				// class Object { camelCase() {} }
 				if ("MethodDefinition" == type) {
-					report(node)
 					return
 				}
 				// new camelCase
@@ -280,18 +281,16 @@ module.exports = {
 				// var value = { key: value }
 				// var { key: value } = value
 				if ("Property" == type) {
-					if (parent.value == node && parent.key.name != parent.value.name) {
+					if (parent.value == node) {
+						if (parent.key.name == parent.value.name) {
+							shortand_properties.add(node)
+						}
 						defer(node)
 					}
 					return
 				}
-				// class Object { key = value }
+				// class Object { camelCase = value }
 				if ("PropertyDefinition" == type) {
-					if (parent.key == node) {
-						report(node)
-					} else {
-						defer(node)
-					}
 					return
 				}
 				// var [ ...camelCase ] = value
@@ -387,24 +386,6 @@ module.exports = {
 					defer(node)
 					return
 				}
-			},
-			/** @param {import("../private").ASTNode} node */
-			PrivateIdentifier(node) {
-				const name = node.name
-				if (allow_regex.test(name)) return
-				const parent = node.parent
-				const type = parent.type
-				// class Object { #camelCase() {} }
-				if ("MethodDefinition" == type) {
-					report(node)
-					return
-				}
-				// class Object { #camelCase = value }
-				if ("PropertyDefinition" == type) {
-					report(node)
-					return
-				}
-				// TODO ?
 			}
 		}
 	}

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

@@ -786,13 +786,19 @@ exports.module = (valid, invalid) => {
 		},
 		// MethodDefinition
 		{
-			code: "class Object { camelCase() {} }",
+			code: `
+			class ObjectB { camelCase() {} }
+			var camelCase
+			`,
 			errors: [{
 				...error,
-				line: 1,
-				column: 16
+				line: 3,
+				column: 8
 			}],
-			output: "class Object { camel_case() {} }",
+			output: `
+			class ObjectB { camelCase() {} }
+			var camel_case
+			`,
 			parserOptions: { ecmaVersion: "latest" }
 		},
 		// NewExpression
@@ -852,6 +858,11 @@ exports.module = (valid, invalid) => {
 					...error,
 					line: 5,
 					column: 23
+				},
+				{
+					...error,
+					line: 6,
+					column: 18
 				}
 			],
 			options: [{ fixSameNames: true }],
@@ -860,46 +871,32 @@ exports.module = (valid, invalid) => {
 			var value = { key: pending_a }
 			var pending_a
 			var value = { key: pending_a }
-			var value = { pendingA }
+			var value = { pendingA: pending_a }
 			`,
 			parserOptions: { ecmaVersion: "latest" }
 		},
 		// PropertyDefinition
 		{
 			code: `
-			class ObjectA { camelCase = deferA }
-			class ObjectB { snake_case = pendingA }
-			var pendingA
-			class ObjectC { snake_case = pendingA }
+			class ObjectB { camelCase = camelCase2 }
+			var camelCase, camelCase2
 			`,
 			errors: [
-				{
-					...error,
-					line: 2,
-					column: 20
-				},
 				{
 					...error,
 					line: 3,
-					column: 33
-				},
-				{
-					...error,
-					line: 4,
 					column: 8
 				},
 				{
 					...error,
-					line: 5,
-					column: 33
+					line: 3,
+					column: 19
 				}
 			],
 			options: [{ fixSameNames: true }],
 			output: `
-			class ObjectA { camel_case = deferA }
-			class ObjectB { snake_case = pending_a }
-			var pending_a
-			class ObjectC { snake_case = pending_a }
+			class ObjectB { camelCase = camelCase2 }
+			var camel_case, camel_case2
 			`,
 			parserOptions: { ecmaVersion: "latest" }
 		},