Skip to content

refactor(@schematics/angular): use generateFromFiles helper in even more cases #30030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

refactor(@schematics/angular): use generateFromFiles helper in even more cases #30030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...es/__name@dasherize____type__.ts.template → ...s/__name@dasherize__.__type__.ts.template
View file
Open in desktop
File renamed without changes.
6 changes: 2 additions & 4 deletions packages/schematics/angular/enum/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
* found in the LICENSE file at https://angular.dev/license
*/

import { Rule } from '@angular-devkit/schematics';
import type { Rule } from '@angular-devkit/schematics';
import { generateFromFiles } from '../utility/generate-from-files';
import { Schema as EnumOptions } from './schema';
import type { Schema as EnumOptions } from './schema';

export default function (options: EnumOptions): Rule {
options.type = options.type ? `.${options.type}` : '';

return generateFromFiles(options);
}
0 ...@dasherize__.interceptor.spec.ts.template → ...@dasherize__.interceptor.spec.ts.template
View file
Open in desktop
File renamed without changes.
0 ..._name@dasherize__.interceptor.ts.template → ..._name@dasherize__.interceptor.ts.template
View file
Open in desktop
File renamed without changes.
0 ...@dasherize__.interceptor.spec.ts.template → ...@dasherize__.interceptor.spec.ts.template
View file
Open in desktop
File renamed without changes.
0 ..._name@dasherize__.interceptor.ts.template → ..._name@dasherize__.interceptor.ts.template
View file
Open in desktop
File renamed without changes.
21 changes: 4 additions & 17 deletions packages/schematics/angular/interceptor/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,12 @@
* found in the LICENSE file at https://angular.dev/license
*/

import { Rule } from '@angular-devkit/schematics';
import type { Rule } from '@angular-devkit/schematics';
import { generateFromFiles } from '../utility/generate-from-files';
import { Schema as InterceptorOptions } from './schema';
import type { Schema as InterceptorOptions } from './schema';

export default function (options: InterceptorOptions): Rule {
// This schematic uses an older method to implement the flat option
const flat = options.flat;
options.flat = true;
const extraTemplateValues = {
'if-flat': (s: string) => (flat ? '' : s),
};
const templateFilesDirectory = options.functional ? './functional-files' : './class-files';

return options.functional
? generateFromFiles(
{ ...options, templateFilesDirectory: './functional-files' },
extraTemplateValues,
)
: generateFromFiles(
{ ...options, templateFilesDirectory: './class-files' },
extraTemplateValues,
);
return generateFromFiles({ ...options, templateFilesDirectory });
}
12 changes: 6 additions & 6 deletions packages/schematics/angular/resolver/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
* found in the LICENSE file at https://angular.dev/license
*/

import { Rule } from '@angular-devkit/schematics';
import type { Rule } from '@angular-devkit/schematics';
import { generateFromFiles } from '../utility/generate-from-files';
import { Schema } from './schema';
import type { Schema as ResolverOptions } from './schema';

export default function (options: Schema): Rule {
return options.functional
? generateFromFiles({ ...options, templateFilesDirectory: './functional-files' })
: generateFromFiles({ ...options, templateFilesDirectory: './class-files' });
export default function (options: ResolverOptions): Rule {
const templateFilesDirectory = options.functional ? './functional-files' : './class-files';

return generateFromFiles({ ...options, templateFilesDirectory });
}