@schematics/angular 14.1.0 → 14.1.1

package/module/index.js

@@ -37,6 +37,7 @@ const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
+const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function buildRelativeModulePath(options, modulePath) {
@@ -118,6 +119,7 @@ function default_1(options) {
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         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'), [
             options.routing || (isLazyLoadedModuleGen && routingModulePath)
                 ? (0, schematics_1.noop)()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.1.0",
+  "version": "14.1.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": "14.1.0",
-    "@angular-devkit/schematics": "14.1.0",
+    "@angular-devkit/core": "14.1.1",
+    "@angular-devkit/schematics": "14.1.1",
     "jsonc-parser": "3.1.0"
   },
   "repository": {

package/pipe/index.js

@@ -36,6 +36,7 @@ const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
 const find_module_1 = require("../utility/find-module");
 const parse_name_1 = require("../utility/parse-name");
+const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 function addDeclarationToNgModule(options) {
     return (host) => {
@@ -75,13 +76,13 @@ function addDeclarationToNgModule(options) {
 }
 function default_1(options) {
     return async (host) => {
-        if (options.path === undefined) {
-            options.path = await (0, workspace_1.createDefaultPath)(host, options.project);
-        }
+        var _a;
+        (_a = options.path) !== null && _a !== void 0 ? _a : (options.path = await (0, workspace_1.createDefaultPath)(host, options.project));
         options.module = (0, find_module_1.findModuleFromOptions)(host, options);
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         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'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({

package/utility/generate-from-files.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFromFiles = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const parse_name_1 = require("./parse-name");
+const validation_1 = require("./validation");
 const workspace_1 = require("./workspace");
 function generateFromFiles(options, extraTemplateValues = {}) {
     return async (host) => {
@@ -20,6 +21,7 @@ function generateFromFiles(options, extraTemplateValues = {}) {
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         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'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({

package/utility/validation.d.ts

@@ -7,3 +7,4 @@
  */
 export declare const htmlSelectorRe: RegExp;
 export declare function validateHtmlSelector(selector: string): void;
+export declare function validateClassName(className: string): void;

package/utility/validation.js

@@ -7,14 +7,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
+exports.validateClassName = exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 // Must start with a letter, and must contain only alphanumeric characters or dashes.
 // When adding a dash the segment after the dash must also start with a letter.
 exports.htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
+// See: https://github.com/tc39/proposal-regexp-unicode-property-escapes/blob/fe6d07fad74cd0192d154966baa1e95e7cda78a1/README.md#other-examples
+const ecmaIdentifierNameRegExp = /^(?:[$_\p{ID_Start}])(?:[$_\u200C\u200D\p{ID_Continue}])*$/u;
 function validateHtmlSelector(selector) {
     if (selector && !exports.htmlSelectorRe.test(selector)) {
-        throw new schematics_1.SchematicsException(`Selector (${selector}) is invalid.`);
+        throw new schematics_1.SchematicsException(`Selector "${selector}" is invalid.`);
     }
 }
 exports.validateHtmlSelector = validateHtmlSelector;
+function validateClassName(className) {
+    if (!ecmaIdentifierNameRegExp.test(className)) {
+        throw new schematics_1.SchematicsException(`Class name "${className}" is invalid.`);
+    }
+}
+exports.validateClassName = validateClassName;