using map as config api for npm formatter steps

as discussed in PR diffplug#283

Author: simschla

lib-extra/src/main/java/com/diffplug/spotless/extra/npm/NodeJSWrapper.java

@@ -16,6 +16,7 @@
 package com.diffplug.spotless.extra.npm;
 
 import java.io.File;
+import java.util.Map;
 import java.util.Objects;
 
 public class NodeJSWrapper extends ReflectiveObjectWrapper {
@@ -42,6 +43,13 @@ public V8ObjectWrapper createNewObject() {
 		return objectWrapper;
 	}
 
+	public V8ObjectWrapper createNewObject(Map<String, Object> values) {
+		Objects.requireNonNull(values);
+		V8ObjectWrapper obj = createNewObject();
+		values.forEach(obj::add);
+		return obj;
+	}
+
 	public V8ArrayWrapper createNewArray(Object... elements) {
 		final V8ArrayWrapper v8ArrayWrapper = this.createNewArray();
 		for (Object element : elements) {

lib-extra/src/main/java/com/diffplug/spotless/extra/npm/NpmFormatterStepStateBase.java

@@ -28,19 +28,23 @@
 
 import com.diffplug.spotless.*;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public abstract class NpmFormatterStepStateBase implements Serializable {
 
 	private static final long serialVersionUID = -5849375492831208496L;
 
-	public final JarState jarState;
+	private final JarState jarState;
 
-	public final FileSignature nodeModulesSignature;
+	@SuppressWarnings("unused")
+	private final FileSignature nodeModulesSignature;
 
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
 	public final transient File nodeModulesDir;
 
-	public final NpmConfig npmConfig;
+	private final NpmConfig npmConfig;
 
-	public final String stepName;
+	private final String stepName;
 
 	protected NpmFormatterStepStateBase(String stepName, Provisioner provisioner, NpmConfig npmConfig, File buildDir, File npm) throws IOException {
 		this.stepName = stepName;

lib-extra/src/main/java/com/diffplug/spotless/extra/npm/PrettierConfig.java

@@ -16,23 +16,43 @@
 package com.diffplug.spotless.extra.npm;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.TreeMap;
 
-public class PrettierConfig {
+import com.diffplug.spotless.FileSignature;
+import com.diffplug.spotless.ThrowingEx;
 
-	private final File prettierConfigPath;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-	private final PrettierOptions options;
+public class PrettierConfig implements Serializable {
 
-	public PrettierConfig(File prettierConfigPath, PrettierOptions options) {
-		this.prettierConfigPath = prettierConfigPath;
-		this.options = options == null ? PrettierOptions.allDefaults() : options;
+	private static final long serialVersionUID = -8709340269833126583L;
+
+	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
+	private final transient File prettierConfigPath;
+
+	@SuppressWarnings("unused")
+	private final FileSignature prettierConfigPathSignature;
+
+	private final TreeMap<String, Object> options;
+
+	public PrettierConfig(File prettierConfigPath, Map<String, Object> options) {
+		try {
+			this.prettierConfigPath = prettierConfigPath;
+			this.prettierConfigPathSignature = FileSignature.signAsList(this.prettierConfigPath);
+			this.options = options == null ? new TreeMap<>() : new TreeMap<>(options);
+		} catch (IOException e) {
+			throw ThrowingEx.asRuntime(e);
+		}
 	}
 
 	public File getPrettierConfigPath() {
 		return prettierConfigPath;
 	}
 
-	public PrettierOptions getOptions() {
-		return options;
+	public Map<String, Object> getOptions() {
+		return new TreeMap<>(this.options);
 	}
 }

lib-extra/src/main/java/com/diffplug/spotless/extra/npm/PrettierFormatterStep.java

@@ -21,6 +21,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.annotation.Nonnull;
 
@@ -66,7 +68,8 @@ public FormatterFunc createFormatterFunc() {
 				final NodeJSWrapper nodeJSWrapper = nodeJSWrapper();
 				final V8ObjectWrapper prettier = nodeJSWrapper.require(nodeModulePath());
 
-				final PrettierOptions[] resolvedPrettierOptions = new PrettierOptions[1];
+				@SuppressWarnings("unchecked")
+				final Map<String, Object>[] resolvedPrettierOptions = (Map<String, Object>[]) new Map[1];
 				if (this.prettierConfig.getPrettierConfigPath() != null) {
 					final Exception[] toThrow = new Exception[1];
 					try (
@@ -76,9 +79,12 @@ public FormatterFunc createFormatterFunc() {
 									if (configOptions == null) {
 										toThrow[0] = new IllegalArgumentException("Cannot find or read config file " + this.prettierConfig.getPrettierConfigPath());
 									} else {
-										resolvedPrettierOptions[0] = PrettierOptions
-												.fromV8Object(configOptions)
-												.overrideWith(this.prettierConfig.getOptions());
+										Map<String, Object> resolvedOptions = new TreeMap<>(V8ObjectUtilsWrapper.toMap(configOptions));
+										resolvedOptions.putAll(this.prettierConfig.getOptions());
+										toThrow[0] = validateOptions(resolvedOptions);
+										if (toThrow[0] == null) {
+											resolvedPrettierOptions[0] = resolvedOptions;
+										}
 									}
 								} catch (Exception e) {
 									toThrow[0] = e;
@@ -107,10 +113,7 @@ public FormatterFunc createFormatterFunc() {
 					resolvedPrettierOptions[0] = this.prettierConfig.getOptions();
 				}
 
-				//				final V8ObjectWrapper prettierConfig = nodeJSWrapper.createNewObject()
-				//					.add("parser", "typescript");
-
-				final V8ObjectWrapper prettierConfig = resolvedPrettierOptions[0].toV8Object(nodeJSWrapper);
+				final V8ObjectWrapper prettierConfig = nodeJSWrapper.createNewObject(resolvedPrettierOptions[0]);
 
 				return FormatterFunc.Closeable.of(() -> {
 					System.out.println("RELEASING PRETTIER FORMATTER FUNCTION");
@@ -126,5 +129,12 @@ public FormatterFunc createFormatterFunc() {
 			}
 
 		}
+
+		private Exception validateOptions(Map<String, Object> resolvedOptions) {
+			if (resolvedOptions.containsKey("filePath")) {
+				return new RuntimeException("option 'filePath' is not supported.)");
+			}
+			return null;
+		}
 	}
 }