immosquare-cleaner 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7caffdb6ce093eae93ca5f22d1e25676d935bbd8f034805307d53bd20e69c201
-  data.tar.gz: 3fa0fc3dc8f247f866f89108a13752aee5761b9e0fcb1f62071bb2de3eb35add
+  metadata.gz: 06af1c0a31ef811c54efdd4d3f845317c81f02db83112947da04390fd5c69e6c
+  data.tar.gz: d3c8617e585affa872699e5378ac6c90818d1fe0d6a3fe6f1bbcf62d727c7451
 SHA512:
-  metadata.gz: e94943fb8aedca8ff9d71bd0dcc4a9a4360392806b814b8e72dbed789d37b3bdfe0952c95bf7c19bc3fc26038920de831577d44894f97fa032a5f9e2f6c8bb7c
-  data.tar.gz: 1d27e92164cf050d08421c100af8d181a696ba8b3c0c25648d669ef269cff5b2b724fccf4fe8d40da5785949aa7fc99640dec8797e788640fcf37eda9cadf346
+  metadata.gz: 354c8df2a5913b65613909c4d000161aafb2fcb7ab66b09e1dd909f0df6d6b74c982f44a65c7f10bba1525ceb1a42203f1aa8df37b70eaf2a8bc327efd7b4808
+  data.tar.gz: b0df5b076458f940f997f92bd76643fa472d850c480f88cc9508eccf1fb7ab0cfd8b99429e80ce0d18c9bc85976c52423ae955e48983cfc7d58725d82fc5f641

data/lib/immosquare-cleaner/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareCleaner
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.1".freeze
 end

data/linters/eslint-plugins/align-assignments.mjs

@@ -38,8 +38,6 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //============================================================//
-const hasRequire   = /require\(/
-const spaceMatcher = /(\s*)((?:\|\||&&|\?\?|\+|-|\*|\/|%|&|\^|\||<<|>>|\*\*|>>>)?=)/
 
 const assignmentOperators = ["=", "+=", "-=", "*=", "/=", "%=", "&=", "^=", "|=", "<<=", ">>=", "**=", ">>>=", "||=", "&&=", "??="]
 
@@ -100,35 +98,31 @@ const rule = {
       previousNode = groupNode
     }
 
-    const getPrefix = (node) => {
-      const nodeBefore = isAssignmentExpression(node) ? node.left : node.declarations.find((dcl) => dcl.type === "VariableDeclarator").id
-      return nodeBefore.loc.end.column - nodeBefore.loc.start.column
+    const assignmentTokenOf = (node) => {
+      const left = isAssignmentExpression(node) ? node.left : node.declarations[0]?.id
+      if (!left) return null
+      const token = sourceCode.getTokenAfter(left)
+      return token && assignmentOperators.includes(token.value) ? token : null
     }
 
-    const findAssigment = (node) => {
-      const prefix = getPrefix(node)
-      const source = sourceCode.getText(node)
-      const match  = source.slice(prefix).match(spaceMatcher)
-      return match ? match.index + prefix + match[2].length : null
+    const findAssignment = (node) => {
+      const token = assignmentTokenOf(node)
+      return token ? token.loc.end.column - sourceCode.getFirstToken(node).loc.start.column - 1 : null
     }
 
     const assignmentOnFirstLine = (node) => {
-      if (isAssignmentExpression(node)) return node.left.loc.start.line === node.right.loc.start.line
-
-      const source = sourceCode.getText(node)
-      const lines  = source.split("\n")
-      return lines[0].includes("=")
+      const token = assignmentTokenOf(node)
+      return token && !isMultiline(sourceCode.getFirstToken(node), token)
     }
 
     const areAligned = (maxPos, nodes) => nodes
       .filter(assignmentOnFirstLine)
-      .map((node) => sourceCode.getText(node))
-      .every((source) => source.charAt(maxPos) === "=")
+      .every((node) => findAssignment(node) === maxPos)
 
     const getMaxPos = (nodes) => nodes
       .filter(assignmentOnFirstLine)
-      .map(findAssigment)
-      .reduce((last, current) => Math.max(last, current), [])
+      .map(findAssignment)
+      .reduce((last, current) => Math.max(last, current), 0)
 
     const check = (group) => {
       const maxPos = getMaxPos(group)
@@ -141,27 +135,21 @@ const rule = {
           end:   getLast(group).loc.end
         },
         message: "This group of assignments is not aligned",
-        fix:     (fixer) => group.map((node) => {
-          const tokens          = sourceCode.getTokens(node)
-          const firstToken      = tokens[0]
-          const assignmentToken = tokens.find((token) => assignmentOperators.includes(token.value))
-          const line            = sourceCode.getText(node)
-          const lineIsAligned   = line.charAt(maxPos) === "="
-
-          if (lineIsAligned || !assignmentToken || isMultiline(firstToken, assignmentToken)) return fixer.replaceText(node, line)
+        fix:     (fixer) => group.flatMap((node) => {
+          const firstToken      = sourceCode.getFirstToken(node)
+          const assignmentToken = assignmentTokenOf(node)
+          if (!assignmentToken || isMultiline(firstToken, assignmentToken) || findAssignment(node) === maxPos) return []
+          const previousToken = sourceCode.getTokenBefore(assignmentToken)
+          const gap           = [previousToken.range[1], assignmentToken.range[0]]
+          if (sourceCode.commentsExistBetween(previousToken, assignmentToken)) return []
 
           //============================================================//
-          // Source line may include spaces, we need to accomodate
-          // for that.
+          // Only the spacing before the operator belongs to this rule. Replacing a declaration
+          // can cut a template processor's placeholder at an AST boundary inside that marker.
           //============================================================//
-          const spacePrefix    = firstToken.loc.start.column
-          const startDelimiter = assignmentToken.loc.start.column - spacePrefix
-          const endDelimiter   = assignmentToken.loc.end.column - spacePrefix
-          const start          = line.slice(0, startDelimiter).replace(/\s+$/m, "")
-          const ending         = line.slice(endDelimiter).replace(/^\s+/m, "")
-          const spacesRequired = maxPos - start.length - assignmentToken.value.length + 1
-          const spaces         = " ".repeat(spacesRequired)
-          return fixer.replaceText(node, `${start}${spaces}${assignmentToken.value} ${ending}`)
+          const prefixWidth    = previousToken.loc.end.column - firstToken.loc.start.column
+          const spacesRequired = maxPos - prefixWidth - assignmentToken.value.length + 1
+          return [fixer.replaceTextRange(gap, " ".repeat(spacesRequired))]
         })
       })
     }
@@ -169,7 +157,7 @@ const rule = {
     return {
       VariableDeclaration: (node) => {
         const source = sourceCode.getText(node)
-        if (requiresOnly && !hasRequire.test(source)) return
+        if (requiresOnly && !source.includes("require(")) return
 
         addNode(node, node)
       },

data/package.json

@@ -7,7 +7,7 @@
   ],
   "private":      true,
   "dependencies": {
-    "@babel/parser":                    "^8.0.7",
+    "@babel/parser":                    "^8.0.8",
     "@eslint/js":                       "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^8.72.0",
     "@typescript-eslint/parser":        "^8.72.0",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-cleaner
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - immosquare