Explicit extension namespaces

lib/descriptor-builder.js

@@ -42,19 +42,20 @@ DescriptorBuilder.prototype.build = function() {
  * @param {Object} p
  * @param {Number} [idx]
  * @param {Boolean} [validate=true]
+ * @param {Boolean} [inherited=false]
  */
-DescriptorBuilder.prototype.addProperty = function(p, idx, validate) {
+DescriptorBuilder.prototype.addProperty = function(p, idx, validate, inherited) {
 
   if (typeof idx === 'boolean') {
     validate = idx;
     idx = undefined;
   }
 
-  this.addNamedProperty(p, validate !== false);
+  this.addNamedProperty(p, validate !== false, inherited);
 
   var properties = this.properties;
 
-  if (idx !== undefined) {
+  if (typeof idx === 'number') {
     properties.splice(idx, 0, p);
   } else {
     properties.push(p);
@@ -105,10 +106,16 @@ DescriptorBuilder.prototype.replaceProperty = function(oldProperty, newProperty,
   //  * validate only if this is a "rename" operation
   //  * add at specific index unless we "replace"
   //
-  this.addProperty(newProperty, replace ? undefined : idx, rename);
+  this.addProperty(newProperty, replace ? undefined : idx, rename, oldProperty.inherited);
+
+  if (oldProperty.inherited) {
+
+    // make new property available under old localName
+    propertiesByName[oldNameNs.localName] = newProperty;
+  }
 
   // make new property available under old name
-  propertiesByName[oldNameNs.name] = propertiesByName[oldNameNs.localName] = newProperty;
+  propertiesByName[oldNameNs.name] = newProperty;
 };
 
 
@@ -130,16 +137,23 @@ DescriptorBuilder.prototype.redefineProperty = function(p, targetPropertyName, r
   delete p.redefines;
 };
 
-DescriptorBuilder.prototype.addNamedProperty = function(p, validate) {
+DescriptorBuilder.prototype.addNamedProperty = function(p, validate, inherited) {
   var ns = p.ns,
       propsByName = this.propertiesByName;
 
   if (validate) {
+    if (inherited) {
+      this.assertNotDefined(p, ns.localName);
+    }
+
     this.assertNotDefined(p, ns.name);
-    this.assertNotDefined(p, ns.localName);
   }
 
-  propsByName[ns.name] = propsByName[ns.localName] = p;
+  if (inherited) {
+    propsByName[ns.localName] = p;
+  }
+
+  propsByName[ns.name] = p;
 };
 
 DescriptorBuilder.prototype.removeNamedProperty = function(p) {
@@ -218,8 +232,8 @@ DescriptorBuilder.prototype.addTrait = function(t, inherited) {
 
     // clone property to allow extensions
     p = assign({}, p, {
-      name: p.ns.localName,
-      inherited: inherited
+      name: inherited ? p.ns.localName : p.ns.name,
+      inherited
     });
 
     Object.defineProperty(p, 'definedBy', {
@@ -239,7 +253,8 @@ DescriptorBuilder.prototype.addTrait = function(t, inherited) {
       if (p.isId) {
         this.setIdProperty(p);
       }
-      this.addProperty(p);
+
+      this.addProperty(p, null, true, inherited);
     }
   }, this));
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moddle",
-  "version": "6.2.1",
+  "version": "7.0.0-exp.3",
   "description": "A library for importing meta-model based file formats into JS",
   "scripts": {
     "all": "run-s lint test distro",

test/fixtures/model/extension/base.json

@@ -6,6 +6,7 @@
     {
       "name": "Root",
       "properties": [
+        { "name": "id", "type": "String" },
         { "name": "own", "type": "Own" },
         { "name": "ownAttr", "type": "String", "isAttr": true },
         { "name": "generic", "type": "Element" },

test/fixtures/model/extension/custom.json

@@ -8,8 +8,10 @@
       "superClass": [ "Base" ],
       "extends": [ "b:Root" ],
       "properties": [
+        { "name": "own", "type": "b:Own" },
         { "name": "customAttr", "type": "Integer", "isAttr": true },
-        { "name": "generic", "type": "CustomGeneric", "redefines": "b:Root#generic" }
+        { "name": "generic", "type": "CustomGeneric", "redefines": "b:Root#generic" },
+        { "name": "id", "type": "String", "replaces": "b:Root#id", "isAttr": true, "isId": true }
       ]
     },
     {

test/fixtures/model/multiple-inheritance/base.json

@@ -0,0 +1,17 @@
+{
+  "name": "Multiple Inheritance Base",
+  "uri": "http://multiple-inheritance-base",
+  "prefix": "b",
+  "types": [
+    {
+      "name": "Element",
+      "properties": [
+        { "name": "ownedElement", "type": "b:Element", "isMany": true }
+      ]
+    },
+    {
+      "name": "PackageableElement",
+      "superClass": [ "b:Element" ]
+    }
+  ]
+}

test/fixtures/model/multiple-inheritance/glue.json

@@ -0,0 +1,16 @@
+{
+  "name": "Multiple Inheritance Glue",
+  "uri": "http://multiple-inheritance-glue",
+  "prefix": "g",
+  "types": [
+    {
+      "name": "Diagram",
+      "superClass": [
+        "b:PackageableElement"
+      ],
+      "extends": [
+        "o:Diagram"
+      ]
+    }
+  ]
+}

test/fixtures/model/multiple-inheritance/other.json

@@ -0,0 +1,19 @@
+{
+  "name": "Multiple Inheritance Other",
+  "uri": "http://multiple-inheritance-other",
+  "prefix": "o",
+  "types": [
+    {
+      "name": "DiagramElement",
+      "properties": [
+        { "name": "ownedElement", "type": "DiagramElement", "isMany": true }
+      ]
+    },
+    {
+      "name": "Diagram",
+      "superClass": [
+        "DiagramElement"
+      ]
+    }
+  ]
+}

test/fixtures/model/redefines/custom.json

@@ -0,0 +1,17 @@
+{
+  "name": "Redefines Custom",
+  "uri": "http://redefines-custom",
+  "prefix": "c",
+  "types": [
+    {
+      "name": "Base",
+      "extends": [
+        "b:Base"
+      ],
+      "properties": [
+        { "name": "value", "type": "String" },
+        { "name": "id", "type": "Integer", "redefines": "b:Base#id", "isId": true }
+      ]
+    }
+  ]
+}

test/fixtures/model/redefines/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Redefines Extension",
+  "uri": "http://redefines-extension",
+  "prefix": "e",
+  "types": [
+    {
+      "name": "Base",
+      "superClass": [
+        "b:Base"
+      ],
+      "properties": [
+        { "name": "value", "type": "String" },
+        { "name": "id", "type": "Integer", "redefines": "b:Base#id", "isId": true }
+      ]
+    }
+  ]
+}

test/fixtures/model/replaces/custom.json

@@ -0,0 +1,17 @@
+{
+  "name": "Replaces Extension",
+  "uri": "http://replace-extension",
+  "prefix": "c",
+  "types": [
+    {
+      "name": "Base",
+      "extends": [
+        "b:Base"
+      ],
+      "properties": [
+        { "name": "value", "type": "String" },
+        { "name": "id", "type": "Integer", "replaces": "b:Base#id", "isId": true }
+      ]
+    }
+  ]
+}

test/fixtures/model/replaces/extension.json

@@ -0,0 +1,17 @@
+{
+  "name": "Replaces Extension",
+  "uri": "http://replace-extension",
+  "prefix": "e",
+  "types": [
+    {
+      "name": "Base",
+      "superClass": [
+        "b:Base"
+      ],
+      "properties": [
+        { "name": "value", "type": "String" },
+        { "name": "id", "type": "Integer", "replaces": "b:Base#id", "isId": true }
+      ]
+    }
+  ]
+}