@schematics/angular 15.0.0 → 15.1.0-next.0

package/guard/{files → implements-files}/__name@dasherize__.guard.ts.template

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { <%= implementationImports %> } from '@angular/router';
+import { <%= routerImports %> } from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({

package/guard/index.js

@@ -14,26 +14,35 @@ function default_1(options) {
     if (!options.implements) {
         throw new schematics_1.SchematicsException('Option "implements" is required.');
     }
-    const implementations = options.implements
-        .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
-        .join(', ');
-    const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
-    const routerNamedImports = [...options.implements, 'UrlTree'];
-    if (options.implements.includes(schema_1.Implement.CanLoad) ||
-        options.implements.includes(schema_1.Implement.CanMatch)) {
-        routerNamedImports.push('Route', 'UrlSegment');
-        if (options.implements.length > 1) {
-            routerNamedImports.push(...commonRouterNameImports);
-        }
+    if (options.implements.length > 1 && options.functional) {
+        throw new schematics_1.SchematicsException('Can only specify one value for implements when generating a functional guard.');
+    }
+    if (options.functional) {
+        const guardType = options.implements[0] + 'Fn';
+        return (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './type-files' }, { guardType });
     }
     else {
-        routerNamedImports.push(...commonRouterNameImports);
+        const implementations = options.implements
+            .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
+            .join(', ');
+        const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
+        const routerNamedImports = [...options.implements, 'UrlTree'];
+        if (options.implements.includes(schema_1.Implement.CanLoad) ||
+            options.implements.includes(schema_1.Implement.CanMatch)) {
+            routerNamedImports.push('Route', 'UrlSegment');
+            if (options.implements.length > 1) {
+                routerNamedImports.push(...commonRouterNameImports);
+            }
+        }
+        else {
+            routerNamedImports.push(...commonRouterNameImports);
+        }
+        routerNamedImports.sort();
+        const routerImports = routerNamedImports.join(', ');
+        return (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './implements-files' }, {
+            implementations,
+            routerImports,
+        });
     }
-    routerNamedImports.sort();
-    const implementationImports = routerNamedImports.join(', ');
-    return (0, generate_from_files_1.generateFromFiles)(options, {
-        implementations,
-        implementationImports,
-    });
 }
 exports.default = default_1;

package/guard/schema.d.ts

@@ -7,7 +7,11 @@ export interface Schema {
      */
     flat?: boolean;
     /**
-     * Specifies which interfaces to implement.
+     * Specifies whether to generate a guard as a function.
+     */
+    functional?: boolean;
+    /**
+     * Specifies which type of guard to create.
      */
     implements?: Implement[];
     /**

package/guard/schema.json

@@ -41,9 +41,14 @@
         "$source": "projectName"
       }
     },
+    "functional": {
+      "type": "boolean",
+      "description": "Specifies whether to generate a guard as a function.",
+      "default": false
+    },
     "implements": {
       "type": "array",
-      "description": "Specifies which interfaces to implement.",
+      "description": "Specifies which type of guard to create.",
       "uniqueItems": true,
       "minItems": 1,
       "items": {
@@ -51,7 +56,7 @@
         "type": "string"
       },
       "default": ["CanActivate"],
-      "x-prompt": "Which interfaces would you like to implement?"
+      "x-prompt": "Which type of guard would you like to create?"
     }
   },
   "required": ["name", "project"]

package/guard/type-files/__name@dasherize__.guard.spec.ts.template

@@ -0,0 +1,18 @@
+import { EnvironmentInjector } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { <%= guardType %> } from '@angular/router';
+
+import { <%= camelize(name) %>Guard } from './<%= dasherize(name) %>.guard';
+
+describe('<%= camelize(name) %>Guard', () => {
+  const executeGuard: <%= guardType %> = (...guardParameters) => 
+      TestBed.inject(EnvironmentInjector).runInContext(() => <%= camelize(name) %>Guard(...guardParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(<%= camelize(name) %>Guard).toBeTruthy();
+  });
+});

package/guard/type-files/__name@dasherize__.guard.ts.template

@@ -0,0 +1,9 @@
+import { <%= guardType %> } from '@angular/router';
+
+export const <%= camelize(name) %>Guard: <%= guardType %><% if (guardType === 'CanDeactivateFn') { %><unknown><% } %> = <%
+  if (guardType === 'CanMatchFn' || guardType === 'CanLoadFn') { %>(route, segments)<% }
+  %><% if (guardType === 'CanActivateFn') { %>(route, state)<% }
+  %><% if (guardType === 'CanActivateChildFn') { %>(childRoute, state)<% }
+  %><% if (guardType === 'CanDeactivateFn') { %>(component, currentRoute, currentState, nextState)<% } %> => {
+  return true;
+}

package/library/files/package.json.template

@@ -7,5 +7,6 @@
   },
   "dependencies": {
     "tslib": "^<%= tsLibLatestVersion %>"
-  }
-}
+  },
+  "sideEffects": false
+}

package/migrations/update-15/update-typescript-target.js

@@ -11,19 +11,26 @@ const json_file_1 = require("../../utility/json-file");
 const workspace_1 = require("../../utility/workspace");
 const workspace_models_1 = require("../../utility/workspace-models");
 function default_1() {
-    return async (host) => {
+    return async (host, context) => {
         // Workspace level tsconfig
         updateTarget(host, 'tsconfig.json');
         const workspace = await (0, workspace_1.getWorkspace)(host);
         // Find all tsconfig which are refereces used by builders
         for (const [, project] of workspace.projects) {
-            for (const [, target] of project.targets) {
+            for (const [targetName, target] of project.targets) {
                 // Update all other known CLI builders that use a tsconfig
                 const tsConfigs = [target.options || {}, ...Object.values(target.configurations || {})]
                     .filter((opt) => typeof (opt === null || opt === void 0 ? void 0 : opt.tsConfig) === 'string')
                     .map((opt) => opt.tsConfig);
-                const uniqueTsConfigs = [...new Set(tsConfigs)];
-                if (uniqueTsConfigs.length < 1) {
+                const uniqueTsConfigs = new Set(tsConfigs);
+                for (const tsConfig of uniqueTsConfigs) {
+                    if (host.exists(tsConfig)) {
+                        continue;
+                    }
+                    uniqueTsConfigs.delete(tsConfig);
+                    context.logger.warn(`'${tsConfig}' referenced in the '${targetName}' target does not exist.`);
+                }
+                if (!uniqueTsConfigs.size) {
                     continue;
                 }
                 switch (target.builder) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "15.0.0",
+  "version": "15.1.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "15.0.0",
-    "@angular-devkit/schematics": "15.0.0",
+    "@angular-devkit/core": "15.1.0-next.0",
+    "@angular-devkit/schematics": "15.1.0-next.0",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

package/resolver/functional-files/__name@dasherize__.resolver.spec.ts.template

@@ -0,0 +1,17 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { <%= camelize(name) %>Resolver } from './<%= dasherize(name) %>.resolver';
+
+describe('<%= camelize(name) %>Resolver', () => {
+  const executeResolver: ResolveFn<boolean> = (...resolverParameters) => 
+      TestBed.inject(EnvironmentInjector).runInContext(() => <%= camelize(name) %>Resolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(resolver).toBeTruthy();
+  });
+});

package/resolver/functional-files/__name@dasherize__.resolver.ts.template

@@ -0,0 +1,5 @@
+import { ResolveFn } from '@angular/router';
+
+export const <%= camelize(name) %>Resolver: ResolveFn<boolean> = (route, state) => {
+  return true;
+}

package/resolver/index.js

@@ -9,6 +9,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    return (0, generate_from_files_1.generateFromFiles)(options);
+    return options.functional
+        ? (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './functional-files' })
+        : (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './class-files' });
 }
 exports.default = default_1;

package/resolver/schema.d.ts

@@ -6,6 +6,10 @@ export interface Schema {
      * When true (the default), creates the new files at the top level of the current project.
      */
     flat?: boolean;
+    /**
+     * Creates the resolver as a `ResolveFn`.
+     */
+    functional?: boolean;
     /**
      * The name of the new resolver.
      */

package/resolver/schema.json

@@ -25,6 +25,11 @@
       "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true
     },
+    "functional": {
+      "type": "boolean",
+      "description": "Creates the resolver as a `ResolveFn`.",
+      "default": false
+    },
     "path": {
       "type": "string",
       "format": "path",

package/utility/generate-from-files.d.ts

@@ -13,5 +13,6 @@ export interface GenerateFromFilesOptions {
     prefix?: string;
     project: string;
     skipTests?: boolean;
+    templateFilesDirectory?: string;
 }
 export declare function generateFromFiles(options: GenerateFromFilesOptions, extraTemplateValues?: Record<string, string | ((v: string) => string)>): Rule;

package/utility/generate-from-files.js

@@ -14,7 +14,7 @@ const validation_1 = require("./validation");
 const workspace_1 = require("./workspace");
 function generateFromFiles(options, extraTemplateValues = {}) {
     return async (host) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         (_a = options.path) !== null && _a !== void 0 ? _a : (options.path = await (0, workspace_1.createDefaultPath)(host, options.project));
         (_b = options.prefix) !== null && _b !== void 0 ? _b : (options.prefix = '');
         (_c = options.flat) !== null && _c !== void 0 ? _c : (options.flat = true);
@@ -22,7 +22,8 @@ function generateFromFiles(options, extraTemplateValues = {}) {
         options.name = parsedPath.name;
         options.path = parsedPath.path;
         (0, validation_1.validateClassName)(schematics_1.strings.classify(options.name));
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+        const templateFilesDirectory = (_d = options.templateFilesDirectory) !== null && _d !== void 0 ? _d : './files';
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)(templateFilesDirectory), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
                 ...schematics_1.strings,

package/utility/latest-versions/package.json

@@ -12,7 +12,7 @@
     "karma-jasmine-html-reporter": "~2.0.0",
     "karma-jasmine": "~5.1.0",
     "karma": "~6.4.0",
-    "ng-packagr": "^15.0.0",
+    "ng-packagr": "^15.0.0-next.0",
     "protractor": "~7.0.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",

package/utility/latest-versions.js

@@ -13,7 +13,7 @@ exports.latestVersions = {
     // but ts_library doesn't support JSON inputs.
     ...require('./latest-versions/package.json')['dependencies'],
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^15.0.0',
+    Angular: '^15.0.0-next.0',
     // Since @angular-devkit/build-angular and @schematics/angular are always
     // published together from the same monorepo, and they are both
     // non-experimental, they will always have the same version.