@plumeria/eslint-plugin 7.5.2 → 7.5.4

package/dist/rules/sort-properties.js

@@ -42,6 +42,36 @@ function getPropertyIndex(property, isTopLevel) {
     }
     return lastGroupIndex * 1000 + maxPropIndex + 1;
 }
+function getLIS(arr) {
+    const n = arr.length;
+    if (n === 0)
+        return [];
+    const dp = new Array(n).fill(1);
+    const parent = new Array(n).fill(-1);
+    for (let i = 0; i < n; i++) {
+        for (let j = 0; j < i; j++) {
+            if (arr[j] < arr[i] && dp[j] + 1 > dp[i]) {
+                dp[i] = dp[j] + 1;
+                parent[i] = j;
+            }
+        }
+    }
+    let maxLen = 0;
+    let bestEndIdx = 0;
+    for (let i = 0; i < n; i++) {
+        if (dp[i] > maxLen) {
+            maxLen = dp[i];
+            bestEndIdx = i;
+        }
+    }
+    const result = [];
+    let curr = bestEndIdx;
+    while (curr !== -1) {
+        result.push(curr);
+        curr = parent[curr];
+    }
+    return result.reverse();
+}
 exports.sortProperties = {
     meta: {
         type: 'suggestion',
@@ -87,15 +117,24 @@ exports.sortProperties = {
                     });
                 })
                     .flat();
-                const misordered = properties.filter((prop, i) => prop !== sorted[i]);
-                if (misordered.length === 0)
+                const propertyToIndexInSorted = new Map();
+                sorted.forEach((prop, index) => {
+                    propertyToIndexInSorted.set(prop, index);
+                });
+                const targetPositions = properties.map((prop) => propertyToIndexInSorted.get(prop));
+                const lisIndices = new Set(getLIS(targetPositions));
+                const misorderedIndices = properties
+                    .map((_, i) => i)
+                    .filter((i) => !lisIndices.has(i));
+                if (misorderedIndices.length === 0)
                     return;
                 const match = sourceCode.getText(node).match(/^{\s*\n(\s*)/);
                 const indent = match ? match[1] : '';
                 const lineEnding = match ? '\n' : ' ';
                 const closingIndentMatch = sourceCode.getText(node).match(/\n(\s*)}$/);
                 const closingIndent = closingIndentMatch ? closingIndentMatch[1] : '';
-                misordered.forEach((prop) => {
+                misorderedIndices.forEach((i) => {
+                    const prop = properties[i];
                     context.report({
                         node: prop,
                         messageId: 'sortProperties',

package/oxlint.json

@@ -4,6 +4,7 @@
   "ignorePatterns": ["**/*.svelte", "**/*.vue"],
 
   "rules": {
+    "@plumeria/no-combinator": "error",
     "@plumeria/no-destructure": "error",
     "@plumeria/no-inner-call": "error",
     "@plumeria/no-unused-keys": "warn",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/eslint-plugin",
-  "version": "7.5.2",
+  "version": "7.5.4",
   "description": "Plumeria ESLint plugin",
   "author": "Refirst 11",
   "license": "MIT",