Skip to content

fix(@schematics/angular): default interface for guard #15313

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.

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
Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 8 additions & 12 deletions packages/schematics/angular/guard/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import { applyLintFix } from '../utility/lint-fix';
import { parseName } from '../utility/parse-name';
import { createDefaultPath } from '../utility/workspace';
import { Schema as GuardOptions } from './schema';
import { Implement as GuardInterface, Schema as GuardOptions } from './schema';


export default function (options: GuardOptions): Rule {
Expand All @@ -31,19 +31,15 @@ export default function (options: GuardOptions): Rule {
options.path = await createDefaultPath(host, options.project as string);
}

if (options.implements === undefined) {
options.implements = [];
if (!options.implements) {
throw new SchematicsException('Option "implements" is required.');
}

let implementations = '';
let implementationImports = '';
if (options.implements.length > 0) {
implementations = options.implements.join(', ');
implementationImports = `${implementations}, `;
// As long as we aren't in IE... ;)
if (options.implements.includes('CanLoad')) {
implementationImports = `${implementationImports}Route, UrlSegment, `;
}
const implementations = options.implements.join(', ');
let implementationImports = `${implementations}, `;
// As long as we aren't in IE... ;)
if (options.implements.includes(GuardInterface.CanLoad)) {
implementationImports = `${implementationImports}Route, UrlSegment, `;
}

const parsedPath = parseName(options.path, options.name);
Expand Down
13 changes: 13 additions & 0 deletions packages/schematics/angular/guard/index_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,17 @@ describe('Guard Schematic', () => {
expect(fileString).toContain(functionName);
});
});

it('should use CanActivate if no implements value', async () => {
const options = { ...defaultOptions, implements: undefined };
const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
.toPromise();
const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
expect(fileString).toContain('CanActivate');
expect(fileString).toContain('canActivate');
expect(fileString).not.toContain('CanActivateChild');
expect(fileString).not.toContain('canActivateChild');
expect(fileString).not.toContain('CanLoad');
expect(fileString).not.toContain('canLoad');
});
});
10 changes: 9 additions & 1 deletion packages/schematics/angular/guard/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,16 @@
"description": "Specifies which interfaces to implement.",
"uniqueItems": true,
"items": {
"type": "string"
"enum": [
"CanActivate",
"CanActivateChild",
"CanLoad"
]
},
"default": [
"CanActivate"
],
"minItems": 1,
"x-prompt": {
"message": "Which interfaces would you like to implement?",
"type": "list",
Expand Down