Add rome format step to json/javascript/typescript languages

Author: blutorange

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -232,7 +232,7 @@ protected final FileCollection parseTarget(Object target) {
 
 	private final FileCollection parseTargetIsExclude(Object target, boolean isExclude) {
 		if (target instanceof Collection) {
-			return parseTargetsIsExclude(((Collection) target).toArray(), isExclude);
+			return parseTargetsIsExclude(((Collection<?>) target).toArray(), isExclude);
 		} else if (target instanceof FileCollection) {
 			return (FileCollection) target;
 		} else if (target instanceof String) {
@@ -963,12 +963,12 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 	 * offline, you can specify the path to the Rome executable via
 	 * {@code rome().pathToExe(...)}.
 	 */
-	public RomeGeneric rome() {
+	public RomeStepConfig<?> rome() {
 		return rome(null);
 	}
 
 	/** Downloads the given Rome version from the network. */
-	public RomeGeneric rome(String version) {
+	public RomeStepConfig<?> rome(String version) {
 		var romeConfig = new RomeGeneric(version);
 		addStep(romeConfig.createStep());
 		return romeConfig;

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavascriptExtension.java

@@ -138,9 +138,51 @@ public PrettierConfig prettier(Map<String, String> devDependencies) {
 		return prettierConfig;
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeJs rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeJs rome(String version) {
+		var romeConfig = new RomeJs(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
 	private static final String DEFAULT_PRETTIER_JS_PARSER = "babel";
 	private static final ImmutableList<String> PRETTIER_JS_PARSERS = ImmutableList.of(DEFAULT_PRETTIER_JS_PARSER, "babel-flow", "flow");
 
+	/**
+	 * Rome formatter step for JavaScript.
+	 */
+	public class RomeJs extends RomeStepConfig<RomeJs> {
+
+		/**
+		 * Creates a new Rome formatter step config for formatting JavaScript files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeJs(String version) {
+			super(getProject(), JavascriptExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "js?";
+		}
+
+		@Override
+		protected RomeJs getThis() {
+			return this;
+		}
+	}
+
 	/**
 	 * Overrides the parser to be set to a js parser.
 	 */

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java

@@ -55,6 +55,22 @@ public JacksonJsonGradleConfig jackson() {
 		return new JacksonJsonGradleConfig(this);
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeJson rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeJson rome(String version) {
+		var romeConfig = new RomeJson(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
 	public class SimpleConfig {
 		private int indent;
 
@@ -145,4 +161,29 @@ protected final FormatterStep createStep() {
 			return JacksonJsonStep.create(jacksonConfig, version, formatExtension.provisioner());
 		}
 	}
+
+	/**
+	 * Rome formatter step for JSON.
+	 */
+	public class RomeJson extends RomeStepConfig<RomeJson> {
+		/**
+		 * Creates a new Rome formatter step config for formatting JSON files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeJson(String version) {
+			super(getProject(), JsonExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "json";
+		}
+
+		@Override
+		protected RomeJson getThis() {
+			return this;
+		}
+	}
 }

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/TypescriptExtension.java

@@ -229,6 +229,47 @@ protected EslintConfig eslintConfig() {
 		}
 	}
 
+	/**
+	 * Defaults to downloading the default Rome version from the network. To work
+	 * offline, you can specify the path to the Rome executable via
+	 * {@code rome().pathToExe(...)}.
+	 */
+	public RomeTs rome() {
+		return rome(null);
+	}
+
+	/** Downloads the given Rome version from the network. */
+	public RomeTs rome(String version) {
+		var romeConfig = new RomeTs(version);
+		addStep(romeConfig.createStep());
+		return romeConfig;
+	}
+
+	/**
+	 * Rome formatter step for TypeScript.
+	 */
+	public class RomeTs extends RomeStepConfig<RomeTs> {
+		/**
+		 * Creates a new Rome formatter step config for formatting TypeScript files. Unless
+		 * overwritten, the given Rome version is downloaded from the network.
+		 *
+		 * @param version Rome version to use.
+		 */
+		public RomeTs(String version) {
+			super(getProject(), TypescriptExtension.this::replaceStep, version);
+		}
+
+		@Override
+		protected String getLanguage() {
+			return "ts?";
+		}
+
+		@Override
+		protected RomeTs getThis() {
+			return this;
+		}
+	}
+
 	@Override
 	protected void setupTask(SpotlessTask task) {
 		if (target == null) {