@coolon/angular-ui-powerups 12.4.0-alpha.18 → 12.4.0-alpha.2

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

@@ -2,43 +2,26 @@ import { lang, Mixin } from '@coolon/typescript-utilities';
 import * as _ from 'lodash';
 import { DefaultUrlSerializer } from '@angular/router';
 
-var ElementLocator;
-(function (ElementLocator) {
-    function findByCssSelector(selector) {
-        return {
-            findIn: parent => parent.dom().find(selector),
-            shouldNotExist: (p) => p.dom().find(selector).should('not.exist')
-        };
-    }
-    ElementLocator.findByCssSelector = findByCssSelector;
-    function findByTextContent(selector, text) {
-        return {
-            findIn(parent) {
-                return parent.dom().contains(selector, text);
-            },
-            shouldNotExist(parent) {
-                return parent.dom().should('not.contain', text);
-            }
-        };
-    }
-    ElementLocator.findByTextContent = findByTextContent;
-})(ElementLocator || (ElementLocator = {}));
-
 class PageElement {
-    constructor(parent, selectorOrLocator) {
-        this.parent = parent;
-        this.elementAccessStrategy = _.isString(selectorOrLocator) ?
-            ElementLocator.findByCssSelector(selectorOrLocator) :
-            selectorOrLocator;
+    constructor(parent, selector) {
+        this.parentElementAccessor = parent instanceof PageElement ? () => parent.element() : parent;
+        this.elementAccessStrategy = _.isString(selector) ? {
+            findIn: p => p.find(selector),
+            shouldNotExist: (p) => p.should('not.have', selector)
+        } : selector;
     }
-    dom() {
-        return this.elementAccessStrategy.findIn(this.parent);
+    element() {
+        const parent = this.getParentElement();
+        return parent ? this.elementAccessStrategy.findIn(parent) : undefined;
+    }
+    getParentElement() {
+        return this.parentElementAccessor ? this.parentElementAccessor() : undefined;
     }
     find(selector) {
-        return new PageElement(this, selector);
+        return new PageElement(() => this.element(), selector);
     }
     click(text) {
-        text ? this.dom().contains(text).click() : this.dom().click();
+        text ? this.element().contains(text).click() : this.element().click();
     }
     get should() {
         return this.getShoulder(this.getShouldElement());
@@ -47,36 +30,88 @@ class PageElement {
         return element.should.bind(element);
     }
     getShouldElement() {
-        return this.dom();
+        return this.element();
     }
     shouldBeVisible() {
         this.should('be.visible');
     }
     shouldNotBeVisible() {
-        this.should('not.be.visible');
+        if (!this.elementAccessStrategy.shouldNotExist) {
+            lang.abstractMethod(this.constructor);
+        }
+        this.elementAccessStrategy.shouldNotExist(this.getParentElement());
+    }
+}
+
+let urlSerialiser = new DefaultUrlSerializer();
+class Path {
+    constructor(segments) {
+        this.segments = segments;
+    }
+    static extractVisitParameters(url) {
+        let result = {};
+        const urlTree = urlSerialiser.parse(url);
+        urlTree.root.children.primary.segments.forEach(s => {
+            result = Object.assign(Object.assign({}, result), s.parameters);
+        });
+        return result;
     }
-    shouldExist() {
-        this.dom().should('exist');
+    toUrl(matrixParams) {
+        return this.segments.map(s => s.toUrlPart(matrixParams)).join('/');
     }
-    shouldNotExist() {
-        if (!this.elementAccessStrategy.shouldNotExist) {
-            this.dom().should("not.exist");
+}
+(function (Path) {
+    function setUrlSerialiser(serialiser) {
+        urlSerialiser = serialiser;
+    }
+    Path.setUrlSerialiser = setUrlSerialiser;
+    class Segment {
+        constructor(path, params = {}) {
+            var _a;
+            this.path = path;
+            this.routeId = params === null || params === void 0 ? void 0 : params.routeId;
+            this.visitParams = (_a = params === null || params === void 0 ? void 0 : params.visitParams) !== null && _a !== void 0 ? _a : [];
         }
-        else {
-            this.elementAccessStrategy.shouldNotExist(this.parent);
+        toUrlPart(params) {
+            let path = this.path;
+            this.visitParams.forEach(p => {
+                const value = params[p];
+                if (value) {
+                    path = `${path};${p}=${value}`;
+                }
+            });
+            if (this.routeId && params[this.routeId]) {
+                path = path + '/' + params[this.routeId];
+            }
+            return path;
         }
     }
-}
+    Path.Segment = Segment;
+    class Builder {
+        constructor() {
+            this.segments = [];
+        }
+        segment(name, params) {
+            const builder = new Segment(name, params);
+            this.segments.push(builder);
+            return this;
+        }
+        getPath() {
+            return new Path(this.segments);
+        }
+    }
+    Path.Builder = Builder;
+})(Path || (Path = {}));
 
-class FaceElementLocator {
+class FaceAccessor {
     constructor(face) {
         this.face = face;
     }
     findIn(parent) {
         return this.face.text ?
-            parent.dom().contains(`aup-command-face`, this.face.text()) :
+            parent.contains(`aup-command-face`, this.face.text()) :
             this.face.icon ?
-                parent.dom().find(`aup-icon[ng-reflect-icon=${this.face.icon()}]`).closest('aup-command-face') :
+                parent.find(`aup-icon[ng-reflect-icon=${this.face.icon()}]`).closest('aup-command-face') :
                 undefined;
     }
     shouldNotExist(parent) {
@@ -89,26 +124,19 @@ class FaceElementLocator {
 }
 class AupCommandFace extends PageElement {
     constructor(parentElement, face) {
-        super(parentElement, AupCommandFace.createElementLocator(face));
+        super(() => parentElement.element(), AupCommandFace.createAccessor(face));
     }
-    static createElementLocator(face) {
-        return new FaceElementLocator(face);
+    static createAccessor(face) {
+        return new FaceAccessor(face);
     }
 }
 
 class AupCommand extends PageElement {
-    constructor(parent, faceOrSelector) {
+    constructor(parent, face) {
+        const faceAccessor = AupCommandFace.createAccessor(face);
         super(parent, {
             findIn(parentElement) {
-                if (_.isString(faceOrSelector)) {
-                    return parentElement.dom().find(faceOrSelector);
-                }
-                else {
-                    return AupCommandFace.createElementLocator(faceOrSelector).findIn(parentElement).closest('aup-command');
-                }
-            },
-            shouldNotExist(parentElement) {
-                this.findIn(parentElement).should("not.exist");
+                return faceAccessor.findIn(parentElement).closest('aup-command');
             }
         });
     }
@@ -122,25 +150,19 @@ class AupCommand extends PageElement {
         this.getButton().should('be.disabled');
     }
     getButton() {
-        return this.dom().find('button');
-    }
-}
-
-class AupEmptyState extends PageElement {
-    shouldContainText(text) {
-        this.dom().should("contain.text", text);
+        return this.element().find('button');
     }
 }
 
 class AupInput extends PageElement {
     label() {
-        return this.dom().find('label');
+        return this.element().find('label');
     }
     hint() {
-        return this.dom().find('mat-hint');
+        return this.element().find('mat-hint');
     }
     error() {
-        return this.dom().find('mat-error');
+        return this.element().find('mat-error');
     }
     get labelShould() {
         return this.getShoulder(this.label());
@@ -160,23 +182,11 @@ class AupInput extends PageElement {
     errorShouldBe(text) {
         return this.errorShould("have.text", text);
     }
-    shouldBeFocused() {
-        this.input().should("have.focus");
-    }
-    shouldNotBeFocused() {
-        this.input().should("not.have.focus");
-    }
-    type(characters) {
-        this.input().type(characters);
-    }
-    hitEnter() {
-        this.type("{enter}");
-    }
 }
 (function (AupInput) {
     class HtmlInput extends AupInput {
         input() {
-            return this.dom().find('input');
+            return this.element().find('input');
         }
         clear() {
             this.input().clear();
@@ -197,7 +207,7 @@ class AupInput extends PageElement {
             return this.input();
         }
         input() {
-            return this.dom().find('textarea');
+            return this.element().find('textarea');
         }
         clear() {
             this.input().clear();
@@ -223,381 +233,123 @@ class AupNavigation extends PageElement {
         this.face(label).shouldBeVisible();
     }
     shouldNotHaveLink(label) {
-        this.face(label).shouldNotExist();
+        this.face(label).shouldNotBeVisible();
     }
 }
 
-/* tslint:disable:unified-signatures */
 class AupTable extends PageElement {
-    row(rowId) {
-        return new AupTable.Row(this, AupTable.cssSelectorForTableRowById(rowId));
+    constructor(parentElementAccessor, selector) {
+        super(parentElementAccessor, selector);
     }
-    rowNumber(rowNumber) {
-        return new AupTable.Row(this, AupTable.cssSelectorForNthTableRow(rowNumber));
+    row(rowId) {
+        return new AupTable.Row(() => this.element(), `tr[aup-table-id=${rowId}]`);
     }
     column(columnId) {
         return new AupTable.Column(this, columnId);
     }
-    selectionColumn() {
-        return new AupTable.SelectionColumn(this, 'selection-column');
-    }
 }
 (function (AupTable) {
-    function cssSelectorForTableRowById(rowId) {
-        return `tbody tr[aup-row-id=${rowId}]`;
-    }
-    AupTable.cssSelectorForTableRowById = cssSelectorForTableRowById;
-    function cssSelectorForNthTableRow(rowNumber) {
-        return `tbody tr:nth-child(${rowNumber})`;
-    }
-    AupTable.cssSelectorForNthTableRow = cssSelectorForNthTableRow;
-    function cssSelectorForColumnCellRendererById(columnId) {
-        return `aup-table-cell-renderer[column-id=${columnId}]`;
-    }
-    AupTable.cssSelectorForColumnCellRendererById = cssSelectorForColumnCellRendererById;
-    function cssSelectorForCell(rowId, columnId) {
-        return `${cssSelectorForTableRowById(rowId)} ${cssSelectorForColumnCellRendererById(columnId)}`;
-    }
-    AupTable.cssSelectorForCell = cssSelectorForCell;
     class Row extends PageElement {
-        constructor(table, selectorOrLocator) {
-            // @ts-ignore
-            super(table, selectorOrLocator);
-            this.table = table;
-        }
-        rowId() {
-            return this.dom()
-                .invoke('attr', 'aup-row-id');
-        }
-        shouldHaveRowId(rowId) {
-            this.rowId().should("eq", rowId);
-        }
-        cell(columnOrId) {
-            const self = this;
-            const columnId = _.isString(columnOrId) ? columnOrId : columnOrId.columnId;
-            return new Cell(this.table, {
-                findIn(parent) {
-                    return self.rowId()
-                        .then(rowId => AupTable.cssSelectorForCell(rowId, columnId))
-                        .then(selector => parent.dom().find(selector));
-                }
-            });
-        }
-        shouldBeSelected() {
-            this.dom().should('have.class', 'aup-row-selected');
-        }
-        shouldNotBeSelected() {
-            this.dom().should('not.have.class', 'aup-row-selected');
-        }
     }
     AupTable.Row = Row;
-    class Column extends PageElement {
+    class Column {
         constructor(table, columnId) {
-            super(table, `aup-table-header-cell-renderer[column-id="${columnId}"]`);
             this.table = table;
             this.columnId = columnId;
         }
-        cellContaining(content) {
+        cell(content) {
             const self = this;
             return new Cell(this.table, {
                 findIn(parent) {
-                    return parent.dom().contains(cssSelectorForColumnCellRendererById(self.columnId), content);
+                    return parent.contains(`aup-table-cell-renderer[column-id=${self.columnId}]`, content);
                 }
             });
         }
-        rowContaining(content) {
-            return this.cellContaining(content).row();
-        }
     }
     AupTable.Column = Column;
-    class SelectionColumn extends Column {
-        selectAll() {
-        }
-    }
-    AupTable.SelectionColumn = SelectionColumn;
     class Cell extends PageElement {
-        constructor(table, elementLocator) {
-            super(table, elementLocator);
-            this.table = table;
-        }
-        rowId() {
-            return this.dom().closest('tr').invoke('attr', 'aup-row-id');
-        }
-        row() {
-            const self = this;
-            return new Row(this.table, {
-                findIn(parent) {
-                    return self.rowId()
-                        .then(rowId => parent.dom().find(AupTable.cssSelectorForTableRowById(rowId)));
-                }
-            });
-        }
     }
     AupTable.Cell = Cell;
-    class SelectionColumnCell extends Cell {
-    }
-    AupTable.SelectionColumnCell = SelectionColumnCell;
 })(AupTable || (AupTable = {}));
 
-function FormElementMixin(Base) {
+function ButtonMixin(Base) {
     return class extends Base {
         constructor(...args) {
             super(...args);
         }
+        click() {
+            return this.element().click();
+        }
         shouldBeDisabled() {
             this.should("be.disabled");
+            // this.should("have.css", "color", "rgba(0,0,0,0.26)")
         }
     };
 }
 
-class Button extends FormElementMixin(PageElement) {
+class Button extends ButtonMixin(PageElement) {
     constructor(parentElementAccessor, buttonText) {
-        super(parentElementAccessor, ElementLocator.findByTextContent('button', buttonText));
-    }
-}
-
-class MatCheckbox extends FormElementMixin(PageElement) {
-    constructor(parentElementAccessor, text) {
-        super(parentElementAccessor, ElementLocator.findByTextContent('mat-checkbox', text));
-    }
-    shouldBeChecked() {
-        this.hiddenCheckBoxElement().should('be.checked');
-    }
-    shouldNotBeChecked() {
-        this.hiddenCheckBoxElement().should('not.be.checked');
-    }
-    hiddenCheckBoxElement() {
-        return this.dom().find('input[type=checkbox]');
-    }
-    check() {
-        this.hiddenCheckBoxElement().then(el => {
-            if (!el.prop('checked')) {
-                this.click();
-                this.shouldBeChecked();
-            }
-        });
-    }
-    uncheck() {
-        this.hiddenCheckBoxElement().then(el => {
-            if (el.prop('checked')) {
-                this.click();
-                this.shouldNotBeChecked();
-            }
-        });
-    }
-}
-
-class Builder {
-    constructor(parentPageElement) {
-        this.parentPageElement = parentPageElement;
-    }
-    find(selector) {
-        return new PageElement(this.parentPageElement, selector);
-    }
-    section(selector, builder) {
-        return this.createContainerElement(PageElement, selector, builder);
-    }
-    contains(text) {
-        return new PageElement(this.parentPageElement, {
+        super(parentElementAccessor, {
             findIn(parent) {
-                return parent.dom().contains(text);
+                return parent.contains('button', buttonText);
             },
             shouldNotExist(parent) {
-                return parent.dom().should('not.contain', text);
+                return parent.should('not.contain', buttonText);
             }
         });
     }
-    button(text) {
-        return new Button(this.parentPageElement, text);
-    }
-    matCheckbox(text) {
-        return new MatCheckbox(this.parentPageElement, text);
-    }
-    aupStringInput(selector) {
-        return new AupInput.HtmlInput(this.parentPageElement, selector !== null && selector !== void 0 ? selector : 'aup-string-input');
-    }
-    aupTextInput(selector) {
-        return new AupInput.TextAreaInput(this.parentPageElement, selector !== null && selector !== void 0 ? selector : 'aup-text-input');
-    }
-    aupPasswordInput(selector) {
-        return new AupInput.HtmlInput(this.parentPageElement, selector !== null && selector !== void 0 ? selector : 'aup-password-input');
-    }
-    aupNumberInput(selector) {
-        return new AupInput.HtmlInput(this.parentPageElement, selector !== null && selector !== void 0 ? selector : 'aup-number-input');
-    }
-    aupCommand(faceOrSelector) {
-        return new AupCommand(this.parentPageElement, faceOrSelector);
-    }
-    aupTabbedNavigation() {
-        return new AupNavigation(this.parentPageElement, 'aup-tabbed-place-navigation');
-    }
-    aupSideNavigation() {
-        return new AupNavigation(this.parentPageElement, 'aup-list-place-nav');
-    }
-    aupTable(selectorOrBuilder, optionalBuilder) {
-        return this.createContainerElement(AupTable, selectorOrBuilder, optionalBuilder, 'aup-table');
-    }
-    aupEmptyState(selectorOrBuilder, optionalBuilder) {
-        return this.createContainerElement(AupEmptyState, selectorOrBuilder, optionalBuilder, 'aup-empty-state');
-    }
-    // TODO: use this in all the element factory methods to allow customisation
-    createElement(klass, selectorOrBuilder, optionalBuilder, defaultSelector) {
-        const selector = _.isString(selectorOrBuilder) ? selectorOrBuilder : defaultSelector;
-        const builder = _.isFunction(selectorOrBuilder) ? selectorOrBuilder : optionalBuilder;
-        if (!selector) {
-            lang.illegalState('This element requires a selector but none was provided');
-        }
-        const element = new klass(this.parentPageElement, selector);
-        if (builder) {
-            return Mixin.createProxy(element, builder(element));
-        }
-        else {
-            return element;
-        }
-    }
-    createContainerElement(klass, selectorOrBuilder, optionalBuilder, defaultSelector) {
-        const selector = _.isString(selectorOrBuilder) ? selectorOrBuilder : defaultSelector;
-        const builder = _.isFunction(selectorOrBuilder) ? selectorOrBuilder : optionalBuilder;
-        if (!selector) {
-            lang.illegalState('This element requires a selector but none was provided');
-        }
-        const element = new klass(this.parentPageElement, selector);
-        if (builder) {
-            // create the B&E type that the builder has access to
-            const decoratedElement = Mixin.createProxy(element, new Builder(element));
-            // create final type that has the E & T type
-            return Mixin.createProxy(decoratedElement, builder(decoratedElement));
-        }
-        else {
-            return element;
-        }
-    }
-}
-
-class AupAbstractActivity extends PageElement {
-    constructor(parent, selector) {
-        // @ts-ignore
-        super(parent, selector);
-        this.title = this.find('aup-activity-title');
-        this._confirmCommand = new Builder(this).aupCommand('[data-cy=confirm-command]');
-        this._cancelCommand = new Builder(this).aupCommand('[data-cy=cancel-command]');
-    }
 }
 
-class AupActivity extends AupAbstractActivity {
-    constructor(parent, selector) {
-        super(parent, selector);
-    }
-    get confirmCommand() {
-        return this._confirmCommand;
-    }
-    get cancelCommand() {
-        return this._cancelCommand;
-    }
-}
-
-class AupModalActivity extends AupActivity {
-    clickBackdrop() {
-        this.dom().closest(`.cdk-overlay-backdrop`).click(-50, -50, { force: true });
-    }
-}
-
-class AupAlert extends AupAbstractActivity {
-    constructor(parent, selector) {
-        super(parent, selector);
-    }
-    get closeCommand() {
-        return this._confirmCommand;
-    }
-    clickClose() {
-        this.closeCommand.click();
-    }
-}
-
-class AupModalAlert extends AupAlert {
-    constructor(parent, selector) {
-        super(parent, selector);
-    }
-    clickBackdrop() {
-        this.dom()
-            .closest(`.cdk-overlay-container`)
-            .find(`.cdk-overlay-backdrop`).click(-50, -50, { force: true });
-    }
-}
-
-class PageBuilder extends Builder {
-    aupModalActivity(selector, builder) {
-        return this.createContainerElement(AupModalActivity, `.dialog-interaction-context ${selector}`, builder);
-    }
-    aupModalAlert(builder) {
-        return this.createContainerElement(AupModalAlert, `.dialog-interaction-context aup-alert-dialog`, builder);
-    }
-    aupModelConfirm(builder) {
-        return this.aupModalActivity(`aup-confirm-dialog`, builder);
-    }
-}
-
-let urlSerialiser = new DefaultUrlSerializer();
-class Path {
-    constructor(segments) {
-        this.segments = segments;
-    }
-    static extractVisitParameters(url) {
-        var _a, _b;
-        let result = {};
-        const urlTree = urlSerialiser.parse(url);
-        const urlSegments = (_b = (_a = urlTree.root.children.primary) === null || _a === void 0 ? void 0 : _a.segments) !== null && _b !== void 0 ? _b : [];
-        urlSegments === null || urlSegments === void 0 ? void 0 : urlSegments.forEach(s => {
-            result = Object.assign(Object.assign({}, result), s.parameters);
-        });
-        return result;
-    }
-    toUrl(matrixParams) {
-        return this.segments.map(s => s.toUrlPart(matrixParams)).join('/');
-    }
-}
-(function (Path) {
-    function setUrlSerialiser(serialiser) {
-        urlSerialiser = serialiser;
-    }
-    Path.setUrlSerialiser = setUrlSerialiser;
-    class Segment {
-        constructor(path, params = {}) {
-            var _a;
-            this.path = path;
-            this.routeId = params === null || params === void 0 ? void 0 : params.routeId;
-            this.visitParams = (_a = params === null || params === void 0 ? void 0 : params.visitParams) !== null && _a !== void 0 ? _a : [];
-        }
-        toUrlPart(params) {
-            let path = this.path;
-            this.visitParams.forEach(p => {
-                const value = params[p];
-                if (value) {
-                    path = `${path};${p}=${value}`;
-                }
-            });
-            if (this.routeId && params[this.routeId]) {
-                path = path + '/' + params[this.routeId];
+var Section;
+(function (Section) {
+    function Mixin$1(Base) {
+        return class extends Base {
+            section(selector, section) {
+                const impl = new Impl(() => this.element(), selector);
+                return Mixin.createProxy(section(impl), impl);
             }
-            return path;
-        }
+            find(selector) {
+                return new PageElement(() => this.element(), selector);
+            }
+            contains(text) {
+                return new PageElement(() => this.element(), {
+                    findIn: parent => parent.contains(text),
+                    shouldNotExist: (parent) => parent.should('not.contain', text)
+                });
+            }
+            button(text) {
+                return new Button(() => this.element(), text);
+            }
+            aupStringInput(selector) {
+                return new AupInput.HtmlInput(() => this.element(), selector !== null && selector !== void 0 ? selector : 'aup-string-input');
+            }
+            aupTextInput(selector) {
+                return new AupInput.TextAreaInput(() => this.element(), selector !== null && selector !== void 0 ? selector : 'aup-text-input');
+            }
+            aupPasswordInput(selector) {
+                return new AupInput.HtmlInput(() => this.element(), selector !== null && selector !== void 0 ? selector : 'aup-password-input');
+            }
+            aupNumberInput(selector) {
+                return new AupInput.HtmlInput(() => this.element(), selector !== null && selector !== void 0 ? selector : 'aup-number-input');
+            }
+            aupCommand(face) {
+                return new AupCommand(this, face);
+            }
+            aupTabbedNavigation() {
+                return new AupNavigation(this, 'aup-tabbed-place-navigation');
+            }
+            aupSideNavigation() {
+                return new AupNavigation(() => this.element(), 'aup-list-place-nav');
+            }
+            aupTable(selector) {
+                return new AupTable(() => this.element(), selector !== null && selector !== void 0 ? selector : 'aup-table');
+            }
+        };
     }
-    Path.Segment = Segment;
-    class Builder {
-        constructor() {
-            this.segments = [];
-        }
-        segment(name, params) {
-            const builder = new Segment(name, params);
-            this.segments.push(builder);
-            return this;
-        }
-        getPath() {
-            return new Path(this.segments);
-        }
+    Section.Mixin = Mixin$1;
+    class Impl extends Mixin$1(PageElement) {
     }
-    Path.Builder = Builder;
-})(Path || (Path = {}));
+})(Section || (Section = {}));
 
 class Page extends PageElement {
     constructor(path) {
@@ -605,7 +357,7 @@ class Page extends PageElement {
         this.path = path;
         this.rootElementSelector = 'body';
     }
-    dom() {
+    element() {
         return cy.get(this.rootElementSelector);
     }
     visit(visitParams, queryParams) {
@@ -628,7 +380,7 @@ class Page extends PageElement {
     }
     shouldBeActive(withParameters) {
         // Note: cy.window() doesn't return a promise... it's a chainable.
-        cy['waitUntil'](() => {
+        cy["waitUntil"](() => {
             return cy.window().then(window => {
                 return window['aup.PlaceRouter'] && !window['aup.PlaceRouter'].isNavigating();
             });
@@ -646,19 +398,21 @@ class Page extends PageElement {
     }
 }
 (function (Page) {
-    function create(pathOrPathBuilder, builder) {
+    function create(pathOrPathBuilder, page) {
         const pathBuilder = new Path.Builder();
         if (_.isString(pathOrPathBuilder)) {
-            pathOrPathBuilder.split('/').filter(p => !_.isEmpty(p)).forEach(p => pathBuilder.segment(p));
+            pathOrPathBuilder.split("/").filter(p => !_.isEmpty(p)).forEach(p => pathBuilder.segment(p));
         }
         else {
             pathOrPathBuilder(pathBuilder);
         }
-        const instance = new Page(pathBuilder.getPath());
-        const content = builder.call(instance, new PageBuilder(instance));
-        return Mixin.createProxy(content, instance);
+        const builder = new PageBuilder(pathBuilder.getPath());
+        return Mixin.createProxy(page(builder), builder);
     }
     Page.create = create;
+    class PageBuilder extends Section.Mixin(Page) {
+    }
+    Page.PageBuilder = PageBuilder;
 })(Page || (Page = {}));
 
 class AupCommandGroup extends PageElement {
@@ -672,13 +426,13 @@ class AupMoreMenu extends PageElement {
 
 class AupPopupMenu extends PageElement {
     constructor(parentElementAccessor, face) {
-        const locator = AupCommandFace.createElementLocator(face);
+        const accessor = AupCommandFace.createAccessor(face);
         super(parentElementAccessor, {
             findIn(parent) {
-                return locator.findIn(parent).closest('button');
+                return accessor.findIn(parent).closest('button');
             },
             shouldNotExist(parent) {
-                locator.shouldNotExist(parent);
+                accessor.shouldNotExist(parent);
             }
         });
     }
@@ -702,5 +456,5 @@ class AupToolBar extends PageElement {
  * Generated bundle index. Do not edit.
  */
 
-export { AupAbstractActivity, AupActivity, AupAlert, AupCommand, AupCommandFace, AupCommandGroup, AupEmptyState, AupInput, AupModalActivity, AupModalAlert, AupMoreMenu, AupNavigation, AupPopupMenu, AupTable, AupToolBar, Builder, Button, ElementLocator, FaceElementLocator, FormElementMixin, MatCheckbox, Page, PageBuilder, PageElement, Path };
+export { AupCommand, AupCommandFace, AupCommandGroup, AupInput, AupMoreMenu, AupNavigation, AupPopupMenu, AupTable, AupToolBar, Button, ButtonMixin, FaceAccessor, Page, PageElement, Path, Section };
 //# sourceMappingURL=coolon-angular-ui-powerups-cypress.js.map