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

package/collection.json

@@ -115,6 +115,11 @@
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."
+    },
+    "environments": {
+      "factory": "./environments",
+      "schema": "./environments/schema.json",
+      "description": "Generate project environment files."
     }
   }
 }

package/environments/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule } from '@angular-devkit/schematics';
+import { Schema as EnvironmentOptions } from './schema';
+export default function (options: EnvironmentOptions): Rule;

package/environments/index.js

@@ -0,0 +1,105 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const utility_1 = require("@schematics/angular/utility");
+const path_1 = require("path");
+const ENVIRONMENTS_DIRECTORY = 'environments';
+const ENVIRONMENT_FILE_CONTENT = 'export const environment = {};\n';
+function default_1(options) {
+    return (0, utility_1.updateWorkspace)((workspace) => {
+        var _a;
+        const project = workspace.projects.get(options.project);
+        if (!project) {
+            throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
+        }
+        const type = project.extensions['projectType'];
+        if (type !== 'application') {
+            return log('error', 'Only application project types are support by this schematic.' + type
+                ? ` Project "${options.project}" has a "projectType" of "${type}".`
+                : ` Project "${options.project}" has no "projectType" defined.`);
+        }
+        const buildTarget = project.targets.get('build');
+        if (!buildTarget) {
+            return log('error', `No "build" target found for project "${options.project}".` +
+                ' A "build" target is required to generate environment files.');
+        }
+        const serverTarget = project.targets.get('server');
+        const sourceRoot = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : path_1.posix.join(project.root, 'src');
+        // The generator needs to be iterated prior to returning to ensure all workspace changes that occur
+        // within the generator are present for `updateWorkspace` when it writes the workspace file.
+        return (0, schematics_1.chain)([
+            ...generateConfigurationEnvironments(buildTarget, serverTarget, sourceRoot, options.project),
+        ]);
+    });
+}
+exports.default = default_1;
+function createIfMissing(path) {
+    return (tree, context) => {
+        if (tree.exists(path)) {
+            context.logger.info(`Skipping creation of already existing environment file "${path}".`);
+        }
+        else {
+            tree.create(path, ENVIRONMENT_FILE_CONTENT);
+        }
+    };
+}
+function log(type, text) {
+    return (_, context) => context.logger[type](text);
+}
+function* generateConfigurationEnvironments(buildTarget, serverTarget, sourceRoot, projectName) {
+    var _a, _b, _c;
+    if (!buildTarget.builder.startsWith(utility_1.AngularBuilder.Browser)) {
+        yield log('warn', `"build" target found for project "${projectName}" has a third-party builder "${buildTarget.builder}".` +
+            ' The generated project options may not be compatible with this builder.');
+    }
+    if (serverTarget && !serverTarget.builder.startsWith(utility_1.AngularBuilder.Server)) {
+        yield log('warn', `"server" target found for project "${projectName}" has a third-party builder "${buildTarget.builder}".` +
+            ' The generated project options may not be compatible with this builder.');
+    }
+    // Create default environment file
+    const defaultFilePath = path_1.posix.join(sourceRoot, ENVIRONMENTS_DIRECTORY, 'environment.ts');
+    yield createIfMissing(defaultFilePath);
+    const configurationEntries = [
+        ...Object.entries((_a = buildTarget.configurations) !== null && _a !== void 0 ? _a : {}),
+        ...Object.entries((_b = serverTarget === null || serverTarget === void 0 ? void 0 : serverTarget.configurations) !== null && _b !== void 0 ? _b : {}),
+    ];
+    const addedFiles = new Set();
+    for (const [name, configurationOptions] of configurationEntries) {
+        if (!configurationOptions) {
+            // Invalid configuration
+            continue;
+        }
+        // Default configuration will use the default environment file
+        if (name === buildTarget.defaultConfiguration) {
+            continue;
+        }
+        const configurationFilePath = path_1.posix.join(sourceRoot, ENVIRONMENTS_DIRECTORY, `environment.${name}.ts`);
+        // Add file replacement option entry for the configuration environment file
+        const replacements = ((_c = configurationOptions['fileReplacements']) !== null && _c !== void 0 ? _c : (configurationOptions['fileReplacements'] = []));
+        const existing = replacements.find((value) => value.replace === defaultFilePath);
+        if (existing) {
+            if (existing.with === configurationFilePath) {
+                yield log('info', `Skipping addition of already existing file replacements option for "${defaultFilePath}" to "${configurationFilePath}".`);
+            }
+            else {
+                yield log('warn', `Configuration "${name}" has a file replacements option for "${defaultFilePath}" but with a different replacement.` +
+                    ` Expected "${configurationFilePath}" but found "${existing.with}". This may result in unexpected build behavior.`);
+            }
+        }
+        else {
+            replacements.push({ replace: defaultFilePath, with: configurationFilePath });
+        }
+        // Create configuration specific environment file if not already added
+        if (!addedFiles.has(configurationFilePath)) {
+            addedFiles.add(configurationFilePath);
+            yield createIfMissing(configurationFilePath);
+        }
+    }
+}

package/environments/schema.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Generates and configures environment files for a project.
+ */
+export interface Schema {
+    /**
+     * The name of the project.
+     */
+    project: string;
+}

package/environments/schema.js

@@ -0,0 +1,4 @@
+"use strict";
+// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
+Object.defineProperty(exports, "__esModule", { value: true });

package/environments/schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularEnvironment",
+  "title": "Angular Environments Options Schema",
+  "type": "object",
+  "additionalProperties": false,
+  "description": "Generates and configures environment files for a project.",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    }
+  },
+  "required": ["project"]
+}

package/guard/schema.json

@@ -47,6 +47,7 @@
       "default": false
     },
     "implements": {
+      "alias": "guardType",
       "type": "array",
       "description": "Specifies which type of guard to create.",
       "uniqueItems": true,

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

@@ -6,4 +6,4 @@ export const <%= camelize(name) %>Guard: <%= guardType %><% if (guardType === 'C
   %><% if (guardType === 'CanActivateChildFn') { %>(childRoute, state)<% }
   %><% if (guardType === 'CanDeactivateFn') { %>(component, currentRoute, currentState, nextState)<% } %> => {
   return true;
-}
+};

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

@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+import { HttpInterceptorFn } from '@angular/common/http';
 
 import { <%= camelize(name) %>Interceptor } from './<%= dasherize(name) %>.interceptor';
 

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

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

package/package.json

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

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

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

package/utility/latest-versions/package.json

@@ -14,7 +14,7 @@
     "karma": "~6.4.0",
     "ng-packagr": "^15.0.0-next.0",
     "protractor": "~7.0.0",
-    "rxjs": "~7.5.0",
+    "rxjs": "~7.6.0",
     "tslib": "^2.3.0",
     "ts-node": "~10.9.0",
     "typescript": "~4.8.2",