closes #54 (missing infer as + type declarations fixed)

Author: RobinBuschmann

lib/interfaces/IFindCreateFindOptions.ts

@@ -0,0 +1,10 @@
+import {IFindOptions} from "./IFindOptions";
+
+export interface IFindCreateFindOptions<TAttributes> extends IFindOptions {
+
+  /**
+   * Default values to use if building a new instance
+   */
+  defaults?: TAttributes;
+
+}

lib/interfaces/IFindOrInitializeOptions.ts

@@ -0,0 +1,9 @@
+import {IFindOptions} from "./IFindOptions";
+
+export interface IFindOrInitializeOptions<TAttributes> extends IFindOptions {
+
+  /**
+   * Default values to use if building a new instance
+   */
+  defaults?: TAttributes;
+}

lib/models/Model.d.ts

@@ -3,18 +3,18 @@ import {Sequelize} from './Sequelize';
 import {IFindOptions} from '../interfaces/IFindOptions';
 import * as Promise from 'bluebird';
 import {
-  SyncOptions, FindCreateFindOptions, UpsertOptions,
-  BulkCreateOptions, UpdateOptions, RestoreOptions, DestroyOptions,
-  TruncateOptions, FindOrInitializeOptions,
-  CreateOptions, InstanceSaveOptions, InstanceSetOptions, AggregateOptions,
-  InstanceIncrementDecrementOptions, DropOptions, InstanceUpdateOptions,
-  InstanceDestroyOptions, InstanceRestoreOptions,
+  SyncOptions, UpsertOptions, BulkCreateOptions, UpdateOptions, RestoreOptions,
+  DestroyOptions, TruncateOptions, InstanceSaveOptions, InstanceSetOptions,
+  AggregateOptions, InstanceIncrementDecrementOptions, DropOptions,
+  InstanceUpdateOptions, InstanceDestroyOptions, InstanceRestoreOptions,
   SchemaOptions, GetTableNameOptions, AddScopeOptions, ScopeOptions,
   WhereOptions, CountOptions, ValidationError, DefineAttributes
 } from 'sequelize';
 import {IAssociationActionOptions} from "../interfaces/IAssociationActionOptions";
 import {IBuildOptions} from "../interfaces/IBuildOptions";
 import {ICreateOptions} from "../interfaces/ICreateOptions";
+import {IFindOrInitializeOptions} from "../interfaces/IFindOrInitializeOptions";
+import {IFindCreateFindOptions} from "../interfaces/IFindCreateFindOptions";
 
 /* tslint:disable:member-ordering */
 /* tslint:disable:array-type */
@@ -310,11 +310,11 @@ export declare class Model<T> extends Hooks {
    * Find a row that matches the query, or build (but don't save) the row if none is found.
    * The successfull result of the promise will be (instance, initialized) - Make sure to use .spread()
    */
-  static findOrInitialize<T extends Model<T>>(options: FindOrInitializeOptions<any>): Promise<[T, boolean]>;
-  static findOrInitialize<T extends Model<T>, A>(options: FindOrInitializeOptions<A>): Promise<[T, boolean]>;
+  static findOrInitialize<T extends Model<T>>(options: IFindOrInitializeOptions<any>): Promise<[T, boolean]>;
+  static findOrInitialize<T extends Model<T>, A>(options: IFindOrInitializeOptions<A>): Promise<[T, boolean]>;
 
-  static findOrBuild<T extends Model<T>>(options: FindOrInitializeOptions<any>): Promise<[T, boolean]>;
-  static findOrBuild<T extends Model<T>, A>(options: FindOrInitializeOptions<A>): Promise<[T, boolean]>;
+  static findOrBuild<T extends Model<T>>(options: IFindOrInitializeOptions<any>): Promise<[T, boolean]>;
+  static findOrBuild<T extends Model<T>, A>(options: IFindOrInitializeOptions<A>): Promise<[T, boolean]>;
 
   /**
    * Find a row that matches the query, or build and save the row if none is found
@@ -327,13 +327,13 @@ export declare class Model<T> extends Hooks {
    * an instance of sequelize.TimeoutError will be thrown instead. If a transaction is created, a savepoint
    * will be created instead, and any unique constraint violation will be handled internally.
    */
-  static findOrCreate<T extends Model<T>>(options: FindOrInitializeOptions<T>): Promise<[T, boolean]>;
+  static findOrCreate<T extends Model<T>>(options: IFindOrInitializeOptions<T>): Promise<[T, boolean]>;
 
   /**
    * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
    * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
    */
-  static findCreateFind<T extends Model<T>>(options: FindCreateFindOptions<T>): Promise<T>;
+  static findCreateFind<T extends Model<T>>(options: IFindCreateFindOptions<T>): Promise<T>;
 
   /**
    * Insert or update a single row. An update will be executed if a row which matches the supplied values on

lib/services/models.ts

@@ -33,13 +33,17 @@ export const INFER_ALIAS_MAP = {
   create: 1,
   aggregate: 2,
   all: 0,
+  find: 0,
   findAll: 0,
   findAndCount: 0,
   findAndCountAll: 0,
   findById: 1,
   findByPrimary: 1,
-  find: 0,
+  findCreateFind: 0,
   findOne: 0,
+  findOrBuild: 0,
+  findOrCreate: 0,
+  findOrInitialize: 0,
   reload: 0,
 };