@schematics/angular 13.0.2 → 13.1.0-next.2

package/application/files/karma.conf.js.template

@@ -25,7 +25,7 @@ module.exports = function (config) {
       suppressAll: true // removes the duplicated traces
     },
     coverageReporter: {
-      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= appName%>'),
+      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= folderName%>'),
       subdir: '.',
       reporters: [
         { type: 'html' },

package/application/index.js

@@ -13,7 +13,6 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../utility/dependencies");
 const latest_versions_1 = require("../utility/latest-versions");
 const paths_1 = require("../utility/paths");
-const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 const schema_1 = require("./schema");
@@ -42,7 +41,7 @@ function addDependenciesToPackageJson(options) {
         return host;
     };
 }
-function addAppToWorkspaceFile(options, appDir) {
+function addAppToWorkspaceFile(options, appDir, folderName) {
     var _a, _b;
     let projectRoot = appDir;
     if (projectRoot) {
@@ -121,7 +120,7 @@ function addAppToWorkspaceFile(options, appDir) {
                 builder: workspace_models_1.Builders.Browser,
                 defaultConfiguration: 'production',
                 options: {
-                    outputPath: `dist/${options.name}`,
+                    outputPath: `dist/${folderName}`,
                     index: `${sourceRoot}/index.html`,
                     main: `${sourceRoot}/main.ts`,
                     polyfills: `${sourceRoot}/polyfills.ts`,
@@ -205,10 +204,6 @@ function minimalPathFilter(path) {
 function default_1(options) {
     return async (host) => {
         var _a, _b;
-        if (!options.name) {
-            throw new schematics_1.SchematicsException(`Invalid options, "name" is required.`);
-        }
-        (0, validation_1.validateProjectName)(options.name);
         const appRootSelector = `${options.prefix}-root`;
         const componentOptions = !options.minimal
             ? {
@@ -228,12 +223,17 @@ function default_1(options) {
         const workspace = await (0, workspace_1.getWorkspace)(host);
         const newProjectRoot = workspace.extensions.newProjectRoot || '';
         const isRootApp = options.projectRoot !== undefined;
+        // If scoped project (i.e. "@foo/bar"), convert dir to "foo/bar".
+        let folderName = options.name.startsWith('@') ? options.name.substr(1) : options.name;
+        if (/[A-Z]/.test(folderName)) {
+            folderName = core_1.strings.dasherize(folderName);
+        }
         const appDir = isRootApp
             ? (0, core_1.normalize)(options.projectRoot || '')
-            : (0, core_1.join)((0, core_1.normalize)(newProjectRoot), core_1.strings.dasherize(options.name));
+            : (0, core_1.join)((0, core_1.normalize)(newProjectRoot), folderName);
         const sourceDir = `${appDir}/src/app`;
         return (0, schematics_1.chain)([
-            addAppToWorkspaceFile(options, appDir),
+            addAppToWorkspaceFile(options, appDir, folderName),
             (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
                 options.minimal ? (0, schematics_1.filter)(minimalPathFilter) : (0, schematics_1.noop)(),
                 (0, schematics_1.applyTemplates)({
@@ -242,6 +242,7 @@ function default_1(options) {
                     relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(appDir),
                     appName: options.name,
                     isRootApp,
+                    folderName,
                 }),
                 (0, schematics_1.move)(appDir),
             ]), schematics_1.MergeStrategy.Overwrite),

package/application/schema.json

@@ -14,6 +14,7 @@
     "name": {
       "description": "The name of the new app.",
       "type": "string",
+      "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
       "$default": {
         "$source": "argv",
         "index": 0

package/component/index.js

@@ -108,7 +108,6 @@ function default_1(options) {
         options.path = parsedPath.path;
         options.selector =
             options.selector || buildSelector(options, (project && project.prefix) || '');
-        (0, validation_1.validateName)(options.name);
         (0, validation_1.validateHtmlSelector)(options.selector);
         const skipStyleFile = options.inlineStyle || options.style === schema_1.Style.None;
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [

package/library/index.js

@@ -14,7 +14,6 @@ const dependencies_1 = require("../utility/dependencies");
 const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
 const paths_1 = require("../utility/paths");
-const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 function updateTsConfig(packageName, ...paths) {
@@ -101,24 +100,19 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
 }
 function default_1(options) {
     return async (host) => {
-        if (!options.name) {
-            throw new schematics_1.SchematicsException(`Invalid options, "name" is required.`);
-        }
         const prefix = options.prefix;
-        (0, validation_1.validateProjectName)(options.name);
         // If scoped project (i.e. "@foo/bar"), convert projectDir to "foo/bar".
-        const projectName = options.name;
-        const packageName = core_1.strings.dasherize(projectName);
-        let scopeName = null;
+        const packageName = options.name;
         if (/^@.*\/.*/.test(options.name)) {
-            const [scope, name] = options.name.split('/');
-            scopeName = scope.replace(/^@/, '');
+            const [, name] = options.name.split('/');
             options.name = name;
         }
         const workspace = await (0, workspace_1.getWorkspace)(host);
         const newProjectRoot = workspace.extensions.newProjectRoot || '';
-        const scopeFolder = scopeName ? core_1.strings.dasherize(scopeName) + '/' : '';
-        const folderName = `${scopeFolder}${core_1.strings.dasherize(options.name)}`;
+        let folderName = packageName.startsWith('@') ? packageName.substr(1) : packageName;
+        if (/[A-Z]/.test(folderName)) {
+            folderName = core_1.strings.dasherize(folderName);
+        }
         const projectRoot = (0, core_1.join)((0, core_1.normalize)(newProjectRoot), folderName);
         const distRoot = `dist/${folderName}`;
         const pathImportLib = `${distRoot}/${folderName.replace('/', '-')}`;
@@ -140,7 +134,7 @@ function default_1(options) {
         ]);
         return (0, schematics_1.chain)([
             (0, schematics_1.mergeWith)(templateSource),
-            addLibToWorkspaceFile(options, projectRoot, projectName),
+            addLibToWorkspaceFile(options, projectRoot, packageName),
             options.skipPackageJson ? (0, schematics_1.noop)() : addDependenciesToPackageJson(),
             options.skipTsConfig ? (0, schematics_1.noop)() : updateTsConfig(packageName, pathImportLib, distRoot),
             (0, schematics_1.schematic)('module', {
@@ -148,7 +142,7 @@ function default_1(options) {
                 commonModule: false,
                 flat: true,
                 path: sourceDir,
-                project: projectName,
+                project: packageName,
             }),
             (0, schematics_1.schematic)('component', {
                 name: options.name,
@@ -158,13 +152,13 @@ function default_1(options) {
                 flat: true,
                 path: sourceDir,
                 export: true,
-                project: projectName,
+                project: packageName,
             }),
             (0, schematics_1.schematic)('service', {
                 name: options.name,
                 flat: true,
                 path: sourceDir,
-                project: projectName,
+                project: packageName,
             }),
             (_tree, context) => {
                 if (!options.skipPackageJson && !options.skipInstall) {

package/library/schema.d.ts

@@ -9,7 +9,7 @@ export interface Schema {
     /**
      * The name of the library.
      */
-    name?: string;
+    name: string;
     /**
      * A prefix to apply to generated selectors.
      */

package/library/schema.json

@@ -10,6 +10,7 @@
     "name": {
       "type": "string",
       "description": "The name of the library.",
+      "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -45,5 +46,5 @@
       "description": "Do not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping is needed to use the library in an app, but can be disabled here to simplify development."
     }
   },
-  "required": []
+  "required": ["name"]
 }

package/ng-new/index.js

@@ -9,14 +9,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const validation_1 = require("../utility/validation");
 function default_1(options) {
-    if (!options.name) {
-        throw new schematics_1.SchematicsException(`Invalid options, "name" is required.`);
-    }
-    (0, validation_1.validateProjectName)(options.name);
     if (!options.directory) {
-        options.directory = options.name;
+        // If scoped project (i.e. "@foo/bar"), convert directory to "foo/bar".
+        options.directory = options.name.startsWith('@') ? options.name.substr(1) : options.name;
     }
     const workspaceOptions = {
         name: options.name,

package/ng-new/schema.json

@@ -13,7 +13,6 @@
     "name": {
       "description": "The name of the new workspace and initial project.",
       "type": "string",
-      "format": "html-selector",
       "$default": {
         "$source": "argv",
         "index": 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "13.0.2",
+  "version": "13.1.0-next.2",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "13.0.2",
-    "@angular-devkit/schematics": "13.0.2",
+    "@angular-devkit/core": "13.1.0-next.2",
+    "@angular-devkit/schematics": "13.1.0-next.2",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/utility/validation.d.ts

@@ -5,7 +5,5 @@
  * 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
  */
-export declare function validateName(name: string): void;
 export declare const htmlSelectorRe: RegExp;
 export declare function validateHtmlSelector(selector: string): void;
-export declare function validateProjectName(projectName: string): void;

package/utility/validation.js

@@ -7,16 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateProjectName = exports.validateHtmlSelector = exports.htmlSelectorRe = exports.validateName = void 0;
+exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-function validateName(name) {
-    if (name && /^\d/.test(name)) {
-        throw new schematics_1.SchematicsException(core_1.tags.oneLine `name (${name})
-        can not start with a digit.`);
-    }
-}
-exports.validateName = validateName;
 // 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]*)*$/;
@@ -27,47 +20,3 @@ function validateHtmlSelector(selector) {
     }
 }
 exports.validateHtmlSelector = validateHtmlSelector;
-function validateProjectName(projectName) {
-    const errorIndex = getRegExpFailPosition(projectName);
-    const unsupportedProjectNames = [];
-    const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
-    if (errorIndex !== null) {
-        const firstMessage = core_1.tags.oneLine `
-    Project name "${projectName}" is not valid. New project names 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.
-    `;
-        const msg = core_1.tags.stripIndent `
-    ${firstMessage}
-    ${projectName}
-    ${Array(errorIndex + 1).join(' ') + '^'}
-    `;
-        throw new schematics_1.SchematicsException(msg);
-    }
-    else if (unsupportedProjectNames.indexOf(projectName) !== -1) {
-        throw new schematics_1.SchematicsException(`Project name ${JSON.stringify(projectName)} is not a supported name.`);
-    }
-    else if (!packageNameRegex.test(projectName)) {
-        throw new schematics_1.SchematicsException(`Project name ${JSON.stringify(projectName)} is invalid.`);
-    }
-}
-exports.validateProjectName = validateProjectName;
-function getRegExpFailPosition(str) {
-    const isScope = /^@.*\/.*/.test(str);
-    if (isScope) {
-        // Remove starting @
-        str = str.replace(/^@/, '');
-        // Change / to - for validation
-        str = str.replace(/\//g, '-');
-    }
-    const parts = str.indexOf('-') >= 0 ? str.split('-') : [str];
-    const matched = [];
-    const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
-    parts.forEach((part) => {
-        if (part.match(projectNameRegexp)) {
-            matched.push(part);
-        }
-    });
-    const compare = matched.join('-');
-    return str !== compare ? compare.length : null;
-}

package/workspace/schema.json

@@ -9,7 +9,6 @@
     "name": {
       "description": "The name of the workspace.",
       "type": "string",
-      "format": "html-selector",
       "$default": {
         "$source": "argv",
         "index": 0