Merge pull request #3 from deepforge-dev/2-incorrect-base-struct-inherit

Resolve base correctly when using structural inheritance. Fixes #2

Author: brollb

src/common/JSONImporter.js

@@ -38,10 +38,11 @@ define([
                 json.attribute_meta[name] = this.core.getAttributeMeta(node, name);
             });
 
-            json.pointers.base = this.core.getPointerPath(node, 'base');
             this.core.getOwnPointerNames(node).forEach(name => {
                 json.pointers[name] = this.core.getPointerPath(node, name);
             });
+            const baseNode = this.core.getBase(node);
+            json.pointers.base = baseNode && this.core.getPath(baseNode);
 
             this.core.getOwnValidPointerNames(node).forEach(name => {
                 json.pointer_meta[name] = this.core.getPointerMeta(node, name);

test/common/JSONImporter.spec.js

@@ -265,6 +265,25 @@ describe('JSONImporter', function () {
                 assert.equal(core.getAttribute(node, 'name'), 'NewMetaNodeName');
                 assert.equal(core.getPointerPath(fco, 'testPtr'), core.getPath(node));
             });
+
+            it('should set base correctly during structural inheritance', async function() {
+                const fco = await core.loadByPath(root, '/1');
+                const nodeA = core.createNode({base: fco, parent: root});
+                core.setAttribute(nodeA, 'name', 'A');
+
+                const nodeB = core.createNode({base: fco, parent: nodeA});
+                core.setAttribute(nodeB, 'name', 'B');
+
+                const nodeAp = core.createNode({base: nodeA, parent: root});
+                core.setAttribute(nodeAp, 'name', 'A prime');
+
+                const [childPath] = core.getChildrenPaths(nodeAp);
+                const nodeBp = await core.loadByPath(root, childPath);
+
+                const schemaAp = await importer.toJSON(nodeAp);
+                const [schemaBp] = schemaAp.children;
+                assert.equal(schemaBp.pointers.base, core.getPath(nodeB));
+            });
         });
 
         describe('pointer meta', function() {