diff --git a/packages/resource/resource.js b/packages/resource/resource.js index fac9deb..180ab17 100644 --- a/packages/resource/resource.js +++ b/packages/resource/resource.js @@ -10,6 +10,21 @@ const decorate = compose( export class Resource extends decorate(class {}) { + constructor() { + super(); + this.instanceUuid = Resource.uuid(); + } + + fromJSON({uri, uuid}) { + if (uri) { + this.uri = uri; + } + if (uuid) { + this.uuid = uuid; + } + return this; + } + static load(uri) { return this.read(uri).then((json) => { return new this(json); @@ -54,25 +69,6 @@ export class Resource extends decorate(class {}) { }); } - static uuid() { - return uuid(); - } - - constructor() { - super(); - this.instanceUuid = Resource.uuid(); - } - - fromJSON({uri, uuid}) { - if (uri) { - this.uri = uri; - } - if (uuid) { - this.uuid = uuid; - } - return this; - } - regenerateUuid() { this.uuid = Resource.uuid(); } @@ -84,4 +80,8 @@ export class Resource extends decorate(class {}) { }; } + static uuid() { + return uuid(); + } + }