@putout/printer 8.17.0 → 8.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/ChangeLog CHANGED
@@ -1,3 +1,8 @@
1
+ 2024.04.19, v8.18.0
2
+
3
+ feature:
4
+ - 8a56e08 @putout/printer: ArrayExpression: SpreadElement after ObjectExpression
5
+
1
6
  2024.04.16, v8.17.0
2
7
 
3
8
  feature:
@@ -36,6 +36,16 @@ const isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
36
36
  const isObjectAfterSpread = (a) => isSpreadElement(a) && isNextObject(a) && !isPrevObject(a);
37
37
  const isObjectAfterIdentifier = (a) => isIdentifier(a) && isNextObject(a) && !isPrevObject(a);
38
38
  const isObjectAfterSimple = (a) => isObjectAfterSpread(a) || isObjectAfterIdentifier(a);
39
+ const isNextSpread = (a) => a.getNextSibling().isSpreadElement();
40
+ const isNextSpreadBetweenObjects = (a) => {
41
+ const next = a.getNextSibling();
42
+ const is = next.isSpreadElement();
43
+
44
+ if (!is)
45
+ return true;
46
+
47
+ return next.getNextSibling().isObjectExpression();
48
+ };
39
49
 
40
50
  const isInsideOneElementArray = ({parentPath}) => parentPath.node.elements.length === 1;
41
51
 
@@ -85,6 +95,10 @@ module.exports.ArrayExpression = {
85
95
 
86
96
  for (const [index, element] of elements.entries()) {
87
97
  const is = isNewLine && isCurrentNewLine(element);
98
+
99
+ if (index && isSpreadElement(element) && !isNextSpread(element) && !isNextObject(element))
100
+ print.newline();
101
+
88
102
  maybe.indent(is);
89
103
  print(element);
90
104
 
@@ -96,7 +110,9 @@ module.exports.ArrayExpression = {
96
110
 
97
111
  if (!is && index < n) {
98
112
  print(',');
99
- print.space();
113
+
114
+ if (isNextSpreadBetweenObjects(element) || !(element.isObjectExpression() && isNextSpread(element)))
115
+ print.space();
100
116
  }
101
117
  }
102
118
 
@@ -116,7 +132,7 @@ module.exports.ArrayExpression = {
116
132
  maybe.indent(elements.length && isNewLine);
117
133
  }
118
134
 
119
- if (isSimpleAndEmptyObject(elements)) {
135
+ if (isSimpleAndEmptyObject(elements) && !isSpreadElement(elements.at(-1))) {
120
136
  print(',');
121
137
  print.breakline();
122
138
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@putout/printer",
3
- "version": "8.17.0",
3
+ "version": "8.18.0",
4
4
  "type": "commonjs",
5
5
  "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
6
6
  "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",