@coolon/angular-ui-powerups 12.0.7 → 12.1.0

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -3631,9 +3631,9 @@
     }());
     var AbstractTableModel = /** @class */ (function (_super) {
         __extends(AbstractTableModel, _super);
-        function AbstractTableModel(sourceOfTruth) {
+        function AbstractTableModel() {
             var _this = _super.call(this) || this;
-            _this.sourceOfTruth = sourceOfTruth;
+            _this._dataSource = new pectin.DelegatingListModel();
             _this._columnList = _this.registerDisposable(new ColumnListModel());
             _this._editorSessions = new pectin.MutableListModel();
             _this.rowClassNamePredicates = [];
@@ -3642,20 +3642,25 @@
             _this.trackBy = function (index, item) {
                 return _this.identityOf ? _this.identityOf(item) : index;
             };
-            _this.identityOf = sourceOfTruth.identityOf;
             var _b = pectin.Dsl.disposeWith(_this), chain = _b.chain, valueOf = _b.valueOf, before = _b.before, when = _b.when, after = _b.after, observe = _b.observe, switchOn = _b.switchOn;
             _this._rowsBeingEdited = new pectin.MutableListModel([], {
-                identifiedWith: _this.identityOf
+                identifiedWith: function (row) { return _this.identityOf(row); }
             });
             _this._editorSessionByRowId = chain(_this._editorSessions).indexBy('rowId');
             _this.editing = chain(_this._editorSessions).count().isGreaterThan(0);
-            _this.dataSource = chain(_this.sourceOfTruth).replaceAll(_this.rowsBeingEdited);
+            _this.dataSource = chain(_this._dataSource).replaceAll(_this.rowsBeingEdited);
             _this.firstEditableColumn = chain(_this.columns).select(function (c) { return c.hasEditorPortal(); }).first();
             _this.firstVisibleColumn = chain(_this._columnList).first();
             _this.lastVisibleColumn = chain(_this._columnList).last();
             _this.rowSelectionDisabledOnAllColumns = chain(_this._columnList).select(function (column) { return column.isRowSelectionEnabled(); }).count().equals(0);
             return _this;
         }
+        AbstractTableModel.prototype.setDataSource = function (sourceOfTruth) {
+            this._dataSource.setDelegate(sourceOfTruth);
+        };
+        AbstractTableModel.prototype.identityOf = function (row) {
+            return this._dataSource.identityOf(row);
+        };
         Object.defineProperty(AbstractTableModel.prototype, "rowsBeingEdited", {
             get: function () {
                 return this._rowsBeingEdited.readonly;
@@ -3975,6 +3980,189 @@
         ];
     })(exports.TreeInheritanceIconComponent || (exports.TreeInheritanceIconComponent = {}));
 
+    var treeNodeDecorator = Symbol('TreeDecorator');
+    exports.DecoratedTreeNode = void 0;
+    (function (DecoratedTreeNode) {
+        function decorateRoot(node, extractChildren) {
+            return new Decorator(undefined, node, extractChildren).decoratedNode;
+        }
+        DecoratedTreeNode.decorateRoot = decorateRoot;
+        function getDecorator(node) {
+            pectin.assert.notNil(node[treeNodeDecorator]);
+            return node[treeNodeDecorator];
+        }
+        DecoratedTreeNode.getDecorator = getDecorator;
+        var Decorator = /** @class */ (function () {
+            function Decorator(parent, node, extractChildren) {
+                this.parent = parent;
+                this.node = node;
+                this.extractChildren = extractChildren;
+                node[treeNodeDecorator] = this; // inject our decorator.
+            }
+            Object.defineProperty(Decorator.prototype, "children", {
+                get: function () {
+                    var _this = this;
+                    return this.extractChildren(this.node)
+                        .map(function (child) { var _a; return (_a = child[treeNodeDecorator]) !== null && _a !== void 0 ? _a : new Decorator(_this.decoratedNode, child, _this.extractChildren); })
+                        .map(function (d) { return d.decoratedNode; });
+                },
+                enumerable: false,
+                configurable: true
+            });
+            Object.defineProperty(Decorator.prototype, "decoratedNode", {
+                get: function () {
+                    return this.node;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            Decorator.prototype.siblingsBefore = function () {
+                if (this.parent) {
+                    return this.parent[treeNodeDecorator].children.slice(0, this.myIndex());
+                }
+                else {
+                    return [];
+                }
+            };
+            Decorator.prototype.siblingsAfter = function () {
+                if (this.parent) {
+                    return this.parent[treeNodeDecorator].children.slice(1 + this.myIndex());
+                }
+                else {
+                    return [];
+                }
+            };
+            Decorator.prototype.siblings = function () {
+                return [].concat(this.siblingsBefore(), this.siblingsAfter());
+            };
+            Decorator.prototype.isFirstChild = function () {
+                return this.parent ? this.myIndex() === 0 : false;
+            };
+            Decorator.prototype.myIndex = function () {
+                var _this = this;
+                var myIndex = this.parent[treeNodeDecorator].children.findIndex(function (child) { return _this.node === child; });
+                pectin.assert.isTruthy(myIndex >= 0, 'illegal state, expected index to be >= 0');
+                return myIndex;
+            };
+            Decorator.prototype.isLastChild = function () {
+                return this.parent ? this.myIndex() === this.parent[treeNodeDecorator].children.length - 1 : false;
+            };
+            Decorator.prototype.hasSiblings = function () {
+                return this.parent ? this.parent[treeNodeDecorator].children.length > 1 : false;
+            };
+            // find(predicate: Predicate<T>): T {
+            //   return _.find(this.descendants(), predicate);
+            // }
+            //
+            // select(predicate: Predicate<T>): T[] {
+            //   return _.filter(this.descendants(), predicate);
+            // }
+            //
+            // flattenInto(array: T[]): T[] {
+            //   this.visitSelfAndDescendants(child => array.push(child));
+            //   return array;
+            // }
+            Decorator.prototype.ancestors = function () {
+                return this.parent ? this.parent[treeNodeDecorator].ancestors().concat([this.parent]) : [];
+            };
+            // ancestorsAndSelf(): T[] {
+            //   return this.memoize('ancestorsAndSelf', () => {
+            //     return this.ancestors().concat([(this.decoratedSelf)]);
+            //   });
+            // }
+            // pathToParent(parent: T): T[] {
+            //   if (this.node === parent.node) {
+            //     return [];
+            //   } else if (this.parent) {
+            //     const pathToParent = this.parent.pathToParent(parent);
+            //     return pathToParent.concat([this.parent]);
+            //   } else {
+            //     throw new Error('parent is not an ancestor');
+            //   }
+            // }
+            //
+            // pathToParentAndSelf(parent): T[] {
+            //   return this.pathToParent(parent).concat([this.decoratedSelf]);
+            // }
+            Decorator.prototype.isRoot = function () {
+                return !this.parent;
+            };
+            Object.defineProperty(Decorator.prototype, "depth", {
+                get: function () {
+                    return this.isRoot() ? 0 : this.parent[treeNodeDecorator].depth + 1;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            Decorator.prototype.isLeaf = function () {
+                return !this.isRoot() && this.children.length < 1;
+            };
+            Decorator.prototype.hasChildren = function () {
+                return this.children.length > 0;
+            };
+            return Decorator;
+        }());
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Array),
+            __metadata("design:paramtypes", [])
+        ], Decorator.prototype, "children", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Array)
+        ], Decorator.prototype, "siblingsBefore", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Array)
+        ], Decorator.prototype, "siblingsAfter", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Array)
+        ], Decorator.prototype, "siblings", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Boolean)
+        ], Decorator.prototype, "isFirstChild", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", void 0)
+        ], Decorator.prototype, "myIndex", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Boolean)
+        ], Decorator.prototype, "isLastChild", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Boolean)
+        ], Decorator.prototype, "hasSiblings", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", Array)
+        ], Decorator.prototype, "ancestors", null);
+        __decorate([
+            src.Memoize(),
+            __metadata("design:type", Number),
+            __metadata("design:paramtypes", [])
+        ], Decorator.prototype, "depth", null);
+        DecoratedTreeNode.Decorator = Decorator;
+    })(exports.DecoratedTreeNode || (exports.DecoratedTreeNode = {}));
+
     var TreeLabelCellRendererComponent = /** @class */ (function (_super) {
         __extends(TreeLabelCellRendererComponent, _super);
         function TreeLabelCellRendererComponent() {
@@ -3983,11 +4171,11 @@
             _this.nodeModel = new pectin.MutableValueModel();
             var chain = pectin.Dsl.disposeWith(_this).chain;
             _this.iconList = chain(_this.nodeModel).mapToList(function (node) {
-                var icons = node.ancestors().slice(1).map(function (ancestor) {
-                    return ancestor.isLastChild() ? exports.TreeInheritanceIconComponent.Type.ICON_BLANK : exports.TreeInheritanceIconComponent.Type.ICON_THROUGH;
+                var icons = exports.DecoratedTreeNode.getDecorator(node).ancestors().slice(1).map(function (ancestor) {
+                    return exports.DecoratedTreeNode.getDecorator(ancestor).isLastChild() ? exports.TreeInheritanceIconComponent.Type.ICON_BLANK : exports.TreeInheritanceIconComponent.Type.ICON_THROUGH;
                 });
-                if (!node.isRoot()) {
-                    icons.push(node.isLastChild() ? exports.TreeInheritanceIconComponent.Type.ICON_INHERITED_TERMINAL : exports.TreeInheritanceIconComponent.Type.ICON_INHERITED_THROUGH_TERMINAL);
+                if (!exports.DecoratedTreeNode.getDecorator(node).isRoot()) {
+                    icons.push(exports.DecoratedTreeNode.getDecorator(node).isLastChild() ? exports.TreeInheritanceIconComponent.Type.ICON_INHERITED_TERMINAL : exports.TreeInheritanceIconComponent.Type.ICON_INHERITED_THROUGH_TERMINAL);
                 }
                 return icons;
             });
@@ -3997,25 +4185,25 @@
             var _this = this;
             var chain = pectin.Dsl.disposeWith(this).chain;
             this.canExpand = chain(this.nodeModel).map(function (node) {
-                return node.hasChildren() && _this.expansionModel.isCollapsed(node);
+                return exports.DecoratedTreeNode.getDecorator(node).hasChildren() && _this.expansionModel.isCollapsed(node);
             }, { dependsOn: this.expansionModel.isExpandedPredicate });
             this.canCollapse = chain(this.nodeModel).map(function (node) {
-                return node.hasChildren() && !_this.expansionModel.isCollapsed(node);
+                return exports.DecoratedTreeNode.getDecorator(node).hasChildren() && !_this.expansionModel.isCollapsed(node);
             }, { dependsOn: this.expansionModel.isExpandedPredicate });
             this.iconModel = chain(this.nodeModel).map(function (node) {
-                return _this.node.isLeaf() ? undefined : _this.iconFactory(node, _this.expansionModel.isExpanded(_this.node));
+                return exports.DecoratedTreeNode.getDecorator(_this.node).isLeaf() ? undefined : _this.iconFactory(node, _this.expansionModel.isExpanded(_this.node));
             }, { dependsOn: this.expansionModel.isExpandedPredicate });
         };
         Object.defineProperty(TreeLabelCellRendererComponent.prototype, "isRoot", {
             get: function () {
-                return this.node.isRoot();
+                return exports.DecoratedTreeNode.getDecorator(this.node).isRoot();
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(TreeLabelCellRendererComponent.prototype, "isLeaf", {
             get: function () {
-                return this.node.isLeaf();
+                return exports.DecoratedTreeNode.getDecorator(this.node).isLeaf();
             },
             enumerable: false,
             configurable: true
@@ -4054,6 +4242,38 @@
         __metadata("design:type", Object)
     ], TreeLabelCellRendererComponent.prototype, "value", void 0);
 
+    var FlattenedTreeListModel = /** @class */ (function (_super) {
+        __extends(FlattenedTreeListModel, _super);
+        function FlattenedTreeListModel(source, childRef, expansionModel) {
+            var _this = _super.call(this, source) || this;
+            _this.source = source;
+            _this.childRef = childRef;
+            _this.expansionModel = expansionModel;
+            _this.trackSource(expansionModel.isExpandedPredicate);
+            return _this;
+        }
+        FlattenedTreeListModel.prototype.getIdentityOf = function (item) {
+            return this.source.identityOf(item);
+        };
+        FlattenedTreeListModel.prototype.compute = function (values) {
+            var _this = this;
+            var result = [];
+            values.forEach(function (rootNode) {
+                return _this.addNodeAndVisibleChildren(exports.DecoratedTreeNode.decorateRoot(rootNode, _this.childRef), result);
+            });
+            return result;
+        };
+        FlattenedTreeListModel.prototype.addNodeAndVisibleChildren = function (node, result) {
+            var _this = this;
+            result.push(node);
+            var decorator = node[treeNodeDecorator];
+            if (decorator.hasChildren() && !this.expansionModel.isCollapsed(node)) {
+                decorator.children.forEach(function (child) { return _this.addNodeAndVisibleChildren(child, result); });
+            }
+        };
+        return FlattenedTreeListModel;
+    }(pectin.ComputedListModel));
+
     var TreeExpansionModel = /** @class */ (function () {
         function TreeExpansionModel(identityOf) {
             this.identityOf = identityOf;
@@ -4071,39 +4291,39 @@
         // @Trace()
         TreeExpansionModel.prototype.expand = function (node) {
             if (this.isCollapsed(node)) {
-                this.collapsedIds.delete(this.identityOf(node.node));
+                this.collapsedIds.delete(this.identityOf(node));
                 this.updatePredicate();
             }
         };
         // @Trace()
         TreeExpansionModel.prototype.collapse = function (node) {
             if (!this.isCollapsed(node)) {
-                this.collapsedIds.add(this.identityOf(node.node));
+                this.collapsedIds.add(this.identityOf(node));
                 this.updatePredicate();
             }
         };
         TreeExpansionModel.prototype.canExpand = function (node) {
-            return node.hasChildren() && this.isCollapsed(node);
+            return exports.DecoratedTreeNode.getDecorator(node).hasChildren() && this.isCollapsed(node);
         };
         TreeExpansionModel.prototype.canCollapse = function (node) {
-            return node.hasChildren() && !this.isCollapsed(node);
+            return exports.DecoratedTreeNode.getDecorator(node).hasChildren() && !this.isCollapsed(node);
         };
         TreeExpansionModel.prototype.isCollapsed = function (node) {
-            return this.collapsedIds.has(this.identityOf(node.node));
+            return this.collapsedIds.has(this.identityOf(node));
         };
         TreeExpansionModel.prototype.isExpanded = function (node) {
             return !this.isCollapsed(node);
         };
         TreeExpansionModel.prototype.ensureAncestorsAndSelfVisible = function (node) {
             var _this = this;
-            node.ancestors()
-                .map(function (a) { return _this.identityOf(node.node); })
+            exports.DecoratedTreeNode.getDecorator(node).ancestors()
+                .map(function (a) { return _this.identityOf(node); })
                 .forEach(function (id) { return _this.collapsedIds.delete(id); });
             this.updatePredicate();
         };
         TreeExpansionModel.prototype.updatePredicate = function () {
             var _this = this;
-            this._isExpandedPredicate.value = function (node) { return !_this.collapsedIds.has(_this.identityOf(node.node)); };
+            this._isExpandedPredicate.value = function (node) { return !_this.collapsedIds.has(_this.identityOf(node)); };
         };
         return TreeExpansionModel;
     }());
@@ -4141,253 +4361,6 @@
         return TreeLabelColumnModel;
     }(ColumnModel));
 
-    exports.SelfAndDescendantsVisitor = /** @class */ (function () {
-        function SelfAndDescendantsVisitor() {
-        }
-        SelfAndDescendantsVisitor.prototype.visit = function (it) {
-            this.onVisit(it);
-            if (this.shouldVisitChildrenOf(it)) {
-                it.visitChildren(this);
-            }
-        };
-        SelfAndDescendantsVisitor.prototype.shouldVisitChildrenOf = function (it) {
-            return true;
-        };
-        return SelfAndDescendantsVisitor;
-    }());
-    (function (SelfAndDescendantsVisitor) {
-        var Each = /** @class */ (function (_super) {
-            __extends(Each, _super);
-            function Each(callback) {
-                var _this = _super.call(this) || this;
-                _this.callback = callback;
-                return _this;
-            }
-            Each.prototype.onVisit = function (it) {
-                this.callback(it);
-            };
-            return Each;
-        }(SelfAndDescendantsVisitor));
-        SelfAndDescendantsVisitor.Each = Each;
-    })(exports.SelfAndDescendantsVisitor || (exports.SelfAndDescendantsVisitor = {}));
-
-    var DecoratedTreeNodeMixin = /** @class */ (function () {
-        function DecoratedTreeNodeMixin(parent, node) {
-            this.parent = parent;
-            this.node = node;
-        }
-        Object.defineProperty(DecoratedTreeNodeMixin.prototype, "decoratedSelf", {
-            get: function () {
-                var _this = this;
-                return this.memoize('decoratedSelf', function () {
-                    return _this.parent ? _this.parent.children.find(function (child) { return child.node === _this.node; }) : exports.DecoratedTreeNode.createRoot(_this.node);
-                });
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(DecoratedTreeNodeMixin.prototype, "children", {
-            get: function () {
-                var _this = this;
-                return this.memoize('children', function () {
-                    return _this.node.children ? _this.node.children.map(function (child) {
-                        return typescriptUtilities.Mixin.createProxy(child, new DecoratedTreeNodeMixin(_this.decoratedSelf, child));
-                    }) : [];
-                });
-            },
-            enumerable: false,
-            configurable: true
-        });
-        DecoratedTreeNodeMixin.prototype.descendants = function () {
-            var _this = this;
-            return this.memoize('descendants', function () {
-                var result = [];
-                _this.visitDescendants(function (child) { return result.push(child); });
-                return result;
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.selfAndDescendants = function () {
-            var _this = this;
-            return this.memoize('selfAndDescendants', function () {
-                var result = [];
-                _this.visitSelfAndDescendants(function (child) { return result.push(child); });
-                return result;
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.siblingsBefore = function () {
-            var _this = this;
-            return this.memoize('siblingsBefore', function () {
-                if (_this.parent) {
-                    return _this.parent.children.slice(0, _this.myIndex());
-                }
-                else {
-                    return [];
-                }
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.siblingsAfter = function () {
-            var _this = this;
-            return this.memoize('siblingsAfter', function () {
-                if (_this.parent) {
-                    return _this.parent.children.slice(1 + _this.myIndex());
-                }
-                else {
-                    return [];
-                }
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.siblings = function () {
-            var _this = this;
-            return this.memoize('siblings', function () { return [].concat(_this.siblingsBefore(), _this.siblingsAfter()); });
-        };
-        DecoratedTreeNodeMixin.prototype.isFirstChild = function () {
-            var _this = this;
-            return this.memoize('isFirstChild', function () { return _this.parent ? _this.myIndex() === 0 : false; });
-        };
-        DecoratedTreeNodeMixin.prototype.myIndex = function () {
-            var _this = this;
-            return this.memoize('myIndex', function () {
-                var myIndex = _this.parent.children.findIndex(function (child) { return child.node === _this.node; });
-                pectin.assert.isTruthy(myIndex >= 0, 'illegal state, expected index to be >= 0');
-                return myIndex;
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.isLastChild = function () {
-            var _this = this;
-            return this.memoize('isLastChild', function () {
-                return _this.parent ? _this.myIndex() === _this.parent.children.length - 1 : false;
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.hasSiblings = function () {
-            return this.parent ? this.node.children.length > 1 : false;
-        };
-        DecoratedTreeNodeMixin.prototype.find = function (predicate) {
-            return ___namespace.find(this.descendants(), predicate);
-        };
-        DecoratedTreeNodeMixin.prototype.select = function (predicate) {
-            return ___namespace.filter(this.descendants(), predicate);
-        };
-        DecoratedTreeNodeMixin.prototype.flattenInto = function (array) {
-            this.visitSelfAndDescendants(function (child) { return array.push(child); });
-            return array;
-        };
-        DecoratedTreeNodeMixin.prototype.ancestors = function () {
-            var _this = this;
-            return this.memoize('ancestors', function () {
-                return _this.parent ? _this.parent.ancestors().concat([_this.parent]) : [];
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.ancestorsAndSelf = function () {
-            var _this = this;
-            return this.memoize('ancestorsAndSelf', function () {
-                return _this.ancestors().concat([(_this.decoratedSelf)]);
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.pathToParent = function (parent) {
-            if (this.node === parent.node) {
-                return [];
-            }
-            else if (this.parent) {
-                var pathToParent = this.parent.pathToParent(parent);
-                return pathToParent.concat([this.parent]);
-            }
-            else {
-                throw new Error('parent is not an ancestor');
-            }
-        };
-        DecoratedTreeNodeMixin.prototype.pathToParentAndSelf = function (parent) {
-            return this.pathToParent(parent).concat([this.decoratedSelf]);
-        };
-        DecoratedTreeNodeMixin.prototype.isRoot = function () {
-            return !this.parent;
-        };
-        Object.defineProperty(DecoratedTreeNodeMixin.prototype, "depth", {
-            get: function () {
-                return this.isRoot() ? 0 : this.parent.depth + 1;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        DecoratedTreeNodeMixin.prototype.isLeaf = function () {
-            return !this.isRoot() && this.node.children.length < 1;
-        };
-        DecoratedTreeNodeMixin.prototype.hasChildren = function () {
-            return this.node.children && this.node.children.length > 0;
-        };
-        DecoratedTreeNodeMixin.prototype.depthFromParent = function (parent) {
-            return this.pathToParent(parent).length;
-        };
-        DecoratedTreeNodeMixin.prototype.treeDepth = function () {
-            var _this = this;
-            return this.memoize('treeDepth', function () {
-                return 1 + _this.descendants().map(function (child) { return child.depthFromParent(_this); }).reduce(function (prev, current) { return Math.max(prev, current); });
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.flatten = function () {
-            var _this = this;
-            return this.memoize('flatten', function () {
-                return _this.flattenInto([]);
-            });
-        };
-        DecoratedTreeNodeMixin.prototype.visit = function (visitor) {
-            visitor.visit(this);
-            return visitor;
-        };
-        DecoratedTreeNodeMixin.prototype.visitChildren = function (visitor) {
-            ___namespace.each(this.children, function (child) { return child.visit(visitor); });
-            return visitor;
-        };
-        DecoratedTreeNodeMixin.prototype.visitSelfAndDescendants = function (callback) {
-            this.visit(new exports.SelfAndDescendantsVisitor.Each(callback));
-        };
-        DecoratedTreeNodeMixin.prototype.visitDescendants = function (callback) {
-            this.visitChildren(new exports.SelfAndDescendantsVisitor.Each(callback));
-        };
-        DecoratedTreeNodeMixin.prototype.memoize = function (property, factory) {
-            var key = "__" + property;
-            if (___namespace.isNil(this[key])) {
-                this[key] = factory();
-            }
-            return this[key];
-        };
-        return DecoratedTreeNodeMixin;
-    }());
-    exports.DecoratedTreeNode = void 0;
-    (function (DecoratedTreeNode) {
-        function createRoot(node) {
-            return typescriptUtilities.Mixin.createProxy(node, new DecoratedTreeNodeMixin(undefined, node));
-        }
-        DecoratedTreeNode.createRoot = createRoot;
-    })(exports.DecoratedTreeNode || (exports.DecoratedTreeNode = {}));
-
-    var TreeToListModel = /** @class */ (function (_super) {
-        __extends(TreeToListModel, _super);
-        function TreeToListModel(source, expansionModel) {
-            var _this = _super.call(this, source) || this;
-            _this.source = source;
-            _this.expansionModel = expansionModel;
-            _this.trackSource(_this.expansionModel.isExpandedPredicate);
-            return _this;
-        }
-        TreeToListModel.prototype.getIdentityOf = function (item) {
-            return this.source.identityOf(item.node);
-        };
-        TreeToListModel.prototype.compute = function (values) {
-            var _this = this;
-            var result = [];
-            values.forEach(function (value) { return _this.addNodeAndVisibleChildren(exports.DecoratedTreeNode.createRoot(value), result); });
-            return result;
-        };
-        TreeToListModel.prototype.addNodeAndVisibleChildren = function (node, result) {
-            var _this = this;
-            result.push(node);
-            if (node.hasChildren() && !this.expansionModel.isCollapsed(node)) {
-                node.children.forEach(function (child) { return _this.addNodeAndVisibleChildren(child, result); });
-            }
-        };
-        return TreeToListModel;
-    }(pectin.ComputedListModel));
-
     // TODO:
     //    Selection Models:
     //      - as simple navigation tree
@@ -4400,24 +4373,16 @@
     //
     var TreeTableModel = /** @class */ (function (_super) {
         __extends(TreeTableModel, _super);
-        function TreeTableModel(source, treeExpansionModel) {
-            var _this = _super.call(this, source) || this;
-            _this.treeExpansionModel = treeExpansionModel;
+        function TreeTableModel(source, childAccessor, builder) {
+            var _this = _super.call(this) || this;
+            _this.treeExpansionModel = new TreeExpansionModel(function (row) { return _this.identityOf(row); });
+            if (builder)
+                builder(_this);
+            var childExtractor = ___namespace.isFunction(childAccessor) ? childAccessor : function (row) { return row[childAccessor]; };
+            _this.flattenedDataSource = _this.registerDisposable(new FlattenedTreeListModel(source, childExtractor, _this.treeExpansionModel));
+            _this.setDataSource(_this.flattenedDataSource);
             return _this;
         }
-        TreeTableModel.fromList = function (sourceOfTruth, builder) {
-            return TreeTableModel._create(TreeTableModel, sourceOfTruth, builder);
-        };
-        TreeTableModel._create = function (klass, sourceOfTruth, builder) {
-            var treeExpansionModel = new TreeExpansionModel(sourceOfTruth.identityOf);
-            var garbage = new pectin.GarbageCollector();
-            var nodes = garbage.registerDisposable(new TreeToListModel(sourceOfTruth, treeExpansionModel));
-            var model = new klass(nodes, treeExpansionModel);
-            model.registerDisposable(garbage);
-            if (builder)
-                builder(model);
-            return model;
-        };
         TreeTableModel.prototype.treeControlColumn = function (builder) {
             var _this = this;
             var columnId = 'tree-label';
@@ -6316,7 +6281,7 @@
     /**
      * Example:
      * @example
-     * const model = TableModel.fromList(heroList, table => {
+     * const model = new TableModel(heroList, table => {
      *   table.pluck("firstName");
      *   table.pluck("lastName");
      *   table.addCustomColumn("fullName", hero => `${hero.firstName} ${hero.lastName}`);
@@ -6348,7 +6313,7 @@
      *
      * Selection models
      * @example
-     * const model = TableModel.fromList(heroList, table => {
+     * const model = new TableModel(heroList, table => {
      *   table.addSelectionColumn(selectionModel); // <- can be single or multiple selection model
      *   table.pluck("firstName");
      *   table.pluck("lastName");
@@ -6356,7 +6321,7 @@
      *
      * Custom cell renderers and editors
      * @example
-     * const model = TableModel.fromList(heroList, table => {
+     * const model = new TableModel(heroList, table => {
      *   table.pluck("favoriteColor")
      *      .cellHeaderRenderer(CellHeaderRendererComponent, (component, column) => {
      *        // configure your component with what ever you need.
@@ -6368,7 +6333,7 @@
      *
      * Template columns
      * @example
-     * const model = TableModel.fromList(heroList, table => {
+     * const model = new TableModel(heroList, table => {
      *   table.addSelectionColumn(selectionModel); // <- can be single or multiple selection model
      *   table.addTemplateColumn("myTemplate");
      * });
@@ -6385,7 +6350,7 @@
      *      fullName:
      *         headerText: "Full Name"
      *
-     * const model = TableModel.fromList(heroList, table => {
+     * const model = new TableModel(heroList, table => {
      *   table.pluck("favoriteColor").cellRenderer(...).cellEditor(...);
      *   table.addCustomColumn("fullName", hero => `${hero.firstName} ${hero.lastName}`);
      *
@@ -6394,17 +6359,21 @@
      */
     var TableModel = /** @class */ (function (_super) {
         __extends(TableModel, _super);
-        function TableModel() {
-            return _super !== null && _super.apply(this, arguments) || this;
+        function TableModel(sourceOfTruth, builder) {
+            var _this = _super.call(this) || this;
+            if (builder) {
+                builder(_this);
+            }
+            _this.setDataSource(sourceOfTruth);
+            return _this;
         }
+        /**
+         * @deprecated use new TableModel(sourceOfTruth, table => {...}); instead.
+         * @param sourceOfTruth
+         * @param builder
+         */
         TableModel.fromList = function (sourceOfTruth, builder) {
-            return TableModel._create(TableModel, sourceOfTruth, builder);
-        };
-        TableModel._create = function (klass, sourceOfTruth, builder) {
-            var model = new klass(sourceOfTruth);
-            if (builder)
-                builder(model);
-            return model;
+            return new TableModel(sourceOfTruth, builder);
         };
         TableModel.prototype.addSelectionColumn = function (selectionModel, showSelectionColumn) {
             return this._addSelectionColumn(selectionModel, showSelectionColumn);
@@ -6412,6 +6381,36 @@
         return TableModel;
     }(AbstractTableModel));
 
+    exports.SelfAndDescendantsVisitor = /** @class */ (function () {
+        function SelfAndDescendantsVisitor() {
+        }
+        SelfAndDescendantsVisitor.prototype.visit = function (it) {
+            this.onVisit(it);
+            if (this.shouldVisitChildrenOf(it)) {
+                it.visitChildren(this);
+            }
+        };
+        SelfAndDescendantsVisitor.prototype.shouldVisitChildrenOf = function (it) {
+            return true;
+        };
+        return SelfAndDescendantsVisitor;
+    }());
+    (function (SelfAndDescendantsVisitor) {
+        var Each = /** @class */ (function (_super) {
+            __extends(Each, _super);
+            function Each(callback) {
+                var _this = _super.call(this) || this;
+                _this.callback = callback;
+                return _this;
+            }
+            Each.prototype.onVisit = function (it) {
+                this.callback(it);
+            };
+            return Each;
+        }(SelfAndDescendantsVisitor));
+        SelfAndDescendantsVisitor.Each = Each;
+    })(exports.SelfAndDescendantsVisitor || (exports.SelfAndDescendantsVisitor = {}));
+
     /**
      * @file Automatically generated by barrelsby.
      */
@@ -9738,6 +9737,7 @@
     exports.EditorControlColumnModel = EditorControlColumnModel;
     exports.EmptyStateComponent = EmptyStateComponent;
     exports.EventCleanUpSession = EventCleanUpSession;
+    exports.FlattenedTreeListModel = FlattenedTreeListModel;
     exports.FlexComponent = FlexComponent;
     exports.FocusBinding = FocusBinding;
     exports.FocusBindingDirective = FocusBindingDirective;
@@ -9821,7 +9821,6 @@
     exports.TreeLabelColumnModel = TreeLabelColumnModel;
     exports.TreeTableComponent = TreeTableComponent;
     exports.TreeTableModel = TreeTableModel;
-    exports.TreeToListModel = TreeToListModel;
     exports.UrlService = UrlService;
     exports.VerticalFocusContainerComponent = VerticalFocusContainerComponent;
     exports.VisibilityService = VisibilityService;
@@ -9835,6 +9834,7 @@
     exports.leftRightPlaceAnimation = leftRightPlaceAnimation;
     exports.slideDownOnEnterAnimation = slideDownOnEnterAnimation;
     exports.slideRightOnEnterAnimation = slideRightOnEnterAnimation;
+    exports.treeNodeDecorator = treeNodeDecorator;
     exports.ɵ0 = ɵ0;
 
     Object.defineProperty(exports, '__esModule', { value: true });