@angular-devkit/core 14.1.0-next.4 → 14.1.1

package/node/BUILD.bazel

@@ -5,6 +5,7 @@
 
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "ts_library")
+load("//tools:toolchain_info.bzl", "TOOLCHAINS_NAMES", "TOOLCHAINS_VERSIONS")
 
 licenses(["notice"])  # MIT License
 
@@ -52,13 +53,20 @@ ts_library(
     ],
 )
 
-jasmine_node_test(
-    name = "node_test",
-    srcs = [":node_test_lib"],
-    deps = [
-        "@npm//chokidar",
-        # @node_module: ajv
-        # @node_module: fast_json_stable_stringify
-        # @node_module: magic_string
-    ],
-)
+[
+    jasmine_node_test(
+        name = "node_test_" + toolchain_name,
+        srcs = [":node_test_lib"],
+        toolchain = toolchain,
+        deps = [
+            "@npm//chokidar",
+            # @node_module: ajv
+            # @node_module: fast_json_stable_stringify
+            # @node_module: magic_string
+        ],
+    )
+    for toolchain_name, toolchain in zip(
+        TOOLCHAINS_NAMES,
+        TOOLCHAINS_VERSIONS,
+    )
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/core",
-  "version": "14.1.0-next.4",
+  "version": "14.1.1",
   "description": "Angular DevKit - Core Utility Library",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
@@ -15,7 +15,7 @@
   "dependencies": {
     "ajv-formats": "2.1.1",
     "ajv": "8.11.0",
-    "jsonc-parser": "3.0.0",
+    "jsonc-parser": "3.1.0",
     "rxjs": "6.6.7",
     "source-map": "0.7.4"
   },

package/src/utils/strings.d.ts

@@ -54,13 +54,14 @@ export declare function camelize(str: string): string;
 /**
  Returns the UpperCamelCase form of a string.
 
+ @example
  ```javascript
  'innerHTML'.classify();          // 'InnerHTML'
  'action_name'.classify();        // 'ActionName'
  'css-class-name'.classify();     // 'CssClassName'
  'my favorite items'.classify();  // 'MyFavoriteItems'
+ 'app.component'.classify();      // 'AppComponent'
  ```
-
  @method classify
  @param {String} str the string to classify
  @return {String} the classified string

package/src/utils/strings.js

@@ -75,13 +75,14 @@ exports.camelize = camelize;
 /**
  Returns the UpperCamelCase form of a string.
 
+ @example
  ```javascript
  'innerHTML'.classify();          // 'InnerHTML'
  'action_name'.classify();        // 'ActionName'
  'css-class-name'.classify();     // 'CssClassName'
  'my favorite items'.classify();  // 'MyFavoriteItems'
+ 'app.component'.classify();      // 'AppComponent'
  ```
-
  @method classify
  @param {String} str the string to classify
  @return {String} the classified string
@@ -90,7 +91,7 @@ function classify(str) {
     return str
         .split('.')
         .map((part) => capitalize(camelize(part)))
-        .join('.');
+        .join('');
 }
 exports.classify = classify;
 /**

package/src/workspace/json/reader.d.ts

@@ -7,4 +7,8 @@
  */
 import { WorkspaceDefinition } from '../definitions';
 import { WorkspaceHost } from '../host';
-export declare function readJsonWorkspace(path: string, host: WorkspaceHost): Promise<WorkspaceDefinition>;
+export interface JsonWorkspaceOptions {
+    allowedProjectExtensions?: string[];
+    allowedWorkspaceExtensions?: string[];
+}
+export declare function readJsonWorkspace(path: string, host: WorkspaceHost, options?: JsonWorkspaceOptions): Promise<WorkspaceDefinition>;

package/src/workspace/json/reader.js

@@ -13,7 +13,15 @@ const utils_1 = require("../../json/utils");
 const definitions_1 = require("../definitions");
 const metadata_1 = require("./metadata");
 const utilities_1 = require("./utilities");
-async function readJsonWorkspace(path, host) {
+const ANGULAR_WORKSPACE_EXTENSIONS = Object.freeze([
+    'cli',
+    'defaultProject',
+    'newProjectRoot',
+    'schematics',
+]);
+const ANGULAR_PROJECT_EXTENSIONS = Object.freeze(['cli', 'schematics', 'projectType', 'i18n']);
+async function readJsonWorkspace(path, host, options = {}) {
+    var _a, _b;
     const raw = await host.readFile(path);
     if (raw === undefined) {
         throw new Error('Unable to read workspace file.');
@@ -35,20 +43,28 @@ async function readJsonWorkspace(path, host) {
         host,
         metadata: new metadata_1.JsonWorkspaceMetadata(path, ast, raw),
         trackChanges: true,
+        unprefixedWorkspaceExtensions: new Set([
+            ...ANGULAR_WORKSPACE_EXTENSIONS,
+            ...((_a = options.allowedWorkspaceExtensions) !== null && _a !== void 0 ? _a : []),
+        ]),
+        unprefixedProjectExtensions: new Set([
+            ...ANGULAR_PROJECT_EXTENSIONS,
+            ...((_b = options.allowedProjectExtensions) !== null && _b !== void 0 ? _b : []),
+        ]),
         error(message, _node) {
             // TODO: Diagnostic reporting support
             throw new Error(message);
         },
-        warn(_message, _node) {
+        warn(message, _node) {
             // TODO: Diagnostic reporting support
+            // eslint-disable-next-line no-console
+            console.warn(message);
         },
     };
     const workspace = parseWorkspace(ast, context);
     return workspace;
 }
 exports.readJsonWorkspace = readJsonWorkspace;
-const specialWorkspaceExtensions = ['cli', 'defaultProject', 'newProjectRoot', 'schematics'];
-const specialProjectExtensions = ['cli', 'schematics', 'projectType'];
 function parseWorkspace(workspaceNode, context) {
     const jsonMetadata = context.metadata;
     let projects;
@@ -72,8 +88,8 @@ function parseWorkspace(workspaceNode, context) {
             projects = parseProjectsObject(nodes, context);
         }
         else {
-            if (!specialWorkspaceExtensions.includes(name) && !/^[a-z]{1,3}-.*/.test(name)) {
-                context.warn(`Project extension with invalid name found.`, name);
+            if (!context.unprefixedWorkspaceExtensions.has(name) && !/^[a-z]{1,3}-.*/.test(name)) {
+                context.warn(`Project extension with invalid name (${name}) found.`, name);
             }
             if (extensions) {
                 extensions[name] = value;
@@ -124,6 +140,10 @@ function parseProject(projectName, projectNode, context) {
         properties = Object.create(null);
     }
     const projectNodeValue = (0, jsonc_parser_1.getNodeValue)(projectNode);
+    if (!('root' in projectNodeValue)) {
+        // TODO(alan-agius4): change this to error in v15.
+        context.warn(`Project "${projectName}" is missing a required property "root". This will become an error in the next major version.`, projectNodeValue);
+    }
     for (const [name, value] of Object.entries(projectNodeValue)) {
         switch (name) {
             case 'targets':
@@ -148,8 +168,8 @@ function parseProject(projectName, projectNode, context) {
                 }
                 break;
             default:
-                if (!specialProjectExtensions.includes(name) && !/^[a-z]{1,3}-.*/.test(name)) {
-                    context.warn(`Project extension with invalid name found.`, name);
+                if (!context.unprefixedProjectExtensions.has(name) && !/^[a-z]{1,3}-.*/.test(name)) {
+                    context.warn(`Project extension with invalid name (${name}) found.`, name);
                 }
                 if (extensions) {
                     extensions[name] = value;