cha0s/avocado
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(entity): JSON

Browse Source
This commit is contained in:
cha0s 2022-03-22 17:58:38 -05:00
parent a55c7141f3
commit 50cca7bb9f
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/entity/src/resources/entity.js
View File

@ -371,17 +371,36 @@ export default (flecks) => {
}
toJSON() {
let output;
if (this.uri) {
const pristine = {};
const json = {};
const traits = Object.entries(this.#traits);
for (let i = 0; i < traits.length; i++) {
const [type, trait] = traits[i];
json[type] = trait.toJSON();
pristine.traits = pristine.traits || {};
pristine.traits[type] = trait.constructor.withDefaults(
this.#originalJson ? this.#originalJson.traits[type] : {},
);
json.traits = json.traits || {};
json.traits[type] = trait.toJSON();
}
return {
...(this.uri ? {extends: this.uri} : {}),
traits: json,
output = {
extends: this.uri,
...(mergeDiff(pristine, json) || {}),
};
}
else {
output = {};
const traits = Object.entries(this.#traits);
for (let i = 0; i < traits.length; i++) {
const [type, trait] = traits[i];
output.traits = {};
output.traits[type] = trait.toJSON();
}
}
return output;
}
toNetwork(informed) {
let output;

4
packages/entity/test/json.js
View File

@ -25,9 +25,9 @@ afterEach(() => {
it('outputs JSON', () => {
const entity = new Entity();
expect(entity.toJSON()).to.deep.equal({traits: {}});
expect(entity.toJSON()).to.deep.equal({});
entity.uri = '/foo/bar';
expect(entity.toJSON()).to.deep.equal({extends: entity.uri, traits: {}});
expect(entity.toJSON()).to.deep.equal({extends: entity.uri});
});
it('can trim defaults from JSON', async () => {