28c53f942b
<!-- Please make sure you have read the submission guidelines before posting an PR --> <!-- https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr --> <!-- Please make sure that your commit message follows our format --> <!-- Example: `fix(nx): must begin with lowercase` --> <!-- If this is a particularly complex change or feature addition, you can request a dedicated Nx release for this pull request branch. Mention someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they will confirm if the PR warrants its own release for testing purposes, and generate it for you if appropriate. --> ## Current Behavior <!-- This is the behavior we have today --> Artifact generators don't handle consistently receiving a file extension in the `path` option. ## Expected Behavior <!-- This is the behavior we should expect with the changes in this PR --> Artifact generators should handle receiving a file extension in the `path` option. If the file extension is passed, the file path will be treated as "complete" and used fully as provided. If the `path` provided doesn't contain a file extension, the default extension will be appended to it (or the one provided in a related option, e.g. `--language`, `--js`, etc) together with the suffix for generators that use it. ## Related Issue(s) <!-- Please link the issue being fixed so it gets closed when this is merged. --> Fixes #
40 lines
984 B
TypeScript
40 lines
984 B
TypeScript
import type { Tree } from '@nx/devkit';
|
|
import type {
|
|
NestGeneratorWithLanguageOption,
|
|
NestGeneratorWithTestOption,
|
|
NormalizedOptions,
|
|
} from '../utils';
|
|
import {
|
|
normalizeOptions,
|
|
runNestSchematic,
|
|
unitTestRunnerToSpec,
|
|
} from '../utils';
|
|
|
|
export type ResolverGeneratorOptions = NestGeneratorWithLanguageOption &
|
|
NestGeneratorWithTestOption;
|
|
|
|
export async function resolverGenerator(
|
|
tree: Tree,
|
|
rawOptions: ResolverGeneratorOptions
|
|
): Promise<any> {
|
|
const options = await normalizeResolverOptions(tree, rawOptions);
|
|
|
|
return runNestSchematic(tree, 'resolver', options);
|
|
}
|
|
|
|
export default resolverGenerator;
|
|
|
|
async function normalizeResolverOptions(
|
|
tree: Tree,
|
|
options: ResolverGeneratorOptions
|
|
): Promise<NormalizedOptions> {
|
|
const normalizedOptions = await normalizeOptions(tree, options, {
|
|
suffix: 'resolver',
|
|
});
|
|
return {
|
|
...normalizedOptions,
|
|
language: options.language,
|
|
spec: unitTestRunnerToSpec(options.unitTestRunner),
|
|
};
|
|
}
|