Publish version 0.4.6

emfjson · Nov 25, 2014 · 40a3af0 · 40a3af0
1 parent 9fae39c
commit 40a3af0
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 31 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ecore.js",
   "main": "dist/ecore.js",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "homepage": "https://github.com/ghillairet/ecore.js",
   "authors": [
     "ghillairet <g.hillairet@gmail.com>"
@@ -20,6 +20,6 @@
     "tests"
   ],
   "dependencies": {
-    "underscore": "~1.5.2"
+    "underscore": "~1.7.0"
   }
 }
diff --git a/dist/ecore.js b/dist/ecore.js
@@ -6,6 +6,8 @@
 
 (function() {
 
+"use strict";
+
 // The root object, `window` in the browser, or `global` on the server.
 var root = this;
 
@@ -476,17 +478,36 @@ Ecore.EObjectPrototype = {
     eContents: function() {
         if (!this.eClass) return [];
 
-        var eAllFeatures = this.eClass.get('eAllStructuralFeatures'),
-            eContainments = _.filter(eAllFeatures, function(feature) {
+        if (_.isUndefined(this.__updateContents)) {
+            this.__updateContents = true;
+
+            var resource = this.eResource();
+            if (resource) {
+                var me = this;
+                resource.on('add remove', function() {
+                    me.__updateContents = true;
+                })
+            }
+        }
+
+        if (this.__updateContents) {
+            var eAllFeatures    = this.eClass.get('eAllStructuralFeatures');
+            var eContainments   = _.filter(eAllFeatures, function(feature) {
                 return feature.isTypeOf('EReference') &&
                     feature.get('containment') &&
                     this.isSet(feature.get('name'));
             }, this);
 
-        return _.flatten(_.map(eContainments, function(c) {
-            var value = this.get(c.get('name'));
-            return value instanceof Ecore.EList ? value.array() : value;
-        }, this));
+            var value = null;
+            this.__eContents = _.flatten(_.map(eContainments, function(c) {
+                value = this.get(c.get('name'));
+                return value ? (value.array ? value.array() : value) : [];
+            }, this));
+
+            this.__updateContents = false;
+        }
+
+        return this.__eContents;
     },
 
     // Returns the URI of the EObject.
@@ -1894,11 +1915,7 @@ var EClassResource = Ecore.Resource = Ecore.EClass.create({
             _: function(fragment) {
                 if (!fragment) return null;
 
-                if (this.__index == null) {
-                    this.__index = buildIndex(this);
-                }
-
-                return this.__index[fragment];
+                return this._index()[fragment];
             }
         },
         {
@@ -1992,7 +2009,20 @@ var EClassResource = Ecore.Resource = Ecore.EClass.create({
             name: '_index',
             eType: JSObject,
             _: function() {
-                return buildIndex(this);
+                if (_.isUndefined(this.__updateIndex)) {
+                    var res = this;
+                    res.__updateIndex = true;
+                    res.on('add remove', function() {
+                        res.__updateIndex = true;
+                    })
+                }
+
+                if (this.__updateIndex) {
+                    this.__index = buildIndex(this);
+                    this.__updateIndex = false;
+                }
+
+                return this.__index;
             }
         }
     ]
@@ -2499,5 +2529,5 @@ Ecore.Edit = {
 }
 
 
-})();
+}.call(this));
 
diff --git a/dist/ecore.min.js b/dist/ecore.min.js
diff --git a/dist/ecore.xmi.js b/dist/ecore.xmi.js
@@ -6,6 +6,8 @@
 
 (function() {
 
+"use strict";
+
 // The root object, `window` in the browser, or `global` on the server.
 var root = this;
 
@@ -476,17 +478,36 @@ Ecore.EObjectPrototype = {
     eContents: function() {
         if (!this.eClass) return [];
 
-        var eAllFeatures = this.eClass.get('eAllStructuralFeatures'),
-            eContainments = _.filter(eAllFeatures, function(feature) {
+        if (_.isUndefined(this.__updateContents)) {
+            this.__updateContents = true;
+
+            var resource = this.eResource();
+            if (resource) {
+                var me = this;
+                resource.on('add remove', function() {
+                    me.__updateContents = true;
+                })
+            }
+        }
+
+        if (this.__updateContents) {
+            var eAllFeatures    = this.eClass.get('eAllStructuralFeatures');
+            var eContainments   = _.filter(eAllFeatures, function(feature) {
                 return feature.isTypeOf('EReference') &&
                     feature.get('containment') &&
                     this.isSet(feature.get('name'));
             }, this);
 
-        return _.flatten(_.map(eContainments, function(c) {
-            var value = this.get(c.get('name'));
-            return value instanceof Ecore.EList ? value.array() : value;
-        }, this));
+            var value = null;
+            this.__eContents = _.flatten(_.map(eContainments, function(c) {
+                value = this.get(c.get('name'));
+                return value ? (value.array ? value.array() : value) : [];
+            }, this));
+
+            this.__updateContents = false;
+        }
+
+        return this.__eContents;
     },
 
     // Returns the URI of the EObject.
@@ -1894,11 +1915,7 @@ var EClassResource = Ecore.Resource = Ecore.EClass.create({
             _: function(fragment) {
                 if (!fragment) return null;
 
-                if (this.__index == null) {
-                    this.__index = buildIndex(this);
-                }
-
-                return this.__index[fragment];
+                return this._index()[fragment];
             }
         },
         {
@@ -1992,7 +2009,20 @@ var EClassResource = Ecore.Resource = Ecore.EClass.create({
             name: '_index',
             eType: JSObject,
             _: function() {
-                return buildIndex(this);
+                if (_.isUndefined(this.__updateIndex)) {
+                    var res = this;
+                    res.__updateIndex = true;
+                    res.on('add remove', function() {
+                        res.__updateIndex = true;
+                    })
+                }
+
+                if (this.__updateIndex) {
+                    this.__index = buildIndex(this);
+                    this.__updateIndex = false;
+                }
+
+                return this.__index;
             }
         }
     ]
@@ -2864,5 +2894,5 @@ function formatXml(xml) {
 }
 
 
-})();
+}.call(this));
 
diff --git a/dist/ecore.xmi.min.js b/dist/ecore.xmi.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ecore",
   "description": "Ecore (EMOF) JavaScript Implementation",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "author": "Guillaume Hillairet <g.hillairet@gmail.com>",
   "repository": {
     "type": "git",