@coolon/angular-ui-powerups 3.18.0 → 11.0.0-alpha.10

package/lib/components/commands/command/command.component.d.ts

@@ -1,5 +1,5 @@
 import { AfterViewInit, ElementRef, OnInit } from '@angular/core';
-import { Command, ListModelChain, ValueModel, ValueModelChain } from '@coolon/pectin';
+import { BooleanValueModelChain, Command, ListModelChain, ValueModel, ValueModelChain } from '@coolon/pectin';
 import { CommandFace } from '../command-face';
 import { PopupAwareComponent } from '../group/popup-aware.component';
 import { PopupContainer } from '../group/popup-container';
@@ -17,6 +17,7 @@ export declare class CommandComponent extends PopupAwareComponent implements OnI
     readonly buttonStyle: ValueModelChain<string>;
     readonly colorModel: ValueModelChain<'primary' | 'accent' | 'warn' | undefined>;
     private activeFace;
+    readonly iconOnly: BooleanValueModelChain;
     constructor(element: ElementRef, parent?: PopupContainer);
     isActive(face: CommandFace): boolean;
     ngOnInit(): void;

package/lib/components/table/column-model.d.ts

@@ -32,6 +32,7 @@ export declare class ColumnModel<Row> {
     private _selectRowOnClick;
     private _flex;
     private _visibleModel;
+    readonly dasherisedColumnId: string;
     constructor(columnId: string, textPropertiesProvider: ColumnModel.TextPropertiesProvider);
     protected installHeaderRenderer(): void;
     getHeaderText(): string;

package/lib/components/table/table-model.d.ts

@@ -54,6 +54,15 @@ import { SelectionColumnModel } from './column-model';
  *   table.addCustomColumn("fullName", hero => `${hero.firstName} ${hero.lastName}`);
  * });
  *
+ * Template columns
+ * @example
+ * const model = TableModel.fromList(heroList, table => {
+ *   table.addSelectionColumn(selectionModel); // <- can be single or multiple selection model
+ *   table.addTemplateColumn("myTemplate");
+ * });
+ *
+ * <div *aupColumnTemplate="let hero; columnId: 'myTemplate'">{{hero.age}}</div>
+ *
  * I18n
  * @example
  * [table.yml]

package/lib/components/table/table.component.d.ts

@@ -31,15 +31,32 @@ import { ColumnModel } from './column-model';
  *
  * Styling
  * @example
+ *  // global settings
+ * :root {
+ *   --aup-table-column-gap: 10px; // defaults to 24px
+ *   --aup-table-row-hover-background-color, rgba(0, 0, 0, 0.05)
+ *   --aup-table-row-selected-background-color: rebeccapurple; // defaults to transparent
+ *   --aup-table-first-column-padding-left: 18px // defaults to --column-gap
+ *   --aup-table-last-column-padding-right: 18px // defaults to --column-gap
+ * }
+ *
+ * // per table settings.
  * aup-table {
  *   --column-gap: 10px; // defaults to 24px
  *   --row-hover-background-color, rgba(0, 0, 0, 0.05)
  *   --row-selected-background-color: rebeccapurple; // defaults to transparent
+ *   --first-column-padding-left: 18px // defaults to --column-gap
+ *   --last-column-padding-right: 18px // defaults to --column-gap
+ *
+ *   aup-table-header-cell-renderer,
  *   aup-table-cell-renderer {
- *     &:first-column {
+ *     &.aup-col-my-dasherised-column-id {
  *       // do stuff
  *     }
- *     &:last-column {
+ *     &.first-visible-column {
+ *       // do stuff
+ *     }
+ *     &.last-visible-column {
  *       // do stuff
  *     }
  *   }
@@ -49,16 +66,16 @@ export declare class TableComponent<Row> extends ResizeAwareComponent implements
     tableModel: AbstractTableModel<Row>;
     showHeaderModel: ValueModel<boolean>;
     showHeader: boolean;
-    columns: ListModelChain<ColumnModel<Row>>;
-    columnIds: ListModelChain<string>;
-    private columnsById;
-    readonly visibleRowCount: ValueModel<number>;
     /**
      * Set to true to enable scrolling.  Once enabled the table will have 0 implicit height.  You will either
      * need to set it explicitly e.g. height: 400px; or by using flex or grid layout to make it fill it's
      * containment area.
      */
     enableScrolling: boolean;
+    columns: ListModelChain<ColumnModel<Row>>;
+    columnIds: ListModelChain<string>;
+    private columnsById;
+    readonly visibleRowCount: ValueModel<number>;
     private readonly headerHeight;
     private readonly rowHeight;
     constructor(elementRef: ElementRef, ngZone: NgZone);
@@ -69,4 +86,5 @@ export declare class TableComponent<Row> extends ResizeAwareComponent implements
     notifyCellClicked(columnModel: ColumnModel<Row>, row: Row): void;
     isFirstVisibleColumn(columnId: string): boolean;
     isLastVisibleColumn(columnId: string): boolean;
+    getColumnClasses(columnId: string): string[];
 }

package/lib/components/tree-table/tree-table-component.d.ts

@@ -1,7 +1,16 @@
+import { ValueModel } from '@coolon/pectin';
 import { DisposableComponent } from '../disposable-component';
 import { TreeNode } from './tree-node';
 import { TreeTableModel } from './tree-table-model';
 export declare class TreeTableComponent<T extends TreeNode<T>> extends DisposableComponent {
     treeTableModel: TreeTableModel<T>;
+    showHeaderModel: ValueModel<boolean>;
+    showHeader: boolean;
+    /**
+     * Set to true to enable scrolling.  Once enabled the table will have 0 implicit height.  You will either
+     * need to set it explicitly e.g. height: 400px; or by using flex or grid layout to make it fill it's
+     * containment area.
+     */
+    enableScrolling: boolean;
     constructor();
 }

package/lib/place/components/abstract-place-navigation.component.d.ts

@@ -6,18 +6,25 @@ import { PlaceComponent } from '../place-component';
 import { PlaceDefinition } from '../place-definition';
 import { PlaceRouter } from '../place-router';
 import { PlaceOutletComponent } from './place-outlet/place-outlet.component';
+interface MenuItem {
+    active: boolean;
+    place: PlaceDefinition;
+}
 export declare class AbstractPlaceNavigationComponent extends DisposableComponent implements OnInit {
     readonly placeRouter: PlaceRouter;
     places: Constructable<PlaceComponent>[];
     placesModel: ListModel<Constructable<PlaceComponent>>;
     placeOutlet: PlaceOutletComponent;
     placeOutletModel: ValueModel<PlaceOutletComponent>;
-    readonly placeDefinitions: ListModelChain<PlaceDefinition>;
+    private readonly placeDefinitions;
+    readonly menuItems: ListModelChain<MenuItem>;
     readonly commandFactory: Command.Factory<PlaceDefinition, void>;
     readonly _activePlaceComponent: DelegatingValueModel<PlaceComponent>;
     private activePlaceDefinition;
+    readonly trackByPlaceDef: (data: MenuItem) => PlaceDefinition;
     constructor(placeRouter: PlaceRouter);
     getNavigationFace(placeDef: PlaceDefinition): CommandFace;
     isActive(place: PlaceDefinition): boolean;
     ngOnInit(): void;
 }
+export {};

package/lib/place/components/not-authorised-notice/not-authorised-notice.component.d.ts

@@ -0,0 +1,3 @@
+export declare class NotAuthorisedNoticeComponent {
+    constructor();
+}

package/lib/place/components/place-outlet/place-outlet.component.d.ts

@@ -1,15 +1,19 @@
-import { EventEmitter, OnInit } from '@angular/core';
+import { ComponentPortal } from '@angular/cdk/portal';
+import { ChangeDetectorRef, EventEmitter, InjectionToken, OnInit } from '@angular/core';
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 import { BooleanValueModelChain, Constructable, ListModel, ValueModel, ValueModelChain } from '@coolon/pectin';
 import { DisposableComponent } from '../../../components/disposable-component';
 import { PlaceComponent } from '../../place-component';
 import { PlaceConfig } from '../../place-config';
+import { PlaceDefinition } from '../../place-definition';
 import { PlaceRouter } from '../../place-router';
 import { Visit } from '../../visit';
+export declare const AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT: InjectionToken<Constructable<any>>;
 export declare class PlaceOutletComponent extends DisposableComponent implements OnInit {
     private readonly router;
     private readonly placeRouter;
     readonly placeConfig: PlaceConfig;
+    private readonly cdr;
     animate: boolean;
     animateModel: ValueModel<boolean>;
     customPlaceAnimationOrderModel: ListModel<Constructable<PlaceComponent>>;
@@ -20,7 +24,7 @@ export declare class PlaceOutletComponent extends DisposableComponent implements
     private outletActivated;
     private readonly _activatedRouteModel;
     private readonly _activePlaceModel;
-    private readonly _activePlaceDefinition;
+    readonly _activePlaceDefinition: ValueModelChain<PlaceDefinition>;
     private parentOutletModel;
     readonly activePlaceAnimationPosition: ValueModelChain<number>;
     private initialPlaceIndex;
@@ -31,10 +35,13 @@ export declare class PlaceOutletComponent extends DisposableComponent implements
     private placesInAnimationOrder;
     private animationSupported;
     readonly animationEnabled: BooleanValueModelChain;
-    constructor(router: Router, placeRouter: PlaceRouter, placeConfig: PlaceConfig, parentOutlet: PlaceOutletComponent);
+    readonly authorised: ValueModelChain<boolean>;
+    readonly notAuthorisedNoticePortal: ComponentPortal<any>;
+    constructor(router: Router, placeRouter: PlaceRouter, placeConfig: PlaceConfig, unauthorisedPlaceNotice: Constructable<any>, parentOutlet: PlaceOutletComponent, cdr: ChangeDetectorRef);
     ngOnInit(): void;
     getAnimationOrder(): number;
     get animationDuration(): string;
+    get isAuthorised(): boolean;
     navigate(visit: Visit): void;
     get parentOutlet(): PlaceOutletComponent;
     get activePlaceModel(): ValueModel<PlaceComponent>;

package/lib/place/exports.d.ts

@@ -15,6 +15,7 @@ export * from "./url-snapshot";
 export * from "./visit";
 export * from "./components/abstract-place-navigation.component";
 export * from "./components/list-place-nav/list-place-nav.component";
+export * from "./components/not-authorised-notice/not-authorised-notice.component";
 export * from "./components/place-outlet/place-outlet.component";
 export * from "./components/place-outlet/route-animations";
 export * from "./components/side-place-navigation/side-place-navigation.component";

package/lib/place/place-component.d.ts

@@ -13,6 +13,7 @@ export declare class PlaceComponent extends DisposableComponent {
     private _inVisitUpdate;
     private _active;
     interactionContext?: InteractionContext;
+    readonly childPlaces: ReadonlyArray<Constructable<PlaceComponent>>;
     canDeactivate?(interactionContext: InteractionContext): boolean | Promise<boolean>;
     constructor();
     initialiseVisit(visit: Visit, notifyVisitChanged: (current: Visit, previous: Visit) => void): void;
@@ -20,7 +21,6 @@ export declare class PlaceComponent extends DisposableComponent {
     isInitialised(): boolean;
     private installBinding;
     get placeDefinition(): PlaceDefinition;
-    get childPlaces(): Constructable<PlaceComponent>[];
     get active(): import("@coolon/pectin").ValueModel<boolean>;
     /**
      * Called by the router when the place is ready to interact after any animations have run.

package/lib/place/place-router.d.ts

@@ -1,6 +1,6 @@
 import { Location } from '@angular/common';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router, RouterStateSnapshot } from '@angular/router';
-import { GarbageCollector, ListModel, MapModelChain, MutableValueModel, ValueModel, ValueModelChain } from '@coolon/pectin';
+import { GarbageCollector, ListModel, MutableValueModel, ValueModel, ValueModelChain } from '@coolon/pectin';
 import { InteractionService } from '../interaction/services/interaction.service';
 import { NavigationSession } from './navigation/session/navigation-session';
 import { PlaceAccessGuard } from './place-access-guard';
@@ -20,20 +20,19 @@ export declare class PlaceRouter extends GarbageCollector {
     readonly navigationSessionName: ValueModelChain<string>;
     private readonly navigationContext;
     private readonly _activeVisits;
-    readonly activeVisitsByPlaceDefinition: MapModelChain<PlaceDefinition, Visit>;
-    private routerInteractionAdapter;
+    private readonly routerInteractionAdapter;
     private sessionFinishedJobs;
+    readonly state: ValueModel<PlaceRouter.State>;
     /**
      * An observable model containing the authoriser function.  This allows places to react to changes
      * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.
      */
-    private _accessGuard;
+    private readonly _accessGuard;
     private redirections;
     constructor(angularRouter: Router, angularLocation: Location, interactionService: InteractionService, urlService: UrlService, placeHistory: PlaceHistory);
     get accessGuard(): ValueModel<PlaceAccessGuard>;
     configureAuth(accessGrant: ValueModel<PlaceAccessGuard>, redirections: PlaceRouter.Redirections): void;
     getAuthenticationFailureRedirect(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Visit;
-    getAuthorisationFailureRedirect(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Visit;
     get navigationSession(): NavigationSession;
     get currentSession(): NavigationSession;
     isNavigating(): boolean;
@@ -66,6 +65,11 @@ export declare class PlaceRouter extends GarbageCollector {
 export declare namespace PlaceRouter {
     interface Redirections {
         onAuthenticationFailure(activatedRoute?: ActivatedRouteSnapshot, state?: RouterStateSnapshot): Visit;
-        onAuthorisationFailure(activatedRoute?: ActivatedRouteSnapshot, state?: RouterStateSnapshot): Visit;
+    }
+    class State {
+        private readonly activeVisits;
+        constructor(activeVisits: Visit[]);
+        isPlaceActive(placeDefinition: PlaceDefinition): boolean;
+        getVisitFor(placeDefinition: PlaceDefinition): Visit;
     }
 }

package/package.json

@@ -1,36 +1,38 @@
 {
   "name": "@coolon/angular-ui-powerups",
-  "version": "3.18.0",
+  "version": "11.0.0-alpha.10",
   "schematics": "./schematics/collection.json",
   "dependencies": {
     "@coolon/typescript-utilities": "^2.2.0",
+    "typescript-string-enums": "^1.0.0",
     "@typescript-plus/fast-memoize-decorator": "^0.1.0",
     "json5": "^2.1.0",
     "ts-morph": "^9.1.0",
     "wake-event": "^0.0.1",
-    "tslib": "^2.0.0",
-    "typescript-string-enums": "^1.0.0"
-  },
-  "peerDependencies": {
-    "@angular/common": "^10.1.1",
-    "@angular/core": "^10.1.1",
-    "@angular/material": "^10.2.0",
-    "@angular/animations": "^10.1.1",
-    "@angular/cdk": "^10.2.0",
-    "@coolon/pectin": ">=3.10.1",
-    "resize-observer-polyfill": "^1.5.1",
-    "@fortawesome/angular-fontawesome": "^0.8.1",
+    "@fortawesome/angular-fontawesome": "^0.8.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/fontawesome-free": "5.15.2",
-    "@angular/forms": "^10.1.1",
-    "@angular/platform-browser": "^10.1.1",
-    "@angular/platform-browser-dynamic": "^10.1.1",
-    "@angular/flex-layout": "^10.0.0-beta.32",
-    "@angular/router": "^10.1.1",
+    "resize-observer-polyfill": "^1.5.1",
+    "tslib": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@angular/animations": "^11.2.3",
+    "@angular/cdk": "^11.2.2",
+    "@angular/common": "^11.2.3",
+    "@angular/compiler": "^11.2.3",
+    "@angular/core": "^11.2.3",
+    "@angular/flex-layout": "^11.0.0-beta.33",
+    "@angular/forms": "^11.2.3",
+    "@angular/material": "^11.2.2",
+    "@angular/material-moment-adapter": "^11.2.2",
+    "@angular/platform-browser": "^11.2.3",
+    "@angular/platform-browser-dynamic": "^11.2.3",
+    "@angular/router": "^11.2.3",
     "rxjs": "~6.6.3",
     "reflect-metadata": "^0.1.13",
-    "zone.js": "~0.10.3"
+    "zone.js": "~0.10.3",
+    "@coolon/pectin": ">=3.10.1"
   },
   "main": "bundles/coolon-angular-ui-powerups.umd.js",
   "module": "fesm2015/coolon-angular-ui-powerups.js",
@@ -40,4 +42,4 @@
   "typings": "coolon-angular-ui-powerups.d.ts",
   "metadata": "coolon-angular-ui-powerups.metadata.json",
   "sideEffects": false
-}
+}

package/schematics/bootstrap-app/templates/styles/global-variables.scss.template

@@ -10,3 +10,4 @@
   --sub-header-height: 48px;
 }
 
+

package/schematics/bootstrap-app/templates/styles.scss.template

@@ -1,10 +1,17 @@
 /* You can add global styles to this file, and also import other style files */
 
+@use '~@angular/material/theming' as ng;
+@use "~@coolon/angular-ui-powerups/assets/styles" as aup;
+@use "./styles/global-variables";
+
+$primary: ng.mat-palette(ng.$mat-indigo);
+$accent: ng.mat-palette(ng.$mat-pink);
+
+@include aup.apply-light-theme($primary, $accent);
+
 @import "./assets/fonts/material-design-icons/material-icons.css";
 @import "~roboto-fontface/css/roboto/roboto-fontface.css";
-@import "./styles/theme";
-@import "./styles/global-variables";
-@import "~@coolon/angular-ui-powerups/assets/styles";
+
 
 html, body {
   height: 100%;

package/schematics/ng-add/index.js

@@ -19,7 +19,7 @@ function installDependencies(_options) {
     return (tree, _) => {
         return package_util_1.updatePackageJson(tree, draft => {
             draft.scripts = Object.assign(Object.assign({}, draft.scripts), { "place-routes": "run-s place-routes:**", "i18n": "run-s i18n:**", "watch": "npm-watch" });
-            draft.dependencies = Object.assign(Object.assign({}, draft.dependencies), { "@coolon/pectin": "^3.7.0", "@coolon/typescript-utilities": "^2.0.2", "@angular/flex-layout": "^11.0.0-beta.33", "roboto-fontface": "^0.10.0", "@fortawesome/angular-fontawesome": "^0.8.1", "@fortawesome/fontawesome-svg-core": "^1.2.34", "@fortawesome/free-solid-svg-icons": "^5.15.2", "@fortawesome/fontawesome-free": "5.15.2", "@js-joda/core": "^3.2.0", "@js-joda/locale": "^3.2.0", "@js-joda/timezone": "^2.3.0", "cldr-data": "^36.0.0", "cldrjs": "^0.5.4", "immer": "^7.0.5", "reflect-metadata": "^0.1.13", "resize-observer-polyfill": "^1.5.1", "typescript-string-enums": "^1.0.0", "format-message-interpret": "^6.2.3", "@angular/material-moment-adapter": "^10.2.1", "moment": "2.27.0" });
+            draft.dependencies = Object.assign(Object.assign({}, draft.dependencies), { "@coolon/pectin": "^3.10.1", "@coolon/typescript-utilities": "^2.0.2", "roboto-fontface": "^0.10.0", "@js-joda/core": "^3.2.0", "@js-joda/locale": "^3.2.0", "@js-joda/timezone": "^2.3.0", "cldr-data": "^36.0.0", "cldrjs": "^0.5.4", "immer": "^7.0.5", "typescript-string-enums": "^1.0.0", "format-message-interpret": "^6.2.3", "moment": "^2.18.1" });
             draft.devDependencies = Object.assign(Object.assign({}, draft.devDependencies), { "husky": "^4.2.0", "@coolon/i18n-resource-generator": "^2.0.13", "cypress-wait-until": "^1.6.1", "barrelsby": "^2.1.1", "dotenv": "6.2.0", "cz-conventional-changelog": "^3.1.0", "@commitlint/cli": "^8.3.5", "git-is-clean": "^3.0.1", "shx": "^0.3.2", 'standard-version': '^8.0.0', "npm-watch": "^0.7.0" });
             draft.watch = Object.assign({}, draft.watch);
             draft.config = Object.assign(Object.assign({}, draft.config), { commitizen: {

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,kDAAoD;AAEpD,uBAAuB;AACvB,SAAgB,KAAK,CAAC,QAAa;IACjC,OAAO,kBAAK,CAAC;QACX,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;YACzC,QAAQ,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,mBAAmB,CAAC,QAAQ,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AARD,sBAQC;AAED,SAAgB,mBAAmB,CAAC,QAAa;IAC/C,OAAO,CAAC,IAAU,EAAE,CAAmB,EAAQ,EAAE;QAC/C,OAAO,gCAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YACrC,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,KAChB,cAAc,EAAE,uBAAuB,EACvC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,WAAW,GACrB,CAAC;YAEF,KAAK,CAAC,YAAY,mCACb,KAAK,CAAC,YAAY,KACrB,gBAAgB,EAAE,QAAQ,EAC1B,8BAA8B,EAAE,QAAQ,EACxC,sBAAsB,EAAE,iBAAiB,EACzC,iBAAiB,EAAE,SAAS,EAC5B,kCAAkC,EAAE,QAAQ,EAC5C,mCAAmC,EAAE,SAAS,EAC9C,mCAAmC,EAAE,SAAS,EAC9C,+BAA+B,EAAE,QAAQ,EACzC,eAAe,EAAE,QAAQ,EACzB,iBAAiB,EAAE,QAAQ,EAC3B,mBAAmB,EAAE,QAAQ,EAC7B,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,QAAQ,EACjB,kBAAkB,EAAE,SAAS,EAC7B,0BAA0B,EAAE,QAAQ,EACpC,yBAAyB,EAAE,QAAQ,EACnC,0BAA0B,EAAE,QAAQ,EACpC,kCAAkC,EAAE,SAAS,EAC7C,QAAQ,EAAE,QAAQ,GACnB,CAAC;YAEF,KAAK,CAAC,eAAe,mCAChB,KAAK,CAAC,eAAe,KACxB,OAAO,EAAE,QAAQ,EACjB,iCAAiC,EAAE,SAAS,EAC5C,oBAAoB,EAAE,QAAQ,EAC9B,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,OAAO,EACjB,2BAA2B,EAAE,QAAQ,EACrC,iBAAiB,EAAE,QAAQ,EAC3B,cAAc,EAAE,QAAQ,EACxB,KAAK,EAAE,QAAQ,EACf,kBAAkB,EAAE,QAAQ,EAC5B,WAAW,EAAE,QAAQ,GACtB,CAAC;YAEF,KAAK,CAAC,KAAK,qBACN,KAAK,CAAC,KAAK,CACf,CAAA;YAED,KAAK,CAAC,MAAM,mCACP,KAAK,CAAC,MAAM,KACf,UAAU,EAAE;oBACV,IAAI,EAAE,0CAA0C;iBACjD,GACF,CAAC;YAEF,KAAK,CAAC,KAAK,GAAG;gBACZ,OAAO,EAAE;oBACP,YAAY,EAAE,gCAAgC;iBAC/C;aACF,CAAC;QAEJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AApED,kDAoEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,4DAA0E;AAC1E,kDAAoD;AAEpD,uBAAuB;AACvB,SAAgB,KAAK,CAAC,QAAa;IACjC,OAAO,kBAAK,CAAC;QACX,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;YACzC,QAAQ,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,mBAAmB,CAAC,QAAQ,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AARD,sBAQC;AAED,SAAgB,mBAAmB,CAAC,QAAa;IAC/C,OAAO,CAAC,IAAU,EAAE,CAAmB,EAAQ,EAAE;QAC/C,OAAO,gCAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YACrC,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,KAChB,cAAc,EAAE,uBAAuB,EACvC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,WAAW,GACrB,CAAC;YAEF,KAAK,CAAC,YAAY,mCACb,KAAK,CAAC,YAAY,KACrB,gBAAgB,EAAE,SAAS,EAC3B,8BAA8B,EAAE,QAAQ,EACxC,iBAAiB,EAAE,SAAS,EAC5B,eAAe,EAAE,QAAQ,EACzB,iBAAiB,EAAE,QAAQ,EAC3B,mBAAmB,EAAE,QAAQ,EAC7B,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,QAAQ,EACjB,yBAAyB,EAAE,QAAQ,EACnC,0BAA0B,EAAE,QAAQ,EACpC,QAAQ,EAAE,SAAS,GACpB,CAAC;YAEF,KAAK,CAAC,eAAe,mCAChB,KAAK,CAAC,eAAe,KACxB,OAAO,EAAE,QAAQ,EACjB,iCAAiC,EAAE,SAAS,EAC5C,oBAAoB,EAAE,QAAQ,EAC9B,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,OAAO,EACjB,2BAA2B,EAAE,QAAQ,EACrC,iBAAiB,EAAE,QAAQ,EAC3B,cAAc,EAAE,QAAQ,EACxB,KAAK,EAAE,QAAQ,EACf,kBAAkB,EAAE,QAAQ,EAC5B,WAAW,EAAE,QAAQ,GACtB,CAAC;YAEF,KAAK,CAAC,KAAK,qBACN,KAAK,CAAC,KAAK,CACf,CAAA;YAED,KAAK,CAAC,MAAM,mCACP,KAAK,CAAC,MAAM,KACf,UAAU,EAAE;oBACV,IAAI,EAAE,0CAA0C;iBACjD,GACF,CAAC;YAEF,KAAK,CAAC,KAAK,GAAG;gBACZ,OAAO,EAAE;oBACP,YAAY,EAAE,gCAAgC;iBAC/C;aACF,CAAC;QAEJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA5DD,kDA4DC"}

package/schematics/place-add/index.js

@@ -16,8 +16,12 @@ function addPlace(_options) {
         if (!placeModulePath) {
             throw new Error(`Places must be created in or under a directory containing a 'places.module.ts'.  I couldn't find one in ${pathToSourceRoot.join('/')} or in any ancestor of it. You can run ng g @coolon/angular-ui-powerups:place-bootstrap --dir=<directory> to initialise one`);
         }
-        const placeModule = buildContext.getSourceFile(placeModulePath);
-        const newPlaceModuleContent = updatePlaceModule(placeModule);
+        // we'll let angular do it by just create a default component then we'll clobber it with our real templates later.
+        const updateModule = schematics_1.externalSchematic('@schematics/angular', 'component', {
+            project: _options.project,
+            name: _options.name,
+            module: placeModulePath.slice(buildContext.sourceCodeRoot.length)
+        });
         const componentFiles = template_utilities_1.applyTemplatesWithOverwrite(tree, 'templates/component', {
             name: componentName,
             selectorPrefix: buildContext.selectorPrefix,
@@ -26,15 +30,8 @@ function addPlace(_options) {
         const additionalFiles = template_utilities_1.applyTemplatesWithOverwrite(tree, 'templates/files', {
             name: componentName
         }, buildContext.sourceRoot);
-        return schematics_1.chain([componentFiles, additionalFiles])(tree, context);
+        return schematics_1.chain([updateModule, componentFiles, additionalFiles])(tree, context);
     };
 }
 exports.addPlace = addPlace;
-function updatePlaceModule(placeModule) {
-    // TODO: Make this work.
-    // const imports = placeModule.getImportDeclarations();
-    const moduleClass = placeModule.findClassWithDecorator('@NgModule');
-    const decorator = moduleClass.getClassDecoratorNode('@NgModule');
-    return placeModule.getFullText();
-}
 //# sourceMappingURL=index.js.map

package/schematics/place-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AAGjF,oEAA0E;AAC1E,kDAA+C;AAI/C,SAAgB,QAAQ,CAAC,QAAgB;IAEvC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,gBAAgB,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClF,MAAM,eAAe,GAAG,YAAY,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2GAA2G,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,6HAA6H,CAAC,CAAC;SACrR;QACD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAChE,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,gDAA2B,CAChD,IAAI,EACJ,qBAAqB,EACrB;YACE,IAAI,EAAE,aAAa;YACnB,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACtD,EACD,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,aAAa,EAAE,CACnD,CAAC;QAGF,MAAM,eAAe,GAAG,gDAA2B,CACjD,IAAI,EACJ,iBAAiB,EACjB;YACE,IAAI,EAAE,aAAa;SACpB,EACD,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3B,OAAO,kBAAK,CAAC,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjE,CAAC,CAAC;AAEJ,CAAC;AA1CD,4BA0CC;AAED,SAAS,iBAAiB,CAAC,WAAgC;IAEzD,wBAAwB;IAExB,uDAAuD;IACvD,MAAM,WAAW,GAAG,WAAW,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,WAAW,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAEjE,OAAO,WAAW,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAoG;AAIpG,oEAA0E;AAC1E,kDAA+C;AAI/C,SAAgB,QAAQ,CAAC,QAAgB;IAEvC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,gBAAgB,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClF,MAAM,eAAe,GAAG,YAAY,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2GAA2G,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,6HAA6H,CAAC,CAAC;SACrR;QACD,kHAAkH;QAClH,MAAM,YAAY,GAAG,8BAAiB,CAAC,qBAAqB,EAAE,WAAW,EAAE;YACzE,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC;SAClE,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,gDAA2B,CAChD,IAAI,EACJ,qBAAqB,EACrB;YACE,IAAI,EAAE,aAAa;YACnB,cAAc,EAAE,YAAY,CAAC,cAAc;YAC3C,UAAU,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACtD,EACD,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,aAAa,EAAE,CACnD,CAAC;QAGF,MAAM,eAAe,GAAG,gDAA2B,CACjD,IAAI,EACJ,iBAAiB,EACjB;YACE,IAAI,EAAE,aAAa;SACpB,EACD,YAAY,CAAC,UAAU,CAAC,CAAC;QAE3B,OAAO,kBAAK,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE/E,CAAC,CAAC;AAEJ,CAAC;AA9CD,4BA8CC"}

package/schematics/utils/build-context.d.ts

@@ -1,4 +1,3 @@
-import { experimental } from '@angular-devkit/core';
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
 import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { DecoratedSourceFile } from './decorators/decorated-source-file';
@@ -12,8 +11,8 @@ export declare abstract class BuildContext {
     get logger(): import("@angular-devkit/core/src/logger").LoggerApi;
     get tsConfigPath(): string;
     get sourceCodeRoot(): string;
-    get sourceRoot(): string;
-    get rootDir(): string;
+    get sourceRoot(): any;
+    get rootDir(): any;
     private loadTypeScriptProject;
     scanClassesInTree(tree: Tree, scanRootDirectory: string, scanClass: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, path: string) => void): void;
     findFileInAncestorPath(pathToSourceRoot: string[], fileName: string): string;
@@ -21,12 +20,12 @@ export declare abstract class BuildContext {
 }
 export declare namespace BuildContext {
     interface Settings {
-        readonly workspaceProject: experimental.workspace.WorkspaceProject;
+        readonly workspaceProject: any;
         readonly projectType: string;
         readonly tsConfigPath: string;
     }
     class App extends BuildContext {
-        get selectorPrefix(): string;
+        get selectorPrefix(): any;
     }
     class Lib extends BuildContext {
     }

package/schematics/utils/template-utilities.js

@@ -9,16 +9,8 @@ function applyTemplatesWithOverwrite(tree, templateUrl, templateData, outDir) {
     const newFiles = schematics_1.apply(schematics_1.url(templateUrl), [
         schematics_1.applyTemplates(Object.assign(Object.assign({}, templateData), core_1.strings)),
         schematics_1.move(`${outDir}`),
-        // @see https://github.com/angular/angular-cli/issues/11337#issuecomment-448259549
-        schematics_1.forEach((fileEntry) => {
-            // this.context.logger.info(fileEntry.path);
-            if (tree.exists(fileEntry.path)) {
-                tree.overwrite(fileEntry.path, fileEntry.content);
-            }
-            return fileEntry;
-        })
     ]);
-    return schematics_1.mergeWith(newFiles);
+    return schematics_1.mergeWith(newFiles, schematics_1.MergeStrategy.Overwrite);
 }
 exports.applyTemplatesWithOverwrite = applyTemplatesWithOverwrite;
 //# sourceMappingURL=template-utilities.js.map

package/schematics/utils/template-utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-utilities.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/template-utilities.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2DAUoC;AAEpC,SAAgB,2BAA2B,CAAC,IAAU,EAAE,WAAmB,EAAE,YAAoB,EAAE,MAAc;IAC/G,uFAAuF;IACvF,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,kBAAK,CACpB,gBAAG,CAAC,WAAW,CAAC,EAChB;QACE,2BAAc,iCACT,YAAY,GACZ,cAAO,EACV;QACF,iBAAI,CAAC,GAAG,MAAM,EAAE,CAAC;QACjB,kFAAkF;QAClF,oBAAO,CAAC,CAAC,SAAoB,EAAE,EAAE;YAC/B,4CAA4C;YAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBAC/B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;aACnD;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC;KACH,CAAC,CAAC;IACL,OAAO,sBAAS,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC;AArBD,kEAqBC"}
+{"version":3,"file":"template-utilities.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/template-utilities.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2DAWoC;AAEpC,SAAgB,2BAA2B,CAAC,IAAU,EAAE,WAAmB,EAAE,YAAoB,EAAE,MAAc;IAC/G,uFAAuF;IACvF,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,kBAAK,CACpB,gBAAG,CAAC,WAAW,CAAC,EAChB;QACE,2BAAc,iCACT,YAAY,GACZ,cAAO,EACV;QACF,iBAAI,CAAC,GAAG,MAAM,EAAE,CAAC;KASlB,CAAC,CAAC;IACL,OAAO,sBAAS,CAAC,QAAQ,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;AACtD,CAAC;AArBD,kEAqBC"}

package/schematics/utils/workspace.d.ts

@@ -1,12 +1,11 @@
-import { experimental } from '@angular-devkit/core';
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
 import { BuildContext } from './build-context';
 export declare class Workspace {
-    readonly schema: experimental.workspace.WorkspaceSchema;
+    readonly schema: any;
     readonly tree: Tree;
     readonly context: SchematicContext;
-    get defaultProject(): string;
-    constructor(schema: experimental.workspace.WorkspaceSchema, tree: Tree, context: SchematicContext);
+    get defaultProject(): any;
+    constructor(schema: any, tree: Tree, context: SchematicContext);
     static load(tree: Tree, _context: SchematicContext): Workspace;
     getApplication(projectName: string): BuildContext.App;
     getApplicationOrDefault(projectName: string | undefined): BuildContext.App;

package/schematics/utils/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/workspace.ts"],"names":[],"mappings":";;;AAEA,mDAA+C;AAC/C,MAAa,SAAS;IAMpB,YAAqB,MAA8C,EAAW,IAAU,EAAW,OAAyB;QAAvG,WAAM,GAAN,MAAM,CAAwC;QAAW,SAAI,GAAJ,IAAI,CAAM;QAAW,YAAO,GAAP,OAAO,CAAkB;IAC5H,CAAC;IALD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;IACpC,CAAC;IAKD,MAAM,CAAC,IAAI,CAAC,IAAU,EAAE,QAA0B;QAChD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACpD,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,uBAAuB,CAAC,WAA6B;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,WAAmB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAGS,mBAAmB,CAAC,OAAe,EAAE,IAAU;QAEvD,MAAM,gBAAgB,GAA4C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9H,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACvE,+EAA+E;QAC/E,OAAO;YACL,gBAAgB;YAChB,WAAW,EAAE,gBAAgB,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YAC3E,YAAY;SACb,CAAC;IACJ,CAAC;CAGF;AApDD,8BAoDC"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/utils/workspace.ts"],"names":[],"mappings":";;;AAEA,mDAA+C;AAE/C,MAAa,SAAS;IAMpB,YAAqB,MAAW,EAAW,IAAU,EAAW,OAAyB;QAApE,WAAM,GAAN,MAAM,CAAK;QAAW,SAAI,GAAJ,IAAI,CAAM;QAAW,YAAO,GAAP,OAAO,CAAkB;IACzF,CAAC;IALD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;IACpC,CAAC;IAKD,MAAM,CAAC,IAAI,CAAC,IAAU,EAAE,QAA0B;QAChD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QACpD,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,uBAAuB,CAAC,WAA6B;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,WAAmB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,QAAQ,CAAC,WAAW,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,gBAAgB,CAAC,CAAC;SAC7E;QACD,OAAO,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,CAAC;IAGS,mBAAmB,CAAC,OAAe,EAAE,IAAU;QAEvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QACvE,+EAA+E;QAC/E,OAAO;YACL,gBAAgB;YAChB,WAAW,EAAE,gBAAgB,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YAC3E,YAAY;SACb,CAAC;IACJ,CAAC;CAGF;AApDD,8BAoDC"}