ember_script-source 0.0.2 → 0.0.5

data/dist/ember-script.js

@@ -262,7 +262,7 @@
                 'ember.js'
             ],
             'author': 'Gordon Hempton/Michael Ficarra',
-            'version': '0.0.1',
+            'version': '0.0.5',
             'main': './lib/module',
             'bin': { 'ember-script': './bin/ember-script' },
             'homepage': 'https://github.com/ghempton/ember-script',
@@ -11103,7 +11103,7 @@
                             }
                         };
                         return function (param$) {
-                            var alternate, ancestry, block, body, cache$2, consequent, i, index, last, newThis, numArgs, numParams, p, parameters, parameters_, paramName, performedRewrite, pIndex, reassignments, rewriteThis, test;
+                            var alternate, ancestry, block, body, cache$2, chains, consequent, i, index, last, newThis, numArgs, numParams, p, parameters, parameters_, paramName, performedRewrite, pIndex, reassignments, rewriteThis, test;
                             {
                                 cache$2 = param$;
                                 parameters = cache$2.parameters;
@@ -11182,7 +11182,10 @@
                                     fn
                                 ]);
                             if (this['instanceof'](CS.ComputedProperty)) {
-                                return emberComputedProperty(fn, this.chains);
+                                chains = Ember.A(this.dependentKeys().map(function (c) {
+                                    return c.join('.');
+                                })).uniq();
+                                return emberComputedProperty(fn, chains);
                             } else {
                                 return fn;
                             }
@@ -12225,50 +12228,13 @@
                 return this;
             };
             Compiler.prototype.compile = function () {
-                var computePropertyChains, defaultRule, generateSymbols, walk;
-                computePropertyChains = function () {
-                    var chains, child, childChains, childName, member, memberName;
-                    chains = [];
-                    if (this['instanceof'](CS.MemberAccessOps) && this.expression['instanceof'](CS.This))
-                        return [this.memberName];
-                    for (var i$ = 0, length$ = this.childNodes.length; i$ < length$; ++i$) {
-                        childName = this.childNodes[i$];
-                        if (!(null != this[childName]))
-                            continue;
-                        if (in$(childName, this.listMembers)) {
-                            for (var i$1 = 0, length$1 = this[childName].length; i$1 < length$1; ++i$1) {
-                                member = this[childName][i$1];
-                                childChains = computePropertyChains.call(member);
-                                if (this['instanceof'](CS.MemberAccessOps)) {
-                                    memberName = this.memberName;
-                                    childChains = childChains.map(function (c) {
-                                        return '' + c + '.' + memberName;
-                                    });
-                                }
-                                chains = chains.concat(childChains);
-                            }
-                        } else {
-                            child = this[childName];
-                            childChains = computePropertyChains.call(child);
-                            if (this['instanceof'](CS.MemberAccessOps)) {
-                                memberName = this.memberName;
-                                childChains = childChains.map(function (c) {
-                                    return '' + c + '.' + memberName;
-                                });
-                            }
-                            chains = chains.concat(childChains);
-                        }
-                    }
-                    return chains;
-                };
+                var defaultRule, generateSymbols, walk;
                 walk = function (fn, inScope, ancestry, options) {
                     var child, childName, children, jsNode;
                     if ((null != ancestry[0] ? ancestry[0]['instanceof'](CS.Function, CS.BoundFunction, CS.ComputedProperty) : void 0) && this === ancestry[0].body)
                         inScope = union(inScope, concatMap(ancestry[0].parameters, beingDeclared));
                     ancestry.unshift(this);
                     children = {};
-                    if (this['instanceof'](CS.ComputedProperty))
-                        this.chains = computePropertyChains.call(this);
                     for (var i$ = 0, length$ = this.childNodes.length; i$ < length$; ++i$) {
                         childName = this.childNodes[i$];
                         if (!(null != this[childName]))
@@ -13046,7 +13012,7 @@
         }
     });
     require.define('/src/nodes.coffee', function (module, exports, __dirname, __filename) {
-        var Annotations, ArrayInitialiser, Block, Bool, Class, CompoundAssignOp, ComputedProperty, concat, concatMap, Conditional, createNodes, difference, exports, ForOf, FunctionApplications, Functions, GenSym, handleLists, handlePrimitives, HeregExp, Identifier, Identifiers, map, Mixin, NegatedConditional, NewOp, Nodes, nub, ObjectInitialiser, ObjectInitialiserMember, PostDecrementOp, PostIncrementOp, Primitives, Range, RegExp, RegExps, Slice, StaticMemberAccessOps, Super, Switch, SwitchCase, union, While;
+        var Annotations, ArrayInitialiser, AssignOp, Block, Bool, Class, CompoundAssignOp, ComputedProperty, concat, concatMap, Conditional, createNodes, difference, enumerableMethods, exports, ForOf, FunctionApplications, Functions, GenSym, handleLists, handlePrimitives, HeregExp, Identifier, Identifiers, map, MemberAccessOp, Mixin, NegatedConditional, NewOp, Nodes, nub, ObjectInitialiser, ObjectInitialiserMember, PostDecrementOp, PostIncrementOp, Primitives, Range, RegExp, RegExps, Slice, StaticMemberAccessOps, Super, Switch, SwitchCase, This, union, While;
         cache$ = require('/src/functional-helpers.coffee', module);
         map = cache$.map;
         concat = cache$.concat;
@@ -13432,6 +13398,9 @@
         Annotations = cache$1.Annotations;
         PostIncrementOp = cache$1.PostIncrementOp;
         PostDecrementOp = cache$1.PostDecrementOp;
+        MemberAccessOp = cache$1.MemberAccessOp;
+        This = cache$1.This;
+        AssignOp = cache$1.AssignOp;
         Nodes.fromBasicObject = function (obj) {
             return exports[obj.type].fromBasicObject(obj);
         };
@@ -13637,6 +13606,127 @@
         PostDecrementOp.prototype.initialise = function () {
             return this.expression.isAssignment = true;
         };
+        Nodes.prototype.dependentKeys = function (scope) {
+            var chains, child, childName, member;
+            if (null == scope)
+                scope = {};
+            chains = [];
+            for (var i$ = 0, length$ = this.childNodes.length; i$ < length$; ++i$) {
+                childName = this.childNodes[i$];
+                if (!(null != this[childName]))
+                    continue;
+                if (in$(childName, this.listMembers)) {
+                    for (var i$1 = 0, length$1 = this[childName].length; i$1 < length$1; ++i$1) {
+                        member = this[childName][i$1];
+                        chains = chains.concat(member.dependentKeys(scope));
+                    }
+                } else {
+                    child = this[childName];
+                    chains = chains.concat(child.dependentKeys(scope));
+                }
+            }
+            return chains;
+        };
+        This.prototype.dependentKeys = function (scope) {
+            if (null == scope)
+                scope = {};
+            return [[]];
+        };
+        MemberAccessOp.prototype.dependentKeys = function (scope) {
+            var memberName;
+            if (null == scope)
+                scope = {};
+            memberName = this.memberName;
+            return this.expression.dependentKeys(scope).map(function (c) {
+                c.push(memberName);
+                return c;
+            });
+        };
+        enumerableMethods = [
+            'isEnumerable',
+            'nextObject',
+            'firstObject',
+            'lastObject',
+            'contains',
+            'forEach',
+            'getEach',
+            'setEach',
+            'map',
+            'mapProperty',
+            'filter',
+            'reject',
+            'filterProperty',
+            'rejectProperty',
+            'find',
+            'findProperty',
+            'every',
+            'everyProperty',
+            'some',
+            'someProperty',
+            'reduce',
+            'invoke',
+            'toArray',
+            'compact',
+            'without',
+            'uniq',
+            '[]',
+            'addEnumerableObserver',
+            'removeEnumerableObserver',
+            'hasEnumerableObservers',
+            'enumerableContentWillChange',
+            'enumerableContentDidChange'
+        ];
+        FunctionApplications.prototype.dependentKeys = function (scope) {
+            var res;
+            if (null == scope)
+                scope = {};
+            res = this['function'].dependentKeys(scope);
+            if (this['function']['instanceof'](MemberAccessOp)) {
+                res = res.map(function (c) {
+                    c.pop();
+                    return c;
+                });
+                if (in$(this['function'].memberName, enumerableMethods))
+                    res = res.map(function (c) {
+                        c.push('@each');
+                        return c;
+                    });
+            }
+            return res;
+        };
+        Block.prototype.dependentKeys = function (scope) {
+            var key, newScope, res;
+            if (null == scope)
+                scope = {};
+            res = [];
+            newScope = Ember.copy(scope);
+            for (var i$ = 0, length$ = newScope.length; i$ < length$; ++i$) {
+                key = newScope[i$];
+                newScope[key] = Ember.copy(newScope[key]);
+            }
+            this.statements.forEach(function (s) {
+                return res = res.concat(s.dependentKeys(scope));
+            });
+            for (var i$1 = 0, length$1 = scope.length; i$1 < length$1; ++i$1) {
+                key = scope[i$1];
+                scope[key] = scope[key].concat(newScope[key]);
+            }
+            return res;
+        };
+        AssignOp.prototype.dependentKeys = function (scope) {
+            var res;
+            if (null == scope)
+                scope = {};
+            res = this.expression.dependentKeys(scope);
+            if (this.assignee['instanceof'](Identifier))
+                scope[this.assignee.data] = (scope[this.assignee.data] || []).concat(res);
+            return res;
+        };
+        Identifier.prototype.dependentKeys = function (scope) {
+            if (null == scope)
+                scope = {};
+            return Ember.copy(scope[this.data]) || [];
+        };
         exports.NegatedConditional = function (super$) {
             extends$(NegatedConditional, super$);
             function NegatedConditional() {
@@ -35615,7 +35705,7 @@
         }();
     });
     require.define('/lib/nodes.js', function (module, exports, __dirname, __filename) {
-        var Annotations, ArrayInitialiser, Block, Bool, Class, CompoundAssignOp, ComputedProperty, concat, concatMap, Conditional, createNodes, difference, exports, ForOf, FunctionApplications, Functions, GenSym, handleLists, handlePrimitives, HeregExp, Identifier, Identifiers, map, Mixin, NegatedConditional, NewOp, Nodes, nub, ObjectInitialiser, ObjectInitialiserMember, PostDecrementOp, PostIncrementOp, Primitives, Range, RegExp, RegExps, Slice, StaticMemberAccessOps, Super, Switch, SwitchCase, union, While;
+        var Annotations, ArrayInitialiser, AssignOp, Block, Bool, Class, CompoundAssignOp, ComputedProperty, concat, concatMap, Conditional, createNodes, difference, enumerableMethods, exports, ForOf, FunctionApplications, Functions, GenSym, handleLists, handlePrimitives, HeregExp, Identifier, Identifiers, map, MemberAccessOp, Mixin, NegatedConditional, NewOp, Nodes, nub, ObjectInitialiser, ObjectInitialiserMember, PostDecrementOp, PostIncrementOp, Primitives, Range, RegExp, RegExps, Slice, StaticMemberAccessOps, Super, Switch, SwitchCase, This, union, While;
         cache$ = require('/lib/functional-helpers.js', module);
         map = cache$.map;
         concat = cache$.concat;
@@ -36001,6 +36091,9 @@
         Annotations = cache$1.Annotations;
         PostIncrementOp = cache$1.PostIncrementOp;
         PostDecrementOp = cache$1.PostDecrementOp;
+        MemberAccessOp = cache$1.MemberAccessOp;
+        This = cache$1.This;
+        AssignOp = cache$1.AssignOp;
         Nodes.fromBasicObject = function (obj) {
             return exports[obj.type].fromBasicObject(obj);
         };
@@ -36206,6 +36299,127 @@
         PostDecrementOp.prototype.initialise = function () {
             return this.expression.isAssignment = true;
         };
+        Nodes.prototype.dependentKeys = function (scope) {
+            var chains, child, childName, member;
+            if (null == scope)
+                scope = {};
+            chains = [];
+            for (var i$ = 0, length$ = this.childNodes.length; i$ < length$; ++i$) {
+                childName = this.childNodes[i$];
+                if (!(null != this[childName]))
+                    continue;
+                if (in$(childName, this.listMembers)) {
+                    for (var i$1 = 0, length$1 = this[childName].length; i$1 < length$1; ++i$1) {
+                        member = this[childName][i$1];
+                        chains = chains.concat(member.dependentKeys(scope));
+                    }
+                } else {
+                    child = this[childName];
+                    chains = chains.concat(child.dependentKeys(scope));
+                }
+            }
+            return chains;
+        };
+        This.prototype.dependentKeys = function (scope) {
+            if (null == scope)
+                scope = {};
+            return [[]];
+        };
+        MemberAccessOp.prototype.dependentKeys = function (scope) {
+            var memberName;
+            if (null == scope)
+                scope = {};
+            memberName = this.memberName;
+            return this.expression.dependentKeys(scope).map(function (c) {
+                c.push(memberName);
+                return c;
+            });
+        };
+        enumerableMethods = [
+            'isEnumerable',
+            'nextObject',
+            'firstObject',
+            'lastObject',
+            'contains',
+            'forEach',
+            'getEach',
+            'setEach',
+            'map',
+            'mapProperty',
+            'filter',
+            'reject',
+            'filterProperty',
+            'rejectProperty',
+            'find',
+            'findProperty',
+            'every',
+            'everyProperty',
+            'some',
+            'someProperty',
+            'reduce',
+            'invoke',
+            'toArray',
+            'compact',
+            'without',
+            'uniq',
+            '[]',
+            'addEnumerableObserver',
+            'removeEnumerableObserver',
+            'hasEnumerableObservers',
+            'enumerableContentWillChange',
+            'enumerableContentDidChange'
+        ];
+        FunctionApplications.prototype.dependentKeys = function (scope) {
+            var res;
+            if (null == scope)
+                scope = {};
+            res = this['function'].dependentKeys(scope);
+            if (this['function']['instanceof'](MemberAccessOp)) {
+                res = res.map(function (c) {
+                    c.pop();
+                    return c;
+                });
+                if (in$(this['function'].memberName, enumerableMethods))
+                    res = res.map(function (c) {
+                        c.push('@each');
+                        return c;
+                    });
+            }
+            return res;
+        };
+        Block.prototype.dependentKeys = function (scope) {
+            var key, newScope, res;
+            if (null == scope)
+                scope = {};
+            res = [];
+            newScope = Ember.copy(scope);
+            for (var i$ = 0, length$ = newScope.length; i$ < length$; ++i$) {
+                key = newScope[i$];
+                newScope[key] = Ember.copy(newScope[key]);
+            }
+            this.statements.forEach(function (s) {
+                return res = res.concat(s.dependentKeys(scope));
+            });
+            for (var i$1 = 0, length$1 = scope.length; i$1 < length$1; ++i$1) {
+                key = scope[i$1];
+                scope[key] = scope[key].concat(newScope[key]);
+            }
+            return res;
+        };
+        AssignOp.prototype.dependentKeys = function (scope) {
+            var res;
+            if (null == scope)
+                scope = {};
+            res = this.expression.dependentKeys(scope);
+            if (this.assignee['instanceof'](Identifier))
+                scope[this.assignee.data] = (scope[this.assignee.data] || []).concat(res);
+            return res;
+        };
+        Identifier.prototype.dependentKeys = function (scope) {
+            if (null == scope)
+                scope = {};
+            return Ember.copy(scope[this.data]) || [];
+        };
         exports.NegatedConditional = function (super$) {
             extends$(NegatedConditional, super$);
             function NegatedConditional() {