@schematics/angular 15.1.0-next.0 → 15.1.0-next.1

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

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

package/interceptor/functional-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.spec.ts.template

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { <%= camelize(name) %>Interceptor } from './<%= dasherize(name) %>.interceptor';
+
+describe('<%= camelize(name) %>Interceptor', () => {
+  const interceptor: HttpInterceptorFn = (req, next) => 
+    TestBed.runInInjectionContext(() => <%= camelize(name) %>Interceptor(req, next));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(interceptor).toBeTruthy();
+  });
+});

package/interceptor/functional-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.ts.template

@@ -0,0 +1,5 @@
+import { HttpInterceptorFn } from '@angular/common/http';
+
+export const <%= camelize(name) %>Interceptor: HttpInterceptorFn = (req, next) => {
+  return next(req);
+}

package/interceptor/index.js

@@ -12,8 +12,11 @@ function default_1(options) {
     // This schematic uses an older method to implement the flat option
     const flat = options.flat;
     options.flat = true;
-    return (0, generate_from_files_1.generateFromFiles)(options, {
+    const extraTemplateValues = {
         'if-flat': (s) => (flat ? '' : s),
-    });
+    };
+    return options.functional
+        ? (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './functional-files' }, extraTemplateValues)
+        : (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './class-files' }, extraTemplateValues);
 }
 exports.default = default_1;

package/interceptor/schema.d.ts

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

package/interceptor/schema.json

@@ -40,6 +40,11 @@
       "type": "boolean",
       "description": "Do not create \"spec.ts\" test files for the new interceptor.",
       "default": false
+    },
+    "functional": {
+      "type": "boolean",
+      "description": "Creates the interceptor as a `HttpInterceptorFn`.",
+      "default": false
     }
   },
   "required": ["name", "project"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "15.1.0-next.0",
+  "version": "15.1.0-next.1",
   "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.1.0-next.0",
-    "@angular-devkit/schematics": "15.1.0-next.0",
+    "@angular-devkit/core": "15.1.0-next.1",
+    "@angular-devkit/schematics": "15.1.0-next.1",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

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

@@ -5,13 +5,13 @@ 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));
+      TestBed.runInInjectionContext(() => <%= camelize(name) %>Resolver(...resolverParameters));
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
   });
 
   it('should be created', () => {
-    expect(resolver).toBeTruthy();
+    expect(executeResolver).toBeTruthy();
   });
 });