fix: objects indent and line break

ahmadkzx · Mar 12, 2023 · 416e40a · 416e40a
1 parent a4d3836
commit 416e40a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/rules/waterfall-objects.js b/src/rules/waterfall-objects.js
@@ -1,4 +1,4 @@
-const { sortByLength, getReplaceRange, getNodesTexts } = require('../utils')
+const { sortByLength, getReplaceRange, getNodesTexts, applyObjectPropertiesIndent } = require('../utils')
 
 const WaterfallObjects = {
   meta: {
@@ -48,7 +48,9 @@ const WaterfallObjects = {
         const sortedPropertiesText = getNodesTexts(sortedProperties, src).join('')
 
         if (sortedPropertiesText !== propertiesText) {
-          const text = getNodesTexts(sortedProperties, src)
+          let text = getNodesTexts(sortedProperties, src)
+          text = applyObjectPropertiesIndent(text, /*object node*/ node, src)
+          text = text.join(',\n')
           const range = getReplaceRange(properties)
 
           context.report({
@@ -74,7 +76,9 @@ const WaterfallObjects = {
         const sortedPropertiesText = getNodesTexts(sortedProperties, src).join('')
 
         if (sortedPropertiesText !== propertiesText) {
-          const text = getNodesTexts(sortedProperties, src)
+          let text = getNodesTexts(sortedProperties, src)
+          text = applyObjectPropertiesIndent(text, /*object node*/ node, src)
+          text = text.join(',\n')
           const range = getReplaceRange(properties)
 
           context.report({

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -56,10 +56,40 @@ function fixIndent(str) {
   return lines.join('\n')
 }
 
+/**
+ * Get object properties indent by catch first property indent
+ * @param {string[]} properties
+ * @param objectNode - ESTree AST nodes
+ * @param src - Source context
+ * @returns {string}
+ */
+function applyObjectPropertiesIndent(properties, objectNode, src) {
+  const text = src.getText(objectNode)
+  /*
+   {
+    test: 1,
+    ...
+   }
+  */
+ const lines = text.split('\n') // => ['{', ' test: 1,', ...]
+ const indentStr = lines[1].match(/^\s*/)[0]
+
+ return properties.map((prop, i) => {
+  if (i === 0 /*first prop always has indent*/) {
+    return prop
+  } else {
+    return indentStr + prop
+  }
+ })
+}
+
+
+
 module.exports = {
   fixIndent,
   sortByLength,
   getNodeLength,
   getNodesTexts,
   getReplaceRange,
+  applyObjectPropertiesIndent
 }