@coolon/angular-ui-powerups 12.4.0 → 12.4.2

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

@@ -25,10 +25,9 @@ import { fas } from '@fortawesome/free-solid-svg-icons';
 import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, TrackExternal, ValueModel, StoreInValueModel, Command, MutableListModel, StoreInListModel, Disposable, MutableValueModel, DelegatingListModel, FocusManager, EventListenerList, Form, Guard, Binding, DebugContext, ListModel, MultipleSelectionModel, DelegatingSelectionModel, AbstractComputedListModel, DirtyTrackingForm, ComputedListModel, PageController, Deferred, Functions } from '@coolon/pectin';
 import { __decorate, __metadata, __awaiter } from 'tslib';
 import { DomSanitizer } from '@angular/platform-browser';
-import * as _ from 'lodash';
-import ___default from 'lodash';
+import { isEmpty, isString, isFunction, isNil, isInteger, findLast, isObject, isEqual, first, uniq, isNumber, isNaN as isNaN$1 } from 'lodash-es';
 import { marked } from 'marked';
-import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
+import { Memoize } from '@typescript-plus/fast-memoize-decorator';
 import { Enum } from 'typescript-string-enums';
 import { lang as lang$1, assert as assert$1, Stringy, Opts, Klass } from '@coolon/typescript-utilities';
 import ResizeObserver from 'resize-observer-polyfill';
@@ -39,9 +38,9 @@ import * as i1$1 from '@angular/material/dialog';
 import { MatDialogModule, MatDialog, MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
 import * as i1 from '@angular/router';
 import { RouterModule, ActivatedRouteSnapshot, UrlSegment, Router, UrlSerializer, NavigationStart, NavigationEnd, NavigationError, NavigationCancel } from '@angular/router';
+import { isFunction as isFunction$1 } from 'lodash';
 import { Overlay, CdkScrollable } from '@angular/cdk/overlay';
 import { MatListModule } from '@angular/material/list';
-import { Memoize as Memoize$1 } from '@typescript-plus/fast-memoize-decorator';
 import 'reflect-metadata';
 import { style, query, group, animate, trigger, transition } from '@angular/animations';
 import * as wakeEvent from 'wake-event';
@@ -340,7 +339,7 @@ class HighlightPipe extends GarbageCollector {
         var _a;
         const model = searchModel !== null && searchModel !== void 0 ? searchModel : (_a = this.highlightContext) === null || _a === void 0 ? void 0 : _a.aupHighlightTextModel;
         const searchText = model === null || model === void 0 ? void 0 : model.value;
-        if (___default.isEmpty(searchText) || !___default.isString(value)) {
+        if (isEmpty(searchText) || !isString(value)) {
             return value;
         }
         // Match in a case insensitive manner
@@ -464,7 +463,7 @@ BusyOverlayComponent.decorators = [
     { type: Component, args: [{
                 selector: 'aup-busy-overlay',
                 template: "<ng-content></ng-content>\n<div class=\"busy-overlay-backdrop\" *ngIf=\"busyModel.value\">\n  <mat-progress-spinner mode=\"indeterminate\" [diameter]=\"52\"></mat-progress-spinner>\n</div>\n",
-                styles: [":host{position:relative}div.busy-overlay-backdrop{z-index:10;z-index:var(--aup-busy-overlay-z-index, 10);position:absolute;background-color:#0003;top:0;left:0;bottom:0;right:0;display:grid;grid-template-columns:auto;grid-template-rows:auto;place-content:center}\n"]
+                styles: [":host{position:relative;display:flex;flex-direction:column;align-items:stretch}div.busy-overlay-backdrop{z-index:10;z-index:var(--aup-busy-overlay-z-index, 10);position:absolute;background-color:#0003;top:0;left:0;bottom:0;right:0;display:grid;grid-template-columns:auto;grid-template-rows:auto;place-content:center}\n"]
             },] }
 ];
 BusyOverlayComponent.ctorParameters = () => [];
@@ -494,27 +493,27 @@ var CommandFace;
         RAISED: 'raised'
     });
     function getColorOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.color) ? face.color() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.color) ? face.color() : undefined;
     }
     CommandFace.getColorOf = getColorOf;
     function getStyleOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.style) ? face.style() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.style) ? face.style() : undefined;
     }
     CommandFace.getStyleOf = getStyleOf;
     function getIconOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.icon) ? face.icon() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.icon) ? face.icon() : undefined;
     }
     CommandFace.getIconOf = getIconOf;
     function getIconPositionOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.iconPosition) ? face.iconPosition() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.iconPosition) ? face.iconPosition() : undefined;
     }
     CommandFace.getIconPositionOf = getIconPositionOf;
     function getTooltipOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.tooltip) ? face.tooltip() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.tooltip) ? face.tooltip() : undefined;
     }
     CommandFace.getTooltipOf = getTooltipOf;
     function getTextOf(face) {
-        return ___default.isFunction(face === null || face === void 0 ? void 0 : face.text) ? face.text() : undefined;
+        return isFunction(face === null || face === void 0 ? void 0 : face.text) ? face.text() : undefined;
     }
     CommandFace.getTextOf = getTextOf;
     class Adapter {
@@ -686,7 +685,7 @@ class CardContainerComponent extends AbstractCardContainerComponent {
         this.enabledScroll = false;
     }
     set columnCount(count) {
-        if (!_.isNil(count) && (!_.isInteger(count) || count < 1)) {
+        if (!isNil(count) && (!isInteger(count) || count < 1)) {
             lang$1.illegalState('columnCount must be a positive integer or nil');
         }
         this._columnCount = count;
@@ -700,14 +699,14 @@ class CardContainerComponent extends AbstractCardContainerComponent {
         this.updateColumnCountStyles();
     }
     get isAutoColumns() {
-        return _.isNil(this._columnCount);
+        return isNil(this._columnCount);
     }
     get isSingleColumn() {
         return this._columnCount === 1;
     }
     updateColumnCountStyles() {
         const el = this.elementRef.nativeElement;
-        if (_.isNil(this._columnCount)) {
+        if (isNil(this._columnCount)) {
             el.style.setProperty('--aup-card-container-column-count', '');
         }
         else {
@@ -928,7 +927,7 @@ class CommandComponent extends PopupAwareComponent {
         this.color$ = chain(this.activeFace$).map(f => CommandFace.getColorOf(f));
         this.tooltip$ = chain(this.activeFace$).map(f => CommandFace.getTooltipOf(f));
         this.iconOnly$ = this.faces$.select(face => {
-            return ___default.isEmpty(CommandFace.getTextOf(face)) && !___default.isEmpty(CommandFace.getIconOf(face));
+            return isEmpty(CommandFace.getTextOf(face)) && !isEmpty(CommandFace.getIconOf(face));
         }).count().equals(this.faces$.count());
     }
     isActive(face) {
@@ -1680,10 +1679,10 @@ class AutocompleteInputComponent extends AbstractValueInputComponent {
         this.optionLabelFormat = (option) => (option && this.optionLabel) ? option[this.optionLabel] : option;
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         const lowerCaseFilterValue = chain(this.filterValue)
-            .map(v => ___default.isString(v) ? v.toLowerCase() : '');
+            .map(v => isString(v) ? v.toLowerCase() : '');
         this.filteredOptions = chain(this.optionsModel)
             .select(option => {
-            return ___default.isEmpty(this.filterValue.value) || this.optionLabelFormat(option).toString().toLowerCase().includes(lowerCaseFilterValue.value);
+            return isEmpty(this.filterValue.value) || this.optionLabelFormat(option).toString().toLowerCase().includes(lowerCaseFilterValue.value);
         }, { dependsOn: lowerCaseFilterValue });
     }
     ngOnInit() {
@@ -2631,7 +2630,7 @@ class ColumnModel extends GarbageCollector {
     }
     onRendererAttached(host, component) {
         this._cellRendererPortalRef.onPortalAttached(host, component);
-        if (___default.isFunction(component === null || component === void 0 ? void 0 : component.matches)) {
+        if (isFunction(component === null || component === void 0 ? void 0 : component.matches)) {
             this._cellRendererTextSearchPredicate = (row, text) => component.matches(row, text);
         }
         else {
@@ -2678,11 +2677,11 @@ class PropertyColumnModel extends ColumnModel {
     cellRenderer(componentType, onComponentInitOrOptions) {
         this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, (component, rowData, firstTime) => {
             if (firstTime) {
-                if (___default.isFunction(onComponentInitOrOptions)) {
+                if (isFunction(onComponentInitOrOptions)) {
                     onComponentInitOrOptions(component);
                 }
                 else {
-                    if (___default.isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onComponentInit)) {
+                    if (isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onComponentInit)) {
                         onComponentInitOrOptions.onComponentInit(component);
                     }
                 }
@@ -2706,7 +2705,7 @@ class PropertyColumnModel extends ColumnModel {
             component[CELL_RENDERER_COMPONENT_ROW_CACHE] = rowData.row;
             let disableEditCallback = false;
             if (firstTime) {
-                if (___default.isFunction(options === null || options === void 0 ? void 0 : options.onComponentInit)) {
+                if (isFunction(options === null || options === void 0 ? void 0 : options.onComponentInit)) {
                     options.onComponentInit(component);
                 }
                 // install our edit callback
@@ -2721,7 +2720,7 @@ class PropertyColumnModel extends ColumnModel {
             disableEditCallback = true;
             component.value = rowData.row[this.property];
             disableEditCallback = false;
-            if (!___default.isFunction(options) && ___default.isFunction(options === null || options === void 0 ? void 0 : options.onRowUpdate)) {
+            if (!isFunction(options) && isFunction(options === null || options === void 0 ? void 0 : options.onRowUpdate)) {
                 options.onRowUpdate(component, rowData.row);
             }
         }));
@@ -2729,7 +2728,7 @@ class PropertyColumnModel extends ColumnModel {
     }
     cellEditor(editor, validatorsOrInitialiser, onComponentInit) {
         const validators = Array.isArray(validatorsOrInitialiser) ? validatorsOrInitialiser : undefined;
-        const initialiser = ___default.isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : onComponentInit;
+        const initialiser = isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : onComponentInit;
         this.configureCellEditor(new CellEditorPortalRef(editor, (component, editSession) => {
             const formValueModel = editSession.form.pluck(this.property);
             if (validators) {
@@ -2769,7 +2768,7 @@ class ListPropertyColumnModel extends ColumnModel {
     }
     cellEditor(editor, validatorsOrInitialiser, initialiseComponent) {
         const validators = Array.isArray(validatorsOrInitialiser) ? validatorsOrInitialiser : undefined;
-        const initialiser = ___default.isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : initialiseComponent;
+        const initialiser = isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : initialiseComponent;
         this.configureCellEditor(new CellEditorPortalRef(editor, (component, editSession) => {
             const formListModel = editSession.form.pluckList(this.property);
             if (validators) {
@@ -2800,17 +2799,17 @@ class CustomValueColumnModel extends ColumnModel {
     cellRenderer(componentType, onComponentInitOrOptions) {
         this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, (component, rowData, firstTime) => {
             if (firstTime) {
-                if (___default.isFunction(onComponentInitOrOptions)) {
+                if (isFunction(onComponentInitOrOptions)) {
                     onComponentInitOrOptions(component);
                 }
                 else {
-                    if (___default.isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onComponentInit)) {
+                    if (isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onComponentInit)) {
                         onComponentInitOrOptions.onComponentInit(component);
                     }
                 }
             }
             component.value = this.getValue(rowData.row);
-            if (!___default.isFunction(onComponentInitOrOptions) && ___default.isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onRowUpdate)) {
+            if (!isFunction(onComponentInitOrOptions) && isFunction(onComponentInitOrOptions === null || onComponentInitOrOptions === void 0 ? void 0 : onComponentInitOrOptions.onRowUpdate)) {
                 onComponentInitOrOptions.onRowUpdate(component, rowData.row);
             }
         }));
@@ -3094,7 +3093,7 @@ class ColumnListModel extends AbstractComputedListModel {
         }
         this.registerDisposable(column);
         this.runInTransaction(() => {
-            if (!_.isNil(index)) {
+            if (!isNil(index)) {
                 this._allColumns.insert(index, column);
             }
             else {
@@ -3176,14 +3175,14 @@ class AbstractTableModel extends GarbageCollector {
         this.selectionColumnModel = new SelectionColumnModel(columnId, () => this.getColumnTextProperties(columnId), selectionModel);
         this.addRowClass('aup-row-selected', row => this.selectionColumnModel.isSelected(row));
         const selectionColumnModel = this.addColumn(this.selectionColumnModel, 0);
-        if (!_.isNil(visible)) {
+        if (!isNil(visible)) {
             selectionColumnModel.visibleWhile(visible instanceof ValueModel ? visible : ValueModel.constant(visible));
         }
         return selectionColumnModel;
     }
     addEditControls(saveCommandFactory, formFactory) {
         this.saveCommandFactory = saveCommandFactory;
-        if (_.isFunction(formFactory)) {
+        if (isFunction(formFactory)) {
             this._createForm = formFactory;
         }
         const columnId = 'editControls';
@@ -3672,11 +3671,11 @@ var DecoratedTreeNode;
             return this.parent ? this.parent[treeNodeDecorator].children.length > 1 : false;
         }
         // find(predicate: Predicate<T>): T {
-        //   return _.find(this.descendants(), predicate);
+        //   return find(this.descendants(), predicate);
         // }
         //
         // select(predicate: Predicate<T>): T[] {
-        //   return _.filter(this.descendants(), predicate);
+        //   return filter(this.descendants(), predicate);
         // }
         //
         // flattenInto(array: T[]): T[] {
@@ -3878,7 +3877,7 @@ class TreeLabelColumnModel extends ColumnModel {
                 component.treeTableModel = this.expansionModel;
             }
             component.value = rowData.row;
-            component.label = ___default.isNil(this.labelProperty) ? undefined : rowData.row[this.labelProperty];
+            component.label = isNil(this.labelProperty) ? undefined : rowData.row[this.labelProperty];
             component.iconFactory = this.iconFactory;
         }));
         return this;
@@ -3904,7 +3903,7 @@ class TreeTableModel extends AbstractTableModel {
         this.treeExpansionModel = new TreeExpansionModel(row => this.identityOf(row));
         if (builder)
             builder(this);
-        const childExtractor = _.isFunction(childAccessor) ? childAccessor : row => row[childAccessor];
+        const childExtractor = isFunction(childAccessor) ? childAccessor : row => row[childAccessor];
         this.flattenedDataSource = this.registerDisposable(new FlattenedTreeListModel(source, childExtractor, this.treeExpansionModel));
         this.setDataSource(this.flattenedDataSource);
         this.addRowClass('aup-node-collapsed', row => this.isCollapsed(row));
@@ -4287,7 +4286,7 @@ class MarkdownComponent extends DisposableComponent {
     ngOnInit() {
         const { when } = Dsl.disposeWith(this);
         when(this.content$).changes(content => this.renderContent(content), { initialValue: 'triggerChangeUnlessNil' });
-        if (_.isNil(this.content) && !_.isEmpty(this.element.nativeElement.innerHTML)) {
+        if (isNil(this.content) && !isEmpty(this.element.nativeElement.innerHTML)) {
             this.renderContent(this.extractInnerContent(this.element.nativeElement.innerHTML));
         }
     }
@@ -4300,7 +4299,7 @@ class MarkdownComponent extends DisposableComponent {
         return lines.map(l => l.substr(prefix)).join('\n');
     }
     renderContent(content) {
-        if (!_.isNil(content)) {
+        if (!isNil(content)) {
             const markdown = this.inline ?
                 this.markdownService.renderInline(content) :
                 this.markdownService.render(content);
@@ -4644,11 +4643,11 @@ var Alert;
     }
     Alert.getContent = getContent;
     function getTitle(alert) {
-        return _.isFunction(alert.title) ? alert.title() : undefined;
+        return isFunction(alert.title) ? alert.title() : undefined;
     }
     Alert.getTitle = getTitle;
     function getColor(alert) {
-        return _.isFunction(alert.color) ? alert.color() : undefined;
+        return isFunction(alert.color) ? alert.color() : undefined;
     }
     Alert.getColor = getColor;
 })(Alert || (Alert = {}));
@@ -4687,7 +4686,7 @@ class AbstractDialogComponent extends Activity {
     }
     isDestructive() {
         // @ts-ignore
-        return _.isFunction(this.config['destructive']) && this.config.destructive();
+        return isFunction$1(this.config['destructive']) && this.config.destructive();
     }
 }
 AbstractDialogComponent.decorators = [
@@ -5009,7 +5008,7 @@ class ActivityContainerComponent extends AbstractInteractionContext {
         if (!this.isActive()) {
             lang$1.illegalState('no activity in progress');
         }
-        return ___default.findLast(this.activityRefs, tab => !tab.isComplete());
+        return findLast(this.activityRefs, tab => !tab.isComplete());
     }
     /**
      * Cancels the current activity and returns true the context is no longer active, false if
@@ -5142,7 +5141,7 @@ ActivityContainerComponent.decorators = [
     { type: Component, args: [{
                 selector: 'aup-activity-container',
                 template: "<mat-tab-group #tabs no-tab-header\n               [dynamicHeight]=\"dynamicHeight\"\n               [class.full-height-tabs]=\"!dynamicHeight\">\n  <mat-tab *ngFor=\"let activityRef of activityRefs; let i = index; trackBy: activityIndex\">\n    <aup-busy-overlay [busyModel]=\"busy\" cdkTrapFocus cdkTrapFocusAutoCapture>\n      <!--\n      We have issues where angular is triggering a leave animation when an\n      new activity is started, but is not running the enter animation\n      when it is scrolled back into view.  So we track the tab changes and\n      disable all animations inside the tab while we're animating.\n      -->\n      <div class=\"activity-outlet-wrapper\" [@.disabled]=\"!activityRef.focused\">\n        <aup-activity-outlet [nestedInteractionContext]=\"this\" [activityRef]=\"activityRef\"></aup-activity-outlet>\n      </div>\n    </aup-busy-overlay>\n  </mat-tab>\n</mat-tab-group>\n",
-                styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}\n"]
+                styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}.activity-outlet-wrapper{flex:1}\n"]
             },] }
 ];
 ActivityContainerComponent.ctorParameters = () => [];
@@ -5180,7 +5179,7 @@ class ActivityTitleComponent extends DisposableComponent {
         this._hasUserTransparentBackground = value;
     }
     get hasTransparentBackground() {
-        return ___default.isNil(this._hasUserTransparentBackground) ? !this._color : this._hasUserTransparentBackground;
+        return isNil(this._hasUserTransparentBackground) ? !this._color : this._hasUserTransparentBackground;
     }
     set color(color) {
         this._color = color;
@@ -5528,7 +5527,7 @@ InPlaceInteractionContextComponent.decorators = [
     { type: Component, args: [{
                 selector: 'aup-in-place-interaction-context',
                 template: "<mat-tab-group no-tab-header [selectedIndex]=\"isActive() ? 1 : 0\" full-height-tabs [dynamicHeight]=\"false\" [animationDuration]=\"animationDuration\">\n  <mat-tab>\n    <ng-content></ng-content>\n  </mat-tab>\n  <mat-tab>\n    <aup-activity-container #activityContainer [dynamicHeight]=\"false\"></aup-activity-container>\n  </mat-tab>\n</mat-tab-group>\n\n",
-                styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}\n"]
+                styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-activity-container{flex:1}\n"]
             },] }
 ];
 InPlaceInteractionContextComponent.ctorParameters = () => [
@@ -5825,7 +5824,7 @@ class InteractionContextTriggerFor extends GarbageCollector {
         });
     }
     prepareActivityData() {
-        return ___default.isFunction(this.activityDataFactory()) ? this.activityDataFactory() : this.activityData;
+        return isFunction(this.activityDataFactory()) ? this.activityDataFactory() : this.activityData;
     }
 }
 InteractionContextTriggerFor.decorators = [
@@ -5911,7 +5910,7 @@ class InputActivity extends Activity {
         }
     }
     shouldCancelOnEscape() {
-        return _.isNil(this.data.cancelOnEscape) // we default to true..
+        return isNil(this.data.cancelOnEscape) // we default to true..
             || this.data.cancelOnEscape;
     }
 }
@@ -6227,7 +6226,7 @@ class InlineStringEditorComponent extends DisposableComponent {
         // deviceDescription.isNil()
         ).areTruthy();
         this.displayValue = chain(this.editorModel.valueModel).map(v => {
-            return _.isEmpty(v) ? this.placeHolderModel.value : v;
+            return isEmpty(v) ? this.placeHolderModel.value : v;
         }, { dependsOn: this.placeHolderModel, allowNil: true });
     }
     createInputActivityData() {
@@ -6452,11 +6451,11 @@ class ParameterDefinition {
     }
     prepareCustomSanitiser(injector) {
         const customSanitiser = this.options.getOptional('sanitiser', null);
-        if (___default.isFunction(customSanitiser)) {
+        if (isFunction(customSanitiser)) {
             return injector.get(customSanitiser);
         }
-        if (___default.isObject(customSanitiser)) {
-            return ___default.isFunction(customSanitiser['sanitise']) ?
+        if (isObject(customSanitiser)) {
+            return isFunction(customSanitiser['sanitise']) ?
                 customSanitiser :
                 lang$1.illegalState(`expected @VisitParameter({sanitiser: ...}) for ${this.propertyName} to be a constructor or instance of ParameterSanitiser, got: ` + customSanitiser);
         }
@@ -6475,7 +6474,7 @@ class ParameterDefinition {
             this.backingModelFactory = () => new MutableValueModel();
         }
         isEmptyValue(value) {
-            return ___default.isNil(value);
+            return isNil(value);
         }
         hasChanged(a, b) {
             return a !== b;
@@ -6490,7 +6489,7 @@ class ParameterDefinition {
             this.backingModelFactory = () => new MutableValueModel();
         }
         isEmptyValue(value) {
-            return ___default.isNil(value);
+            return isNil(value);
         }
         hasChanged(a, b) {
             return a !== b;
@@ -6505,10 +6504,10 @@ class ParameterDefinition {
             this.backingModelFactory = () => new MutableListModel();
         }
         isEmptyValue(value) {
-            return ___default.isNil(value) || value.length < 1;
+            return isNil(value) || value.length < 1;
         }
         hasChanged(a, b) {
-            return !___default.isEqual(a, b);
+            return !isEqual(a, b);
         }
     }
     ParameterDefinition.ArrayParameter = ArrayParameter;
@@ -6555,12 +6554,12 @@ class PlaceDefinition {
     }
     getPlaceData(key, defaultValue) {
         return this.data ?
-            ___default.isNil(this.data[key]) ? defaultValue : this.data[key] :
+            isNil(this.data[key]) ? defaultValue : this.data[key] :
             defaultValue;
     }
     searchPlaceData(keys, defaultValue) {
         if (this.data) {
-            const found = keys.find(key => !___default.isNil(this.data[key]));
+            const found = keys.find(key => !isNil(this.data[key]));
             return found ? this.data[found] : defaultValue;
         }
         else {
@@ -6628,7 +6627,7 @@ class PlaceDefinition {
                         // because our id routes redirect if the id isn't present we always have a id
                         // parameter in our params.  This will bugger our remember and defaultvalue sanitisation
                         // as it'll see that the id is present (event thought its a blank string).
-                        if (!___default.isEmpty(value)) {
+                        if (!isEmpty(value)) {
                             result[def.name] = def.urlFormat.parse(value);
                         }
                     }
@@ -6740,8 +6739,8 @@ class PlaceComponent extends DisposableComponent {
         // Now we need to initialise the binding direction.  If we have a value in the Url then we should always push
         // that to the view.  If we don't and the view already has a value (e.g. a selection model has already initialised in the
         // component constructor) then we should push that to the route.
-        const isInVisit = !_.isNil(initialVisit.getParameterValue(parameterDef));
-        const isInModel = !_.isNil(model.value);
+        const isInVisit = !isNil(initialVisit.getParameterValue(parameterDef));
+        const isInModel = !isNil(model.value);
         if (!isInVisit && isInModel) {
             binding.writeLeft(); // push it to the route
         }
@@ -6819,7 +6818,7 @@ PlaceComponent.decorators = [
 ];
 PlaceComponent.ctorParameters = () => [];
 __decorate([
-    Memoize$1(),
+    Memoize(),
     __metadata("design:type", PlaceDefinition),
     __metadata("design:paramtypes", [])
 ], PlaceComponent.prototype, "placeDefinition", null);
@@ -6896,7 +6895,7 @@ class PlaceComponentDeactivationHandler {
                 if (this.isPrimaryComponent && this.routerInteractionAdapter.isModalActive()) {
                     const routeIds = this.urlService.getActiveInteractionIdsFromUrl(nextState.url);
                     const currentIds = this.routerInteractionAdapter.getActiveInteractionContextIds();
-                    if (!_.isEqual(currentIds, routeIds)) { // why am I checking this????
+                    if (!isEqual(currentIds, routeIds)) { // why am I checking this????
                         yield this.routerInteractionAdapter.cancelCurrentModalInteraction();
                         return false;
                     }
@@ -7215,7 +7214,7 @@ class SynchroniseInteractionContextIdsWithRoute extends NavigationSession {
         const currentIds = this.interactionServiceAdapter.getActiveInteractionContextIds();
         const previousIds = this.urlService.getCurrentLocationUrlSnapshot().getInteractionIds();
         // console.log(`---> synchroniseInteractionIds`, { is: currentIds.join(','), was: previousIds.join(',') });
-        if (___default.isEqual(currentIds, previousIds)) {
+        if (isEqual(currentIds, previousIds)) {
             // console.log('### Activity context ids were the same, skipping');
             this.context.finishRoutingSession();
         }
@@ -7653,7 +7652,7 @@ class PlaceHistory {
         return !!((_a = this._previousVisits) === null || _a === void 0 ? void 0 : _a.getVisitFor(placeDef));
     }
     getMostRecentVisitFor(placeDef) {
-        return ___default.first(this.getHistory(placeDef));
+        return first(this.getHistory(placeDef));
     }
     getHistory(placeDef) {
         let history = this._archive.get(placeDef);
@@ -7669,7 +7668,7 @@ class PlaceHistory {
     archive(visits) {
         visits.forEach(state => {
             const history = this.getHistory(state.placeDefinition);
-            const previousState = ___default.first(history);
+            const previousState = first(history);
             if (!previousState || state.hasChangedFrom(previousState)) {
                 history.unshift(state); // LIFO
                 this.setHistory(state.placeDefinition, history.slice(0, this.placeHistoryDepth));
@@ -7720,7 +7719,7 @@ PlaceHistory.ctorParameters = () => [];
     //       return Object.keys(parameters).reduce((acc, key) => {
     //         const matchValue = parameters[key];
     //         const visitValue = state.get(key);
-    //         const matched = matchValue === '*' ? !_.isNil(visitValue) : visitValue == matchValue;
+    //         const matched = matchValue === '*' ? !isNil(visitValue) : visitValue == matchValue;
     //         // Logger.get(this).info(`matched=${matched}`, parameters, visitValue);
     //         return acc && matched;
     //       }, true);
@@ -7729,18 +7728,18 @@ PlaceHistory.ctorParameters = () => [];
     //   }
     //
     //   last(): Visit.State {
-    //     return _.findLast(this._history, visit => this._matches(visit))
+    //     return findLast(this._history, visit => this._matches(visit))
     //   }
     //
     //   // @trace
     //   allThatMatch(): Visit.State[] {
-    //     return _.filter(this._history, visit => this._matches(visit)).slice(-this._limit);
+    //     return filter(this._history, visit => this._matches(visit)).slice(-this._limit);
     //   }
     //
     //   // @trace
     //   mostRecentValueOf<T=any>(param: string, defaultValue: T = null): T {
-    //     const lastStateWithParam = _.findLast(this.allThatMatch(), state => !_.isNil(state.get(param)));
-    //     return _.isNil(lastStateWithParam) ? defaultValue : lastStateWithParam.get(param);
+    //     const lastStateWithParam = findLast(this.allThatMatch(), state => !isNil(state.get(param)));
+    //     return isNil(lastStateWithParam) ? defaultValue : lastStateWithParam.get(param);
     //   }
     //
     //   limit(limit: number): this {
@@ -7790,7 +7789,7 @@ class ConsolidatedParameterMap {
         return !!this.paramMaps.find(m => m.has(name));
     }
     get keys() {
-        return _.uniq(this.paramMaps.reduce((result, params) => result.concat(params.keys), []));
+        return uniq(this.paramMaps.reduce((result, params) => result.concat(params.keys), []));
     }
 }
 __decorate([
@@ -7828,7 +7827,7 @@ class Visit {
     }
     // @Trace()
     hasRouteId() {
-        return !_.isNil(this.getRouteId());
+        return !isNil(this.getRouteId());
     }
     /**
      * Returns the value of the place parameter with the specified name.  The parameter
@@ -7837,7 +7836,7 @@ class Visit {
      * @param parameter the visit parameter definition
      */
     getParameterValue(parameter) {
-        return _.isString(parameter) ? this.visitParameters[parameter] : this.visitParameters[parameter.name];
+        return isString(parameter) ? this.visitParameters[parameter] : this.visitParameters[parameter.name];
     }
     // @Trace()
     hasParameter(parameterDef) {
@@ -7873,11 +7872,11 @@ class Visit {
         const currentParams = this.placeDefinition.getFormattedRouteParameters(this, true);
         const otherParams = this.placeDefinition.getFormattedRouteParameters(other, true);
         // console.log({currentParams, otherParams});
-        const sameRouteParameters = _.isEqual(currentParams, otherParams);
+        const sameRouteParameters = isEqual(currentParams, otherParams);
         return !samePlace || !sameRouteParameters;
     }
     hasChangedFrom(other) {
-        const sameNonRouteParameters = _.isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
+        const sameNonRouteParameters = isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
         return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
     }
     toDebugString() {
@@ -7947,7 +7946,7 @@ class UrlSnapshot {
         return this.getInteractionIds().length > 0;
     }
     hasInteractionIds(ids) {
-        return ___default.isEqual(this.getInteractionIds(), ids);
+        return isEqual(this.getInteractionIds(), ids);
     }
     // @Trace()
     updateInteractionIds(ids) {
@@ -8461,11 +8460,11 @@ class PlaceOutletComponent extends DisposableComponent {
             let placeIndex = 0;
             if (activatePlaceType.value) {
                 placeIndex = placesInOrder.indexOf(activatePlaceType.value);
-                if (_.isNil(this.initialPlaceIndex)) {
+                if (isNil(this.initialPlaceIndex)) {
                     this.initialPlaceIndex = placeIndex;
                 }
             }
-            return _.isNil(this.initialPlaceIndex) ? 0 : placeIndex - this.initialPlaceIndex;
+            return isNil(this.initialPlaceIndex) ? 0 : placeIndex - this.initialPlaceIndex;
         }, { dependsOn: activatePlaceType });
         this.animationSupported = this.placesInAnimationOrder.count().isGreaterThan(0);
         this.animationEnabled = valueOf.all(this.animateModel, this.animationSupported).areTruthy();
@@ -8562,6 +8561,7 @@ class PlaceOutletComponent extends DisposableComponent {
         const visitModel = new MutableValueModel(routerVisit);
         DebugContext.tag(visitModel, `PlaceOutletComponent[${activePlace.constructor.name})].visitModel`);
         activePlace.initialiseVisit(routerVisit, (current, previous) => {
+            console.log("initialiseVisitCallback", { routerVisitModel: this.routerVisitModel.value });
             this.pushVisitChangeToRoute(previous, current);
         });
         const finishPlaceLoad = () => {
@@ -8580,6 +8580,7 @@ class PlaceOutletComponent extends DisposableComponent {
         const { when, chain, valueOf } = Dsl.disposeWith(activePlace);
         when(this.routerVisitModel)
             .changes(visit => {
+            console.log("routerVisitModel.change", { routerVisitModel: this.routerVisitModel.value });
             this.pushVisitChangeToComponent(activePlace, visit);
         }, {
             unless: valueOf.any(this._isPushingVisitToRoute, this.routerVisitModel.isNil()).areTruthy()
@@ -8598,8 +8599,9 @@ class PlaceOutletComponent extends DisposableComponent {
                 this._isPushingVisitToRoute.value = false;
             }
             // sanitisers may have adjusted other values in the visit to we check and write it back.
-            if (current.hasRoutingChangedFrom(this.routerVisitModel.value)) {
-                this.pushVisitChangeToComponent(this.activePlaceModel.value, this.routerVisitModel.value);
+            const routerVisit = this.routerVisitModel.value; // this is occasionally null... need to investigate if that's a normal state or not.
+            if (routerVisit && current.hasRoutingChangedFrom(routerVisit)) {
+                this.pushVisitChangeToComponent(this.activePlaceModel.value, routerVisit);
             }
         });
     }
@@ -9031,7 +9033,7 @@ function Place(options) {
     return (target) => {
         var _a;
         if (PlaceComponent.isPlaceComponentConstructor(target)) {
-            PlaceComponent.injectDefinition(target, new PlaceDefinition(target, options.path, _.isNil(options.authenticate) ? true : options.authenticate, (_a = options.role) !== null && _a !== void 0 ? _a : options.roles, options.data, PlaceComponent.getRouteParameters(target), (options.children || []).map(c => PlaceComponent.getDefinition(c))));
+            PlaceComponent.injectDefinition(target, new PlaceDefinition(target, options.path, isNil(options.authenticate) ? true : options.authenticate, (_a = options.role) !== null && _a !== void 0 ? _a : options.roles, options.data, PlaceComponent.getRouteParameters(target), (options.children || []).map(c => PlaceComponent.getDefinition(c))));
             if (options.roles) {
                 console.warn(`${target.name} @Place({roles: string[]}) is deprecated.  Use @Place({role:any}) instead`);
             }
@@ -9217,11 +9219,11 @@ var Formatter;
     }
     class NumberType {
         format(value) {
-            return ___default.isNumber(value) && !___default.isNaN(value) ? `${value}` : null;
+            return isNumber(value) && !isNaN(value) ? `${value}` : null;
         }
         parse(value) {
             const parsed = Number.parseFloat(value);
-            return ___default.isNaN(parsed) ? null : parsed;
+            return isNaN$1(parsed) ? null : parsed;
         }
     }
     class BooleanType {