@ts-core/angular 11.0.81 → 11.0.85

package/esm2015/theme/ThemeModule.js

@@ -1,5 +1,5 @@
 import { InjectionToken, NgModule } from '@angular/core';
-import { ThemeService } from '@ts-core/frontend/theme';
+import { ThemeService, ThemeAssetService } from '@ts-core/frontend/theme';
 import { CookieModule } from '../cookie/CookieModule';
 import { CookieService } from '../cookie/CookieService';
 import { ThemeAssetBackgroundDirective } from './ThemeAssetBackgroundDirective';
@@ -27,6 +27,11 @@ export class ThemeModule {
                     provide: ThemeService,
                     deps: [CookieService, THEME_OPTIONS],
                     useFactory: themeServiceFactory
+                },
+                {
+                    provide: ThemeAssetService,
+                    deps: [ThemeService],
+                    useFactory: themeAssetServiceFactory
                 }
             ]
         };
@@ -40,10 +45,13 @@ ThemeModule.decorators = [
             },] }
 ];
 export function themeServiceFactory(cookie, options) {
-    if (!_.isNil(options) && !_.isNil(options.service)) {
+    if (!_.isNil(options) && _.isNil(options.service)) {
         options.service = cookie;
     }
     return new ThemeService(options);
 }
+export function themeAssetServiceFactory(theme) {
+    return new ThemeAssetService(theme);
+}
 export const THEME_OPTIONS = new InjectionToken(`THEME_OPTIONS`);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGhlbWVNb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGhlbWUvVGhlbWVNb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBdUIsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTlFLE9BQU8sRUFBd0IsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDN0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNoRixPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN0RSxPQUFPLEtBQUssQ0FBQyxNQUFNLFFBQVEsQ0FBQztBQUU1QixJQUFJLFlBQVksR0FBRyxDQUFDLG9CQUFvQixFQUFFLHdCQUF3QixFQUFFLDZCQUE2QixFQUFFLG1CQUFtQixFQUFFLHdCQUF3QixDQUFDLENBQUM7QUFPbEosTUFBTSxPQUFPLFdBQVc7SUFDcEIsNkVBQTZFO0lBQzdFLEVBQUU7SUFDRixrQkFBa0I7SUFDbEIsRUFBRTtJQUNGLDZFQUE2RTtJQUV0RSxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQThCO1FBQ2hELE9BQU87WUFDSCxRQUFRLEVBQUUsV0FBVztZQUNyQixTQUFTLEVBQUU7Z0JBQ1A7b0JBQ0ksT0FBTyxFQUFFLGFBQWE7b0JBQ3RCLFFBQVEsRUFBRSxPQUFPLElBQUksRUFBRTtpQkFDMUI7Z0JBQ0Q7b0JBQ0ksT0FBTyxFQUFFLFlBQVk7b0JBQ3JCLElBQUksRUFBRSxDQUFDLGFBQWEsRUFBRSxhQUFhLENBQUM7b0JBQ3BDLFVBQVUsRUFBRSxtQkFBbUI7aUJBQ2xDO2FBQ0o7U0FDSixDQUFDO0lBQ04sQ0FBQzs7O1lBM0JKLFFBQVEsU0FBQztnQkFDTixPQUFPLEVBQUUsQ0FBQyxZQUFZLENBQUM7Z0JBQ3ZCLFlBQVk7Z0JBQ1osT0FBTyxFQUFFLFlBQVk7YUFDeEI7O0FBMEJELE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxNQUFzQixFQUFFLE9BQThCO0lBQ3RGLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDaEQsT0FBTyxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7S0FDNUI7SUFDRCxPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3JDLENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsSUFBSSxjQUFjLENBQXVCLGVBQWUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0aW9uVG9rZW4sIE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBJQ29va2llU2VydmljZSB9IGZyb20gJ0B0cy1jb3JlL2Zyb250ZW5kL2Nvb2tpZSc7XG5pbXBvcnQgeyBJVGhlbWVTZXJ2aWNlT3B0aW9ucywgVGhlbWVTZXJ2aWNlIH0gZnJvbSAnQHRzLWNvcmUvZnJvbnRlbmQvdGhlbWUnO1xuaW1wb3J0IHsgQ29va2llTW9kdWxlIH0gZnJvbSAnLi4vY29va2llL0Nvb2tpZU1vZHVsZSc7XG5pbXBvcnQgeyBDb29raWVTZXJ2aWNlIH0gZnJvbSAnLi4vY29va2llL0Nvb2tpZVNlcnZpY2UnO1xuaW1wb3J0IHsgVGhlbWVBc3NldEJhY2tncm91bmREaXJlY3RpdmUgfSBmcm9tICcuL1RoZW1lQXNzZXRCYWNrZ3JvdW5kRGlyZWN0aXZlJztcbmltcG9ydCB7IFRoZW1lQXNzZXRJbWFnZURpcmVjdGl2ZSB9IGZyb20gJy4vVGhlbWVBc3NldEltYWdlRGlyZWN0aXZlJztcbmltcG9ydCB7IFRoZW1lVG9nZ2xlRGlyZWN0aXZlIH0gZnJvbSAnLi9UaGVtZVRvZ2dsZURpcmVjdGl2ZSc7XG5pbXBvcnQgeyBUaGVtZVN0eWxlRGlyZWN0aXZlIH0gZnJvbSAnLi9UaGVtZVN0eWxlRGlyZWN0aXZlJztcbmltcG9ydCB7IFRoZW1lU3R5bGVIb3ZlckRpcmVjdGl2ZSB9IGZyb20gJy4vVGhlbWVTdHlsZUhvdmVyRGlyZWN0aXZlJztcbmltcG9ydCAqIGFzIF8gZnJvbSAnbG9kYXNoJztcblxubGV0IGRlY2xhcmF0aW9ucyA9IFtUaGVtZVRvZ2dsZURpcmVjdGl2ZSwgVGhlbWVBc3NldEltYWdlRGlyZWN0aXZlLCBUaGVtZUFzc2V0QmFja2dyb3VuZERpcmVjdGl2ZSwgVGhlbWVTdHlsZURpcmVjdGl2ZSwgVGhlbWVTdHlsZUhvdmVyRGlyZWN0aXZlXTtcblxuQE5nTW9kdWxlKHtcbiAgICBpbXBvcnRzOiBbQ29va2llTW9kdWxlXSxcbiAgICBkZWNsYXJhdGlvbnMsXG4gICAgZXhwb3J0czogZGVjbGFyYXRpb25zXG59KVxuZXhwb3J0IGNsYXNzIFRoZW1lTW9kdWxlIHtcbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRTdGF0aWMgTWV0aG9kc1xuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIHB1YmxpYyBzdGF0aWMgZm9yUm9vdChvcHRpb25zPzogSVRoZW1lU2VydmljZU9wdGlvbnMpOiBNb2R1bGVXaXRoUHJvdmlkZXJzPFRoZW1lTW9kdWxlPiB7XG4gICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICBuZ01vZHVsZTogVGhlbWVNb2R1bGUsXG4gICAgICAgICAgICBwcm92aWRlcnM6IFtcbiAgICAgICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgICAgIHByb3ZpZGU6IFRIRU1FX09QVElPTlMsXG4gICAgICAgICAgICAgICAgICAgIHVzZVZhbHVlOiBvcHRpb25zIHx8IHt9XG4gICAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgICAgIHByb3ZpZGU6IFRoZW1lU2VydmljZSxcbiAgICAgICAgICAgICAgICAgICAgZGVwczogW0Nvb2tpZVNlcnZpY2UsIFRIRU1FX09QVElPTlNdLFxuICAgICAgICAgICAgICAgICAgICB1c2VGYWN0b3J5OiB0aGVtZVNlcnZpY2VGYWN0b3J5XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgXVxuICAgICAgICB9O1xuICAgIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRoZW1lU2VydmljZUZhY3RvcnkoY29va2llOiBJQ29va2llU2VydmljZSwgb3B0aW9ucz86IElUaGVtZVNlcnZpY2VPcHRpb25zKTogVGhlbWVTZXJ2aWNlIHtcbiAgICBpZiAoIV8uaXNOaWwob3B0aW9ucykgJiYgIV8uaXNOaWwob3B0aW9ucy5zZXJ2aWNlKSkge1xuICAgICAgICBvcHRpb25zLnNlcnZpY2UgPSBjb29raWU7XG4gICAgfVxuICAgIHJldHVybiBuZXcgVGhlbWVTZXJ2aWNlKG9wdGlvbnMpO1xufVxuXG5leHBvcnQgY29uc3QgVEhFTUVfT1BUSU9OUyA9IG5ldyBJbmplY3Rpb25Ub2tlbjxJVGhlbWVTZXJ2aWNlT3B0aW9ucz4oYFRIRU1FX09QVElPTlNgKTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGhlbWVNb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGhlbWUvVGhlbWVNb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBdUIsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTlFLE9BQU8sRUFBd0IsWUFBWSxFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDaEcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNoRixPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN0RSxPQUFPLEtBQUssQ0FBQyxNQUFNLFFBQVEsQ0FBQztBQUU1QixJQUFJLFlBQVksR0FBRyxDQUFDLG9CQUFvQixFQUFFLHdCQUF3QixFQUFFLDZCQUE2QixFQUFFLG1CQUFtQixFQUFFLHdCQUF3QixDQUFDLENBQUM7QUFPbEosTUFBTSxPQUFPLFdBQVc7SUFDcEIsNkVBQTZFO0lBQzdFLEVBQUU7SUFDRixrQkFBa0I7SUFDbEIsRUFBRTtJQUNGLDZFQUE2RTtJQUV0RSxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQThCO1FBQ2hELE9BQU87WUFDSCxRQUFRLEVBQUUsV0FBVztZQUNyQixTQUFTLEVBQUU7Z0JBQ1A7b0JBQ0ksT0FBTyxFQUFFLGFBQWE7b0JBQ3RCLFFBQVEsRUFBRSxPQUFPLElBQUksRUFBRTtpQkFDMUI7Z0JBQ0Q7b0JBQ0ksT0FBTyxFQUFFLFlBQVk7b0JBQ3JCLElBQUksRUFBRSxDQUFDLGFBQWEsRUFBRSxhQUFhLENBQUM7b0JBQ3BDLFVBQVUsRUFBRSxtQkFBbUI7aUJBQ2xDO2dCQUNEO29CQUNJLE9BQU8sRUFBRSxpQkFBaUI7b0JBQzFCLElBQUksRUFBRSxDQUFDLFlBQVksQ0FBQztvQkFDcEIsVUFBVSxFQUFFLHdCQUF3QjtpQkFDdkM7YUFDSjtTQUNKLENBQUM7SUFDTixDQUFDOzs7WUFoQ0osUUFBUSxTQUFDO2dCQUNOLE9BQU8sRUFBRSxDQUFDLFlBQVksQ0FBQztnQkFDdkIsWUFBWTtnQkFDWixPQUFPLEVBQUUsWUFBWTthQUN4Qjs7QUErQkQsTUFBTSxVQUFVLG1CQUFtQixDQUFDLE1BQXNCLEVBQUUsT0FBOEI7SUFDdEYsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDL0MsT0FBTyxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7S0FDNUI7SUFDRCxPQUFPLElBQUksWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ3JDLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQUMsS0FBbUI7SUFDeEQsT0FBTyxJQUFJLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ3hDLENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsSUFBSSxjQUFjLENBQXVCLGVBQWUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0aW9uVG9rZW4sIE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBJQ29va2llU2VydmljZSB9IGZyb20gJ0B0cy1jb3JlL2Zyb250ZW5kL2Nvb2tpZSc7XG5pbXBvcnQgeyBJVGhlbWVTZXJ2aWNlT3B0aW9ucywgVGhlbWVTZXJ2aWNlLCBUaGVtZUFzc2V0U2VydmljZSB9IGZyb20gJ0B0cy1jb3JlL2Zyb250ZW5kL3RoZW1lJztcbmltcG9ydCB7IENvb2tpZU1vZHVsZSB9IGZyb20gJy4uL2Nvb2tpZS9Db29raWVNb2R1bGUnO1xuaW1wb3J0IHsgQ29va2llU2VydmljZSB9IGZyb20gJy4uL2Nvb2tpZS9Db29raWVTZXJ2aWNlJztcbmltcG9ydCB7IFRoZW1lQXNzZXRCYWNrZ3JvdW5kRGlyZWN0aXZlIH0gZnJvbSAnLi9UaGVtZUFzc2V0QmFja2dyb3VuZERpcmVjdGl2ZSc7XG5pbXBvcnQgeyBUaGVtZUFzc2V0SW1hZ2VEaXJlY3RpdmUgfSBmcm9tICcuL1RoZW1lQXNzZXRJbWFnZURpcmVjdGl2ZSc7XG5pbXBvcnQgeyBUaGVtZVRvZ2dsZURpcmVjdGl2ZSB9IGZyb20gJy4vVGhlbWVUb2dnbGVEaXJlY3RpdmUnO1xuaW1wb3J0IHsgVGhlbWVTdHlsZURpcmVjdGl2ZSB9IGZyb20gJy4vVGhlbWVTdHlsZURpcmVjdGl2ZSc7XG5pbXBvcnQgeyBUaGVtZVN0eWxlSG92ZXJEaXJlY3RpdmUgfSBmcm9tICcuL1RoZW1lU3R5bGVIb3ZlckRpcmVjdGl2ZSc7XG5pbXBvcnQgKiBhcyBfIGZyb20gJ2xvZGFzaCc7XG5cbmxldCBkZWNsYXJhdGlvbnMgPSBbVGhlbWVUb2dnbGVEaXJlY3RpdmUsIFRoZW1lQXNzZXRJbWFnZURpcmVjdGl2ZSwgVGhlbWVBc3NldEJhY2tncm91bmREaXJlY3RpdmUsIFRoZW1lU3R5bGVEaXJlY3RpdmUsIFRoZW1lU3R5bGVIb3ZlckRpcmVjdGl2ZV07XG5cbkBOZ01vZHVsZSh7XG4gICAgaW1wb3J0czogW0Nvb2tpZU1vZHVsZV0sXG4gICAgZGVjbGFyYXRpb25zLFxuICAgIGV4cG9ydHM6IGRlY2xhcmF0aW9uc1xufSlcbmV4cG9ydCBjbGFzcyBUaGVtZU1vZHVsZSB7XG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vIFx0U3RhdGljIE1ldGhvZHNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgc3RhdGljIGZvclJvb3Qob3B0aW9ucz86IElUaGVtZVNlcnZpY2VPcHRpb25zKTogTW9kdWxlV2l0aFByb3ZpZGVyczxUaGVtZU1vZHVsZT4ge1xuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgbmdNb2R1bGU6IFRoZW1lTW9kdWxlLFxuICAgICAgICAgICAgcHJvdmlkZXJzOiBbXG4gICAgICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgICAgICBwcm92aWRlOiBUSEVNRV9PUFRJT05TLFxuICAgICAgICAgICAgICAgICAgICB1c2VWYWx1ZTogb3B0aW9ucyB8fCB7fVxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgICAgICBwcm92aWRlOiBUaGVtZVNlcnZpY2UsXG4gICAgICAgICAgICAgICAgICAgIGRlcHM6IFtDb29raWVTZXJ2aWNlLCBUSEVNRV9PUFRJT05TXSxcbiAgICAgICAgICAgICAgICAgICAgdXNlRmFjdG9yeTogdGhlbWVTZXJ2aWNlRmFjdG9yeVxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgICAgICBwcm92aWRlOiBUaGVtZUFzc2V0U2VydmljZSxcbiAgICAgICAgICAgICAgICAgICAgZGVwczogW1RoZW1lU2VydmljZV0sXG4gICAgICAgICAgICAgICAgICAgIHVzZUZhY3Rvcnk6IHRoZW1lQXNzZXRTZXJ2aWNlRmFjdG9yeVxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIF1cbiAgICAgICAgfTtcbiAgICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB0aGVtZVNlcnZpY2VGYWN0b3J5KGNvb2tpZTogSUNvb2tpZVNlcnZpY2UsIG9wdGlvbnM/OiBJVGhlbWVTZXJ2aWNlT3B0aW9ucyk6IFRoZW1lU2VydmljZSB7XG4gICAgaWYgKCFfLmlzTmlsKG9wdGlvbnMpICYmIF8uaXNOaWwob3B0aW9ucy5zZXJ2aWNlKSkge1xuICAgICAgICBvcHRpb25zLnNlcnZpY2UgPSBjb29raWU7XG4gICAgfVxuICAgIHJldHVybiBuZXcgVGhlbWVTZXJ2aWNlKG9wdGlvbnMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdGhlbWVBc3NldFNlcnZpY2VGYWN0b3J5KHRoZW1lOiBUaGVtZVNlcnZpY2UpOiBUaGVtZUFzc2V0U2VydmljZSB7XG4gICAgcmV0dXJuIG5ldyBUaGVtZUFzc2V0U2VydmljZSh0aGVtZSk7XG59XG5cbmV4cG9ydCBjb25zdCBUSEVNRV9PUFRJT05TID0gbmV3IEluamVjdGlvblRva2VuPElUaGVtZVNlcnZpY2VPcHRpb25zPihgVEhFTUVfT1BUSU9OU2ApO1xuIl19

package/esm2015/user/UserBaseService.js

@@ -59,7 +59,7 @@ export class UserBaseService {
         }
         return this.user.id === value;
     }
-    updateUser(data) {
+    userUpdate(data) {
         if (!this.hasUser) {
             return;
         }
@@ -102,4 +102,4 @@ export var UserBaseServiceEvent;
     UserBaseServiceEvent["CHANGED"] = "CHANGED";
     UserBaseServiceEvent["LOGOUTED"] = "LOGOUTED";
 })(UserBaseServiceEvent || (UserBaseServiceEvent = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserBaseService.js","sourceRoot":"","sources":["../../../src/user/UserBaseService.ts"],"names":[],"mappings":"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","sourcesContent":["import { ObservableData } from '@ts-core/common/observer';\nimport * as _ from 'lodash';\nimport { Observable, Subject } from 'rxjs';\nimport { map, filter } from 'rxjs/operators';\nimport { LoginBaseService, LoginBaseServiceEvent } from '../login/LoginBaseService';\nimport { IUser, UserUid } from './IUser';\n\nexport abstract class UserBaseService<U extends IUser = any, V = void> {\n    // --------------------------------------------------------------------------\n    //\n    // \tProperties\n    //\n    // --------------------------------------------------------------------------\n\n    protected _user: U;\n    protected observer: Subject<ObservableData<V | UserBaseServiceEvent, U>>;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tConstructor\n    //\n    // --------------------------------------------------------------------------\n\n    constructor(protected login: LoginBaseService) {\n        this.observer = new Subject();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tProtected Methods\n    //\n    // --------------------------------------------------------------------------\n\n    protected initialize(): void {\n        if (this.login.isLoggedIn) {\n            this.loginedHandler();\n        }\n\n        this.login.events.subscribe(data => {\n            if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {\n                this.loginedHandler();\n            } else if (data.type === LoginBaseServiceEvent.LOGOUT_FINISHED) {\n                this.logoutedHandler();\n            }\n        });\n    }\n\n    protected initializeUser(): void {\n        this._user = this.createUser(this.login.loginData);\n    }\n    protected deinitializeUser(): void {\n        this._user = null;\n    }\n\n    protected loginedHandler(): void {\n        this.initializeUser();\n        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGINED, this.user));\n    }\n\n    protected logoutedHandler(): void {\n        this.deinitializeUser();\n        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGOUTED));\n    }\n\n    protected abstract createUser(data: any): U;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public isUser(value: any): boolean {\n        if (!value || !this.user) {\n            return false;\n        }\n        if (value.hasOwnProperty('id')) {\n            return this.user.id === value.id;\n        }\n\n        return this.user.id === value;\n    }\n\n    public updateUser(data: any): void {\n        if (!this.hasUser) {\n            return;\n        }\n        this.user.update(data);\n        this.observer.next(new ObservableData(UserBaseServiceEvent.CHANGED, data));\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Properties\n    //\n    // --------------------------------------------------------------------------\n\n    public get events(): Observable<ObservableData<V | UserBaseServiceEvent, U>> {\n        return this.observer.asObservable();\n    }\n\n    public get logined(): Observable<U> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.LOGINED),\n            map(item => item.data)\n        );\n    }\n\n    public get changed(): Observable<any> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.CHANGED),\n            map(item => item.data)\n        );\n    }\n\n    public get logouted(): Observable<void> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.LOGOUTED),\n            map(() => null)\n        );\n    }\n\n    public get hasUser(): boolean {\n        return !_.isNil(this._user);\n    }\n\n    public get isLogined(): boolean {\n        return this.hasUser;\n    }\n\n    public get user(): U {\n        return this._user;\n    }\n\n    public get id(): UserUid {\n        return this.hasUser ? this.user.id : null;\n    }\n}\n\nexport enum UserBaseServiceEvent {\n    LOGINED = 'LOGINED',\n    CHANGED = 'CHANGED',\n    LOGOUTED = 'LOGOUTED'\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserBaseService.js","sourceRoot":"","sources":["../../../src/user/UserBaseService.ts"],"names":[],"mappings":"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","sourcesContent":["import { ObservableData } from '@ts-core/common/observer';\nimport * as _ from 'lodash';\nimport { Observable, Subject } from 'rxjs';\nimport { map, filter } from 'rxjs/operators';\nimport { LoginBaseService, LoginBaseServiceEvent } from '../login/LoginBaseService';\nimport { IUser, UserUid } from './IUser';\n\nexport abstract class UserBaseService<U extends IUser = any, V = void> {\n    // --------------------------------------------------------------------------\n    //\n    // \tProperties\n    //\n    // --------------------------------------------------------------------------\n\n    protected _user: U;\n    protected observer: Subject<ObservableData<V | UserBaseServiceEvent, U>>;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tConstructor\n    //\n    // --------------------------------------------------------------------------\n\n    constructor(protected login: LoginBaseService) {\n        this.observer = new Subject();\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tProtected Methods\n    //\n    // --------------------------------------------------------------------------\n\n    protected initialize(): void {\n        if (this.login.isLoggedIn) {\n            this.loginedHandler();\n        }\n\n        this.login.events.subscribe(data => {\n            if (data.type === LoginBaseServiceEvent.LOGIN_COMPLETE) {\n                this.loginedHandler();\n            } else if (data.type === LoginBaseServiceEvent.LOGOUT_FINISHED) {\n                this.logoutedHandler();\n            }\n        });\n    }\n\n    protected initializeUser(): void {\n        this._user = this.createUser(this.login.loginData);\n    }\n\n    protected deinitializeUser(): void {\n        this._user = null;\n    }\n\n    protected loginedHandler(): void {\n        this.initializeUser();\n        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGINED, this.user));\n    }\n\n    protected logoutedHandler(): void {\n        this.deinitializeUser();\n        this.observer.next(new ObservableData(UserBaseServiceEvent.LOGOUTED));\n    }\n\n    protected abstract createUser(data: any): U;\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Methods\n    //\n    // --------------------------------------------------------------------------\n\n    public isUser(value: any): boolean {\n        if (!value || !this.user) {\n            return false;\n        }\n        if (value.hasOwnProperty('id')) {\n            return this.user.id === value.id;\n        }\n        return this.user.id === value;\n    }\n\n    public userUpdate(data: any): void {\n        if (!this.hasUser) {\n            return;\n        }\n        this.user.update(data);\n        this.observer.next(new ObservableData(UserBaseServiceEvent.CHANGED, data));\n    }\n\n    // --------------------------------------------------------------------------\n    //\n    // \tPublic Properties\n    //\n    // --------------------------------------------------------------------------\n\n    public get events(): Observable<ObservableData<V | UserBaseServiceEvent, U>> {\n        return this.observer.asObservable();\n    }\n\n    public get logined(): Observable<U> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.LOGINED),\n            map(item => item.data)\n        );\n    }\n\n    public get changed(): Observable<any> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.CHANGED),\n            map(item => item.data)\n        );\n    }\n\n    public get logouted(): Observable<void> {\n        return this.events.pipe(\n            filter(item => item.type === UserBaseServiceEvent.LOGOUTED),\n            map(() => null)\n        );\n    }\n\n    public get hasUser(): boolean {\n        return !_.isNil(this._user);\n    }\n\n    public get isLogined(): boolean {\n        return this.hasUser;\n    }\n\n    public get user(): U {\n        return this._user;\n    }\n\n    public get id(): UserUid {\n        return this.hasUser ? this.user.id : null;\n    }\n}\n\nexport enum UserBaseServiceEvent {\n    LOGINED = 'LOGINED',\n    CHANGED = 'CHANGED',\n    LOGOUTED = 'LOGOUTED'\n}\n"]}

package/fesm2015/ts-core-angular.js

@@ -28,7 +28,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatBottomSheet, MatBottomSheetModule } from '@angular/material/bottom-sheet';
 import { RemoveFilterableCondition, GetFilterableCondition } from '@ts-core/common/dto';
 import { DomSanitizer } from '@angular/platform-browser';
-import { ThemeService } from '@ts-core/frontend/theme';
+import { ThemeService, ThemeAssetService } from '@ts-core/frontend/theme';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
@@ -3976,7 +3976,7 @@ LanguageModule.decorators = [
             },] }
 ];
 function languageServiceFactory(cookie, options) {
-    if (options && !options.service) {
+    if (!isNil(options) && isNil(options.service)) {
         options.service = cookie;
     }
     return new LanguageService(options);
@@ -6258,15 +6258,17 @@ class ThemeAssetDirective extends Destroyable {
     //	Constructor
     //
     // --------------------------------------------------------------------------
-    constructor(element, theme) {
+    constructor(element, theme, themeAsset) {
         super();
         this.theme = theme;
+        this.themeAsset = themeAsset;
         this._extension = 'png';
         this._isFile = false;
         this._isImage = false;
         this._isVideo = false;
         this._isSound = false;
         this._isBackground = false;
+        this._isIgnoreTheme = true;
         this.element = ViewUtil.parseElement(element.nativeElement);
         this.theme.changed.pipe(takeUntil(this.destroyed)).subscribe(() => {
             this.isTriedThemeDefault = false;
@@ -6283,21 +6285,21 @@ class ThemeAssetDirective extends Destroyable {
             return null;
         }
         if (this.isImage) {
-            return Assets.getImage(id, this.extension);
+            return this.themeAsset.getImage(id, this.extension, this.isIgnoreTheme);
         }
         if (this.isBackground) {
-            return Assets.getBackground(id, this.extension);
+            return this.themeAsset.getBackground(id, this.extension, this.isIgnoreTheme);
         }
         if (this.isSound) {
-            return Assets.getSound(id, this.extension);
+            return this.themeAsset.getSound(id, this.extension, this.isIgnoreTheme);
         }
         if (this.isVideo) {
-            return Assets.getVideo(id, this.extension);
+            return this.themeAsset.getVideo(id, this.extension, this.isIgnoreTheme);
         }
         if (this.isFile) {
-            return Assets.getFile(id, this.extension);
+            return this.themeAsset.getFile(id, this.extension, this.isIgnoreTheme);
         }
-        return Assets.getIcon(id, this.extension);
+        return this.themeAsset.getIcon(id, this.extension, this.isIgnoreTheme);
     }
     // --------------------------------------------------------------------------
     //
@@ -6328,9 +6330,7 @@ class ThemeAssetDirective extends Destroyable {
         return !isNil(theme) ? this.name + capitalize(theme.name) : null;
     }
     getDefaultSourceId(theme) {
-        let value = this.name;
-        value += theme.isDark ? 'Dark' : 'Light';
-        return value;
+        return `${this.name}${theme.isDark ? 'Dark' : 'Light'}`;
     }
     // --------------------------------------------------------------------------
     //
@@ -6401,6 +6401,16 @@ class ThemeAssetDirective extends Destroyable {
     get isBackground() {
         return this._isBackground;
     }
+    set isIgnoreTheme(value) {
+        if (value === this._isIgnoreTheme) {
+            return;
+        }
+        this._isIgnoreTheme = value;
+        this.setSourceProperties();
+    }
+    get isIgnoreTheme() {
+        return this._isIgnoreTheme;
+    }
     get name() {
         return this._name;
     }
@@ -6436,6 +6446,7 @@ ThemeAssetDirective.propDecorators = {
     isFile: [{ type: Input }],
     isImage: [{ type: Input }],
     isBackground: [{ type: Input }],
+    isIgnoreTheme: [{ type: Input }],
     name: [{ type: Input }],
     extension: [{ type: Input }]
 };
@@ -6446,8 +6457,8 @@ class ThemeAssetBackgroundDirective extends ThemeAssetDirective {
     //	Constructor
     //
     // --------------------------------------------------------------------------
-    constructor(element, theme) {
-        super(element, theme);
+    constructor(element, theme, themeAsset) {
+        super(element, theme, themeAsset);
     }
     // --------------------------------------------------------------------------
     //
@@ -6469,7 +6480,8 @@ ThemeAssetBackgroundDirective.decorators = [
 ];
 ThemeAssetBackgroundDirective.ctorParameters = () => [
     { type: ElementRef },
-    { type: ThemeService }
+    { type: ThemeService },
+    { type: ThemeAssetService }
 ];
 
 class ThemeAssetImageDirective extends ThemeAssetDirective {
@@ -6478,8 +6490,8 @@ class ThemeAssetImageDirective extends ThemeAssetDirective {
     //	Constructor
     //
     // --------------------------------------------------------------------------
-    constructor(element, theme) {
-        super(element, theme);
+    constructor(element, theme, themeAsset) {
+        super(element, theme, themeAsset);
     }
     // --------------------------------------------------------------------------
     //
@@ -6500,7 +6512,8 @@ ThemeAssetImageDirective.decorators = [
 ];
 ThemeAssetImageDirective.ctorParameters = () => [
     { type: ElementRef },
-    { type: ThemeService }
+    { type: ThemeService },
+    { type: ThemeAssetService }
 ];
 
 class ThemeToggleDirective extends Destroyable {
@@ -6789,6 +6802,11 @@ class ThemeModule {
                     provide: ThemeService,
                     deps: [CookieService, THEME_OPTIONS],
                     useFactory: themeServiceFactory
+                },
+                {
+                    provide: ThemeAssetService,
+                    deps: [ThemeService],
+                    useFactory: themeAssetServiceFactory
                 }
             ]
         };
@@ -6802,11 +6820,14 @@ ThemeModule.decorators = [
             },] }
 ];
 function themeServiceFactory(cookie, options) {
-    if (!isNil(options) && !isNil(options.service)) {
+    if (!isNil(options) && isNil(options.service)) {
         options.service = cookie;
     }
     return new ThemeService(options);
 }
+function themeAssetServiceFactory(theme) {
+    return new ThemeAssetService(theme);
+}
 const THEME_OPTIONS = new InjectionToken(`THEME_OPTIONS`);
 
 class WindowDragAreaDirective extends Destroyable {
@@ -7795,6 +7816,7 @@ class LoginBaseService extends Loadable {
         this._loginData = null;
     }
     parseLoginErrorResponse(error) { }
+    parseLogoutErrorResponse(error) { }
     parseLoginSidResponse(response) {
         this._loginData = response;
     }
@@ -7804,6 +7826,7 @@ class LoginBaseService extends Loadable {
         }
         this.reset();
     }
+    // public abstract registration(param: any): void;
     loginByResponse(param) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isLoggedIn || this.isLoading) {
@@ -7831,17 +7854,26 @@ class LoginBaseService extends Loadable {
         return true;
     }
     logout() {
-        if (!this.isLoggedIn) {
-            return;
-        }
-        this.observer.next(new ObservableData(LoadableEvent.STARTED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_STARTED));
-        this.logoutRequest();
-        this.reset();
-        this._isLoggedIn = false;
-        this.status = LoadableStatus.NOT_LOADED;
-        this.observer.next(new ObservableData(LoadableEvent.FINISHED));
-        this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_FINISHED));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isLoggedIn) {
+                return;
+            }
+            this.observer.next(new ObservableData(LoadableEvent.STARTED));
+            this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_STARTED));
+            try {
+                yield this.logoutRequest();
+            }
+            catch (error) {
+                this.parseLogoutErrorResponse(ExtendedError.create(error));
+            }
+            finally {
+                this.reset();
+                this._isLoggedIn = false;
+                this.status = LoadableStatus.NOT_LOADED;
+                this.observer.next(new ObservableData(LoadableEvent.FINISHED));
+                this.observer.next(new ObservableData(LoginBaseServiceEvent.LOGOUT_FINISHED));
+            }
+        });
     }
     isCanLoginWithSid() {
         return this.sid != null || this.getSavedSid() != null;
@@ -8815,13 +8847,14 @@ class RouterBaseService extends Loadable {
     initializeObservers() {
         this.router.events.pipe(takeUntil(this.destroyed)).subscribe(event => {
             if (event instanceof NavigationStart) {
+                this._previousUrl = this.url;
                 this.status = LoadableStatus.LOADING;
             }
             else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {
-                this.status = LoadableStatus.LOADED;
                 if (event instanceof NavigationEnd) {
                     this._lastUrl = event.url;
                 }
+                this.status = LoadableStatus.LOADED;
             }
         });
     }
@@ -8856,7 +8889,7 @@ class RouterBaseService extends Loadable {
                     this.isNeedUpdateExtras = false;
                     this.applyExtras(this.extrasToApply);
                 }
-                this.observer.next(new ObservableData(LoadableEvent.COMPLETE));
+                this.observer.next(new ObservableData(LoadableEvent.COMPLETE, { url: this.url, previousUrl: this.previousUrl }));
                 break;
         }
         if (newStatus === LoadableStatus.LOADED || newStatus === LoadableStatus.ERROR) {
@@ -8985,11 +9018,20 @@ class RouterBaseService extends Loadable {
     get url() {
         return this.router.url;
     }
+    get urlTree() {
+        return this.router.parseUrl(this.url);
+    }
     get lastUrl() {
         return this._lastUrl;
     }
-    get urlTree() {
-        return this.router.parseUrl(this.url);
+    get lastUrlTree() {
+        return this.router.parseUrl(this.lastUrl);
+    }
+    get previousUrl() {
+        return this._previousUrl;
+    }
+    get previousUrlTree() {
+        return this.router.parseUrl(this.previousUrl);
     }
     get router() {
         return this._router;
@@ -9066,7 +9108,7 @@ class UserBaseService {
         }
         return this.user.id === value;
     }
-    updateUser(data) {
+    userUpdate(data) {
         if (!this.hasUser) {
             return;
         }
@@ -9116,5 +9158,5 @@ var UserBaseServiceEvent;
  * Generated bundle index. Do not edit.
  */
 
-export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, ApplicationComponent2, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetIconPipe, AssetImagePipe, AssetModule, AutoScrollBottomDirective, BootstrapBreakpoint, BootstrapBreakpointService, BootstrapBreakpointServiceEvent, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, CdkTableBaseComponent, CdkTableDataSource, CdkTableFilterableMapCollection, CdkTablePaginableBookmarkMapCollection, CdkTablePaginableMapCollection, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, Direction, FinancePipe, FocusDirective, FocusManager, FormElementAsync, FormElementSync, HTMLContentTitleDirective, INotification, INotificationContent, IUser, IVICommonOptions, IWindow, IWindowContent, InfiniteScrollDirective, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageMatPaginatorIntl, LanguageModule, LanguageMomentDateAdapter, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LanguageSelectorComponent, ListItem, ListItems, LoginBaseService, LoginBaseServiceEvent, LoginGuard, LoginRedirectResolver, LoginRequireResolver, LoginResolver, MenuItem, MenuItemBase, MenuItems, MenuListComponent, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationConfig, NotificationEvent, NotificationFactory, NotificationModule, NotificationService, NotificationServiceEvent, PipeBaseService, PrettifyPipe, PropertiesManager, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, SanitizePipe, ScrollDirective, SelectListComponent, SelectListItem, SelectListItems, SelectOnFocusDirective, ShellBaseComponent, StartCasePipe, THEME_OPTIONS, TabGroupComponent, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TruncatePipe, UserBaseService, UserBaseServiceEvent, VICommonModule, VIComponentModule, VI_ANGULAR_OPTIONS, ViewUtil, WindowAlign, WindowBase, WindowConfig, WindowEvent, WindowFactory, WindowImpl, WindowModule, WindowService, WindowServiceEvent, cookieServiceFactory, languageServiceFactory, loggerServiceFactory, themeServiceFactory, AssetFilePipe as ɵa, AssetSoundPipe as ɵb, AssetVideoPipe as ɵc, WindowDragAreaDirective as ɵd, WindowQuestionComponent as ɵe, WindowQuestionBaseComponent as ɵf, WindowCloseElementComponent as ɵg, WindowElement as ɵh, WindowResizeElementComponent as ɵi, WindowMinimizeElementComponent as ɵj, NotificationComponent as ɵk, NotificationQuestionBaseComponent as ɵl, BottomSheetModule as ɵm, BottomSheetCloseElementComponent as ɵn, CdkTableColumnValuePipe as ɵo, CdkTableColumnClassNamePipe as ɵp, CdkTableColumnStyleNamePipe as ɵq, CdkTableRowStyleNamePipe as ɵr, CdkTableRowClassNamePipe as ɵs, CdkTableCellClassNamePipe as ɵt, CdkTablePaginableComponent as ɵu, CdkTableFilterableComponent as ɵv, ValueAccessor as ɵw };
+export { APPLICATION_INJECTOR, ApplicationBaseComponent, ApplicationComponent, ApplicationComponent2, AspectRatioResizeDirective, AssetBackgroundDirective, AssetBackgroundPipe, AssetIconPipe, AssetImagePipe, AssetModule, AutoScrollBottomDirective, BootstrapBreakpoint, BootstrapBreakpointService, BootstrapBreakpointServiceEvent, BottomSheetService, COOKIE_OPTIONS, CamelCasePipe, CanDeactivateGuard, CdkTableBaseComponent, CdkTableDataSource, CdkTableFilterableMapCollection, CdkTablePaginableBookmarkMapCollection, CdkTablePaginableMapCollection, ClickToCopyDirective, ClickToSelectDirective, CookieModule, CookieOptions, CookieService, Direction, FinancePipe, FocusDirective, FocusManager, FormElementAsync, FormElementSync, HTMLContentTitleDirective, INotification, INotificationContent, IUser, IVICommonOptions, IWindow, IWindowContent, InfiniteScrollDirective, LANGUAGE_OPTIONS, LanguageDirective, LanguageHasDirective, LanguageMatPaginatorIntl, LanguageModule, LanguageMomentDateAdapter, LanguagePipe, LanguagePipeHas, LanguagePipeHasPure, LanguagePipePure, LanguageRequireResolver, LanguageResolver, LanguageSelectorComponent, ListItem, ListItems, LoginBaseService, LoginBaseServiceEvent, LoginGuard, LoginRedirectResolver, LoginRequireResolver, LoginResolver, MenuItem, MenuItemBase, MenuItems, MenuListComponent, MessageBaseComponent, MomentDateAdaptivePipe, MomentDateFromNowPipe, MomentDatePipe, MomentTimePipe, NavigationMenuItem, NgModelErrorPipe, NotificationConfig, NotificationEvent, NotificationFactory, NotificationModule, NotificationService, NotificationServiceEvent, PipeBaseService, PrettifyPipe, PropertiesManager, QuestionEvent, QuestionManager, QuestionMode, ResizeDirective, ResizeManager, RouterBaseService, SanitizePipe, ScrollDirective, SelectListComponent, SelectListItem, SelectListItems, SelectOnFocusDirective, ShellBaseComponent, StartCasePipe, THEME_OPTIONS, TabGroupComponent, ThemeAssetBackgroundDirective, ThemeAssetDirective, ThemeAssetImageDirective, ThemeModule, ThemeStyleDirective, ThemeStyleHoverDirective, ThemeToggleDirective, TimePipe, TruncatePipe, UserBaseService, UserBaseServiceEvent, VICommonModule, VIComponentModule, VI_ANGULAR_OPTIONS, ViewUtil, WindowAlign, WindowBase, WindowConfig, WindowEvent, WindowFactory, WindowImpl, WindowModule, WindowService, WindowServiceEvent, cookieServiceFactory, languageServiceFactory, loggerServiceFactory, themeAssetServiceFactory, themeServiceFactory, AssetFilePipe as ɵa, AssetSoundPipe as ɵb, AssetVideoPipe as ɵc, WindowDragAreaDirective as ɵd, WindowQuestionComponent as ɵe, WindowQuestionBaseComponent as ɵf, WindowCloseElementComponent as ɵg, WindowElement as ɵh, WindowResizeElementComponent as ɵi, WindowMinimizeElementComponent as ɵj, NotificationComponent as ɵk, NotificationQuestionBaseComponent as ɵl, BottomSheetModule as ɵm, BottomSheetCloseElementComponent as ɵn, CdkTableColumnValuePipe as ɵo, CdkTableColumnClassNamePipe as ɵp, CdkTableColumnStyleNamePipe as ɵq, CdkTableRowStyleNamePipe as ɵr, CdkTableRowClassNamePipe as ɵs, CdkTableCellClassNamePipe as ɵt, CdkTablePaginableComponent as ɵu, CdkTableFilterableComponent as ɵv, ValueAccessor as ɵw };
 //# sourceMappingURL=ts-core-angular.js.map