Update trailingComma to "all" and add npm scripts for "format" and "watch"

Author: ota-meshi

.prettierrc.js

@@ -6,7 +6,7 @@ module.exports = {
 	endOfLine: 'lf',
 	printWidth: 100,
 	singleQuote: true,
-	trailingComma: 'es5',
+	trailingComma: 'all',
 	useTabs: true,
 	overrides: [
 		{

camel-case.js

@@ -6,7 +6,7 @@ function camelCase(str) {
 			? s
 					.replace(/^-(ms|moz|khtml|epub|(\w+-?)*webkit)(?=-)/i, '$1')
 					.replace(/-\w/g, (s) => s[1].toUpperCase())
-			: s
+			: s,
 	);
 }
 

extract.js

@@ -206,7 +206,7 @@ function literalParser(source, opts, styles) {
 			nameSpace
 				.shift()
 				.replace(/^\W+/, '')
-				.split(/[/\\]+/g)
+				.split(/[/\\]+/g),
 		);
 
 		if (types.isIdentifier(id)) {
@@ -432,8 +432,8 @@ function literalParser(source, opts, styles) {
 				(targetStyle) =>
 					targetStyle.opts &&
 					targetStyle.opts.expressions.some(
-						(expr) => expr.start <= style.startIndex && style.endIndex < expr.end
-					)
+						(expr) => expr.start <= style.startIndex && style.endIndex < expr.end,
+					),
 			);
 
 			if (target) {

object-parser.js

@@ -48,7 +48,7 @@ function defineRaws(node, prop, prefix, suffix, props) {
 			prefix,
 			suffix,
 		},
-		props
+		props,
 	);
 }
 
@@ -85,7 +85,7 @@ class objectParser {
 
 		let before = root.source.input.css.slice(
 			startNode.start - startNode.loc.start.column,
-			startNode.start
+			startNode.start,
 		);
 
 		if (/^\s+$/.test(before)) {

package.json

@@ -36,12 +36,14 @@
     ]
   },
   "scripts": {
+    "format": "prettier . --write",
     "lint:formatting": "prettier . --check",
     "lint:js": "eslint .",
     "lint": "npm-run-all --parallel lint:*",
     "pretest": "npm run lint",
     "mocha": "mocha --no-timeouts",
     "test": "nyc npm run mocha",
+    "watch": "mocha --watch",
     "debug": "npm run mocha -- --inspect-brk",
     "release": "np"
   },
@@ -85,6 +87,9 @@
     "*.{js,md,yml}": "prettier --write"
   },
   "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 2019
+    },
     "extends": [
       "stylelint",
       "prettier"

template-parser-helper.js

@@ -48,7 +48,7 @@ function literal(start) {
 		const start = offset + nodeIndex;
 		const end = start + node.text.length;
 		const templateLiteralStyles = input.templateLiteralStyles.filter(
-			(style) => style.startIndex <= end && start < style.endIndex
+			(style) => style.startIndex <= end && start < style.endIndex,
 		);
 
 		if (templateLiteralStyles.length) {
@@ -167,7 +167,7 @@ class LocalFixer {
 			this.object(error.input);
 			error.message = error.message.replace(
 				/:\d+:\d+:/,
-				':' + error.line + ':' + error.column + ':'
+				':' + error.line + ':' + error.column + ':',
 			);
 		}
 
@@ -187,8 +187,8 @@ class LocalFixer {
 					{
 						map: false,
 					},
-					style.opts
-				)
+					style.opts,
+				),
 			);
 		} catch (error) {
 			if (style.ignoreErrors) {

test/camel-case.js

@@ -49,7 +49,7 @@ describe('camelCase', () => {
 		symbols.forEach((symbol) => {
 			it(JSON.stringify(symbol), () => {
 				expect(camelCase(testCases.map((testCase) => testCase.unCamel).join(symbol))).to.equal(
-					testCases.map((testCase) => testCase.camel).join(symbol)
+					testCases.map((testCase) => testCase.camel).join(symbol),
 				);
 			});
 		});
@@ -66,7 +66,7 @@ describe('unCamelCase', () => {
 		symbols.forEach((symbol) => {
 			it(JSON.stringify(symbol), () => {
 				expect(unCamelCase(testCases.map((testCase) => testCase.camel).join(symbol))).to.equal(
-					testCases.map((testCase) => testCase.unCamel).join(symbol)
+					testCases.map((testCase) => testCase.unCamel).join(symbol),
 				);
 			});
 		});

test/css-in-js.js

@@ -62,7 +62,7 @@ describe('CSS in JS', () => {
 			`,
 				{
 					from: '/fixtures/glamorous-atRule.jsx',
-				}
+				},
 			).first.first.first;
 
 			decl.raws.prop.raw = 'WebkitBorderRadius';
@@ -82,7 +82,7 @@ describe('CSS in JS', () => {
 			`,
 				{
 					from: '/fixtures/glamorous-atRule.jsx',
-				}
+				},
 			).first.first.first;
 
 			atRule.raws.params.raw = "(minWidth: ' + minWidth + ')";

test/literals.js

@@ -25,7 +25,7 @@ describe('template literals', () => {
 			expect(decl).have.property('prop', 'border-bottom');
 			expect(decl).have.property(
 				'value',
-				'${(props) => (props.border ? `1px solid ${color}` : "0")}'
+				'${(props) => (props.border ? `1px solid ${color}` : "0")}',
 			);
 		});
 	});
@@ -55,7 +55,7 @@ describe('template literals', () => {
 					"${(props) =>",
 					"(props.status === \"signed\" && \"red\") ||",
 					"\"blue\"}",
-				].join("\n\t\t")
+				].join("\n\t\t"),
 			);
 		});
 	});
@@ -149,15 +149,15 @@ describe('template literals', () => {
 							? `${/\bprefix\b/.test(rule.selector) ? 'prefix-' : ''}\${prop}${
 									/\bsuffix\b/.test(rule.selector) ? '-suffix' : ''
 							  }`
-							: 'prop'
+							: 'prop',
 					);
 					expect(decl).to.have.property(
 						'value',
 						/\bvalue\b/.test(rule.selector)
 							? `${/\bprefix\b/.test(rule.selector) ? 'prefix-' : ''}\${value}${
 									/\bsuffix\b/.test(rule.selector) ? '-suffix' : ''
 							  }`
-							: 'value'
+							: 'value',
 					);
 				});
 			});

test/styled-components.js

@@ -250,7 +250,7 @@ describe('styled-components', () => {
 		expect(document.nodes).to.have.lengthOf(1);
 		expect(document.first.first).to.haveOwnProperty(
 			'prop',
-			"margin-${/* sc-custom 'left' */ rtlSwitch}"
+			"margin-${/* sc-custom 'left' */ rtlSwitch}",
 		);
 	});
 

un-camel-case.js

@@ -6,7 +6,7 @@ function unCamelCase(str) {
 			? s
 					.replace(/[A-Z]/g, (s) => '-' + s.toLowerCase())
 					.replace(/^(o|ms|moz|khtml|epub|(\w+-?)*webkit)(?=-)/i, '-$1')
-			: s
+			: s,
 	);
 }