@angular/material 15.0.0-rc.2 → 15.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/material",
-  "version": "15.0.0-rc.2",
+  "version": "15.0.0",
   "description": "Angular Material",
   "repository": {
     "type": "git",
@@ -988,12 +988,12 @@
     }
   },
   "peerDependencies": {
-    "@angular/animations": "^15.0.0-0 || ^16.0.0",
-    "@angular/cdk": "15.0.0-rc.2",
-    "@angular/core": "^15.0.0-0 || ^16.0.0",
-    "@angular/common": "^15.0.0-0 || ^16.0.0",
-    "@angular/forms": "^15.0.0-0 || ^16.0.0",
-    "@angular/platform-browser": "^15.0.0-0 || ^16.0.0",
+    "@angular/animations": "^15.0.0 || ^16.0.0",
+    "@angular/cdk": "15.0.0",
+    "@angular/core": "^15.0.0 || ^16.0.0",
+    "@angular/common": "^15.0.0 || ^16.0.0",
+    "@angular/forms": "^15.0.0 || ^16.0.0",
+    "@angular/platform-browser": "^15.0.0 || ^16.0.0",
     "rxjs": "^6.5.3 || ^7.4.0"
   },
   "dependencies": {

package/schematics/ng-add/index.js

@@ -18,7 +18,7 @@ const package_config_1 = require("./package-config");
  * Note that the fallback version range does not use caret, but tilde because that is
  * the default for Angular framework dependencies in CLI projects.
  */
-const fallbackMaterialVersionRange = `~15.0.0-rc.2`;
+const fallbackMaterialVersionRange = `~15.0.0`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.
@@ -33,7 +33,7 @@ function default_1(options) {
         // have the same version tag if possible.
         const ngCoreVersionTag = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/core');
         const materialVersionRange = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/material');
-        const angularDependencyVersion = ngCoreVersionTag || `^15.0.0-0 || ^16.0.0`;
+        const angularDependencyVersion = ngCoreVersionTag || `^15.0.0 || ^16.0.0`;
         // The CLI inserts `@angular/material` into the `package.json` before this schematic runs.
         // This means that we do not need to insert Angular Material into `package.json` files again.
         // In some cases though, it could happen that this schematic runs outside of the CLI `ng add`

package/schematics/ng-add/index.mjs

@@ -18,7 +18,7 @@ const package_config_1 = require("./package-config");
  * Note that the fallback version range does not use caret, but tilde because that is
  * the default for Angular framework dependencies in CLI projects.
  */
-const fallbackMaterialVersionRange = `~15.0.0-rc.2`;
+const fallbackMaterialVersionRange = `~15.0.0`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.
@@ -33,7 +33,7 @@ function default_1(options) {
         // have the same version tag if possible.
         const ngCoreVersionTag = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/core');
         const materialVersionRange = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/material');
-        const angularDependencyVersion = ngCoreVersionTag || `^15.0.0-0 || ^16.0.0`;
+        const angularDependencyVersion = ngCoreVersionTag || `^15.0.0 || ^16.0.0`;
         // The CLI inserts `@angular/material` into the `package.json` before this schematic runs.
         // This means that we do not need to insert Angular Material into `package.json` files again.
         // In some cases though, it could happen that this schematic runs outside of the CLI `ng add`

package/schematics/ng-generate/mdc-migration/index_bundled.js

@@ -21388,12 +21388,16 @@ publishFacade(_global);
 function visitElements(nodes, preorderCallback = () => {
 }, postorderCallback = () => {
 }) {
-  nodes.reverse();
-  for (let i = 0; i < nodes.length; i++) {
+  for (let i = nodes.length - 1; i > -1; i--) {
     const node = nodes[i];
-    if (node instanceof Element$1) {
+    const isElement = node instanceof Element$1;
+    if (isElement) {
       preorderCallback(node);
+    }
+    if (isElement || node instanceof Template) {
       visitElements(node.children, preorderCallback, postorderCallback);
+    }
+    if (isElement) {
       postorderCallback(node);
     }
   }
@@ -22234,6 +22238,7 @@ var SliderTemplateMigrator = class extends TemplateMigrator {
         const bindings = this._getBindings(node);
         const inputBindings = [];
         const comments = [];
+        let alreadyAppendedTemplateVars = false;
         for (let i = 0; i < bindings.length; i++) {
           const binding = bindings[i];
           if (binding.name === "value") {
@@ -22241,10 +22246,26 @@ var SliderTemplateMigrator = class extends TemplateMigrator {
             inputBindings.push(originalHtml.slice(sourceSpan.start.offset, sourceSpan.end.offset));
             updates.push(this._removeBinding(originalHtml, binding.node));
           }
-          if (binding.name === "invert" || binding.name === "vertical") {
+          if (binding.name === "invert" || binding.name === "vertical" || binding.name === "tickInterval" || binding.name === "valueText") {
             comments.push(`<!-- TODO: The '${binding.name}' property no longer exists -->`);
             updates.push(this._removeBinding(originalHtml, binding.node));
           }
+          if (binding.name === "displayValue") {
+            comments.push(`<!-- TODO: The '${binding.name}' property no longer exists. Use 'displayWith' instead. -->`);
+            updates.push(this._removeBinding(originalHtml, binding.node));
+          }
+          if (binding.name === "input" || binding.name === "change") {
+            const sourceSpan = binding.node.sourceSpan;
+            const oldBindingStr = originalHtml.slice(sourceSpan.start.offset, sourceSpan.end.offset);
+            const newBindingStr = oldBindingStr.replace("$event", "{source: ngSliderThumb, parent: ngSlider, value: ngSliderThumb.value}");
+            inputBindings.push(newBindingStr);
+            updates.push(this._removeBinding(originalHtml, binding.node));
+            if (!alreadyAppendedTemplateVars) {
+              inputBindings.push('#ngSliderThumb="matSliderThumb"');
+              updates.push(this._insertTemplateVar(node, "ngSlider"));
+              alreadyAppendedTemplateVars = true;
+            }
+          }
         }
         if (comments.length) {
           updates.push(this._addComments(node, comments));
@@ -22258,6 +22279,12 @@ var SliderTemplateMigrator = class extends TemplateMigrator {
     });
     return updates;
   }
+  _insertTemplateVar(node, varName) {
+    return {
+      offset: node.startSourceSpan.end.offset - 1,
+      updateFn: (html) => html.slice(0, node.startSourceSpan.end.offset - 1) + ` #${varName}` + html.slice(node.startSourceSpan.end.offset - 1)
+    };
+  }
   _addComments(node, comments) {
     const whitespace = this._parseIndentation(node);
     const indentation = "\n" + this._parseIndentation(node);
@@ -22335,6 +22362,7 @@ var mappings = [
 ];
 var RENAMED_TYPOGRAPHY_LEVELS = new Map(mappings);
 var RENAMED_TYPOGRAPHY_CLASSES = new Map(mappings.map((m) => ["mat-" + m[0], "mat-" + m[1]]));
+var COMBINED_TYPOGRAPHY_LEVELS = /* @__PURE__ */ new Map([["input", "body-1"]]);
 
 // bazel-out/k8-fastbuild/bin/src/material/schematics/ng-generate/mdc-migration/rules/components/typography-hierarchy/typography-hierarchy-template.js
 var TypographyHierarchyTemplateMigrator = class extends TemplateMigrator {
@@ -22749,20 +22777,40 @@ function migrateTypographyConfigs(content, namespace) {
   const newFunctionName = `${namespace}.define-typography-config`;
   const replacements = [];
   calls.forEach(({ name, args }) => {
-    const argContent = content.slice(args.start, args.end);
-    replacements.push({ start: name.start, end: name.end, text: newFunctionName });
+    const parameters = extractNamedParameters(content, args);
+    const addedParameters = /* @__PURE__ */ new Set();
     RENAMED_TYPOGRAPHY_LEVELS.forEach((newName, oldName) => {
-      const pattern = new RegExp(`\\$(${oldName}) *:`, "g");
-      let match;
-      while (match = pattern.exec(argContent)) {
-        const start = args.start + match.index + 1;
+      const correspondingParam = parameters.get(oldName);
+      if (correspondingParam) {
+        addedParameters.add(newName);
         replacements.push({
-          start,
-          end: start + match[1].length,
+          start: correspondingParam.key.start + 1,
+          end: correspondingParam.key.end,
           text: newName
         });
       }
     });
+    COMBINED_TYPOGRAPHY_LEVELS.forEach((newName, oldName) => {
+      const correspondingParam = parameters.get(oldName);
+      if (correspondingParam) {
+        if (addedParameters.has(newName)) {
+          const fullContent = content.slice(correspondingParam.key.start, correspondingParam.value.fullEnd);
+          replacements.push({
+            start: correspondingParam.key.start,
+            end: correspondingParam.value.fullEnd,
+            text: `/* TODO(mdc-migration): No longer supported. Use \`${newName}\` instead. ${fullContent} */`
+          });
+        } else {
+          addedParameters.add(newName);
+          replacements.push({
+            start: correspondingParam.key.start + 1,
+            end: correspondingParam.key.end,
+            text: newName
+          });
+        }
+      }
+    });
+    replacements.push({ start: name.start, end: name.end, text: newFunctionName });
   });
   replacements.sort((a, b) => b.start - a.start).forEach(({ start, end, text }) => content = content.slice(0, start) + text + content.slice(end));
   return content;
@@ -22796,6 +22844,69 @@ function extractFunctionCalls(name, content) {
   }
   return results;
 }
+function extractNamedParameters(content, argsRange) {
+  let escapeCount = 0;
+  const args = content.slice(argsRange.start, argsRange.end).replace(/\(.*\)/g, (current) => ++escapeCount + "\u25EC".repeat(current.length - 1));
+  let colonIndex = args.indexOf(":");
+  const params = /* @__PURE__ */ new Map();
+  while (colonIndex > -1) {
+    const keyRange = extractKeyRange(args, colonIndex);
+    const valueRange = extractValueRange(args, colonIndex);
+    if (keyRange && valueRange) {
+      params.set(args.slice(keyRange.start + 1, keyRange.end), {
+        key: { start: keyRange.start + argsRange.start, end: keyRange.end + argsRange.start },
+        value: {
+          start: valueRange.start + argsRange.start,
+          end: valueRange.end + argsRange.start,
+          fullEnd: valueRange.fullEnd + argsRange.start
+        }
+      });
+    }
+    colonIndex = args.indexOf(":", colonIndex + 1);
+  }
+  return params;
+}
+function extractKeyRange(content, colonIndex) {
+  let index2 = colonIndex - 1;
+  let start = -1;
+  let end = -1;
+  while (index2 > -1) {
+    const char = content[index2];
+    if (char !== " " && char !== "\n") {
+      if (end === -1) {
+        end = index2 + 1;
+      } else if (char === "$") {
+        start = index2;
+        break;
+      }
+    }
+    index2--;
+  }
+  return start > -1 && end > -1 ? { start, end } : null;
+}
+function extractValueRange(content, colonIndex) {
+  let index2 = colonIndex + 1;
+  let start = -1;
+  let end = -1;
+  let fullEnd = -1;
+  while (index2 < content.length) {
+    const char = content[index2];
+    const isWhitespace2 = char === " " || char === "\n";
+    if (!isWhitespace2 && start === -1) {
+      start = index2;
+    } else if (start > -1 && (isWhitespace2 || char === ",")) {
+      end = index2;
+      fullEnd = index2 + 1;
+      break;
+    }
+    if (start > -1 && index2 === content.length - 1) {
+      fullEnd = end = content.length;
+      break;
+    }
+    index2++;
+  }
+  return start > -1 && end > -1 ? { start, end, fullEnd } : null;
+}
 
 // bazel-out/k8-fastbuild/bin/src/material/schematics/ng-generate/mdc-migration/rules/template-migration.js
 var import_schematics2 = require("@angular/cdk/schematics");