Merge branch 'master' into release

js-data · Jul 2, 2017 · bebbf60 · bebbf60
2 parents ff1dd0c + 1e99be4
commit bebbf60
Show file tree

Hide file tree

Showing 28 changed files with 8,629 additions and 756 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -13,8 +13,10 @@ Frans Krojegård <frans@krojegard.com>
 InternalFX <bryan@internalfx.com>
 Ivan Voznyakovsky <ivan.voznyakovsky@gmail.com>
 Jason Dobry <jason.dobry@gmail.com>
+Jeremy TRUFIER <jeremy@trufier.com>
 Ken Børge Viktil <ken.borge.viktil@evry.com>
 Kent C. Dodds <kent@doddsfamily.us>
+Kurt Van Delden <kurt@vandeldenassociates.com>
 Matt Lewis <matthew.lewis@socialsignin.co.uk>
 Matt Winkler <matt@mattwinkler.com>
 Matthew Overall <matthew.overall@gmail.com>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+##### 3.0.0 - 01 July 2017
+
+**v3 Stable Release**
+
+###### Bug fixes
+- [#473] - Fixes #471 by @Tronix117
+
 ##### 3.0.0-rc.9 - 22 February 2017
 
 ###### Bug fixes

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -11,8 +11,10 @@ Frans Krojegård <frans@krojegard.com>
 InternalFX <bryan@internalfx.com>
 Ivan Voznyakovsky <ivan.voznyakovsky@gmail.com>
 Jason Dobry <jason.dobry@gmail.com>
+Jeremy TRUFIER <jeremy@trufier.com>
 Ken Børge Viktil <ken.borge.viktil@evry.com>
 Kent C. Dodds <kent@doddsfamily.us>
+Kurt Van Delden <kurt@vandeldenassociates.com>
 Matt Lewis <matthew.lewis@socialsignin.co.uk>
 Matt Winkler <matt@mattwinkler.com>
 Matthew Overall <matthew.overall@gmail.com>

diff --git a/dist/js-data.d.ts b/dist/js-data.d.ts
@@ -125,7 +125,7 @@ export class Mapper extends Component {
   afterFind(id: string|number, opts: any, result: any): any
   afterFindAll(query: any, opts: any, result: any): any
   afterSum(field: string, query: any, opts: any, result: any): any
-  afterUpdate(id: string|number, opts: any, result: any): any
+  afterUpdate(id: string|number, props: any, opts: any, result: any): any
   afterUpdateAll(props: any, query: any, opts: any, result: any): any
   afterUpdateMany(records: any[], opts: any, result: any): any
   beforeCreate(props: any, opts: any): any
@@ -222,16 +222,17 @@ export class Container extends Component {
   getAdapterName(opts?: any): string
   getAdapters(): any
   getMapper(name: string): Mapper
+  getMapperByName(name:string): Mapper
   registerAdapter(name: string, adapter: any, opts?: any): void
 }
-export class DataStore extends Container {
-  collectionClass: typeof LinkedCollection
+export class SimpleStore extends Container {
+  collectionClass: typeof Collection
   _collections: Object
   _pendingQueries: Object
   _completedQueries: Object
   usePendingFind: boolean
   usePendingFindAll: boolean
-  as(name: string): Mapper|LinkedCollection
+  as(name: string): Mapper|Collection
   constructor(opts?: any)
   add(mapperName: string, records: any[]|any, opts?: any): any[]|any
   addToCache(mapperName: string, data: any, opts: any): any
@@ -240,7 +241,8 @@ export class DataStore extends Container {
   cachedFindAll(mapperName: string, hash: string, opts: any): any
   cacheFind(mapperName: string, data: any, id: string|number, opts: any): void
   cacheFindAll(mapperName: string, data: any, hash: string, opts: any): void
-  createIndex(mapperName: string, name: any, fieldList: any, opts?: any): LinkedCollection
+  clear(): any
+  createIndex(mapperName: string, name: any, fieldList: any, opts?: any): Collection
   filter(mapperName: string, query: any, thisArg?: any): any[]
   get(mapperName: string, id: string|number): any
   getAll(mapperName: string, ...args: any[]): any[]
@@ -260,11 +262,17 @@ export class DataStore extends Container {
   cachedFind(mapperName: string, id: any, opts?: any): any
   cachedFindAll(mapperName: string, query: any, opts?: any): any
   hashQuery(mapperName: string, query: any, opts?: any): string
-  getCollection(mapperName: string): LinkedCollection
+  getCollection(mapperName: string): Collection
   update(mapperName: string, id: any, record: any, opts?: any): Promise<any>
   updateAll(mapperName: string, props: any, query?: any, opts?: any): Promise<any[]|any>
   updateMany(mapperName: string, records: any, opts?: any): Promise<any[]|any>
 }
+export class DataStore extends SimpleStore {
+  collectionClass: typeof LinkedCollection
+  as(name: string): Mapper|LinkedCollection
+  createIndex(mapperName: string, name: any, fieldList: any, opts?: any): LinkedCollection
+  getCollection(mapperName: string): LinkedCollection
+}
 export class Query extends Component {
   static ops: {
     '=='(value: any, predicate: any): boolean