Add tsfmt support for maven #552
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright 2016 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.maven.typescript; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.maven.plugins.annotations.Parameter; | ||
|
|
||
| import com.diffplug.spotless.FormatterStep; | ||
| import com.diffplug.spotless.maven.FormatterStepConfig; | ||
| import com.diffplug.spotless.maven.FormatterStepFactory; | ||
| import com.diffplug.spotless.npm.TsConfigFileType; | ||
| import com.diffplug.spotless.npm.TsFmtFormatterStep; | ||
| import com.diffplug.spotless.npm.TypedTsFmtConfigFile; | ||
|
|
||
| public class Tsfmt implements FormatterStepFactory { | ||
|
|
||
| @Parameter | ||
| private String tslintFile; | ||
|
|
||
| @Parameter | ||
| private String tsconfigFile; | ||
|
|
||
| @Parameter | ||
| private String vscodeFile; | ||
|
|
||
| @Parameter | ||
| private String tsfmtFile; | ||
|
|
||
| @Parameter | ||
| private String typescriptFormatterVersion; | ||
|
|
||
| @Parameter | ||
| private String typescriptVersion; | ||
|
|
||
| @Parameter | ||
| private String tslintVersion; | ||
|
|
||
| @Parameter | ||
| private String npmExecutable; | ||
|
|
||
| @Parameter | ||
| private Map<String, Object> config; | ||
|
|
||
| @Parameter(defaultValue = "${project.build.directory}", required = true, readonly = true) | ||
| private File buildDir; | ||
|
|
||
| @Override | ||
| public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) { | ||
|
|
||
| Map<String, String> devDependencies = TsFmtFormatterStep.defaultDevDependencies(); | ||
| if (typescriptFormatterVersion != null) { | ||
| devDependencies.put("typescript-formatter", typescriptFormatterVersion); | ||
| } | ||
| if (typescriptVersion != null) { | ||
| devDependencies.put("typescript", typescriptVersion); | ||
| } | ||
| if (tslintVersion != null) { | ||
| devDependencies.put("tslint", tslintVersion); | ||
| } | ||
|
|
||
| File npm = npmExecutable != null ? stepConfig.getFileLocator().locateFile(npmExecutable) : null; | ||
|
|
||
| TypedTsFmtConfigFile configFile = null; | ||
|
|
||
| // check that there is only 1 config file or inline config | ||
| if (this.tsconfigFile != null | ||
| ^ this.tsfmtFile != null | ||
| ^ this.tslintFile != null | ||
| ^ this.vscodeFile != null) { | ||
| if (this.tsconfigFile != null) { | ||
| configFile = new TypedTsFmtConfigFile(TsConfigFileType.TSCONFIG, stepConfig.getFileLocator().locateFile(tsconfigFile)); | ||
| } else if (this.tsfmtFile != null) { | ||
| configFile = new TypedTsFmtConfigFile(TsConfigFileType.TSFMT, stepConfig.getFileLocator().locateFile(tsfmtFile)); | ||
| } else if (this.tslintFile != null) { | ||
| configFile = new TypedTsFmtConfigFile(TsConfigFileType.TSLINT, stepConfig.getFileLocator().locateFile(tslintFile)); | ||
| } else if (this.vscodeFile != null) { | ||
| configFile = new TypedTsFmtConfigFile(TsConfigFileType.VSCODE, stepConfig.getFileLocator().locateFile(vscodeFile)); | ||
| } | ||
| } else { | ||
| if (config == null) { | ||
| throw new IllegalArgumentException("must specify exactly one configFile or config"); | ||
| } | ||
| } | ||
|
|
||
| if (buildDir == null) { | ||
| buildDir = new File(stepConfig.getBaseDir(), "build-dir"); | ||
| } | ||
|
There was a problem hiding this comment. ... because if it was, this wouldn't be necessary. I think part of what might be happening is that new File(".") is not resolving to where we suspect it to be. We could modify There was a problem hiding this comment. Hmm... I tried this below and it is still not working. |
||
| return TsFmtFormatterStep.create(devDependencies, stepConfig.getProvisioner(), buildDir, npm, configFile, config); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2016 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.maven.typescript; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import com.diffplug.common.collect.ImmutableSet; | ||
| import com.diffplug.spotless.maven.FormatterFactory; | ||
|
|
||
| /** | ||
| * A {@link FormatterFactory} implementation that corresponds to {@code <typescript>...</typescript>} configuration element. | ||
| * <p> | ||
| * It defines a formatter for typescript source files. | ||
| */ | ||
| public class Typescript extends FormatterFactory { | ||
|
|
||
| private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.of("src/**/*.ts"); | ||
|
|
||
| private static final String LICENSE_HEADER_DELIMITER = null; | ||
|
|
||
| @Override | ||
| public Set<String> defaultIncludes() { | ||
| return DEFAULT_INCLUDES; | ||
| } | ||
|
|
||
| @Override | ||
| public String licenseHeaderDelimiter() { | ||
| return LICENSE_HEADER_DELIMITER; | ||
| } | ||
|
|
||
| public void addTsfmt(Tsfmt tsfmt) { | ||
| addStepFactory(tsfmt); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This default seems to not be effective...