chore(lint): remove uses of Function type

Author: jdanyow

.vscode/settings.json

@@ -1,4 +1,9 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": false
+  "editor.formatOnSave": true,
+  "typescript.format.enable": true,
+  "json.format.enable": false,
+  "html.format.enable": false,
+  "html.suggest.angular1": false,
+  "html.suggest.ionic": false
 }

src/styles/decorators.ts

@@ -1,8 +1,8 @@
-import {StyleResource} from './style-resource';
-import {resource} from 'aurelia-templating';
-import {RelativeStyleStrategy, StyleStrategy, InlineStyleStrategy} from './style-strategy';
-import {metadata} from 'aurelia-metadata';
-import {StyleLocator} from './style-locator';
+import { StyleResource } from './style-resource';
+import { resource } from 'aurelia-templating';
+import { RelativeStyleStrategy, StyleStrategy, InlineStyleStrategy } from './style-strategy';
+import { metadata } from 'aurelia-metadata';
+import { StyleLocator } from './style-locator';
 
 /**
  * Decorator: Indicates that the target is a styles class.
@@ -16,7 +16,7 @@ export function styles() {
  * @param strategy The style strategy instance.
  */
 export function useStyleStrategy(strategy: StyleStrategy): any {
-  return (target: Function) => {
+  return (target: new () => any) => {
     metadata.define(StyleLocator.styleStrategyMetadataKey, strategy, target);
   };
 }

src/styles/dynamic-styles.ts

@@ -1,4 +1,4 @@
-import {styles, useStyles} from './decorators';
+import { styles, useStyles } from './decorators';
 
 let nextThemeId = 0;
 
@@ -7,13 +7,13 @@ function getNextDynamicThemeId() {
 }
 
 export interface StyleModule {
-  [x: string]: Function;
+  [x: string]: new () => any;
 }
 
 export function createDynamicStyleModule(styleUrl: string): StyleModule {
   @styles()
   @useStyles(styleUrl)
-  class DynamicTheme {}
+  class DynamicTheme { }
 
   return {
     [getNextDynamicThemeId()]: DynamicTheme

src/styles/style-compiler.ts

@@ -1,14 +1,14 @@
-import {BindingLanguage, ViewResources} from 'aurelia-templating';
-import {inject} from 'aurelia-dependency-injection';
-import {StyleFactory} from './style-factory';
+import { BindingLanguage, ViewResources } from 'aurelia-templating';
+import { inject } from 'aurelia-dependency-injection';
+import { StyleFactory } from './style-factory';
 
 const classMatcher = /styles.([A-Za-z1-9\-_]+)/g;
 
 @inject(BindingLanguage, ViewResources)
 export class StyleCompiler {
-  constructor(private bindingLanguage: BindingLanguage, private viewResources: ViewResources) {}
+  constructor(private bindingLanguage: BindingLanguage, private viewResources: ViewResources) { }
 
-  public compile(styleObjectType: Function, css: string): StyleFactory {
+  public compile(styleObjectType: new () => any, css: string): StyleFactory {
     const styles = Object.create(null);
     const transformed = css.replace(classMatcher, (_: string, capture: string) => {
       const name = capture.replace(/\-/g, '_');
@@ -32,15 +32,15 @@ export class StyleCompiler {
 }
 
 class PlainCSSBindingExpression {
-  constructor(private css: string) {}
+  constructor(private css: string) { }
 
   public createBinding(styleElement: HTMLStyleElement) {
     return new CSSBinding(this.css, styleElement);
   }
 }
 
 class CSSBinding {
-  constructor(private css: string, private styleElement: HTMLStyleElement) {}
+  constructor(private css: string, private styleElement: HTMLStyleElement) { }
 
   public bind() {
     this.styleElement.innerHTML = this.css;

src/styles/style-factory.ts

@@ -1,16 +1,16 @@
-import {StyleController} from './style-controller';
-import {AureliaUX} from '../aurelia-ux';
-import {computedFrom, camelCase} from 'aurelia-binding';
-import {Container} from 'aurelia-dependency-injection';
-import {Origin} from 'aurelia-metadata';
-import {swatches} from '../colors/swatches';
-import {shadows} from '../colors/shadows';
+import { StyleController } from './style-controller';
+import { AureliaUX } from '../aurelia-ux';
+import { computedFrom, camelCase } from 'aurelia-binding';
+import { Container } from 'aurelia-dependency-injection';
+import { Origin } from 'aurelia-metadata';
+import { swatches } from '../colors/swatches';
+import { shadows } from '../colors/shadows';
 
 export class StyleFactory {
   public themeKey: string;
   private defaultController: StyleController;
 
-  constructor(private styleObjectType: Function, private styles: string[], private expression: object) {
+  constructor(private styleObjectType: new () => any, private styles: string[], private expression: object) {
     this.themeKey = camelCase(Origin.get(styleObjectType).moduleMember);
   }
 
@@ -44,7 +44,7 @@ export class StyleFactory {
       new StyleOverrideContext(ux, $styles, bindingContext),
       this.expression,
       destination
-      );
+    );
   }
 }
 
@@ -64,7 +64,7 @@ class StyleOverrideContext {
   public $swatches = swatches;
   public $shadows = shadows;
 
-  constructor(public $ux: AureliaUX, public $styles: any, public bindingContext: any) {}
+  constructor(public $ux: AureliaUX, public $styles: any, public bindingContext: any) { }
 
   @computedFrom('$ux.platform')
   get $platform() {

src/styles/style-resource.ts

@@ -1,19 +1,19 @@
-import {Origin} from 'aurelia-metadata';
-import {ViewResources, View} from 'aurelia-templating';
-import {Container} from 'aurelia-dependency-injection';
-import {StyleFactory} from './style-factory';
-import {StyleLocator} from './style-locator';
-import {StyleEngine} from './style-engine';
+import { Origin } from 'aurelia-metadata';
+import { ViewResources, View } from 'aurelia-templating';
+import { Container } from 'aurelia-dependency-injection';
+import { StyleFactory } from './style-factory';
+import { StyleLocator } from './style-locator';
+import { StyleEngine } from './style-engine';
 
 export class StyleResource {
-  public styleObjectType: Function;
+  public styleObjectType: new () => any;
   public css: string;
   public resources: ViewResources;
   public factory: StyleFactory;
   public container: Container;
   private hooks: StyleViewEngineHooks;
 
-  public initialize(container: Container, target: Function): void {
+  public initialize(container: Container, target: new () => any): void {
     this.styleObjectType = target;
     this.container = container;
     this.hooks = new StyleViewEngineHooks(container.get(StyleEngine));
@@ -42,7 +42,7 @@ export class StyleResource {
 class StyleViewEngineHooks {
   public factory: StyleFactory;
 
-  constructor(private engine: StyleEngine) {}
+  constructor(private engine: StyleEngine) { }
 
   public beforeBind(view: View) {
     this.engine.getOrCreateStyleController(view, this.factory).bind(view);

src/styles/style-strategy.ts

@@ -1,22 +1,22 @@
-import {StyleFactory} from './style-factory';
-import {protocol, Origin} from 'aurelia-metadata';
-import {PLATFORM} from 'aurelia-pal';
-import {StyleLocator} from './style-locator';
-import {relativeToFile} from 'aurelia-path';
-import {Container} from 'aurelia-dependency-injection';
-import {StyleCompiler} from './style-compiler';
-import {Loader} from 'aurelia-loader';
-import {AureliaUX} from '../aurelia-ux';
+import { StyleFactory } from './style-factory';
+import { protocol, Origin } from 'aurelia-metadata';
+import { PLATFORM } from 'aurelia-pal';
+import { StyleLocator } from './style-locator';
+import { relativeToFile } from 'aurelia-path';
+import { Container } from 'aurelia-dependency-injection';
+import { StyleCompiler } from './style-compiler';
+import { Loader } from 'aurelia-loader';
+import { AureliaUX } from '../aurelia-ux';
 
 export interface StyleStrategy {
   moduleId?: string;
-  loadStyleFactory(container: Container, styleObjectType: Function): Promise<StyleFactory>;
+  loadStyleFactory(container: Container, styleObjectType: new () => any): Promise<StyleFactory>;
 }
 
 /**
  * Decorator: Indicates that the decorated class/object is a style strategy.
  */
-export const styleStrategy: Function = (protocol as any).create('aurelia:style-strategy', {
+export const styleStrategy: () => (target: any) => void = (protocol as any).create('aurelia:style-strategy', {
   validate(target: any): string | boolean {
     if (!(typeof target.loadStyleFactory === 'function')) {
       return 'Style strategies must implement: loadStyleFactory(): Promise<StyleFactory>';
@@ -70,7 +70,7 @@ export class RelativeStyleStrategy implements StyleStrategy {
   /**
    * Loads a style factory.
    */
-  public loadStyleFactory(container: Container, styleObjectType: Function): Promise<StyleFactory> {
+  public loadStyleFactory(container: Container, styleObjectType: new () => any): Promise<StyleFactory> {
     if (this.absolutePath === null && this.moduleId) {
       const path = resolveForDesign(this.pathOrDesignMap, container);
 
@@ -128,7 +128,7 @@ export class ConventionalStyleStrategy implements StyleStrategy {
   /**
    * Loads a style factory.
    */
-  public loadStyleFactory(container: Container, styleObjectType: Function): Promise<StyleFactory> {
+  public loadStyleFactory(container: Container, styleObjectType: new () => any): Promise<StyleFactory> {
     return container.get(Loader)
       .loadText(this.styleUrl)
       .catch(() => null)
@@ -152,12 +152,12 @@ export class InlineStyleStrategy implements StyleStrategy {
   /**
    * Creates an instance of InlineStyleStrategy.
    */
-  constructor(private cssOrDesignMap: string | any) {}
+  constructor(private cssOrDesignMap: string | any) { }
 
   /**
    * Loads a style factory.
    */
-  public loadStyleFactory(container: Container, styleObjectType: Function): Promise<StyleFactory> {
+  public loadStyleFactory(container: Container, styleObjectType: new () => any): Promise<StyleFactory> {
     const css = resolveForDesign(this.cssOrDesignMap, container);
     this.transformedCSS = fixupCSSUrls(this.moduleId, css);
     const compiler = container.get(StyleCompiler) as StyleCompiler;

tslint.json

@@ -13,7 +13,6 @@
     "array-type": ["array-simple"],
     "arrow-parens": false,
     "max-classes-per-file": [false],
-    "prefer-for-of": false,
-    "ban-types": false
+    "prefer-for-of": false
   }
 }