@rest-hooks/normalizr
Advanced tools
Comparing version 6.0.0-beta.5 to 6.0.0-beta.6
@@ -6,2 +6,16 @@ # Change Log | ||
## [6.0.0-beta.6](https://github.com/coinbase/rest-hooks/compare/@rest-hooks/normalizr@6.0.0-beta.5...@rest-hooks/normalizr@6.0.0-beta.6) (2020-05-14) | ||
### 💅 Enhancement | ||
* Rename merge variables to (existing, incoming) ([#340](https://github.com/coinbase/rest-hooks/issues/340)) ([1d68c30](https://github.com/coinbase/rest-hooks/commit/1d68c30c4b07204d20782f257c9bf0b0fd594c7c)) | ||
### 📝 Documentation | ||
* Get rid of all references to asSchema() ([#339](https://github.com/coinbase/rest-hooks/issues/339)) ([01b878b](https://github.com/coinbase/rest-hooks/commit/01b878b85f7469a12e19912efc696a424663e5f5)) | ||
## [6.0.0-beta.5](https://github.com/coinbase/rest-hooks/compare/@rest-hooks/normalizr@6.0.0-beta.4...@rest-hooks/normalizr@6.0.0-beta.5) (2020-05-13) | ||
@@ -8,0 +22,0 @@ |
@@ -18,3 +18,3 @@ import { AbstractInstanceType, Schema, NormalizedEntity } from '../types'; | ||
/** Creates new instance copying over defined values of arguments */ | ||
static merge<T extends typeof SimpleRecord>(this: T, first: AbstractInstanceType<T>, second: AbstractInstanceType<T>): AbstractInstanceType<T>; | ||
static merge<T extends typeof SimpleRecord>(this: T, existing: AbstractInstanceType<T>, incoming: AbstractInstanceType<T>): AbstractInstanceType<T>; | ||
/** Whether key is non-default */ | ||
@@ -21,0 +21,0 @@ static hasDefined<T extends typeof SimpleRecord>(this: T, instance: AbstractInstanceType<T>, key: Filter<keyof AbstractInstanceType<T>, string>): boolean; |
@@ -251,4 +251,4 @@ define(['exports'], function (exports) { 'use strict'; | ||
static merge(first, second) { | ||
const props = Object.assign(this.toObjectDefined(first), this.toObjectDefined(second)); | ||
static merge(existing, incoming) { | ||
const props = Object.assign(this.toObjectDefined(existing), this.toObjectDefined(incoming)); | ||
return this.fromJS(props); | ||
@@ -290,3 +290,5 @@ } | ||
} | ||
/* istanbul ignore next */ | ||
static asSchema() { | ||
@@ -297,3 +299,5 @@ /* istanbul ignore next */ | ||
} | ||
/* istanbul ignore next */ | ||
return this; | ||
@@ -300,0 +304,0 @@ } |
@@ -252,4 +252,4 @@ var rest_hooks_normalizr = (function (exports) { | ||
static merge(first, second) { | ||
const props = Object.assign(this.toObjectDefined(first), this.toObjectDefined(second)); | ||
static merge(existing, incoming) { | ||
const props = Object.assign(this.toObjectDefined(existing), this.toObjectDefined(incoming)); | ||
return this.fromJS(props); | ||
@@ -291,3 +291,5 @@ } | ||
} | ||
/* istanbul ignore next */ | ||
static asSchema() { | ||
@@ -298,3 +300,5 @@ /* istanbul ignore next */ | ||
} | ||
/* istanbul ignore next */ | ||
return this; | ||
@@ -301,0 +305,0 @@ } |
@@ -247,4 +247,4 @@ /** | ||
static merge(first, second) { | ||
const props = Object.assign(this.toObjectDefined(first), this.toObjectDefined(second)); | ||
static merge(existing, incoming) { | ||
const props = Object.assign(this.toObjectDefined(existing), this.toObjectDefined(incoming)); | ||
return this.fromJS(props); | ||
@@ -286,3 +286,5 @@ } | ||
} | ||
/* istanbul ignore next */ | ||
static asSchema() { | ||
@@ -293,3 +295,5 @@ /* istanbul ignore next */ | ||
} | ||
/* istanbul ignore next */ | ||
return this; | ||
@@ -296,0 +300,0 @@ } |
@@ -253,4 +253,4 @@ 'use strict'; | ||
static merge(first, second) { | ||
const props = Object.assign(this.toObjectDefined(first), this.toObjectDefined(second)); | ||
static merge(existing, incoming) { | ||
const props = Object.assign(this.toObjectDefined(existing), this.toObjectDefined(incoming)); | ||
return this.fromJS(props); | ||
@@ -292,3 +292,5 @@ } | ||
} | ||
/* istanbul ignore next */ | ||
static asSchema() { | ||
@@ -299,3 +301,5 @@ /* istanbul ignore next */ | ||
} | ||
/* istanbul ignore next */ | ||
return this; | ||
@@ -302,0 +306,0 @@ } |
@@ -255,4 +255,4 @@ (function (global, factory) { | ||
static merge(first, second) { | ||
const props = Object.assign(this.toObjectDefined(first), this.toObjectDefined(second)); | ||
static merge(existing, incoming) { | ||
const props = Object.assign(this.toObjectDefined(existing), this.toObjectDefined(incoming)); | ||
return this.fromJS(props); | ||
@@ -294,3 +294,5 @@ } | ||
} | ||
/* istanbul ignore next */ | ||
static asSchema() { | ||
@@ -301,3 +303,5 @@ /* istanbul ignore next */ | ||
} | ||
/* istanbul ignore next */ | ||
return this; | ||
@@ -304,0 +308,0 @@ } |
@@ -45,3 +45,3 @@ import { Schema, AbstractInstanceType } from './types'; | ||
readonly key: string; | ||
merge(a: any, b: any): any; | ||
merge(existing: any, incoming: any): any; | ||
prototype: T; | ||
@@ -48,0 +48,0 @@ } |
{ | ||
"name": "@rest-hooks/normalizr", | ||
"version": "6.0.0-beta.5", | ||
"version": "6.0.0-beta.6", | ||
"description": "Normalizes and denormalizes JSON according to schema for Redux and Flux applications", | ||
@@ -62,3 +62,3 @@ "homepage": "https://github.com/coinbase/rest-hooks/tree/master/packages/normalizr#readme", | ||
}, | ||
"gitHead": "3dfb110ce5a37dd836d1b1d0fab6a0299a780a0e" | ||
"gitHead": "081abed3b41210c2f81e74cbaaeda943cf086e1f" | ||
} |
Sorry, the diff of this file is not supported yet
188330
3262