Router and filter improvements

Author: Anatoly Ostrovsky

integrations/closure/externs/angular.js

@@ -177,7 +177,7 @@ ng.Component = function() {};
 
 /**
  * Public Component.controller member exposed by the AngularTS namespace contract.
- * @type {(!Array<(function(...?): (!Object|undefined)|function(...?): ?)>|function(...?): (!Object|undefined)|function(new: ?, ...?)|function(new: Object, ...?)|string|undefined)}
+ * @type {(!Array<(function(...?): !Object|function(...?): (!Object|undefined))>|function(...?): (!Object|undefined)|function(new: Object, ...?)|string|undefined)}
  */
 ng.Component.prototype.controller;
 
@@ -205,6 +205,12 @@ ng.Component.prototype.templateUrl;
  */
 ng.Component.prototype.bindings;
 
+/**
+ * Replaces the generated component host element with the component template.
+ * @type {(boolean|undefined)}
+ */
+ng.Component.prototype.replace;
+
 /**
  * Whether transclusion is enabled. Disabled by default.
  * @type {(!Object<string, string>|boolean|undefined)}
@@ -280,7 +286,7 @@ ng.Directive.prototype.compile;
 
 /**
  * Controller constructor or injectable string name
- * @type {(!Array<(function(...?): (!Object|undefined)|function(...?): ?)>|function(...?): (!Object|undefined)|function(new: ?, ...?)|function(new: Object, ...?)|string|undefined)}
+ * @type {(!Array<(function(...?): !Object|function(...?): (!Object|undefined))>|function(...?): (!Object|undefined)|function(new: Object, ...?)|string|undefined)}
  */
 ng.Directive.prototype.controller;
 
@@ -475,7 +481,7 @@ ng.NgModule.prototype.animation = function(name, animationFactory) {};
 /**
  * Public NgModule.filter member exposed by the AngularTS namespace contract.
  * @param {string} name
- * @param {function(...?): !Object} filterFn
+ * @param {function(...?): function(...?): ?} filterFn
  * @return {!ng.NgModule}
  */
 ng.NgModule.prototype.filter = function(name, filterFn) {};
@@ -869,7 +875,7 @@ ng.FilterProvider.prototype.$get;
 /**
  * Public FilterProvider.register member exposed by the AngularTS namespace contract.
  * @param {string} name
- * @param {function(...?): !Object} factory
+ * @param {function(...?): function(...?): ?} factory
  * @return {!ng.FilterProvider}
  */
 ng.FilterProvider.prototype.register = function(name, factory) {};
@@ -1378,7 +1384,7 @@ ng.CompileService;
 
 /**
  * Public AngularTS ControllerService contract exposed through the global ng namespace for Closure-annotated applications.
- * @typedef {function((!Array<(function(...?): (!Object|undefined)|function(...?): ?)>|function(...?): (!Object|undefined)|function(new: ?, ...?)|function(new: Object, ...?)|string), (!Object|undefined), (boolean|undefined), (string|undefined)): ?}
+ * @typedef {function((!Array<(function(...?): !Object|function(...?): (!Object|undefined))>|function(...?): (!Object|undefined)|function(new: Object, ...?)|string), (!Object|undefined), (boolean|undefined), (string|undefined)): ?}
  */
 ng.ControllerService;
 
@@ -1448,7 +1454,7 @@ ng.FilterFn;
 
 /**
  * Public AngularTS FilterFactory contract exposed through the global ng namespace for Closure-annotated applications.
- * @typedef {function(...?): !Object}
+ * @typedef {function(...?): function(...?): ?}
  */
 ng.FilterFactory;
 
@@ -1476,60 +1482,30 @@ ng.EntryFilterItem.prototype.key;
  */
 ng.EntryFilterItem.prototype.value;
 
-/**
- * Public AngularTS DateFilterFormat contract exposed through the global ng namespace for Closure-annotated applications.
- * @typedef {string}
- */
-ng.DateFilterFormat;
-
 /**
  * Public AngularTS DateFilterOptions contract exposed through the global ng namespace for Closure-annotated applications.
  * @record
  */
 ng.DateFilterOptions = function() {};
 
-/**
- * Public DateFilterOptions.locale member exposed by the AngularTS namespace contract.
- * @type {(string|undefined)}
- */
-ng.DateFilterOptions.prototype.locale;
-
 /**
  * Public AngularTS NumberFilterOptions contract exposed through the global ng namespace for Closure-annotated applications.
  * @record
  */
 ng.NumberFilterOptions = function() {};
 
-/**
- * Public NumberFilterOptions.locale member exposed by the AngularTS namespace contract.
- * @type {(string|undefined)}
- */
-ng.NumberFilterOptions.prototype.locale;
-
 /**
  * Public AngularTS CurrencyFilterOptions contract exposed through the global ng namespace for Closure-annotated applications.
  * @record
  */
 ng.CurrencyFilterOptions = function() {};
 
 /**
- * Public CurrencyFilterOptions.locale member exposed by the AngularTS namespace contract.
- * @type {(string|undefined)}
- */
-ng.CurrencyFilterOptions.prototype.locale;
-
-/**
- * Public AngularTS RelativeTimeFilterOptions contract exposed through the global ng namespace for Closure-annotated applications.
+ * An object with some or all of properties of `options` parameter of `Intl.RelativeTimeFormat` constructor. [MDN](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters).
  * @record
  */
 ng.RelativeTimeFilterOptions = function() {};
 
-/**
- * Public RelativeTimeFilterOptions.locale member exposed by the AngularTS namespace contract.
- * @type {(string|undefined)}
- */
-ng.RelativeTimeFilterOptions.prototype.locale;
-
 /**
  * Function that serializes query params into a URL-encoded string.
  * @typedef {function((!Object<string, ?>|undefined)): string}
@@ -3555,6 +3531,12 @@ ng.InjectionTokens.prototype.$aria;
  */
 ng.InjectionTokens.prototype.$compile;
 
+/**
+ * Public InjectionTokens.$compileLifecycle member exposed by the AngularTS namespace contract.
+ * @type {string}
+ */
+ng.InjectionTokens.prototype.$compileLifecycle;
+
 /**
  * Public InjectionTokens.$cookie member exposed by the AngularTS namespace contract.
  * @type {string}
@@ -4843,7 +4825,7 @@ ng.StateDeclaration.prototype.dynamic;
 
 /**
  * The name of the component to use for this view. The name of an AngularTS `.component()` which will be used for this view. Resolve data can be provided to the component via the component's `bindings` object. For each binding declared on the component, any resolve with the same name is set on the component's controller instance. Note: Mapping from resolve names to component inputs may be specified using [[bindings]]. #### Example: ```js .state('profile', { // Use the <my-profile></my-profile> component for this state. component: 'MyProfile', } ``` Note: When using `component` to define a view, you may _not_ use any of: `template`, `templateUrl`, `controller`.
- * @type {(string|undefined)}
+ * @type {(!ng.Component|string|undefined)}
  */
 ng.StateDeclaration.prototype.component;
 
@@ -4855,7 +4837,7 @@ ng.StateDeclaration.prototype.bindings;
 
 /**
  * The view's controller function or name The controller function, or the name of a registered controller. The controller function will be used to control the contents of the [[directives.ngVIew]] directive. See: [[Ng1Controller]] for information about component-level router hooks.
- * @type {(!Array<(function(...?): (!Object|undefined)|function(...?): ?)>|function(...?): (!Object|undefined)|function(new: ?, ...?)|function(new: Object, ...?)|string|undefined)}
+ * @type {(!Array<(function(...?): !Object|function(...?): (!Object|undefined))>|function(...?): (!Object|undefined)|function(new: Object, ...?)|string|undefined)}
  */
 ng.StateDeclaration.prototype.controller;
 

integrations/dart/NG_NAMESPACE_PARITY.md

@@ -137,7 +137,6 @@ part of the Dart public facade.
 | ng type | Dart status |
 | --- | --- |
 | `CurrencyFilterOptions` | started |
-| `DateFilterFormat` | started |
 | `DateFilterOptions` | started |
 | `EntryFilterItem` | started |
 | `FilterFactory` | started |

integrations/dart/lib/src/filters.dart

@@ -4,55 +4,10 @@ typedef FilterFn = Object? Function(Object? input, [List<Object?> args]);
 /// Factory that creates an AngularTS filter implementation.
 typedef FilterFactory = FilterFn Function();
 
-/// Built-in date filter format names.
-enum DateFilterFormat {
-  /// Invokes short.
-  short('short'),
-
-  /// Invokes medium.
-  medium('medium'),
-
-  /// Invokes long.
-  long('long'),
-
-  /// Invokes full.
-  full('full'),
-
-  /// Invokes short date.
-  shortDate('shortDate'),
-
-  /// Invokes medium date.
-  mediumDate('mediumDate'),
-
-  /// Invokes long date.
-  longDate('longDate'),
-
-  /// Invokes full date.
-  fullDate('fullDate'),
-
-  /// Invokes short time.
-  shortTime('shortTime'),
-
-  /// Invokes medium time.
-  mediumTime('mediumTime'),
-
-  /// Invokes long time.
-  longTime('longTime'),
-
-  /// Invokes full time.
-  fullTime('fullTime');
-
-  const DateFilterFormat(this.value);
-
-  /// Registers an AngularTS value.
-  final String value;
-}
-
 /// Options passed to the date filter.
 final class DateFilterOptions {
   /// Creates a date filter options.
   const DateFilterOptions({
-    this.locale,
     this.calendar,
     this.dateStyle,
     this.day,
@@ -76,9 +31,6 @@ final class DateFilterOptions {
     this.intl = const {},
   });
 
-  /// The locale.
-  final String? locale;
-
   /// The calendar.
   final String? calendar;
 
@@ -145,7 +97,6 @@ final class DateFilterOptions {
   /// The to map.
   Map<String, Object?> toMap() => {
         ...intl,
-        if (locale != null) 'locale': locale,
         if (calendar != null) 'calendar': calendar,
         if (dateStyle != null) 'dateStyle': dateStyle,
         if (day != null) 'day': day,
@@ -174,7 +125,6 @@ final class DateFilterOptions {
 final class NumberFilterOptions {
   /// Creates a number filter options.
   const NumberFilterOptions({
-    this.locale,
     this.compactDisplay,
     this.currency,
     this.currencyDisplay,
@@ -199,9 +149,6 @@ final class NumberFilterOptions {
     this.intl = const {},
   });
 
-  /// The locale.
-  final String? locale;
-
   /// The compact display.
   final String? compactDisplay;
 
@@ -271,7 +218,6 @@ final class NumberFilterOptions {
   /// The to map.
   Map<String, Object?> toMap() => {
         ...intl,
-        if (locale != null) 'locale': locale,
         if (compactDisplay != null) 'compactDisplay': compactDisplay,
         if (currency != null) 'currency': currency,
         if (currencyDisplay != null) 'currencyDisplay': currencyDisplay,
@@ -306,8 +252,8 @@ final class NumberFilterOptions {
 final class CurrencyFilterOptions {
   /// Creates a currency filter options.
   const CurrencyFilterOptions({
-    this.locale,
     this.compactDisplay,
+    this.currency,
     this.currencyDisplay,
     this.currencySign,
     this.localeMatcher,
@@ -329,12 +275,12 @@ final class CurrencyFilterOptions {
     this.intl = const {},
   });
 
-  /// The locale.
-  final String? locale;
-
   /// The compact display.
   final String? compactDisplay;
 
+  /// The currency.
+  final String? currency;
+
   /// The currency display.
   final String? currencyDisplay;
 
@@ -389,14 +335,14 @@ final class CurrencyFilterOptions {
   /// The use grouping.
   final Object? useGrouping;
 
-  /// Raw `Intl.NumberFormatOptions` values except `currency` and `style`.
+  /// Raw `Intl.NumberFormatOptions` values except `style`.
   final Map<String, Object?> intl;
 
   /// The to map.
   Map<String, Object?> toMap() => {
         ...intl,
-        if (locale != null) 'locale': locale,
         if (compactDisplay != null) 'compactDisplay': compactDisplay,
+        if (currency != null) 'currency': currency,
         if (currencyDisplay != null) 'currencyDisplay': currencyDisplay,
         if (currencySign != null) 'currencySign': currencySign,
         if (localeMatcher != null) 'localeMatcher': localeMatcher,
@@ -428,16 +374,12 @@ final class CurrencyFilterOptions {
 final class RelativeTimeFilterOptions {
   /// Creates a relative time filter options.
   const RelativeTimeFilterOptions({
-    this.locale,
     this.localeMatcher,
     this.numeric,
     this.style,
     this.intl = const {},
   });
 
-  /// The locale.
-  final String? locale;
-
   /// The locale matcher.
   final String? localeMatcher;
 
@@ -453,7 +395,6 @@ final class RelativeTimeFilterOptions {
   /// The to map.
   Map<String, Object?> toMap() => {
         ...intl,
-        if (locale != null) 'locale': locale,
         if (localeMatcher != null) 'localeMatcher': localeMatcher,
         if (numeric != null) 'numeric': numeric,
         if (style != null) 'style': style,