oxlint-plugin-arch 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.2
+
+- Fix `chain-newline` reporting already-wrapped chains whose root is parenthesized, like `(db as TestDb)\n  .insertInto()`, spans several lines, or has a comment between two links.
+- Autofix `call-array-multiline` arrays with parenthesized elements, like `Promise.all([(a), (b)])`.
+
 ## 0.3.1
 
 - Fix `key-value-same-line` reporting `key: (` values whose parenthesized expression starts on the next line.

package/dist/index.js

@@ -815,32 +815,43 @@ function callArrayMultilineIsShadowed(context, root) {
   }
   return false;
 }
-function callArrayMultilineEdits(array, text, elementIndent, baseIndent, newline) {
+function callArrayMultilineOuterRange(source, node) {
+  let range = [node.range[0], node.range[1]];
+  let before = source.getTokenBefore(node);
+  let after = source.getTokenAfter(node);
+  while (before?.value === "(" && after?.value === ")") {
+    range = [before.range[0], after.range[1]];
+    before = source.getTokenBefore(before);
+    after = source.getTokenAfter(after);
+  }
+  return range;
+}
+function callArrayMultilineEdits(array, source, text, elementIndent, baseIndent, newline) {
   const elements = array.elements;
   if (elements.some((element) => element === null))
     return null;
-  const present = elements.filter((element) => element !== null);
+  const present = elements.filter((element) => element !== null).map((element) => callArrayMultilineOuterRange(source, element));
   const first = present[0];
   const last = present.at(-1);
   if (!first || !last)
     return null;
   const edits = [];
-  const openingRange = [array.range[0] + 1, first.range[0]];
+  const openingRange = [array.range[0] + 1, first[0]];
   if (!/^\s*$/.test(text.slice(...openingRange)))
     return null;
   edits.push({ range: openingRange, text: `${newline}${elementIndent}` });
   for (let index = 1;index < present.length; index++) {
     const previous = present[index - 1];
     const current = present[index];
-    const gap = text.slice(previous.range[1], current.range[0]);
+    const gap = text.slice(previous[1], current[0]);
     if (!/^,\s*$/.test(gap))
       return null;
     edits.push({
-      range: [previous.range[1] + 1, current.range[0]],
+      range: [previous[1] + 1, current[0]],
       text: `${newline}${elementIndent}`
     });
   }
-  const closingRange = [last.range[1], array.range[1] - 1];
+  const closingRange = [last[1], array.range[1] - 1];
   const closingGap = text.slice(...closingRange);
   if (!/^,?\s*$/.test(closingGap))
     return null;
@@ -898,7 +909,7 @@ var callArrayMultiline = defineRule({
         const text = source.text;
         const baseIndent = layoutLineIndent(text, array.range[0]);
         const hasComments = source.getCommentsInside(array).length > 0;
-        const edits = hasComments ? null : callArrayMultilineEdits(array, text, baseIndent + indentUnit, baseIndent, newline);
+        const edits = hasComments ? null : callArrayMultilineEdits(array, source, text, baseIndent + indentUnit, baseIndent, newline);
         context.report({
           node: array,
           messageId: "multiline",
@@ -1011,7 +1022,7 @@ var chainNewline = defineRule2({
           return;
         const source = context.sourceCode;
         const text = source.text;
-        const chainIndent = layoutLineIndent(text, root.range[0]) + indentUnit;
+        const chainIndent = layoutLineIndent(text, node.range[0]) + indentUnit;
         const replacements = [];
         let fixable = true;
         let needsFix = false;
@@ -1021,14 +1032,19 @@ var chainNewline = defineRule2({
             needsFix = true;
             continue;
           }
-          const range = [link.member.object.range[1], link.member.property.range[0]];
+          const operatorToken = source.getTokenBefore(link.member.property);
+          const objectEnd = (operatorToken && source.getTokenBefore(operatorToken)) ?? link.member.object;
+          const range = [objectEnd.range[1], link.member.property.range[0]];
           const gap = text.slice(...range);
           const operator = link.member.optional ? "?." : ".";
           const expected = `${newline}${chainIndent}${operator}`;
-          if (source.commentsExistBetween(link.member.object, link.member.property) || gap.trim() !== operator) {
+          const hasComments = source.commentsExistBetween(objectEnd, link.member.property);
+          if (hasComments || gap.trim() !== operator) {
             fixable = false;
           }
-          if (gap !== expected) {
+          const lastComment = hasComments && operatorToken ? source.getTokenBefore(operatorToken, { includeComments: true }) : null;
+          const alignedAfterComment = lastComment !== null && text.slice(lastComment.range[1], link.member.property.range[0]) === expected;
+          if (gap !== expected && !alignedAfterComment) {
             needsFix = true;
             replacements.push({ range, text: expected });
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlint-plugin-arch",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Configurable architecture rules for Oxlint JavaScript plugins.",
   "type": "module",
   "main": "./dist/index.js",