@coolon/angular-ui-powerups 0.0.119 → 0.0.121

package/fesm5/coolon-angular-ui-powerups.js

@@ -5,7 +5,7 @@ import { MatInputModule, MatFormFieldModule, MatSelectModule, MatButtonModule, M
 import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __extends, __decorate, __metadata, __awaiter, __generator, __assign, __spread } from 'tslib';
-import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, Binding, Guard, StoreInValueModel, Command, ValueHolder } from '@coolon/pectin';
+import { DelegatingValueModel, assert, UnaryCommand, lang, Dsl, GarbageCollector, Logger, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, DelegatingListModel, Deferred, MutableStream, MutableValueModel, MutableListModel, DebugContext, Binding, Guard, StoreInValueModel, Command, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
 import { RouterModule, UrlSegment, NavigationStart, NavigationEnd, NavigationError, NavigationCancel, Router, UrlSerializer } from '@angular/router';
 import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
@@ -3305,7 +3305,7 @@ var PlaceComponent = /** @class */ (function (_super) {
         var _this = this;
         assert.isNil(this.visit);
         this.visit = visit;
-        // DebugContext.get(this.visit).tag(`${this.placeDefinition.component.name}.visit`);
+        DebugContext.get(this.visit).tag(this.placeDefinition.component.name + ".visit");
         this.placeDefinition.getVisitParameterDefs().forEach((/**
          * @param {?} parameterDef
          * @return {?}
@@ -4033,20 +4033,19 @@ NavigationState = /** @class */ (function (_super) {
             new NavigationState.IdleDuringInteraction(this.context, this.currentRouterUrl()) :
             new NavigationState.Idle(this.context);
     };
-    //
-    //
     /**
      * @param {?} url
+     * @param {?=} options
      * @return {?}
      */
-    NavigationState.prototype.resetBrowserLocation = 
-    //
-    /**
+    NavigationState.prototype.resetBrowserLocation = /**
      * @param {?} url
+     * @param {?=} options
      * @return {?}
      */
-    function (url) {
-        this.placeRouter.resetBrowserLocation(url);
+    function (url, options) {
+        if (options === void 0) { options = { replaceCurrent: false }; }
+        this.placeRouter.resetBrowserLocation(url, options);
     };
     /**
      * @param {?} event
@@ -4092,6 +4091,25 @@ NavigationState = /** @class */ (function (_super) {
             return p + ": " + _this[p];
         })).join(', ');
     };
+    /**
+     * @protected
+     * @param {?} url
+     * @return {?}
+     */
+    NavigationState.prototype.replaceBuggeredUrlAfterAngularRouterCancelled = /**
+     * @protected
+     * @param {?} url
+     * @return {?}
+     */
+    function (url) {
+        // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+        // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+        // it before the cancel event fired.
+        // So we need to:
+        // - replace the just inserted url with the one that used to be there.
+        // - push our actual url back onto the top of the stack.
+        this.resetBrowserLocation(url, { replaceCurrent: true });
+    };
     return NavigationState;
 }(GarbageCollector));
 if (false) {
@@ -4425,11 +4443,11 @@ if (false) {
          * @return {?}
          */
         function (event) {
+            this.replaceBuggeredUrlAfterAngularRouterCancelled(this.poppedHistoryUrl);
             // Angular doesn't preserve the url when a guard cancels the back button.
             // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
             Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-            this.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-            this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
+            this.resetBrowserLocation(this.startingUrl);
             return new Idle(this.context);
         };
         /**
@@ -4441,15 +4459,18 @@ if (false) {
          * @return {?}
          */
         function (event) {
-            // navigation was aborted.
-            if (this.currentRouterUrl() !== this.startingUrl) {
-                // Angular doesn't preserve the url when a guard cancels the back button.
-                // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-                Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-                this.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-                this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-            }
-            return new Idle(this.context);
+            // // navigation was aborted.
+            // if (this.currentRouterUrl() !== this.startingUrl) {
+            //   // Angular doesn't preserve the url when a guard cancels the back button.
+            //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+            //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
+            //   this.restoreHistory([
+            //     this.poppedHistoryUrl,
+            //     this.startingUrl
+            //   ]);
+            // }
+            // return new Idle(this.context);
+            return this.illegalTransition("when do I get this???");
         };
         /**
          * @param {?} locationTriggerUrl
@@ -4598,6 +4619,7 @@ if (false) {
          * @return {?}
          */
         function (event) {
+            // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
             if (this.context.interactionService.isActive()) {
                 /** @type {?} */
                 var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -4719,6 +4741,7 @@ if (false) {
                 this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
             }
             else {
+                // this.replaceBuggeredUrlAfterAngularRouterCancells(this.start)
                 this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
             }
             return this.createIdleState();
@@ -4819,6 +4842,7 @@ if (false) {
          * @return {?}
          */
         function (event) {
+            // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
             if (this.interactionService.isActive()) {
                 /** @type {?} */
                 var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -4854,7 +4878,7 @@ if (false) {
          * @return {?}
          */
         function (newUrl) {
-            return this.illegalTransition("Leaving interaction after pop-state should't block so should never see a back button click");
+            return this.illegalTransition('Leaving interaction after pop-state should\'t block so should never see a back button click');
         };
         return LeavingInteractionAfterPopStateTransition;
     }(AbstractInteractionTransition));
@@ -4865,74 +4889,6 @@ if (false) {
         /** @type {?} */
         LeavingInteractionAfterPopStateTransition.prototype.poppedHistoryUrl;
     }
-    // See LeavingInteractionAfterPopStateTransition.createNavigationInteractionCancelledState(...) above.
-    //
-    // export class LeavingInteractionAfterPopStateCancelled extends NavigationState {
-    //
-    //   readonly isPopState = false;
-    //   firstCancelHandled = false;
-    //   popStateHandled = false;
-    //   popStateEventUrl: string;
-    //   debugPropertyKeys = ['idle', 'startingUrl', 'poppedHistoryUrl', 'locationChangeTriggerUrl', 'popStateEventUrl', 'firstCancelHandled', 'popStateHandled'];
-    //
-    //   constructor(context: Context,
-    //               readonly startingUrl: string,
-    //               readonly locationChangeTriggerUrl: string,
-    //               readonly poppedHistoryUrl: string) {
-    //     super(context);
-    //   }
-    //
-    //   get isTransitional() {
-    //     return true;
-    //   }
-    //
-    //   onRouterStarted(event: NavigationStart): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterCancelled(event: NavigationCancel): NavigationState {
-    //
-    //     // if (this.firstCancelHandled && this.popStateHandled) {
-    //     //   // Angular doesn't preserve the url when a guard cancels the back button.
-    //     //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //     //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-    //     //   this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
-    //     //   this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
-    //     //   if (this.interactionService.isActive()) {
-    //     //     const interactionIds = this.interactionService.activeInteractionContextIds.value;
-    //     //     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
-    //     //   } else {
-    //     //     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-    //     //   }
-    //     //   return this.createIdleState();
-    //     // } else {
-    //     //   this.firstCancelHandled = true;
-    //     return this.ignore(event);
-    //     // }
-    //   }
-    //
-    //
-    //   onRouterEnd(event: NavigationEnd): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterError(event: NavigationError): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onPopState(event: NavigationStart): NavigationState {
-    //     // this.popStateHandled = true;
-    //     // this.popStateEventUrl = event.url;
-    //     return this.ignore(event);
-    //   }
-    //
-    //   async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {
-    //     return false;
-    //   }
-    // }
     /**
      * This state handles the scenario where a link navigation triggered an interaction and the user clicked back a to cancel it.
      * The routing event sequence is different depending on the link that was clicked.
@@ -4955,76 +4911,7 @@ if (false) {
      * -> PopState
      * -> NavigationCancel
      */
-    var 
-    // See LeavingInteractionAfterPopStateTransition.createNavigationInteractionCancelledState(...) above.
-    //
-    // export class LeavingInteractionAfterPopStateCancelled extends NavigationState {
-    //
-    //   readonly isPopState = false;
-    //   firstCancelHandled = false;
-    //   popStateHandled = false;
-    //   popStateEventUrl: string;
-    //   debugPropertyKeys = ['idle', 'startingUrl', 'poppedHistoryUrl', 'locationChangeTriggerUrl', 'popStateEventUrl', 'firstCancelHandled', 'popStateHandled'];
-    //
-    //   constructor(context: Context,
-    //               readonly startingUrl: string,
-    //               readonly locationChangeTriggerUrl: string,
-    //               readonly poppedHistoryUrl: string) {
-    //     super(context);
-    //   }
-    //
-    //   get isTransitional() {
-    //     return true;
-    //   }
-    //
-    //   onRouterStarted(event: NavigationStart): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterCancelled(event: NavigationCancel): NavigationState {
-    //
-    //     // if (this.firstCancelHandled && this.popStateHandled) {
-    //     //   // Angular doesn't preserve the url when a guard cancels the back button.
-    //     //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-    //     //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-    //     //   this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
-    //     //   this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
-    //     //   if (this.interactionService.isActive()) {
-    //     //     const interactionIds = this.interactionService.activeInteractionContextIds.value;
-    //     //     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
-    //     //   } else {
-    //     //     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-    //     //   }
-    //     //   return this.createIdleState();
-    //     // } else {
-    //     //   this.firstCancelHandled = true;
-    //     return this.ignore(event);
-    //     // }
-    //   }
-    //
-    //
-    //   onRouterEnd(event: NavigationEnd): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onRouterError(event: NavigationError): NavigationState {
-    //     return this.ignore(event);
-    //   }
-    //
-    //
-    //   onPopState(event: NavigationStart): NavigationState {
-    //     // this.popStateHandled = true;
-    //     // this.popStateEventUrl = event.url;
-    //     return this.ignore(event);
-    //   }
-    //
-    //   async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {
-    //     return false;
-    //   }
-    // }
-    /**
+    var /**
      * This state handles the scenario where a link navigation triggered an interaction and the user clicked back a to cancel it.
      * The routing event sequence is different depending on the link that was clicked.
      *
@@ -5147,7 +5034,7 @@ if (false) {
          */
         function () {
             Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-            this.resetBrowserLocation(this.clickedLinkUrl); // put the back click one back in.
+            this.replaceBuggeredUrlAfterAngularRouterCancelled(this.clickedLinkUrl); // put the back click one back in.
             if (this.interactionService.isActive()) {
                 /** @type {?} */
                 var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -5267,7 +5154,13 @@ if (false) {
                 // Angular doesn't preserve the url when a guard cancels the back button.
                 // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
                 Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-                // this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
+                // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+                // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+                // it before the cancel event fired.
+                // So we need to:
+                // - replace the just inserted url with the one that used to be there.
+                // - push our actual url back onto the top of the stack.
+                this.replaceBuggeredUrlAfterAngularRouterCancelled(this.locationChangeTriggerUrl);
                 this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
                 if (this.interactionService.isActive()) {
                     /** @type {?} */
@@ -6029,14 +5922,25 @@ var PlaceRouter = /** @class */ (function (_super) {
     };
     /**
      * @param {?} url
+     * @param {?} options
      * @return {?}
      */
     PlaceRouter.prototype.resetBrowserLocation = /**
      * @param {?} url
+     * @param {?} options
      * @return {?}
      */
-    function (url) {
-        this.angularLocation.go(url);
+    function (url, options) {
+        options.replaceCurrent ? this.angularLocation.replaceState(url) : this.angularLocation.go(url);
+    };
+    /**
+     * @return {?}
+     */
+    PlaceRouter.prototype.forward = /**
+     * @return {?}
+     */
+    function () {
+        this.angularLocation.forward();
     };
     /**
      * @param {...?} visits
@@ -8517,8 +8421,8 @@ function RouteId(type, options) {
         /** @type {?} */
         var param = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        // UseDelegate({tag: `@RouteId(${prototype.constructor.name}.${propertyKey.toString()})`})(prototype, propertyKey);
-        UseDelegate()(prototype, propertyKey);
+        UseDelegate({ tag: "@RouteId(" + prototype.constructor.name + "." + propertyKey.toString() + ")" })(prototype, propertyKey);
+        // UseDelegate()(prototype, propertyKey);
     });
 }
 /**
@@ -8538,8 +8442,8 @@ function VisitParameter(options) {
         /** @type {?} */
         var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        // UseDelegate({tag: `@VisitParameter(${prototype.constructor.name}.${propertyKey.toString()})`})(prototype, propertyKey);
-        UseDelegate()(prototype, propertyKey);
+        UseDelegate({ tag: "@VisitParameter(" + prototype.constructor.name + "." + propertyKey.toString() + ")" })(prototype, propertyKey);
+        // UseDelegate()(prototype, propertyKey);
     });
 }
 /**
@@ -8558,8 +8462,8 @@ function VisitParameterList(options) {
     function (prototype, propertyKey) {
         /** @type {?} */
         var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
-        // UseDelegate({tag: `@VisitParameterList(${prototype.constructor.name}.${propertyKey.toString()})`})(prototype, propertyKey);
-        UseDelegate()(prototype, propertyKey);
+        UseDelegate({ tag: "@VisitParameterList(" + prototype.constructor.name + "." + propertyKey.toString() + ")" })(prototype, propertyKey);
+        // UseDelegate()(prototype, propertyKey);
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
     });
 }